fleetmap-reports 2.0.362 → 2.0.364

package/package.json

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

package/src/partnerReports/driverranking-report.js

@@ -57,13 +57,26 @@ function toGrade (score) {
   return grades.find(g => score >= g.min).grade
 }
 
+// Splits [from, to] into consecutive sub-ranges of at most chunkDays each
+function splitDateRange (from, to, chunkDays) {
+  const chunkMs = chunkDays * 24 * 60 * 60 * 1000
+  const end = new Date(to).getTime()
+  const chunks = []
+  let chunkStart = new Date(from).getTime()
+  while (chunkStart < end) {
+    const chunkEnd = Math.min(chunkStart + chunkMs, end)
+    chunks.push({ from: new Date(chunkStart), to: new Date(chunkEnd) })
+    chunkStart = chunkEnd
+  }
+  return chunks.length ? chunks : [{ from: new Date(from), to: new Date(to) }]
+}
+
 async function create (from, to, userData, traccar) {
   const reportData = {
     drivers: []
   }
 
   userData.geofences = []
-  userData.roadSpeedLimits = true
 
   let deviceIdsByDriver
   if (!userData.requestToRunServerSide) {
@@ -101,41 +114,49 @@ async function create (from, to, userData, traccar) {
   }
 
   const devices = userData.devices
-  let deviceCount = 0
   const driversData = new Map()
-  const overspeedEvents = await getOverspeedEvents(from, to, userData, devices, userData, traccar)
 
-  const sliced = automaticReports.sliceArray(devices, 5)
+  // Process the period in chunks so we never hold more than ~a week of raw GPS positions for the
+  // whole device set in memory at once - a single busy device can have tens of thousands of
+  // positions over a month, which was causing Runtime.OutOfMemory even after narrowing devices/drivers.
+  const dateChunks = splitDateRange(from, to, 7)
+  const totalDeviceOperations = devices.length * dateChunks.length
+  let deviceCount = 0
 
-  for (const slice of sliced) {
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, false, false, deviceCount, devices.length)
+  for (const dateChunk of dateChunks) {
+    const overspeedEvents = await getOverspeedEvents(dateChunk.from, dateChunk.to, userData, devices, userData, traccar)
+    const sliced = automaticReports.sliceArray(devices, 5)
 
-    const result = []
-    const requests = []
-    for (const _chunk of automaticReports.sliceArray(slice.map(d => d.id), 1)) {
-      requests.push(traccar.reports.reportsEventsGet(from, to, _chunk, null, ['alarm']))
-    }
+    for (const slice of sliced) {
+      const allInOne = await traccarHelper.getAllInOne(traccar, dateChunk.from, dateChunk.to, slice, true, true, false, false, deviceCount, totalDeviceOperations)
 
-    try {
-      result.push(...(await Promise.all(requests)))
-    } catch (e) {
-      console.log(e)
-    }
-    const alarmEvents = result.flatMap(d => d.data)
+      const result = []
+      const requests = []
+      for (const _chunk of automaticReports.sliceArray(slice.map(d => d.id), 1)) {
+        requests.push(traccar.reports.reportsEventsGet(dateChunk.from, dateChunk.to, _chunk, null, ['alarm']))
+      }
 
-    for (const device of slice) {
-      const route = allInOne.route.filter(t => t.deviceId === device.id)
-      const trips = allInOne.trips.filter(t => t.deviceId === device.id)
+      try {
+        result.push(...(await Promise.all(requests)))
+      } catch (e) {
+        console.log(e)
+      }
+      const alarmEvents = result.flatMap(d => d.data)
 
-      const deviceOverspeedEvents = overspeedEvents.find(e => e.device.id === device.id)
-      const deviceAlarmEvents = alarmEvents.filter(e => e.deviceId === device.id)
+      for (const device of slice) {
+        const route = allInOne.route.filter(t => t.deviceId === device.id)
+        const trips = allInOne.trips.filter(t => t.deviceId === device.id)
 
-      await processDevice(driversData, device, userData, { route, trips }, deviceAlarmEvents, deviceOverspeedEvents)
-      deviceCount++
-    }
+        const deviceOverspeedEvents = overspeedEvents.find(e => e.device.id === device.id)
+        const deviceAlarmEvents = alarmEvents.filter(e => e.deviceId === device.id)
 
-    console.log('LOADING_MESSAGE:' + slice[0].name)
-    console.log(`PROGRESS_PERC:${deviceCount / devices.length * 100}`)
+        await processDevice(driversData, device, userData, { route, trips }, deviceAlarmEvents, deviceOverspeedEvents)
+        deviceCount++
+      }
+
+      console.log('LOADING_MESSAGE:' + slice[0].name)
+      console.log(`PROGRESS_PERC:${deviceCount / totalDeviceOperations * 100}`)
+    }
   }
 
   const allDriversData = (Array.from(driversData.values())).filter(d => d.distance > 0)