aotrautils 0.0.326 → 0.0.328

aotrautils/aotrautils.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (04/12/2022-02:34:17)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (04/12/2022-13:37:53)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4827,7 +4827,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils CLIENT library associated with aotra version : «1_29072022-2359 (04/12/2022-02:34:17)»*/
+/*utils CLIENT library associated with aotra version : «1_29072022-2359 (04/12/2022-13:37:53)»*/
 /*-----------------------------------------------------------------------------*/
 /* ## Utility global methods in a browser (htmljs) client environment.
  *
@@ -12949,7 +12949,7 @@ createOritaMicroClient=function(url, port, isNode=false){
 };
 
 
-/*utils GEOMETRY library associated with aotra version : «1_29072022-2359 (04/12/2022-02:34:17)»*/
+/*utils GEOMETRY library associated with aotra version : «1_29072022-2359 (04/12/2022-13:37:53)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -14177,7 +14177,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-02:34:17)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (04/12/2022-13:37:53)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -14534,18 +14534,19 @@ WebsocketImplementation={
 					clientPingIntervalMillis:5000,
 //				clientsSockets:[],
 					serverSocket:serverSocket,
-					receptionEntryPoints:[],
+					receptionEntryPointsByClient:{},
 					
-					receive:(channelName, doOnIncomingMessage, clientsRoomsTag=null)=>{
+					receive:(channelNameParam, doOnIncomingMessage, clientsRoomsTag=null)=>{
 						
 						// DBG
-						lognow("(SERVER) Registering receive for «"+channelName+"»...",doOnIncomingMessage);
+						lognow("(SERVER) Registering receive for «"+channelNameParam+"»...",doOnIncomingMessage);
+						
 						
 						
 						const receptionEntryPoint={
-							channelName:channelName,
+							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 !
 								
@@ -14569,7 +14570,7 @@ WebsocketImplementation={
 								
 																
 								// DBG
-								lognow("(SERVER) ENTRY POINT IS OF THE RIGHT CHANNEL:", channelName);
+								lognow("(SERVER) ENTRY POINT IS OF THE RIGHT CHANNEL:", receptionEntryPoint.channelName);
 								
 								
 
@@ -14591,12 +14592,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;
 					},
@@ -14693,20 +14693,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);
 								});
 								
 							};
@@ -14731,7 +14729,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 !
@@ -14890,10 +14891,10 @@ WebsocketImplementation={
 			
 					receptionEntryPoints:[],
 					
-					receive:(channelName, doOnIncomingMessage, clientsRoomsTag=null)=>{
+					receive:(channelNameParam, doOnIncomingMessage, clientsRoomsTag=null)=>{
 						
 						const receptionEntryPoint={
-								channelName:channelName,
+								channelName:channelNameParam,
 								clientsRoomsTag:clientsRoomsTag, 
 								execute:(eventOrMessage)=>{
 										
@@ -14904,7 +14905,7 @@ WebsocketImplementation={
 									const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
 									
 									// Channel information is stored in exchanged data :
-									if(dataWrapped.channelName && dataWrapped.channelName!==channelName) return;
+									if(dataWrapped.channelName && dataWrapped.channelName!==channelNameParam) return;
 									
 									const clientSocket=nodeClientInstance.clientSocket;
 														
@@ -14924,7 +14925,7 @@ WebsocketImplementation={
 					},
 					
 					
-					send:(channelName, data, clientsRoomsTag=null)=>{
+					send:(channelNameParam, data, clientsRoomsTag=null)=>{
 						
 						const clientSocket=nodeClientInstance.clientSocket;
 						
@@ -14941,7 +14942,7 @@ WebsocketImplementation={
 						if(!WebsocketImplementation.isInRoom(clientSocket,clientsRoomsTag)) return;
 						
 						// Channel information is stored in exchanged data :
-						let dataWrapped={channelName:channelName, data:data};
+						let dataWrapped={channelName:channelNameParam, data:data};
 
 
 //					// DBG
@@ -14952,12 +14953,12 @@ WebsocketImplementation={
 	
 	
 //			            // DBG
-//			            console.log("(NODE CLIENT) SENDING DATA ! channelName:«"+channelName+"» ; clientsRoomsTag:«"+clientsRoomsTag+"»");
+//			            console.log("(NODE CLIENT) SENDING DATA ! channelNameParam:«"+channelNameParam+"» ; clientsRoomsTag:«"+clientsRoomsTag+"»");
 //			            console.log("(NODE CLIENT) SENDING DATA ! dataWrapped:",dataWrapped);
 	
 						// TODO : FIXME : Use one single interface !
 						if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.send(dataWrapped);
-		      	else																										clientSocket.emit(channelName,dataWrapped);
+		      	else																										clientSocket.emit(channelNameParam,dataWrapped);
 						
 						return nodeClientInstance;
 					},
@@ -14995,7 +14996,7 @@ WebsocketImplementation={
 							
 							const clientSocket=nodeClientInstance.clientSocket;
 							if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.addEventListener("message", doOnMessage);
-							else																										clientSocket.on(channelName, doOnMessage);
+							else																										clientSocket.on(channelNameParam, doOnMessage);
 
 							doOnConnection(nodeClientInstance, clientSocket);
 							
@@ -15061,10 +15062,10 @@ WebsocketImplementation={
 			const browserInstance={
 					clientSocket:clientSocket,
 					
-					receive:(channelName, doOnIncomingMessage, clientsRoomsTag=null)=>{
+					receive:(channelNameParam, doOnIncomingMessage, clientsRoomsTag=null)=>{
 
 						// DBG
-						lognow("INFO : (CLIENT-BROWSER)  SETTING UP RECEIVE for :",channelName);
+						lognow("INFO : (CLIENT-BROWSER)  SETTING UP RECEIVE for :",channelNameParam);
 						
 						
 						const doOnMessage=(eventOrMessage)=>{
@@ -15076,7 +15077,7 @@ WebsocketImplementation={
 							
 							
 							// Channel information is stored in exchanged data :
-							if(dataWrapped.channelName && dataWrapped.channelName!==channelName) return;
+							if(dataWrapped.channelName && dataWrapped.channelName!==channelNameParam) return;
 
 							const clientSocket=browserInstance.clientSocket;
 
@@ -15089,14 +15090,14 @@ WebsocketImplementation={
 					   
 					    
 					  if(!WebsocketImplementation.useSocketIOImplementation)	browserInstance.clientSocket.addEventListener("message", doOnMessage);
-						else																										browserInstance.clientSocket.on(channelName, doOnMessage);
+						else																										browserInstance.clientSocket.on(channelNameParam, doOnMessage);
 
 						
 						return browserInstance;
 					},
 					
 					
-					send:(channelName, data, clientsRoomsTag=null)=>{
+					send:(channelNameParam, data, clientsRoomsTag=null)=>{
 						
 						const clientSocket=browserInstance.clientSocket;
 			    	
@@ -15113,7 +15114,7 @@ WebsocketImplementation={
 						if(!WebsocketImplementation.isInRoom(clientSocket,clientsRoomsTag)) return;
 
 						// Channel information is stored in exchanged data :
-					  let dataWrapped={channelName:channelName, data:data};
+					  let dataWrapped={channelName:channelNameParam, data:data};
 		      	
 		      	
 				    // DBG
@@ -15126,7 +15127,7 @@ WebsocketImplementation={
 				   	
 		   			// TODO : FIXME : Use one single interface !
 						if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.send(dataWrapped);
-		      	else																										clientSocket.emit(channelName,dataWrapped);
+		      	else																										clientSocket.emit(channelNameParam,dataWrapped);
 
 						
 						return browserInstance;

aotrautils/package.json

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