deps: update undici to 5.20.0

PR-URL: #46711 Reviewed-By: Filip Skokan <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Darshan Sen <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]>

Author: nodejs-github-bot

deps/undici/src/README.md

@@ -405,6 +405,18 @@ implementations in Deno and Cloudflare Workers.
 
 Refs: https://fetch.spec.whatwg.org/#atomic-http-redirect-handling
 
+## Workarounds
+
+### Network address family autoselection.
+
+If you experience problem when connecting to a remote server that is resolved by your DNS servers to a IPv6 (AAAA record)
+first, there are chances that your local router or ISP might have problem connecting to IPv6 networks. In that case
+undici will throw an error with code `UND_ERR_CONNECT_TIMEOUT`. 
+
+If the target server resolves to both a IPv6 and IPv4 (A records) address and you are using a compatible Node version 
+(18.3.0 and above), you can fix the problem by providing the `autoSelectFamily` option (support by both `undici.request`
+and `undici.Agent`) which will enable the family autoselection algorithm when establishing the connection.
+
 ## Collaborators
 
 *[__Daniele Belardi__](https://github.com/dnlup), <https://www.npmjs.com/~dnlup>

deps/undici/src/docs/api/Client.md

@@ -17,8 +17,8 @@ Returns: `Client`
 
 ### Parameter: `ClientOptions`
 
-***bodyTimeout**`number | null` (optional) - Default: `30e3` - The timeout after which a request will time out, in milliseconds. Monitors time between receiving body data. Use `0` to disable it entirely. Defaults to 30 seconds.
-***headersTimeout**`number | null` (optional) - Default: `30e3` - The amount of time the parser will wait to receive the complete HTTP headers while not sending the request. Defaults to 30 seconds.
+***bodyTimeout**`number | null` (optional) - Default: `300e3` - The timeout after which a request will time out, in milliseconds. Monitors time between receiving body data. Use `0` to disable it entirely. Defaults to 300 seconds.
+***headersTimeout**`number | null` (optional) - Default: `300e3` - The amount of time the parser will wait to receive the complete HTTP headers while not sending the request. Defaults to 300 seconds.
 ***keepAliveMaxTimeout**`number | null` (optional) - Default: `600e3` - The maximum allowed `keepAliveTimeout` when overridden by *keep-alive* hints from the server. Defaults to 10 minutes.
 ***keepAliveTimeout**`number | null` (optional) - Default: `4e3` - The timeout after which a socket without active requests will time out. Monitors time between activity on a connected socket. This value may be overridden by *keep-alive* hints from the server. See [MDN: HTTP - Headers - Keep-Alive directives](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Keep-Alive#directives) for more details. Defaults to 4 seconds.
 ***keepAliveTimeoutThreshold**`number | null` (optional) - Default: `1e3` - A number subtracted from server *keep-alive* hints when overriding `keepAliveTimeout` to account for timing inaccuracies caused by e.g. transport latency. Defaults to 1 second.
@@ -28,6 +28,8 @@ Returns: `Client`
 ***connect**`ConnectOptions | Function | null` (optional) - Default: `null`.
 ***strictContentLength**`Boolean` (optional) - Default: `true` - Whether to treat request content length mismatches as errors. If true, an error is thrown when the request content-length header doesn't match the length of the request body.
 ***interceptors**`{Client: DispatchInterceptor[] }` - Default: `[RedirectInterceptor]` - A list of interceptors that are applied to the dispatch method. Additional logic can be applied (such as, but not limited to: 302 status code handling, authentication, cookies, compression and caching). Note that the behavior of interceptors is Experimental and might change at any given time.
+***autoSelectFamily**: `boolean` (optional) - Default: depends on local Node version, on Node 18.13.0 and above is `false`. Enables a family autodetection algorithm that loosely implements section 5 of [RFC 8305](https://tools.ietf.org/html/rfc8305#section-5). See [here](https://nodejs.org/api/net.html#socketconnectoptions-connectlistener) for more details. This option is ignored if not supported by the current Node version.
+***autoSelectFamilyAttemptTimeout**: `number` - Default: depends on local Node version, on Node 18.13.0 and above is `250`. The amount of time in milliseconds to wait for a connection attempt to finish before trying the next address when using the `autoSelectFamily` option. See [here](https://nodejs.org/api/net.html#socketconnectoptions-connectlistener) for more details.
 
 #### Parameter: `ConnectOptions`
 

deps/undici/src/docs/api/Dispatcher.md

@@ -74,7 +74,7 @@ Returns: `void | Promise<ConnectData>` - Only returns a `Promise` if no `callbac
 #### Parameter: `ConnectData`
 
 ***statusCode**`number`
-***headers**`Record<string, string | string[]>`
+***headers**`Record<string, string | string[] | undefined>`
 ***socket**`stream.Duplex`
 ***opaque**`unknown`
 
@@ -199,8 +199,8 @@ Returns: `Boolean` - `false` if dispatcher is busy and further dispatch calls wo
 ***idempotent**`boolean` (optional) - Default: `true` if `method` is `'HEAD'` or `'GET'` - Whether the requests can be safely retried or not. If `false` the request won't be sent until all preceding requests in the pipeline has completed.
 ***blocking**`boolean` (optional) - Default: `false` - Whether the response is expected to take a long time and would end up blocking the pipeline. When this is set to `true` further pipelining will be avoided on the same connection until headers have been received.
 ***upgrade**`string | null` (optional) - Default: `null` - Upgrade the request. Should be used to specify the kind of upgrade i.e. `'Websocket'`.
-***bodyTimeout**`number | null` (optional) - The timeout after which a request will time out, in milliseconds. Monitors time between receiving body data. Use `0` to disable it entirely. Defaults to 30 seconds.
-***headersTimeout**`number | null` (optional) - The amount of time the parser will wait to receive the complete HTTP headers while not sending the request. Defaults to 30 seconds.
+***bodyTimeout**`number | null` (optional) - The timeout after which a request will time out, in milliseconds. Monitors time between receiving body data. Use `0` to disable it entirely. Defaults to 300 seconds.
+***headersTimeout**`number | null` (optional) - The amount of time the parser will wait to receive the complete HTTP headers while not sending the request. Defaults to 300 seconds.
 ***throwOnError**`boolean` (optional) - Default: `false` - Whether Undici should throw an error upon receiving a 4xx or 5xx response from the server.
 
 #### Parameter: `DispatchHandler`
@@ -383,7 +383,7 @@ Extends: [`RequestOptions`](#parameter-requestoptions)
 #### Parameter: PipelineHandlerData
 
 ***statusCode**`number`
-***headers**`Record<string, string | string[]>`
+***headers**`Record<string, string | string[] | undefined>`
 ***opaque**`unknown`
 ***body**`stream.Readable`
 ***context**`object`
@@ -644,7 +644,7 @@ Returns: `void | Promise<StreamData>` - Only returns a `Promise` if no `callback
 #### Parameter: `StreamFactoryData`
 
 ***statusCode**`number`
-***headers**`Record<string, string | string[]>`
+***headers**`Record<string, string | string[] | undefined>`
 ***opaque**`unknown`
 ***onInfo**`({statusCode: number, headers: Record<string, string | string[]>}) => void | null` (optional) - Default: `null` - Callback collecting all the info headers (HTTP 100-199) received.
 
@@ -853,9 +853,9 @@ Emitted when dispatcher is no longer busy.
 
 ## Parameter: `UndiciHeaders`
 
-*`Record<string, string | string[]> | string[] | null`
+*`Record<string, string | string[] | undefined> | string[] | null`
 
-Header arguments such as `options.headers` in [`Client.dispatch`](Client.md#clientdispatchoptions-handlers) can be specified in two forms; either as an object specified by the `Record<string, string | string[]>` (`IncomingHttpHeaders`) type, or an array of strings. An array representation of a header list must have an even length or an `InvalidArgumentError` will be thrown.
+Header arguments such as `options.headers` in [`Client.dispatch`](Client.md#clientdispatchoptions-handlers) can be specified in two forms; either as an object specified by the `Record<string, string | string[] | undefined>` (`IncomingHttpHeaders`) type, or an array of strings. An array representation of a header list must have an even length or an `InvalidArgumentError` will be thrown.
 
 Keys are lowercase and values are not modified.
 

deps/undici/src/index.js

@@ -20,10 +20,6 @@ const DecoratorHandler = require('./lib/handler/DecoratorHandler')
 constRedirectHandler=require('./lib/handler/RedirectHandler')
 constcreateRedirectInterceptor=require('./lib/interceptor/redirectInterceptor')
 
-constnodeVersion=process.versions.node.split('.')
-constnodeMajor=Number(nodeVersion[0])
-constnodeMinor=Number(nodeVersion[1])
-
 lethasCrypto
 try{
 require('crypto')
@@ -100,7 +96,7 @@ function makeDispatcher (fn){
 module.exports.setGlobalDispatcher=setGlobalDispatcher
 module.exports.getGlobalDispatcher=getGlobalDispatcher
 
-if(nodeMajor>16||(nodeMajor===16&&nodeMinor>=8)){
+if(util.nodeMajor>16||(util.nodeMajor===16&&util.nodeMinor>=8)){
 letfetchImpl=null
 module.exports.fetch=asyncfunctionfetch(resource){
 if(!fetchImpl){
@@ -127,7 +123,7 @@ if (nodeMajor > 16 || (nodeMajor === 16 && nodeMinor >= 8)){
 module.exports.getGlobalOrigin=getGlobalOrigin
 }
 
-if(nodeMajor>=16){
+if(util.nodeMajor>=16){
 const{ deleteCookie, getCookies, getSetCookies, setCookie }=require('./lib/cookies')
 
 module.exports.deleteCookie=deleteCookie
@@ -141,7 +137,7 @@ if (nodeMajor >= 16){
 module.exports.serializeAMimeType=serializeAMimeType
 }
 
-if(nodeMajor>=18&&hasCrypto){
+if(util.nodeMajor>=18&&hasCrypto){
 const{ WebSocket }=require('./lib/websocket/websocket')
 
 module.exports.WebSocket=WebSocket

deps/undici/src/lib/client.js

@@ -109,7 +109,9 @@ class Client extends DispatcherBase{
  connect,
  maxRequestsPerClient,
  localAddress,
- maxResponseSize
+ maxResponseSize,
+ autoSelectFamily,
+ autoSelectFamilyAttemptTimeout
 }={}){
 super()
 
@@ -185,12 +187,20 @@ class Client extends DispatcherBase{
 thrownewInvalidArgumentError('maxResponseSize must be a positive number')
 }
 
+if(
+autoSelectFamilyAttemptTimeout!=null&&
+(!Number.isInteger(autoSelectFamilyAttemptTimeout)||autoSelectFamilyAttemptTimeout<-1)
+){
+thrownewInvalidArgumentError('autoSelectFamilyAttemptTimeout must be a positive number')
+}
+
 if(typeofconnect!=='function'){
 connect=buildConnector({
  ...tls,
  maxCachedSessions,
  socketPath,
 timeout: connectTimeout,
+ ...(util.nodeHasAutoSelectFamily&&autoSelectFamily ? { autoSelectFamily, autoSelectFamilyAttemptTimeout } : undefined),
  ...connect
 })
 }
@@ -212,8 +222,8 @@ class Client extends DispatcherBase{
 this[kResuming]=0// 0, idle, 1, scheduled, 2 resuming
 this[kNeedDrain]=0// 0, idle, 1, scheduled, 2 resuming
 this[kHostHeader]=`host: ${this[kUrl].hostname}${this[kUrl].port ? `:${this[kUrl].port}` : ''}\r\n`
-this[kBodyTimeout]=bodyTimeout!=null ? bodyTimeout : 30e3
-this[kHeadersTimeout]=headersTimeout!=null ? headersTimeout : 30e3
+this[kBodyTimeout]=bodyTimeout!=null ? bodyTimeout : 300e3
+this[kHeadersTimeout]=headersTimeout!=null ? headersTimeout : 300e3
 this[kStrictContentLength]=strictContentLength==null ? true : strictContentLength
 this[kMaxRedirections]=maxRedirections
 this[kMaxRequests]=maxRequestsPerClient

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

@@ -2,7 +2,7 @@
 
 const{ maxNameValuePairSize, maxAttributeValueSize }=require('./constants')
 const{ isCTLExcludingHtab }=require('./util')
-const{collectASequenceOfCodePoints}=require('../fetch/dataURL')
+const{collectASequenceOfCodePointsFast}=require('../fetch/dataURL')
 constassert=require('assert')
 
 /**
@@ -32,7 +32,7 @@ function parseSetCookie (header){
 // (including the %x3B ("") in question).
 constposition={position: 0}
 
-nameValuePair=collectASequenceOfCodePoints((char)=>char!==';',header,position)
+nameValuePair=collectASequenceOfCodePointsFast(';',header,position)
 unparsedAttributes=header.slice(position.position)
 }else{
 // Otherwise:
@@ -54,8 +54,8 @@ function parseSetCookie (header){
 // empty) value string consists of the characters after the first
 // %x3D ("=") character.
 constposition={position: 0}
-name=collectASequenceOfCodePoints(
-(char)=>char!=='=',
+name=collectASequenceOfCodePointsFast(
+'=',
 nameValuePair,
 position
 )
@@ -106,8 +106,8 @@ function parseUnparsedAttributes (unparsedAttributes, cookieAttributeList ={})
 if(unparsedAttributes.includes('')){
 // 1. Consume the characters of the unparsed-attributes up to, but
 // not including, the first %x3B ("") character.
-cookieAv=collectASequenceOfCodePoints(
-(char)=>char!==';',
+cookieAv=collectASequenceOfCodePointsFast(
+';',
 unparsedAttributes,
 {position: 0}
 )
@@ -134,8 +134,8 @@ function parseUnparsedAttributes (unparsedAttributes, cookieAttributeList ={})
 // character.
 constposition={position: 0}
 
-attributeName=collectASequenceOfCodePoints(
-(char)=>char!=='=',
+attributeName=collectASequenceOfCodePointsFast(
+'=',
 cookieAv,
 position
 )

deps/undici/src/lib/core/request.js

@@ -34,10 +34,6 @@ const channels ={}
 
 letextractBody
 
-constnodeVersion=process.versions.node.split('.')
-constnodeMajor=Number(nodeVersion[0])
-constnodeMinor=Number(nodeVersion[1])
-
 try{
 constdiagnosticsChannel=require('diagnostics_channel')
 channels.create=diagnosticsChannel.channel('undici:request:create')
@@ -172,7 +168,7 @@ class Request{
 }
 
 if(util.isFormDataLike(this.body)){
-if(nodeMajor<16||(nodeMajor===16&&nodeMinor<8)){
+if(util.nodeMajor<16||(util.nodeMajor===16&&util.nodeMinor<8)){
 thrownewInvalidArgumentError('Form-Data bodies are only supported in node v16.8 and newer.')
 }
 

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

@@ -10,6 +10,8 @@ const{Blob } = require('buffer')
 constnodeUtil=require('util')
 const{ stringify }=require('querystring')
 
+const[nodeMajor,nodeMinor]=process.versions.node.split('.').map(v=>Number(v))
+
 functionnop(){}
 
 functionisStream(obj){
@@ -420,5 +422,8 @@ module.exports ={
  validateHandler,
  getSocketInfo,
  isFormDataLike,
- buildURL
+ buildURL,
+ nodeMajor,
+ nodeMinor,
+nodeHasAutoSelectFamily: nodeMajor>18||(nodeMajor===18&&nodeMinor>=13)
 }

deps/undici/src/lib/fetch/dataURL.js

@@ -556,6 +556,7 @@ module.exports ={
  dataURLProcessor,
  URLSerializer,
  collectASequenceOfCodePoints,
+ collectASequenceOfCodePointsFast,
  stringPercentDecode,
  parseMIMEType,
  collectAnHTTPQuotedString,

deps/undici/src/lib/fetch/headers.js

@@ -75,6 +75,7 @@ class HeadersList{
 if(initinstanceofHeadersList){
 this[kHeadersMap]=newMap(init[kHeadersMap])
 this[kHeadersSortedMap]=init[kHeadersSortedMap]
+this.cookies=init.cookies
 }else{
 this[kHeadersMap]=newMap(init)
 this[kHeadersSortedMap]=null