fleetmap-reports 2.0.370 → 2.0.372

package/package.json

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

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
 }
 

package/src/util/utils.js

@@ -274,9 +274,15 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
   console.log('PROGRESS_PERC:1')
   const cookie = await axios.get('/pinmeapi/cookie/get', { withCredentials: true }).then(d => d.data)
   const reportData = []
-  for (let i = 0; i < sliced.length; i += maxRequests) {
-    const _sliced = sliced.slice(i, i + maxRequests)
-    await Promise.all(_sliced.map(async items => {
+  let nextIndex = 0
+
+  // A worker pool, not fixed-size Promise.all batches: with batches, one slow item (e.g. a device
+  // with way more 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 an
+  // item it immediately grabs the next one, so a slow item only delays itself.
+  async function worker () {
+    while (nextIndex < sliced.length) {
+      const items = sliced[nextIndex++]
       const url = `https://${getServerHost()}/pinmeapi/reports/${type}`
       try {
         await axios.post(url, {
@@ -309,9 +315,12 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
         console.log('LOADING_MESSAGE:' + items[0].name)
       }
       console.log(`PROGRESS_PERC:${itemsCount / totalItems * 100}`)
-    }))
+    }
   }
 
+  const workerCount = Math.min(maxRequests, sliced.length)
+  await Promise.all(Array.from({ length: workerCount }, () => worker()))
+
   if (userData.byDriver) {
     reportData.sort((a, b) => (((a.driver && a.driver.name) || a.name || '') > ((b.driver && b.driver.name) || b.name || '')) ? 1 : -1)
   } else {