fleetmap-reports 2.0.356 → 2.0.357

package/package.json

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

package/src/partnerReports/driverranking-report.js

@@ -67,6 +67,9 @@ async function create (from, to, userData, traccar) {
       await processDevice(driversData, device, userData, { route, trips }, deviceAlarmEvents, deviceOverspeedEvents)
       deviceCount++
     }
+
+    console.log('LOADING_MESSAGE:' + slice[0].name)
+    console.log(`PROGRESS_PERC:${deviceCount / devices.length * 100}`)
   }
 
   const allDriversData = (Array.from(driversData.values())).filter(d => d.distance > 0)

package/src/speeding-report.js

@@ -132,7 +132,17 @@ async function getEvents (traccarInstance, from, to, devices, userData, deviceCo
   if (processServerSide() && !userData.useVehicleSpeedLimit) {
     const cookie = await axios.get('/pinmeapi/cookie/get', { withCredentials: true }).then(d => d.data)
     const url = `https://${getServerHost()}/pinmeapi/reports/speeding-report/getEvents`
-    return axios.post(url, { from, to, devices, userData, deviceCount, totalDevices, sliceSize, cookie }, { withCredentials: true }).then(d => d.data)
+    const maxAttempts = 3
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+      try {
+        return await axios.post(url, { from, to, devices, userData, deviceCount, totalDevices, sliceSize, cookie }, { withCredentials: true, timeout: 60000 }).then(d => d.data)
+      } catch (e) {
+        console.log(`getEvents failed for devices [${devices.map(d => d.name).join(', ')}] (attempt ${attempt}/${maxAttempts}): ${e.message}`)
+        if (attempt === maxAttempts) {
+          return []
+        }
+      }
+    }
   } else {
     const geofencesFeatures = userData.geofences.filter(g => g.area && g.area.startsWith('POLYGON') &&
       g.attributes.speedLimit).map(g => convertToFeature(g))