aotrautils 0.0.507 → 0.0.508

aotrautils/aotrautils.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (05/02/2023-14:51:18)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (05/02/2023-20:34:33)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4866,7 +4866,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils CLIENT library associated with aotra version : «1_29072022-2359 (05/02/2023-14:51:18)»*/
+/*utils CLIENT library associated with aotra version : «1_29072022-2359 (05/02/2023-20:34:33)»*/
 /*-----------------------------------------------------------------------------*/
 /* ## Utility global methods in a browser (htmljs) client environment.
  *
@@ -11434,7 +11434,7 @@ initClient=function(isNodeContext=true, useSocketIOImplementation=/*DEBUG*/false
 	aotraClient.client.start=function(){
 	
 		// DBG
-		lognow("INFO : Setting up Websocket implementation server :...");
+		lognow("INFO : Setting up client :...");
 		
 		let socketToServer=WebsocketImplementation.getStatic(isNodeContext, useSocketIOImplementation).connectToServer(url, port, isSecure, timeout);
 		if(!socketToServer){
@@ -11487,7 +11487,7 @@ initClient=function(isNodeContext=true, useSocketIOImplementation=/*DEBUG*/false
 //		}
 		
 		// DBG
-		lognow("aotraClient.clientSocket:",aotraClient.clientSocket);
+		lognow("aotraClient.client:",aotraClient.client);
 		
 		// DBG
 //		aotraClient.clientSocket.addEventListener("close",()=>{
@@ -11729,25 +11729,27 @@ createFusrodaClient=function(doOnClientReady, doOnDataReception, urlParam=null,
 		// DBG
 		lognow("FUSRODA CLIENT : SETTING UP...");
 		
+
 		//0)
-		socketToServer.send("protocol", { type:"hello" });
-		//1)
 		socketToServer.receive("protocolConfig", (messageConfig)=>{
 			
 			// DBG
-			lognow("(CLIENT) (DEBUG) Received protocol config from server !messageConfig:",messageConfig);
+			lognow("(CLIENT) (DEBUG) Received protocol config from server : messageConfig:",messageConfig);
 			
 			//2)			
-			socketToServer.send("screenFrameRequest", {});
 			socketToServer.receive("imagePacket", (doOnDataReception && doOnDataReception["image"]?doOnDataReception["image"]:()=>{/*DO NOTHING*/}));
+			socketToServer.send("screenFrameRequest", {});
 
 			//2)			
-			socketToServer.send("soundSampleRequest", {});
 			socketToServer.receive("soundPacket", (doOnDataReception && doOnDataReception["sound"]?doOnDataReception["sound"]:()=>{/*DO NOTHING*/}));
+			socketToServer.send("soundSampleRequest", {});
 
 
 			doOnClientReady(messageConfig);
 		});
+		
+		//1)
+		socketToServer.send("protocol", { type:"hello" });
 
 		
 	}, urlParam, portParam, isSecure);
@@ -11910,7 +11912,7 @@ createOritaMainClient=function(
 		
 			mainClient.outputsGPIO=outputsGPIOLocal;
 			
-			doOnOutputsUpdated(microClientId, mainClient.outputsGPIO);
+			doOnOutputsUpdated(mainClient, microClientId, mainClient.outputsGPIO);
 		},
 	});
 
