aotrautils-srv 0.0.511 → 0.0.513

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (05/03/2023-18:12:37)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (07/03/2023-01:07:38)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4866,7 +4866,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (05/03/2023-18:12:37)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (07/03/2023-01:07:38)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5106,7 +5106,7 @@ WebsocketImplementation={
 		
 		// COMMON METHODS
 		/*private static*/isInRoom(clientSocket, clientsRoomsTag){
-			return !clientsRoomsTag || empty(clientsRoomsTag) || contains(clientsRoomsTag, clientSocket.clientRoomTag);
+			return (!clientsRoomsTag || empty(clientsRoomsTag) || contains(clientsRoomsTag, clientSocket.clientRoomTag));
 		},
 		
 		
@@ -5426,6 +5426,7 @@ WebsocketImplementation={
 							
 							// DBG
 							lognow("DEBUG : Starting ping-pong with client : clientSocket.clientId:",clientSocket.clientId);
+							lognow("DEBUG : WebsocketImplementation.useSocketIOImplementation:",WebsocketImplementation.useSocketIOImplementation);
 							lognow("DEBUG : clientSocket.readyState:",clientSocket.readyState);
 							
 							
@@ -5461,13 +5462,13 @@ WebsocketImplementation={
 							    
 							    clientSocket.isConnectionAlive=false;
 								
-									// DBG
-									//lognow("(SERVER) SENDING PING");
+//									// DBG
+//									lognow("(SERVER) DEBUG : SENDING PING");
 								
 									if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.ping();
 									// OLD :
 //								else																										clientSocket.emit("ping");
-									else 																										nodeServerInstance.send("protocol",{type:"ping"});
+									else 																										nodeServerInstance.send("protocol",{type:"ping"}, null, clientSocket);
 
 							    
 							}, nodeServerInstance.clientPingIntervalMillis);
@@ -5733,7 +5734,7 @@ WebsocketImplementation={
 						lognow("DEBUG : CLIENT : nodeClientInstance.clientSocket.on(connect)");
 
 						
-						// Node client ping handling :
+						// Node client ping handling :  (SocketIO implementation only)
 						if(WebsocketImplementation.useSocketIOImplementation){
 							nodeClientInstance.receive("protocol",(message)=>{
 								if(message.type!=="ping")	return;
@@ -5855,10 +5856,9 @@ WebsocketImplementation={
 						
 						// We add a message id :
 						const messageId=getUUID();
-						
 						data.messageId=messageId;
-						browserInstance.send(channelNameParam, data, clientsRoomsTag);
 						
+						// 1) We prepare the reception :
 						const resultPromise={
 							clientsRoomsTag:clientsRoomsTag,
 							messageId:messageId,
@@ -5867,6 +5867,8 @@ WebsocketImplementation={
 								
 								browserInstance.receive(channelNameForResponse, (dataLocal, clientSocket)=>{
 									
+									
+									// We check if the message matches the condition :
 									if(listenerConfig.condition && !listenerConfig.condition(dataLocal, clientSocket))	return ;
 									
 									// We check if we have the same message id:
@@ -5881,6 +5883,9 @@ WebsocketImplementation={
 								return resultPromise;
 							}
 						};
+
+						// 2) We send the data :
+						browserInstance.send(channelNameParam, data, clientsRoomsTag);
 						
 
 						return resultPromise;
@@ -5972,7 +5977,7 @@ WebsocketImplementation={
 						
 						
 						
-						// Browser client ping handling :
+						// Browser client ping handling : (SocketIO implementation only)
 						if(WebsocketImplementation.useSocketIOImplementation){
 							browserInstance.receive("protocol",(message)=>{
 								if(message.type!=="ping")	return;
@@ -5991,16 +5996,6 @@ WebsocketImplementation={
 			
 			
 			
-			if(WebsocketImplementation.useSocketIOImplementation){
-				browserInstance.receive("protocol",(message)=>{
-					if(message.type!=="ping")	return;
-					browserInstance.send("protocol",{type:"pong"});
-					
-					// DBG
-					lognow("DEBUG : CLIENT : Pong sent.");
-				});
-			}
-			
 			
 			return browserInstance;
 		},

aotrautils-srv/package.json

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