@autofleet/settings 1.4.3 → 1.4.5

package/dist/index.d.ts

@@ -6,7 +6,7 @@ interface SettingsClassOptions {
     ttl?: number;
     disableTestEnvCheck?: boolean;
 }
-declare type SettingValue = string | boolean | number | any[] | any;
+type SettingValue = string | boolean | number | any[] | any;
 interface Location {
     lat: number;
     lng: number;
@@ -19,7 +19,7 @@ interface Label {
     time?: string | Date;
     location?: Location;
 }
-declare type LabelsArray = Label[];
+type LabelsArray = Label[];
 interface GetSettingOption {
     timeout?: number;
     rejectOnFail?: boolean;

package/dist/index.js

@@ -25,7 +25,7 @@ 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();
+const logger = (0, logger_1.default)();
 const fiveMinutes = 60 * 5;
 const waitingToNetwork = 'waitingToNetwork';
 const findUrl = (serviceUrl) => serviceUrl
@@ -34,6 +34,16 @@ const findUrl = (serviceUrl) => serviceUrl
 class CannotGetNetworkValueError extends Error {
 }
 class SettingsManager {
+    static get NEVER_DEFAULT_VALUE() {
+        return 'NEVER_DEFAULT_VALUE';
+    }
+    static readNetworkValue(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, disableTestEnvCheck = false } = {}) {
         const localServiceUrl = findUrl(serviceUrl);
         this.NEVER_DEFAULT_VALUE = SettingsManager.NEVER_DEFAULT_VALUE;
@@ -45,16 +55,6 @@ class SettingsManager {
             serviceUrl: localServiceUrl,
         });
     }
-    static get NEVER_DEFAULT_VALUE() {
-        return 'NEVER_DEFAULT_VALUE';
-    }
-    static readNetworkValue(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;
-    }
     get(key, defaultValue, labels = [], { timeout = 5000, rejectOnFail = false } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             if (typeof defaultValue === 'undefined') {
@@ -178,10 +178,10 @@ class SettingsManager {
     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 Object.assign(Object.assign({}, l), { time: (0, moment_1.default)(l.time).startOf('hour').format(), day: (0, 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);
+                const h3Index = h3_js_1.default.latLngToCell(l.location.lat, l.location.lng, 8);
                 return Object.assign(Object.assign({}, l), { location: h3Index });
             }
             return l;

package/dist/index.test.js

@@ -12,19 +12,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable import/no-extraneous-dependencies */
+const nock_1 = __importDefault(require("nock"));
 const index_1 = __importDefault(require("./index"));
-const nock = require('nock');
 process.env.NODE_ENV = 'node-common-test';
 const serviceUrl = 'localhost:8085';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const mockSetting = (key, value, labels = undefined, response = 200) => {
-    const n = nock(`http://${serviceUrl}`)
-        .get(`/api/v1/settings/get-setting/${key}`)
-        .query(labels ? { labels: labels.map((label) => JSON.stringify(label)) } : undefined);
+    const n = (0, nock_1.default)(`http://${serviceUrl}`).get(`/api/v1/settings/get-setting/${key}`);
+    if (labels) {
+        n.query({ labels: labels.map((label) => JSON.stringify(label)) });
+    }
     return n.reply(response, { value });
 };
 const mockMultipleSettings = (keys, values, response = 200) => {
-    const n = nock(`http://${serviceUrl}`)
+    const n = (0, nock_1.default)(`http://${serviceUrl}`)
         .post('/api/v1/settings/get-settings/_multiple', {
         keys,
         labels: [],
@@ -157,7 +159,7 @@ describe('Settings', () => {
             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', (done) => __awaiter(void 0, void 0, void 0, function* () {
+        it('Throws an error if network error and no default value and success the next time', (done) => {
             const settings = new index_1.default({
                 serviceUrl: `http://${serviceUrl}/`,
             });
@@ -170,7 +172,7 @@ describe('Settings', () => {
                 expect(m.isDone());
                 done();
             }), 100);
-        }));
+        });
         it('Values can be flushed', () => __awaiter(void 0, void 0, void 0, function* () {
             const m1 = mockSetting('key1', 'value1');
             const settings = new index_1.default({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/settings",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -13,26 +13,29 @@
     "coverage": "jest --coverage --forceExit --runInBand && rm -rf ./coverage",
     "dev": "nodemon"
   },
+  "peerDependencies": {
+    "@autofleet/logger": "*"
+  },
   "dependencies": {
-    "@autofleet/logger": "^1.1.0",
     "@autofleet/network": "^1.4.2",
-    "@types/jest": "^22.0.0",
-    "bluebird": "^3.7.2",
     "dotenv": "^8.2.0",
-    "h3-js": "^3.7.2",
-    "jest": "^22.4.4",
+    "h3-js": "^4.1.0",
     "moment": "^2.29.1",
-    "nock": "^10.0.2",
     "node-cache": "^5.1.2"
   },
   "devDependencies": {
+    "@autofleet/logger": "^4.0.6",
+    "@types/jest": "^29.5.12",
+    "@types/nock": "^10.0.3",
     "@typescript-eslint/eslint-plugin": "^4.8.1",
     "eslint": "^7.13.0",
     "eslint-config-airbnb-typescript": "^12.0.0",
     "eslint-plugin-import": "^2.22.1",
-    "ts-jest": "^25.4.0",
+    "jest": "^29.7.0",
+    "nock": "^10.0.2",
+    "ts-jest": "^29.2.3",
     "ts-node": "^8.6.2",
-    "typescript": "^3.9.6"
+    "typescript": "^4.9.5"
   },
   "author": "",
   "license": "ISC"

package/src/index.test.ts

@@ -1,16 +1,17 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import nock from 'nock';
 import Settings from './index';
 
-const nock = require('nock');
-
 process.env.NODE_ENV = 'node-common-test';
 
 const serviceUrl = 'localhost:8085';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const mockSetting = (key: string, value: string | boolean | number | never, labels: any = undefined, response = 200) => {
-  const n = nock(`http://${serviceUrl}`)
-    .get(`/api/v1/settings/get-setting/${key}`)
-    .query(labels ? { labels: labels.map((label: any) => JSON.stringify(label)) } : undefined);
+  const n = nock(`http://${serviceUrl}`).get(`/api/v1/settings/get-setting/${key}`);
+  if (labels) {
+    n.query({ labels: labels.map((label: any) => JSON.stringify(label)) });
+  }
 
   return n.reply(response, { value });
 };
@@ -179,7 +180,7 @@ describe('Settings', () => {
         .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) => {
+    it('Throws an error if network error and no default value and success the next time', (done) => {
       const settings = new Settings({
         serviceUrl: `http://${serviceUrl}/`,
       });

package/src/index.ts

@@ -240,7 +240,7 @@ class SettingsManager {
       }
 
       if (l.location && l.location.lat && l.location.lng) {
-        const h3Index = h3.geoToH3(l.location.lat, l.location.lng, 8);
+        const h3Index = h3.latLngToCell(l.location.lat, l.location.lng, 8);
         return {
           ...l,
           location: h3Index,

package/tsconfig.json

@@ -5,6 +5,7 @@
     "declaration": true,
     "outDir": "./dist",
     "strict": true,
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "skipLibCheck": true,
   }
 }