aotrautils-srv 0.0.267 → 0.0.268

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (27/09/2022-02:35:05)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (23/11/2022-18:45:22)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4827,7 +4827,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 
 
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (27/09/2022-02:35:05)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (23/11/2022-18:45:22)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -4986,60 +4986,62 @@ if(typeof(fs)==="undefined"){
 
 // -Server :
 
-// UNUSED : (BUT KEEP CODE!!)
-//getServerParams=function(portParam,isSecureParam,certPathParam,keyPathParam){
-//	
-//	// Node dependencies :
-//	// https=require("https");
-//	// fs=require("fs");
-//	
-//	if(!https){
-//		// TRACE
-//		console.log("WARN : Could not find the nodejs dependency «https», aborting SSL setup.");
-//		return null;
-//	}
-//	if(!fs){
-//		// TRACE
-//		console.log("WARN : Could not find the nodejs dependency «fs», aborting SSL setup.");
-//		return null;
-//	}
-//
-//	var result={};
-//	
-//	// We read the command-line arguments if needed :
-//	var argCLPort;
-//	var argCLCertPath;
-//	var argCLKeyPath;
-//	process.argv.forEach(function (val, i){
-//		if(i<=1)	return;
-//		else if(i==2)	argCLPort=val;
-//		else if(i==3)	argCLCertPath=val;
-//		else if(i==4)	argCLKeyPath=val;
-//	});
-//	
-//	// Console, command-line arguments OVERRIDE parameters values :
-//	
-//	result.port=nonull(argCLPort,portParam);
-//	result.certPath=null;
-//	result.keyPath=null;
-//	result.isSecure=isSecureParam;
-//	
-//	if(isSecureParam){
-//		result.certPath=nonull(argCLCertPath,certPathParam);
-//		result.keyPath=nonull(argCLKeyPath,keyPathParam);
-//	}
-//	
-//	// Eventual encryption options :
-//	result.sslOptions=null;
-//	if(isSecureParam){
-//		result.sslOptions={
-//			cert: fs.readFileSync(certPath),
-//			key: fs.readFileSync(keyPath),
-//		};
-//	}
-//	
-//	return result;
-//}
+getServerParams=function(portParam=null,certPathParam=null,keyPathParam=null){
+	
+	// Node dependencies :
+	// https=require("https");
+	// fs=require("fs");
+	
+	if(!https){
+		// TRACE
+		console.log("WARN : Could not find the nodejs dependency «https», aborting SSL setup.");
+		return null;
+	}
+	if(!fs){
+		// TRACE
+		console.log("WARN : Could not find the nodejs dependency «fs», aborting SSL setup.");
+		return null;
+	}
+
+	const result={};
+	
+	// We read the command-line arguments if needed :
+	let argCLPort;
+	let argCLCertPath;
+	let argCLKeyPath;
+	process.argv.forEach(function (val, i){
+		if(i<=1)	return;
+		else if(i==2)	argCLPort=val;
+		else if(i==3)	argCLCertPath=val;
+		else if(i==4)	argCLKeyPath=val;
+	});
+	
+	// Console, command-line arguments OVERRIDE parameters values :
+	
+	result.port=nonull(argCLPort,portParam);
+	result.certPath=null;
+	result.keyPath=null;
+	result.isSecure=(certPathParam || keyPathParam);
+	
+	if(result.isSecure){
+		result.certPath=nonull(argCLCertPath,certPathParam);
+		result.keyPath=nonull(argCLKeyPath,keyPathParam);
+	}
+	
+	// Eventual encryption options :
+	result.sslOptions=null;
+	if(result.isSecure){
+		result.sslOptions={
+			cert: fs.readFileSync(certPath),
+			key: fs.readFileSync(keyPath),
+		};
+	}
+	
+	return result;
+}
+
+
+
 
 
 // NODE ONLY SERVER / CLIENTS : 
@@ -5945,11 +5947,13 @@ initNodeServer=function(doOnClientConnection=null, doOnFinalizeServer=null, /*OP
 	// 			EXAMPLE : 							node orita-srv.js hash orita.global@keyHash 1234567890
 	console.log("Server launched.");
 	
+	
 	// We read the command-line arguments if needed :
 
 	let argCLPort;
 	let argCLCertPath;
 	let argCLKeyPath;
+	
 	let serverConfig={};
 	let isForceUnsecure;
 
@@ -5982,7 +5986,10 @@ initNodeServer=function(doOnClientConnection=null, doOnFinalizeServer=null, /*OP
 	});
 	isForceUnsecure=(argCLCertPath==="unsecure");
 
-	
+
+
+
+
 	const aotraNodeServer={config:serverConfig};
 	aotraNodeServer.serverManager={ start:()=>{/*DEFAULT START FUNCTION, WILL BE OVERRIDEN LATER*/}};
 

aotrautils-srv/package.json

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