New Connection Status Indicator

universalweb · Mar 3, 2022 · 56afe00 · 56afe00
1 parent 8e9f0c8
commit 56afe00
Show file tree

Hide file tree

Showing 36 changed files with 65 additions and 37 deletions.
diff --git a/uwBridge/apps/client/example!/filesystem/public/Sentivate.js b/uwBridge/apps/client/example!/filesystem/public/Sentivate.js
diff --git a/uwBridge/apps/client/example!/filesystem/public/worker.js b/uwBridge/apps/client/example!/filesystem/public/worker.js
@@ -4322,7 +4322,12 @@
   	const socketIsReady = (data) => {
   		console.log('Socket Is Ready');
   		if (alreadySetup) {
-  			update('_');
+  			update({
+  				type: 'connection',
+  				data: {
+  					type: 'reconnected'
+  				}
+  			});
   		} else {
   			post$1('ready', {
   				language: data.language
@@ -4404,10 +4409,6 @@
   		}
   		return false;
   	};
-  	/*
-  	This async streams required filesLoadedfrom socket
-  	or from cache.
-  	*/
   	assign(app.events.socket, {
   		async get(options, workerInfo) {
   			const { data } = options;
@@ -4457,7 +4458,12 @@
   			if (reason === 'io server disconnect') {
   				socket.connect();
   			}
-  			update('_');
+  			update({
+  				type: 'connection',
+  				data: {
+  					type: 'disconnected'
+  				}
+  			});
   		});
   	};
   	app.events.configure = (data) => {

diff --git a/uwBridge/system/compile/build/front/bundle.js b/uwBridge/system/compile/build/front/bundle.js
diff --git a/uwBridge/system/compile/build/front/coreBundle.js b/uwBridge/system/compile/build/front/coreBundle.js
@@ -316,10 +316,12 @@
     	if (!Watcher.status || !json) {
     		return;
     	}
-    	const type = json.type;
+    	const {
+    		type, name: dataName
+    	} = json;
     	const levelObject = Watcher.containerPrimary[type] || Watcher.containerPrimary[json.name];
     	await eachAsync$2(Watcher.containerRegex, async (watcher) => {
-    		if (watcher.regex.test(type)) {
+    		if (watcher.regex.test(type) || watcher.regex.test(dataName)) {
     			return watcher(json);
     		}
     	});

diff --git a/uwBridge/system/compile/build/worker/bundle.js b/uwBridge/system/compile/build/worker/bundle.js
@@ -4322,7 +4322,12 @@
   	const socketIsReady = (data) => {
   		console.log('Socket Is Ready');
   		if (alreadySetup) {
-  			update('_');
+  			update({
+  				type: 'connection',
+  				data: {
+  					type: 'reconnected'
+  				}
+  			});
   		} else {
   			post$1('ready', {
   				language: data.language
@@ -4404,10 +4409,6 @@
   		}
   		return false;
   	};
-  	/*
-  	This async streams required filesLoadedfrom socket
-  	or from cache.
-  	*/
   	assign(app.events.socket, {
   		async get(options, workerInfo) {
   			const { data } = options;
@@ -4457,7 +4458,12 @@
   			if (reason === 'io server disconnect') {
   				socket.connect();
   			}
-  			update('_');
+  			update({
+  				type: 'connection',
+  				data: {
+  					type: 'disconnected'
+  				}
+  			});
   		});
   	};
   	app.events.configure = (data) => {

diff --git a/uwBridge/system/compile/build/worker/coreBundle.js b/uwBridge/system/compile/build/worker/coreBundle.js
@@ -79,7 +79,12 @@
 	const socketIsReady = (data) => {
 		console.log('Socket Is Ready');
 		if (alreadySetup) {
-			update('_');
+			update({
+				type: 'connection',
+				data: {
+					type: 'reconnected'
+				}
+			});
 		} else {
 			post$1('ready', {
 				language: data.language
@@ -161,10 +166,6 @@
 		}
 		return false;
 	};
-	/*
-	This async streams required filesLoadedfrom socket
-	or from cache.
-	*/
 	assign(app.events.socket, {
 		async get(options, workerInfo) {
 			const { data } = options;
@@ -214,7 +215,12 @@
 			if (reason === 'io server disconnect') {
 				socket.connect();
 			}
-			update('_');
+			update({
+				type: 'connection',
+				data: {
+					type: 'disconnected'
+				}
+			});
 		});
 	};
 	app.events.configure = (data) => {

diff --git a/uwBridge/system/compile/build/worker/coreBundle.js.map b/uwBridge/system/compile/build/worker/coreBundle.js.map
diff --git a/uwBridge/system/compile/source/front/core/watchers.js b/uwBridge/system/compile/source/front/core/watchers.js
@@ -27,10 +27,13 @@ export class Watcher {
 		if (!Watcher.status || !json) {
 			return;
 		}
-		const type = json.type;
+		const {
+			type,
+			name: dataName
+		} = json;
 		const levelObject = Watcher.containerPrimary[type] || Watcher.containerPrimary[json.name];
 		await eachAsync(Watcher.containerRegex, async (watcher) => {
-			if (watcher.regex.test(type)) {
+			if (watcher.regex.test(type) || watcher.regex.test(dataName)) {
 				return watcher(json);
 			}
 		});

diff --git a/uwBridge/system/compile/source/worker/core/socket.js b/uwBridge/system/compile/source/worker/core/socket.js
@@ -68,9 +68,11 @@ const request = async (configObj) => {
 const socketIsReady = (data) => {
 	console.log('Socket Is Ready');
 	if (alreadySetup) {
-		update('_', {
-			type: 'connection.reconnected',
-			data: {}
+		update({
+			type: 'connection',
+			data: {
+				type: 'reconnected'
+			}
 		});
 	} else {
 		post('ready', {
@@ -150,10 +152,6 @@ const getCallback = async function(jsonData, configObj, workerInfo) {
 	}
 	return false;
 };
-/*
-This async streams required filesLoadedfrom socket
-or from cache.
-*/
 assign(app.events.socket, {
 	async get(options, workerInfo) {
 		const { data } = options;
@@ -203,9 +201,11 @@ const socketInitialize = () => {
 		if (reason === 'io server disconnect') {
 			socket.connect();
 		}
-		update('_', {
-			type: 'connection.disconnected',
-			data: {}
+		update({
+			type: 'connection',
+			data: {
+				type: 'disconnected'
+			}
 		});
 	});
 };

diff --git a/uwBridge/system/setup/service/socket/index.js b/uwBridge/system/setup/service/socket/index.js
@@ -1,5 +1,7 @@
 module.exports = (utility) => {
 	const socketio = require('socket.io');
+	// const uWS = require('../uWebSockets');
+	// const { StringDecoder } = require('string_decoder');
 	const {
 		each,
 		eachObject,

diff --git a/uWebSockets.js/LICENSE → .../setup/service/socket/uWebSockets/LICENSE b/uWebSockets.js/LICENSE → .../setup/service/socket/uWebSockets/LICENSE
diff --git a/uWebSockets.js/README.md → ...etup/service/socket/uWebSockets/README.md b/uWebSockets.js/README.md → ...etup/service/socket/uWebSockets/README.md
diff --git a/uWebSockets.js/index.d.ts → ...tup/service/socket/uWebSockets/index.d.ts b/uWebSockets.js/index.d.ts → ...tup/service/socket/uWebSockets/index.d.ts
diff --git a/uWebSockets.js/package.json → ...p/service/socket/uWebSockets/package.json b/uWebSockets.js/package.json → ...p/service/socket/uWebSockets/package.json
diff --git a/uWebSockets.js/source_commit → .../service/socket/uWebSockets/source_commit b/uWebSockets.js/source_commit → .../service/socket/uWebSockets/source_commit
diff --git a/uWebSockets.js/uws.js → ...m/setup/service/socket/uWebSockets/uws.js b/uWebSockets.js/uws.js → ...m/setup/service/socket/uWebSockets/uws.js
diff --git a/uWebSockets.js/uws_darwin_arm64_102.node → ...ket/uWebSockets/uws_darwin_arm64_102.node b/uWebSockets.js/uws_darwin_arm64_102.node → ...ket/uWebSockets/uws_darwin_arm64_102.node
diff --git a/uWebSockets.js/uws_darwin_arm64_83.node → ...cket/uWebSockets/uws_darwin_arm64_83.node b/uWebSockets.js/uws_darwin_arm64_83.node → ...cket/uWebSockets/uws_darwin_arm64_83.node
diff --git a/uWebSockets.js/uws_darwin_arm64_88.node → ...cket/uWebSockets/uws_darwin_arm64_88.node b/uWebSockets.js/uws_darwin_arm64_88.node → ...cket/uWebSockets/uws_darwin_arm64_88.node
diff --git a/uWebSockets.js/uws_darwin_arm64_93.node → ...cket/uWebSockets/uws_darwin_arm64_93.node b/uWebSockets.js/uws_darwin_arm64_93.node → ...cket/uWebSockets/uws_darwin_arm64_93.node
diff --git a/uWebSockets.js/uws_darwin_x64_102.node → ...ocket/uWebSockets/uws_darwin_x64_102.node b/uWebSockets.js/uws_darwin_x64_102.node → ...ocket/uWebSockets/uws_darwin_x64_102.node
diff --git a/uWebSockets.js/uws_darwin_x64_83.node → ...socket/uWebSockets/uws_darwin_x64_83.node b/uWebSockets.js/uws_darwin_x64_83.node → ...socket/uWebSockets/uws_darwin_x64_83.node
diff --git a/uWebSockets.js/uws_darwin_x64_88.node → ...socket/uWebSockets/uws_darwin_x64_88.node b/uWebSockets.js/uws_darwin_x64_88.node → ...socket/uWebSockets/uws_darwin_x64_88.node
diff --git a/uWebSockets.js/uws_darwin_x64_93.node → ...socket/uWebSockets/uws_darwin_x64_93.node b/uWebSockets.js/uws_darwin_x64_93.node → ...socket/uWebSockets/uws_darwin_x64_93.node
diff --git a/uWebSockets.js/uws_linux_arm64_102.node → ...cket/uWebSockets/uws_linux_arm64_102.node b/uWebSockets.js/uws_linux_arm64_102.node → ...cket/uWebSockets/uws_linux_arm64_102.node
diff --git a/uWebSockets.js/uws_linux_arm64_83.node → ...ocket/uWebSockets/uws_linux_arm64_83.node b/uWebSockets.js/uws_linux_arm64_83.node → ...ocket/uWebSockets/uws_linux_arm64_83.node
diff --git a/uWebSockets.js/uws_linux_arm64_88.node → ...ocket/uWebSockets/uws_linux_arm64_88.node b/uWebSockets.js/uws_linux_arm64_88.node → ...ocket/uWebSockets/uws_linux_arm64_88.node
diff --git a/uWebSockets.js/uws_linux_arm64_93.node → ...ocket/uWebSockets/uws_linux_arm64_93.node b/uWebSockets.js/uws_linux_arm64_93.node → ...ocket/uWebSockets/uws_linux_arm64_93.node
diff --git a/uWebSockets.js/uws_linux_x64_102.node → ...socket/uWebSockets/uws_linux_x64_102.node b/uWebSockets.js/uws_linux_x64_102.node → ...socket/uWebSockets/uws_linux_x64_102.node
diff --git a/uWebSockets.js/uws_linux_x64_83.node → .../socket/uWebSockets/uws_linux_x64_83.node b/uWebSockets.js/uws_linux_x64_83.node → .../socket/uWebSockets/uws_linux_x64_83.node
diff --git a/uWebSockets.js/uws_linux_x64_88.node → .../socket/uWebSockets/uws_linux_x64_88.node b/uWebSockets.js/uws_linux_x64_88.node → .../socket/uWebSockets/uws_linux_x64_88.node
diff --git a/uWebSockets.js/uws_linux_x64_93.node → .../socket/uWebSockets/uws_linux_x64_93.node b/uWebSockets.js/uws_linux_x64_93.node → .../socket/uWebSockets/uws_linux_x64_93.node
diff --git a/uWebSockets.js/uws_win32_x64_102.node → ...socket/uWebSockets/uws_win32_x64_102.node b/uWebSockets.js/uws_win32_x64_102.node → ...socket/uWebSockets/uws_win32_x64_102.node
diff --git a/uWebSockets.js/uws_win32_x64_83.node → .../socket/uWebSockets/uws_win32_x64_83.node b/uWebSockets.js/uws_win32_x64_83.node → .../socket/uWebSockets/uws_win32_x64_83.node
diff --git a/uWebSockets.js/uws_win32_x64_88.node → .../socket/uWebSockets/uws_win32_x64_88.node b/uWebSockets.js/uws_win32_x64_88.node → .../socket/uWebSockets/uws_win32_x64_88.node
diff --git a/uWebSockets.js/uws_win32_x64_93.node → .../socket/uWebSockets/uws_win32_x64_93.node b/uWebSockets.js/uws_win32_x64_93.node → .../socket/uWebSockets/uws_win32_x64_93.node