aotrautils-srv 0.0.456 → 0.0.457

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (26/01/2023-23:48:18)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (27/01/2023-22:17:44)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4864,7 +4864,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (26/01/2023-23:48:18)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (27/01/2023-22:17:44)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5765,7 +5765,7 @@ WebsocketImplementation={
 					
 					receptionEntryPoints:[],
 					
-					receive:(channelNameParam, doOnIncomingMessage, clientsRoomsTag=null, receptionEntryPointId=null)=>{
+					receive:(channelNameParam, doOnIncomingMessage, clientsRoomsTag=null, receptionEntryPointId=null, listenerConfig={destroyListenerAfterReceiving:false})=>{
 
 
 						// DBG
@@ -5777,7 +5777,7 @@ WebsocketImplementation={
 								clientsRoomsTag:clientsRoomsTag,
 								// TODO : ADD TO ALL OTHER SUBSYSTEMS !
 								id:receptionEntryPointId,
-								
+								listenerConfig:listenerConfig,
 								execute:(eventOrMessage)=>{
 										
 									const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
@@ -5793,9 +5793,11 @@ WebsocketImplementation={
 									// Room information is stored in client socket object :
 									if(!WebsocketImplementation.isInRoom(clientSocket,clientsRoomsTag)) return;
 									
-									if(doOnIncomingMessage)	doOnIncomingMessage(dataWrapped.data, clientSocket);
-									
+									if(doOnIncomingMessage)
+										doOnIncomingMessage(dataWrapped.data, clientSocket);
 									
+									if(listenerConfig && listenerConfig.destroyListenerAfterReceiving)
+										remove(browserInstance.receptionEntryPoints,receptionEntryPoint);
 								}
 						};
 						
@@ -5803,6 +5805,8 @@ WebsocketImplementation={
 						if(!contains(browserInstance.receptionEntryPoints,(l)=>(l.id && receptionEntryPoint.id && l.id===receptionEntryPoint.id)))
 							browserInstance.receptionEntryPoints.push(receptionEntryPoint);
 						
+						// DBG
+						lognow("browserInstance.receptionEntryPoints("+browserInstance.receptionEntryPoints.length+"):",browserInstance.receptionEntryPoints);
 						
 						return browserInstance;
 					},
@@ -5820,18 +5824,32 @@ WebsocketImplementation={
 						// DBG
 						lognow(">>>>>>sendChainable("+channelNameParam+"):data:",data);
 						
+						// We add a message id :
+						const messageId=getUUID();
 						
+						data.messageId=messageId;
 						browserInstance.send(channelNameParam, data, clientsRoomsTag);
 						
 						const resultPromise={
 							clientsRoomsTag:clientsRoomsTag,
+							messageId:messageId,
 							thenWhenReceiveMessageType:(channelNameForResponse, listenerConfig={messageType:"",condition:()=>true}, doOnIncomingMessageForResponse)=>{
 								const listenerId=nonull(listenerConfig.messageType,"");
-								browserInstance.receive(channelNameForResponse, (data, clientSocket)=>{
+								
+								const self=this;
+								browserInstance.receive(channelNameForResponse, (dataLocal, clientSocket)=>{
+									
+									if(listenerConfig.condition && !listenerConfig.condition(dataLocal, clientSocket))	return ;
+									
+									// We check if we have the same message id:
+									if(self.messageId!==dataLocal.messageId){
+										// DBG
+										lognow("self.messageId:"+self.messageId+"|dataLocal.messageId"+dataLocal.messageId);
+										return;
+									}
 									
-									if(listenerConfig.condition && !listenerConfig.condition(data, clientSocket))	return ;
-									doOnIncomingMessageForResponse(data, clientSocket);
-								}, this.clientsRoomsTag, listenerId);
+									doOnIncomingMessageForResponse(dataLocal, clientSocket);
+								}, this.clientsRoomsTag, listenerId, {destroyListenerAfterReceiving:true});
 								return this;
 							}
 						};

aotrautils-srv/package.json

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