Skip to content

Commit 8cf313c

Browse files
deps: update undici to 6.6.0
PR-URL: #51630 Reviewed-By: Marco Ippolito <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Filip Skokan <[email protected]>
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 5 additions & 7 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)