@nxtedition/lib 19.0.37 → 19.0.39
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 +13 -13
- package/s3.js +9 -6
- package/serializers.js +2 -8
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nxtedition/lib",
|
|
3
|
-
"version": "19.0.
|
|
3
|
+
"version": "19.0.39",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"author": "Robert Nagy <robert.nagy@boffins.se>",
|
|
6
6
|
"type": "module",
|
|
@@ -75,11 +75,11 @@
|
|
|
75
75
|
"/__tests__"
|
|
76
76
|
],
|
|
77
77
|
"dependencies": {
|
|
78
|
-
"@aws-sdk/client-s3": "^3.
|
|
79
|
-
"@elastic/elasticsearch": "^8.
|
|
80
|
-
"@elastic/transport": "^8.
|
|
81
|
-
"@nxtedition/nxt-undici": "^2.0.
|
|
82
|
-
"date-fns": "^3.
|
|
78
|
+
"@aws-sdk/client-s3": "^3.550.0",
|
|
79
|
+
"@elastic/elasticsearch": "^8.13.0",
|
|
80
|
+
"@elastic/transport": "^8.5.0",
|
|
81
|
+
"@nxtedition/nxt-undici": "^2.0.45",
|
|
82
|
+
"date-fns": "^3.6.0",
|
|
83
83
|
"fast-querystring": "^1.1.1",
|
|
84
84
|
"hasha": "^6.0.0",
|
|
85
85
|
"http-errors": "^2.0.0",
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
"nested-error-stacks": "^2.1.1",
|
|
93
93
|
"object-hash": "^3.0.0",
|
|
94
94
|
"p-queue": "^8.0.1",
|
|
95
|
-
"pino": "^8.
|
|
95
|
+
"pino": "^8.20.0",
|
|
96
96
|
"pino-std-serializers": "^6.2.2",
|
|
97
97
|
"qs": "^6.12.0",
|
|
98
98
|
"request-target": "^1.0.2",
|
|
@@ -100,18 +100,18 @@
|
|
|
100
100
|
"split-string": "^6.0.0",
|
|
101
101
|
"split2": "^4.2.0",
|
|
102
102
|
"toobusy-js": "^0.5.1",
|
|
103
|
-
"undici": "^6.
|
|
103
|
+
"undici": "^6.12.0",
|
|
104
104
|
"url-join": "^5.0.0"
|
|
105
105
|
},
|
|
106
106
|
"devDependencies": {
|
|
107
|
-
"@nxtedition/deepstream.io-client-js": ">=24.1.
|
|
108
|
-
"@types/lodash": "^4.
|
|
109
|
-
"@types/node": "^20.
|
|
110
|
-
"eslint": "^
|
|
107
|
+
"@nxtedition/deepstream.io-client-js": ">=24.1.20",
|
|
108
|
+
"@types/lodash": "^4.17.0",
|
|
109
|
+
"@types/node": "^20.12.6",
|
|
110
|
+
"eslint": "^9.0.0",
|
|
111
111
|
"eslint-config-prettier": "^9.1.0",
|
|
112
112
|
"eslint-config-standard": "^17.0.0",
|
|
113
113
|
"eslint-plugin-import": "^2.29.1",
|
|
114
|
-
"eslint-plugin-n": "^
|
|
114
|
+
"eslint-plugin-n": "^17.1.0",
|
|
115
115
|
"eslint-plugin-node": "^11.1.0",
|
|
116
116
|
"eslint-plugin-promise": "^6.0.0",
|
|
117
117
|
"husky": "^9.0.11",
|
package/s3.js
CHANGED
|
@@ -51,7 +51,7 @@ export async function upload({
|
|
|
51
51
|
)
|
|
52
52
|
uploadId = multipartUploadOutput.UploadId
|
|
53
53
|
logger = logger?.child({ uploadId })
|
|
54
|
-
logger?.debug('
|
|
54
|
+
logger?.debug('multipart upload created')
|
|
55
55
|
|
|
56
56
|
const uploader = {
|
|
57
57
|
size: 0,
|
|
@@ -113,7 +113,11 @@ export async function upload({
|
|
|
113
113
|
logger?.debug({ number, size, etag: ETag }, 'part upload completed')
|
|
114
114
|
return { part: { ETag, PartNumber: number } }
|
|
115
115
|
} catch (err) {
|
|
116
|
-
|
|
116
|
+
if (err.name === 'AbortError') {
|
|
117
|
+
logger?.debug({ err }, 'part upload aborted')
|
|
118
|
+
} else {
|
|
119
|
+
logger?.warn({ err }, 'part upload failed')
|
|
120
|
+
}
|
|
117
121
|
return { error: err }
|
|
118
122
|
}
|
|
119
123
|
},
|
|
@@ -154,7 +158,7 @@ export async function upload({
|
|
|
154
158
|
signal?.throwIfAborted()
|
|
155
159
|
|
|
156
160
|
if (errors.length > 0) {
|
|
157
|
-
throw new AggregateError(errors, 'upload failed')
|
|
161
|
+
throw new AggregateError(errors, 'multipart upload failed')
|
|
158
162
|
}
|
|
159
163
|
|
|
160
164
|
if (parts.length === 0) {
|
|
@@ -190,16 +194,15 @@ export async function upload({
|
|
|
190
194
|
throw new Error(`Expected hash ${hash} but got ${result.hash}`)
|
|
191
195
|
}
|
|
192
196
|
|
|
193
|
-
logger?.debug(result, '
|
|
197
|
+
logger?.debug(result, 'multipart upload completed')
|
|
194
198
|
|
|
195
199
|
return result
|
|
196
200
|
} catch (err) {
|
|
197
|
-
logger?.error({ err }, '
|
|
201
|
+
logger?.error({ err }, 'multipart upload failed')
|
|
198
202
|
|
|
199
203
|
if (uploadId) {
|
|
200
204
|
try {
|
|
201
205
|
await s3.send(new AWS.AbortMultipartUploadCommand({ Bucket, Key, UploadId: uploadId }))
|
|
202
|
-
logger?.warn('aborted multipart upload')
|
|
203
206
|
} catch (er) {
|
|
204
207
|
throw new AggregateError([err, er])
|
|
205
208
|
}
|
package/serializers.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import serializers from 'pino-std-serializers'
|
|
2
2
|
import { SIGNALS } from './platform.js'
|
|
3
|
+
import { util } from 'undici'
|
|
3
4
|
|
|
4
5
|
function getHeader(obj, key) {
|
|
5
6
|
return obj?.headers?.get?.(key) || obj?.getHeader?.(key) || obj?.headers?.[key]
|
|
@@ -11,14 +12,7 @@ function getHeaders(obj) {
|
|
|
11
12
|
}
|
|
12
13
|
|
|
13
14
|
if (Array.isArray(obj.headers)) {
|
|
14
|
-
|
|
15
|
-
const dst = {}
|
|
16
|
-
for (let n = 0; n < src.length; n += 2) {
|
|
17
|
-
const key = src[n].toString().toLowerCase()
|
|
18
|
-
const val = src[n + 1].toString()
|
|
19
|
-
dst[key] = dst[key] ? `${dst[key]},${val}` : val
|
|
20
|
-
}
|
|
21
|
-
return dst
|
|
15
|
+
return util.parseHeaders(obj.headers)
|
|
22
16
|
}
|
|
23
17
|
|
|
24
18
|
return (
|