@@ -12028,7 +12030,7 @@ createOritaMainClient=function(
 								
 								
 								
-								treatVideoData();
+								treatVideoData(microClientId, receivedData);
 								
 								
 							
@@ -12052,7 +12054,7 @@ createOritaMainClient=function(
 								oritaClient.microClientsInfos[microClientId].lastTime=getNow();
 								
 								
-								treatAudioData();
+								treatAudioData(microClientId, receivedData);
 								
 							
 							}
@@ -12158,12 +12160,15 @@ createOritaMainClient=function(
 
 
 
-createOritaMicroClient=function(url, port, isNode=false){
-
+createOritaMicroClient=function(url, port, isNode=false, staticMicroClientIdParam=null){
 
+	
+	const staticMicroClientId=(!isNode?nonull(staticMicroClientIdParam,getURLParameter("mid")):null);
 
 	
-	let oritaClient={
+	const oritaClient={
+	
+		staticMicroClientId:staticMicroClientId,
 	
 		onRegistrationEventListeners:[],
 		onCommunicationEventListeners:[],
@@ -12178,6 +12183,8 @@ createOritaMicroClient=function(url, port, isNode=false){
 
 	oritaClient.start = function(mediasArg = null) {
 
+
+
 		const startResultPromise = new Promise((resolve, reject) => {
 
 
@@ -12238,7 +12245,7 @@ createOritaMicroClient=function(url, port, isNode=false){
 
 					// Only micro client determines its own id ! (to avoid multi-registration protocol bug !)
 
-					let microClientId = getUUID("short");
+					const microClientId = nonull(oritaClient.staticMicroClientId, getUUID("short"));
 
 					oritaClient.microClientId = microClientId;
 
@@ -12264,7 +12271,7 @@ createOritaMicroClient=function(url, port, isNode=false){
 	
 						if (contains(message.type, "response.microClient.registered")) {
 	
-							let microClientId = message.microClientId;
+							const microClientId = message.microClientId;
 	
 							// To be sure this registration response does not concerns another micro client :
 							if (oritaClient.microClientId !== microClientId) return;
@@ -12992,7 +12999,7 @@ createOritaMicroClient=function(url, port, isNode=false){
 };
 
 
-/*utils GEOMETRY library associated with aotra version : «1_29072022-2359 (05/02/2023-14:51:18)»*/
+/*utils GEOMETRY library associated with aotra version : «1_29072022-2359 (05/02/2023-20:34:33)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -14220,7 +14227,7 @@ function rayVsUnitSphereClosestPoint(p, r) {
 // MUST REMAIN AT THE END OF THIS LIBRARY FILE !
 
 AOTRAUTILS_GEOMETRY_LIB_IS_LOADED=true;
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (05/02/2023-14:51:18)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (05/02/2023-20:34:33)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -14383,9 +14390,9 @@ if(typeof(fs)==="undefined"){
 //- WEBSOCKETS AND NODEJS :
 
 function isConnected(clientSocket){
-	if(!WebsocketImplementation.useSocketIOImplementation)	if(clientSocket.readyState===WebSocket.OPEN)	return true;
-	else																										if(clientSocket.connected)										return true;
-	return false;
+	if(!WebsocketImplementation.useSocketIOImplementation)
+		return (clientSocket.readyState===WebSocket.OPEN)
+	return (clientSocket.connected);
 }
 
 
@@ -14650,6 +14657,14 @@ WebsocketImplementation={
 						
 						nodeServerInstance.receptionEntryPoints.push(receptionEntryPoint);
 						
+						// SPECIAL FOR THE SOCKETIO IMPLEMENTATION :
+						if(WebsocketImplementation.useSocketIOImplementation){
+							const channelName=receptionEntryPoint.channelName;
+							clientSocket.on(channelName, (eventOrMessage)=>{
+								receptionEntryPoint.execute(eventOrMessage, clientSocket);
+							});
+						}
+
 						
 //					// DBG
 //					console.log("ADD RECEPTION ENTRY POINT channelName:«"+channelName+"»! nodeServerInstance.receptionEntryPoints.length:",nodeServerInstance.receptionEntryPoints.length);
@@ -14763,15 +14778,8 @@ WebsocketImplementation={
 								});
 							};
 
-		 					if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.addEventListener("message", doOnMessage);
-							else{
+		 					if(!WebsocketImplementation.useSocketIOImplementation){	clientSocket.addEventListener("message", doOnMessage);
 							// NO:	else																						clientSocket.on("message", doOnMessage);
-								foreach(nodeServerInstance.receptionEntryPoints,(receptionEntryPoint,i)=>{
-									const channelName=receptionEntryPoint.channelName;
-									clientSocket.on(channelName, (eventOrMessage)=>{
-										receptionEntryPoint.execute(eventOrMessage, clientSocket);
-									});
-								});
 							}
 								
 							doOnConnection(nodeServerInstance, clientSocket);
@@ -14983,6 +14991,15 @@ WebsocketImplementation={
 						
 						nodeClientInstance.receptionEntryPoints.push(receptionEntryPoint);
 						
+						// SPECIAL FOR THE SOCKETIO IMPLEMENTATION :
+						if(WebsocketImplementation.useSocketIOImplementation){
+							const channelName=receptionEntryPoint.channelName;
+							clientSocket.on(channelName, (eventOrMessage)=>{
+								receptionEntryPoint.execute(eventOrMessage, clientSocket);
+							});
+						}
+						
+						
 						return nodeClientInstance;
 					},
 					
@@ -15060,15 +15077,8 @@ WebsocketImplementation={
 							};
 							
 							const clientSocket=nodeClientInstance.clientSocket;
-							if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.addEventListener("message", doOnMessage);
-							else{
+							if(!WebsocketImplementation.useSocketIOImplementation){	clientSocket.addEventListener("message", doOnMessage);
 							// NO:	else																						clientSocket.on("message", doOnMessage);
-								foreach(nodeClientInstance.receptionEntryPoints,(receptionEntryPoint,i)=>{
-									const channelName=receptionEntryPoint.channelName;
-									clientSocket.on(channelName, (eventOrMessage)=>{
-										receptionEntryPoint.execute(eventOrMessage, clientSocket);
-									});
-								});
 							}
 
 							doOnConnection(nodeClientInstance, clientSocket);
@@ -15153,8 +15163,8 @@ WebsocketImplementation={
 										
 									const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
 							
-//								// DBG
-//								lognow("(CLIENT) (DEBUG) CLIENT RECEIVED SOMETHING FROM SERVER :",dataWrapped);
+									// // DBG
+									// lognow("(CLIENT) (DEBUG) CLIENT RECEIVED SOMETHING FROM SERVER :",dataWrapped);
 									
 									// Channel information is stored in exchanged data :
 									if(dataWrapped.channelName && dataWrapped.channelName!==channelNameParam) return;
@@ -15181,6 +15191,14 @@ WebsocketImplementation={
 						if(!contains(browserInstance.receptionEntryPoints,(l)=>(l.id && receptionEntryPoint.id && l.id===receptionEntryPoint.id)))
 							browserInstance.receptionEntryPoints.push(receptionEntryPoint);
 						
+						// SPECIAL FOR THE SOCKETIO IMPLEMENTATION :
+						if(WebsocketImplementation.useSocketIOImplementation){
+							const channelName=receptionEntryPoint.channelName;
+							clientSocket.on(channelName, (eventOrMessage)=>{
+								receptionEntryPoint.execute(eventOrMessage, clientSocket);
+							});
+						}
+								
 						
 						return browserInstance;
 					},
@@ -15302,15 +15320,8 @@ WebsocketImplementation={
 							};
 						    
 							const clientSocket=browserInstance.clientSocket;
-						  if(!WebsocketImplementation.useSocketIOImplementation)	clientSocket.addEventListener("message", doOnMessage);
-							else{
+						  if(!WebsocketImplementation.useSocketIOImplementation){	clientSocket.addEventListener("message", doOnMessage);
 							// NO:	else																						clientSocket.on("message", doOnMessage);
-								foreach(browserInstance.receptionEntryPoints,(receptionEntryPoint,i)=>{
-									const channelName=receptionEntryPoint.channelName;
-									clientSocket.on(channelName, (eventOrMessage)=>{
-										receptionEntryPoint.execute(eventOrMessage, clientSocket);
-									});
-								});
 							}
 
 

aotrautils/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "aotrautils",
-	"version": "0.0.507",
+	"version": "0.0.508",
 	"main": "aotrautils.build.js",
 	"description": "A library for vanilla javascript utils (client-side) used in aotra javascript CMS",
 	"author": "Jeremie Ratomposon <info@alqemia.com> (https://alqemia.com)",