fleetmap-reports 1.0.753 → 1.0.755

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.753",
+  "version": "1.0.755",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -38,5 +38,8 @@
     "mocha": "^10.2.0",
     "webpack": "^5.51.0",
     "webpack-cli": "^4.5.0"
+  },
+  "browser": {
+    "cluster": false
   }
 }

package/src/tests/performance.test.js

@@ -2,6 +2,7 @@ const { getReports } = require('./index')
 const { createPerformanceReport } = require('../partnerReports/performance-report')
 // eslint-disable-next-line no-undef
 describe('performance', function () {
+  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('performance report', async () => {
     const report = await getReports()

package/src/tests/zones.test.js

@@ -2,6 +2,7 @@ const { getReports } = require('./index')
 const assert = require('assert')
 // eslint-disable-next-line no-undef
 describe('zones', function () {
+  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('works with ellca', async () => {
     const report = await getReports()
@@ -47,4 +48,25 @@ describe('zones', function () {
     assert.equal(first.inTime.fixTime, '2023-01-03T21:23:24.000+0000')
     assert.equal(first.outTime.fixTime, '2023-01-07T12:22:53.000+0000')
   }, 4000000)
+
+  // eslint-disable-next-line no-undef
+  it('works with casais 2', async () => {
+    const report = await getReports('mario.andre.moreira@casais.gi', 'Casais.23')
+    const userData = await report.getUserData()
+    userData.groupByDay = true
+    userData.devices = userData.devices.filter(d => d.name === 'G-2542-F Fiat Tipo')
+    userData.geofences = userData.geofences.filter(g => g.name === 'baliza raio verde ')
+    assert.equal(userData.geofences.length > 0, true)
+    assert.equal(userData.devices.length > 0, true)
+    const result = await report.zoneReport(
+      new Date(2023, 1, 27, 0, 0, 0, 0),
+      new Date(2023, 1, 27, 23, 59, 59, 0),
+      userData)
+    assert.equal(result[0].devices[0].geofences.length, 1)
+    assert.equal(result[0].devices[0].geofences[0].days.length, 1)
+    const first = result[0].devices[0].geofences[0].days[0]
+    assert.equal(first.firstIn, '2023-02-27T21:53:16.000+0000')
+    assert.equal(first.distanceIn, 93.03917199839687)
+    assert.equal(first.distanceOut, 819.6685737216337)
+  }, 4000000)
 })

package/src/util/parallel.js

@@ -6,9 +6,10 @@ exports.parallel = (report, method, toSlice, ...args) => {
   const numCPUs = require('os').cpus().length
   return new Promise((resolve, reject) => {
     if (cluster.isPrimary) {
-      console.log('master', process.pid, 'is running', process.cwd(), 'with', numCPUs, 'cpus')
+      console.log('parallel with', numCPUs, 'cpus', 'toSlice len', toSlice.length)
       cluster.setupPrimary({ exec: path.resolve(__dirname, 'worker.js') })
       const sliced = toSlice.length > (numCPUs - 1) ? sliceArray(toSlice, toSlice.length / (numCPUs - 1)) : [toSlice]
+      console.log('sliced in', sliced.length)
       const _result = []
       let done = 0
       let workerCount = 0
@@ -17,6 +18,10 @@ exports.parallel = (report, method, toSlice, ...args) => {
         reject(new Error('0 to process'))
       }
       sliced.forEach((slice) => {
+        if (!slice.length) {
+          console.error(report, method, 'got empty slice', slice)
+          reject(new Error('got empty slice'))
+        }
         try {
           console.log('forking worker', workerCount++, report, method, slice)
           const worker = cluster.fork()
@@ -37,7 +42,6 @@ exports.parallel = (report, method, toSlice, ...args) => {
           reject(e)
         }
       })
-
       cluster.on('exit', (worker, code, signal) => {
         console.log('worker died', worker.process.pid, code, signal)
         if (signal === 'SIGKILL') {