aotrautils-srv 0.0.114 → 0.0.117

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1.0.0.000 (16/07/2022-14:36:04)»*/
+/*utils COMMONS library associated with aotra version : «1.0.0.000 (16/07/2022-14:54:41)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4828,7 +4828,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1.0.0.000 (16/07/2022-14:36:04)»*/
+/*utils SERVER library associated with aotra version : «1.0.0.000 (16/07/2022-14:54:41)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4872,13 +4872,16 @@ if(typeof(window)==="undefined")	window=global;
 // https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API/Writing_WebSocket_client_applications
 
 // We have to import both implementations, regardless of which one is chosen :
-const {Socket}=require("socket.io");
-const {WebSocket}=require("ws");
+//const {Socket}=require("socket.io");
+//const {WebSocket}=require("ws");
+Socket=require("socket.io");
+WebSocket=require("ws");
+
 
 
 // DBG
-console.log("Socket!!!!!!",Socket);
-console.log("WebSocket!!!!!!",WebSocket);
+console.log("Socket!!!!!!>>>>",Socket);
+console.log("WebSocket!!!!!!>>>>",WebSocket);
 
 
 // =================================================================================
@@ -5050,6 +5053,8 @@ if(typeof(fs)==="undefined"){
 // NODE ONLY SERVER / CLIENTS : 
 WebsocketImplementation={
 		
+		Socket:Socket,
+		Websocket:WebSocket,
 		
 		isNodeContext:true,
 		useSocketIOImplementation:false,
@@ -5083,8 +5088,10 @@ WebsocketImplementation={
 			// *********************************************************************************
 		
 			// DBG
-			console.log("11111 Socket:",JSON.stringify(Socket));
-			console.log("11111 WebSocket:",JSON.stringify(WebSocket));
+			console.log("11111 WebsocketImplementation.Socket:",WebsocketImplementation.Socket);
+			console.log("11111 WebsocketImplementation.WebSocket:",WebsocketImplementation.WebSocket);
+			console.log("11111 WebsocketImplementation.Socket:",JSON.stringify(WebsocketImplementation.Socket));
+			console.log("11111 WebsocketImplementation.WebSocket:",JSON.stringify(WebsocketImplementation.WebSocket));
 
 			
 			return WebsocketImplementation;
@@ -5104,17 +5111,17 @@ WebsocketImplementation={
 			// 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(">>>>>>>Socket:",JSON.stringify(Socket));
-				console.log(">>>>>>>WebSocket:",JSON.stringify(WebSocket));
+				console.log(">>>>>>>WebsocketImplementation.Socket:",JSON.stringify(WebsocketImplementation.Socket));
+				console.log(">>>>>>>WebsocketImplementation.WebSocket:",JSON.stringify(WebsocketImplementation.WebSocket));
 				
 				// NOW : socket.io :
 				// Loading socket.io
-				serverSocket=Socket.listen(listenableServer);
+				serverSocket=WebsocketImplementation.Socket.listen(listenableServer);
 				
 				// Setting up the disctonnect event :
 				serverSocket.on("endConnection",()=>{
@@ -5202,7 +5209,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;
 
 						    	
@@ -5226,7 +5233,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;
 
 
@@ -5403,7 +5410,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;
@@ -5412,17 +5419,17 @@ 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(Socket)!=="undefined"){
+				if(WebsocketImplementation.isNodeContext && typeof(WebsocketImplementation.Socket)!=="undefined"){
 				//		// Node client :
 				//		connectToServer=function (serverURL, port, isSecure, timeout=10000){
-				//			return Socket.connect(serverURL + ":" + port,{timeout: timeout});
+				//			return WebsocketImplementation.Socket.connect(serverURL + ":" + port,{timeout: timeout});
 				//		}
-					clientSocket=Socket.connect(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
+					clientSocket=WebsocketImplementation.Socket.connect(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
 				}
 			}
 
@@ -5482,7 +5489,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;
 
 
@@ -5559,7 +5566,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;
@@ -5569,7 +5576,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 :
@@ -5635,7 +5642,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.114",
+	"version": "0.0.117",
 	"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)",