fleetmap-reports 2.0.230 → 2.0.232

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.230",
+  "version": "2.0.232",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -23,6 +23,7 @@
     "jspdf": "^2.5.1",
     "jspdf-autotable": "3.8.1",
     "moment": "2.30.1",
+    "p-limit": "^6.2.0",
     "piscina": "^4.9.2",
     "stream-chain": "^3.4.0",
     "stream-json": "^1.9.1",

package/src/zone-report.js

@@ -25,6 +25,8 @@ const axios = require('axios').default
 const sliceSize = 1
 const deviceChunk = 5
 const fileName = 'ZoneReport'
+const {pLimit} = require('p-limit')
+
 
 exports.process = async (traccar, from, to, slice, deviceCount, devices, reportRangeDays, userData) => {
   const data = await traccarHelper.getAllInOne(
@@ -83,23 +85,22 @@ async function createZoneReport (from, to, userData, traccar) {
   const reportRangeDays = (new Date(to).getTime() - new Date(from).getTime()) / (1000 * 60 * 60 * 24)
   const sliced = automaticReports.sliceArray(devices, sliceSize)
 
-  let deviceCount = 0
-  const url = `https://${process.env.SERVER_HOST}/pinmeapi/process-report/zone-report-processing`
+  const url = 'https://api.pinme.io/pinmeapi/process-report/zone-report-processing'
 
-  const promises = sliced.map(slice => {
+  const promises = sliced.map((slice, i) => {
     const now = new Date()
     return traccar.axios.post(url, {
       from,
       to,
       userData,
       slice,
-      deviceCount: deviceCount++,
+      deviceCount: i,
       devices,
       reportRangeDays
     }, { timeout: 900000 }).then(response => {
       console.log('processed devices', slice.map(d => d.id), 'in', new Date() - now, 'ms')
       return response.data
-    }).catch(e => console.error(e.message, e.response?.data))
+    }).catch(e => console.error(url, e.message, e))
   })
   const results = await Promise.all(promises)
   results.forEach(processed => {