test

package.json

@@ -43,6 +43,7 @@
 		"rollup": "^3.19.0",
 		"sodium-native": "^4.0.1",
 		"testatron": "^2.1.0",
+		"textlint": "^13.3.3",
 		"webtorrent": "^2.0.14"
 	},
 	"description": "Sentivate Network Client, Server Module, UDSP, Universal Web Socket, & certificate generation. This serves as a service & browser prototype.",

udsp/UWRL/index.js

@@ -1,25 +1,35 @@
-import { jsonParse } from '@universalweb/acid';
+import { initialString, jsonParse, restString } from '@universalweb/acid';
 class UWRL {
 	constructor(urlOriginal, paramaters) {
 		let url = urlOriginal;
 		if (paramaters) {
 			this.paramaters = paramaters;
 		}
 		if (url.includes('{')) {
-			const urlParts = urlOriginal.split('{');
-			url = urlParts[0];
+			const jsonStringStartIndex = url.indexOf('{');
+			console.log(jsonStringStartIndex, url[45]);
+			url = initialString(url, jsonStringStartIndex);
+			this.params = restString(url, jsonStringStartIndex).trim();
 			try {
-				this.paramaters = jsonParse(`{${urlParts[1]}`);
-				if (paramaters) {
-					if (paramaters['#']) {
-						this.hash = paramaters['#'];
-					}
-				}
+				this.paramaters = jsonParse(this.params);
 			} catch {
 				this.paramaters = {};
 			}
+			if (paramaters) {
+				if (paramaters['#']) {
+					this.hash = paramaters['#'];
+				}
+				if (paramaters[':']) {
+					this.account = paramaters[':'][0];
+					this.password = paramaters[':'][1];
+				}
+			}
 		}
+		console.log(url);
+		const urlObject = new URL(url);
+		console.log(urlObject);
 		this.href = url;
+		this.origin = urlObject.origin;
 	}
 	get search() {
 		return this.paramaterString;
@@ -33,11 +43,11 @@ class UWRL {
 // Supports Username Password and URL Fragments
 // Server can opt in to get the URL fragments
 // fragments are turned into client side state tracking
-const uwri = new UWRL('https://www.example.com:8080/path/to/resource{"query":"value", "#": "fragment also known as on the UW as state", ":": ["username", "password"]}');
+const uwri = new UWRL('https://www.example.com:8080/path/to/resource{"query":"value", "#": "fragment", ":": ["username", "password"]}');
 console.log(uwri);
-const uwri2 = new UWRL('https://www.example.com:8080/path/to/resource', {
-	query: 'value',
-	'#': 'fragment',
-	'@': ['username', 'password']
-});
-console.log(uwri2);
+// const uwri2 = new UWRL('https://www.example.com:8080/path/to/resource', {
+// 	query: 'value',
+// 	'#': 'fragment',
+// 	'@': ['username', 'password']
+// });
+// console.log(uwri2);

udsp/request/base.js

@@ -582,4 +582,8 @@ export class Base {
 	totalIncomingHeadSize = 0;
 	totalIncomingPathSize = 0;
 	totalReceivedUniqueDataPackets = 0;
+	onPathCurrentId = 0;
+	onParametersCurrentId = 0;
+	onHeadCurrentId = 0;
+	onDataCurrentId = 0;
 }

udsp/request/onData.js

@@ -8,6 +8,6 @@ export async function onData(message) {
 		console.log('Incoming Progress', this.incomingProgress);
 	}
 	if (this.events.data) {
-		this.events.data(message.data, message.pid);
+		this.events.data(message.data, message.packetId);
 	}
 }

udsp/request/onDataSync.js

@@ -0,0 +1,13 @@
+function callOnDataSyncEvent() {
+	if (this.events.dataSync) {
+		this.events.dataSync(message.data, message.packetId);
+	}
+}
+export function onDataSync(message) {
+	if (message.packetId === this.onDataCurrentId) {
+
+		while (this.) {
+
+		}
+	}
+}

udsp/request/onHead.js

@@ -8,6 +8,6 @@ export async function onHead(message) {
 		console.log('Incoming Progress', this.incomingProgress);
 	}
 	if (this.events.head) {
-		this.events.head(message.head, message.pid);
+		this.events.head(message.head, message.packetId);
 	}
 }

udsp/request/onPacket.js

@@ -1,4 +1,6 @@
-import { hasValue, isArray, isFalse } from '@universalweb/acid';
+import {
+	hasValue, isArray, isFalse, isNumber,
+} from '@universalweb/acid';
 import { destroy } from './destory.js';
 import { processEvent } from '#server/processEvent';
 export async function onPacket(packet) {
@@ -112,7 +114,6 @@ export async function onPacket(packet) {
 			}
 			console.log(`DATA PROGRESS current:${this.currentIncomingDataSize}`, this.totalIncomingDataSize);
 			if (this.currentIncomingDataSize === this.totalIncomingDataSize) {
-				console.log(this);
 				console.log('Last packet received', this.currentIncomingDataSize, this.totalIncomingDataSize);
 				message.last = true;
 				this.totalIncomingUniqueDataPackets = packetId;
@@ -138,16 +139,16 @@ export async function onPacket(packet) {
 				this.method = method;
 			}
 			console.log(`Setup Packet Received HEADER:${totalIncomingHeadSize} DATA:${totalIncomingDataSize}`);
-			if (hasValue(totalIncomingPathSize)) {
+			if (hasValue(totalIncomingPathSize) && isNumber(totalIncomingPathSize)) {
 				this.totalIncomingPathSize = totalIncomingPathSize;
 			}
-			if (hasValue(totalIncomingParametersSize)) {
+			if (hasValue(totalIncomingParametersSize) && isNumber(totalIncomingParametersSize)) {
 				this.totalIncomingParametersSize = totalIncomingParametersSize;
 			}
-			if (hasValue(totalIncomingHeadSize)) {
+			if (hasValue(totalIncomingHeadSize) && isNumber(totalIncomingHeadSize)) {
 				this.totalIncomingHeadSize = totalIncomingHeadSize;
 			}
-			if (totalIncomingDataSize) {
+			if (hasValue(totalIncomingDataSize) && isNumber(totalIncomingDataSize)) {
 				this.totalIncomingDataSize = totalIncomingDataSize;
 			}
 		}