@autofleet/node-common 1.1.62 → 1.1.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.1.62",
+  "version": "1.1.64",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",

package/queue/index.js

@@ -28,6 +28,11 @@ class AfQueue {
 
     this.existing = true;
     logger.info('Will remove AfQueue');
+
+    if (this.worker) {
+      await this.worker.end();
+    }
+
     if (this.queue) {
       await this.queue.end();
     }
@@ -36,13 +41,7 @@ class AfQueue {
       await this.scheduler.end();
     }
 
-
-    if (this.worker) {
-      this.worker.on('end', process.exit);
-      await this.worker.end();
-    } else {
-      process.exit();
-    }
+    process.exit();
   }
 
   async init(connectionDetails, workerSettings, shouldCreateQueue = true) {
@@ -62,7 +61,6 @@ class AfQueue {
       promiseArr.push(this.startWorker(redisConf, workerSettings));
     }
 
-    process.on('SIGINT', this.exitHandler.bind(this));
     process.on('SIGINT', this.exitHandler.bind(this));
     process.on('SIGTERM', this.exitHandler.bind(this));
 

package/settings/index.js

@@ -2,6 +2,7 @@ const EventEmitter = require('events');
 const NodeCache = require('node-cache');
 const Network = require('../network');
 const Logger = require('../logger');
+const keysMap = require('./map');
 
 const logger = Logger();
 require('dotenv').config();
@@ -32,6 +33,10 @@ module.exports = class SettingsManager {
     if (typeof defaultValue === 'undefined') {
       throw new Error('Can\'t get a key without defaultValue');
     }
+    if (!keysMap[key]) {
+      // TODO: Throw error here after done with mapping all keys
+      logger.error(`Try to get settings for unknown key: ${key}`);
+    }
 
     const cacheKey = `${key}_${JSON.stringify(labels)}`;
     const cacheValue = this.settingsCache.get(cacheKey);

package/settings/map.js

@@ -0,0 +1,265 @@
+module.exports = {
+  MAP_PROVIDER: {
+    name: 'Map provider',
+    description: 'The map provider',
+    type: 'string',
+    defaultValue: 'osrm',
+    context: 'maps',
+  },
+  H3_LEVEL: {
+    name: 'H3 level',
+    description: '',
+    type: 'number',
+    defaultValue: 8,
+    context: 'maps',
+  },
+  DEMAND_PREDICTION_MODEL: {
+    name: 'Demand prediction model',
+    description: 'Some des',
+    type: 'string',
+    defaultValue: '@london',
+    context: 'demand prediction',
+  },
+  MIN_SHIFT_TIME_FOR_INFLEET_HOURS: {
+    name: 'Minimum shift time for infleet',
+    description: 'Minimum left time on shift in hours for infleet',
+    type: 'number',
+    defaultValue: 0,
+    context: 'indefleet',
+  },
+  FLEETING_INFLEET_THRESHOLD: {
+    name: 'Infleet threshold',
+    description: 'Minimum vehicles for start infleet',
+    type: 'number',
+    defaultValue: 0,
+    context: 'indefleet',
+  },
+  FLEETING_DEFLEET_THRESHOLD: {
+    name: 'Defleet threshold',
+    description: 'Minimum vehicles for start defleet',
+    type: 'number',
+    defaultValue: 0,
+    context: 'indefleet',
+  },
+  FLEET_WEIGHTS: { // ?
+    name: 'FLEET_WEIGHTS',
+    description: '',
+    type: 'json',
+    defaultValue: [4],
+    context: 'indefleet',
+  },
+  FLEETING_CORRELATION_COEFFICIENT: { // ?
+    name: 'Indefleet HRPV',
+    description: '',
+    type: 'number',
+    defaultValue: 4,
+    context: 'indefleet',
+  },
+  // FLEETING_DEMAND_CALCULATION_TIME_MARGIN_MINUTES ??
+  // FLEETING_DEMAND_CALCULATION_INTERVAL, FLEETING_DEMAND_CALCULATION_INTERVALS ??
+  ALLOW_STOP_POINT_OUTSIDE_TERRITORY: {
+    name: 'Allow stop points outside territory',
+    description: '',
+    type: 'string',
+    defaultValue: 'all',
+    enum: ['all', 'none', 'first', 'last'],
+    context: 'matching',
+  },
+  VEHICLE_SEARCH_RADIUS: {
+    name: 'Matching search radius',
+    description: 'The meters for searching vehicles on matching',
+    type: 'number',
+    defaultValue: 15000,
+    context: 'matching',
+  },
+  ETA_MAX: {
+    name: 'Maximum time to pickup',
+    description: 'The maximum allowed time to pickup in matching',
+    type: 'number',
+    defaultValue: 15,
+    context: 'matching',
+  },
+  MIN_RANGE_FOR_MATCHING: {
+    name: 'Minimum fuel range for matching',
+    description: 'The minimum im meters fuel range for vehicle to taking part in matching',
+    type: 'number',
+    defaultValue: 10000,
+    context: 'matching',
+  },
+  FLEET_SCORE_WEIGHT: {
+    name: 'Fleet score weight',
+    description: 'The fleet score weight 0-1',
+    type: 'number',
+    defaultValue: 0.5,
+    context: 'matching',
+  },
+  UNPAID_MAX: { // ?
+    name: 'unpaid max',
+    description: '',
+    type: 'number',
+    defaultValue: 20,
+    context: 'matching',
+  },
+  ETA_MIN: { // ?
+    name: 'ETA min',
+    description: '',
+    type: 'number',
+    defaultValue: 5,
+    context: 'matching',
+  },
+  VEHICLE_REROUTE_INTERVAL_SECONDS: {
+    name: 'Reroute interval',
+    description: 'Vehicles reroute interval in seconds',
+    type: 'number',
+    defaultValue: 300,
+    context: 'route',
+  },
+  METERS_FOR_CALC_NEW_ROUTE: {
+    name: 'Meters for re-calculation route',
+    description: 'The distance im meters to recalc the route',
+    type: 'number',
+    defaultValue: 20,
+    context: 'route',
+  },
+  MIN_RANGE_TO_FUEL_METERS: {
+    name: 'Fuel threshold',
+    description: 'The vehicle range in meters to get fuel',
+    type: 'number',
+    defaultValue: 50000,
+    context: 'fuel',
+  },
+  DRIVER_MAX_MIN_TO_FUEL: {
+    name: 'Maximum time for fuel',
+    description: 'The maximum time in minutes for driver done with fuel',
+    type: 'number',
+    defaultValue: 15,
+    context: 'fuel',
+  },
+  // TODO: MAPPING_S2_LEVEL?
+  PLACEMENT_INTERVAL: { // TODO: per fleet + there is also PLACEMENT_INTERVAL_MIN WTF?!
+    name: 'Placement interval',
+    description: '',
+    type: 'number',
+    defaultValue: 30,
+    context: 'placement',
+  },
+  PLACEMENT_CORRELATION_COEFFICIENT: { // TODO: per fleet
+    name: 'HRPV',
+    description: 'PLACEMENT_CORRELATION_COEFFICIENT',
+    type: 'number',
+    defaultValue: 1,
+    context: 'placement',
+  },
+  PLACEMENT_POSITIVE_THRESHOLD: { // TODO: per fleet
+    name: 'Placement positive threshold',
+    description: 'PLACEMENT_POSITIVE_THRESHOLD',
+    type: 'number',
+    defaultValue: 1.1,
+    context: 'placement',
+  },
+  PLACEMENT_NEGATIVE_THRESHOLD: { // TODO: per fleet
+    name: 'Placement negative threshold',
+    description: 'PLACEMENT_NEGATIVE_THRESHOLD',
+    type: 'number',
+    defaultValue: 0.9,
+    context: 'placement',
+  },
+  DRIVER_MAX_MINUTES_TO_COME_BACK: {
+    name: 'Parking threshold',
+    description: 'Minuets before the end of the shift for vehicles to get parking',
+    type: 'number',
+    defaultValue: 40,
+    context: 'shifts',
+  },
+  EMERGENCY_NUMBER: {
+    name: 'Minimum shift time for infleet',
+    description: 'Minimum left time on shift in hours for infleet',
+    type: 'string',
+    defaultValue: '972525893052',
+    context: 'operation',
+  },
+  REFRESH_TOKEN_DRIVER_EXPIRES_IN_ZEITMS_FORMAT: {
+    name: 'Driver refresh token expires',
+    description: 'The driver token expires in Zeitms format',
+    type: 'string',
+    defaultValue: '1y',
+    context: 'security',
+  },
+  CANCEL_BREAK_MILLI: {
+    name: 'Cancel break mili', // TODO: grave time
+    description: '',
+    type: 'number',
+    defaultValue: 30 * 1000,
+    context: 'operation',
+  },
+  MAX_BREAK_TIME_MILLI: {
+    name: 'Max break time',
+    description: 'The duration of break in miliseconds',
+    type: 'number',
+    defaultValue: 10 * 60 * 1000,
+    context: 'operation',
+  },
+  MAX_BREAKS_PER_SHIFT: {
+    name: 'Maximum breaks per shift',
+    description: 'The number of breaks that driver can take during shift',
+    type: 'number',
+    defaultValue: 5,
+    context: 'operation',
+  },
+  MIN_TIME_BETWEEN_BREAKS_MILLI: {
+    name: 'Minimum time between breaks',
+    description: 'The minimum time in miliseconds for taking another break',
+    type: 'number',
+    defaultValue: 60 * 60 * 1000,
+    context: 'operation',
+  },
+  MAXIMUN_RIDES_PER_TILE_ON_MAP: {
+    name: 'Maximum rides per tile on CC map',
+    description: '',
+    type: 'number',
+    defaultValue: 15,
+    context: 'operation',
+  },
+  DRIVER_APP_SP_VALIDATION_POPUP_DISTANCE: {
+    name: 'Distance for pop done in stop point validation',
+    description: 'Driver app - distance (km) from stop point for pop validation',
+    type: 'number',
+    defaultValue: 0.7,
+    context: 'operation',
+  },
+  FLEETING_ACTIVATION_EXPIERY_HOURS: { // TODO: there is also ACTIVATION_EXPIERY WTF?!
+    name: 'Activation expiery hours',
+    description: 'Hours from start to activate until the activation will cancel',
+    type: 'number',
+    defaultValue: 2,
+    context: 'operation',
+  },
+  DEMAND_GATEWAY_SECRET: {
+    name: 'Demand gateway secret',
+    description: '',
+    type: 'string',
+    defaultValue: 1234,
+    context: 'security',
+  },
+  REFRESH_TOKEN_EXPIRES_IN_ZEITMS_FORMAT: { // TODO: per fleet
+    name: 'Fleet user token expires in zeitms foramt',
+    description: '',
+    type: 'string',
+    defaultValue: '90d',
+    context: 'security',
+  },
+  CC_MIN_TO_RESET_WRONG_PASSWORD_COUNTER: { // TODO: per fleet
+    name: 'Minutes to reset wrong password in CC',
+    description: '',
+    type: 'number',
+    defaultValue: 30,
+    context: 'security',
+  },
+  CC_WRONG_PASSWORD_ATTEMPTS: { // TODO: per fleet
+    name: 'Wrong password attempts in CC',
+    description: '',
+    type: 'number',
+    defaultValue: 5,
+    context: 'security',
+  },
+};