fleetmap-reports 2.0.195 → 2.0.196

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.195",
+  "version": "2.0.196",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -14,12 +14,13 @@
     "@turf/distance": "^6.5.0",
     "@turf/helpers": "^6.5.0",
     "@turf/point-to-line-distance": "^6.5.0",
-    "axios": "1.6.7",
+    "axios": "1.8.2",
     "country-reverse-geocoding": "^0.2.2",
     "docx": "^7.3.0",
     "file-saver": "^2.0.5",
     "fleetmap-partners": "1.0.185",
     "json-as-xlsx": "2.5.6",
+    "JSONStream": "^1.3.5",
     "jspdf": "^2.5.1",
     "jspdf-autotable": "3.8.1",
     "moment": "2.30.1",

package/src/util/traccar.js

@@ -1,5 +1,6 @@
 const automaticReports = require('../automaticReports')
 const { convertFromUTC, isClientSide, convertFromLocal } = require('./utils')
+const { parse } = require('JSONStream')
 
 async function getRoute (traccar, from, to, devices) {
   const devicesToSlice = devices.slice()
@@ -98,15 +99,25 @@ async function getAllInOne (
         traccar.axios.get(u, {
           jar: traccar.cookieJar,
           withCredentials: true,
-          timeout: 900000
-        }).catch(e => {
-          console.log(e.message, 'try again', u)
-          return traccar.axios.get(u, {
-            jar: traccar.cookieJar,
-            withCredentials: true,
-            timeout: 900000
+          timeout: 900000,
+          responseType: 'stream'
+        }).then(r => {
+          const stream = r.data
+          const jsonStream = parse()
+          stream.pipe(jsonStream)
+          let responseData = []
+          jsonStream.on('data', data => {
+            responseData = data
           })
-        }).then(r => r.data).then(x => {
+          return new Promise((resolve, reject) => {
+            jsonStream.on('close', data => {
+              resolve(responseData)
+            })
+            jsonStream.on('error', err => {
+              reject(err)
+            })
+          })
+        }).then(x => {
           console.log('LOADING_MESSAGE:' + _chunk[0].name)
           if (counter) {
             counter.count += devicesPerRequest
@@ -124,7 +135,7 @@ async function getAllInOne (
     try {
       result.push(...(await Promise.all(requests)))
     } catch (e) {
-      console.log('parallel', e.message, e.config)
+      console.error('parallel', e.message, e.config)
     }
     console.log('took', new Date() - now, 'ms')
   }

package/src/zone-report.js

@@ -23,7 +23,7 @@ const { checkGeofenceIn } = require('./util/geofence')
 const { parallel } = require('./util/parallel')
 const { getDataByDay } = require('./util/trips')
 const axios = require('axios').default
-const sliceSize = 5
+const sliceSize = 4
 const fileName = 'ZoneReport'
 
 async function createZoneReport (from, to, userData, traccar) {