aotrautils-srv 0.0.208 → 0.0.211

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1.0.0.000 (19/07/2022-03:08:57)»*/
+/*utils COMMONS library associated with aotra version : «1.0.0.000 (19/07/2022-03:36:03)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4828,7 +4828,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1.0.0.000 (19/07/2022-03:08:57)»*/
+/*utils SERVER library associated with aotra version : «1.0.0.000 (19/07/2022-03:36:03)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5331,12 +5331,16 @@ WebsocketImplementation={
 							doOnConnection(nodeServerInstance, clientSocket);
 							
 							
+							// DBG
+							lognow("DEBUG : Starting ping-pong with client : clientSocket.id:",clientSocket.id);
+							
+							
 							// To make the server aware of the clients connections states :
+							clientSocket.isConnectionAlive=true;
 							clientSocket.stateCheckInterval=setInterval(()=>{
 								
 								
-							    if (clientSocket.isAlive===false){
-			    				 	clearInterval(clientSocket.stateCheckInterval);
+							    if (clientSocket.isConnectionAlive===false){
 			    				 	
 	    				 			// TODO : FIXME : DUPLICATED CODE :
 	    				 			// TODO : FIXME : Use one single interface !
@@ -5346,35 +5350,37 @@ WebsocketImplementation={
 	    				 			// TODO : FIXME : DUPLICATED CODE :
 							    	if(!empty(nodeServerInstance.onClientLostListeners))
 							    		foreach(nodeServerInstance.onClientLostListeners,l=>{l.execute(clientSocket);});
+
 							    	
+			    				 	clearInterval(clientSocket.stateCheckInterval);
 							    	return;
 							    }
 							    
-							    clientSocket.isAlive=false;
-							    try{
+							    clientSocket.isConnectionAlive=false;
+//							    try{
 								
 										// OLD :
 //									if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.ping();
 //									else																										clientSocket.emit("ping");
-										nodeServerInstance.send("protocol",{type:"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;
-							    }
+//							    }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);
@@ -5383,17 +5389,17 @@ WebsocketImplementation={
 //						// OLD :
 //						if(!WebsocketImplementation.useSocketIOImplementation){
 //							clientSocket.on("pong",()=>{
-//								clientSocket.isAlive=true;
+//								clientSocket.isConnectionAlive=true;
 //							});
 //						}else{
 //							clientSocket.on("ping",()=>{
-//								clientSocket.isAlive=true;
+//								clientSocket.isConnectionAlive=true;
 //							});
 //						}
 
 							nodeServerInstance.receive("protocol",(message)=>{
 								if(message.type!=="pong")	return;
-								clientSocket.isAlive=true;
+								clientSocket.isConnectionAlive=true;
 							});
 							
 							
@@ -6157,12 +6163,16 @@ class ListManager{
 			lognow("ERROR : Cannot add null item.");
 			return;
 		}
-		const numberOfItemsCurrently=countKeys(this.itemsInfos);
+		const numberOfItemsCurrently=getArraySize(this.itemsInfos);
 		if(this.maxItemsNumber<=numberOfItemsCurrently){
 			// TRACE
 			lognow("ERROR : Cannot add item with id «"+id+"», list already full.");
 			return;
 		}
+		
+		// DBG
+		lognow(">>>>>>>>>numberOfItemsCurrently:",numberOfItemsCurrently);
+		
 		if(numberOfItemsCurrently==0 && this.mode==="startAtConnexion"){
 			this.startSession();
 		}
@@ -6188,9 +6198,13 @@ class ListManager{
 	}
 	
 	isClientActive(clientId){
+		
+		// DBG
+		lognow("			this.isSessionActive()",this.isSessionActive());
+		
 		if(!this.isSessionActive())	return false;
 		const clientPosition=this.getItemPosition(clientId);
-		const result=(clientPosition<=this.maxItemsNumber);
+		const result=((clientPosition-1)/*Because client position starts at 1 !*/<=this.maxItemsNumber);
 		return result;
 	}
 	
@@ -6217,10 +6231,14 @@ class ListManager{
 		
 		let id=null;
 		foreach(this.itemsInfos,(itemInfos,key)=>{
-			if(itemInfos.item===item){
+			if(itemInfos.item===item
+					// DEBUG ONLY :
+					|| (itemInfos.item.id && item.id && itemInfos.item.id===item.id)
+			){
 				id=key;
 				return "break";
 			}
+			
 		});
 		
 		if(!id){

aotrautils-srv/package.json

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