From 86fb220eef37c060a89967d76fe8dd73abdd6a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?William=20Lauz=C3=A9?= <william@gaiia.com>
Date: Tue, 6 Jun 2023 14:00:40 -0400
Subject: [PATCH 1/3] chore: replace request with got

---
 .gitignore                |  3 +++
 lib/apicontrollersbase.js | 38 +++++++++++++++-----------------------
 package.json              |  2 +-
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index e920c16..31198c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,6 @@ node_modules
 
 # Optional REPL history
 .node_repl_history
+
+.idea/
+yarn.lock
diff --git a/lib/apicontrollersbase.js b/lib/apicontrollersbase.js
index 877c91b..fe09aeb 100644
--- a/lib/apicontrollersbase.js
+++ b/lib/apicontrollersbase.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var request = require('request');
+var got = require('got');
 var logger = require('./logger.js').logger;
 var config = require('./config').config;
 var constants = require('./constants').constants;
@@ -92,31 +92,23 @@ class APIOperationBase {
 			reqOpts['proxy'] = config.proxy.proxyUrl;
 		}
 
-		request(reqOpts, function(error, response, body){
-			if(error) {
-				logger.error(error);
-			} else 
-			{
-				//TODO: slice added due to BOM character. remove once BOM character is removed.
-				if(typeof body!=='undefined'){
-					var responseObj = JSON.parse(body.slice(1));
+		got(reqOpts)
+			.then(response => {
+				const body = response.body;
+
+				// TODO: slice added due to BOM character. remove once BOM character is removed.
+				if (typeof body !== 'undefined') {
+					const responseObj = JSON.parse(body.slice(1));
 					logger.debug(JSON.stringify(responseObj, 2, null));
 					obj._response = responseObj;
-				/*
-				var jsonResponse = JSON.stringify(body);
-				console.log("escaped body : '" + escape(jsonResponse) + "'");
-				console.log("body : '" + jsonResponse + "'");
-				logger.debug("Response: " + JSON.stringify(body, 2, null));
-				obj._response = body;
-				*/
-				callback();
-			}
-				else
-				{
-					logger.error("Undefined Response");
+					callback();
+				} else {
+					logger.error('Undefined Response');
 				}
-			}
-		});
+			})
+			.catch(error => {
+				logger.error(error);
+			});
 
 		logger.debug('Exit APIOperationBase execute');
 	}
diff --git a/package.json b/package.json
index 853f166..5cf573b 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "test": "tests"
   },
   "dependencies": {
-    "request": "^2.72.0",
+    "got": "^13.0.0",
     "winston": "^2.2.0"
   },
   "devDependencies": {

From 5d23f6d07191620ca99a0ab3d784bb1c98708ea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?William=20Lauz=C3=A9?= <william@gaiia.com>
Date: Tue, 6 Jun 2023 15:23:56 -0400
Subject: [PATCH 2/3] attempt fix

---
 lib/apicontrollersbase.js | 20 +++++++++-----------
 package.json              |  1 +
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/apicontrollersbase.js b/lib/apicontrollersbase.js
index fe09aeb..9b9cae2 100644
--- a/lib/apicontrollersbase.js
+++ b/lib/apicontrollersbase.js
@@ -4,6 +4,7 @@ var got = require('got');
 var logger = require('./logger.js').logger;
 var config = require('./config').config;
 var constants = require('./constants').constants;
+var hpagent  = require('hpagent');
 
 class APIOperationBase {
 	constructor(apiRequest) {
@@ -80,22 +81,19 @@ class APIOperationBase {
 
 		logger.debug(JSON.stringify(this._request, 2, null));
 
-		var reqOpts = {
-			url: this._endpoint,
-			method: 'POST',
-			json: true,
-			timeout: config.timeout,
-			body: this._request
-		};
+		var reqOpts = {};
 
-		if(config.proxy.setProxy){
-			reqOpts['proxy'] = config.proxy.proxyUrl;
+		if (config.proxy.setProxy) {
+			reqOpts['agent'] = {
+				https: new hpagent.HttpsProxyAgent({
+					proxy: config.proxy.proxyUrl
+				})
+			};
 		}
 
-		got(reqOpts)
+		got(this._endpoint, { responseType: 'json', timeout: config.timeout, body: this._request, ...reqOpts })
 			.then(response => {
 				const body = response.body;
-
 				// TODO: slice added due to BOM character. remove once BOM character is removed.
 				if (typeof body !== 'undefined') {
 					const responseObj = JSON.parse(body.slice(1));
diff --git a/package.json b/package.json
index 5cf573b..7c4f843 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "got": "^13.0.0",
+    "hpagent": "^1.2.0",
     "winston": "^2.2.0"
   },
   "devDependencies": {

From b30035aa2a6cd8e65f244aef2ca31c3f6430cf38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?William=20Lauz=C3=A9?= <william@gaiia.com>
Date: Tue, 6 Jun 2023 15:56:09 -0400
Subject: [PATCH 3/3] yolo

---
 lib/apicontrollersbase.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/apicontrollersbase.js b/lib/apicontrollersbase.js
index 9b9cae2..181bfa1 100644
--- a/lib/apicontrollersbase.js
+++ b/lib/apicontrollersbase.js
@@ -81,7 +81,7 @@ class APIOperationBase {
 
 		logger.debug(JSON.stringify(this._request, 2, null));
 
-		var reqOpts = {};
+		var reqOpts = { timeout: config.timeout, json: this._request, method: 'POST' };
 
 		if (config.proxy.setProxy) {
 			reqOpts['agent'] = {
@@ -91,7 +91,7 @@ class APIOperationBase {
 			};
 		}
 
-		got(this._endpoint, { responseType: 'json', timeout: config.timeout, body: this._request, ...reqOpts })
+		got(this._endpoint, reqOpts)
 			.then(response => {
 				const body = response.body;
 				// TODO: slice added due to BOM character. remove once BOM character is removed.