aotrautils-srv 0.0.128 → 0.0.131

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1.0.0.000 (16/07/2022-16:04:32)»*/
+/*utils COMMONS library associated with aotra version : «1.0.0.000 (16/07/2022-16:48:44)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4828,7 +4828,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1.0.0.000 (16/07/2022-16:04:32)»*/
+/*utils SERVER library associated with aotra version : «1.0.0.000 (16/07/2022-16:48:44)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4872,10 +4872,8 @@ 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");
-Socket=require("socket.io");
-WebSocket=require("ws");
+//Socket=require("socket.io");
+//WebSocket=require("ws");
 
 
 
@@ -5066,21 +5064,46 @@ WebsocketImplementation={
 		getStatic:(isNodeContext=true, useSocketIOImplementation=false)=>{
 			
 			WebsocketImplementation.isNodeContext=isNodeContext;
-			
 			WebsocketImplementation.useSocketIOImplementation=useSocketIOImplementation;
 
 			if(WebsocketImplementation.useSocketIOImplementation){
 				// TRACE
 				lognow("INFO : (SERVER/CLIENT) Using socket.io websocket implementation.");	
+				
+				if(isNodeContext && typeof(Socket)==="undefined"){
+					// TRACE
+					console.log("«socket.io» 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.");
+					return WebsocketImplementation;
+				}
 
 			}else{
 				// TRACE
-				lognow("INFO : (SERVER/CLIENT) Using native websocket implementation.");	
+				lognow("INFO : (SERVER/CLIENT) Using native WebSocket implementation.");	
+				
+				// https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API/Writing_WebSocket_client_applications
+				if(isNodeContext && typeof(WebSocket)==="undefined"){
+					WebSocket=require("ws");
+					// TRACE
+					console.log("«ws» SERVER library not called yet, calling it now.");
+					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;
+				}		
 				
 			}
+		
 
 			// *********************************************************************************
-		
+			
 			
 			return WebsocketImplementation;
 		},
@@ -5296,7 +5319,10 @@ WebsocketImplementation={
 							    
 							    clientSocket.isAlive=false;
 							    try{
-							    	clientSocket.ping();
+								
+										if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.ping();
+										else																										clientSocket.emit("ping");
+							    	
 							    }catch(error){
 							    	lognow("ERROR : A problem occurred when tried to ping client socket : ",error);
 							    	// We effectively end the client connection to this server :
@@ -5315,9 +5341,16 @@ WebsocketImplementation={
 							    
 							    
 							}, nodeServerInstance.clientTimeoutMillis);
-							clientSocket.on("pong",()=>{
-								clientSocket.isAlive=true;
-							});
+							
+							if(!WebsocketImplementation.useSocketIOImplementation){
+								clientSocket.on("pong",()=>{
+									clientSocket.isAlive=true;
+								});
+							}else{
+								clientSocket.on("ping",()=>{
+									clientSocket.isAlive=true;
+								});
+							}
 							
 							
 							
@@ -5394,7 +5427,6 @@ WebsocketImplementation={
 		/*private*/connectToServerFromNode:(serverURL, port, isSecure, timeout)=>{
 			
 			
-			
 			// NEW : ws :
 			if(typeof(WebSocket)==="undefined"){
 				// TRACE
@@ -5417,7 +5449,8 @@ WebsocketImplementation={
 				//		}
 				
 //				OLD SYNTAX:	clientSocket=Socket.connect(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
-					clientSocket=Socket(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
+//				clientSocket=new Socket.Client???(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
+					clientSocket=io(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
 					
 				}
 			}
@@ -5576,7 +5609,9 @@ WebsocketImplementation={
 				//			}else{
 				//				// TRACE
 				//				console.log("ERROR : Could not initialize socket !");
-					clientSocket=io.connect(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
+					// OLD SYNTAX :clientSocket=io.connect(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.128",
+	"version": "0.0.131",
 	"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)",