fleetmap-reports 2.0.270 → 2.0.272

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.270",
+  "version": "2.0.272",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -23,7 +23,6 @@
     "jspdf": "^2.5.1",
     "jspdf-autotable": "3.8.1",
     "moment": "2.30.1",
-    "p-limit": "^6.2.0",
     "piscina": "^4.9.2",
     "stream-chain": "^3.4.0",
     "stream-json": "^1.9.1",

package/src/location-report.js

@@ -47,16 +47,17 @@ async function createLocationReportByDriver (from, to, userData, traccar) {
   const devices = await traccar.axios.get(url).then(d => d.data)
   console.log(devices.length)
 
-  if (!devices.length) {
-    // Empty report
-    return { drivers: [] }
-  }
+  if (!devices.length) { return { drivers: [] } }
 
-  const sliced = automaticReports.sliceArray(devices, 1)
   const deviceCount = 0
-  const promises = sliced.map(slice => _getDriverRoute(traccar, from, to, slice, deviceCount, devices, userData))
-  const result = await Promise.all(promises)
-  return { drivers: result.flat() }
+  const results = []
+  const batchSize = 10
+  for (let i = 0; i < devices.length; i += batchSize) {
+    const batch = devices.slice(i, i + batchSize)
+    const batchResults = await Promise.all(batch.map(device => _getDriverRoute(traccar, from, to, [device], deviceCount, devices, userData)))
+    results.push(...batchResults)
+  }
+  return { drivers: results.flat() }
 }
 
 async function _getDriverRoute (traccar, from, to, slice, deviceCount, devices, userData) {

package/src/tests/positions.test.js

@@ -37,7 +37,7 @@ describe('test positions', function () {
       console.log(driver.positions)
       assert.equal(driver.positions.length, 85) // Total Positions
     } catch (e) {
-      console.error(e)
+      console.error(e.message, e.response && e.response.data, e)
     }
   }, 2000000)
   // eslint-disable-next-line no-undef

package/src/util/traccar.js

@@ -2,6 +2,9 @@ const automaticReports = require('../automaticReports')
 const { convertFromUTC, isClientSide, convertFromLocal } = require('./utils')
 const path = require('path')
 const { cleanPositions, filterPosition } = require('./route')
+const Piscina = require('piscina')
+const piscina = new Piscina()
+
 async function getRoute (traccar, from, to, devices) {
   const devicesToSlice = devices.slice()
 
@@ -106,8 +109,6 @@ function getCookie (traccar) {
 
 function streamJson (traccar, u, filter) {
   const cookie = getCookie(traccar)
-  const Piscina = require('piscina')
-  const piscina = new Piscina()
   return piscina.run({
     url: traccar.axios.defaults.baseURL + u,
     cookie,