fleetmap-reports 2.0.213 → 2.0.217

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.213",
+  "version": "2.0.217",
   "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)
+          console.log('forking worker', workerCount++, report, method, slice.length)
           const worker = cluster.fork()
           worker.send({
             report,

package/src/util/traccar.worker.js

@@ -1,12 +1,5 @@
-const { chain } = require('stream-chain')
-const { parser } = require('stream-json')
-const { pick } = require('stream-json/filters/Pick')
-const { streamArray } = require('stream-json/streamers/StreamArray')
-const { Readable } = require('stream')
-
 module.exports = async ({ url, cookie }) => {
   const now = new Date()
-  console.log(url)
   const response = await fetch(url, {
     headers: { cookie }
   })
@@ -14,18 +7,5 @@ module.exports = async ({ url, cookie }) => {
     throw new Error(`Fetch failed: ${response.status} ${response.statusText}`)
   }
   console.log(url, 'took', new Date() - now, 'ms', 'streaming...')
-  const nodeStream = Readable.fromWeb(response.body)
-
-  const result = { route: [] }
-  return new Promise((resolve, reject) => {
-    const pipeline = chain([
-      nodeStream,
-      parser(),
-      pick({ filter: 'route' }),
-      streamArray() // Stream each item in the array
-    ])
-    pipeline.on('data', ({ value }) => result.route.push(value))
-    pipeline.on('end', () => resolve(result))
-    pipeline.on('error', reject)
-  })
+  return response.json()
 }

package/src/zone-report.js

@@ -23,11 +23,26 @@ const { checkGeofenceIn } = require('./util/geofence')
 const { parallel } = require('./util/parallel')
 const { getDataByDay } = require('./util/trips')
 const axios = require('axios').default
-const sliceSize = 2
+const sliceSize = 10
 const deviceChunk = 5
 const fileName = 'ZoneReport'
 
-async function createZoneReport (from, to, userData, traccar, cookie) {
+async function process (traccar, from, to, slice, deviceCount, devices, reportRangeDays, userData) {
+  const data = await traccarHelper.getAllInOne(
+    traccar, from, to, slice, true, false, false, false,
+    deviceCount, devices.length, sliceSize, reportRangeDays > 29 ? 1 : deviceChunk, undefined)
+
+  const route = filterPositions(data.route)
+  const alerts = []
+  if (isClientSide()) {
+    alerts.push(...(await getInAndOutEvents(slice, cleanPositions(route), userData)))
+  } else {
+    alerts.push(...(await parallel('zone-report', 'getInAndOutEvents', slice, cleanPositions(route), userData)))
+  }
+  return await processDevices(from, to, slice, userData, { alerts, route, summary: data.summary })
+}
+
+async function createZoneReport (from, to, userData, traccar) {
   console.log('createZoneReport', from, to)
   const reportData = []
   const devices = devicesToProcess(userData)
@@ -71,18 +86,8 @@ async function createZoneReport (from, to, userData, traccar, cookie) {
 
   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, reportRangeDays > 29 ? 1 : deviceChunk, undefined)
-
-    const route = filterPositions(data.route)
-    const alerts = []
-    if (isClientSide()) {
-      alerts.push(...(await getInAndOutEvents(slice, cleanPositions(route), userData)))
-    } else {
-      alerts.push(...(await parallel('zone-report', 'getInAndOutEvents', slice, cleanPositions(route), userData)))
-    }
-    allData.devices.push(...await processDevices(from, to, slice, userData, { alerts, route, summary: data.summary }))
+    const processed = await process(traccar, from, to, slice, deviceCount, devices, reportRangeDays, userData)
+    allData.devices.push(...processed)
 
     deviceCount = deviceCount + slice.length
   }