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

package/index.js

@@ -1,7 +1,6 @@
 const axios = require('axios');
-const http = require('http');
-const https = require('https');
 const axiosRetry = require('axios-retry');
+const { Logger } = require('@autofleet/node-common');
 const qs = require('qs');
 const httpAdapter = require('axios/lib/adapters/http');
 const merge = require('deepmerge');
@@ -29,6 +28,7 @@ const HTTPMethods = [
 ];
 
 const defaultSettings = {
+  timeout: 10000,
   headers: {
     'X-AF-AUTH': 'ANYONE',
     'X-IAF-ORIGIN-SERVICE': process.env.AF_SERVICE_NAME || null,
@@ -44,8 +44,12 @@ module.exports = class Network {
   constructor(settings = {}) {
     this.settings = merge(defaultSettings, settings);
     if (this.settings.keepAlive) {
-      const keepaliveAgent = new Agent();
-      const keepaliveHttpsAgent = new HttpsAgent();
+      const keepaliveAgent = new Agent({
+        maxSockets: 1000
+      });
+      const keepaliveHttpsAgent = new HttpsAgent({
+        maxSockets: 1000
+      });
       this.settings.httpAgent = keepaliveAgent;
       this.settings.httpsAgent = keepaliveHttpsAgent;
       delete this.settings.keepAlive;
@@ -63,10 +67,10 @@ module.exports = class Network {
       }
     }
 
-    this.axios = axios.create(this.settings);
-    // this.addRetry(settings);
+    this.axios = settings.cache ? setup(this.settings) : axios.create(this.settings);
+    this.addRetry(settings);
     this.buildClassHttpMethods();
-    // this.addLogs();
+    this.addLogs();
   }
 
   addRetry(settings) {
@@ -77,6 +81,30 @@ module.exports = class Network {
     });
   }
 
+  addLogs() {
+    const logger = Logger();
+    this.axios.interceptors.request.use((request) => {
+      logger.info(`Start Request: [${request.method.toUpperCase()}] ${request.baseURL} ${request.url}`, {
+        headers: request.headers,
+        query: request.query,
+        body: request.body,
+        params: request.params,
+      });
+      return request;
+    });
+
+    this.axios.interceptors.response.use((response) => {
+      logger.info(`Finish Request: [${response.config.method.toUpperCase()} ${response.config.url}`);
+      return response;
+    }, (error) => {
+      logger.error('test dor', {
+        req: error.request,
+      })
+      logger.error('Finish Request with error', { status: error.status, data: error.response && error.response.data });
+      throw error;
+    });
+  }
+
   createBaseUrl() {
     if (!this.settings.serviceUrl && !this.settings.serviceName) {
       throw new Error('At least one of the settings Missing serviceUrl or serviceName');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/network",
-  "version": "1.2.9-alpha-8",
+  "version": "1.2.9-alpha-10",
   "description": "",
   "main": "index.js",
   "scripts": {