@autofleet/network 1.2.9-alpha-6 → 1.2.9-alpha-8

package/index.js

@@ -1,13 +1,13 @@
-const undici = require('undici');
+const axios = require('axios');
 const http = require('http');
 const https = require('https');
-// const axiosRetry = require('axios-retry');
+const axiosRetry = require('axios-retry');
 const qs = require('qs');
-// const httpAdapter = require('axios/lib/adapters/http');
+const httpAdapter = require('axios/lib/adapters/http');
 const merge = require('deepmerge');
 const { setup } = require('axios-cache-adapter');
-// const Agent = require('agentkeepalive');
-// const HttpsAgent = require('agentkeepalive').HttpsAgent;
+const Agent = require('agentkeepalive');
+const HttpsAgent = require('agentkeepalive').HttpsAgent;
 
 require('dotenv').config();
 /**
@@ -43,27 +43,27 @@ const defaultSettings = {
 module.exports = class Network {
   constructor(settings = {}) {
     this.settings = merge(defaultSettings, settings);
-    // if (this.settings.keepAlive) {
-    //   const keepaliveAgent = new Agent();
-    //   const keepaliveHttpsAgent = new HttpsAgent();
-    //   this.settings.httpAgent = keepaliveAgent;
-    //   this.settings.httpsAgent = keepaliveHttpsAgent;
-    //   delete this.settings.keepAlive;
-    // }
+    if (this.settings.keepAlive) {
+      const keepaliveAgent = new Agent();
+      const keepaliveHttpsAgent = new HttpsAgent();
+      this.settings.httpAgent = keepaliveAgent;
+      this.settings.httpsAgent = keepaliveHttpsAgent;
+      delete this.settings.keepAlive;
+    }
     this.createBaseUrl();
 
-    // if(settings.cache) {
-    //   this.settings.cache = {
-    //     maxAge: 15 * 60 * 1000,
-    //     exclude: {
-    //       // Store responses from requests with query parameters in cache
-    //       query: false
-    //     },
-    //     ...settings.cache,
-    //   }
-    // }
+    if(settings.cache) {
+      this.settings.cache = {
+        maxAge: 15 * 60 * 1000,
+        exclude: {
+          // Store responses from requests with query parameters in cache
+          query: false
+        },
+        ...settings.cache,
+      }
+    }
 
-    // this.axios = axios.create(this.settings);
+    this.axios = axios.create(this.settings);
     // this.addRetry(settings);
     this.buildClassHttpMethods();
     // this.addLogs();
@@ -99,20 +99,7 @@ module.exports = class Network {
    */
   buildClassHttpMethods() {
     HTTPMethods.forEach((method) => {
-      this[method] = async (...args) => {
-        const {
-          statusCode,
-          headers,
-          trailers,
-          body
-        } = await request(`${settings.baseURL}${args[0]}`, {
-          body: args[1]
-        });
-
-        return {
-          data: await body.json(),
-        }
-      }
+      this[method] = (...args) => this.axios[method](...args);
     });
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/network",
-  "version": "1.2.9-alpha-6",
+  "version": "1.2.9-alpha-8",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,7 +22,7 @@
     "undici": "^4.4.4"
   },
   "devDependencies": {
-    "jest": "22.4.3",
+    "jest": "^27.0.6",
     "nock": "^10.0.0"
   }
 }