Assmble Path & Parameters

onPacket Path & params Param & Path Max Size fixes
universalweb · Aug 16, 2023 · 898969b · 898969b
1 parent 441f81a
commit 898969b
Show file tree

Hide file tree

Showing 6 changed files with 209 additions and 109 deletions.
diff --git a/udsp/base.js b/udsp/base.js
@@ -11,7 +11,7 @@ export class UDSP {
 			maxDataSize,
 			maxHeadSize,
 			maxPathSize,
-			maxParamsSize
+			maxParametersSize
 		} = this;
 		if (maxPayloadSize) {
 			if (!maxDataSize) {
@@ -20,8 +20,8 @@ export class UDSP {
 			if (!maxHeadSize) {
 				this.maxHeadSize = maxPayloadSize;
 			}
-			if (!maxParamsSize) {
-				this.maxParamsSize = maxPayloadSize;
+			if (!maxParametersSize) {
+				this.maxParametersSize = maxPayloadSize;
 			}
 			if (!maxPathSize) {
 				this.maxPathSize = maxPayloadSize;
@@ -39,11 +39,11 @@ export class UDSP {
 			if (!maxHeadSize) {
 				this.maxHeadSize = this.maxPayloadSize - this.emptyPayloadOverHeadSize;
 			}
-			if (!maxParamsSize) {
-				this.maxParamsSize = this.maxPayloadSize - this.emptyPayloadOverParamsSize;
+			if (!maxParametersSize) {
+				this.maxParametersSize = this.maxPayloadSize - this.emptyPayloadOverHeadSize;
 			}
 			if (!maxPathSize) {
-				this.maxPathSize = this.maxPayloadSize - this.emptyPayloadOverPathSize;
+				this.maxPathSize = this.maxPayloadSize - this.emptyPayloadOverHeadSize;
 			}
 			console.log(`packetInitialOverhead: ${packetInitialOverhead} bytes`);
 		}
@@ -55,7 +55,7 @@ export class UDSP {
 		console.log(`Max Data Size: ${this.maxDataSize} bytes`);
 		console.log(`Max Head Size: ${this.maxHeadSize} bytes`);
 		console.log(`Max Path Size: ${this.maxPathSize} bytes`);
-		console.log(`Max Paraneters Size: ${this.maxParamsSize} bytes`);
+		console.log(`Max Paraneters Size: ${this.maxParametersSize} bytes`);
 		console.log(`Max Packet Size: ${this.maxPacketSize} bytes`);
 	}
 	generateConnectionID() {

diff --git a/udsp/cryptography.js b/udsp/cryptography.js
@@ -120,7 +120,7 @@ class Cryptography {
 		console.log('cryptographyConfig.encryptKeypair', cryptographyConfig.encryptKeypair);
 		if (!config.encryptKeypair) {
 			console.log('keypairType', config.keypairType);
-			console.log('exchange', exchange);
+			console.log('Keypair exchange', exchange);
 			if (config.keypairType === 'ed25519' && exchange === 'x25519') {
 				if (config.privateKey) {
 					this.encryptionKeypair = signKeypairToEncryptKeypair({

diff --git a/udsp/request/ask.js b/udsp/request/ask.js
@@ -8,7 +8,7 @@ import {
 import { Base } from './base.js';
 import { request } from '#udsp/requestTypes/request';
 export class Ask extends Base {
-	constructor(method = 'get', path, params, data, head, options = {}, source) {
+	constructor(method = 'get', path, parameters, data, head, options = {}, source) {
 		super(options, source);
 		const {
 			requestQueue,
@@ -26,9 +26,9 @@ export class Ask extends Base {
 			this.path = path;
 			this.pathSize = path.length;
 		}
-		if (params) {
-			this.request.params = params;
-			this.params = params;
+		if (parameters) {
+			this.request.parameters = parameters;
+			this.parameters = parameters;
 		}
 		if (data) {
 			this.request.data = data;