fleetmap-reports 2.0.204 → 2.0.205

package/package.json

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

package/src/util/parallel.js

@@ -23,7 +23,7 @@ exports.parallel = (report, method, toSlice, ...args) => {
           reject(new Error('got empty slice'))
         }
         try {
-          console.log('forking worker', workerCount++, report, method, slice.length)
+          console.log('forking worker', workerCount++, report, method, slice)
           const worker = cluster.fork()
           worker.send({
             report,
@@ -37,12 +37,10 @@ exports.parallel = (report, method, toSlice, ...args) => {
               resolve(_result.flat())
             }
           })
-          worker.on('error', e => { console.error(e); reject(e) })
+          worker.on('error', reject)
           worker.on('exit', (code, signal) => {
             if (code !== 0) {
-              const error = `Worker exited with code ${code} and signal ${signal}`
-              console.error(error)
-              reject(new Error(error))
+              reject(new Error(`Worker exited with code ${code} and signal ${signal}`))
             }
           })
         } catch (e) {

package/src/zone-report.js

@@ -23,11 +23,12 @@ const { checkGeofenceIn } = require('./util/geofence')
 const { parallel } = require('./util/parallel')
 const { getDataByDay } = require('./util/trips')
 const axios = require('axios').default
-const sliceSize = 4
+const sliceSize = 10
+const deviceChunk = 5
 const fileName = 'ZoneReport'
 
 async function createZoneReport (from, to, userData, traccar) {
-  console.log('createZoneReport 200', from, to)
+  console.log('createZoneReport', from, to)
   const reportData = []
   const devices = devicesToProcess(userData)
   const allData = {
@@ -66,14 +67,13 @@ async function createZoneReport (from, to, userData, traccar) {
   }
 
   const reportRangeDays = (new Date(to).getTime() - new Date(from).getTime()) / (1000 * 60 * 60 * 24)
-  const devicesPerRequest = reportRangeDays > 28 ? 1 : sliceSize
-  const sliced = automaticReports.sliceArray(devices, devicesPerRequest)
+  const sliced = automaticReports.sliceArray(devices, sliceSize)
 
   let deviceCount = 0
   for (const slice of sliced) {
     const data = await traccarHelper.getAllInOne(
       traccar, from, to, slice, true, false, false, false,
-      deviceCount, devices.length, sliceSize, devicesPerRequest, undefined)
+      deviceCount, devices.length, sliceSize, reportRangeDays > 29 ? 1 : deviceChunk, undefined)
 
     const route = filterPositions(data.route)
     const alerts = []