aotrautils-srv 0.0.801 → 0.0.802

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (15/02/2024-00:44:20)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (16/02/2024-00:55:32)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5167,7 +5167,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 	
 
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (15/02/2024-00:44:20)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (16/02/2024-00:55:32)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -6314,7 +6314,7 @@ WebsocketImplementation={
 
 
 
-launchNodeHTTPServer=function(port, doOnConnect=null, doOnFinalizeServer=null, /*OPTIONAL*/sslOptions=null, httpHandlerParam=null){
+launchNodeHTTPServer=function(port, doOnConnect=null, doOnFinalizeServer=null, /*OPTIONAL*/sslOptions=null, httpHandlerParam=null, addCORSHeader=ADD_CORS_HEADER){
 	
 	const EXCLUDED_FILENAMES_PARTS=[".keyHash."];
 	
@@ -6365,7 +6365,7 @@ launchNodeHTTPServer=function(port, doOnConnect=null, doOnFinalizeServer=null, /
 		const headers={ "Content-Type": contentType };
 
 		// To remove the CORS error message (cf. https://medium.com/@dtkatz/3-ways-to-fix-the-cors-error-and-how-access-control-allow-origin-works-d97d55946d9)
-		if(ADD_CORS_HEADER)		headers["Access-Control-Allow-Origin"]="*";
+		if(addCORSHeader)		headers["Access-Control-Allow-Origin"]="*";
 		
     
     fs.readFile(filePath, function(error, fileContent){
@@ -6836,18 +6836,18 @@ class ListManager{
 		return getArraySize(this.itemsInfos);
 	}
 	
-}
+};
 
 getListManager=function(config){
 	return new ListManager(config);
-}
+};
+
 
 
 // NO : IN A NODE CONTEXT WITH requre("") WILL RESULT IN AN UNDEFINED FUNCTION ERROR !!! 
-// function performHTTPRequestNode(url,httpMethod="GET",headers={},postRequestBodyOrNamedArgs=null){
+// function performHTTPRequestNode(...){...
 // USE THIS INSTEAD :
-performHTTPRequestNode=function(completeURL,httpMethod="GET",headers={},postRequestBodyOrNamedArgs=null){
-
+performHTTPRequestNode=function(completeURL,httpMethod="GET",headers={},requestBodyOrNamedArgs=null,addCORSHeader=ADD_CORS_HEADER){
 	
 	if(!require){
 		// TODO : FIXME : Support also a browser context!!
@@ -6855,7 +6855,7 @@ performHTTPRequestNode=function(completeURL,httpMethod="GET",headers={},postRequ
 		throw new Error("Unsupported context non-nodejs for performHTTPRequestNode().");
 	}
 	
-	const isSecure=completeURL.includes("https://");
+	const isSecure=(!empty(completeURL) && contains(completeURL.toLowerCase(),"https://"));
 	const httpHandler = isSecure?require("https"):require("http");
 	
 	// Options for the HTTP request
@@ -6868,9 +6868,19 @@ performHTTPRequestNode=function(completeURL,httpMethod="GET",headers={},postRequ
 		options.json=true;
 		headers["Content-Type"]="application/json";
 		// To remove the CORS error message (cf. https://medium.com/@dtkatz/3-ways-to-fix-the-cors-error-and-how-access-control-allow-origin-works-d97d55946d9)
-		if(ADD_CORS_HEADER)		headers["Access-Control-Allow-Origin"]="*";
+		if(addCORSHeader)		headers["Access-Control-Allow-Origin"]="*";
+	}	else if(httpMethod==="GET" && requestBodyOrNamedArgs){
+		// Not the same way to send parameters in GET http method :
+		// DBG
+		lognow("unformatted API URL : "+completeURL);
+		
+		completeURL=appendGetParameters(completeURL, requestBodyOrNamedArgs);
+		
+		// DBG
+		lognow("formatted API URL : "+completeURL);
 	}
 	
+	
   options.headers=headers;
   
 	return new Promise((resolve,reject)=>{
@@ -6889,8 +6899,17 @@ performHTTPRequestNode=function(completeURL,httpMethod="GET",headers={},postRequ
 		
 		  // The whole response has been received.
 		  response.on("end", () => {
-				const responseData=parseJSON(responseDataStr);
-				resolve(responseData);
+			
+				try{
+					const responseData=parseJSON(responseDataStr);
+					resolve(responseData, response, responseDataStr);
+				}catch(error){
+					// DBG
+					lognow("WARN : Could not JSON parse the response data ! Must deal with the string:«"+responseDataStr+"»", error);
+					resolve(responseDataStr, response, responseDataStr);
+					return;
+				}
+				
 		  });
 		});
 		
@@ -6903,8 +6922,8 @@ performHTTPRequestNode=function(completeURL,httpMethod="GET",headers={},postRequ
 		// Not the same way to send parameters in POST http method :
 		if(contains(["POST","PUT"],httpMethod)){
 			// (We need to stringify parameters or else we'll have an error :)
-			if(!empty(postRequestBodyOrNamedArgs)){
-				request.write(stringifyObject(postRequestBodyOrNamedArgs));
+			if(!empty(requestBodyOrNamedArgs)){
+				request.write(stringifyObject(requestBodyOrNamedArgs));
 			}
 		}
 		
@@ -6913,11 +6932,31 @@ performHTTPRequestNode=function(completeURL,httpMethod="GET",headers={},postRequ
 
 	});
 	
-}
+};
 
 
 
 
+replacePathVariablesNamesWithValuesIfPossible=function(apiURL, namedArgs){
+	let result=apiURL;
+	foreach(namedArgs,(namedArgValue, namedArgKey)=>{
+		result=result.replace("{"+namedArgKey+"}",namedArgValue);
+	});
+	return result;
+};
+
+appendGetParameters=function(apiURL, namedArgs){
+	let result=apiURL;
+
+	const paramCouples=[];
+	foreach(namedArgs,(value,key)=>{paramCouples.push(key+"="+value);});
+
+	if(!empty(paramCouples)) result+=("?"+paramCouples.join("&"));
+
+	return result;
+};
+
+
 /* INCLUDED EXTERNAL LIBRAIRIES
 */
 "use strict";var sjcl={cipher:{},hash:{},keyexchange:{},mode:{},misc:{},codec:{},exception:{corrupt:function(a){this.toString=function(){return"CORRUPT: "+this.message};this.message=a},invalid:function(a){this.toString=function(){return"INVALID: "+this.message};this.message=a},bug:function(a){this.toString=function(){return"BUG: "+this.message};this.message=a},notReady:function(a){this.toString=function(){return"NOT READY: "+this.message};this.message=a}}};

aotrautils-srv/package.json

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