fleetmap-reports 2.0.275 → 2.0.277

package/package.json

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

package/src/location-report.js

@@ -55,16 +55,15 @@ async function createLocationReportByDriver (from, to, userData, traccar) {
   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)))
-    const filtered = batchResults.filter(r => r)
-    console.log(i, '/', devices.length, 'pushing', filtered)
+    const filtered = batchResults.filter(r => r && r.length)
+    console.log(i, '/', devices.length, 'pushing', filtered, batchResults)
     results.push(...filtered)
   }
   return { drivers: results.flat() }
 }
 
-async function _getDriverRoute (traccar, from, to, slice, deviceCount, devices, userData) {
+async function _getDriverRoute (traccar, from, to, slice, deviceCount, devices, userData, retry = 3) {
   const url = `https://${process.env.SERVER_HOST}/pinmeapi/process-report/get-driver-route`
-  console.log(url, slice.length, slice[0].id, userData.drivers)
   return traccar.axios.post(url, {
     from,
     to,
@@ -73,16 +72,14 @@ async function _getDriverRoute (traccar, from, to, slice, deviceCount, devices,
     devices,
     userData
   }, { timeout: 1000 * 60 * 5 })
-    .catch(() => traccar.axios.post(url, {
-      from,
-      to,
-      slice,
-      deviceCount,
-      devices,
-      userData
-    }))
-    .catch(e => console.error(e))
-    .then(d => (d && d.data) || undefined)
+    .catch((e) => {
+      if (--retry) {
+        return _getDriverRoute(traccar, from, to, slice, deviceCount, devices, userData, retry)
+      } else {
+        console.error('giving up', slice[0].id, 'after 3 retries', e.message)
+      }
+    })
+    .then(r => r.data)
 }
 
 async function getDriverRoute (traccar, from, to, slice, deviceCount, devices, userData) {
@@ -96,7 +93,7 @@ async function getDriverRoute (traccar, from, to, slice, deviceCount, devices, u
     false,
     true
   )
-  await processDrivers(from, to, userData, allInOne)
+  return processDrivers(from, to, userData, allInOne)
 }
 
 async function createLocationReportByGroup (from, to, userData, traccar) {

package/src/tests/positions.test.js

@@ -27,7 +27,7 @@ describe('test positions', function () {
     try {
       const userData = await report.getUserData()
       userData.byDriver = true
-      userData.drivers = [userData.drivers.pop()]
+      userData.drivers = userData.drivers.filter(d => d.name.startsWith('ERICA'))
       const data = await report.locationReport(
         new Date(Date.UTC(2025, 0, 1, 0, 0, 0)),
         new Date(Date.UTC(2025, 0, 31, 23, 59, 59, 0)),