aotrautils-srv 0.0.73 → 0.0.76

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:14:34)»*/
+/*utils SERVER library associated with aotra version : «1.0.0.000 (13/07/2022-02:25:54)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -229,15 +229,16 @@ WebsocketImplementation={
 				// 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"){
+				const globalContext=(WebsocketImplementation.isNodeContext?global:window);
+				if(typeof(globalContext.socketIO)==="undefined"){
 					// TRACE
 					lognow("«socket.io» SERVER library not called yet, calling it now.");
-					socketIO=require("socket.io");
+					globalContext.socketIO=require("socket.io");
 					// TRACE
-					lognow("«socket.io» SERVER library called.");
+					lognow("«socket.io» SERVER library called:",globalContext.socketIO);
 
 				}
-				if(typeof(socketIO)==="undefined"){
+				if(typeof(globalContext.socketIO)==="undefined"){
 					// Exception
 					throw "ERROR : «socket.io» SERVER library not found. Cannot launch nodejs server. Aborting.";
 				}
@@ -285,13 +286,14 @@ WebsocketImplementation={
 				serverSocket=new WebSocket.Server({ "server":listenableServer });
 			}else{
 				
-				
+				const globalContext=(WebsocketImplementation.isNodeContext?global:window);
+
 				// DBG
-				console.log(">>>>>>>socketIO:",JSON.stringify(socketIO));
+				console.log(">>>>>>>socketIO:",JSON.stringify(globalContext.socketIO));
 				
 				// NOW : socket.io :
 				// Loading socket.io
-				serverSocket=socketIO.listen(listenableServer);
+				serverSocket=globalContext.socketIO.listen(listenableServer);
 				
 				// Setting up the disctonnect event :
 				serverSocket.on("endConnection",()=>{
@@ -593,12 +595,15 @@ WebsocketImplementation={
 			}else{
 				// NOW : socket.io :
 				//client on server-side:
-				if(WebsocketImplementation.isNodeContext && typeof(socketIO)!=="undefined"){
+				
+				const globalContext=(WebsocketImplementation.isNodeContext?global:window);
+				
+				if(WebsocketImplementation.isNodeContext && typeof(globalContext.socketIO)!=="undefined"){
 				//		// Node client :
 				//		connectToServer=function (serverURL, port, isSecure, timeout=10000){
 				//			return socketIO.connect(serverURL + ":" + port,{timeout: timeout});
 				//		}
-					clientSocket=socketIO.connect(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
+					clientSocket=globalContext.socketIO.connect(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
 				}
 			}
 
@@ -1317,7 +1322,7 @@ function getListManager(config){
 
 
 
-/*utils COMMONS library associated with aotra version : «1.0.0.000 (13/07/2022-02:14:34)»*/
+/*utils COMMONS library associated with aotra version : «1.0.0.000 (13/07/2022-02:25:54)»*/
 /*-----------------------------------------------------------------------------*/
 
 

aotrautils-srv/package.json

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