use axios package

Author: jochen-testingbot

lib/api.js

@@ -3,8 +3,9 @@
 const querystring = require('querystring');
 const fs = require('fs');
 const path = require('path');
-const request = require('request');
+const axios = require('axios');
 const crypto = require('crypto');
+const FormData = require('form-data');
 const os = require('os');
 
 class TestingBot {
@@ -14,18 +15,22 @@ class TestingBot {
     this.options.api_secret = this.options.api_secret || process.env.TESTINGBOT_SECRET || process.env.TB_SECRET || null;
 
     if (!this.options.api_key || !this.options.api_secret) {
-      try {
-        const tbFile = path.join(os.homedir(), '.testingbot');
-        if (fs.statSync(tbFile).isFile() === true) {
-          const data = fs.readFileSync(tbFile);
-          if (data !== null) {
-            const arr = data.toString().replace('\n', '').split(':');
-            this.options.api_key = arr[0];
-            this.options.api_secret = arr[1];
-          }
+      this._loadConfig();
+    }
+  }
+
+  _loadConfig () {
+    try {
+      const tbFile = path.join(os.homedir(), '.testingbot');
+      if (fs.statSync(tbFile).isFile() === true) {
+        const data = fs.readFileSync(tbFile);
+        if (data !== null) {
+          const arr = data.toString().replace('\n', '').split(':');
+          this.options.api_key = arr[0];
+          this.options.api_secret = arr[1];
         }
-      } catch (e) {
       }
+    } catch (e) {
     }
   }
 
@@ -264,31 +269,32 @@ class TestingBot {
   }
 
   uploadFile (localFilePath, callback) {
-    const executeRequest = (resolve, reject) => {
+    const executeRequest = async (resolve, reject) => {
+      const form = new FormData();
+      form.append('file', fs.createReadStream(localFilePath));
+
       const requestOptions = {
         method: 'POST',
-        uri: 'https://api.testingbot.com/v1/storage',
+        url: 'https://api.testingbot.com/v1/storage',
         auth: {
-          user: this.options.api_key,
-          pass: this.options.api_secret,
-          sendImmediately: true
+          username: this.options.api_key,
+          password: this.options.api_secret
         },
-        formData: {
-          file: fs.createReadStream(localFilePath)
+        data: form,
+        headers: form.getHeaders(),
+        validateStatus: function (status) {
+          return true; // Accept any status code to handle errors ourselves
         }
       };
 
-      request(requestOptions, function (error, response) {
-        let responseBody = null;
-        if (response) {
-          if (response.body && typeof (response.body) === 'string') {
-            response.body = JSON.parse(response.body);
-          }
-          if (response.statusCode.toString().substring(0, 1) === '2') {
-            responseBody = response.body;
-          } else {
-            error = response.body;
-          }
+      try {
+        const response = await axios(requestOptions);
+        let responseBody = response.data;
+        let error = null;
+
+        if (response.status.toString().substring(0, 1) !== '2') {
+          error = responseBody;
+          responseBody = null;
         }
 
         if (callback) {
@@ -300,11 +306,19 @@ class TestingBot {
             resolve(responseBody);
           }
         }
-      });
+      } catch (err) {
+        const error = err.response ? err.response.data : err.message;
+        if (callback) {
+          callback(error, null);
+        } else if (reject) {
+          reject(error);
+        }
+      }
     };
 
     if (callback) {
-      return executeRequest(null, null);
+      executeRequest(null, null);
+      return;
     }
 
     return new Promise(executeRequest);
@@ -402,46 +416,56 @@ class TestingBot {
   }
 
   request (reqData, callback) {
-    const executeRequest = (resolve, reject) => {
-      let requestPath = '/v1' + reqData.url;
-      if (reqData.method === 'GET' && reqData.data) {
-        requestPath = requestPath + '?' + querystring.stringify(reqData.data);
-      }
+    const executeRequest = async (resolve, reject) => {
+      const requestPath = '/v1' + reqData.url;
       const requestOptions = {
         method: reqData.method,
-        uri: 'https://api.testingbot.com' + requestPath,
+        url: 'https://api.testingbot.com' + requestPath,
         auth: {
-          user: this.options.api_key,
-          pass: this.options.api_secret,
-          sendImmediately: true
+          username: this.options.api_key,
+          password: this.options.api_secret
+        },
+        validateStatus: function (status) {
+          return true; // Accept any status code to handle errors ourselves
         }
       };
 
-      if (reqData.method !== 'GET') {
+      if (reqData.method === 'GET' && reqData.data) {
+        requestOptions.params = reqData.data;
+      } else if (reqData.method !== 'GET') {
         if (reqData.json) {
-          requestOptions.json = true;
-          requestOptions.body = reqData.data;
+          requestOptions.headers = { 'Content-Type': 'application/json' };
+          requestOptions.data = reqData.data;
         } else {
-          requestOptions.form = reqData.data;
+          requestOptions.headers = { 'Content-Type': 'application/x-www-form-urlencoded' };
+          // Flatten nested objects for form-encoded data
+          const flattenObject = (obj, prefix = '') => {
+            const flattened = {};
+            Object.keys(obj).forEach(key => {
+              const value = obj[key];
+              const newKey = prefix ? prefix + '[' + key + ']' : key;
+              if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+                Object.assign(flattened, flattenObject(value, newKey));
+              } else {
+                flattened[newKey] = value;
+              }
+            });
+            return flattened;
+          };
+          requestOptions.data = querystring.stringify(flattenObject(reqData.data || {}));
         }
       }
 
-      request(requestOptions, function (error, response) {
-        let responseBody = null;
-        if (response) {
-          if (!reqData.json && response.body && typeof (response.body) === 'string') {
-            try {
-              response.body = JSON.parse(response.body);
-            } catch (e) {
-              // keep body as string if JSON parsing fails
-            }
-          }
-          if (response.statusCode.toString().substring(0, 1) === '2') {
-            responseBody = response.body;
-          } else {
-            error = response.body;
-          }
+      try {
+        const response = await axios(requestOptions);
+        let responseBody = response.data;
+        let error = null;
+
+        if (response.status.toString().substring(0, 1) !== '2') {
+          error = responseBody;
+          responseBody = null;
         }
+
         if (callback) {
           callback(error, responseBody);
         } else if (resolve && reject) {
@@ -451,11 +475,19 @@ class TestingBot {
             resolve(responseBody);
           }
         }
-      });
+      } catch (err) {
+        const error = err.response ? err.response.data : err.message;
+        if (callback) {
+          callback(error, null);
+        } else if (reject) {
+          reject(error);
+        }
+      }
     };
 
     if (callback) {
-      return executeRequest(null, null);
+      executeRequest(null, null);
+      return;
     }
 
     return new Promise(executeRequest);