FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

deps: update undici to 7.19.2 · nodejs/node@2c39a92 · GitHub

/ node Public

Commit 2c39a92

Browse files
nodejs-github-bot
authored and
aduh95
committed
deps: update undici to 7.19.2
PR-URL: #61566 Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Matthew Aitken <maitken033380023@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 4726627 commit 2c39a92

9 files changed

Lines changed: 122 additions & 180 deletions

File tree

‎deps/undici/src/lib/core/util.js‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -431,22 +431,17 @@ function parseHeaders (headers, obj) {
431431
val = [val]
432432
obj[key] = val
433433
}
434-
val.push(headers[i + 1].toString('utf8'))
434+
val.push(headers[i + 1].toString('latin1'))
435435
} else {
436436
const headersValue = headers[i + 1]
437437
if (typeof headersValue === 'string') {
438438
obj[key] = headersValue
439439
} else {
440-
obj[key] = Array.isArray(headersValue) ? headersValue.map(x => x.toString('utf8')) : headersValue.toString('utf8')
440+
obj[key] = Array.isArray(headersValue) ? headersValue.map(x => x.toString('latin1')) : headersValue.toString('latin1')
441441
}
442442
}
443443
}
444444

445-
// See https://github.com/nodejs/node/pull/46528
446-
if ('content-length' in obj && 'content-disposition' in obj) {
447-
obj['content-disposition'] = Buffer.from(obj['content-disposition']).toString('latin1')
448-
}
449-
450445
return obj
451446
}
452447

@@ -461,34 +456,20 @@ function parseRawHeaders (headers) {
461456
*/
462457
const ret = new Array(headersLength)
463458

464-
let hasContentLength = false
465-
let contentDispositionIdx = -1
466459
let key
467460
let val
468-
let kLen = 0
469461

470462
for (let n = 0; n < headersLength; n += 2) {
471463
key = headers[n]
472464
val = headers[n + 1]
473465

474466
typeof key !== 'string' && (key = key.toString())
475-
typeof val !== 'string' && (val = val.toString('utf8'))
467+
typeof val !== 'string' && (val = val.toString('latin1'))
476468

477-
kLen = key.length
478-
if (kLen === 14 && key[7] === '-' && (key === 'content-length' || key.toLowerCase() === 'content-length')) {
479-
hasContentLength = true
480-
} else if (kLen === 19 && key[7] === '-' && (key === 'content-disposition' || key.toLowerCase() === 'content-disposition')) {
481-
contentDispositionIdx = n + 1
482-
}
483469
ret[n] = key
484470
ret[n + 1] = val
485471
}
486472

487-
// See https://github.com/nodejs/node/pull/46528
488-
if (hasContentLength && contentDispositionIdx !== -1) {
489-
ret[contentDispositionIdx] = Buffer.from(ret[contentDispositionIdx]).toString('latin1')
490-
}
491-
492473
return ret
493474
}
494475

