handshake send intro

await for handshake before requests
process request queue

udsp/base.js

@@ -75,5 +75,4 @@ export class UDSP {
 	heapSize = 0;
 	throttle = false;
 	debounce = false;
-	requestQueue = [];
 }

udsp/client/index.js

@@ -222,6 +222,8 @@ export class Client extends UDSP {
 		const { handshake } = message;
 		console.log('Handshake Finished', handshake);
 		this.connected = true;
+		// Trigger the handshake completed event
+		this.handshakeCompleted();
 	}
 	encodePublicKeyHeader(header = {}) {
 		const key = this.encryptKeypair.publicKey;
@@ -233,6 +235,20 @@ export class Client extends UDSP {
 		}
 		return header;
 	}
+	launchHandshake() {
+		promise((accept) => {
+			this.handshakeCompleted = accept;
+		});
+		this.sendIntro();
+	}
+	ensureHandshake() {
+		if (this.connected === true) {
+			return true;
+		} else if (!this.handshakeCompleted) {
+			this.launchHandshake();
+		}
+		return this.handshakeCompleted;
+	}
 	send = send;
 	request = request;
 	fetch = fetchRequest;

udsp/request.js

@@ -3,7 +3,7 @@ import {
 } from '#logs';
 import { promise, construct, isString } from '@universalweb/acid';
 imported('Request');
-export function request(dataArg, options) {
+export async function request(dataArg, options) {
 	const data = (isString(dataArg)) ? {
 		path: dataArg
 	} : dataArg;

udsp/request/base.js

@@ -232,16 +232,7 @@ export class Base {
 	}
 	async send() {
 		const thisSource = this;
-		if (isFalse(this.handshake)) {
-			if (this.method !== 'intro') {
-				if (!this.waitingOnIntro) {
-					console.log('Handshake not complete.');
-					this.waitingOnIntro = true;
-				}
-				await this.source().intro(this);
-				this.handshake = this.source().handshake;
-			}
-		}
+		await this.source().ensureHandshake();
 		if (this.sent) {
 			return this.accept;
 		}

udsp/server/clients/index.js

@@ -92,7 +92,6 @@ export class Client {
 	isServerClient = true;
 	isServerEnd = true;
 	pending = false;
-	requestQueue = construct(Map);
 	packetIdGenerator = construct(UniqID);
 	state = 0;
 	encryptConnectionId = false;