aotrautils-srv 0.0.222 → 0.0.225

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1.0.0.000 (22/07/2022-01:01:02)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (30/07/2022-00:15:34)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -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-01:01:02)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (30/07/2022-00:15:34)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -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={
 		
@@ -5071,17 +5069,33 @@ WebsocketImplementation={
 				lognow("INFO : (SERVER/CLIENT) Using socket.io websocket implementation.");	
 				
 				if(isNodeContext){
+					
+					// NODE SERVER :
 					if(typeof(Socket)==="undefined"){
 						// TRACE
-						console.log("«socket.io» SERVER library not called yet, calling it now.");
+						console.log("«socket.io» NODE SERVER library not called yet, calling it now.");
 						Socket=require("socket.io");
 						return WebsocketImplementation;
 					}
 					if(typeof(Socket)==="undefined"){
 						// TRACE
-						console.log("ERROR : «socket.io» CONSOLE/BROWSER CLIENT/SERVER library not found. Cannot launch nodejs server. Aborting.");
+						console.log("ERROR : «socket.io» NODE CLIENT/SERVER library not found. Cannot launch nodejs server. Aborting.");
+						return WebsocketImplementation;
+					}
+					
+					// NODE CLIENT :				
+					if(typeof(io)==="undefined"){
+						// TRACE
+						console.log("«socket.io-client» NODE CLIENT library not called yet, calling it now.");
+						io=require("socket.io-client");
+					}
+					if(typeof(io)==="undefined"){
+						// TRACE
+						console.log("ERROR : «socket-client.io» NODE CLIENT library not found. Cannot launch nodejs server. Aborting.");
 						return WebsocketImplementation;
 					}
+
+					
 				}
 
 			}else{
@@ -5091,16 +5105,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;
-					}		
 				}
 				
 			}
@@ -5446,7 +5459,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);
@@ -5462,29 +5475,31 @@ 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 :
 				//client on server-side:
 				
-				if(WebsocketImplementation.isNodeContext && typeof(Socket)!=="undefined"){
+				if(WebsocketImplementation.isNodeContext && typeof(io)!=="undefined"){
 				//		// Node client :
 				//		connectToServer=function (serverURL, port, isSecure, timeout=10000){
 				//			return Socket.connect(serverURL + ":" + port,{timeout: timeout});
 				//		}
 				
 //				OLD SYNTAX:	clientSocket=Socket.connect(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
-//				clientSocket=new Socket.Client???(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
+//				NO :	clientSocket=new Socket.Client(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
 					clientSocket=io(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
 					
 				}

aotrautils-srv/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "aotrautils-srv",
-	"version": "0.0.222",
+	"version": "0.0.225",
 	"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)",
@@ -24,6 +24,7 @@
 		"fs": "^0.0.1-security",
 		"sjcl": "^1.0.8",
 		"socket.io": "^4.5.1",
+		"socket.io-client": "^4.5.1",
 		"ws": "^8.1.0"
 	}
 }