aotrautils-srv 0.0.51 → 0.0.54

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils SERVER library associated with aotra version : «1.0.0.000 (11/07/2022-21:13:03)»*/
+/*utils SERVER library associated with aotra version : «1.0.0.000 (11/07/2022-23:45:39)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -140,59 +140,60 @@ if(typeof(fs)==="undefined"){
 
 // -Server :
 
-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;
-}
+// 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;
+//}
 
 
 // NODE ONLY SERVER / CLIENTS : 
@@ -1008,14 +1009,9 @@ initNodeServer=function(doOnClientConnection=null, doOnFinalizeServer=null, /*OP
 					argCLPort=jsonConf.port;
 					argCLCertPath=jsonConf.sslCertPath;
 					argCLKeyPath=jsonConf.sslKeyPath;
-					try{
-						serverConfig=nonull({},JSON.parse(jsonConf.serverConfig));
-					}catch(err1){
-						lognow("ERROR : Cannot parse JSON string «"+jsonConf.serverConfig+"».",err1);
-					}
-				}catch(err2){
-					lognow("ERROR : Cannot parse JSON string «"+val+"».",err2);
-					isHashAsked=true;
+					serverConfig=nonull({},jsonConf.serverConfig);
+				}catch(err1){
+					lognow("ERROR : Cannot parse argument JSON string «"+val+"».",err1);
 				}
 			}	else						persisterId=val;
 		}else if(i==4){
@@ -1303,7 +1299,7 @@ function getListManager(config){
 
 
 
-/*utils COMMONS library associated with aotra version : «1.0.0.000 (11/07/2022-21:13:03)»*/
+/*utils COMMONS library associated with aotra version : «1.0.0.000 (11/07/2022-23:45:39)»*/
 /*-----------------------------------------------------------------------------*/
 
 

aotrautils-srv/package.json

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