fleetmap-reports 2.0.311 → 2.0.313

package/package.json

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

package/src/zone-report.js

@@ -26,6 +26,28 @@ const sliceSize = 1
 const deviceChunk = 5
 const fileName = 'ZoneReport'
 
+function simpleLimit (concurrency) {
+  const queue = []
+  let activeCount = 0
+
+  const next = () => {
+    if (queue.length === 0 || activeCount >= concurrency) return
+    activeCount++
+    const { fn, resolve, reject } = queue.shift()
+    fn().then(resolve).catch(reject).finally(() => {
+      activeCount--
+      next()
+    })
+  }
+
+  return fn => {
+    return new Promise((resolve, reject) => {
+      queue.push({ fn, resolve, reject })
+      next()
+    })
+  }
+}
+
 exports.process = async (traccar, from, to, slice, deviceCount, devices, reportRangeDays, userData) => {
   const data = await traccarHelper.getAllInOne(
     traccar, from, to, slice, true, false, false, false,
@@ -85,7 +107,8 @@ async function createZoneReport (from, to, userData, traccar) {
 
   const url = 'https://rntba7aqifqx3iywrenb7pq6km0liwsr.lambda-url.us-east-1.on.aws/pinmeapi/process-report/zone-report-processing'
 
-  const promises = sliced.map((slice, i) => {
+  const limit = simpleLimit(1000)
+  const promises = sliced.map((slice, i) => limit(async () => {
     const now = new Date()
     return traccar.axios.post(url, {
       from,
@@ -112,6 +135,7 @@ async function createZoneReport (from, to, userData, traccar) {
         return response.data
       })
   })
+  )
   const results = await Promise.all(promises)
   results.forEach(processed => {
     if (processed && processed.length) {
@@ -128,7 +152,7 @@ async function processDevices (from, to, devices, userData, data) {
   const devicesResult = []
   console.log('processDevices', from, to, devices.length)
   for (const d of devices) {
-    const alerts = data.alerts.filter(t => t.deviceId === d.id)
+    const alerts = data.alerts.filter(t => t && t.deviceId === d.id)
     const deviceRoute = data.route.filter(p => p.deviceId === d.id)
     let zoneInOutData = analyseAlerts(alerts, deviceRoute, userData, from, to, d).filter(d => !userData.onlyWithStop || d.stopped)