fleetmap-reports 2.0.249 → 2.0.251

package/package.json

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

package/src/util/traccar.js

@@ -100,8 +100,14 @@ async function getItems (traccar, u, _chunk, counter, devicesPerRequest, ignoreP
   }
 }
 
+function getCookie (traccar) {
+  return (traccar.axios.defaults.headers && traccar.axios.defaults.headers.cookie) ||
+      (traccar.axios.defaults.headers && traccar.axios.defaults.headers.common && traccar.axios.defaults.headers.common.cookie) ||
+      (require('axios').defaults.headers && require('axios').defaults.headers.common && require('axios').defaults.headers.common.cookie)
+}
+
 function streamJson (traccar, u, filter) {
-  const cookie = traccar.axios.defaults.headers?.cookie || traccar.axios.defaults.headers?.common?.cookie || require('axios').defaults.headers?.common?.cookie
+  const cookie = getCookie(traccar)
   return piscina.run({
     url: traccar.axios.defaults.baseURL + u,
     cookie,

package/src/util/utils.js

@@ -296,8 +296,13 @@ exports.convertToFeature = convertToFeature
 exports.convertPositionToFeature = convertPositionToFeature
 exports.calculateDistance = (positions, ignoreOdometer) => {
   let distanceValue = 0
-  if (!ignoreOdometer && positions.length > 1 && positions[0].attributes?.odometer && positions[positions.length - 1].attributes?.odometer) {
-    distanceValue = (positions[positions.length - 1].attributes?.odometer - positions[0].attributes?.odometer) / 1000
+  if (!ignoreOdometer &&
+      positions.length > 1 &&
+      positions[0].attributes &&
+      positions[0].attributes.odometer &&
+      positions[positions.length - 1].attributes &&
+      positions[positions.length - 1].attributes.odometer) {
+    distanceValue = (positions[positions.length - 1].attributes.odometer - positions[0].attributes.odometer) / 1000
   }
 
   if (distanceValue > 0) {

package/src/zone-report.js

@@ -120,7 +120,7 @@ async function createZoneReport (from, to, userData, traccar) {
       reportRangeDays
     }, { timeout: 900000 })
       .catch(e => {
-        console.error(url, e.message, e.response?.data || e, 'try again')
+        console.error(url, (e.message && e.response.data) || e, 'try again')
         return traccar.axios.post(url, {
           from,
           to,