fleetmap-reports 2.0.196 → 2.0.197
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 +4 -3
- package/src/util/traccar.js +10 -13
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "fleetmap-reports",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.197",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -14,20 +14,21 @@
|
|
|
14
14
|
"@turf/distance": "^6.5.0",
|
|
15
15
|
"@turf/helpers": "^6.5.0",
|
|
16
16
|
"@turf/point-to-line-distance": "^6.5.0",
|
|
17
|
-
"axios": "1.
|
|
17
|
+
"axios": "1.6.7",
|
|
18
18
|
"country-reverse-geocoding": "^0.2.2",
|
|
19
19
|
"docx": "^7.3.0",
|
|
20
20
|
"file-saver": "^2.0.5",
|
|
21
21
|
"fleetmap-partners": "1.0.185",
|
|
22
22
|
"json-as-xlsx": "2.5.6",
|
|
23
|
-
"JSONStream": "^1.3.5",
|
|
24
23
|
"jspdf": "^2.5.1",
|
|
25
24
|
"jspdf-autotable": "3.8.1",
|
|
26
25
|
"moment": "2.30.1",
|
|
26
|
+
"stream-json": "^1.9.1",
|
|
27
27
|
"traccar-api": "^1.0.5",
|
|
28
28
|
"wkt": "^0.1.1"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
|
+
"axios-debug-log": "^0.8.4",
|
|
31
32
|
"eslint": "^8.15.0",
|
|
32
33
|
"eslint-config-standard": "^17.0.0",
|
|
33
34
|
"eslint-plugin-import": "^2.26.0",
|
package/src/util/traccar.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
const automaticReports = require('../automaticReports')
|
|
2
2
|
const { convertFromUTC, isClientSide, convertFromLocal } = require('./utils')
|
|
3
|
-
const {
|
|
3
|
+
const { parser } = require('stream-json')
|
|
4
|
+
const Assembler = require('stream-json/Assembler')
|
|
4
5
|
|
|
5
6
|
async function getRoute (traccar, from, to, devices) {
|
|
6
7
|
const devicesToSlice = devices.slice()
|
|
@@ -102,22 +103,18 @@ async function getAllInOne (
|
|
|
102
103
|
timeout: 900000,
|
|
103
104
|
responseType: 'stream'
|
|
104
105
|
}).then(r => {
|
|
105
|
-
const
|
|
106
|
-
const
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
responseData = data
|
|
106
|
+
const jsonParser = parser()
|
|
107
|
+
const assembler = new Assembler()
|
|
108
|
+
r.data.pipe(jsonParser)
|
|
109
|
+
jsonParser.on('data', chunk => {
|
|
110
|
+
assembler[chunk.name]?.(chunk.value)
|
|
111
111
|
})
|
|
112
112
|
return new Promise((resolve, reject) => {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
})
|
|
116
|
-
jsonStream.on('error', err => {
|
|
117
|
-
reject(err)
|
|
118
|
-
})
|
|
113
|
+
jsonParser.on('end', () => resolve(assembler.current))
|
|
114
|
+
jsonParser.on('error', reject)
|
|
119
115
|
})
|
|
120
116
|
}).then(x => {
|
|
117
|
+
console.log('got', x)
|
|
121
118
|
console.log('LOADING_MESSAGE:' + _chunk[0].name)
|
|
122
119
|
if (counter) {
|
|
123
120
|
counter.count += devicesPerRequest
|