fleetmap-reports 2.0.238 → 2.0.240

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.238",
+  "version": "2.0.240",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -31,7 +31,6 @@
     "wkt": "^0.1.1"
   },
   "devDependencies": {
-    "axios-debug-log": "^0.8.4",
     "eslint": "^8.15.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.26.0",

package/src/tests/zones.test.js

@@ -9,7 +9,7 @@ describe('zones', function () {
     userData.tripsBetweenZones = true
     const result = await report.zoneReport(
       new Date(Date.UTC(2023, 6, 24, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 6, 25, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 7, 25, 23, 59, 59, 0)),
       userData)
     console.log(await report.zoneReportToPDF(userData, result[0]))
   }, 4000000)

package/src/zone-report.js

@@ -107,7 +107,7 @@ async function createZoneReport (from, to, userData, traccar) {
 
   const url = 'https://api.pinme.io/pinmeapi/process-report/zone-report-processing'
 
-  const limit = simpleLimit(50)
+  const limit = simpleLimit(25)
   const promises = sliced.map((slice, i) => limit(async () => {
     const now = new Date()
     return traccar.axios.post(url, {
@@ -118,10 +118,22 @@ async function createZoneReport (from, to, userData, traccar) {
       deviceCount: i,
       devices,
       reportRangeDays
-    }, { timeout: 900000 }).then(response => {
-      console.log('processed devices', slice.map(d => d.id), 'in', new Date() - now, 'ms')
-      return response.data
-    }).catch(e => console.error(url, e.message, e))
+    }, { timeout: 900000 })
+      .catch(e => {
+        console.error(url, e.message, e.response?.data || e, 'try again')
+        return traccar.axios.post(url, {
+          from,
+          to,
+          userData,
+          slice,
+          deviceCount: i,
+          devices,
+          reportRangeDays
+        }, { timeout: 900000 })
+      }).then(response => {
+        console.log('processed devices', slice.map(d => d.id), 'in', new Date() - now, 'ms')
+        return response.data
+      })
   })
   )
   const results = await Promise.all(promises)
@@ -465,7 +477,7 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to, device) {
           anyLastExit: a.anyLastExit,
           geofenceName: geofence.name,
           geofenceId: geofence.id,
-          stopped: routeIn.filter(p => !p.attributes.ignition).length > 0,
+          stopped: routeIn.filter(p => !p.attributes?.ignition).length > 0,
           driverName: inData.position.driverName
         })
         zoneInData = zoneInData.filter(z => z.geofenceId !== a.geofenceId)