aotrautils 0.0.340 → 0.0.342

aotrautils/aotrautils.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (04/12/2022-18:26:14)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (04/12/2022-18:51:53)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4827,7 +4827,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils CLIENT library associated with aotra version : «1_29072022-2359 (04/12/2022-18:26:14)»*/
+/*utils CLIENT library associated with aotra version : «1_29072022-2359 (04/12/2022-18:51:53)»*/
 /*-----------------------------------------------------------------------------*/
 /* ## Utility global methods in a browser (htmljs) client environment.
  *
@@ -11418,7 +11418,6 @@ initClient=function(isNodeContext=true, useSocketIOImplementation=/*DEBUG*/false
 //		if(doOnError && useSocketIOImplementation /*TODO : FIXME: FOR NOW, ONLY WORKS FOR SOCKET.IO IMPLEMENTATION !'*/){
 //			
 ////			// DBG
-////			lognow(">>> serverSocket.connected:"+serverSocket.connected);
 ////			lognow(">>> serverSocket:",serverSocket);
 //
 //
@@ -12949,7 +12948,7 @@ createOritaMicroClient=function(url, port, isNode=false){
 };
 
 
-/*utils GEOMETRY library associated with aotra version : «1_29072022-2359 (04/12/2022-18:26:14)»*/
+/*utils GEOMETRY library associated with aotra version : «1_29072022-2359 (04/12/2022-18:51:53)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -14177,7 +14176,7 @@ function rayVsUnitSphereClosestPoint(p, r) {
 // MUST REMAIN AT THE END OF THIS LIBRARY FILE !
 
 AOTRAUTILS_GEOMETRY_LIB_IS_LOADED=true;
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (04/12/2022-18:26:14)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (04/12/2022-18:51:53)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -14334,6 +14333,14 @@ if(typeof(fs)==="undefined"){
 //Networking management :
 //- WEBSOCKETS AND NODEJS :
 
+function isConnected(clientSocket){
+	if(!WebsocketImplementation.useSocketIOImplementation)	if(clientSocket.readyState===WebSocket.OPEN)	return true;
+	else																										if(clientSocket.connected)										return true;
+	return false;
+}
+
+
+
 // -Server :
 
 getServerParams=function(portParam=null,certPathParam=null,keyPathParam=null){
@@ -14624,10 +14631,8 @@ WebsocketImplementation={
 						    
 						    serverClients.forEach((clientSocket)=>{
 						    	
-				    				// TODO : FIXME : Use one single interface !
-									if(!WebsocketImplementation.useSocketIOImplementation)	if(clientSocket.readyState!==WebSocket.OPEN)	return;
-									else																										if(clientSocket.connected)	return;
-
+						    	
+									if(!isConnected(clientSocket))	return;
 						    	
 		
 									// Room information is stored in client socket object :
@@ -14878,7 +14883,7 @@ WebsocketImplementation={
 			}
 			
 			// DBG
-			lognow("DEBUG : CLIENT : clientSocket created:"+clientSocket.connected);
+			lognow("DEBUG : CLIENT : clientSocket created:");
 
 
 			// NODE CLIENT INSTANCE :
@@ -14929,10 +14934,8 @@ WebsocketImplementation={
 //			    // DBG
 //			    console.log("(NODE CLIENT) TRYING TO SEND : clientSocket.readyState:",clientSocket.readyState);
 
-						// TODO : FIXME : Use one single interface !
-						if(!WebsocketImplementation.useSocketIOImplementation)	if(clientSocket.readyState!==WebSocket.OPEN)	return;
-						else																										if(clientSocket.connected)	return;
-
+						if(!isConnected(clientSocket))	return;
+						
 
 						// Room information is stored in client socket object :
 						if(!WebsocketImplementation.isInRoom(clientSocket,clientsRoomsTag)) return;
@@ -15101,10 +15104,8 @@ WebsocketImplementation={
 //					// DBG
 //					console.log("(BROWSER) TRYING TO SEND : clientSocket.readyState:",clientSocket.readyState);
 
-						// TODO : FIXME : Use one single interface !
-						if(!WebsocketImplementation.useSocketIOImplementation)	if(clientSocket.readyState!==WebSocket.OPEN)	return;
-						else																										if(clientSocket.connected)	return;
-
+						if(!isConnected(clientSocket))	return;
+						
 						
 						// Room information is stored in client socket object :
 						if(!WebsocketImplementation.isInRoom(clientSocket,clientsRoomsTag)) return;

aotrautils/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "aotrautils",
-	"version": "0.0.340",
+	"version": "0.0.342",
 	"main": "aotrautils.build.js",
 	"description": "A library for vanilla javascript utils (client-side) used in aotra javascript CMS",
 	"author": "Jeremie Ratomposon <info@alqemia.com> (https://alqemia.com)",