fleetmap-reports 2.0.314 → 2.0.316

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.314",
+  "version": "2.0.316",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/index.js

@@ -12,7 +12,7 @@ function Reports (config, axios) {
   }
   this.getUserData = async () => {
     return {
-      user: await this.traccar.session.sessionGet().then(d => d.data),
+      user: await this.traccar.session.sessionGet(process.env.TOKEN).then(d => d.data),
       devices: await this.traccar.devices.devicesGet().then(d => d.data),
       groups: await this.traccar.groups.groupsGet().then(d => d.data),
       drivers: await this.traccar.drivers.driversGet().then(d => d.data),

package/src/util/parallel.js

@@ -25,12 +25,6 @@ exports.parallel = (report, method, toSlice, ...args) => {
         try {
           console.log('forking worker', workerCount++, report, method, slice.length)
           const worker = cluster.fork()
-          worker.send({
-            report,
-            method,
-            args: [slice, ...args]
-          })
-          console.log('sent to worker', worker.process.pid)
           worker.on('message', ({ result }) => {
             console.log('received result from worker', worker.process.pid)
             _result.push(result)
@@ -48,6 +42,12 @@ exports.parallel = (report, method, toSlice, ...args) => {
               reject(new Error(`Worker ${worker.process.pid} exited with code ${code} and signal ${signal}`))
             }
           })
+          worker.send({
+            report,
+            method,
+            args: [slice, ...args]
+          })
+          console.log('sent to worker', worker.process.pid)
         } catch (e) {
           console.error(report, method, 'worker', workerCount, 'numCPUs', numCPUs)
           reject(e)

package/src/util/traccar.worker.js

@@ -4,9 +4,19 @@ const { streamArray } = require('stream-json/streamers/StreamArray')
 const { Readable } = require('stream')
 const { cleanPosition, filterPosition } = require('./route')
 
+function fetchRetry (url, options, retry = 3) {
+  return fetch(url, options).catch(async e => {
+    if (retry) {
+      console.warn(url, e.message, 'retrying', retry)
+      return fetchRetry(url, options, retry - 1)
+    }
+    throw e
+  })
+}
+
 module.exports = async ({ url, cookie, filter }) => {
   const now = new Date()
-  const response = await fetch(url, { headers: { cookie } })
+  const response = await fetchRetry(url, { headers: { cookie } })
     .catch(e => {
       console.error(e)
       throw new Error(`${e.message} traccar-worker ${cookie} ${url}`)

package/src/zone-report.js

@@ -150,7 +150,6 @@ async function createZoneReport (from, to, userData, traccar) {
 
 async function processDevices (from, to, devices, userData, data) {
   const devicesResult = []
-  console.log('processDevices', from, to, devices.length)
   for (const d of devices) {
     const alerts = data.alerts.filter(t => t && t.deviceId === d.id)
     const deviceRoute = data.route.filter(p => p.deviceId === d.id)
@@ -538,7 +537,7 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to, device) {
 
 async function getInAndOutEvents (devices, route, userData) {
   const events = []
-  const geofencesFeatures = userData.geofences.map(g => convertToFeature(g))
+  const geofencesFeatures = userData.geofences.filter(g => g.area).map(g => convertToFeature(g))
   devices.forEach(d => {
     const deviceRoute = route.filter(p => p.deviceId === d.id)
     const routePoints = deviceRoute.sort(sortPositions).map(p => convertPositionToFeature(p))