aotrautils-srv 0.0.169 → 0.0.170

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1.0.0.000 (17/07/2022-14:32:32)»*/
+/*utils COMMONS library associated with aotra version : «1.0.0.000 (17/07/2022-14:45:40)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4828,7 +4828,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1.0.0.000 (17/07/2022-14:32:32)»*/
+/*utils SERVER library associated with aotra version : «1.0.0.000 (17/07/2022-14:45:40)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5113,6 +5113,26 @@ WebsocketImplementation={
 		},
 		
 		
+		/*private*/getMessageDataBothImplementations:(eventOrMessage)=>{
+			
+				const dataResult=(!WebsocketImplementation.useSocketIOImplementation?eventOrMessage.data:eventOrMessage);
+				
+				////
+				// DBG
+				lognow("		SERVER RECEIVED 1:",eventOrMessage);
+				
+				try{
+					dataResult=(WebsocketImplementation.useFlatStrings || isString(eventOrMessage)?JSON.parse(eventOrMessage):eventOrMessage);
+				}catch(error1){
+					// TRACE
+					lognow(`ERROR : Failed to parse JSON for string «${dataResult}»`,error1);
+					dataResult=(isString(eventOrMessage)?eventOrMessage:JSON.stringify(eventOrMessage));
+				}
+				
+				return dataResult;
+		},
+		
+		
 		getServer:(listenableServer)=>{
 			
 			if(!WebsocketImplementation.isNodeContext){
@@ -5173,27 +5193,13 @@ WebsocketImplementation={
 //						 nodeServerInstance.onConnectionToClient((serverParam, clientSocketParam)=>{
 	
 							 // TODO : Find a way to remove this !
-							 const doOnMessage=(message)=>{
+							 const doOnMessage=(eventOrMessage)=>{
 								
 //							dataWrapped=JSON.parse(dataWrapped);
 //							dataWrapped=getAt(dataWrapped,0);// We get the root element
+								
 
-
-								////
-								// DBG
-								lognow("		SERVER RECEIVED 1:",message);
-
-
-								let dataWrapped=message;
-								try{
-									dataWrapped=(WebsocketImplementation.useFlatStrings || isString(message)?JSON.parse(message):message);
-								}catch(error1){
-									// TRACE
-									lognow(`ERROR : Failed to parse JSON for string «${dataWrapped}»`,error1);
-									dataWrapped=(isString(message)?message:JSON.stringify(message));
-								}
-
-	
+								const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
 								////
 								// DBG
 								lognow("		SERVER RECEIVED 2:",dataWrapped);
@@ -5423,7 +5429,6 @@ WebsocketImplementation={
 			nodeServerInstance.receive("protocol",(message, clientSocket)=>{
 				
 				if(message.type!=="joinRoom" || !clientSocket)	return;
-
 				nodeServerInstance.addToRoom(clientSocket, message.clientRoomTag);
 
 			});
@@ -5510,13 +5515,13 @@ WebsocketImplementation={
 								clientsRoomsTag:clientsRoomsTag, 
 								execute:(clientSocketParam)=>{
 									
-									const doOnMessage=(message)=>{
+									const doOnMessage=(eventOrMessage)=>{
 										
 //									dataWrapped=JSON.parse(dataWrapped);
 //									dataWrapped=getAt(dataWrapped,0);// We get the root element
-																		
-										const dataWrapped=(WebsocketImplementation.useFlatStrings?JSON.parse(message):message);
+//										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;
@@ -5586,9 +5591,7 @@ WebsocketImplementation={
 					join:(clientRoomTag)=>{
 						// Join room client part protocol :
 						const message={type:"joinRoom",clientRoomTag:clientRoomTag};
-						
 						nodeClientInstance.send("protocol",message);
-						
 					},
 					
 					
@@ -5666,26 +5669,14 @@ WebsocketImplementation={
 						// DBG
 						lognow("INFO : (CLIENT-BROWSER)  SETTING UP RECEIVE for :",channelName);
 						
-						const doOnMessage=(message)=>{
+						const doOnMessage=(eventOrMessage)=>{
 							
-//							// DBG
-//							lognow("!!! RECEIVED : message",message);
 								
-								// OLD : let dataWrapped=JSON.parse(event.data);
-//							const dataWrapped=JSON.parse(message);
-//							dataWrapped=getAt(dataWrapped,0);// We get the root element
-
-
-								let dataWrapped=message;
-								try{
-									dataWrapped=(WebsocketImplementation.useFlatStrings || isString(message)?JSON.parse(message):message);
-								}catch(error1){
-									// TRACE
-									lognow(`ERROR : Failed to parse JSON for string «${dataWrapped}»`,error1);
-									dataWrapped=(isString(message)?message:JSON.stringify(message));
-								}
-
-
+								const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
+								
+								////
+								// DBG
+								lognow("		CLIENT-BROWSER RECEIVED 2:",dataWrapped);
 							
 								
 								// Channel information is stored in exchanged data :

aotrautils-srv/package.json

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