fleetmap-reports 2.0.310 → 2.0.312

package/package.json

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

package/src/util/parallel.js

@@ -30,6 +30,7 @@ exports.parallel = (report, method, toSlice, ...args) => {
             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)

package/src/util/worker.js

@@ -1,8 +1,14 @@
 const path = require('path')
 console.log(`worker ${process.pid} is running`, process.cwd())
 process.on('message', async (message) => {
-  const { report, method, args } = message
-  console.log(`worker ${process.pid} is running`, process.cwd(), report, method)
-  const _report = require(path.resolve(__dirname, `../${report}`))
-  process.send({ result: await _report[method](...args) })
+  try {
+    const { report, method, args } = message
+    console.log(`worker ${process.pid} is running`, process.cwd(), report, method)
+    const _report = require(path.resolve(__dirname, `../${report}`))
+    process.send({ result: await _report[method](...args) })
+  } catch (error) {
+    console.error(`worker ${process.pid} error:`, error)
+    process.send({ error: error.message, stack: error.stack })
+    process.exit(1)
+  }
 })

package/src/zone-report.js

@@ -128,7 +128,7 @@ 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.deviceId === d.id)
+    const alerts = data.alerts.filter(t => t && t.deviceId === d.id)
     const deviceRoute = data.route.filter(p => p.deviceId === d.id)
     let zoneInOutData = analyseAlerts(alerts, deviceRoute, userData, from, to, d).filter(d => !userData.onlyWithStop || d.stopped)