onPacket Server side patch

Packet Security
universalweb · Aug 5, 2023 · c208d4f · c208d4f
1 parent 8c20d4c
commit c208d4f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 26 deletions.
diff --git a/udsp/client/index.js b/udsp/client/index.js
@@ -332,7 +332,6 @@ export class Client extends UDSP {
 	autoConnect = false;
 	connect = connect;
 	static connections = new Map();
-	packetIdGenerator = construct(UniqID);
 	certChunks = [];
 }
 export async function client(configuration) {

diff --git a/udsp/client/processMessage.js b/udsp/client/processMessage.js
@@ -11,7 +11,7 @@ export async function processMessage(packet, client) {
 		message,
 		footer
 	} = packet;
-	const { queue } = client;
+	const { requestQueue } = client;
 	const {
 		connectionClose,
 		state,
@@ -26,7 +26,7 @@ export async function processMessage(packet, client) {
 		return failed(`End event received from server disconnected closing client`);
 	}
 	// console.log(queue.keys());
-	const askObject = queue.get(sid);
+	const askObject = requestQueue.get(sid);
 	if (askObject) {
 		askObject.onPacket(packet);
 	} else {

diff --git a/udsp/decodePacket.js b/udsp/decodePacket.js
@@ -29,10 +29,8 @@ export async function decodePacketHeaders(config) {
 	let encryptConnectionId;
 	if (isServerEnd) {
 		encryptConnectionId = cryptography.config.encryptServerConnectionId;
-		info(`encrypt server ConnectionId ${encryptConnectionId}`);
 	} else {
 		encryptConnectionId = cryptography.config.encryptClientConnectionId;
-		info(`encrypt client ConnectionId ${encryptConnectionId}`);
 	}
 	const client = config.client;
 	info(`Packet Encoded Size ${packetEncoded.length}`);
@@ -56,7 +54,7 @@ export async function decodePacketHeaders(config) {
 		return failed(`No connection id in header -> Invalid Packet`);
 	}
 	if (connectionIdKeypair && encryptConnectionId) {
-		success('Server Connection ID Decrypted');
+		success('Connection ID Decrypted');
 		// console.log(destination);
 		if (isServerEnd) {
 			header.id = cryptography.decryptServerConnectionId(header.id, connectionIdKeypair);

diff --git a/udsp/request/ask.js b/udsp/request/ask.js
@@ -1,11 +1,5 @@
 import {
-	promise, assign, omit,
-	eachArray, stringify,
-	get,
-	isBuffer, isPlainObject,
-	isArray, isMap, construct,
-	each, hasLength,
-	hasValue
+	promise, assign, omit, eachArray, stringify, get, isBuffer, isPlainObject, isArray, isMap, construct, each, hasLength, hasValue, UniqID
 } from '@universalweb/acid';
 import { decode, encode } from 'msgpackr';
 import {
@@ -18,15 +12,15 @@ export class Ask extends Base {
 		super(options, source);
 		const {
 			requestQueue,
-			packetIdGenerator,
+			streamIdGenerator,
 		} = source;
 		const {
 			data,
 			method = 'get'
 		} = requestObject;
 		const head = requestObject.head || options.head;
 		console.log('Ask', requestObject);
-		const streamId = packetIdGenerator.get();
+		const streamId = streamIdGenerator.get();
 		this.request.sid = streamId;
 		this.request.method = method;
 		this.method = method;

diff --git a/udsp/request/onPacket.js b/udsp/request/onPacket.js
@@ -5,6 +5,7 @@ export async function onPacket(packet) {
 	const source = this;
 	this.lastPacketTime = Date.now();
 	const { message } = packet;
+	console.log(packet);
 	const {
 		// main data payload
 		data,
@@ -33,7 +34,7 @@ export async function onPacket(packet) {
 		dataReady,
 		last
 	} = message;
-	console.log(`Stream Id ${streamId}`);
+	console.log(`onPacket Stream Id ${streamId}`);
 	this.totalIncomingPackets++;
 	if (this.ok) {
 		return;

diff --git a/udsp/request/reply.js b/udsp/request/reply.js
@@ -18,15 +18,12 @@ export class Reply extends Base {
 		const { sid } = message;
 		// console.log(source);
 		// // console.log(message);
-		const {
-			queue,
-			packetIdGenerator
-		} = source;
+		const { requestQueue, } = source;
 		this.sid = sid;
 		this.id = sid;
 		this.response.sid = sid;
-		queue.set(sid, this);
-		this.onPacket(message);
+		requestQueue.set(sid, this);
+		this.onPacket(request);
 	}
 	isReply = true;
 	async complete() {

diff --git a/udsp/server/clients/index.js b/udsp/server/clients/index.js
@@ -86,7 +86,7 @@ export class Client {
 	}
 	// server intro to client with connection id and new keypair
 	async sendIntro(introMessage) {
-		info(`Client Intro Sent -> - ID:${this.idString}`);
+		info(`Client Intro Sent -> - ID:${this.idString}`, introMessage);
 		if (isFalsy(this.newKeypairGenerated)) {
 			this.generateSessionKeypair();
 			this.newKeypairGenerated = true;
@@ -122,6 +122,7 @@ export class Client {
 	}
 	proccessProtocolPacket(message) {
 		info(`Client Intro -> - ID:${this.idString}`);
+		console.log(message);
 		const {
 			intro,
 			certRequest,
@@ -140,11 +141,11 @@ export class Client {
 	isServerClient = true;
 	isServerEnd = true;
 	pending = false;
-	packetIdGenerator = construct(UniqID);
 	state = 0;
 	encryptConnectionId = false;
 	randomId = randomBuffer(8);
 	privateData = {};
+	requestQueue = construct(Map);
 }
 export async function createClient(config) {
 	const client = await construct(Client, [config]);

diff --git a/udsp/server/onPacket.js b/udsp/server/onPacket.js
@@ -2,7 +2,7 @@ import {
 	success, failed, imported, msgSent, info, msgReceived
 } from '#logs';
 import { toBase64 } from '#crypto';
-import { isEmpty } from '@universalweb/acid';
+import { isEmpty, hasValue } from '@universalweb/acid';
 import { decodePacket, decodePacketHeaders } from '#udsp/decodePacket';
 import { createClient } from './clients/index.js';
 import { reply } from '#udsp/request/reply';
@@ -55,7 +55,7 @@ export async function onPacket(packet, connection) {
 		header,
 		message
 	} = config.packetDecoded;
-	if (message.sid) {
+	if (hasValue(message?.sid)) {
 		reply(config.packetDecoded, client);
 	} else {
 		client.proccessProtocolPacket(message, header);