aotrautils-srv 0.0.76 → 0.0.77

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils SERVER library associated with aotra version : «1.0.0.000 (13/07/2022-02:25:54)»*/
+/*utils SERVER library associated with aotra version : «1.0.0.000 (13/07/2022-09:28:37)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -30,6 +30,45 @@ if(typeof(window)==="undefined")	window=global;
 
 
 
+// OLD : socket.io :
+// https://stackoverflow.com/questions/31156884/how-to-use-https-on-node-js-using-express-socket-io
+// https://stackoverflow.com/questions/6599470/node-js-socket-io-with-ssl
+// https://nodejs.org/api/https.html#https_https_createserver_options_requestlistener
+
+if(typeof(socketIO)==="undefined"){
+	// TRACE
+	lognow("«socket.io» SERVER library not called yet, calling it now.");
+	socketIO=require("socket.io");
+	// TRACE
+	lognow("«socket.io» SERVER library called:",socketIO);
+
+}
+if(typeof(socketIO)==="undefined"){
+	// Exception
+	lognow("ERROR : «socket.io» SERVER library not found. Cannot launch nodejs server. Aborting.");
+}
+
+// NEW : ws :
+// https://github.com/websockets/ws#installing
+// https://github.com/websockets/ws/blob/master/doc/ws.md#event-message
+// ON BROWSER SIDE : Native Websockets :
+// https://developer.mozilla.org/en-US/docs/Web/API/WebSocket
+// https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API/Writing_WebSocket_client_applications
+if(typeof(WebSocket)==="undefined"){
+	WebSocket=require("ws");
+	// TRACE
+	console.log("«ws» SERVER library not called yet, calling it now.");
+}
+if(typeof(WebSocket)==="undefined"){
+	// TRACE
+	console.log("ERROR : «ws» SERVER library not found. Cannot launch nodejs server. Aborting.");
+}
+
+
+
+
+
+
 // =================================================================================
 // NODEJS UTILS
 
@@ -216,32 +255,16 @@ WebsocketImplementation={
 			
 			WebsocketImplementation.isNodeContext=isNodeContext;
 			
+			//const globalContext=(WebsocketImplementation.isNodeContext?global:window);
+
+
 			// cf. https://socket.io/docs/v4/client-socket-instance/
 			WebsocketImplementation.useSocketIOImplementation=useSocketIOImplementation;
 
 			if(WebsocketImplementation.useSocketIOImplementation){
-
 				// TRACE
 				lognow("INFO : (SERVER/CLIENT) Using socket.io websocket implementation.");	
 
-				// OLD : socket.io :
-				// https://stackoverflow.com/questions/31156884/how-to-use-https-on-node-js-using-express-socket-io
-				// https://stackoverflow.com/questions/6599470/node-js-socket-io-with-ssl
-				// https://nodejs.org/api/https.html#https_https_createserver_options_requestlistener
-				
-				const globalContext=(WebsocketImplementation.isNodeContext?global:window);
-				if(typeof(globalContext.socketIO)==="undefined"){
-					// TRACE
-					lognow("«socket.io» SERVER library not called yet, calling it now.");
-					globalContext.socketIO=require("socket.io");
-					// TRACE
-					lognow("«socket.io» SERVER library called:",globalContext.socketIO);
-
-				}
-				if(typeof(globalContext.socketIO)==="undefined"){
-					// Exception
-					throw "ERROR : «socket.io» SERVER library not found. Cannot launch nodejs server. Aborting.";
-				}
 			}else{
 				// TRACE
 				lognow("INFO : (SERVER/CLIENT) Using native websocket implementation.");	
@@ -250,23 +273,7 @@ WebsocketImplementation={
 
 			// *********************************************************************************
 			
-			// NEW : ws :
-			// https://github.com/websockets/ws#installing
-			// https://github.com/websockets/ws/blob/master/doc/ws.md#event-message
-			// ON BROWSER SIDE : Native Websockets :
-			// https://developer.mozilla.org/en-US/docs/Web/API/WebSocket
-			// https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API/Writing_WebSocket_client_applications
-			if(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» SERVER library not found. Cannot launch nodejs server. Aborting.");
-				return null;
-			}
+			
 			
 			return WebsocketImplementation;
 		},
@@ -286,14 +293,13 @@ WebsocketImplementation={
 				serverSocket=new WebSocket.Server({ "server":listenableServer });
 			}else{
 				
-				const globalContext=(WebsocketImplementation.isNodeContext?global:window);
 
 				// DBG
-				console.log(">>>>>>>socketIO:",JSON.stringify(globalContext.socketIO));
+				console.log(">>>>>>>socketIO:",JSON.stringify(socketIO));
 				
 				// NOW : socket.io :
 				// Loading socket.io
-				serverSocket=globalContext.socketIO.listen(listenableServer);
+				serverSocket=socketIO.listen(listenableServer);
 				
 				// Setting up the disctonnect event :
 				serverSocket.on("endConnection",()=>{
@@ -596,14 +602,13 @@ WebsocketImplementation={
 				// NOW : socket.io :
 				//client on server-side:
 				
-				const globalContext=(WebsocketImplementation.isNodeContext?global:window);
 				
-				if(WebsocketImplementation.isNodeContext && typeof(globalContext.socketIO)!=="undefined"){
+				if(WebsocketImplementation.isNodeContext && typeof(socketIO)!=="undefined"){
 				//		// Node client :
 				//		connectToServer=function (serverURL, port, isSecure, timeout=10000){
 				//			return socketIO.connect(serverURL + ":" + port,{timeout: timeout});
 				//		}
-					clientSocket=globalContext.socketIO.connect(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
+					clientSocket=socketIO.connect(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
 				}
 			}
 
@@ -1322,7 +1327,7 @@ function getListManager(config){
 
 
 
-/*utils COMMONS library associated with aotra version : «1.0.0.000 (13/07/2022-02:25:54)»*/
+/*utils COMMONS library associated with aotra version : «1.0.0.000 (13/07/2022-09:28:37)»*/
 /*-----------------------------------------------------------------------------*/
 
 

aotrautils-srv/package.json

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