fleetmap-reports 2.0.208 → 2.0.210
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/util/traccar.js +2 -3
- package/src/zone-report.js +2 -2
package/package.json
CHANGED
package/src/util/traccar.js
CHANGED
|
@@ -74,7 +74,6 @@ async function getItems (traccar, u, _chunk, counter, devicesPerRequest, ignoreP
|
|
|
74
74
|
const x = routeOnly
|
|
75
75
|
? await streamJson(traccar, u)
|
|
76
76
|
: await traccar.axios.get(u, {
|
|
77
|
-
jar: traccar.cookieJar,
|
|
78
77
|
withCredentials: true
|
|
79
78
|
}).then(r => r.data)
|
|
80
79
|
|
|
@@ -94,8 +93,8 @@ async function getItems (traccar, u, _chunk, counter, devicesPerRequest, ignoreP
|
|
|
94
93
|
}
|
|
95
94
|
}
|
|
96
95
|
|
|
97
|
-
function streamJson (traccar, u) {
|
|
98
|
-
const cookie = traccar.axios.defaults.headers.common
|
|
96
|
+
function streamJson (traccar, u, _cookie) {
|
|
97
|
+
const cookie = _cookie || traccar.axios.defaults.headers?.cookie || traccar.axios.defaults.headers?.common?.cookie
|
|
99
98
|
return piscina.run({
|
|
100
99
|
url: traccar.axios.defaults.baseURL + u,
|
|
101
100
|
cookie
|
package/src/zone-report.js
CHANGED
|
@@ -23,11 +23,11 @@ const { checkGeofenceIn } = require('./util/geofence')
|
|
|
23
23
|
const { parallel } = require('./util/parallel')
|
|
24
24
|
const { getDataByDay } = require('./util/trips')
|
|
25
25
|
const axios = require('axios').default
|
|
26
|
-
const sliceSize =
|
|
26
|
+
const sliceSize = 5
|
|
27
27
|
const deviceChunk = 5
|
|
28
28
|
const fileName = 'ZoneReport'
|
|
29
29
|
|
|
30
|
-
async function createZoneReport (from, to, userData, traccar) {
|
|
30
|
+
async function createZoneReport (from, to, userData, traccar, cookie) {
|
|
31
31
|
console.log('createZoneReport', from, to)
|
|
32
32
|
const reportData = []
|
|
33
33
|
const devices = devicesToProcess(userData)
|