@autofleet/node-common 1.1.65 → 1.1.66

package/.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   test:
     docker:
-      - image: circleci/node:8.9.4
+      - image: circleci/node:11.14.0
     steps:
       - checkout
       - restore_cache:

package/.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: node:8.9.4
+image: node:11.14.0
 
 stages:
   - test

package/README.md

@@ -49,6 +49,14 @@ To learn more [click here](https://blog.risingstack.com/designing-microservices-
 
 ## Settings
 
+### Adding settings
+For adding new setting you need to add it to the map.js file, please specify 
+* name - descriptive name
+* description - few words about what it does + unit
+* type - supportable types: 'number', 'string', 'json'
+* defaultValue - default value
+* context - 'security' and 'operation' will not show in the simulator configuration
+
 See example.
 
 ## DeLorean

package/events/index.js

@@ -1,52 +1,21 @@
 const PubSub = require('@google-cloud/pubsub');
 const logger = require('../logger/index')();
 
-let Client;
-let Publisher;
-
-const getPubsubPublisher = async () => {
-  if (Publisher) {
-    return Publisher;
-  }
-
+// EventType - 'vehicle'/'stop_point' etc.
+const publish = (eventType, eventObj, debug = false) => {
   const envv = process.env.NODE_ENV || 'development';
   const projectId = process.env.PROJECT;
   const topic = process.env.TOPIC;
 
   if (!topic || !projectId) {
-    return {
-      debug: 'Missing project/topic',
-    };
+    return 'Missing project/topic';
   }
 
-  if ((envv === 'development' || envv === 'test')) {
-    return {
-      debug: 'Not publishing in dev/test',
-    };
+  if ((envv === 'development' || envv === 'test') && !debug) {
+    return 'Not publishing in dev/test';
   }
 
-  Client = new PubSub({ projectId });
-  Publisher = Client.topic(topic).publisher();
-
-  return {
-    client: Client,
-    publisher: Publisher,
-    topic,
-    envv,
-  };
-};
-
-// EventType - 'vehicle'/'stop_point' etc.
-const publish = (eventType, eventObj) => {
-  const {
-    debug,
-    publisher,
-    envv,
-  } = getPubsubPublisher();
-
-  if (debug) {
-    return debug;
-  }
+  const pubsubClient = new PubSub({ projectId });
 
   const msg = {
     type: eventType,
@@ -57,7 +26,9 @@ const publish = (eventType, eventObj) => {
   const data = JSON.stringify(msg);
   const dataBuffer = Buffer.from(data);
 
-  return publisher
+  return pubsubClient
+    .topic(topic)
+    .publisher()
     .publish(dataBuffer)
     .then((messageId) => {
       logger.info(`Message ${messageId} published to google pubsub`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.1.65",
+  "version": "1.1.66",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",
@@ -9,7 +9,8 @@
     "linter": "./node_modules/.bin/eslint ."
   },
   "jest": {
-    "setupTestFrameworkScriptFile": "jest-extended"
+    "setupTestFrameworkScriptFile": "jest-extended",
+    "testURL": "http://localhost:8085/"
   },
   "repository": {
     "type": "git",
@@ -18,9 +19,9 @@
   "author": "",
   "license": "ISC",
   "bugs": {
-    "url": "https://gitlab.com/AutoFleet/node-common/issues"
+    "url": "https://github.com/Autofleet/node-common/issues"
   },
-  "homepage": "https://gitlab.com/AutoFleet/node-common#README",
+  "homepage": "https://github.com/Autofleet/node-common",
   "dependencies": {
     "@google-cloud/logging-winston": "^0.10.2",
     "@google-cloud/pubsub": "^0.20.1",
@@ -29,7 +30,7 @@
     "dotenv": "^5.0.1",
     "event-pubsub": "^4.3.0",
     "express": "^4.16.2",
-    "jest": "^22.4.3",
+    "jest": "^22.4.4",
     "mock-socket": "^7.1.0",
     "node-cache": "^4.2.0",
     "node-resque": "^5.4.1",

package/settings/map.js

@@ -262,4 +262,18 @@ module.exports = {
     defaultValue: 5,
     context: 'security',
   },
+  MAXIMUM_RADIUS_FOR_STOP_POINT_UPDATE: {
+    name: 'Maximum radius for stoppoint update',
+    description: 'The maximum radius (in meters) that a stop point can be updated to',
+    type: 'number',
+    defaultValue: 1000,
+    context: 'operation',
+  },
+  DEMAND_PREDICTION_TIMEFRAMES: {
+    name: 'Demand prediction time frames',
+    description: 'Demand prediction time frames for fleet',
+    type: 'json',
+    defaultValue: '["00:00","01:00","02:00","03:00","04:00","05:00","06:00","07:00","08:00","09:00","10:00","11:00","12:00","13:00","14:00","15:00","16:00","17:00","18:00","19:00","20:00","21:00","22:00","23:00"]',
+    context: 'demand prediction',
+  },
 };