fleetmap-reports 2.0.307 → 2.0.309

package/package.json

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

package/src/util/parallel.js

@@ -37,10 +37,13 @@ exports.parallel = (report, method, toSlice, ...args) => {
               resolve(_result.flat())
             }
           })
-          worker.on('error', reject)
+          worker.on('error', (e) => {
+            console.error('worker', worker.process.pid, e)
+            reject(e)
+          })
           worker.on('exit', (code, signal) => {
             if (code !== 0) {
-              reject(new Error(`Worker exited with code ${code} and signal ${signal}`))
+              reject(new Error(`Worker ${worker.process.pid} exited with code ${code} and signal ${signal}`))
             }
           })
         } catch (e) {

package/src/zone-report.js

@@ -26,28 +26,6 @@ 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,
@@ -107,8 +85,7 @@ 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 limit = simpleLimit(1000)
-  const promises = sliced.map((slice, i) => limit(async () => {
+  const promises = sliced.map((slice, i) => {
     const now = new Date()
     return traccar.axios.post(url, {
       from,
@@ -135,7 +112,6 @@ async function createZoneReport (from, to, userData, traccar) {
         return response.data
       })
   })
-  )
   const results = await Promise.all(promises)
   results.forEach(processed => {
     if (processed && processed.length) {