aotrautils-srv 0.0.289 → 0.0.291

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (27/11/2022-21:01:59)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (27/11/2022-22:11:00)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4827,7 +4827,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (27/11/2022-21:01:59)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (27/11/2022-22:11:00)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5191,6 +5191,10 @@ WebsocketImplementation={
 					
 					receive:(channelName, doOnIncomingMessage, clientsRoomsTag=null)=>{
 						
+						// DBG
+						lognow("(SERVER) Registering receive for «"+channelName+"»...",doOnIncomingMessage);
+						
+						
 						const receptionEntryPoint={
 							channelName:channelName,
 							clientsRoomsTag:clientsRoomsTag, 
@@ -5200,58 +5204,42 @@ WebsocketImplementation={
 							 // With «ws» library we have no choive than register message events inside a «connection» event !
 //						 nodeServerInstance.onConnectionToClient((serverParam, clientSocketParam)=>{
 	
-							 // TODO : Find a way to remove this !
-							 const doOnMessage=(eventOrMessage)=>{
-									
-									
-									// DBG
-									lognow("(SERVER) RECEIVED SOMETHING FROM CLIENT...");
-									
-	//							dataWrapped=JSON.parse(dataWrapped);
-	//							dataWrapped=getAt(dataWrapped,0);// We get the root element
-									
-	
-									const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
 								
 								
-									// DBG
-									lognow("(SERVER) dataWrapped.channelName:",dataWrapped.channelName);
-									lognow("(SERVER) receptionEntryPoint.channelName:",receptionEntryPoint.channelName);
-									
-	
-									// Channel information is stored in exchanged data :
-									if(dataWrapped.channelName!==receptionEntryPoint.channelName) return;
-									
-									
-									const clientSocket=clientSocketParam;
-									
-									
-	
-									// TODO : FIXME : Use one single interface !
-									// Room information is stored in client socket object :
-									const isClientInRoom=WebsocketImplementation.isInRoom(clientSocket, receptionEntryPoint.clientsRoomsTag);
-									
-									// DBG
-									lognow("(SERVER) isClientInRoom:",isClientInRoom);
-									
-									if(!isClientInRoom) return;
-
-									// DBG
-									lognow("(SERVER) doOnIncomingMessage:",doOnIncomingMessage);
-									
-									doOnIncomingMessage(dataWrapped.data, clientSocket);
-									
-						   };
-
+								// DBG
+								lognow("(SERVER) RECEIVED SOMETHING FROM CLIENT...");
+								
+//							dataWrapped=JSON.parse(dataWrapped);
+//							dataWrapped=getAt(dataWrapped,0);// We get the root element
+								
 
+								const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
 							
-							 
+							
+								// DBG
+								lognow("(SERVER) dataWrapped.channelName:",dataWrapped.channelName);
+								lognow("(SERVER) receptionEntryPoint.channelName:",receptionEntryPoint.channelName);
+								
 
-							 if(!WebsocketImplementation.useSocketIOImplementation)	clientSocketParam.addEventListener("message", doOnMessage);
-							 else																										clientSocketParam.on(channelName, doOnMessage);
+								// Channel information is stored in exchanged data :
+								if(dataWrapped.channelName!==receptionEntryPoint.channelName) return;
+								
 								
+								const clientSocket=clientSocketParam;
 								
 
+								// TODO : FIXME : Use one single interface !
+								// Room information is stored in client socket object :
+								const isClientInRoom=WebsocketImplementation.isInRoom(clientSocket, receptionEntryPoint.clientsRoomsTag);
+								
+								// DBG
+								lognow("(SERVER) isClientInRoom:",isClientInRoom);
+								
+								if(!isClientInRoom) return;
+
+								// DBG
+								lognow("(SERVER) doOnIncomingMessage:",doOnIncomingMessage);
+								if(doOnIncomingMessage)	doOnIncomingMessage(dataWrapped.data, clientSocket);
 
 								
 							},
@@ -5354,15 +5342,38 @@ WebsocketImplementation={
 //							console.log("nodeServerInstance.receptionEntryPoints.length:",nodeServerInstance.receptionEntryPoints.length);
 
 
-		
-							// We execute the events registration listeners entry points:
-							foreach(nodeServerInstance.receptionEntryPoints,(receptionEntryPoint,i)=>{
-							
-//								// DBG
-//								console.log("ENTRY POINT ["+i+"] !");
-							
-								receptionEntryPoint.execute(clientSocket);
-							});
+
+
+							////
+
+							doOnMessage=()=>{
+								
+
+			
+								// We execute the events registration listeners entry points:
+								foreach(nodeServerInstance.receptionEntryPoints,(receptionEntryPoint,i)=>{
+								
+									// DBG
+									console.log("(SERVER) ENTRY POINT ["+i+"] is executed !");
+								
+									receptionEntryPoint.execute(clientSocket);
+								});
+								
+							};
+
+
+		 					if(!WebsocketImplementation.useSocketIOImplementation)	clientSocketParam.addEventListener("message", doOnMessage);
+							else																										clientSocketParam.on(channelName, doOnMessage);
+								
+								
+
+
+
+
+
+
+
+
 							
 
 

aotrautils-srv/package.json

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