@autofleet/node-common 1.5.1 → 1.6.1

package/.dependabot/config.yml

@@ -0,0 +1,10 @@
+version: 1
+update_configs:
+  - package_manager: "javascript"
+    directory: "/"
+    update_schedule: "daily"
+    allowed_updates:
+      - match:
+          dependency_name: "@autofleet/*"
+      - match:
+          update_type: "security"

package/.github/workflows/main.yml

@@ -0,0 +1,37 @@
+# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
+
+name: Node.js Package
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  npm-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: https://registry.npmjs.org/
+      - run: npm ci
+      - run: npm run linter
+      - run: npm run coverage
+      - run: rm -rf ./coverage
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+
+  publish-npm:
+    needs: npm-test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: https://registry.npmjs.org/
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.5.1",
+  "version": "1.6.1",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/Autofleet/node-common",
   "dependencies": {
-    "@google-cloud/logging-winston": "^3.0.2",
+    "@google-cloud/logging-winston": "^0.10.2",
     "@google-cloud/pubsub": "^0.20.1",
     "axios": "^0.18.0",
     "axios-retry": "^3.1.0",

package/settings/index.js

@@ -2,7 +2,7 @@ const EventEmitter = require('events');
 const NodeCache = require('node-cache');
 const Network = require('../network');
 const Logger = require('../logger');
-const keysMap = require('./map');
+// const keysMap = require('./map');
 
 const util = require('util');
 
@@ -45,17 +45,10 @@ class SettingsManager {
     });
   }
 
-  calcRandomTtl() {
-    return this.ttl + (1 + Math.random());
-  }
-
   async get(key, defaultValue, labels = [], { timeout = 1000 } = {}) {
     if (typeof defaultValue === 'undefined') {
       throw new Error('Can\'t get a key without defaultValue');
     }
-    if (!keysMap[key]) {
-      logger.error(`Try to get settings for unknown key: ${key}`);
-    }
 
     const cacheKey = `${key}_${JSON.stringify(labels)}`;
     const cacheValue = this.settingsCache.get(cacheKey);
@@ -97,13 +90,13 @@ class SettingsManager {
       this.settingsCache.del(cacheKey);
       throw e;
     }
-    this.settingsCache.set(cacheKey, returnValue, this.calcRandomTtl());
+    this.settingsCache.set(cacheKey, returnValue, this.ttl);
     return returnValue;
   }
 
   setLocal(key, labels, value) {
     const cacheKey = `${key}_${JSON.stringify(labels)}`;
-    this.settingsCache.set(cacheKey, value, this.calcRandomTtl());
+    this.settingsCache.set(cacheKey, value, this.ttl);
   }
 
   flush() {