aotrautils-srv 0.0.126 → 0.0.129

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:00:17)»*/
+/*utils COMMONS library associated with aotra version : «1.0.0.000 (16/07/2022-16:26:34)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4828,7 +4828,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1.0.0.000 (16/07/2022-16:00:17)»*/
+/*utils SERVER library associated with aotra version : «1.0.0.000 (16/07/2022-16:26:34)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4872,17 +4872,11 @@ 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");
 
 
 
-// DBG
-console.log("Socket!!!!!!>>>>",Socket);
-console.log("WebSocket!!!!!!>>>>",WebSocket);
-
 
 // =================================================================================
 // NODEJS UTILS
@@ -5052,10 +5046,8 @@ if(typeof(fs)==="undefined"){
 
 // NODE ONLY SERVER / CLIENTS : 
 WebsocketImplementation={
-		
-//	Socket:Socket,
-//	WebSocket:WebSocket,
-		
+
+
 		isNodeContext:true,
 		useSocketIOImplementation:false,
 		useFlatStrings:false,
@@ -5072,32 +5064,52 @@ 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;
+				}		
 				
 			}
+		
 
 			// *********************************************************************************
-		
-			// DBG
-			console.log("11111 Socket:",Socket);
-			console.log("11111 WebSocket:",WebSocket);
 			
-
 			
 			return WebsocketImplementation;
 		},
 		
 		
-		getServer:(listenableServer, port)=>{
+		getServer:(listenableServer)=>{
 			
 			if(!WebsocketImplementation.isNodeContext){
 				// TRACE
@@ -5113,10 +5125,6 @@ WebsocketImplementation={
 				serverSocket=new WebSocket.Server({ "server":listenableServer });
 			}else{
 				
-
-				// DBG
-				console.log(">>>>>>>Socket:",Socket);
-				console.log(">>>>>>>WebSocket:",WebSocket);
 				
 				// NOW : socket.io :
 				// Loading socket.io
@@ -5128,8 +5136,6 @@ WebsocketImplementation={
 					serverSocket.disconnect();
 				});
 				
-//				////
-				serverSocket.listen(port);
 				
 			}
 
@@ -5593,7 +5599,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=Socket(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
+					
 			}
 			
 			
@@ -5796,12 +5804,12 @@ launchNodeHTTPServer=function(port, doOnConnect=null, doOnFinalizeServer=null, /
 	
 	let listenableServer;
 	if(sslOptions){
-		let httpsServer=https.createServer(sslOptions, handler);		// OLD : .listen(port);
+		let httpsServer=https.createServer(sslOptions, handler).listen(port);
 		// TRACE
 		console.log("INFO : SERVER : HTTPS Server launched and listening on port " + port + "!");
 		listenableServer=httpsServer;
 	}else{
-		let httpServer=http.createServer(handler);//		OLD : .listen(port);
+		let httpServer=http.createServer(handler).listen(port);
 		// TRACE
 		console.log("INFO : SERVER : HTTP Server launched and listening on port " + port + "!");
 		listenableServer=httpServer;

aotrautils-srv/package.json

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