aotrautils-srv 0.0.298 → 0.0.300

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (27/11/2022-22:57:04)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (01/12/2022-00:01:29)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4827,7 +4827,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (27/11/2022-22:57:04)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (01/12/2022-00:01:29)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5198,13 +5198,9 @@ WebsocketImplementation={
 						const receptionEntryPoint={
 							channelName:channelName,
 							clientsRoomsTag:clientsRoomsTag, 
-							execute:(clientSocketParam, eventOrMessage)=>{
+							execute:(eventOrMessage, clientSocketParam)=>{
 
-								
 							 // With «ws» library we have no choive than register message events inside a «connection» event !
-//						 nodeServerInstance.onConnectionToClient((serverParam, clientSocketParam)=>{
-	
-								
 								
 								// DBG
 								lognow("(SERVER) RECEIVED SOMETHING FROM CLIENT...", eventOrMessage.data);
@@ -5349,49 +5345,25 @@ WebsocketImplementation={
 							clientSocket.clientId=getUUID();
 
 
-//							// DBG
-//							console.log("nodeServerInstance.receptionEntryPoints.length:",nodeServerInstance.receptionEntryPoints.length);
-
-
+//						// DBG
+//						console.log("nodeServerInstance.receptionEntryPoints.length:",nodeServerInstance.receptionEntryPoints.length);
 
 
-							////
+							const doOnMessage=(eventOrMessage)=>{
 
-							doOnMessage=(eventOrMessage)=>{
-
-			
 								// 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, eventOrMessage);
+									receptionEntryPoint.execute(eventOrMessage, clientSocket);
 								});
 								
 							};
 
-
 		 					if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.addEventListener("message", doOnMessage);
 							else																										clientSocket.on(channelName, doOnMessage);
 								
-								
-
-
-
-
-
-
-
-
-							
-
-
 							doOnConnection(nodeServerInstance, clientSocket);
 							
 							
-							
-							
 							// DBG
 							lognow("DEBUG : Starting ping-pong with client : clientSocket.clientId:",clientSocket.clientId);
 							lognow("DEBUG : clientSocket.readyState:",clientSocket.readyState);
@@ -5564,31 +5536,24 @@ WebsocketImplementation={
 						const receptionEntryPoint={
 								channelName:channelName,
 								clientsRoomsTag:clientsRoomsTag, 
-								execute:(clientSocketParam)=>{
-									
-									const doOnMessage=(eventOrMessage)=>{
+								execute:(eventOrMessage)=>{
 										
-//									dataWrapped=JSON.parse(dataWrapped);
-//									dataWrapped=getAt(dataWrapped,0);// We get the root element
-//										const dataWrapped=(WebsocketImplementation.useFlatStrings?JSON.parse(eventOrMessage):eventOrMessage);
+//								dataWrapped=JSON.parse(dataWrapped);
+//								dataWrapped=getAt(dataWrapped,0);// We get the root element
+//								const dataWrapped=(WebsocketImplementation.useFlatStrings?JSON.parse(eventOrMessage):eventOrMessage);
 										
-										const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
-										
-										// Channel information is stored in exchanged data :
-										if(dataWrapped.channelName && dataWrapped.channelName!==channelName) return;
-										
-										let clientSocket=nodeClientInstance.clientSocket;
-										
-										// Room information is stored in client socket object :
-										if(!WebsocketImplementation.isInRoom(clientSocket,clientsRoomsTag)) return;
-										
-										doOnIncomingMessage(dataWrapped.data, clientSocket);
-										
-									};
+									const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
+									
+									// Channel information is stored in exchanged data :
+									if(dataWrapped.channelName && dataWrapped.channelName!==channelName) return;
+									
+									const clientSocket=nodeClientInstance.clientSocket;
+														
+									// Room information is stored in client socket object :
+									if(!WebsocketImplementation.isInRoom(clientSocket,clientsRoomsTag)) return;
+									
+									if(doOnIncomingMessage)	doOnIncomingMessage(dataWrapped.data, clientSocket);
 									
-									if(!WebsocketImplementation.useSocketIOImplementation)	nodeClientInstance.clientSocket.addEventListener("message", doOnMessage);
-									else																										nodeClientInstance.clientSocket.on(channelName, doOnMessage);
-
 									
 								}
 						};
@@ -5657,18 +5622,23 @@ WebsocketImplementation={
 							if(nodeClientInstance.hasConnectEventFired)	return;
 							nodeClientInstance.hasConnectEventFired=true;
 							
-							const clientSocket=nodeClientInstance.clientSocket;
-							
-							
 							// DBG
 							lognow("DEBUG : CLIENT : doOnConnection !");
 
-							doOnConnection(nodeClientInstance, clientSocket);
+							const doOnMessage=(eventOrMessage)=>{
+								
+								// We execute the listeners entry points registration :
+								foreach(nodeClientInstance.receptionEntryPoints,(receptionEntryPoint)=>{
+									receptionEntryPoint.execute(eventOrMessage);
+								});
+
+							};
 							
-							// We execute the listeners entry points registration :
-							foreach(nodeClientInstance.receptionEntryPoints,(receptionEntryPoint)=>{
-								receptionEntryPoint.execute(clientSocket);
-							});
+							const clientSocket=nodeClientInstance.clientSocket;
+							if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.addEventListener("message", doOnMessage);
+							else																										clientSocket.on(channelName, doOnMessage);
+
+							doOnConnection(nodeClientInstance, clientSocket);
 							
 							
 						};
@@ -5739,30 +5709,30 @@ WebsocketImplementation={
 						// DBG
 						lognow("INFO : (CLIENT-BROWSER)  SETTING UP RECEIVE for :",channelName);
 						
+						
 						const doOnMessage=(eventOrMessage)=>{
 							
-								
-								const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
-								
-								
-								// Channel information is stored in exchanged data :
-								if(dataWrapped.channelName && dataWrapped.channelName!==channelName) return;
-	
-								let clientSocket=browserInstance.clientSocket;
-	
-								// Room information is stored in client socket object :
-								if(!WebsocketImplementation.isInRoom(clientSocket,clientsRoomsTag)) return;
-	
-								doOnIncomingMessage(dataWrapped.data, clientSocket);
-					    	
-					    };
+							const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
+							
+							
+							// Channel information is stored in exchanged data :
+							if(dataWrapped.channelName && dataWrapped.channelName!==channelName) return;
+
+							const clientSocket=browserInstance.clientSocket;
+
+							// Room information is stored in client socket object :
+							if(!WebsocketImplementation.isInRoom(clientSocket, clientsRoomsTag)) return;
+
+							doOnIncomingMessage(dataWrapped.data, clientSocket);
+				    	
+				    };
 					   
 					    
-					   if(!WebsocketImplementation.useSocketIOImplementation)	browserInstance.clientSocket.addEventListener("message", doOnMessage);
-						 else																										browserInstance.clientSocket.on(channelName, doOnMessage);
+					  if(!WebsocketImplementation.useSocketIOImplementation)	browserInstance.clientSocket.addEventListener("message", doOnMessage);
+						else																										browserInstance.clientSocket.on(channelName, doOnMessage);
 
 						
-						 return browserInstance;
+						return browserInstance;
 					},
 					
 					
@@ -5821,7 +5791,6 @@ WebsocketImplementation={
 
 
 							doOnConnection(browserInstance, clientSocket);
-
 							
 						};
 						

aotrautils-srv/package.json

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