aotrautils-srv 0.0.925 → 0.0.927

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (07/04/2024-18:24:28)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (07/04/2024-19:08:28)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5221,7 +5221,7 @@ class OpenAIAPIClient{
 		};
 
 		return new Promise((resolve,reject)=>{
-			performHTTPRequestNode(this.apiURL,"POST",headers,parameters).then((responseObj)=>{
+			performHTTPRequest(this.apiURL,"POST",headers,parameters,true).then((responseObj)=>{
 				const responseData=responseObj.responseData;
 				const data=responseData;
 				
@@ -5248,48 +5248,6 @@ class OpenAIAPIClient{
 		});
 		
 		
-// DOES NOT WORK :
-//		return new Promise((resolve,reject)=>{
-//			
-//			fetch(self.apiURL, {
-//			   method: "POST",
-//			   headers: headers,
-//			   body: JSON.stringify(parameters),
-//			  })
-//				// STRANGE : DOES NOT WORK !!:
-//		    //.then(response => response.json())
-//		    // STRANGE : DOES WORK :
-//		   .then(response => {
-//			
-//		  	 	// DBG
-//		  	  console.log("~~~~~~~~~~~response :",response);
-//		  	  
-//					return response.json();
-//				})
-//		   .then(data => {
-//			
-//					if(data.error){
-//						const error=data.error;
-//						// TRACE
-//						console.error("Error:", error);
-//						reject(""+error);
-//						return;
-//					}
-//			
-//		  	 	// DBG
-//		  	  console.log("~~~~~~~~~~~data :",data);
-//					
-//					const assistantReply = data.choices[0].message.content;
-//					resolve(assistantReply);
-//		   })
-//		   .catch(error => {
-//					// TRACE
-//					console.error("Error:", error);
-//					reject(""+error);
-//		   });
-//		});
-		
-		
 		
 		
 	}
@@ -5317,7 +5275,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 	
 
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (07/04/2024-18:24:28)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (07/04/2024-19:08:28)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -7000,27 +6958,11 @@ getListManager=function(config){
 
 
 // NO : IN A NODE CONTEXT WITH requre("") WILL RESULT IN AN UNDEFINED FUNCTION ERROR !!! 
-// function performHTTPRequestNode(...){...
+// function performHTTPRequest(...){...
 // USE THIS INSTEAD :
-performHTTPRequestNode=function(completeURL,httpMethod="GET",headers={},requestBodyOrNamedArgs=null,addCORSHeader=ADD_CORS_HEADER){
-	
-	if(!require){
-		// TODO : FIXME : Support also a browser context!!
-		lognow("ERROR : require() not found, this may need we are not running in a nodejs context. This is currently not supported. Aborting");
-		throw new Error("Unsupported context non-nodejs for performHTTPRequestNode().");
-	}
-	
-	const isSecure=(!empty(completeURL) && contains(completeURL.toLowerCase(),"https://"));
-	const httpHandler=isSecure?require("https"):require("http");
-	
-	// Options for the HTTP request
-	const options = {
-	  url: completeURL,
-	  method: httpMethod,
-	};
+performHTTPRequest=function(completeURL,httpMethod="GET",headers={},requestBodyOrNamedArgs=null,isNodeContext=false,addCORSHeader=ADD_CORS_HEADER){
 	
 	if(contains(["POST","PUT"],httpMethod)){
-		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(addCORSHeader)		headers["Access-Control-Allow-Origin"]="*";
@@ -7035,6 +6977,65 @@ performHTTPRequestNode=function(completeURL,httpMethod="GET",headers={},requestB
 		lognow("formatted API URL : "+completeURL);
 	}
 	
+	// CASE BROWSER CONTEXT :
+	if(!isNodeContext || typeof(require)=="undefined"){
+		// TRACE
+		lognow("INFO : require() not found, this may need we are not running in a nodejs context. This is currently not supported. Aborting");
+		
+		const bodyL=((contains(["POST","PUT"],httpMethod) && requestBodyOrNamedArgs)?JSON.stringify(requestBodyOrNamedArgs):null);
+		
+		return new Promise((resolve,reject)=>{
+			fetch(completeURL, {
+			   method: httpMethod,
+			   headers: headers,
+			   body: body,
+			  })
+				// STRANGE : DOES NOT WORK !!:
+		    //.then(response => response.json())
+		    // STRANGE : DOES WORK :
+		   .then(response => {
+			
+		  	 	// DBG
+		  	  console.log("~~~~~~~~~~~response :",response);
+		  	  
+					return response.json();
+				}).then(data => {
+			
+					if(data.error){
+						const error=data.error;
+						// TRACE
+						console.error("Error:", error);
+						reject(""+error);
+						return;
+					}
+			
+		  	 	// DBG
+		  	  console.log("~~~~~~~~~~~data :",data);
+					
+					resolve(data);
+		   }).catch(error => {
+					// TRACE
+					console.error("Error:", error);
+					reject(`${error}`);
+		   });
+		});
+	}// else :
+	
+	// CASE NODEJS CONTEXT :
+	
+	const isSecure=(!empty(completeURL) && contains(completeURL.toLowerCase(),"https://"));
+	const httpHandler=isSecure?require("https"):require("http");
+	
+	// Options for the HTTP request
+	const options = {
+	  url: completeURL,
+	  method: httpMethod,
+	};
+	
+	
+	if(contains(["POST","PUT"],httpMethod)){
+		options.json=true;
+	}
 	
   options.headers=headers;
   

aotrautils-srv/package.json

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