fleetmap-reports 2.0.206 → 2.0.208

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.206",
+  "version": "2.0.208",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -23,6 +23,7 @@
     "jspdf": "^2.5.1",
     "jspdf-autotable": "3.8.1",
     "moment": "2.30.1",
+    "piscina": "^4.9.2",
     "stream-chain": "^3.4.0",
     "stream-json": "^1.9.1",
     "traccar-api": "^1.0.5",

package/src/util/traccar.js

@@ -1,10 +1,8 @@
 const automaticReports = require('../automaticReports')
 const { convertFromUTC, isClientSide, convertFromLocal } = require('./utils')
-const { parser } = require('stream-json')
-const { streamArray } = require('stream-json/streamers/StreamArray')
-const { chain } = require('stream-chain')
-const { pick } = require('stream-json/filters/Pick')
-
+const path = require('path')
+const Piscina = require('piscina')
+const piscina = new Piscina()
 async function getRoute (traccar, from, to, devices) {
   const devicesToSlice = devices.slice()
 
@@ -96,26 +94,15 @@ async function getItems (traccar, u, _chunk, counter, devicesPerRequest, ignoreP
   }
 }
 
-async function streamJson (traccar, u) {
-  console.log('streaming', traccar.axios.defaults.baseURL, u)
-  const response = await traccar.axios.get(u, {
-    responseType: 'stream',
-    jar: traccar.cookieJar,
-    withCredentials: true
-  })
-
-  const result = { route: [] }
-
-  return new Promise((resolve, reject) => {
-    const pipeline = chain([
-      response.data,
-      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)
+function streamJson (traccar, u) {
+  const cookie = traccar.axios.defaults.headers.common.cookie
+  return piscina.run({
+    url: traccar.axios.defaults.baseURL + u,
+    cookie
+  },
+  {
+    filename: path.resolve(__dirname, './traccar.worker.js'),
+    maxThreads: require('os').cpus().length
   })
 }
 

package/src/util/traccar.worker.js

@@ -0,0 +1,31 @@
+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 }
+  })
+  if (!response.ok) {
+    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)
+  })
+}

package/src/zone-report.js

@@ -23,7 +23,7 @@ const { checkGeofenceIn } = require('./util/geofence')
 const { parallel } = require('./util/parallel')
 const { getDataByDay } = require('./util/trips')
 const axios = require('axios').default
-const sliceSize = 50
+const sliceSize = 25
 const deviceChunk = 5
 const fileName = 'ZoneReport'