aotrautils-srv 0.0.440 → 0.0.441

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (23/01/2023-22:48:24)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (23/01/2023-23:00:24)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -2858,12 +2858,11 @@ window.contains=function(container, objectToFind,/*OPTIONAL*/useRegexp=false,sea
 		// console.log("WARN : Container is empty ! Cannot search for «"+objectToFind+"».");
 		return false;
 	}
-//	if(!isString(container) && objectToFind && isFunction(objectToFind)){
-//		return !!foreach(container, (item, keyOrIndex)=>{
-//			if(objectToFind(item, keyOrIndex))	return true;
-//		});
-//	}else
-	{
+	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)){
@@ -4865,7 +4864,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (23/01/2023-22:48:24)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (23/01/2023-23:00:24)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5763,36 +5762,36 @@ WebsocketImplementation={
 						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 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);
 						
 						
 						return browserInstance;
@@ -5807,19 +5806,19 @@ WebsocketImplementation={
 					// CURRENT
 					sendChainable:(channelNameParam, data, clientsRoomsTag=null)=>{
 						
-//						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;
+						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;
 					},
 					
 					

aotrautils-srv/package.json

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