Skip to content

Commit 8cf313c

Browse files
nodejs-github-botnodejs-github-bot
authored
deps: update undici to 6.6.0
PR-URL: #51630 Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 415aa77 commit 8cf313c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1127
-715
lines changed

‎deps/undici/src/docs/best-practices/client-certificate.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ The server option `rejectUnauthorized: false` allows us to handle any invalid ce
1111
### Client Certificate Authentication
1212

1313
```js
14-
const { readFileSync } = require('fs')
15-
const { join } = require('path')
16-
const { createServer } = require('https')
14+
const { readFileSync } = require('node:fs')
15+
const { join } = require('node:path')
16+
const { createServer } = require('node:https')
1717
const { Client } = require('undici')
1818

1919
const serverOptions = {

‎deps/undici/src/lib/agent.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class Agent extends DispatcherBase {
4242
connect = { ...connect }
4343
}
4444

45-
this[kInterceptors] = options.interceptors && options.interceptors.Agent && Array.isArray(options.interceptors.Agent)
45+
this[kInterceptors] = options.interceptors?.Agent && Array.isArray(options.interceptors.Agent)
4646
? options.interceptors.Agent
4747
: [createRedirectInterceptor({ maxRedirections })]
4848

@@ -54,22 +54,20 @@ class Agent extends DispatcherBase {
5454
this[kFactory] = factory
5555
this[kClients] = new Map()
5656

57-
const agent = this
58-
5957
this[kOnDrain] = (origin, targets) => {
60-
agent.emit('drain', origin, [agent, ...targets])
58+
this.emit('drain', origin, [this, ...targets])
6159
}
6260

6361
this[kOnConnect] = (origin, targets) => {
64-
agent.emit('connect', origin, [agent, ...targets])
62+
this.emit('connect', origin, [this, ...targets])
6563
}
6664

6765
this[kOnDisconnect] = (origin, targets, err) => {
68-
agent.emit('disconnect', origin, [agent, ...targets], err)
66+
this.emit('disconnect', origin, [this, ...targets], err)
6967
}
7068

7169
this[kOnConnectionError] = (origin, targets, err) => {
72-
agent.emit('connectionError', origin, [agent, ...targets], err)
70+
this.emit('connectionError', origin, [this, ...targets], err)
7371
}
7472
}
7573

‎deps/undici/src/lib/api/api-connect.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const { AsyncResource } = require('async_hooks')
3+
const { AsyncResource } = require('node:async_hooks')
44
const { InvalidArgumentError, RequestAbortedError, SocketError } = require('../core/errors')
55
const util = require('../core/util')
66
const { addSignal, removeSignal } = require('./abort-signal')
@@ -96,7 +96,7 @@ function connect (opts, callback) {
9696
if (typeof callback !== 'function') {
9797
throw err
9898
}
99-
const opaque = opts && opts.opaque
99+
const opaque = opts?.opaque
100100
queueMicrotask(() => callback(err, { opaque }))
101101
}
102102
}

‎deps/undici/src/lib/api/api-pipeline.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ const {
44
Readable,
55
Duplex,
66
PassThrough
7-
} = require('stream')
7+
} = require('node:stream')
88
const {
99
InvalidArgumentError,
1010
InvalidReturnValueError,
1111
RequestAbortedError
1212
} = require('../core/errors')
1313
const util = require('../core/util')
14-
const { AsyncResource } = require('async_hooks')
14+
const { AsyncResource } = require('node:async_hooks')
1515
const { addSignal, removeSignal } = require('./abort-signal')
16-
const assert = require('assert')
16+
const assert = require('node:assert')
1717

1818
const kResume = Symbol('resume')
1919

@@ -100,7 +100,7 @@ class PipelineHandler extends AsyncResource {
100100
read: () => {
101101
const { body } = this
102102

103-
if (body && body.resume) {
103+
if (body?.resume) {
104104
body.resume()
105105
}
106106
},

‎deps/undici/src/lib/api/api-request.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const {
77
} = require('../core/errors')
88
const util = require('../core/util')
99
const { getResolveErrorBodyCallback } = require('./util')
10-
const { AsyncResource } = require('async_hooks')
10+
const { AsyncResource } = require('node:async_hooks')
1111
const { addSignal, removeSignal } = require('./abort-signal')
1212

1313
class RequestHandler extends AsyncResource {
@@ -171,7 +171,7 @@ function request (opts, callback) {
171171
if (typeof callback !== 'function') {
172172
throw err
173173
}
174-
const opaque = opts && opts.opaque
174+
const opaque = opts?.opaque
175175
queueMicrotask(() => callback(err, { opaque }))
176176
}
177177
}

‎deps/undici/src/lib/api/api-stream.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
'use strict'
22

3-
const { finished, PassThrough } = require('stream')
3+
const { finished, PassThrough } = require('node:stream')
44
const {
55
InvalidArgumentError,
66
InvalidReturnValueError,
77
RequestAbortedError
88
} = require('../core/errors')
99
const util = require('../core/util')
1010
const { getResolveErrorBodyCallback } = require('./util')
11-
const { AsyncResource } = require('async_hooks')
11+
const { AsyncResource } = require('node:async_hooks')
1212
const { addSignal, removeSignal } = require('./abort-signal')
1313

1414
class StreamHandler extends AsyncResource {
@@ -148,7 +148,7 @@ class StreamHandler extends AsyncResource {
148148

149149
const needDrain = res.writableNeedDrain !== undefined
150150
? res.writableNeedDrain
151-
: res._writableState && res._writableState.needDrain
151+
: res._writableState?.needDrain
152152

153153
return needDrain !== true
154154
}
@@ -212,7 +212,7 @@ function stream (opts, factory, callback) {
212212
if (typeof callback !== 'function') {
213213
throw err
214214
}
215-
const opaque = opts && opts.opaque
215+
const opaque = opts?.opaque
216216
queueMicrotask(() => callback(err, { opaque }))
217217
}
218218
}

‎deps/undici/src/lib/api/api-upgrade.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
'use strict'
22

33
const { InvalidArgumentError, RequestAbortedError, SocketError } = require('../core/errors')
4-
const { AsyncResource } = require('async_hooks')
4+
const { AsyncResource } = require('node:async_hooks')
55
const util = require('../core/util')
66
const { addSignal, removeSignal } = require('./abort-signal')
7-
const assert = require('assert')
7+
const assert = require('node:assert')
88

99
class UpgradeHandler extends AsyncResource {
1010
constructor (opts, callback) {
@@ -97,7 +97,7 @@ function upgrade (opts, callback) {
9797
if (typeof callback !== 'function') {
9898
throw err
9999
}
100-
const opaque = opts && opts.opaque
100+
const opaque = opts?.opaque
101101
queueMicrotask(() => callback(err, { opaque }))
102102
}
103103
}

‎deps/undici/src/lib/api/readable.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
'use strict'
44

5-
const assert = require('assert')
6-
const { Readable } = require('stream')
5+
const assert = require('node:assert')
6+
const { Readable } = require('node:stream')
77
const { RequestAbortedError, NotSupportedError, InvalidArgumentError, AbortError } = require('../core/errors')
88
const util = require('../core/util')
99
const { ReadableStreamFrom } = require('../core/util')

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const assert = require('assert')
1+
const assert = require('node:assert')
22
const {
33
ResponseStatusCodeError
44
} = require('../core/errors')

‎deps/undici/src/lib/balanced-pool.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class BalancedPool extends PoolBase {
5353
throw new InvalidArgumentError('factory must be a function.')
5454
}
5555

56-
this[kInterceptors] = opts.interceptors && opts.interceptors.BalancedPool && Array.isArray(opts.interceptors.BalancedPool)
56+
this[kInterceptors] = opts.interceptors?.BalancedPool && Array.isArray(opts.interceptors.BalancedPool)
5757
? opts.interceptors.BalancedPool
5858
: []
5959
this[kFactory] = factory

‎deps/undici/src/lib/cache/cache.js

+4-10
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
const { kConstruct } = require('./symbols')
44
const { urlEquals, fieldValues: getFieldValues } = require('./util')
55
const { kEnumerableProperty, isDisturbed } = require('../core/util')
6-
const { kHeadersList } = require('../core/symbols')
76
const { webidl } = require('../fetch/webidl')
8-
const { Response, cloneResponse } = require('../fetch/response')
7+
const { Response, cloneResponse, fromInnerResponse } = require('../fetch/response')
98
const { Request, fromInnerRequest } = require('../fetch/request')
10-
const { Headers } = require('../fetch/headers')
11-
const { kState, kHeaders, kGuard } = require('../fetch/symbols')
9+
const { kState } = require('../fetch/symbols')
1210
const { fetching } = require('../fetch/index')
1311
const { urlIsHttpHttpsScheme, createDeferredPromise, readAllBytes } = require('../fetch/util')
14-
const assert = require('assert')
12+
const assert = require('node:assert')
1513
const { getGlobalDispatcher } = require('../global')
1614

1715
/**
@@ -783,11 +781,7 @@ class Cache {
783781
// 5.5.2
784782
for (const response of responses) {
785783
// 5.5.2.1
786-
const responseObject = new Response(kConstruct)
787-
responseObject[kState] = response
788-
responseObject[kHeaders] = new Headers(kConstruct)
789-
responseObject[kHeaders][kHeadersList] = response.headersList
790-
responseObject[kHeaders][kGuard] = 'immutable'
784+
const responseObject = fromInnerResponse(response, 'immutable', { settingsObject: {} })
791785

792786
responseList.push(responseObject.clone())
793787

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const assert = require('assert')
3+
const assert = require('node:assert')
44
const { URLSerializer } = require('../fetch/dataURL')
55
const { isValidHeaderName } = require('../fetch/util')
66

‎deps/undici/src/lib/client.js

+14-14
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
/* global WebAssembly */
66

7-
const assert = require('assert')
8-
const net = require('net')
9-
const http = require('http')
10-
const { pipeline } = require('stream')
7+
const assert = require('node:assert')
8+
const net = require('node:net')
9+
const http = require('node:http')
10+
const { pipeline } = require('node:stream')
1111
const util = require('./core/util')
1212
const { channels } = require('./core/diagnostics')
1313
const timers = require('./timers')
@@ -84,7 +84,7 @@ const {
8484
/** @type {import('http2')} */
8585
let http2
8686
try {
87-
http2 = require('http2')
87+
http2 = require('node:http2')
8888
} catch {
8989
// @ts-ignore
9090
http2 = { constants: {} }
@@ -250,7 +250,7 @@ class Client extends DispatcherBase {
250250
})
251251
}
252252

253-
this[kInterceptors] = interceptors && interceptors.Client && Array.isArray(interceptors.Client)
253+
this[kInterceptors] = interceptors?.Client && Array.isArray(interceptors.Client)
254254
? interceptors.Client
255255
: [createRedirectInterceptor({ maxRedirections })]
256256
this[kUrl] = util.parseOrigin(url)
@@ -370,10 +370,10 @@ class Client extends DispatcherBase {
370370
// TODO: for H2 we need to gracefully flush the remaining enqueued
371371
// request and close each stream.
372372
return new Promise((resolve) => {
373-
if (!this[kSize]) {
374-
resolve(null)
375-
} else {
373+
if (this[kSize]) {
376374
this[kClosedResolve] = resolve
375+
} else {
376+
resolve(null)
377377
}
378378
})
379379
}
@@ -401,10 +401,10 @@ class Client extends DispatcherBase {
401401
this[kHTTP2SessionState] = null
402402
}
403403

404-
if (!this[kSocket]) {
405-
queueMicrotask(callback)
406-
} else {
404+
if (this[kSocket]) {
407405
util.destroy(this[kSocket].on('close', callback), err)
406+
} else {
407+
queueMicrotask(callback)
408408
}
409409

410410
resume(this)
@@ -479,15 +479,15 @@ async function lazyllhttp () {
479479

480480
let mod
481481
try {
482-
mod = await WebAssembly.compile(Buffer.from(require('./llhttp/llhttp_simd-wasm.js'), 'base64'))
482+
mod = await WebAssembly.compile(require('./llhttp/llhttp_simd-wasm.js'))
483483
} catch (e) {
484484
/* istanbul ignore next */
485485

486486
// We could check if the error was caused by the simd option not
487487
// being enabled, but the occurring of this other error
488488
// * https://github.com/emscripten-core/emscripten/issues/11495
489489
// got me to remove that check to avoid breaking Node 12.
490-
mod = await WebAssembly.compile(Buffer.from(llhttpWasmData || require('./llhttp/llhttp-wasm.js'), 'base64'))
490+
mod = await WebAssembly.compile(llhttpWasmData || require('./llhttp/llhttp-wasm.js'))
491491
}
492492

493493
return await WebAssembly.instantiate(mod, {

‎deps/undici/src/lib/cookies/parse.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const { maxNameValuePairSize, maxAttributeValueSize } = require('./constants')
44
const { isCTLExcludingHtab } = require('./util')
55
const { collectASequenceOfCodePointsFast } = require('../fetch/dataURL')
6-
const assert = require('assert')
6+
const assert = require('node:assert')
77

88
/**
99
* @description Parses the field-value attributes of a set-cookie header string.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const assert = require('assert')
3+
const assert = require('node:assert')
44
const { kHeadersList } = require('../core/symbols')
55

66
function isCTLExcludingHtab (value) {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

3-
const net = require('net')
4-
const assert = require('assert')
3+
const net = require('node:net')
4+
const assert = require('node:assert')
55
const util = require('./util')
66
const { InvalidArgumentError, ConnectTimeoutError } = require('./errors')
77

@@ -86,7 +86,7 @@ function buildConnector ({ allowH2, maxCachedSessions, socketPath, timeout, ...o
8686
let socket
8787
if (protocol === 'https:') {
8888
if (!tls) {
89-
tls = require('tls')
89+
tls = require('node:tls')
9090
}
9191
servername = servername || options.servername || util.getServerName(host) || null
9292

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
2-
const diagnosticsChannel = require('diagnostics_channel')
3-
const util = require('util')
2+
const diagnosticsChannel = require('node:diagnostics_channel')
3+
const util = require('node:util')
44

55
const undiciDebugLog = util.debuglog('undici')
66
const fetchDebuglog = util.debuglog('fetch')

0 commit comments

Comments
 (0)