@autofleet/node-common 1.1.4 → 1.1.7

package/README.md

@@ -7,10 +7,21 @@ Make sure you have:
 * Tests
 * Docs
 
+## Consts
+
+Currently we suppurt:
+```
+  {
+    'OK'
+    'ERROR'
+    'FAIL'
+  }
+```
+
 ## Network
 Server 2 Servers communication.
 
-Implement:
+Implemented:
 * Retriving service urls from environment
 * Retry - Using https://github.com/softonic/axios-retry
 * Caching - TBD
@@ -36,7 +47,16 @@ RIDE_SERVICE_HOST=jsonplaceholder.typicode.com
 
 To learn more [click here](https://blog.risingstack.com/designing-microservices-architecture-for-failure/).
 
+## Settings
+
+See example.
+
+## DeLorean
+
+Use this model to mock time on server - more info TBD.
+
 ## Publish package
+
 bump the version number in package.json
 and run
 ```

package/consts/index.js

@@ -0,0 +1,5 @@
+module.exports = {
+  ok: 'OK',
+  error: 'ERROR',
+  fail: 'FAIL',
+};

package/network/index.js

@@ -25,7 +25,7 @@ const HTTPMethods = [
 const defaultSettings = {
   timeout: 2500,
   headers: { 'X-AF-AUTH': 'ANYONE' },
-  paramsSerializer: params => qs.stringify(params),
+  paramsSerializer: params => qs.stringify(params, { arrayFormat: 'brackets' }),
 };
 
 module.exports = class Network {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.1.4",
+  "version": "1.1.7",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",
@@ -26,9 +26,13 @@
     "axios-retry": "^3.1.0",
     "dotenv": "^5.0.1",
     "jest": "^22.4.3",
+    "mock-socket": "^7.1.0",
     "node-cache": "^4.2.0",
+    "portfinder": "^1.0.13",
     "qs": "^6.5.2",
-    "winston": "^3.0.0-rc4"
+    "winston": "^3.0.0-rc4",
+    "ws": "^5.2.0",
+    "timekeeper": "^2.1.2"
   },
   "devDependencies": {
     "eslint": "^4.19.1",

package/settings/example.js

@@ -2,7 +2,7 @@
 const Settings = require('./index');
 
 const settings = new Settings({
-  serviceUrl: 'http://localhost:8085/',
+  serviceUrl: 'http://setting-ms.autofleet.io/',
 });
 
 const fleetId = 'e7bbfcad-98a8-421d-962f-fd1c7790c789';

package/settings/index.js

@@ -8,7 +8,7 @@ require('dotenv').config();
 const fiveMinutes = 60 * 5;
 
 module.exports = class SettingsManager {
-  constructor({ serviceUrl, ttl = fiveMinutes }) {
+  constructor({ serviceUrl, ttl = fiveMinutes } = {}) {
     const localServiceUrl = serviceUrl || process.env.SETTING_MS_SERVICE_HOST;
 
     this.ttl = ttl;
@@ -31,7 +31,7 @@ module.exports = class SettingsManager {
 
     let networkValue;
     try {
-      const networkReponse = await this.network.get(`/api/v1/setting/get-setting/${key}`, {
+      const networkReponse = await this.network.get(`/api/v1/settings/get-setting/${key}`, {
         params: {
           labels,
         },

package/settings/index.test.js

@@ -4,11 +4,31 @@ const Settings = require('./index');
 const serviceUrl = 'http://localhost:8085';
 
 const mockSetting = (key, value, labels, response = 200) => nock(serviceUrl)
-  .get(`/api/v1/setting/get-setting/${key}`)
+  .get(`/api/v1/settings/get-setting/${key}`)
   .query(labels ? { labels } : undefined)
   .reply(response, { value });
 
 describe('Settings', () => {
+  it('Throws exeption if there is no defualt value', async () => {
+    const settings = new Settings({
+      serviceUrl,
+    });
+
+    expect(settings.get('key1'))
+      .rejects.toEqual(new Error('Can\'t get a key without defaultValue'));
+  });
+
+  it('Uses env.SETTING_MS_SERVICE_HOST as serivce host if no one defind', async () => {
+    const m = mockSetting('key1', 'value1');
+    process.env.SETTING_MS_SERVICE_HOST = serviceUrl;
+    const settings = new Settings();
+
+    const value = await settings.get('key1', 'dv');
+    expect(value).toEqual('value1');
+    expect(m.isDone()).toBeTruthy();
+    process.env.SETTING_MS_SERVICE_HOST = '';
+  });
+
   it('Get a key from server', async () => {
     const m = mockSetting('key1', 'value1');
     const settings = new Settings({