fleetmap-reports 2.0.369 → 2.0.371

package/package.json

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

package/src/fuel-consumption-report.js

@@ -29,7 +29,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
 
   if (isClientSide() && (devices.length > 50 || ((new Date(to).getTime() - new Date(from).getTime()) > (1000 * 60 * 60 * 24 * 15)))) {
     const sliced = automaticReports.sliceArray(devices, 1)
-    allData.devices = await executeServerSide('fuel-consumption-report', sliced, from, to, userData, devices.length, traccar, 5)
+    allData.devices = await executeServerSide('fuel-consumption-report', sliced, from, to, userData, devices.length, traccar, 10)
     allData.totalDevices = allData.devices.length
     reportData.push(allData)
     return reportData

package/src/partnerReports/driverranking-report.js

@@ -211,11 +211,16 @@ async function runServerSideGrid (from, to, userData, deviceIdsByDriver, traccar
   const url = `https://${getServerHost()}/pinmeapi/reports/driverranking-report`
   const rawRows = []
   let completed = 0
-  const maxConcurrent = 20
-
-  for (let i = 0; i < cells.length; i += maxConcurrent) {
-    const batch = cells.slice(i, i + maxConcurrent)
-    await Promise.all(batch.map(async ({ driverSlice, dateChunk }) => {
+  let nextCellIndex = 0
+  const maxConcurrent = 10
+
+  // A worker pool, not fixed-size Promise.all batches: with batches, one slow cell (a device with
+  // way more GPS data than its peers) stalls the *entire* next batch behind it, since Promise.all
+  // waits for every item before starting the next round. Here, as soon as any worker finishes a
+  // cell it immediately grabs the next one, so a slow cell only delays itself.
+  async function worker () {
+    while (nextCellIndex < cells.length) {
+      const { driverSlice, dateChunk } = cells[nextCellIndex++]
       const deviceIds = new Set()
       driverSlice.forEach(d => {
         const ids = deviceIdsByDriver.get(d.uniqueId)
@@ -249,9 +254,12 @@ async function runServerSideGrid (from, to, userData, deviceIdsByDriver, traccar
       completed++
       console.log('LOADING_MESSAGE:' + driverSlice[0].name)
       console.log(`PROGRESS_PERC:${(completed / cells.length) * 100}`)
-    }))
+    }
   }
 
+  const workerCount = Math.min(maxConcurrent, cells.length)
+  await Promise.all(Array.from({ length: workerCount }, () => worker()))
+
   return rawRows
 }