@autofleet/node-common 1.1.66 → 1.1.68

package/events/index.js

@@ -1,21 +1,52 @@
 const PubSub = require('@google-cloud/pubsub');
 const logger = require('../logger/index')();
 
-// EventType - 'vehicle'/'stop_point' etc.
-const publish = (eventType, eventObj, debug = false) => {
+let Client;
+let Publisher;
+
+const getPubsubPublisher = async () => {
+  if (Publisher) {
+    return Publisher;
+  }
+
   const envv = process.env.NODE_ENV || 'development';
   const projectId = process.env.PROJECT;
   const topic = process.env.TOPIC;
 
   if (!topic || !projectId) {
-    return 'Missing project/topic';
+    return {
+      debug: 'Missing project/topic',
+    };
   }
 
-  if ((envv === 'development' || envv === 'test') && !debug) {
-    return 'Not publishing in dev/test';
+  if ((envv === 'development' || envv === 'test')) {
+    return {
+      debug: 'Not publishing in dev/test',
+    };
   }
 
-  const pubsubClient = new PubSub({ projectId });
+  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 msg = {
     type: eventType,
@@ -26,9 +57,7 @@ const publish = (eventType, eventObj, debug = false) => {
   const data = JSON.stringify(msg);
   const dataBuffer = Buffer.from(data);
 
-  return pubsubClient
-    .topic(topic)
-    .publisher()
+  return 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.66",
+  "version": "1.1.68",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",

package/settings/map.js

@@ -269,11 +269,11 @@ module.exports = {
     defaultValue: 1000,
     context: 'operation',
   },
-  DEMAND_PREDICTION_TIMEFRAMES: {
+  DEMAND_PREDICTION_UTC_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"]',
+    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',
   },
 };