aotrautils-srv 0.0.90 → 0.0.93

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1.0.0.000 (13/07/2022-11:27:48)»*/
+/*utils COMMONS library associated with aotra version : «1.0.0.000 (13/07/2022-23:23:15)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4828,7 +4828,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1.0.0.000 (13/07/2022-11:27:48)»*/
+/*utils SERVER library associated with aotra version : «1.0.0.000 (13/07/2022-23:23:15)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4864,10 +4864,6 @@ if(typeof(window)==="undefined")	window=global;
 // https://nodejs.org/api/https.html#https_https_createserver_options_requestlistener
 
 
-// DBG
-socketIO=require("socket.io");
-WebSocket=require("ws");
-
 
 
 //let socketIO;
@@ -5079,6 +5075,12 @@ if(typeof(fs)==="undefined"){
 // NODE ONLY SERVER / CLIENTS : 
 WebsocketImplementation={
 		
+		////
+		
+		socketIO:require("socket.io"),
+		WebSocket:require("ws"),
+		
+		
 		isNodeContext:true,
 		useSocketIOImplementation:false,
 		useFlatStrings:false,
@@ -5114,6 +5116,10 @@ WebsocketImplementation={
 
 			// *********************************************************************************
 			
+			WebsocketImplementation.socketIO=require("socket.io");
+			WebsocketImplementation.WebSocket=require("ws");
+			
+			
 			
 			
 			return WebsocketImplementation;
@@ -5127,21 +5133,23 @@ WebsocketImplementation={
 				throw new Error("ERROR : SERVER : Server launch is not supported in a non-nodejs context for any implementation.");
 			}
 			
+
+			
 			// TODO : FIXME : Use one single interface !
 			// NODE SERVER MODE ONLY :
 			let serverSocket;
 			if(!WebsocketImplementation.useSocketIOImplementation){
-				serverSocket=new WebSocket.Server({ "server":listenableServer });
+				serverSocket=new WebsocketImplementation.WebSocket.Server({ "server":listenableServer });
 			}else{
 				
 
 				// DBG
-				console.log(">>>>>>>socketIO:",JSON.stringify(socketIO));
-				console.log(">>>>>>>WebSocket:",JSON.stringify(WebSocket));
+				console.log(">>>>>>>WebsocketImplementation.socketIO:",JSON.stringify(WebsocketImplementation.socketIO));
+				console.log(">>>>>>>WebsocketImplementation.WebSocket:",JSON.stringify(WebsocketImplementation.WebSocket));
 				
 				// NOW : socket.io :
 				// Loading socket.io
-				serverSocket=socketIO.listen(listenableServer);
+				serverSocket=WebsocketImplementation.socketIO.listen(listenableServer);
 				
 				// Setting up the disctonnect event :
 				serverSocket.on("endConnection",()=>{
@@ -5229,7 +5237,7 @@ WebsocketImplementation={
 						    	
 						    	
 				    				// TODO : FIXME : Use one single interface !
-									if(!WebsocketImplementation.useSocketIOImplementation)	if(clientSocket.readyState!==WebSocket.OPEN)	return;
+									if(!WebsocketImplementation.useSocketIOImplementation)	if(clientSocket.readyState!==WebsocketImplementation.WebSocket.OPEN)	return;
 									else																										if(clientSocket.connected)	return;
 
 						    	
@@ -5253,7 +5261,7 @@ WebsocketImplementation={
 							
 							// TODO : FIXME : Use one single interface !
 							let clientSocket=clientSocketParam;
-							if(!WebsocketImplementation.useSocketIOImplementation)	if(clientSocket.readyState!==WebSocket.OPEN)	return;
+							if(!WebsocketImplementation.useSocketIOImplementation)	if(clientSocket.readyState!==WebsocketImplementation.WebSocket.OPEN)	return;
 							else																										if(clientSocket.connected)	return;
 
 
@@ -5430,7 +5438,7 @@ WebsocketImplementation={
 			
 			
 			// NEW : ws :
-			if(typeof(WebSocket)==="undefined"){
+			if(typeof(WebsocketImplementation.WebSocket)==="undefined"){
 				// TRACE
 				lognow("ERROR : CLIENT : Could not find websocket client lib, aborting client connection.");
 				return null;
@@ -5439,18 +5447,18 @@ WebsocketImplementation={
 			// NODE CLIENT MODE ONLY :
 			let clientSocket;
 			if(!WebsocketImplementation.useSocketIOImplementation){
-				clientSocket=new WebSocket(serverURL+":"+port,/*WORKAROUND:*/{ rejectUnauthorized:false, secure: isSecure });
+				clientSocket=new WebsocketImplementation.WebSocket(serverURL+":"+port,/*WORKAROUND:*/{ rejectUnauthorized:false, secure: isSecure });
 			}else{
 				// NOW : socket.io :
 				//client on server-side:
 				
 				
-				if(WebsocketImplementation.isNodeContext && typeof(socketIO)!=="undefined"){
+				if(WebsocketImplementation.isNodeContext && typeof(WebsocketImplementation.socketIO)!=="undefined"){
 				//		// Node client :
 				//		connectToServer=function (serverURL, port, isSecure, timeout=10000){
-				//			return socketIO.connect(serverURL + ":" + port,{timeout: timeout});
+				//			return WebsocketImplementation.socketIO.connect(serverURL + ":" + port,{timeout: timeout});
 				//		}
-					clientSocket=socketIO.connect(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
+					clientSocket=WebsocketImplementation.socketIO.connect(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
 				}
 			}
 
@@ -5510,7 +5518,7 @@ WebsocketImplementation={
 //			    console.log("(NODE CLIENT) TRYING TO SEND : clientSocket.readyState:",clientSocket.readyState);
 
 						// TODO : FIXME : Use one single interface !
-						if(!WebsocketImplementation.useSocketIOImplementation)	if(clientSocket.readyState!==WebSocket.OPEN)	return;
+						if(!WebsocketImplementation.useSocketIOImplementation)	if(clientSocket.readyState!==WebsocketImplementation.WebSocket.OPEN)	return;
 						else																										if(clientSocket.connected)	return;
 
 
@@ -5587,7 +5595,7 @@ WebsocketImplementation={
 		/*private*/connectToServerFromBrowser:(serverURL, port, isSecure, timeout)=>{
 			
 			// NEW : ws :
-			if(typeof(WebSocket)==="undefined"){
+			if(typeof(WebsocketImplementation.WebSocket)==="undefined"){
 				// TRACE
 				lognow("ERROR : CLIENT : Could not find websocket client lib, aborting client connection.");
 				return null;
@@ -5597,7 +5605,7 @@ WebsocketImplementation={
 			// BROWSER CLIENT MODE ONLY :
 			let clientSocket;
 			if(!WebsocketImplementation.useSocketIOImplementation){
-				clientSocket=new WebSocket(serverURL+":"+port,["ws","wss"]);
+				clientSocket=new WebsocketImplementation.WebSocket(serverURL+":"+port,["ws","wss"]);
 			}else if(typeof(io)!=="undefined"){
 				// NOW : socket.io :
 				//				// Browser client :
@@ -5663,7 +5671,7 @@ WebsocketImplementation={
 //					console.log("(BROWSER) TRYING TO SEND : clientSocket.readyState:",clientSocket.readyState);
 
 						// TODO : FIXME : Use one single interface !
-						if(!WebsocketImplementation.useSocketIOImplementation)	if(clientSocket.readyState!==WebSocket.OPEN)	return;
+						if(!WebsocketImplementation.useSocketIOImplementation)	if(clientSocket.readyState!==WebsocketImplementation.WebSocket.OPEN)	return;
 						else																										if(clientSocket.connected)	return;
 
 						

aotrautils-srv/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "aotrautils-srv",
-	"version": "0.0.90",
+	"version": "0.0.93",
 	"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)",