aotrautils-srv 0.0.1494 → 0.0.1495

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (28/04/2025-10:57:01)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (29/04/2025-00:11:03)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4894,7 +4894,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 	
 
-/*utils AI library associated with aotra version : «1_29072022-2359 (28/04/2025-10:57:01)»*/
+/*utils AI library associated with aotra version : «1_29072022-2359 (29/04/2025-00:11:03)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5040,7 +5040,7 @@ getOpenAIAPIClient=(modelName, apiURL, agentRole, defaultPrompt)=>{
 
 
 
-/*utils CONSOLE library associated with aotra version : «1_29072022-2359 (28/04/2025-10:57:01)»*/
+/*utils CONSOLE library associated with aotra version : «1_29072022-2359 (29/04/2025-00:11:03)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -7186,7 +7186,14 @@ class NodeServerInstance{
 			this.listenableServer.close(doOnCloseServer);
 		});
 	}
-					
+
+
+
+	// TODO : DEVELOP...				
+	//sendChainable(channelNameParam, data, clientsRoomsTag=null){
+	//}
+
+
 	receive(channelNameParam, doOnIncomingMessage, clientsRoomsTag=null){
 		const self=this;
 			
@@ -7194,8 +7201,6 @@ class NodeServerInstance{
 		lognow("(SERVER) Registering receive for «"+channelNameParam+"»...");
 		
 		const serverReceptionEntryPoint=new ServerReceptionEntryPoint(channelNameParam, clientsRoomsTag, doOnIncomingMessage);
-		
-		///!!!
 		this.serverReceptionEntryPoints.push(serverReceptionEntryPoint);
 		
 		// SPECIAL FOR THE SOCKETIO IMPLEMENTATION :
@@ -7209,11 +7214,6 @@ class NodeServerInstance{
 		return this;
 	}
 	
-	
-	// TODO : DEVELOP...				
-	//sendChainable(channelNameParam, data, clientsRoomsTag=null){
-	//}
-
 
 	send(channelName, data, clientsRoomsTag=null, clientSocketParam=null){
 						
@@ -7446,11 +7446,11 @@ class ClientReceptionEntryPoint{
 		this.doOnIncomingMessage=doOnIncomingMessage;
 	}
 	
+	// III-
 	execute(eventOrMessage, clientSocket, clientReceptionEntryPoints){
 		
 		const channelName=this.channelName;
 
-		
 		const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
 		
 		// Channel information is stored in exchanged data :
@@ -7459,17 +7459,31 @@ class ClientReceptionEntryPoint{
 		// Room information is stored in client socket object :
 		if(!WebsocketImplementation.isInRoom(clientSocket, this.clientsRoomsTag)) return;
 		
-		
 		if(		this.listenerConfig && this.listenerConfig.messageType && dataWrapped.type
 			 && this.listenerConfig.messageType===dataWrapped.type)	return;
 		
+		const dataLocal=dataWrapped.data;
+		
+		// We check if the message matches the condition :
+		if(this.listenerConfig.condition && !lthis.istenerConfig.condition(dataLocal, clientSocket))	return ;
+		
+		const messageIdLocal=this.listenerConfig.messageId;
+		// We check if we have the same message id:
+		if(messageIdLocal!==dataLocal.messageId){
+			// DBG
+			lognow("DEBUG : Message ignored : messageId:"+messageIdParam+"|dataLocal.messageId"+dataLocal.messageId);
+			return;
+		}
+
+		// --------------------------------
+		
 		// We remove one-time usage listeners :
 		// We remove BEFORE executing doOnIncomingMessage(), because in this reception entry point function we can have other listener registration UNDER THE SAME ID !
 		if(this.listenerConfig && this.listenerConfig.destroyListenerAfterReceiving)
 			remove(this, clientReceptionEntryPoints);
 		
 		if(this.doOnIncomingMessage)
-			this.doOnIncomingMessage(dataWrapped.data, clientSocket, this.listenerConfig.messageId);
+			this.doOnIncomingMessage(dataLocal, clientSocket);
 			
 	}
 	
@@ -7486,33 +7500,8 @@ class ClientInstance{
 		this.clientReceptionEntryPoints=[];
 		
 	}
-		
-	receive(channelNameParam, doOnIncomingMessage, clientsRoomsTag=null, entryPointId=null, listenerConfig={destroyListenerAfterReceiving:false}){
-		const self=this;
-		
-		// DBG
-		lognow("INFO : (CLIENT)  SETTING UP RECEIVE for :",channelNameParam);
-		
-		const clientReceptionEntryPoint=new ClientReceptionEntryPoint(channelNameParam, entryPointId, clientsRoomsTag, listenerConfig, doOnIncomingMessage);
-		if(!contains.filter((l)=>(
-					 l.entryPointId && clientReceptionEntryPoint.entryPointId 
-				&& l.entryPointId===clientReceptionEntryPoint.entryPointId
-			))(this.clientReceptionEntryPoints)){
-				
-			this.clientReceptionEntryPoints.push(clientReceptionEntryPoint);
-		}
-
-		const clientSocket=this.clientSocket;
-	  if(WebsocketImplementation.useSocketIOImplementation){
-			// FOR THE SOCKETIO IMPLEMENTATION :
-			clientSocket.on(channelNameParam, (eventOrMessage)=>{
-				clientReceptionEntryPoint.execute(eventOrMessage, clientSocket, this.clientReceptionEntryPoints);
-			});
-		}
-			
-		return this;
-	}
-
+	
+	
 	sendChainable(channelNameParam, data, clientsRoomsTag=null){
 		const self=this;
 		
@@ -7527,25 +7516,14 @@ class ClientInstance{
 		const resultPromise={
 			// CAUTION : CANNOT STORE ANYTHING IN THE resultPromise, FOR ASYNC CALLS MAKES ITS DATA INCONSISTENT IN TIME !
 			thenWhenReceiveMessageType:(channelNameForResponse, listenerConfig={messageType:"",condition:()=>true}, doOnIncomingMessageForResponse)=>{
+			
 				listenerConfig=nonull(listenerConfig,{messageType:"",condition:()=>true});
 				const listenerId=nonull(listenerConfig.messageType,"");
 				
+				// I-
 				//
-				self.receive(channelNameForResponse, (dataLocal, clientSocket, messageIdParam)=>{
-					
-					// We check if the message matches the condition :
-					if(listenerConfig.condition && !listenerConfig.condition(dataLocal, clientSocket))	return ;
-					
-					// We check if we have the same message id:
-					if(messageIdParam!==dataLocal.messageId){
-						// DBG
-						lognow("DEBUG : Message ignored : resultPromise.messageId:"+resultPromise.messageId+"|dataLocal.messageId"+dataLocal.messageId);
-						return;
-					}
-					
-					doOnIncomingMessageForResponse(dataLocal, clientSocket);
-
-				}, clientsRoomsTag, listenerId, {messageId:messageId, destroyListenerAfterReceiving:true});
+				self.receive(channelNameForResponse, doOnIncomingMessageForResponse
+				, clientsRoomsTag, listenerId, {messageId:messageId, destroyListenerAfterReceiving:true});
 				//
 				
 				return resultPromise;
@@ -7558,6 +7536,35 @@ class ClientInstance{
 
 		return resultPromise;
 	}
+	
+	// II-
+	receive(channelNameParam, doOnIncomingMessage, clientsRoomsTag=null, entryPointId=null, listenerConfig={destroyListenerAfterReceiving:false}){
+		const self=this;
+		
+		// DBG
+		lognow("INFO : (CLIENT)  SETTING UP RECEIVE for :",channelNameParam);
+		
+		const clientReceptionEntryPoint=new ClientReceptionEntryPoint(channelNameParam, entryPointId, clientsRoomsTag, listenerConfig, doOnIncomingMessage);
+		if(!contains.filter((l)=>(
+					 l.entryPointId && clientReceptionEntryPoint.entryPointId 
+				&& l.entryPointId===clientReceptionEntryPoint.entryPointId
+			))(this.clientReceptionEntryPoints)){
+				
+			this.clientReceptionEntryPoints.push(clientReceptionEntryPoint);
+		}
+
+		const clientSocket=this.clientSocket;
+	  if(WebsocketImplementation.useSocketIOImplementation){
+			// FOR THE SOCKETIO IMPLEMENTATION :
+			clientSocket.on(channelNameParam, (eventOrMessage)=>{
+				clientReceptionEntryPoint.execute(eventOrMessage, clientSocket, this.clientReceptionEntryPoints);
+			});
+		}
+			
+		return this;
+	}
+
+	
 		
 		
 	send(channelNameParam, data, clientsRoomsTag=null){

aotrautils-srv/package.json

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