@autofleet/node-common 1.1.51 → 1.1.53

package/network/index.js

@@ -28,17 +28,13 @@ const defaultSettings = {
   paramsSerializer: params => qs.stringify(params, { arrayFormat: 'brackets' }),
 };
 
-const getHttpRequestObject = (response) => {
-  const maxBodySize = 1000;
-  const jsonBody = response.config.data ? JSON.stringify(response.config.data) : '';
-  return {
-    status: response.status,
-    requestUrl: response.config.url,
-    query: response.config.params,
-    body: jsonBody.length > maxBodySize ? jsonBody.substring(0, maxBodySize) : response.config.data,
-    requestMethod: response.config.method.toUpperCase(),
-  };
-};
+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 = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.1.51",
+  "version": "1.1.53",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",

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('key1', 'value1');
+    const settings = new Settings({
+      serviceUrl: `http://${serviceUrl}/`,
+    });
+
+    const [value, value2] = await Promise.all([
+      settings.get('key1', 'dv'),
+      settings.get('key1', 'dv'),
+    ]);
+    expect(value).toEqual('value1');
+    expect(m.isDone()).toBeTruthy();
+
+    expect(value2).toEqual('value1');
+  });
+
   it('Finds with labels', async () => {
     const m = mockSetting('key1', 'value1', [{ fleetId: 'uuid' }]);
     const settings = new Settings({