aotrautils-srv 0.0.106 → 0.0.107

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1.0.0.000 (14/07/2022-00:12:59)»*/
+/*utils COMMONS library associated with aotra version : «1.0.0.000 (16/07/2022-13:58:40)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4828,7 +4828,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1.0.0.000 (14/07/2022-00:12:59)»*/
+/*utils SERVER library associated with aotra version : «1.0.0.000 (16/07/2022-13:58:40)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4862,46 +4862,18 @@ if(typeof(window)==="undefined")	window=global;
 // 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
+// https://socket.io/docs/v4/client-socket-instance/
 
+// 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
 
-
-
-//let socketIO;
-//let WebSocket;
-//				
-//if(typeof(socketIO)==="undefined"){
-//	// TRACE
-//	lognow("«socket.io» SERVER library not called yet, calling it now.");
-//	
-//	socketIO=require("socket.io");
-////	import { socketIO } from "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
-//	lognow("«ws» SERVER library not called yet, calling it now.");
-//}
-//if(typeof(WebSocket)==="undefined"){
-//	// TRACE
-//	lognow("ERROR : «ws» SERVER library not found. Cannot launch nodejs server. Aborting.");
-//}
-
-
+// We have to import both implementations, regardless of which one is chosen :
+const {Socket}=require("socket.io");
+const {WebSocket}=require("ws");
 
 
 
@@ -5093,10 +5065,6 @@ 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){
@@ -5110,18 +5078,12 @@ WebsocketImplementation={
 			}
 
 			// *********************************************************************************
-			
-			socketIO=require("socket.io");
-			WebSocket=require("ws");
-			
-			
 		
 			// DBG
-			console.log("IIIII socketIO:",JSON.stringify(socketIO));
+			console.log("IIIII Socket:",JSON.stringify(Socket));
 			console.log("IIIII WebSocket:",JSON.stringify(WebSocket));
 
 			
-			
 			return WebsocketImplementation;
 		},
 		
@@ -5144,13 +5106,12 @@ WebsocketImplementation={
 				
 
 				// DBG
-//				console.log(">>>>>>>require(socket.io):",JSON.stringify(require("socket.io")));
-				console.log(">>>>>>>socketIO:",JSON.stringify(socketIO));
+				console.log(">>>>>>>Socket:",JSON.stringify(Socket));
 				console.log(">>>>>>>WebSocket:",JSON.stringify(WebSocket));
 				
 				// NOW : socket.io :
 				// Loading socket.io
-				serverSocket=socketIO.listen(listenableServer);
+				serverSocket=Socket.listen(listenableServer);
 				
 				// Setting up the disctonnect event :
 				serverSocket.on("endConnection",()=>{
@@ -5453,13 +5414,12 @@ WebsocketImplementation={
 				// NOW : socket.io :
 				//client on server-side:
 				
-				
-				if(WebsocketImplementation.isNodeContext && typeof(socketIO)!=="undefined"){
+				if(WebsocketImplementation.isNodeContext && typeof(Socket)!=="undefined"){
 				//		// Node client :
 				//		connectToServer=function (serverURL, port, isSecure, timeout=10000){
-				//			return socketIO.connect(serverURL + ":" + port,{timeout: timeout});
+				//			return Socket.connect(serverURL + ":" + port,{timeout: timeout});
 				//		}
-					clientSocket=socketIO.connect(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
+					clientSocket=Socket.connect(serverURL + ":" + port,{timeout: timeout, secure: isSecure});
 				}
 			}
 

aotrautils-srv/package.json

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