undici 6.5.0 → 6.6.0

package/docs/best-practices/client-certificate.md

@@ -11,9 +11,9 @@ The server option `rejectUnauthorized: false` allows us to handle any invalid ce
 ### Client Certificate Authentication
 
 ```js
-const { readFileSync } = require('fs')
-const { join } = require('path')
-const { createServer } = require('https')
+const { readFileSync } = require('node:fs')
+const { join } = require('node:path')
+const { createServer } = require('node:https')
 const { Client } = require('undici')
 
 const serverOptions = {

package/lib/agent.js

@@ -42,7 +42,7 @@ class Agent extends DispatcherBase {
       connect = { ...connect }
     }
 
-    this[kInterceptors] = options.interceptors && options.interceptors.Agent && Array.isArray(options.interceptors.Agent)
+    this[kInterceptors] = options.interceptors?.Agent && Array.isArray(options.interceptors.Agent)
       ? options.interceptors.Agent
       : [createRedirectInterceptor({ maxRedirections })]
 
@@ -54,22 +54,20 @@ class Agent extends DispatcherBase {
     this[kFactory] = factory
     this[kClients] = new Map()
 
-    const agent = this
-
     this[kOnDrain] = (origin, targets) => {
-      agent.emit('drain', origin, [agent, ...targets])
+      this.emit('drain', origin, [this, ...targets])
     }
 
     this[kOnConnect] = (origin, targets) => {
-      agent.emit('connect', origin, [agent, ...targets])
+      this.emit('connect', origin, [this, ...targets])
     }
 
     this[kOnDisconnect] = (origin, targets, err) => {
-      agent.emit('disconnect', origin, [agent, ...targets], err)
+      this.emit('disconnect', origin, [this, ...targets], err)
     }
 
     this[kOnConnectionError] = (origin, targets, err) => {
-      agent.emit('connectionError', origin, [agent, ...targets], err)
+      this.emit('connectionError', origin, [this, ...targets], err)
     }
   }
 

package/lib/api/api-connect.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { AsyncResource } = require('async_hooks')
+const { AsyncResource } = require('node:async_hooks')
 const { InvalidArgumentError, RequestAbortedError, SocketError } = require('../core/errors')
 const util = require('../core/util')
 const { addSignal, removeSignal } = require('./abort-signal')
@@ -96,7 +96,7 @@ function connect (opts, callback) {
     if (typeof callback !== 'function') {
       throw err
     }
-    const opaque = opts && opts.opaque
+    const opaque = opts?.opaque
     queueMicrotask(() => callback(err, { opaque }))
   }
 }

package/lib/api/api-pipeline.js

@@ -4,16 +4,16 @@ const {
   Readable,
   Duplex,
   PassThrough
-} = require('stream')
+} = require('node:stream')
 const {
   InvalidArgumentError,
   InvalidReturnValueError,
   RequestAbortedError
 } = require('../core/errors')
 const util = require('../core/util')
-const { AsyncResource } = require('async_hooks')
+const { AsyncResource } = require('node:async_hooks')
 const { addSignal, removeSignal } = require('./abort-signal')
-const assert = require('assert')
+const assert = require('node:assert')
 
 const kResume = Symbol('resume')
 
@@ -100,7 +100,7 @@ class PipelineHandler extends AsyncResource {
       read: () => {
         const { body } = this
 
-        if (body && body.resume) {
+        if (body?.resume) {
           body.resume()
         }
       },

package/lib/api/api-request.js

@@ -7,7 +7,7 @@ const {
 } = require('../core/errors')
 const util = require('../core/util')
 const { getResolveErrorBodyCallback } = require('./util')
-const { AsyncResource } = require('async_hooks')
+const { AsyncResource } = require('node:async_hooks')
 const { addSignal, removeSignal } = require('./abort-signal')
 
 class RequestHandler extends AsyncResource {
@@ -171,7 +171,7 @@ function request (opts, callback) {
     if (typeof callback !== 'function') {
       throw err
     }
-    const opaque = opts && opts.opaque
+    const opaque = opts?.opaque
     queueMicrotask(() => callback(err, { opaque }))
   }
 }

package/lib/api/api-stream.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { finished, PassThrough } = require('stream')
+const { finished, PassThrough } = require('node:stream')
 const {
   InvalidArgumentError,
   InvalidReturnValueError,
@@ -8,7 +8,7 @@ const {
 } = require('../core/errors')
 const util = require('../core/util')
 const { getResolveErrorBodyCallback } = require('./util')
-const { AsyncResource } = require('async_hooks')
+const { AsyncResource } = require('node:async_hooks')
 const { addSignal, removeSignal } = require('./abort-signal')
 
 class StreamHandler extends AsyncResource {
@@ -148,7 +148,7 @@ class StreamHandler extends AsyncResource {
 
     const needDrain = res.writableNeedDrain !== undefined
       ? res.writableNeedDrain
-      : res._writableState && res._writableState.needDrain
+      : res._writableState?.needDrain
 
     return needDrain !== true
   }
@@ -212,7 +212,7 @@ function stream (opts, factory, callback) {
     if (typeof callback !== 'function') {
       throw err
     }
-    const opaque = opts && opts.opaque
+    const opaque = opts?.opaque
     queueMicrotask(() => callback(err, { opaque }))
   }
 }

package/lib/api/api-upgrade.js

@@ -1,10 +1,10 @@
 'use strict'
 
 const { InvalidArgumentError, RequestAbortedError, SocketError } = require('../core/errors')
-const { AsyncResource } = require('async_hooks')
+const { AsyncResource } = require('node:async_hooks')
 const util = require('../core/util')
 const { addSignal, removeSignal } = require('./abort-signal')
-const assert = require('assert')
+const assert = require('node:assert')
 
 class UpgradeHandler extends AsyncResource {
   constructor (opts, callback) {
@@ -97,7 +97,7 @@ function upgrade (opts, callback) {
     if (typeof callback !== 'function') {
       throw err
     }
-    const opaque = opts && opts.opaque
+    const opaque = opts?.opaque
     queueMicrotask(() => callback(err, { opaque }))
   }
 }

package/lib/api/readable.js

@@ -2,8 +2,8 @@
 
 'use strict'
 
-const assert = require('assert')
-const { Readable } = require('stream')
+const assert = require('node:assert')
+const { Readable } = require('node:stream')
 const { RequestAbortedError, NotSupportedError, InvalidArgumentError, AbortError } = require('../core/errors')
 const util = require('../core/util')
 const { ReadableStreamFrom } = require('../core/util')

package/lib/api/util.js

@@ -1,4 +1,4 @@
-const assert = require('assert')
+const assert = require('node:assert')
 const {
   ResponseStatusCodeError
 } = require('../core/errors')

package/lib/balanced-pool.js

@@ -53,7 +53,7 @@ class BalancedPool extends PoolBase {
       throw new InvalidArgumentError('factory must be a function.')
     }
 
-    this[kInterceptors] = opts.interceptors && opts.interceptors.BalancedPool && Array.isArray(opts.interceptors.BalancedPool)
+    this[kInterceptors] = opts.interceptors?.BalancedPool && Array.isArray(opts.interceptors.BalancedPool)
       ? opts.interceptors.BalancedPool
       : []
     this[kFactory] = factory

package/lib/cache/cache.js

@@ -3,15 +3,13 @@
 const { kConstruct } = require('./symbols')
 const { urlEquals, fieldValues: getFieldValues } = require('./util')
 const { kEnumerableProperty, isDisturbed } = require('../core/util')
-const { kHeadersList } = require('../core/symbols')
 const { webidl } = require('../fetch/webidl')
-const { Response, cloneResponse } = require('../fetch/response')
+const { Response, cloneResponse, fromInnerResponse } = require('../fetch/response')
 const { Request, fromInnerRequest } = require('../fetch/request')
-const { Headers } = require('../fetch/headers')
-const { kState, kHeaders, kGuard } = require('../fetch/symbols')
+const { kState } = require('../fetch/symbols')
 const { fetching } = require('../fetch/index')
 const { urlIsHttpHttpsScheme, createDeferredPromise, readAllBytes } = require('../fetch/util')
-const assert = require('assert')
+const assert = require('node:assert')
 const { getGlobalDispatcher } = require('../global')
 
 /**
@@ -783,11 +781,7 @@ class Cache {
     // 5.5.2
     for (const response of responses) {
       // 5.5.2.1
-      const responseObject = new Response(kConstruct)
-      responseObject[kState] = response
-      responseObject[kHeaders] = new Headers(kConstruct)
-      responseObject[kHeaders][kHeadersList] = response.headersList
-      responseObject[kHeaders][kGuard] = 'immutable'
+      const responseObject = fromInnerResponse(response, 'immutable', { settingsObject: {} })
 
       responseList.push(responseObject.clone())
 

package/lib/cache/util.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const assert = require('assert')
+const assert = require('node:assert')
 const { URLSerializer } = require('../fetch/dataURL')
 const { isValidHeaderName } = require('../fetch/util')
 

package/lib/client.js

@@ -4,10 +4,10 @@
 
 /* global WebAssembly */
 
-const assert = require('assert')
-const net = require('net')
-const http = require('http')
-const { pipeline } = require('stream')
+const assert = require('node:assert')
+const net = require('node:net')
+const http = require('node:http')
+const { pipeline } = require('node:stream')
 const util = require('./core/util')
 const { channels } = require('./core/diagnostics')
 const timers = require('./timers')
@@ -84,7 +84,7 @@ const {
 /** @type {import('http2')} */
 let http2
 try {
-  http2 = require('http2')
+  http2 = require('node:http2')
 } catch {
   // @ts-ignore
   http2 = { constants: {} }
@@ -250,7 +250,7 @@ class Client extends DispatcherBase {
       })
     }
 
-    this[kInterceptors] = interceptors && interceptors.Client && Array.isArray(interceptors.Client)
+    this[kInterceptors] = interceptors?.Client && Array.isArray(interceptors.Client)
       ? interceptors.Client
       : [createRedirectInterceptor({ maxRedirections })]
     this[kUrl] = util.parseOrigin(url)
@@ -370,10 +370,10 @@ class Client extends DispatcherBase {
     // TODO: for H2 we need to gracefully flush the remaining enqueued
     // request and close each stream.
     return new Promise((resolve) => {
-      if (!this[kSize]) {
-        resolve(null)
-      } else {
+      if (this[kSize]) {
         this[kClosedResolve] = resolve
+      } else {
+        resolve(null)
       }
     })
   }
@@ -401,10 +401,10 @@ class Client extends DispatcherBase {
         this[kHTTP2SessionState] = null
       }
 
-      if (!this[kSocket]) {
-        queueMicrotask(callback)
-      } else {
+      if (this[kSocket]) {
         util.destroy(this[kSocket].on('close', callback), err)
+      } else {
+        queueMicrotask(callback)
       }
 
       resume(this)
@@ -479,7 +479,7 @@ async function lazyllhttp () {
 
   let mod
   try {
-    mod = await WebAssembly.compile(Buffer.from(require('./llhttp/llhttp_simd-wasm.js'), 'base64'))
+    mod = await WebAssembly.compile(require('./llhttp/llhttp_simd-wasm.js'))
   } catch (e) {
     /* istanbul ignore next */
 
@@ -487,7 +487,7 @@ async function lazyllhttp () {
     // being enabled, but the occurring of this other error
     // * https://github.com/emscripten-core/emscripten/issues/11495
     // got me to remove that check to avoid breaking Node 12.
-    mod = await WebAssembly.compile(Buffer.from(llhttpWasmData || require('./llhttp/llhttp-wasm.js'), 'base64'))
+    mod = await WebAssembly.compile(llhttpWasmData || require('./llhttp/llhttp-wasm.js'))
   }
 
   return await WebAssembly.instantiate(mod, {

package/lib/cookies/parse.js

@@ -3,7 +3,7 @@
 const { maxNameValuePairSize, maxAttributeValueSize } = require('./constants')
 const { isCTLExcludingHtab } = require('./util')
 const { collectASequenceOfCodePointsFast } = require('../fetch/dataURL')
-const assert = require('assert')
+const assert = require('node:assert')
 
 /**
  * @description Parses the field-value attributes of a set-cookie header string.

package/lib/cookies/util.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const assert = require('assert')
+const assert = require('node:assert')
 const { kHeadersList } = require('../core/symbols')
 
 function isCTLExcludingHtab (value) {

package/lib/core/connect.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const net = require('net')
-const assert = require('assert')
+const net = require('node:net')
+const assert = require('node:assert')
 const util = require('./util')
 const { InvalidArgumentError, ConnectTimeoutError } = require('./errors')
 
@@ -86,7 +86,7 @@ function buildConnector ({ allowH2, maxCachedSessions, socketPath, timeout, ...o
     let socket
     if (protocol === 'https:') {
       if (!tls) {
-        tls = require('tls')
+        tls = require('node:tls')
       }
       servername = servername || options.servername || util.getServerName(host) || null
 

package/lib/core/diagnostics.js

@@ -1,6 +1,6 @@
 'use strict'
-const diagnosticsChannel = require('diagnostics_channel')
-const util = require('util')
+const diagnosticsChannel = require('node:diagnostics_channel')
+const util = require('node:util')
 
 const undiciDebugLog = util.debuglog('undici')
 const fetchDebuglog = util.debuglog('fetch')

package/lib/core/request.js

@@ -4,7 +4,7 @@ const {
   InvalidArgumentError,
   NotSupportedError
 } = require('./errors')
-const assert = require('assert')
+const assert = require('node:assert')
 const { kHTTP2BuildRequest, kHTTP2CopyHeaders, kHTTP1BuildRequest } = require('./symbols')
 const util = require('./util')
 const { channels } = require('./diagnostics.js')
@@ -369,8 +369,11 @@ class Request {
 
       if (value == null || value.length === 0) continue
 
-      if (headers[key]) headers[key] += `,${value}`
-      else headers[key] = value
+      if (headers[key]) {
+        headers[key] += `,${value}`
+      } else {
+        headers[key] = value
+      }
     }
 
     return headers
@@ -433,20 +436,22 @@ function processHeader (request, key, val, skipAppend = false) {
     }
   } else if (headerName === 'expect') {
     throw new NotSupportedError('expect header not supported')
-  } else {
-    if (Array.isArray(val)) {
-      for (let i = 0; i < val.length; i++) {
-        if (skipAppend) {
-          if (request.headers[key]) request.headers[key] += `,${processHeaderValue(key, val[i], skipAppend)}`
-          else request.headers[key] = processHeaderValue(key, val[i], skipAppend)
+  } else if (Array.isArray(val)) {
+    for (let i = 0; i < val.length; i++) {
+      if (skipAppend) {
+        if (request.headers[key]) {
+          request.headers[key] += `,${processHeaderValue(key, val[i], skipAppend)}`
         } else {
-          request.headers += processHeaderValue(key, val[i])
+          request.headers[key] = processHeaderValue(key, val[i], skipAppend)
         }
+      } else {
+        request.headers += processHeaderValue(key, val[i])
       }
-    } else {
-      if (skipAppend) request.headers[key] = processHeaderValue(key, val, skipAppend)
-      else request.headers += processHeaderValue(key, val)
     }
+  } else if (skipAppend) {
+    request.headers[key] = processHeaderValue(key, val, skipAppend)
+  } else {
+    request.headers += processHeaderValue(key, val)
   }
 }
 

package/lib/core/tree.js

@@ -57,12 +57,10 @@ class TstNode {
       } else {
         this.left = new TstNode(key, value, index)
       }
+    } else if (this.right !== null) {
+      this.right.add(key, value, index)
     } else {
-      if (this.right !== null) {
-        this.right.add(key, value, index)
-      } else {
-        this.right = new TstNode(key, value, index)
-      }
+      this.right = new TstNode(key, value, index)
     }
   }
 

package/lib/core/util.js

@@ -1,14 +1,14 @@
 'use strict'
 
-const assert = require('assert')
+const assert = require('node:assert')
 const { kDestroyed, kBodyUsed } = require('./symbols')
-const { IncomingMessage } = require('http')
-const stream = require('stream')
-const net = require('net')
+const { IncomingMessage } = require('node:http')
+const stream = require('node:stream')
+const net = require('node:net')
 const { InvalidArgumentError } = require('./errors')
-const { Blob } = require('buffer')
-const nodeUtil = require('util')
-const { stringify } = require('querystring')
+const { Blob } = require('node:buffer')
+const nodeUtil = require('node:util')
+const { stringify } = require('node:querystring')
 const { headerNameLowerCasedRecord } = require('./constants')
 const { tree } = require('./tree')
 
@@ -187,7 +187,7 @@ function isDestroyed (stream) {
 }
 
 function isReadableAborted (stream) {
-  const state = stream && stream._readableState
+  const state = stream?._readableState
   return isDestroyed(stream) && state && !state.endEmitted
 }
 
@@ -254,19 +254,19 @@ function parseHeaders (headers, obj) {
     const key = headerNameToString(headers[i])
     let val = obj[key]
 
-    if (!val) {
+    if (val) {
+      if (typeof val === 'string') {
+        val = [val]
+        obj[key] = val
+      }
+      val.push(headers[i + 1].toString('utf8'))
+    } else {
       const headersValue = headers[i + 1]
       if (typeof headersValue === 'string') {
         obj[key] = headersValue
       } else {
         obj[key] = Array.isArray(headersValue) ? headersValue.map(x => x.toString('utf8')) : headersValue.toString('utf8')
       }
-    } else {
-      if (typeof val === 'string') {
-        val = [val]
-        obj[key] = val
-      }
-      val.push(headers[i + 1].toString('utf8'))
     }
   }
 

package/lib/dispatcher.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const EventEmitter = require('events')
+const EventEmitter = require('node:events')
 
 class Dispatcher extends EventEmitter {
   dispatch () {

package/lib/eventsource/eventsource-stream.js

@@ -337,7 +337,7 @@ class EventSourceStream extends Transform {
         if (event[field] === undefined) {
           event[field] = value
         } else {
-          event[field] += '\n' + value
+          event[field] += `\n${value}`
         }
         break
       case 'retry':

package/lib/eventsource/eventsource.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const { setTimeout } = require('node:timers/promises')
 const { pipeline } = require('node:stream')
 const { fetching } = require('../fetch')
 const { makeRequest } = require('../fetch/request')
@@ -11,6 +10,7 @@ const { parseMIMEType } = require('../fetch/dataURL')
 const { MessageEvent } = require('../websocket/events')
 const { isNetworkError } = require('../fetch/response')
 const { getGlobalDispatcher } = require('../global')
+const { delay } = require('./util')
 
 let experimentalWarned = false
 
@@ -344,7 +344,7 @@ class EventSource extends EventTarget {
     this.dispatchEvent(new Event('error'))
 
     // 2. Wait a delay equal to the reconnection time of the event source.
-    await setTimeout(this.#settings.reconnectionTime, { ref: false })
+    await delay(this.#settings.reconnectionTime)
 
     // 5. Queue a task to run the following steps:
 

package/lib/eventsource/util.js

@@ -23,7 +23,15 @@ function isASCIINumber (value) {
   return true
 }
 
+// https://github.com/nodejs/undici/issues/2664
+function delay (ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms).unref()
+  })
+}
+
 module.exports = {
   isValidLastEventId,
-  isASCIINumber
+  isASCIINumber,
+  delay
 }