aotrautils-srv 0.0.323 → 0.0.324

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (04/12/2022-02:54:45)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (04/12/2022-13:37:57)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4827,7 +4827,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (04/12/2022-02:54:45)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (04/12/2022-13:37:57)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5184,7 +5184,7 @@ WebsocketImplementation={
 					clientPingIntervalMillis:5000,
 //				clientsSockets:[],
 					serverSocket:serverSocket,
-					receptionEntryPoints:[],
+					receptionEntryPointsByClient:{},
 					
 					receive:(channelNameParam, doOnIncomingMessage, clientsRoomsTag=null)=>{
 						
@@ -5192,10 +5192,11 @@ WebsocketImplementation={
 						lognow("(SERVER) Registering receive for «"+channelNameParam+"»...",doOnIncomingMessage);
 						
 						
+						
 						const receptionEntryPoint={
 							channelName:channelNameParam,
 							clientsRoomsTag:clientsRoomsTag, 
-							execute:(eventOrMessage, clientSocketParam)=>{
+							execute:(eventOrMessage, clientSocketParam, clientId)=>{
 
 							 // With «ws» library we have no choive than register message events inside a «connection» event !
 								
@@ -5241,12 +5242,11 @@ WebsocketImplementation={
 						};
 						
 						
-						nodeServerInstance.receptionEntryPoints.push(receptionEntryPoint);
+						if(!nodeServerInstance.receptionEntryPointsByClient[clientId])
+							nodeServerInstance.receptionEntryPointsByClient[clientId]=[];
+						nodeServerInstance.receptionEntryPointsByClient[clientId].push(receptionEntryPoint);
 						
 						
-//					// DBG
-//					console.log("ADD RECEPTION ENTRY POINT channelName:«"+channelName+"»! nodeServerInstance.receptionEntryPoints.length:",nodeServerInstance.receptionEntryPoints.length);
-						
 						
 						return nodeServerInstance;
 					},
@@ -5343,20 +5343,18 @@ WebsocketImplementation={
 //						if(contains(nodeServerInstance.clientsSockets, clientSocket))	return;
 //						nodeServerInstance.clientsSockets.push(clientSocket);
 
+							const clientId=getUUID();
+							clientSocket.clientId=clientId;
 
-							// DBG
-							clientSocket.clientId=getUUID();
-
-
-//						// DBG
-//						console.log("nodeServerInstance.receptionEntryPoints.length:",nodeServerInstance.receptionEntryPoints.length);
 
 
 							const doOnMessage=(eventOrMessage)=>{
 
 								// We execute the events registration listeners entry points:
-								foreach(nodeServerInstance.receptionEntryPoints,(receptionEntryPoint,i)=>{
-									receptionEntryPoint.execute(eventOrMessage, clientSocket);
+								if(!nodeServerInstance.receptionEntryPointsByClient[clientId])
+									return;
+								foreach(nodeServerInstance.receptionEntryPointsByClient[clientId],(receptionEntryPoint,i)=>{
+									receptionEntryPoint.execute(eventOrMessage, clientSocket, clientId);
 								});
 								
 							};
@@ -5381,7 +5379,10 @@ WebsocketImplementation={
 			    				 	
 			    				 	
 			    				 	// On today, this method is named as same for the two implementations :
+			    				 	// TRACE
+			    				 	lognow("(SERVER) Removing all listeners and receptjion entrypoints for client socket «"+clientSocket.clientId+"».");
 			    				 	clientSocket.removeAllListeners();
+			    				 	nodeServerInstance.receptionEntryPointsByClient[clientSocket.clientId]=[];
 			    				 	
 			    				 	
 	    				 			// TODO : FIXME : Use one single interface !

aotrautils-srv/package.json

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