fleetmap-reports 2.0.203 → 2.0.205

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.203",
+  "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/util/traccar.js

@@ -72,24 +72,28 @@ async function getSummary (traccar, from, to, devices) {
 
 async function getItems (traccar, u, _chunk, counter, devicesPerRequest, ignorePercentage,
   totalDevices, currentDeviceCount, routeOnly) {
-  const x = routeOnly
-    ? await streamJson(traccar, u)
-    : await traccar.axios.get(u, {
-      jar: traccar.cookieJar,
-      withCredentials: true,
-      timeout: 900000
-    }).then(r => r.data)
-
-  console.log('LOADING_MESSAGE:' + _chunk[0].name)
-  if (counter) {
-    counter.count += devicesPerRequest
-    ignorePercentage || console.log(`PROGRESS_PERC:${Math.round(counter.count / totalDevices * 100)}`)
-  } else {
-    currentDeviceCount += devicesPerRequest
-    ignorePercentage || console.log(`PROGRESS_PERC:${Math.round(currentDeviceCount / totalDevices * 100)}`)
+  try {
+    const x = routeOnly
+      ? await streamJson(traccar, u)
+      : await traccar.axios.get(u, {
+        jar: traccar.cookieJar,
+        withCredentials: true
+      }).then(r => r.data)
+
+    console.log('LOADING_MESSAGE:' + _chunk[0].name)
+    if (counter) {
+      counter.count += devicesPerRequest
+      ignorePercentage || console.log(`PROGRESS_PERC:${Math.round(counter.count / totalDevices * 100)}`)
+    } else {
+      currentDeviceCount += devicesPerRequest
+      ignorePercentage || console.log(`PROGRESS_PERC:${Math.round(currentDeviceCount / totalDevices * 100)}`)
+    }
+    console.log('done devices', _chunk.map(d => d.id), 'position count', x.route && x.route.length)
+    return x
+  } catch (e) {
+    console.error(e)
+    return {}
   }
-  console.log('done devices', _chunk.map(d => d.id), 'position count', x.route && x.route.length)
-  return x
 }
 
 async function streamJson (traccar, u) {
@@ -97,27 +101,19 @@ async function streamJson (traccar, u) {
   const response = await traccar.axios.get(u, {
     responseType: 'stream',
     jar: traccar.cookieJar,
-    withCredentials: true,
-    timeout: 900000
+    withCredentials: true
   })
 
-  const result = {
-    route: []
-  }
+  const result = { route: [] }
 
-  console.log('waiting for data')
   return new Promise((resolve, reject) => {
     const pipeline = chain([
-      response.data, // Axios stream (Node readable)
-      parser(), // Tokenize
-      pick({ filter: 'route' }), // Pick 'route', 'summary', etc.
+      response.data,
+      parser(),
+      pick({ filter: 'route' }),
       streamArray() // Stream each item in the array
     ])
-
-    pipeline.on('data', ({ value }) => {
-      result.route.push(value) // Or stream to a DB/file/processor
-      console.log('pushed to', result.route.length)
-    })
+    pipeline.on('data', ({ value }) => result.route.push(value))
     pipeline.on('end', () => resolve(result))
     pipeline.on('error', reject)
   })

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 = []