fleetmap-reports 2.0.217 → 2.0.219

package/package.json

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

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'),
@@ -119,7 +120,8 @@ async function getAllInOne (
   sliceSize = 5,
   devicesPerRequest = 1,
   counter = undefined,
-  ignorePercentage = false) {
+  ignorePercentage = false,
+  filter) {
   let url = `/reports/allinone?from=${from.toISOString()}&to=${to.toISOString()}`
   if (getRoutes) url += '&type=route'
   if (getTrips) url += '&type=trips'
@@ -135,7 +137,8 @@ async function getAllInOne (
       console.log(u)
       requests.push(
         getItems(traccar, u, _chunk, counter, devicesPerRequest, ignorePercentage, totalDevices, currentDeviceCount,
-          !getTrips && !getStops && !getSummary))
+          !getTrips && !getStops && !getSummary, filter)
+      )
     }
     const now = new Date()
     console.log('parallel', requests.length)

package/src/util/traccar.worker.js

@@ -1,11 +1,31 @@
-module.exports = async ({ url, cookie }) => {
+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')
+const { cleanPosition } = require('./route')
+
+module.exports = async ({ url, cookie, filter }) => {
   const now = new Date()
   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 result = { route: [] }
+  return new Promise((resolve, reject) => {
+    const pipeline = chain([
+      nodeStream,
+      parser(),
+      streamArray() // Stream each item in the array
+    ])
+    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

@@ -30,7 +30,7 @@ const fileName = 'ZoneReport'
 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)
+    deviceCount, devices.length, sliceSize, reportRangeDays > 29 ? 1 : deviceChunk, undefined, true)
 
   const route = filterPositions(data.route)
   const alerts = []