httpRequest now returns a promise and no longer takes a callback

lib/ApiRequest.js

@@ -2,32 +2,34 @@ const { URL, URLSearchParams } = require("url");
 const crypto = require("crypto");
 const http = require("http");
 
-function httpRequest(options, reqBody, callback) {
-	const request = http.request(options, response => {
-		let resBody = "";
-
-		response.on("data", data => {
-			resBody += data;
-		});
-
-		response.on("end", () => {
-			callback(null, JSON.parse(resBody));
+function httpRequest(options, reqBody) {
+	return new Promise((resolve, reject) => {
+		const request = http.request(options, response => {
+			let resBody = "";
+
+			response.on("data", data => {
+				resBody += data;
+			});
+
+			response.on("end", () => {
+				resolve(resBody);
+			});
+
+			response.on("error", err => {
+				reject(err);
+			});
 		});
-
-		response.on("error", err => {
-			callback(err, null);
+	
+		request.on("error", err => {
+			reject(err);
 		});
+
+		if(options.method === "POST") {
+			request.write(reqBody);
+		}
+
+		request.end();
 	});
-
-	request.on("error", err => {
-		callback(err, null);
-	});
-
-	if(options.method === "POST") {
-		request.write(reqBody);
-	}
-
-	request.end();
 }
 
 class ApiRequest {
@@ -112,21 +114,27 @@ class ApiRequest {
 			options.path += `?${querystring}`;
 		}
 
-		if(callback) {
-			httpRequest(options, querystring, callback);
+		const request = httpRequest(options, querystring)
+			.then(response => {
+				return new Promise((resolve, reject) => {
+					const data = JSON.parse(response);
 
-			return;
+					resolve(data);
+				});
+			});
+
+		if(callback) {
+			request
+				.then(data => {
+					callback(null, data);
+				})
+				.catch(err => {
+					callback(err, null);
+				});
+		}
+		else {
+			return request;
 		}
-
-		return new Promise((resolve, reject) => httpRequest(options, querystring, (err, data) => {
-			if(err) {
-				reject(err);
-
-				return;
-			}
-
-			resolve(data);
-		}));
 	}
 }