aotrautils-srv 0.0.152 → 0.0.155

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1.0.0.000 (17/07/2022-03:46:42)»*/
+/*utils COMMONS library associated with aotra version : «1.0.0.000 (17/07/2022-04:01:32)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4828,7 +4828,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1.0.0.000 (17/07/2022-03:46:42)»*/
+/*utils SERVER library associated with aotra version : «1.0.0.000 (17/07/2022-04:01:32)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5177,7 +5177,15 @@ WebsocketImplementation={
 								
 //							dataWrapped=JSON.parse(dataWrapped);
 //							dataWrapped=getAt(dataWrapped,0);// We get the root element
-								const dataWrapped=(WebsocketImplementation.useFlatStrings?JSON.parse(message):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));
+								}
 
 
 								// DBG
@@ -5221,16 +5229,9 @@ WebsocketImplementation={
 							 
 
 							 if(!WebsocketImplementation.useSocketIOImplementation)	clientSocketParam.addEventListener("message", doOnMessage);
-							 else{
-								
-								// DBG
-								clientSocketParam.onAny((event,args) => {		 console.log(`MAIS PUTAIN : ${event}:`,args);		});
-								clientSocketParam.on(channelName,(args, clientSocket) => { console.log(`MAIS OSKOUR :${args} ${clientSocket}`);		});
-								
+							 else																										clientSocketParam.on(channelName, doOnMessage);
 								
 								
-								clientSocketParam.on(channelName, doOnMessage);
-							 }
 
 
 								
@@ -5257,7 +5258,8 @@ WebsocketImplementation={
 								// TODO : FIXME : Use one single interface !
 								let serverClients;
 								if(!WebsocketImplementation.useSocketIOImplementation)	serverClients=nodeServerInstance.serverSocket.clients;
-								else																										serverClients=nodeServerInstance.serverSocket.sockets.clients();
+//							OLD:	else																							serverClients=nodeServerInstance.serverSocket.sockets.clients();
+								else																										serverClients=nodeServerInstance.serverSocket.sockets;
 						    
 						    serverClients.forEach((clientSocket)=>{
 						    	
@@ -5438,7 +5440,8 @@ WebsocketImplementation={
 				
 				// TODO : FIXME : Use one single interface !
 				if(!WebsocketImplementation.useSocketIOImplementation)	serverClients=nodeServerInstance.serverSocket.clients;
-				else																										serverClients=nodeServerInstance.serverSocket.sockets.clients();
+				// OLD : else																						serverClients=nodeServerInstance.serverSocket.sockets.clients();
+				else																										serverClients=nodeServerInstance.serverSocket.sockets;
 				
 				serverClients.forEach((clientSocket)=>{
 				 	clearInterval(clientSocket.stateCheckInterval);
@@ -5677,7 +5680,17 @@ WebsocketImplementation={
 //							const dataWrapped=JSON.parse(message);
 //							dataWrapped=getAt(dataWrapped,0);// We get the root element
 
-								const dataWrapped=(WebsocketImplementation.useFlatStrings?JSON.parse(message):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));
+								}
+
+
 							
 								
 								// Channel information is stored in exchanged data :

aotrautils-srv/package.json

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