fleetmap-reports 2.0.354 → 2.0.357

package/package.json

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

package/src/partnerReports/driverranking-report.js

@@ -1,5 +1,5 @@
 const traccarHelper = require('../util/traccar')
-const { getDriverData } = require('../util/driver')
+const { getDriverData, devicesByDriver } = require('../util/driver')
 const { getCanDriverStyleMessages, parseCanDriverStyleMessage } = require('../util/xpert')
 const { calculateRPMSections } = require('./performance-report')
 const { getTranslations, isClientSide, convertToLocaleString, convertMS } = require('../util/utils')
@@ -29,10 +29,12 @@ async function create (from, to, userData, traccar) {
     drivers: []
   }
 
-  const devices = userData.devices
   userData.geofences = []
   userData.roadSpeedLimits = true
 
+  const { devices, drivers } = await devicesByDriver(traccar, from, to, userData.drivers, userData.devices)
+  userData.drivers = drivers
+
   let deviceCount = 0
   const driversData = new Map()
   const overspeedEvents = await getOverspeedEvents(from, to, userData, devices, userData, traccar)
@@ -65,6 +67,9 @@ async function create (from, to, userData, traccar) {
       await processDevice(driversData, device, userData, { route, trips }, deviceAlarmEvents, deviceOverspeedEvents)
       deviceCount++
     }
+
+    console.log('LOADING_MESSAGE:' + slice[0].name)
+    console.log(`PROGRESS_PERC:${deviceCount / devices.length * 100}`)
   }
 
   const allDriversData = (Array.from(driversData.values())).filter(d => d.distance > 0)

package/src/speeding-report.js

@@ -132,7 +132,17 @@ async function getEvents (traccarInstance, from, to, devices, userData, deviceCo
   if (processServerSide() && !userData.useVehicleSpeedLimit) {
     const cookie = await axios.get('/pinmeapi/cookie/get', { withCredentials: true }).then(d => d.data)
     const url = `https://${getServerHost()}/pinmeapi/reports/speeding-report/getEvents`
-    return axios.post(url, { from, to, devices, userData, deviceCount, totalDevices, sliceSize, cookie }, { withCredentials: true }).then(d => d.data)
+    const maxAttempts = 3
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+      try {
+        return await axios.post(url, { from, to, devices, userData, deviceCount, totalDevices, sliceSize, cookie }, { withCredentials: true, timeout: 60000 }).then(d => d.data)
+      } catch (e) {
+        console.log(`getEvents failed for devices [${devices.map(d => d.name).join(', ')}] (attempt ${attempt}/${maxAttempts}): ${e.message}`)
+        if (attempt === maxAttempts) {
+          return []
+        }
+      }
+    }
   } else {
     const geofencesFeatures = userData.geofences.filter(g => g.area && g.area.startsWith('POLYGON') &&
       g.attributes.speedLimit).map(g => convertToFeature(g))

package/src/util/utils.js

@@ -115,6 +115,7 @@ function getDates (startDate, endDate, timezone) {
   let currentDate = new Date(startDate.getFullYear(), startDate.getMonth(), startDate.getDate(), 12, 0, 0, 0)
   let _endDate = new Date(endDate.getFullYear(), endDate.getMonth(), endDate.getDate(), 23, 59, 59, 0)
 
+  timezone = safeTimezone(timezone)
   if (!isClientSide() && timezone) {
     const startDateUserTimezone = convertFromUTC(startDate, timezone)
     currentDate = new Date(startDateUserTimezone.getFullYear(), startDateUserTimezone.getMonth(), startDateUserTimezone.getDate(), 12, 0, 0, 0)
@@ -160,13 +161,25 @@ async function getImgFromUrl (hostname) {
 
 function isClientSide () { return (typeof window !== 'undefined') }
 
+// Guards against corrupt user attributes (e.g. timezone === true) reaching Intl,
+// which throws RangeError: Invalid time zone specified
+function safeTimezone (timezone) {
+  if (typeof timezone !== 'string' || !timezone) return undefined
+  try {
+    Intl.DateTimeFormat(undefined, { timeZone: timezone })
+    return timezone
+  } catch (e) {
+    return undefined
+  }
+}
+
 function convertToLocaleString (value, lang, timezone, user) {
   if (isClientSide()) {
     return new Date(value).toLocaleString()
   }
   if ((lang && timezone) || user) {
     return new Date(value).toLocaleString(lang || getUserPartner(user).lang, {
-      timeZone: timezone || getUserPartner(user).timezone,
+      timeZone: safeTimezone(timezone) || safeTimezone(user && getUserPartner(user).timezone),
       hour12: false
     })
   }
@@ -178,7 +191,7 @@ function convertToLocaleDateString (value, lang, timezone, user) {
     return new Date(value).toLocaleDateString()
   } else {
     return new Date(value).toLocaleDateString(lang || getUserPartner(user).lang, {
-      timeZone: timezone || getUserPartner(user).timezone,
+      timeZone: safeTimezone(timezone) || safeTimezone(user && getUserPartner(user).timezone),
       hour12: false
     })
   }
@@ -189,7 +202,7 @@ function convertToLocaleTimeString (value, lang, timezone, user) {
     return new Date(value).toLocaleTimeString()
   } else {
     return new Date(value).toLocaleTimeString(lang || getUserPartner(user).lang, {
-      timeZone: timezone || getUserPartner(user).timezone,
+      timeZone: safeTimezone(timezone) || safeTimezone(user && getUserPartner(user).timezone),
       hour12: false
     })
   }
@@ -199,6 +212,10 @@ function getTimezoneOffset (timezone, date = new Date()) {
   if (isClientSide()) {
     return date.getTimezoneOffset()
   } else {
+    timezone = safeTimezone(timezone)
+    if (!timezone) {
+      return 0
+    }
     const utcDate = new Date(date.toLocaleString('en-US', { timeZone: 'UTC' }))
     const tzDate = new Date(date.toLocaleString('en-US', { timeZone: timezone }))
     return (utcDate.getTime() - tzDate.getTime()) / 6e4