fleetmap-reports 1.0.370 → 1.0.374

package/package.json

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

package/src/automaticReports.js

@@ -1,9 +1,8 @@
 const moment = require('moment')
 
-function sliceArray(longArray) {
+function sliceArray(longArray,  size = 1) {
     const arrayToSlice = longArray.slice()
 
-    const size = 1
     const arrayOfArrays = []
     for (let i=0; i<arrayToSlice.length; i+=size) {
         arrayOfArrays.push(arrayToSlice.slice(i,i+size));

package/src/util/traccar.js

@@ -3,7 +3,7 @@ const automaticReports = require("../automaticReports");
 async function getRoute(traccar, from, to, devices){
     const devicesToSlice = devices.slice()
 
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
+    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice, 50)
     let requests = []
     for (const a of arrayOfArrays) {
         const promise = traccar.reports.reportsRouteGet(from, to, a.map(d => d.id))
@@ -11,13 +11,12 @@ async function getRoute(traccar, from, to, devices){
     }
 
     const result = await Promise.all(requests)
-
     return result.map(r => r.data).flat()
 }
 
 async function getTrips(traccar, from, to, devices){
     const devicesToSlice = devices.slice()
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
+    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice, 50)
     let requests = []
     for (const a of arrayOfArrays) {
         const promise = traccar.reports.reportsTripsGet(from, to, a.map(d => d.id))
@@ -30,7 +29,7 @@ async function getTrips(traccar, from, to, devices){
 
 async function getStops(traccar, from, to, devices){
     const devicesToSlice = devices.slice()
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
+    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice,50)
     let requests = []
     for (const a of arrayOfArrays) {
         const promise = traccar.reports.reportsStopsGet(from, to, a.map(d => d.id))
@@ -43,7 +42,7 @@ async function getStops(traccar, from, to, devices){
 
 async function getEvents(traccar, from, to, devices, events){
     const devicesToSlice = devices.slice()
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
+    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice, 50)
     let requests = []
     for (const a of arrayOfArrays) {
         const promise = traccar.reports.reportsEventsGet(from, to, a.map(d => d.id), null, events)
@@ -55,7 +54,7 @@ async function getEvents(traccar, from, to, devices, events){
 
 async function getSummary(traccar, from, to, devices){
     const devicesToSlice = devices.slice()
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
+    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice, 50)
     let requests = []
     for (const a of arrayOfArrays) {
         const promise = traccar.reports.reportsSummaryGet(from, to, a.map(d => d.id))
@@ -74,15 +73,18 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
     if(getSummary) url += `&type=summary`
     console.log('LOADING_MESSAGE:' + devices.map(d => d.name).join(', '))
 
-    const sliced = automaticReports.sliceArray(devices)
+    const sliced = automaticReports.sliceArray(devices, 5)
     let deviceCount = 0
-    const requests = sliced.map(a =>
-        traccar.axios.get(url + '&' + a.map(d => `deviceId=${d.id}`).join('&')).then(r => r.data).then(x => {
-            console.log('LOADING_MESSAGE:' + a.map(d => d.name).join(', '))
-            console.log(`PROGRESS_PERC:${++deviceCount/sliced.length*100}`)
-            return x
-        }))
-    const result = await Promise.all(requests)
+    const result = []
+    for(const chunk of sliced) {
+        const requests = chunk.map(d =>
+            traccar.axios.get(url + '&' + `deviceId=${d.id}`).then(r => r.data).then(x => {
+                console.log('LOADING_MESSAGE:' + d.name)
+                console.log(`PROGRESS_PERC:${++deviceCount / devices.length * 100}`)
+                return x
+            }))
+        result.push(...(await Promise.all(requests)))
+    }
     return {
         route: result.filter(t => t.route).map(r => r.route).flat(),
         trips: result.filter(t => t.trips).map(r => r.trips).flat(),