fleetmap-reports 2.0.226 → 2.0.227

package/package.json

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

package/src/util/traccar.js

@@ -75,7 +75,8 @@ async function getItems (traccar, u, _chunk, counter, devicesPerRequest, ignoreP
     const x = routeOnly && !isClientSide()
       ? await streamJson(traccar, u.replace('allinone', 'route').replace('type=route', ''), filter)
       : await traccar.axios.get(u, {
-        withCredentials: true
+        withCredentials: true,
+        timeout: 900000
       }).then(r => {
         if (filter && r.data.route) {
           r.data.route = cleanPositions(r.data.route.filter(filterPosition))

package/src/zone-report.js

@@ -86,8 +86,9 @@ async function createZoneReport (from, to, userData, traccar) {
   let deviceCount = 0
   const url = `https://${process.env.SERVER_HOST}/pinmeapi/process-report/zone-report-processing`
 
-  const promises = sliced.map(slice =>
-    traccar.axios.post(url, {
+  const promises = sliced.map(slice => {
+    const now = new Date()
+    return traccar.axios.post(url, {
       from,
       to,
       userData,
@@ -95,14 +96,16 @@ async function createZoneReport (from, to, userData, traccar) {
       deviceCount: deviceCount++,
       devices,
       reportRangeDays
-    }).then(response => {
-      console.log(url, 'done')
+    }, { timeout: 900000 }).then(response => {
+      console.log(url, 'done in', new Date() - now, 'ms')
       return response.data
     }).catch(e => console.error(e.message, e.response?.data))
-  )
+  })
   const results = await Promise.all(promises)
   results.forEach(processed => {
-    allData.devices.push(...processed)
+    if (processed) {
+      allData.devices.push(...processed)
+    }
   })
 
   reportData.push(allData)