fleetmap-reports 2.0.306 → 2.0.308
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.worker.js +2 -3
- package/src/zone-report.js +2 -26
package/package.json
CHANGED
|
@@ -6,9 +6,8 @@ const { cleanPosition, filterPosition } = require('./route')
|
|
|
6
6
|
|
|
7
7
|
module.exports = async ({ url, cookie, filter }) => {
|
|
8
8
|
const now = new Date()
|
|
9
|
-
const response = await fetch(url, {
|
|
10
|
-
|
|
11
|
-
})
|
|
9
|
+
const response = await fetch(url, { headers: { cookie } })
|
|
10
|
+
.catch(e => { throw new Error(`${e.message} traccar-worker ${cookie} ${url} `) })
|
|
12
11
|
if (!response.ok) {
|
|
13
12
|
throw new Error(`${cookie} ${url} Fetch failed: ${response.status} ${response.statusText}`)
|
|
14
13
|
}
|
package/src/zone-report.js
CHANGED
|
@@ -26,28 +26,6 @@ const sliceSize = 1
|
|
|
26
26
|
const deviceChunk = 5
|
|
27
27
|
const fileName = 'ZoneReport'
|
|
28
28
|
|
|
29
|
-
function simpleLimit (concurrency) {
|
|
30
|
-
const queue = []
|
|
31
|
-
let activeCount = 0
|
|
32
|
-
|
|
33
|
-
const next = () => {
|
|
34
|
-
if (queue.length === 0 || activeCount >= concurrency) return
|
|
35
|
-
activeCount++
|
|
36
|
-
const { fn, resolve, reject } = queue.shift()
|
|
37
|
-
fn().then(resolve).catch(reject).finally(() => {
|
|
38
|
-
activeCount--
|
|
39
|
-
next()
|
|
40
|
-
})
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
return fn => {
|
|
44
|
-
return new Promise((resolve, reject) => {
|
|
45
|
-
queue.push({ fn, resolve, reject })
|
|
46
|
-
next()
|
|
47
|
-
})
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
|
|
51
29
|
exports.process = async (traccar, from, to, slice, deviceCount, devices, reportRangeDays, userData) => {
|
|
52
30
|
const data = await traccarHelper.getAllInOne(
|
|
53
31
|
traccar, from, to, slice, true, false, false, false,
|
|
@@ -107,8 +85,7 @@ async function createZoneReport (from, to, userData, traccar) {
|
|
|
107
85
|
|
|
108
86
|
const url = 'https://rntba7aqifqx3iywrenb7pq6km0liwsr.lambda-url.us-east-1.on.aws/pinmeapi/process-report/zone-report-processing'
|
|
109
87
|
|
|
110
|
-
const
|
|
111
|
-
const promises = sliced.map((slice, i) => limit(async () => {
|
|
88
|
+
const promises = sliced.map((slice, i) => {
|
|
112
89
|
const now = new Date()
|
|
113
90
|
return traccar.axios.post(url, {
|
|
114
91
|
from,
|
|
@@ -120,7 +97,7 @@ async function createZoneReport (from, to, userData, traccar) {
|
|
|
120
97
|
reportRangeDays
|
|
121
98
|
}, { timeout: 900000 })
|
|
122
99
|
.catch(e => {
|
|
123
|
-
console.error(url, (e.
|
|
100
|
+
console.error(url, (e.response && e.response.data) || e, 'try again')
|
|
124
101
|
return traccar.axios.post(url, {
|
|
125
102
|
from,
|
|
126
103
|
to,
|
|
@@ -135,7 +112,6 @@ async function createZoneReport (from, to, userData, traccar) {
|
|
|
135
112
|
return response.data
|
|
136
113
|
})
|
|
137
114
|
})
|
|
138
|
-
)
|
|
139
115
|
const results = await Promise.all(promises)
|
|
140
116
|
results.forEach(processed => {
|
|
141
117
|
if (processed && processed.length) {
|