aotrautils-srv 0.0.220 → 0.0.223

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1.0.0.000 (22/07/2022-00:49:55)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (30/07/2022-00:00:12)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -23,7 +23,6 @@
 
 
 // COMPATIBILITY browser javascript / nodejs environment :
-
 if(typeof(window)==="undefined")	window=global;	
 
 
@@ -4828,7 +4827,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1.0.0.000 (22/07/2022-00:49:55)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (30/07/2022-00:00:12)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4852,7 +4851,6 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 // COMPATIBILITY browser javascript / nodejs environment :
-
 if(typeof(window)==="undefined")	window=global;	
 
 
@@ -4888,12 +4886,12 @@ const FILE_ENCODING="utf8";
 if(typeof(fs)==="undefined"){
 	// TRACE
 	console.log("WARN : Could not find the nodejs dependency «fs», aborting persister setup.");
-	window.getPersister=()=>{	return null;	};
+	getPersister=()=>{	return null;	};
 	
 }else{
 	
 	
-	window.getPersister=function(dataDirPath,suffix=""){
+	getPersister=function(dataDirPath,suffix=""){
 		
 		let self={
 		
@@ -5091,16 +5089,15 @@ WebsocketImplementation={
 				// https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API/Writing_WebSocket_client_applications
 				if(isNodeContext){
 					if(typeof(WebSocket)==="undefined"){
-						WebSocket=require("ws");
 						// TRACE
 						console.log("«ws» SERVER library not called yet, calling it now.");
+						WebSocket=require("ws");
+						if(typeof(WebSocket)==="undefined"){
+							// TRACE
+							console.log("ERROR : «ws» CONSOLE/BROWSER CLIENT/SERVER library not found. Cannot launch nodejs server. Aborting.");
+						}
 						return WebsocketImplementation;
 					}
-					if(typeof(WebSocket)==="undefined"){
-						// TRACE
-						console.log("ERROR : «ws» CONSOLE/BROWSER CLIENT/SERVER library not found. Cannot launch nodejs server. Aborting.");
-						return WebsocketImplementation;
-					}		
 				}
 				
 			}
@@ -5312,6 +5309,10 @@ WebsocketImplementation={
 //						nodeServerInstance.clientsSockets.push(clientSocket);
 
 
+							// DBG
+							clientSocket.clientId=getUUID();
+
+
 							// DBG
 							console.log("nodeServerInstance.receptionEntryPoints.length:",nodeServerInstance.receptionEntryPoints.length);
 
@@ -5442,7 +5443,7 @@ WebsocketImplementation={
 		connectToServer:(serverURL, port, isSecure=false, timeout)=>{
 
 			// TRACE
-			lognow("INFO : Using websocket implementation : "+(WebsocketImplementation.isNodeContext?"node (server-side)":"browser (client-side)"));
+			lognow("INFO : Using socket library flavor : "+(WebsocketImplementation.isNodeContext?"node (client/server-side)":"browser (client-side only)"));
 
 			if(WebsocketImplementation.isNodeContext)
 				return WebsocketImplementation.connectToServerFromNode(serverURL, port, isSecure, timeout);
@@ -5458,16 +5459,18 @@ WebsocketImplementation={
 		/*private*/connectToServerFromNode:(serverURL, port, isSecure, timeout)=>{
 			
 			
-			// NEW : ws :
-			if(typeof(WebSocket)==="undefined"){
-				// TRACE
-				lognow("ERROR : CLIENT : Could not find websocket client lib, aborting client connection.");
-				return null;
-			}
-			
 			// NODE CLIENT MODE ONLY :
 			let clientSocket;
 			if(!WebsocketImplementation.useSocketIOImplementation){
+			
+				// NEW : ws :
+				if(typeof(WebSocket)==="undefined"){
+					// TRACE
+					lognow("ERROR : CLIENT : Could not find websocket client lib, aborting client connection.");
+					return null;
+				}
+
+				
 				clientSocket=new WebSocket(serverURL+":"+port,/*WORKAROUND:*/{ rejectUnauthorized:false, secure: isSecure });
 			}else{
 				// NOW : socket.io :
@@ -5535,7 +5538,7 @@ WebsocketImplementation={
 					
 					send:(channelName, data, clientsRoomsTag=null)=>{
 						
-						let clientSocket=nodeClientInstance.clientSocket;
+						const clientSocket=nodeClientInstance.clientSocket;
 						
 						
 //			    // DBG
@@ -5587,7 +5590,7 @@ WebsocketImplementation={
 							if(nodeClientInstance.hasConnectEventFired)	return;
 							nodeClientInstance.hasConnectEventFired=true;
 							
-							let clientSocket=nodeClientInstance.clientSocket;
+							const clientSocket=nodeClientInstance.clientSocket;
 							
 							doOnConnection(nodeClientInstance, clientSocket);
 							
@@ -5597,11 +5600,6 @@ WebsocketImplementation={
 							});
 							
 							
-							////
-							// TODO : FIXME
-							
-							
-							
 						};
 
 						if(!WebsocketImplementation.useSocketIOImplementation)	nodeClientInstance.clientSocket.addEventListener("open",doAllOnConnection);
@@ -5701,7 +5699,7 @@ WebsocketImplementation={
 					
 					send:(channelName, data, clientsRoomsTag=null)=>{
 						
-						let clientSocket=browserInstance.clientSocket;
+						const clientSocket=browserInstance.clientSocket;
 			    	
 								
 //					// DBG
@@ -5750,10 +5748,11 @@ WebsocketImplementation={
 							if(browserInstance.hasConnectEventFired)	return;
 							browserInstance.hasConnectEventFired=true;
 
+							const clientSocket=browserInstance.clientSocket;
+
+
 							doOnConnection(browserInstance, clientSocket);
 
-							// DBG
-							clientSocket.clientId=getUUID();
 							
 						};
 						

aotrautils-srv/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "aotrautils-srv",
-	"version": "0.0.220",
+	"version": "0.0.223",
 	"main": "aotrautils-srv.build.js",
 	"description": "A library for vanilla javascript utils (server-side) used in aotra javascript CMS",
 	"author": "Jeremie Ratomposon <info@alqemia.com> (https://alqemia.com)",