fleetmap-reports 1.0.739 → 1.0.740

package/package.json

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

package/src/automaticReports.js

@@ -64,3 +64,5 @@ exports.deviceWithFuelInfo = deviceWithFuelInfo
 exports.calculateSpentFuel = calculateSpentFuel
 exports.calculateXpertSpentFuel = calculateXpertSpentFuel
 exports.calculateXpertDistance = calculateXpertDistance
+exports.maxParallelRequests = maxParallelRequests
+

package/src/events-report.js

@@ -8,6 +8,7 @@ const { convertToLocaleString, getTranslations } = require('./util/utils')
 const { devicesToProcess } = require('./util/device')
 const { isInside } = require('./util/timetable')
 const { getDigitalPortValue } = require('./location-report')
+const { maxParallelRequests } = require('./automaticReports')
 
 const fileName = 'EventReport'
 
@@ -41,7 +42,7 @@ async function createEventsReport (from, to, userData, traccar) {
 
   const devices = devicesToProcess(userData)
 
-  const data = await getReportData(from, to, devices, userData.eventTypes, traccar)
+  const data = await getReportData(from, to, devices, userData.eventTypes || [], traccar)
 
   if (data.length > 0) {
     reportData.push({
@@ -73,45 +74,47 @@ async function getReportData (from, to, devices, types, traccar) {
 async function processDevices (from, to, devices, data, traccar, userData) {
   const devicesResult = []
   let i = 0
-  await Promise.all(devices.map(async d => {
-    const deviceAlerts = data.filter(t => t.deviceId === d.id)
-
-    const response = await traccar.reports.reportsRouteGet(from, to, [d.id])
-    const positions = response.data
-
-    for (const a of deviceAlerts) {
-      a.position = positions.find(p => p.id === a.positionId)
-
-      if (a.geofenceId) {
-        const geofence = userData.geofences.find(g => g.id === a.geofenceId)
-        if (geofence) {
-          if (a.type === 'deviceOverspeed') {
-            a.geofenceName = geofence.name + ' (' + Math.round(a.attributes.speedLimit * 1.85200) + ' Km/h)'
-          } else {
-            a.geofenceName = geofence.name
+  for (let j = 0; j < devices.length; j += maxParallelRequests) {
+    await Promise.all(devices.slice(j, j + maxParallelRequests).map(async d => {
+      const deviceAlerts = data.filter(t => t.deviceId === d.id)
+
+      const response = await traccar.reports.reportsRouteGet(from, to, [d.id])
+      const positions = response.data
+
+      for (const a of deviceAlerts) {
+        a.position = positions.find(p => p.id === a.positionId)
+
+        if (a.geofenceId) {
+          const geofence = userData.geofences.find(g => g.id === a.geofenceId)
+          if (geofence) {
+            if (a.type === 'deviceOverspeed') {
+              a.geofenceName = geofence.name + ' (' + Math.round(a.attributes.speedLimit * 1.85200) + ' Km/h)'
+            } else {
+              a.geofenceName = geofence.name
+            }
           }
         }
-      }
 
-      if (a.position && a.position.attributes.driverUniqueId) {
-        const driver = userData.drivers.find(d => d.uniqueId === a.position.attributes.driverUniqueId)
-        a.driver = driver && driver.name
+        if (a.position && a.position.attributes.driverUniqueId) {
+          const driver = userData.drivers.find(d => d.uniqueId === a.position.attributes.driverUniqueId)
+          a.driver = driver && driver.name
+        }
       }
-    }
 
-    const alerts = deviceAlerts.filter(a => userData.allWeek || !userData.weekDays || (!a.position || isInside(a.position.fixTime, a.position.fixTime, userData)))
-    console.log('LOADING_MESSAGE:' + d.name)
-    console.log(`PROGRESS_PERC:${++i / devices.length * 100}`)
-
-    if (alerts.length > 0) {
-      devicesResult.push({
-        device: d,
-        from,
-        to,
-        alerts
-      })
-    }
-  }))
+      const alerts = deviceAlerts.filter(a => userData.allWeek || !userData.weekDays || (!a.position || isInside(a.position.fixTime, a.position.fixTime, userData)))
+      console.log('LOADING_MESSAGE:' + d.name)
+      console.log(`PROGRESS_PERC:${++i / devices.length * 100}`)
+
+      if (alerts.length > 0) {
+        devicesResult.push({
+          device: d,
+          from,
+          to,
+          alerts
+        })
+      }
+    }))
+  }
 
   return devicesResult
 }

package/src/tests/events.test.js

@@ -0,0 +1,15 @@
+const { getReports } = require('./index')
+// eslint-disable-next-line no-undef
+describe('events', function () {
+  // eslint-disable-next-line no-undef
+  it('works with many devices', async () => {
+    const report = await getReports(process.env.USER_NOGARTEL, process.env.PASS_NOGARTEL)
+    const userData = await report.getUserData()
+    console.log(userData.devices.length)
+    const result = await report.eventsReport(
+      new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 5, 11, 23, 59, 59, 0)),
+      userData)
+    console.log('result', result)
+  }, 4000000)
+})