@autofleet/settings 1.4.4 → 2.0.0-beta.0

package/dist/index.d.ts

@@ -1,12 +1,14 @@
 /// <reference types="node" />
+import { LoggerInstanceManager } from '@autofleet/logger';
 import NodeCache from 'node-cache';
 import EventEmitter from 'events';
 interface SettingsClassOptions {
     serviceUrl?: string;
     ttl?: number;
     disableTestEnvCheck?: boolean;
+    logger?: LoggerInstanceManager;
 }
-declare type SettingValue = string | boolean | number | any[] | any;
+type SettingValue = string | boolean | number | any[] | any;
 interface Location {
     lat: number;
     lng: number;
@@ -19,7 +21,7 @@ interface Label {
     time?: string | Date;
     location?: Location;
 }
-declare type LabelsArray = Label[];
+type LabelsArray = Label[];
 interface GetSettingOption {
     timeout?: number;
     rejectOnFail?: boolean;
@@ -29,11 +31,12 @@ declare class SettingsManager {
     settingsCache: NodeCache;
     networkEvents: EventEmitter;
     network: any;
+    logger?: LoggerInstanceManager;
     NEVER_DEFAULT_VALUE: string;
     disableTestEnvCheck: boolean;
     static get NEVER_DEFAULT_VALUE(): string;
     static readNetworkValue(networkValue: SettingValue, defaultValue: SettingValue): any;
-    constructor({ serviceUrl, ttl, disableTestEnvCheck }?: SettingsClassOptions);
+    constructor({ serviceUrl, ttl, disableTestEnvCheck, logger, }?: SettingsClassOptions);
     get(key: SettingValue, defaultValue?: any, labels?: LabelsArray, { timeout, rejectOnFail }?: GetSettingOption): Promise<any>;
     getMultiple(settingsToGet: {
         key: SettingValue;

package/dist/index.js

@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // eslint-disable-next-line max-classes-per-file
 const dotenv_1 = __importDefault(require("dotenv"));
 const network_1 = __importDefault(require("@autofleet/network"));
-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"));
@@ -25,7 +24,6 @@ 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 fiveMinutes = 60 * 5;
 const waitingToNetwork = 'waitingToNetwork';
 const findUrl = (serviceUrl) => serviceUrl
@@ -34,17 +32,6 @@ const findUrl = (serviceUrl) => serviceUrl
 class CannotGetNetworkValueError extends Error {
 }
 class SettingsManager {
-    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({
-            serviceUrl: localServiceUrl,
-        });
-    }
     static get NEVER_DEFAULT_VALUE() {
         return 'NEVER_DEFAULT_VALUE';
     }
@@ -55,7 +42,21 @@ class SettingsManager {
         }
         return returnValue;
     }
+    constructor({ serviceUrl, ttl = fiveMinutes, disableTestEnvCheck = false, logger, } = {}) {
+        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({
+            serviceUrl: localServiceUrl,
+            keepAlive: false,
+        });
+        this.logger = logger;
+    }
     get(key, defaultValue, labels = [], { timeout = 5000, rejectOnFail = false } = {}) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (typeof defaultValue === 'undefined') {
                 throw new Error('Can\'t get a key without defaultValue');
@@ -91,7 +92,7 @@ class SettingsManager {
                 networkValue = networkResponse.data.value;
             }
             catch (error) {
-                logger.error('Cant get setting from network', { error, rejectOnFail, key });
+                (_a = this.logger) === null || _a === void 0 ? void 0 : _a.error('Cant get setting from network', { error, rejectOnFail, key });
                 if (rejectOnFail) {
                     const errorToThrow = new CannotGetNetworkValueError();
                     this.networkEvents.emit(cacheKey, errorToThrow);
@@ -112,6 +113,7 @@ class SettingsManager {
         });
     }
     getMultiple(settingsToGet, labels, { timeout = 5000, rejectOnFail = false } = {}) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const settingsToReturn = new Map();
             const settingsToFetch = [];
@@ -144,7 +146,7 @@ class SettingsManager {
                     });
                 }
                 catch (err) {
-                    logger.error('Cant get setting from network', { err });
+                    (_a = this.logger) === null || _a === void 0 ? void 0 : _a.error('Cant get setting from network', { err });
                     if (rejectOnFail) {
                         throw new CannotGetNetworkValueError();
                     }
@@ -178,7 +180,7 @@ 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.latLngToCell(l.location.lat, l.location.lng, 8);

package/dist/index.test.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_1 = __importDefault(require("./index"));
+/* eslint-disable import/no-extraneous-dependencies */
 const nock = require('nock');
 process.env.NODE_ENV = 'node-common-test';
 const serviceUrl = 'localhost:8085';
@@ -157,7 +158,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 +171,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,28 +1,23 @@
 {
   "name": "@autofleet/settings",
-  "version": "1.4.4",
+  "version": "2.0.0-beta.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
     "start": "ts-node  src/index.ts",
     "example": "ts-node  src/example.ts",
     "build": "tsc",
-    "prepublish": "npm run build",
     "linter": "./node_modules/.bin/eslint .",
     "test": "jest --forceExit",
     "coverage": "jest --coverage --forceExit --runInBand && rm -rf ./coverage",
     "dev": "nodemon"
   },
   "dependencies": {
-    "@autofleet/logger": "^1.1.0",
-    "@autofleet/network": "^1.4.2",
-    "@types/jest": "^22.0.0",
-    "bluebird": "^3.7.2",
+    "@autofleet/logger": "^4.0.6",
+    "@autofleet/network": "^1.5.1",
     "dotenv": "^8.2.0",
     "h3-js": "^4.1.0",
-    "jest": "^22.4.4",
     "moment": "^2.29.1",
-    "nock": "^10.0.2",
     "node-cache": "^5.1.2"
   },
   "devDependencies": {
@@ -30,9 +25,12 @@
     "eslint": "^7.13.0",
     "eslint-config-airbnb-typescript": "^12.0.0",
     "eslint-plugin-import": "^2.22.1",
-    "ts-jest": "^25.4.0",
-    "ts-node": "^8.6.2",
-    "typescript": "^3.9.6"
+    "ts-jest": "^29.0.3",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.7.4",
+    "jest": "^29.7.0",
+    "@types/jest": "^28.1.6",
+    "nock": "^10.0.2"
   },
   "author": "",
   "license": "ISC"

package/src/alltypes.d.ts

@@ -1,2 +1 @@
 declare module '@autofleet/network';
-declare module '@autofleet/logger';

package/src/index.test.ts

@@ -1,5 +1,6 @@
 import Settings from './index';
 
+/* eslint-disable import/no-extraneous-dependencies */
 const nock = require('nock');
 
 process.env.NODE_ENV = 'node-common-test';
@@ -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

@@ -3,7 +3,7 @@
 // eslint-disable-next-line max-classes-per-file
 import dotenv from 'dotenv';
 import Network from '@autofleet/network';
-import Logger from '@autofleet/logger';
+import { LoggerInstanceManager } from '@autofleet/logger';
 import NodeCache from 'node-cache';
 import EventEmitter from 'events';
 import util from 'util';
@@ -13,7 +13,6 @@ import h3 from 'h3-js';
 dotenv.config();
 
 const nextTick = util.promisify(process.nextTick);
-const logger = Logger();
 
 const fiveMinutes = 60 * 5;
 const waitingToNetwork = 'waitingToNetwork';
@@ -26,6 +25,7 @@ interface SettingsClassOptions {
   serviceUrl?: string;
   ttl?: number;
   disableTestEnvCheck?: boolean;
+  logger?: LoggerInstanceManager;
 }
 
 type SettingValue = string | boolean | number | any[] | any;
@@ -62,6 +62,8 @@ class SettingsManager {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   network: any;
 
+  logger?: LoggerInstanceManager;
+
   NEVER_DEFAULT_VALUE: string;
 
   disableTestEnvCheck: boolean;
@@ -80,7 +82,12 @@ class SettingsManager {
     return returnValue;
   }
 
-  constructor({ serviceUrl, ttl = fiveMinutes, disableTestEnvCheck = false }:SettingsClassOptions = {}) {
+  constructor({
+    serviceUrl,
+    ttl = fiveMinutes,
+    disableTestEnvCheck = false,
+    logger,
+  }: SettingsClassOptions = {}) {
     const localServiceUrl = findUrl(serviceUrl);
 
     this.NEVER_DEFAULT_VALUE = SettingsManager.NEVER_DEFAULT_VALUE;
@@ -90,7 +97,9 @@ class SettingsManager {
     this.networkEvents = new EventEmitter();
     this.network = new Network({
       serviceUrl: localServiceUrl,
+      keepAlive: false,
     });
+    this.logger = logger;
   }
 
   async get(
@@ -135,7 +144,7 @@ class SettingsManager {
       });
       networkValue = networkResponse.data.value;
     } catch (error) {
-      logger.error('Cant get setting from network', { error, rejectOnFail, key });
+      this.logger?.error('Cant get setting from network', { error, rejectOnFail, key });
       if (rejectOnFail) {
         const errorToThrow = new CannotGetNetworkValueError();
         this.networkEvents.emit(cacheKey, errorToThrow);
@@ -196,7 +205,7 @@ class SettingsManager {
           settingsToReturn.set(key, values[index].value);
         });
       } catch (err) {
-        logger.error('Cant get setting from network', { err });
+        this.logger?.error('Cant get setting from network', { err });
         if (rejectOnFail) {
           throw new CannotGetNetworkValueError();
         }