fleetmap-reports 2.0.215 → 2.0.218

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.215",
+  "version": "2.0.218",
   "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/route.js

@@ -41,19 +41,21 @@ function filterPositions (positions) {
   return positions.filter(filterPosition)
 }
 
+function cleanPosition (p) {
+  return {
+    id: p.id,
+    fixTime: p.fixTime,
+    address: p.address,
+    latitude: p.latitude,
+    longitude: p.longitude,
+    deviceId: p.deviceId,
+    speed: p.speed,
+    valid: p.valid
+  }
+}
+
 exports.cleanPositions = (positions) => {
-  return positions.map(p => {
-    return {
-      id: p.id,
-      fixTime: p.fixTime,
-      address: p.address,
-      latitude: p.latitude,
-      longitude: p.longitude,
-      deviceId: p.deviceId,
-      speed: p.speed,
-      valid: p.valid
-    }
-  })
+  return positions.map(cleanPosition)
 }
 
 function filterPosition (p) {
@@ -68,3 +70,4 @@ function filterPosition (p) {
 
 exports.getIdleEvents = getIdleEvents
 exports.filterPositions = filterPositions
+exports.cleanPositon = cleanPosition

package/src/util/traccar.js

@@ -69,10 +69,10 @@ async function getSummary (traccar, from, to, devices) {
 }
 
 async function getItems (traccar, u, _chunk, counter, devicesPerRequest, ignorePercentage,
-  totalDevices, currentDeviceCount, routeOnly) {
+  totalDevices, currentDeviceCount, routeOnly, filter) {
   try {
-    const x = routeOnly
-      ? await streamJson(traccar, u)
+    const x = routeOnly && !isClientSide()
+      ? await streamJson(traccar, u.replace('allinone', 'route'), filter)
       : await traccar.axios.get(u, {
         withCredentials: true
       }).then(r => r.data)
@@ -93,11 +93,12 @@ async function getItems (traccar, u, _chunk, counter, devicesPerRequest, ignoreP
   }
 }
 
-function streamJson (traccar, u, _cookie) {
-  const cookie = _cookie || traccar.axios.defaults.headers?.cookie || traccar.axios.defaults.headers?.common?.cookie
+function streamJson (traccar, u, filter) {
+  const cookie = traccar.axios.defaults.headers?.cookie || traccar.axios.defaults.headers?.common?.cookie
   return piscina.run({
     url: traccar.axios.defaults.baseURL + u,
-    cookie
+    cookie,
+    filter
   },
   {
     filename: path.resolve(__dirname, './traccar.worker.js'),
@@ -135,7 +136,8 @@ async function getAllInOne (
       console.log(u)
       requests.push(
         getItems(traccar, u, _chunk, counter, devicesPerRequest, ignorePercentage, totalDevices, currentDeviceCount,
-          !getTrips && !getStops && !getSummary))
+          !getTrips && !getStops && !getSummary)
+      )
     }
     const now = new Date()
     console.log('parallel', requests.length)

package/src/util/traccar.worker.js

@@ -3,30 +3,29 @@ const { parser } = require('stream-json')
 const { pick } = require('stream-json/filters/Pick')
 const { streamArray } = require('stream-json/streamers/StreamArray')
 const { Readable } = require('stream')
+const { cleanPosition } = require('./route')
 
-module.exports = async ({ url, cookie }) => {
+module.exports = async ({ url, cookie, filter }) => {
   const now = new Date()
-  console.log(url)
   const response = await fetch(url, {
     headers: { cookie }
   })
   if (!response.ok) {
-    throw new Error(`Fetch failed: ${response.status} ${response.statusText}`)
+    throw new Error(`${cookie} ${url} Fetch failed: ${response.status} ${response.statusText}`)
   }
   console.log(url, 'took', new Date() - now, 'ms', 'streaming...')
-  return response.json()
-  /* const nodeStream = Readable.fromWeb(response.body)
+  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('data', ({ value }) => result.route.push(
+      filter ? cleanPosition(value) : value))
     pipeline.on('end', () => resolve(result))
     pipeline.on('error', reject)
-  }) */
+  })
 }

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, filterPositions)
+
+  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
   }