aotrautils-srv 0.0.435 → 0.0.436

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (22/01/2023-20:08:43)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (23/01/2023-21:41:10)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -2858,32 +2858,40 @@ window.contains=function(container, objectToFind,/*OPTIONAL*/useRegexp=false,sea
 		// console.log("WARN : Container is empty ! Cannot search for «"+objectToFind+"».");
 		return false;
 	}
-	if(isArray(container)){
-		// for (var i=0; i<container.length; i++){
-		// if(container[i] === objectToFind) return true;
-		// }
-		// return false;
-		return container.indexOf(objectToFind) >= 0;
-	} else if((container instanceof Object) && (typeof container !== "string")){
-		for (key in container){
-			if(!container.hasOwnProperty(key))		continue;
-			if(!searchInKeysOnly){
-				if(container[key] === objectToFind)
-					return true;
-			}else{
-				if(key === (typeof(objectToFind)!=="string"?(""+objectToFind):objectToFind)) // CAUTION : Associative arrays keys are always strings !
-					return true;
+	if(!isString(container) && objectToFind && isFunction(objectToFind)){
+		return !!foreach(container, (item, keyOrIndex)=>{
+			if(objectToFind(item, keyOrIndex))	return true;
+		});
+	}else{
+		// Note : We also allow the search of null plain items in a container !
+		
+		if(isArray(container)){
+			// for (var i=0; i<container.length; i++){
+			// if(container[i] === objectToFind) return true;
+			// }
+			// return false;
+			return container.indexOf(objectToFind) >= 0;
+		} else if((container instanceof Object) && (typeof container !== "string")){
+			for (key in container){
+				if(!container.hasOwnProperty(key))		continue;
+				if(!searchInKeysOnly){
+					if(container[key] === objectToFind)
+						return true;
+				}else{
+					if(key === (typeof(objectToFind)!=="string"?(""+objectToFind):objectToFind)) // CAUTION : Associative arrays keys are always strings !
+						return true;
+				}
 			}
+			return false;
 		}
-		return false;
+		
+		// Container is a string case :
+		var str=container;
+		var chunk=objectToFind;
+		if(!useRegexp)
+			return str.indexOf(chunk) !== -1;
+		return new RegExp(chunk, "gm").test(str);
 	}
-	
-	// Container is a string case :
-	var str=container;
-	var chunk=objectToFind;
-	if(!useRegexp)
-		return str.indexOf(chunk) !== -1;
-	return new RegExp(chunk, "gm").test(str);
 };
 
 window.hasKey=function(container, keyToFind){
@@ -4856,7 +4864,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (22/01/2023-20:08:43)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (23/01/2023-21:41:10)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5608,6 +5616,11 @@ WebsocketImplementation={
 					
 					send:(channelNameParam, data, clientsRoomsTag=null)=>{
 						
+						// DBG
+						lognow("(CLIENT) (NODEJS) CLIENT TRIES TO SEND !");
+						
+						
+						
 						const clientSocket=nodeClientInstance.clientSocket;
 						
 						
@@ -5662,7 +5675,7 @@ WebsocketImplementation={
 							nodeClientInstance.hasConnectEventFired=true;
 							
 							// DBG
-							lognow("DEBUG : CLIENT : doOnConnection !");
+							lognow("DEBUG : CLIENT (NODEJS) : doOnConnection !");
 
 							const doOnMessage=(eventOrMessage)=>{
 								
@@ -5679,7 +5692,6 @@ WebsocketImplementation={
 
 							doOnConnection(nodeClientInstance, clientSocket);
 							
-							
 						};
 						
 
@@ -5741,43 +5753,84 @@ WebsocketImplementation={
 			const browserInstance={
 					clientSocket:clientSocket,
 					
-					receive:(channelNameParam, doOnIncomingMessage, clientsRoomsTag=null)=>{
+					receptionEntryPoints:[],
+					
+					receive:(channelNameParam, doOnIncomingMessage, clientsRoomsTag=null, receptionEntryPointId=null)=>{
+
 
 						// DBG
 						lognow("INFO : (CLIENT-BROWSER)  SETTING UP RECEIVE for :",channelNameParam);
+
+
+						const receptionEntryPoint={
+								channelName:channelNameParam,
+								clientsRoomsTag:clientsRoomsTag,
+								// TODO : ADD TO ALL OTHER SUBSYSTEMS !
+								id:receptionEntryPointId,
+								
+								execute:(eventOrMessage)=>{
+										
+									const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
+							
+//								// DBG
+//								lognow("(CLIENT) (DEBUG) CLIENT RECEIVED SOMETHING FROM SERVER :",dataWrapped);
+									
+									// Channel information is stored in exchanged data :
+									if(dataWrapped.channelName && dataWrapped.channelName!==channelNameParam) return;
+									
+									const clientSocket=browserInstance.clientSocket;
+														
+									// Room information is stored in client socket object :
+									if(!WebsocketImplementation.isInRoom(clientSocket,clientsRoomsTag)) return;
+									
+									if(doOnIncomingMessage)	doOnIncomingMessage(dataWrapped.data, clientSocket);
+									
+									
+								}
+						};
 						
+						// TODO : ADD TO ALL OTHER SUBSYSTEMS !
+						if(!contains(browserInstance.receptionEntryPoints,(l)=>(l.id && receptionEntryPoint.id && l.id===receptionEntryPoint.id)))
+							browserInstance.receptionEntryPoints.push(receptionEntryPoint);
 						
-						const doOnMessage=(eventOrMessage)=>{
-							
-							const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
-							
-//						// DBG
-//						lognow("(CLIENT) (DEBUG) CLIENT RECEIVED SOMETHING FROM SERVER :",dataWrapped);
-							
-							
-							// Channel information is stored in exchanged data :
-							if(dataWrapped.channelName && dataWrapped.channelName!==channelNameParam) return;
-
-							const clientSocket=browserInstance.clientSocket;
+						
+						return browserInstance;
+					},
+					
+					
+					
 
-							// 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(channelNameParam, doOnMessage);
 
+				
+					// CURRENT
+					sendChainable:(channelNameParam, data, clientsRoomsTag=null)=>{
 						
-						return browserInstance;
+						browserInstance.send(channelNameParam, data, clientsRoomsTag);
+						
+						const resultPromise={
+							clientsRoomsTag:clientsRoomsTag,
+							thenWhenReceiveMessageType:(channelNameForResponse, messageTypeForResponse, doOnIncomingMessageForResponse)=>{
+								const listenerId=messageTypeForResponse;
+								browserInstance.receive(channelNameForResponse, doOnIncomingMessageForResponse, this.clientsRoomsTag, listenerId);
+								return this;
+							}
+						};
+						
+
+						return resultPromise;
 					},
 					
 					
+					
+					
+					
+					
 					send:(channelNameParam, data, clientsRoomsTag=null)=>{
 						
+						// DBG
+						lognow("(CLIENT) (BROWSER) CLIENT TRIES TO SEND !");
+						
 						const clientSocket=browserInstance.clientSocket;
 			    	
 								
@@ -5825,8 +5878,23 @@ WebsocketImplementation={
 							if(browserInstance.hasConnectEventFired)	return;
 							browserInstance.hasConnectEventFired=true;
 
-							const clientSocket=browserInstance.clientSocket;
+							
+							
+							// DBG
+							lognow("DEBUG : CLIENT (BROWSER) : doOnConnection !");
+							
+							const doOnMessage=(eventOrMessage)=>{
+								
+								// We execute the listeners entry points registration :
+								foreach(browserInstance.receptionEntryPoints,(receptionEntryPoint)=>{
+									receptionEntryPoint.execute(eventOrMessage);
+								});
 
+							};
+						    
+							const clientSocket=browserInstance.clientSocket;
+						  if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.addEventListener("message", doOnMessage);
+							else																										clientSocket.on(channelNameParam, doOnMessage);
 
 							doOnConnection(browserInstance, clientSocket);
 							

aotrautils-srv/package.json

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