@autofleet/settings 1.2.0 → 1.2.2

package/dist/index.d.ts

@@ -4,13 +4,19 @@ import EventEmitter from 'events';
 interface SettingsClassOptions {
     serviceUrl?: string;
     ttl?: number;
+    disableTestEnvCheck?: boolean;
 }
 declare type SettingValue = string | boolean | number | any[] | never;
+interface Location {
+    lat: number;
+    lng: number;
+}
 interface Label {
     businessModelId?: string;
     demandSourceId?: string;
     fleetId?: string;
     time?: string | Date;
+    location?: Location;
 }
 declare type LabelsArray = Label[];
 interface GetSettingOption {
@@ -23,9 +29,10 @@ declare class SettingsManager {
     networkEvents: EventEmitter;
     network: any;
     NEVER_DEFAULT_VALUE: string;
+    disableTestEnvCheck: boolean;
     static get NEVER_DEFAULT_VALUE(): string;
     static readNetworkValue(networkValue: SettingValue, defaultValue: SettingValue): SettingValue;
-    constructor({ serviceUrl, ttl }?: SettingsClassOptions);
+    constructor({ serviceUrl, ttl, disableTestEnvCheck }?: SettingsClassOptions);
     get(key: SettingValue, defaultValue?: any, labels?: LabelsArray, { timeout, rejectOnFail }?: GetSettingOption): Promise<any>;
     getMultiple(settingsToGet: {
         key: SettingValue;

package/dist/index.js

@@ -22,6 +22,7 @@ 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"));
+const h3_js_1 = __importDefault(require("h3-js"));
 dotenv_1.default.config();
 const nextTick = util_1.default.promisify(process.nextTick);
 const logger = logger_1.default();
@@ -33,10 +34,11 @@ const findUrl = (serviceUrl) => serviceUrl
 class CannotGetNetworkValueError extends Error {
 }
 class SettingsManager {
-    constructor({ serviceUrl, ttl = fiveMinutes } = {}) {
+    constructor({ serviceUrl, ttl = fiveMinutes, disableTestEnvCheck = false } = {}) {
         const localServiceUrl = findUrl(serviceUrl);
         this.NEVER_DEFAULT_VALUE = SettingsManager.NEVER_DEFAULT_VALUE;
         this.ttl = ttl;
+        this.disableTestEnvCheck = disableTestEnvCheck;
         this.settingsCache = new node_cache_1.default();
         this.networkEvents = new events_1.default();
         this.network = new network_1.default({
@@ -74,7 +76,7 @@ class SettingsManager {
                 }
                 return cacheValue;
             }
-            if (process.env.NODE_ENV === 'test') {
+            if (!this.disableTestEnvCheck && process.env.NODE_ENV === 'test') {
                 return defaultValue;
             }
             let networkValue;
@@ -177,6 +179,10 @@ class SettingsManager {
             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() });
             }
+            if (l.location && l.location.lat && l.location.lng) {
+                const h3Index = h3_js_1.default.geoToH3(l.location.lat, l.location.lng, 8);
+                return Object.assign(Object.assign({}, l), { location: h3Index });
+            }
             return l;
         });
         const cacheKey = `${key}_${JSON.stringify(newLabels)}`;

package/dist/index.test.js

@@ -117,6 +117,31 @@ describe('Settings', () => {
             expect(value).toEqual('value1');
             expect(m.isDone()).toBeTruthy();
         }));
+        it('Finds with location label', () => __awaiter(void 0, void 0, void 0, function* () {
+            const location = { lat: 32.07917469952991, lng: 34.777393341064446 };
+            const labels = [{ fleetId: 'uuid', location }];
+            const m = mockSetting('key1', 'value1', labels);
+            const settings = new index_1.default({
+                serviceUrl: `http://${serviceUrl}/`,
+            });
+            const settingLabel = [{ fleetId: 'uuid', location }];
+            const value = yield settings.get('key1', 'dv', settingLabel);
+            expect(value).toEqual('value1');
+            expect(m.isDone()).toBeTruthy();
+        }));
+        it('Finds with location and time label', () => __awaiter(void 0, void 0, void 0, function* () {
+            const time = new Date();
+            const location = { lat: 32.07917469952991, lng: 34.777393341064446 };
+            const labels = [{ fleetId: 'uuid', location, time }];
+            const m = mockSetting('key1', 'value1', labels);
+            const settings = new index_1.default({
+                serviceUrl: `http://${serviceUrl}/`,
+            });
+            const settingLabel = [{ fleetId: 'uuid', location, 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.2.0",
+  "version": "1.2.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -19,6 +19,7 @@
     "@types/jest": "^22.0.0",
     "bluebird": "^3.7.2",
     "dotenv": "^8.2.0",
+    "h3-js": "^3.7.2",
     "jest": "^22.4.4",
     "moment": "^2.29.1",
     "nock": "^10.0.2",

package/src/index.test.ts

@@ -131,6 +131,35 @@ describe('Settings', () => {
       expect(m.isDone()).toBeTruthy();
     });
 
+    it('Finds with location label', async () => {
+      const location = { lat: 32.07917469952991, lng: 34.777393341064446 };
+      const labels = [{ fleetId: 'uuid', location }];
+      const m = mockSetting('key1', 'value1', labels);
+      const settings = new Settings({
+        serviceUrl: `http://${serviceUrl}/`,
+      });
+
+      const settingLabel = [{ fleetId: 'uuid', location }];
+      const value = await settings.get('key1', 'dv', settingLabel);
+      expect(value).toEqual('value1');
+      expect(m.isDone()).toBeTruthy();
+    });
+
+    it('Finds with location and time label', async () => {
+      const time = new Date();
+      const location = { lat: 32.07917469952991, lng: 34.777393341064446 };
+      const labels = [{ fleetId: 'uuid', location, time }];
+      const m = mockSetting('key1', 'value1', labels);
+      const settings = new Settings({
+        serviceUrl: `http://${serviceUrl}/`,
+      });
+
+      const settingLabel = [{ fleetId: 'uuid', location, 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

@@ -8,6 +8,7 @@ import NodeCache from 'node-cache';
 import EventEmitter from 'events';
 import util from 'util';
 import moment from 'moment';
+import h3 from 'h3-js';
 
 dotenv.config();
 
@@ -24,15 +25,21 @@ const findUrl = (serviceUrl?: string) => serviceUrl
 interface SettingsClassOptions {
   serviceUrl?: string;
   ttl?: number;
+  disableTestEnvCheck?: boolean;
 }
 
 type SettingValue = string | boolean | number | any[] | never;
 
+interface Location {
+  lat: number;
+  lng: number;
+}
 interface Label {
   businessModelId?: string;
   demandSourceId?: string;
   fleetId?: string;
   time?: string | Date;
+  location?: Location;
 }
 
 type LabelsArray = Label[];
@@ -56,6 +63,8 @@ class SettingsManager {
 
   NEVER_DEFAULT_VALUE: string;
 
+  disableTestEnvCheck: boolean;
+
   static get NEVER_DEFAULT_VALUE() {
     return 'NEVER_DEFAULT_VALUE';
   }
@@ -70,11 +79,12 @@ class SettingsManager {
     return returnValue;
   }
 
-  constructor({ serviceUrl, ttl = fiveMinutes }:SettingsClassOptions = {}) {
+  constructor({ serviceUrl, ttl = fiveMinutes, disableTestEnvCheck = false }:SettingsClassOptions = {}) {
     const localServiceUrl = findUrl(serviceUrl);
 
     this.NEVER_DEFAULT_VALUE = SettingsManager.NEVER_DEFAULT_VALUE;
     this.ttl = ttl;
+    this.disableTestEnvCheck = disableTestEnvCheck;
     this.settingsCache = new NodeCache();
     this.networkEvents = new EventEmitter();
     this.network = new Network({
@@ -109,7 +119,7 @@ class SettingsManager {
       return cacheValue;
     }
 
-    if (process.env.NODE_ENV === 'test') {
+    if (!this.disableTestEnvCheck && process.env.NODE_ENV === 'test') {
       return defaultValue;
     }
 
@@ -226,6 +236,15 @@ class SettingsManager {
           day: moment(l.time).day(),
         };
       }
+
+      if (l.location && l.location.lat && l.location.lng) {
+        const h3Index = h3.geoToH3(l.location.lat, l.location.lng, 8);
+        return {
+          ...l,
+          location: h3Index,
+        };
+      }
+
       return l;
     });