fleetmap-reports 2.0.23 → 2.0.25

package/package.json

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

package/src/speeding-report.js

@@ -314,13 +314,16 @@ async function getRoadSpeedLimits (devices, routes, threshold, minimumMinutes =
 
 exports.getRoadSpeedLimits = getRoadSpeedLimits
 
-async function invokeValhalla (route, i, chunk, country, threshold, results, retry = 10) {
+let countSuccess = 0
+let countError = 0
+let lastSuccessDuration
+async function invokeValhalla (route, i, chunk, country, threshold, results, retry = 3) {
   const slice = route.slice(i, i + chunk)
   const position = slice.find(p => getCountry(p))
   let url
   try {
     url = `http://valhalla-${(position && getCountry(position)) || country}.pinme.io:8002/trace_attributes`
-    console.log(url)
+    const now = new Date()
     const {
       // eslint-disable-next-line camelcase
       matched_points,
@@ -348,8 +351,10 @@ async function invokeValhalla (route, i, chunk, country, threshold, results, ret
           lon: p.longitude,
           lat: p.latitude
         }))
-      }, { timeout: 60000 })
+      }, { timeout: 10000 })
       .then(r => r.data)
+    countSuccess++
+    lastSuccessDuration = new Date() - now
     // eslint-disable-next-line camelcase
     matched_points.forEach((mp, mIndex) => {
       const edge = edges[mp.edge_index]
@@ -359,12 +364,15 @@ async function invokeValhalla (route, i, chunk, country, threshold, results, ret
       }
     })
   } catch (e) {
+    countError++
     if (--retry) {
-      console.error(e.message, 'retry:', retry)
+      console.error('retry', retry, e.message, (e.response && e.response.data) || url, 'deviceId',
+        slice[0] && slice[0].deviceId, slice[0] && slice[0].address, slice[0] && slice[0].fixTime, country, 'chunk', chunk,
+        'success', countSuccess, 'error', countError, lastSuccessDuration)
       return invokeValhalla(route, i, chunk, country, threshold, results, retry)
     } else {
       console.error(e.message, (e.response && e.response.data) || url, 'deviceId',
-        slice[0] && slice[0].deviceId, slice[0] && slice[0].address, slice[0] && slice[0].fixTime, country, chunk)
+        slice[0] && slice[0].deviceId, slice[0] && slice[0].address, slice[0] && slice[0].fixTime, country, 'chunk', chunk)
     }
   }
 }