@autofleet/settings 1.1.3 → 1.2.0

package/dist/index.d.ts

@@ -10,6 +10,7 @@ interface Label {
     businessModelId?: string;
     demandSourceId?: string;
     fleetId?: string;
+    time?: string | Date;
 }
 declare type LabelsArray = Label[];
 interface GetSettingOption {
@@ -32,5 +33,6 @@ declare class SettingsManager {
     }[], labels: LabelsArray, { timeout, rejectOnFail }?: GetSettingOption): Promise<any>;
     setLocal(key: string, labels: LabelsArray, value: SettingValue): void;
     flush(): void;
+    getCacheKey(key: SettingValue, labels: LabelsArray): string;
 }
 export default SettingsManager;

package/dist/index.js

@@ -21,6 +21,7 @@ const logger_1 = __importDefault(require("@autofleet/logger"));
 const node_cache_1 = __importDefault(require("node-cache"));
 const events_1 = __importDefault(require("events"));
 const util_1 = __importDefault(require("util"));
+const moment_1 = __importDefault(require("moment"));
 dotenv_1.default.config();
 const nextTick = util_1.default.promisify(process.nextTick);
 const logger = logger_1.default();
@@ -57,13 +58,16 @@ class SettingsManager {
             if (typeof defaultValue === 'undefined') {
                 throw new Error('Can\'t get a key without defaultValue');
             }
-            const cacheKey = `${key}_${JSON.stringify(labels)}`;
+            const cacheKey = this.getCacheKey(key, labels);
             const cacheValue = this.settingsCache.get(cacheKey);
             if (cacheValue !== undefined) {
                 if (waitingToNetwork === cacheValue) {
                     yield nextTick();
-                    return new Promise((resolve) => {
+                    return new Promise((resolve, reject) => {
                         this.networkEvents.once(cacheKey, (networkValue) => {
+                            if (networkValue instanceof Error && rejectOnFail) {
+                                return reject(networkValue);
+                            }
                             resolve(SettingsManager.readNetworkValue(networkValue, defaultValue));
                         });
                     });
@@ -87,7 +91,9 @@ class SettingsManager {
             catch (error) {
                 logger.error('Cant get setting from network', { error });
                 if (rejectOnFail) {
-                    throw new CannotGetNetworkValueError();
+                    const errorToThrow = new CannotGetNetworkValueError();
+                    this.networkEvents.emit(cacheKey, errorToThrow);
+                    throw errorToThrow;
                 }
             }
             this.networkEvents.emit(cacheKey, networkValue);
@@ -108,7 +114,7 @@ class SettingsManager {
             const settingsToReturn = new Map();
             const settingsToFetch = [];
             settingsToGet.map((obj) => {
-                const cacheKey = `${obj.key}_${JSON.stringify(labels)}`;
+                const cacheKey = this.getCacheKey(obj.key, labels);
                 const cacheValue = this.settingsCache.get(cacheKey);
                 if (cacheValue) {
                     settingsToReturn.set(obj.key, cacheValue);
@@ -144,7 +150,7 @@ class SettingsManager {
                 }
             }
             return settingsToGet.map((setting) => {
-                const cacheKey = `${setting.key}_${JSON.stringify(labels)}`;
+                const cacheKey = this.getCacheKey(setting.key, labels);
                 let returnValue;
                 try {
                     returnValue = SettingsManager.readNetworkValue(settingsToReturn.get(setting.key), setting.defaultValue);
@@ -159,11 +165,22 @@ class SettingsManager {
         });
     }
     setLocal(key, labels, value) {
-        const cacheKey = `${key}_${JSON.stringify(labels)}`;
+        const cacheKey = this.getCacheKey(key, labels);
         this.settingsCache.set(cacheKey, value, this.ttl);
     }
     flush() {
         return this.settingsCache.flushAll();
     }
+    // eslint-disable-next-line class-methods-use-this
+    getCacheKey(key, labels) {
+        const newLabels = labels.map((l) => {
+            if (l.time) {
+                return Object.assign(Object.assign({}, l), { time: moment_1.default(l.time).startOf('hour').format(), day: moment_1.default(l.time).day() });
+            }
+            return l;
+        });
+        const cacheKey = `${key}_${JSON.stringify(newLabels)}`;
+        return cacheKey;
+    }
 }
 exports.default = SettingsManager;

package/dist/index.test.js

@@ -105,6 +105,18 @@ describe('Settings', () => {
             expect(value).toEqual('value1');
             expect(m.isDone()).toBeTruthy();
         }));
+        it('Finds with time label', () => __awaiter(void 0, void 0, void 0, function* () {
+            const time = new Date();
+            const labels = [{ fleetId: 'uuid', time }];
+            const m = mockSetting('key1', 'value1', labels);
+            const settings = new index_1.default({
+                serviceUrl: `http://${serviceUrl}/`,
+            });
+            const settingLabel = [{ fleetId: 'uuid', time }];
+            const value = yield settings.get('key1', 'dv', settingLabel);
+            expect(value).toEqual('value1');
+            expect(m.isDone()).toBeTruthy();
+        }));
         it('Returns default value when network error', () => __awaiter(void 0, void 0, void 0, function* () {
             const settings = new index_1.default({
                 serviceUrl: `http://${serviceUrl}/`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/settings",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -20,6 +20,7 @@
     "bluebird": "^3.7.2",
     "dotenv": "^8.2.0",
     "jest": "^22.4.4",
+    "moment": "^2.29.1",
     "nock": "^10.0.2",
     "node-cache": "^5.1.2"
   },

package/src/index.test.ts

@@ -117,6 +117,20 @@ describe('Settings', () => {
       expect(m.isDone()).toBeTruthy();
     });
 
+    it('Finds with time label', async () => {
+      const time = new Date();
+      const labels = [{ fleetId: 'uuid', time }];
+      const m = mockSetting('key1', 'value1', labels);
+      const settings = new Settings({
+        serviceUrl: `http://${serviceUrl}/`,
+      });
+
+      const settingLabel = [{ fleetId: 'uuid', time }];
+      const value = await settings.get('key1', 'dv', settingLabel);
+      expect(value).toEqual('value1');
+      expect(m.isDone()).toBeTruthy();
+    });
+
     it('Returns default value when network error', async () => {
       const settings = new Settings({
         serviceUrl: `http://${serviceUrl}/`,

package/src/index.ts

@@ -7,6 +7,7 @@ import Logger from '@autofleet/logger';
 import NodeCache from 'node-cache';
 import EventEmitter from 'events';
 import util from 'util';
+import moment from 'moment';
 
 dotenv.config();
 
@@ -31,6 +32,7 @@ interface Label {
   businessModelId?: string;
   demandSourceId?: string;
   fleetId?: string;
+  time?: string | Date;
 }
 
 type LabelsArray = Label[];
@@ -90,13 +92,16 @@ class SettingsManager {
       throw new Error('Can\'t get a key without defaultValue');
     }
 
-    const cacheKey = `${key}_${JSON.stringify(labels)}`;
+    const cacheKey = this.getCacheKey(key, labels);
     const cacheValue = this.settingsCache.get(cacheKey);
     if (cacheValue !== undefined) {
       if (waitingToNetwork === cacheValue) {
         await nextTick();
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
           this.networkEvents.once(cacheKey, (networkValue) => {
+            if (networkValue instanceof Error && rejectOnFail) {
+              return reject(networkValue);
+            }
             resolve(SettingsManager.readNetworkValue(networkValue, defaultValue));
           });
         });
@@ -121,7 +126,9 @@ class SettingsManager {
     } catch (error) {
       logger.error('Cant get setting from network', { error });
       if (rejectOnFail) {
-        throw new CannotGetNetworkValueError();
+        const errorToThrow = new CannotGetNetworkValueError();
+        this.networkEvents.emit(cacheKey, errorToThrow);
+        throw errorToThrow;
       }
     }
 
@@ -149,7 +156,7 @@ class SettingsManager {
     const settingsToFetch: any[] = [];
 
     settingsToGet.map((obj) => {
-      const cacheKey = `${obj.key}_${JSON.stringify(labels)}`;
+      const cacheKey = this.getCacheKey(obj.key, labels);
       const cacheValue = this.settingsCache.get(cacheKey);
       if (cacheValue) {
         settingsToReturn.set(obj.key, cacheValue);
@@ -187,7 +194,7 @@ class SettingsManager {
     }
 
     return settingsToGet.map((setting: any) => {
-      const cacheKey = `${setting.key}_${JSON.stringify(labels)}`;
+      const cacheKey = this.getCacheKey(setting.key, labels);
       let returnValue;
       try {
         returnValue = SettingsManager.readNetworkValue(settingsToReturn.get(setting.key), setting.defaultValue);
@@ -201,13 +208,30 @@ class SettingsManager {
   }
 
   setLocal(key: string, labels: LabelsArray, value: SettingValue) {
-    const cacheKey = `${key}_${JSON.stringify(labels)}`;
+    const cacheKey = this.getCacheKey(key, labels);
     this.settingsCache.set(cacheKey, value, this.ttl);
   }
 
   flush() {
     return this.settingsCache.flushAll();
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  getCacheKey(key: SettingValue, labels: LabelsArray) {
+    const newLabels = labels.map((l) => {
+      if (l.time) {
+        return {
+          ...l,
+          time: moment(l.time).startOf('hour').format(),
+          day: moment(l.time).day(),
+        };
+      }
+      return l;
+    });
+
+    const cacheKey = `${key}_${JSON.stringify(newLabels)}`;
+    return cacheKey;
+  }
 }
 
 export default SettingsManager;