fleetmap-reports 1.0.925 → 1.0.929

package/package.json

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

package/src/kms-report.js

@@ -44,7 +44,7 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
   }
 
   if (isClientSide() && allDevices.length > 50 && userData.groupByDay) {
-    const sliced = automaticReports.sliceArray(allDevices, 20)
+    const sliced = automaticReports.sliceArray(allDevices, 1)
     await executeServerSide('kms-report', allData, sliced, from, to, userData, allDevices.length)
   } else {
     let deviceCount = 0

package/src/util/utils.js

@@ -227,21 +227,25 @@ function weekDaySelected (date, weekDays) {
 async function executeServerSide (type, allData, sliced, from, to, userData, totalDevices) {
   let deviceCount = 0
   console.log('PROGRESS_PERC:1')
-  const maxRequests = 4
-  for (let i=0; i < sliced.length; i+=maxRequests) {
-    const _sliced = sliced.slice(i, i+maxRequests)
+  const maxRequests = 10
+  for (let i = 0; i < sliced.length; i += maxRequests) {
+    const _sliced = sliced.slice(i, i + maxRequests)
     await Promise.all(_sliced.map(async devices => {
       const url = `https://${process.env.SERVER_HOST}/reports/${type}`
-      const data = await axios.post(url, {
-        from,
-        to,
-        userData: {
-          ...userData,
-          devices
-        }
-      }, { withCredentials: true }).then(d => d.data)
-      allData.devices.push(...(data[0].devices))
-      deviceCount = deviceCount + devices.length
+      try {
+        const data = await axios.post(url, {
+          from,
+          to,
+          userData: {
+            ...userData,
+            devices
+          }
+        }, { withCredentials: true }).then(d => d.data)
+        allData.devices.push(...(data[0].devices))
+        deviceCount = deviceCount + devices.length
+      } catch (e) {
+        console.error(e)
+      }
       console.log(`PROGRESS_PERC:${deviceCount / totalDevices * 100}`)
     }))
   }

package/src/zone-report.js

@@ -262,7 +262,7 @@ function getAnyNextIn (outDate, alerts, deviceRoute) {
     .filter(a => a.type === 'geofenceEnter')
     .find(a => new Date(a.position.fixTime).getTime() > outDate)
 
-  if (!alerts.filter(a => a.type === 'geofenceExit' &&
+  if (next && !alerts.filter(a => a.type === 'geofenceExit' &&
       new Date(a.position.fixTime).getTime() > outDate &&
       new Date(a.position.fixTime).getTime() < new Date(next.position.fixTime).getTime()).length) {
     return (next && next.position && new Date(next.position.fixTime).getTime()) ||