‎deps/undici/src/lib/dispatcher/client-h2.js‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -642,9 +642,13 @@ function writeH2 (client, request) {
642642
++session[kOpenStreams]
643643
stream.setTimeout(requestTimeout)
644644

645+
// Track whether we received a response (headers)
646+
let responseReceived = false
647+
645648
stream.once('response', headers => {
646649
const { [HTTP2_HEADER_STATUS]: statusCode, ...realHeaders } = headers
647650
request.onResponseStarted()
651+
responseReceived = true
648652

649653
// Due to the stream nature, it is possible we face a race condition
650654
// where the stream has been assigned, but the request has been aborted
@@ -667,30 +671,20 @@ function writeH2 (client, request) {
667671
}
668672
})
669673

670-
stream.once('end', (err) => {
674+
stream.once('end', () => {
671675
stream.removeAllListeners('data')
672-
// When state is null, it means we haven't consumed body and the stream still do not have
673-
// a state.
674-
// Present specially when using pipeline or stream
675-
if (stream.state?.state == null || stream.state.state < 6) {
676-
// Do not complete the request if it was aborted
677-
// Not prone to happen for as safety net to avoid race conditions with 'trailers'
676+
// If we received a response, this is a normal completion
677+
if (responseReceived) {
678678
if (!request.aborted && !request.completed) {
679679
request.onComplete({})
680680
}
681681

682682
client[kQueue][client[kRunningIdx]++] = null
683683
client[kResume]()
684684
} else {
685-
// Stream is closed or half-closed-remote (6), decrement counter and cleanup
686-
// It does not have sense to continue working with the stream as we do not
687-
// have yet RST_STREAM support on client-side
688-
--session[kOpenStreams]
689-
if (session[kOpenStreams] === 0) {
690-
session.unref()
691-
}
692-
693-
abort(err ?? new InformationalError('HTTP/2: stream half-closed (remote)'))
685+
// Stream ended without receiving a response - this is an error
686+
// (e.g., server destroyed the stream before sending headers)
687+
abort(new InformationalError('HTTP/2: stream half-closed (remote)'))
694688
client[kQueue][client[kRunningIdx]++] = null
695689
client[kPendingIdx] = client[kRunningIdx]
696690
client[kResume]()

‎deps/undici/src/lib/interceptor/decompress.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ let warningEmitted = /** @type {boolean} */ (false)
3333
class DecompressHandler extends DecoratorHandler {
3434
/** @type {Transform[]} */
3535
#decompressors = []
36-
/** @type {NodeJS.WritableStream&NodeJS.ReadableStream|null} */
37-
#pipelineStream
3836
/** @type {Readonly<number[]>} */
3937
#skipStatusCodes
4038
/** @type {boolean} */
@@ -139,7 +137,7 @@ class DecompressHandler extends DecoratorHandler {
139137
const lastDecompressor = this.#decompressors[this.#decompressors.length - 1]
140138
this.#setupDecompressorEvents(lastDecompressor, controller)
141139

142-
this.#pipelineStream = pipeline(this.#decompressors, (err) => {
140+
pipeline(this.#decompressors, (err) => {
143141
if (err) {
144142
super.onResponseError(controller, err)
145143
return
@@ -154,7 +152,6 @@ class DecompressHandler extends DecoratorHandler {
154152
*/
155153
#cleanupDecompressors () {
156154
this.#decompressors.length = 0
157-
this.#pipelineStream = null
158155
}
159156

160157
/**
@@ -190,7 +187,7 @@ class DecompressHandler extends DecoratorHandler {
190187
this.#setupMultipleDecompressors(controller)
191188
}
192189

193-
super.onResponseStart(controller, statusCode, newHeaders, statusMessage)
190+
return super.onResponseStart(controller, statusCode, newHeaders, statusMessage)
194191
}
195192

196193
/**

‎deps/undici/src/lib/llhttp/wasm_build_env.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
> undici@7.19.1 build:wasm
2+
> undici@7.19.2 build:wasm
33
> node build/wasm.js --docker
44

55
> docker run --rm --platform=linux/x86_64 --user 1001:1001 --mount type=bind,source=/home/runner/work/node/node/deps/undici/src/lib/llhttp,target=/home/node/build/lib/llhttp --mount type=bind,source=/home/runner/work/node/node/deps/undici/src/build,target=/home/node/build/build --mount type=bind,source=/home/runner/work/node/node/deps/undici/src/deps,target=/home/node/build/deps -t ghcr.io/nodejs/wasm-builder@sha256:975f391d907e42a75b8c72eb77c782181e941608687d4d8694c3e9df415a0970 node build/wasm.js

‎deps/undici/src/lib/web/fetch/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1677,9 +1677,9 @@ async function httpNetworkOrCacheFetch (
16771677
// requestCurrentURL(request).password = TODO
16781678

16791679
// In browsers, the user will be prompted to enter a username/password before the request
1680-
// is re-sent. To prevent an infinite 401 loop, return a network error for now.
1680+
// is re-sent. To prevent an infinite 401 loop, return the response for now.
16811681
// https://github.com/nodejs/undici/pull/4756
1682-
return makeNetworkError()
1682+
return response
16831683
}
16841684

16851685
// 4. Set response to the result of running HTTP-network-or-cache fetch given

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL