@autofleet/node-common 1.1.52 → 1.1.54

package/network/index.js

@@ -11,6 +11,7 @@ require('dotenv').config();
 if (process.env.NODE_ENV === 'test') {
   axios.defaults.adapter = httpAdapter;
 }
+
 const HTTPMethods = [
   'get',
   'post',
@@ -20,42 +21,32 @@ const HTTPMethods = [
   'patch',
   'options',
 ];
+
 const defaultSettings = {
   timeout: 2500,
   headers: { 'X-AF-AUTH': 'ANYONE' },
   paramsSerializer: params => qs.stringify(params, { arrayFormat: 'brackets' }),
 };
-const getHttpResponseObject = (response) => {
-  const maxBodySize = 1000;
-  const jsonBody = response.config.data ? JSON.stringify(response.config.data) : '';
-  const body = jsonBody.length > maxBodySize ? jsonBody.substring(0, maxBodySize) : response.config.data;
-  return {
-    status: response.status,
-    requestUrl: response.config.url,
-    query: response.config.params,
-    body,
-    requestMethod: response.config.method.toUpperCase(),
-  };
-};
-const getHttpRequestObject = (request) => {
-  const maxBodySize = 1000;
-  const jsonBody = request.data ? JSON.stringify(request.data) : '';
-  const body = jsonBody.length > maxBodySize ? jsonBody.substring(0, maxBodySize) : request.data;
-  return {
-    headers: request.headers,
-    query: request.params,
-    body,
-  };
-}
+
+const getHttpRequestObject = response => ({
+  status: response.status,
+  requestUrl: response.config.url,
+  query: response.config.params,
+  body: response.config.data,
+  requestMethod: response.config.method.toUpperCase(),
+});
+
 module.exports = class Network {
   constructor(settings = {}) {
     this.settings = Object.assign({}, defaultSettings, settings);
     this.createBaseUrl();
+
     this.axios = axios.create(this.settings);
     this.addRetry(settings);
     this.buildClassHttpMethods();
     this.addLogs();
   }
+
   addRetry(settings) {
     axiosRetry(this.axios, {
       retries: 0,
@@ -63,25 +54,33 @@ module.exports = class Network {
       ...settings,
     });
   }
+
   addLogs() {
     const logger = Logger();
     this.axios.interceptors.request.use((request) => {
-      logger.info(`Start Request: [${request.method.toUpperCase()}] ${request.baseURL} ${request.url}`, getHttpRequestObject(request));
+      logger.info(`Start Request: [${request.method.toUpperCase()}] ${request.baseURL} ${request.url}`, {
+        headers: request.headers,
+        query: request.params,
+        body: request.data,
+      });
       return request;
     });
+
     this.axios.interceptors.response.use((response) => {
-      logger.info(`Finish Request: [${response.config.method.toUpperCase()} ${response.config.url}`, getHttpResponseObject(response));
+      logger.info(`Finish Request: [${response.config.method.toUpperCase()} ${response.config.url}`, getHttpRequestObject(response));
       return response;
     }, (error) => {
-      logger.error('Finish Request with error', { data: error.response ? error.response.data : undefined, ...getHttpResponseObject(error.response || error) });
+      logger.error('Finish Request with error', { data: error.response ? error.response.data : undefined, ...getHttpRequestObject(error.response || error) });
       // throw error;
       return error;
     });
   }
+
   createBaseUrl() {
     if (!this.settings.serviceUrl && !this.settings.serviceName) {
       throw new Error('At least one of the settings Missing serviceUrl or serviceName');
     }
+
     const { settings } = this;
     if (settings.serviceUrl) {
       settings.baseURL = settings.serviceUrl;
@@ -93,6 +92,7 @@ module.exports = class Network {
       }
     }
   }
+
   /**
    * Build class methods that wrap axios methods
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.1.52",
+  "version": "1.1.54",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",
@@ -22,10 +22,8 @@
   },
   "homepage": "https://gitlab.com/AutoFleet/node-common#README",
   "dependencies": {
-    "@google-cloud/logging-winston": "^0.10.1",
-    "@google-cloud/monitoring": "^0.6.0",
-    "@google-cloud/profiler": "^0.2.0",
-    "@google-cloud/pubsub": "^0.19.0",
+    "@google-cloud/logging-winston": "^0.10.2",
+    "@google-cloud/pubsub": "^0.20.1",
     "axios": "^0.18.0",
     "axios-retry": "^3.1.0",
     "dotenv": "^5.0.1",

package/settings/index.js

@@ -1,3 +1,4 @@
+const EventEmitter = require('events');
 const NodeCache = require('node-cache');
 const Network = require('../network');
 const Logger = require('../logger');
@@ -6,17 +7,22 @@ const logger = Logger();
 require('dotenv').config();
 
 const fiveMinutes = 60 * 5;
+const watingToNetwork = 'watingToNetwork';
 
 const findUrl = serviceUrl => serviceUrl ||
   (process.env.SETTING_MS_SERVICE_HOST && process.env.SETTING_MS_SERVICE_HOST.length > 0 ? `http://${process.env.SETTING_MS_SERVICE_HOST}/` : undefined) ||
   (process.env.NODE_ENV !== 'test' ? 'http://setting-ms.autofleet.io/' : 'http://localhost:9999/');
 
 module.exports = class SettingsManager {
+  static readNetworkValue(networkValue, defaultValue) {
+    return typeof networkValue !== 'undefined' ? networkValue : defaultValue;
+  }
   constructor({ serviceUrl, ttl = fiveMinutes } = {}) {
     const localServiceUrl = findUrl(serviceUrl);
 
     this.ttl = ttl;
     this.settingsCache = new NodeCache();
+    this.networkEvents = new EventEmitter();
     this.network = new Network({
       serviceUrl: localServiceUrl,
     });
@@ -30,6 +36,13 @@ module.exports = class SettingsManager {
     const cacheKey = `${key}_${JSON.stringify(labels)}`;
     const cacheValue = this.settingsCache.get(cacheKey);
     if (cacheValue !== undefined) {
+      if (watingToNetwork === cacheValue) {
+        return new Promise((resolve) => {
+          this.networkEvents.once(cacheKey, (networkValue) => {
+            resolve(SettingsManager.readNetworkValue(networkValue, defaultValue));
+          });
+        });
+      }
       return cacheValue;
     }
 
@@ -39,6 +52,7 @@ module.exports = class SettingsManager {
 
     let networkValue;
     try {
+      this.settingsCache.set(cacheKey, watingToNetwork, this.ttl);
       const networkReponse = await this.network.get(`/api/v1/settings/get-setting/${key}`, {
         params: {
           labels,
@@ -50,7 +64,8 @@ module.exports = class SettingsManager {
       logger.error('Cant get setting from network');
     }
 
-    const returnValue = typeof networkValue !== 'undefined' ? networkValue : defaultValue;
+    this.networkEvents.emit(cacheKey, networkValue);
+    const returnValue = SettingsManager.readNetworkValue(networkValue, defaultValue);
     this.settingsCache.set(cacheKey, returnValue, this.ttl);
     return returnValue;
   }

package/settings/index.test.js

@@ -72,6 +72,23 @@ describe('Settings', () => {
     expect(value2).toEqual('value1');
   });
 
+
+  it('Use only one request for similar keys', async () => {
+    const m = mockSetting('key1EM', 'value1EM');
+    const settings = new Settings({
+      serviceUrl: `http://${serviceUrl}/`,
+    });
+
+    const [value, value2] = await Promise.all([
+      settings.get('key1EM', 'dv'),
+      settings.get('key1EM', 'dv'),
+    ]);
+    expect(value).toEqual('value1EM');
+    expect(m.isDone()).toBeTruthy();
+
+    expect(value2).toEqual('value1EM');
+  });
+
   it('Finds with labels', async () => {
     const m = mockSetting('key1', 'value1', [{ fleetId: 'uuid' }]);
     const settings = new Settings({