aotrautils-srv 0.0.218 → 0.0.221

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1.0.0.000 (19/07/2022-04:19:44)»*/
+/*utils COMMONS library associated with aotra version : «1.0.0.000 (22/07/2022-00:54:19)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4828,7 +4828,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1.0.0.000 (19/07/2022-04:19:44)»*/
+/*utils SERVER library associated with aotra version : «1.0.0.000 (22/07/2022-00:54:19)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5347,7 +5347,6 @@ WebsocketImplementation={
 										if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.terminate();
 										else																										clientSocket.emit("endConnection");
 
-	    				 			// TODO : FIXME : DUPLICATED CODE :
 							    	if(!empty(nodeServerInstance.onClientLostListeners))
 							    		foreach(nodeServerInstance.onClientLostListeners,l=>{l.execute(clientSocket);});
 
@@ -5357,31 +5356,13 @@ WebsocketImplementation={
 							    }
 							    
 							    clientSocket.isConnectionAlive=false;
-//							    try{
 								
-										// OLD :
-//									if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.ping();
-//									else																										clientSocket.emit("ping");
+									// OLD :
+//								if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.ping();
+//								else																										clientSocket.emit("ping");
 								
 									nodeServerInstance.send("protocol",{type:"ping"});
 
-							    	
-//							    }catch(error){
-//							    	lognow("ERROR : A problem occurred when tried to ping client socket : ",error);
-//							    	// We effectively end the client connection to this server :
-//
-//										// TODO : FIXME : DUPLICATED CODE :
-//										// TODO : FIXME : Use one single interface !
-//										if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.terminate();
-//										else																										clientSocket.emit("endConnection");
-//
-//	    				 			// TODO : FIXME : DUPLICATED CODE :
-//							    	if(!empty(nodeServerInstance.onClientLostListeners))
-//							    		foreach(nodeServerInstance.onClientLostListeners,l=>{l.execute(clientSocket);});
-//
-//							    	return;
-//							    }
-							    
 							    
 							}, nodeServerInstance.clientTimeoutMillis);
 							
@@ -5554,7 +5535,7 @@ WebsocketImplementation={
 					
 					send:(channelName, data, clientsRoomsTag=null)=>{
 						
-						let clientSocket=nodeClientInstance.clientSocket;
+						const clientSocket=nodeClientInstance.clientSocket;
 						
 						
 //			    // DBG
@@ -5606,15 +5587,19 @@ WebsocketImplementation={
 							if(nodeClientInstance.hasConnectEventFired)	return;
 							nodeClientInstance.hasConnectEventFired=true;
 							
-							let clientSocket=nodeClientInstance.clientSocket;
+							const clientSocket=nodeClientInstance.clientSocket;
+							
+							// DBG
+							clientSocket.clientId=getUUID();
 							
 							doOnConnection(nodeClientInstance, clientSocket);
 							
-							// We execute the listeners entry points:
+							// We execute the listeners entry points registration :
 							foreach(nodeClientInstance.receptionEntryPoints,(receptionEntryPoint)=>{
 								receptionEntryPoint.execute(clientSocket);
 							});
 							
+							
 						};
 
 						if(!WebsocketImplementation.useSocketIOImplementation)	nodeClientInstance.clientSocket.addEventListener("open",doAllOnConnection);
@@ -5714,7 +5699,7 @@ WebsocketImplementation={
 					
 					send:(channelName, data, clientsRoomsTag=null)=>{
 						
-						let clientSocket=browserInstance.clientSocket;
+						const clientSocket=browserInstance.clientSocket;
 			    	
 								
 //					// DBG
@@ -5757,13 +5742,24 @@ WebsocketImplementation={
 					
 					
 					onConnectionToServer:(doOnConnection)=>{
+						const doAllOnConnection=()=>{
+
+							// To avoid triggering this event several times, depending on the implementation : 
+							if(browserInstance.hasConnectEventFired)	return;
+							browserInstance.hasConnectEventFired=true;
+
+							const clientSocket=browserInstance.clientSocket;
+
+							// DBG
+							clientSocket.clientId=getUUID();
+
+							doOnConnection(browserInstance, clientSocket);
+
+							
+						};
 						
-						// To avoid triggering this event several times, depending on the implementation : 
-						if(browserInstance.hasConnectEventFired)	return;
-						browserInstance.hasConnectEventFired=true;
-						
-						if(!WebsocketImplementation.useSocketIOImplementation)	browserInstance.clientSocket.addEventListener("open",doOnConnection);
-						else																										browserInstance.clientSocket.on("connect",doOnConnection);
+						if(!WebsocketImplementation.useSocketIOImplementation)	browserInstance.clientSocket.addEventListener("open",doAllOnConnection);
+						else																										browserInstance.clientSocket.on("connect",doAllOnConnection);
 						
 						
 					},
@@ -6225,7 +6221,8 @@ class ListManager{
 		if(!this.isSessionActive())	return false;
 		const clientPosition=this.getItemPosition(clientId);
 		//CAUTION : Client position starts at 1 !
-		const result=((clientPosition-1)<=this.maxItemsNumber && (clientPosition-1)<=this.simultaneousItemsNumber);
+		const clientIndex=(clientPosition-1);
+		const result=(clientIndex<=this.maxItemsNumber && clientIndex<=this.simultaneousItemsNumber);
 		
 		return result;
 	}

aotrautils-srv/package.json

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