@autofleet/node-common 1.1.74 → 1.1.76

package/.npmignore

@@ -0,0 +1,4 @@
+node_modules
+logs
+coverage
+!.vscode/launch.json

package/package.json

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

package/settings/index.js

@@ -8,19 +8,31 @@ const logger = Logger();
 require('dotenv').config();
 
 const fiveMinutes = 60 * 5;
-const watingToNetwork = 'watingToNetwork';
+const waitingToNetwork = 'waitingToNetwork';
 
 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 {
+class SettingsManager {
+  static get NEVER_DEFAULT_VALUE() {
+    return 'NEVER_DEFAULT_VALUE';
+  }
+
   static readNetworkValue(networkValue, defaultValue) {
-    return typeof networkValue !== 'undefined' ? networkValue : defaultValue;
+    const returnValue = typeof networkValue !== 'undefined' ? networkValue : defaultValue;
+
+    if (returnValue === SettingsManager.NEVER_DEFAULT_VALUE) {
+      throw new Error('Cannot find value from network or cache, default value is set to never');
+    }
+
+    return returnValue;
   }
+
   constructor({ serviceUrl, ttl = fiveMinutes } = {}) {
     const localServiceUrl = findUrl(serviceUrl);
 
+    this.NEVER_DEFAULT_VALUE = SettingsManager.NEVER_DEFAULT_VALUE;
     this.ttl = ttl;
     this.settingsCache = new NodeCache();
     this.networkEvents = new EventEmitter();
@@ -29,7 +41,7 @@ module.exports = class SettingsManager {
     });
   }
 
-  async get(key, defaultValue, labels = []) {
+  async get(key, defaultValue, labels = [], { timeout = 1000 } = {}) {
     if (typeof defaultValue === 'undefined') {
       throw new Error('Can\'t get a key without defaultValue');
     }
@@ -41,7 +53,7 @@ module.exports = class SettingsManager {
     const cacheKey = `${key}_${JSON.stringify(labels)}`;
     const cacheValue = this.settingsCache.get(cacheKey);
     if (cacheValue !== undefined) {
-      if (watingToNetwork === cacheValue) {
+      if (waitingToNetwork === cacheValue) {
         return new Promise((resolve) => {
           this.networkEvents.once(cacheKey, (networkValue) => {
             resolve(SettingsManager.readNetworkValue(networkValue, defaultValue));
@@ -57,12 +69,12 @@ module.exports = class SettingsManager {
 
     let networkValue;
     try {
-      this.settingsCache.set(cacheKey, watingToNetwork, this.ttl);
+      this.settingsCache.set(cacheKey, waitingToNetwork, this.ttl);
       const networkReponse = await this.network.get(`/api/v1/settings/get-setting/${key}`, {
         params: {
           labels,
         },
-        timeout: 1000,
+        timeout,
       });
       networkValue = networkReponse.data.value;
     } catch (error) {
@@ -70,7 +82,13 @@ module.exports = class SettingsManager {
     }
 
     this.networkEvents.emit(cacheKey, networkValue);
-    const returnValue = SettingsManager.readNetworkValue(networkValue, defaultValue);
+    let returnValue;
+    try {
+      returnValue = SettingsManager.readNetworkValue(networkValue, defaultValue);
+    } catch (e) {
+      this.settingsCache.del(cacheKey);
+      throw e;
+    }
     this.settingsCache.set(cacheKey, returnValue, this.ttl);
     return returnValue;
   }
@@ -83,4 +101,6 @@ module.exports = class SettingsManager {
   flush() {
     return this.settingsCache.flushAll();
   }
-};
+}
+
+module.exports = SettingsManager;

package/settings/index.test.js

@@ -36,7 +36,7 @@ describe('Settings', () => {
     expect(await settings.get('key1', false)).toBe(false);
   });
 
-  it('Uses env.SETTING_MS_SERVICE_HOST as serivce host if no one defind', async () => {
+  it('Uses env.SETTING_MS_SERVICE_HOST as service host if no one defined', async () => {
     const m = mockSetting('key1', 'value1');
     process.env.SETTING_MS_SERVICE_HOST = serviceUrl;
     const settings = new Settings();
@@ -109,11 +109,40 @@ describe('Settings', () => {
     expect(value).toEqual('dv');
   });
 
+  it('Throws an error if network error and no default value', async () => {
+    const settings = new Settings({
+      serviceUrl: `http://${serviceUrl}/`,
+    });
+
+    const f = () => settings.get('key1', settings.NEVER_DEFAULT_VALUE, [{ fleetId: 'uuid' }]);
+    expect(f())
+      .rejects.toEqual(new Error('Cannot find value from network or cache, default value is set to never'));
+  });
+
+  it('Throws an error if network error and no default value and success the next time', async (done) => {
+    const settings = new Settings({
+      serviceUrl: `http://${serviceUrl}/`,
+    });
+
+    const f = () => settings.get('key1', settings.NEVER_DEFAULT_VALUE);
+    expect(f())
+      .rejects.toEqual(new Error('Cannot find value from network or cache, default value is set to never'));
+
+
+    setTimeout(async () => {
+      const m = mockSetting('key1', 'value1');
+      expect(await settings.get('key1', settings.NEVER_DEFAULT_VALUE)).toEqual('value1');
+      expect(m.isDone());
+      done();
+    }, 100);
+  });
+
   it('Values can be flushed', async () => {
     const m1 = mockSetting('key1', 'value1');
     const settings = new Settings({
       serviceUrl: `http://${serviceUrl}/`,
     });
+    settings.flush();
 
     const value = await settings.get('key1', 'dv');
     expect(value).toEqual('value1');