undici 6.6.2 → 6.7.0

package/lib/{fetch → web/fetch}/index.js

@@ -10,7 +10,7 @@ const {
   fromInnerResponse
 } = require('./response')
 const { HeadersList } = require('./headers')
-const { Request, makeRequest } = require('./request')
+const { Request, cloneRequest } = require('./request')
 const zlib = require('node:zlib')
 const {
   bytesMatch,
@@ -47,7 +47,7 @@ const {
   createInflate,
   extractMimeType
 } = require('./util')
-const { kState } = require('./symbols')
+const { kState, kDispatcher } = require('./symbols')
 const assert = require('node:assert')
 const { safelyExtractBody, extractBody } = require('./body')
 const {
@@ -59,13 +59,17 @@ const {
 } = require('./constants')
 const EE = require('node:events')
 const { Readable, pipeline } = require('node:stream')
-const { addAbortListener, isErrored, isReadable, nodeMajor, nodeMinor, bufferToLowerCasedHeaderName } = require('../core/util')
-const { dataURLProcessor, serializeAMimeType, minimizeSupportedMimeType } = require('./dataURL')
-const { getGlobalDispatcher } = require('../global')
+const { addAbortListener, isErrored, isReadable, nodeMajor, nodeMinor, bufferToLowerCasedHeaderName } = require('../../core/util')
+const { dataURLProcessor, serializeAMimeType, minimizeSupportedMimeType } = require('./data-url')
+const { getGlobalDispatcher } = require('../../global')
 const { webidl } = require('./webidl')
 const { STATUS_CODES } = require('node:http')
 const GET_OR_HEAD = ['GET', 'HEAD']
 
+const defaultUserAgent = typeof __UNDICI_IS_NODE__ !== 'undefined' || typeof esbuildDetection !== 'undefined'
+  ? 'node'
+  : 'undici'
+
 /** @type {import('buffer').resolveObjectURL} */
 let resolveObjectURL
 
@@ -77,12 +81,6 @@ class Fetch extends EE {
     this.connection = null
     this.dump = false
     this.state = 'ongoing'
-    // 2 terminated listeners get added per request,
-    // but only 1 gets removed. If there are 20 redirects,
-    // 21 listeners will be added.
-    // See https://github.com/nodejs/undici/issues/1711
-    // TODO (fix): Find and fix root cause for leaked listener.
-    this.setMaxListeners(21)
   }
 
   terminate (reason) {
@@ -206,7 +204,7 @@ function fetch (input, init = undefined) {
   const processResponse = (response) => {
     // 1. If locallyAborted is true, terminate these substeps.
     if (locallyAborted) {
-      return Promise.resolve()
+      return
     }
 
     // 2. If response’s aborted flag is set, then:
@@ -219,14 +217,14 @@ function fetch (input, init = undefined) {
       //    deserializedError.
 
       abortFetch(p, request, responseObject, controller.serializedAbortReason)
-      return Promise.resolve()
+      return
     }
 
     // 3. If response is a network error, then reject p with a TypeError
     // and terminate these substeps.
     if (response.type === 'error') {
       p.reject(new TypeError('fetch failed', { cause: response.error }))
-      return Promise.resolve()
+      return
     }
 
     // 4. Set responseObject to the result of creating a Response object,
@@ -241,7 +239,7 @@ function fetch (input, init = undefined) {
     request,
     processResponseEndOfBody: handleFetchDone,
     processResponse,
-    dispatcher: init?.dispatcher ?? getGlobalDispatcher() // undici
+    dispatcher: requestObject[kDispatcher] // undici
   })
 
   // 14. Return p.
@@ -363,9 +361,9 @@ function fetching ({
   processResponseEndOfBody,
   processResponseConsumeBody,
   useParallelQueue = false,
-  dispatcher // undici
+  dispatcher = getGlobalDispatcher() // undici
 }) {
-  // This has bitten me in the ass more times than I'd like to admit.
+  // Ensure that the dispatcher is set accordingly
   assert(dispatcher)
 
   // 1. Let taskDestination be null.
@@ -1114,7 +1112,6 @@ function fetchFinale (fetchParams, response) {
           controller.enqueue(value)
         }
       },
-      queuingStrategy: new ByteLengthQueuingStrategy({ highWaterMark: 16384 }),
       type: 'bytes'
     })
 
@@ -1408,7 +1405,7 @@ async function httpNetworkOrCacheFetch (
     // Otherwise:
 
     // 1. Set httpRequest to a clone of request.
-    httpRequest = makeRequest(request)
+    httpRequest = cloneRequest(request)
 
     // 2. Set httpFetchParams to a copy of fetchParams.
     httpFetchParams = { ...fetchParams }
@@ -1478,7 +1475,7 @@ async function httpNetworkOrCacheFetch (
   //    user agents should append `User-Agent`/default `User-Agent` value to
   //    httpRequest’s header list.
   if (!httpRequest.headersList.contains('user-agent', true)) {
-    httpRequest.headersList.append('user-agent', typeof esbuildDetection === 'undefined' ? 'undici' : 'node', true)
+    httpRequest.headersList.append('user-agent', defaultUserAgent)
   }
 
   //    15. If httpRequest’s cache mode is "default" and httpRequest’s header
@@ -1929,7 +1926,6 @@ async function httpNetworkFetch (
   //     cancelAlgorithm set to cancelAlgorithm.
   const stream = new ReadableStream(
     {
-      highWaterMark: 16384,
       async start (controller) {
         fetchParams.controller.controller = controller
       },
@@ -1939,15 +1935,14 @@ async function httpNetworkFetch (
       async cancel (reason) {
         await cancelAlgorithm(reason)
       },
-      type: 'bytes',
-      queuingStrategy: new ByteLengthQueuingStrategy({ highWaterMark: 16384 })
+      type: 'bytes'
     }
   )
 
   // 17. Run these steps, but abort when the ongoing fetch is terminated:
 
   //    1. Set response’s body to a new body whose stream is stream.
-  response.body = { stream }
+  response.body = { stream, source: null, length: null }
 
   //    2. If response is not a network error and request’s cache mode is
   //    not "no-store", then update response in httpCache for request.
@@ -1966,6 +1961,7 @@ async function httpNetworkFetch (
   // 19. Run these steps in parallel:
 
   //    1. Run these steps, but abort when fetchParams is canceled:
+  fetchParams.controller.onAborted = onAborted
   fetchParams.controller.on('terminated', onAborted)
   fetchParams.controller.resume = async () => {
     // 1. While true
@@ -2149,7 +2145,15 @@ async function httpNetworkFetch (
             const keys = Object.keys(rawHeaders)
             for (let i = 0; i < keys.length; ++i) {
               // The header names are already in lowercase.
-              headersList.append(keys[i], rawHeaders[keys[i]], true)
+              const key = keys[i]
+              const value = rawHeaders[key]
+              if (key === 'set-cookie') {
+                for (let j = 0; j < value.length; ++j) {
+                  headersList.append(key, value[j], true)
+                }
+              } else {
+                headersList.append(key, value, true)
+              }
             }
             // For H2, The header names are already in lowercase,
             // so we can avoid the `HeadersList#get` call here.
@@ -2234,6 +2238,10 @@ async function httpNetworkFetch (
             fetchParams.controller.off('terminated', this.abort)
           }
 
+          if (fetchParams.controller.onAborted) {
+            fetchParams.controller.off('terminated', fetchParams.controller.onAborted)
+          }
+
           fetchParams.controller.ended = true
 
           this.body.push(null)

package/lib/{fetch → web/fetch}/request.js

@@ -4,8 +4,8 @@
 
 const { extractBody, mixinBody, cloneBody } = require('./body')
 const { Headers, fill: fillHeaders, HeadersList } = require('./headers')
-const { FinalizationRegistry } = require('../compat/dispatcher-weakref')()
-const util = require('../core/util')
+const { FinalizationRegistry } = require('./dispatcher-weakref')()
+const util = require('../../core/util')
 const {
   isValidHTTPToken,
   sameOrigin,
@@ -24,11 +24,11 @@ const {
   requestDuplex
 } = require('./constants')
 const { kEnumerableProperty } = util
-const { kHeaders, kSignal, kState, kGuard, kRealm } = require('./symbols')
+const { kHeaders, kSignal, kState, kGuard, kRealm, kDispatcher } = require('./symbols')
 const { webidl } = require('./webidl')
 const { getGlobalOrigin } = require('./global')
-const { URLSerializer } = require('./dataURL')
-const { kHeadersList, kConstruct } = require('../core/symbols')
+const { URLSerializer } = require('./data-url')
+const { kHeadersList, kConstruct } = require('../../core/symbols')
 const assert = require('node:assert')
 const { getMaxListeners, setMaxListeners, getEventListeners, defaultMaxListeners } = require('node:events')
 
@@ -78,6 +78,8 @@ class Request {
 
     // 5. If input is a string, then:
     if (typeof input === 'string') {
+      this[kDispatcher] = init.dispatcher
+
       // 1. Let parsedURL be the result of parsing input with baseURL.
       // 2. If parsedURL is failure, then throw a TypeError.
       let parsedURL
@@ -101,6 +103,8 @@ class Request {
       // 5. Set fallbackMode to "cors".
       fallbackMode = 'cors'
     } else {
+      this[kDispatcher] = input[kDispatcher]
+
       // 6. Otherwise:
 
       // 7. Assert: input is a Request object.
@@ -979,7 +983,11 @@ webidl.converters.RequestInit = webidl.dictionaryConverter([
     key: 'duplex',
     converter: webidl.converters.DOMString,
     allowedValues: requestDuplex
+  },
+  {
+    key: 'dispatcher', // undici specific option
+    converter: webidl.converters.any
   }
 ])
 
-module.exports = { Request, makeRequest, fromInnerRequest }
+module.exports = { Request, makeRequest, fromInnerRequest, cloneRequest }

package/lib/{fetch → web/fetch}/response.js

@@ -2,7 +2,7 @@
 
 const { Headers, HeadersList, fill } = require('./headers')
 const { extractBody, cloneBody, mixinBody } = require('./body')
-const util = require('../core/util')
+const util = require('../../core/util')
 const { kEnumerableProperty } = util
 const {
   isValidReasonPhrase,
@@ -21,8 +21,8 @@ const { kState, kHeaders, kGuard, kRealm } = require('./symbols')
 const { webidl } = require('./webidl')
 const { FormData } = require('./formdata')
 const { getGlobalOrigin } = require('./global')
-const { URLSerializer } = require('./dataURL')
-const { kHeadersList, kConstruct } = require('../core/symbols')
+const { URLSerializer } = require('./data-url')
+const { kHeadersList, kConstruct } = require('../../core/symbols')
 const assert = require('node:assert')
 const { types } = require('node:util')
 

package/lib/{fetch → web/fetch}/symbols.js

@@ -6,5 +6,6 @@ module.exports = {
   kSignal: Symbol('signal'),
   kState: Symbol('state'),
   kGuard: Symbol('guard'),
-  kRealm: Symbol('realm')
+  kRealm: Symbol('realm'),
+  kDispatcher: Symbol('dispatcher')
 }

package/lib/{fetch → web/fetch}/util.js

@@ -4,18 +4,19 @@ const { Transform } = require('node:stream')
 const zlib = require('node:zlib')
 const { redirectStatusSet, referrerPolicySet: referrerPolicyTokens, badPortsSet } = require('./constants')
 const { getGlobalOrigin } = require('./global')
-const { collectASequenceOfCodePoints, collectAnHTTPQuotedString, removeChars, parseMIMEType } = require('./dataURL')
+const { collectASequenceOfCodePoints, collectAnHTTPQuotedString, removeChars, parseMIMEType } = require('./data-url')
 const { performance } = require('node:perf_hooks')
-const { isBlobLike, toUSVString, ReadableStreamFrom, isValidHTTPToken } = require('../core/util')
+const { isBlobLike, ReadableStreamFrom, isValidHTTPToken } = require('../../core/util')
 const assert = require('node:assert')
-const { isUint8Array } = require('util/types')
+const { isUint8Array } = require('node:util/types')
+const { webidl } = require('./webidl')
 
 // https://nodejs.org/api/crypto.html#determining-if-crypto-support-is-unavailable
-/** @type {import('crypto')|undefined} */
+/** @type {import('crypto')} */
 let crypto
-
 try {
   crypto = require('node:crypto')
+/* c8 ignore next 3 */
 } catch {
 
 }
@@ -110,9 +111,7 @@ function isValidReasonPhrase (statusText) {
  * @see https://fetch.spec.whatwg.org/#header-name
  * @param {string} potentialValue
  */
-function isValidHeaderName (potentialValue) {
-  return isValidHTTPToken(potentialValue)
-}
+const isValidHeaderName = isValidHTTPToken
 
 /**
  * @see https://fetch.spec.whatwg.org/#header-value
@@ -438,6 +437,8 @@ function stripURLForReferrer (url, originOnly) {
   // 1. Assert: url is a URL.
   assert(url instanceof URL)
 
+  url = new URL(url)
+
   // 2. If url’s scheme is a local scheme, then return no referrer.
   if (url.protocol === 'file:' || url.protocol === 'about:' || url.protocol === 'blank:') {
     return 'no-referrer'
@@ -739,35 +740,40 @@ const esIteratorPrototype = Object.getPrototypeOf(Object.getPrototypeOf([][Symbo
 
 /**
  * @see https://webidl.spec.whatwg.org/#dfn-iterator-prototype-object
- * @param {() => unknown} iterator
  * @param {string} name name of the instance
- * @param {'key'|'value'|'key+value'} kind
+ * @param {symbol} kInternalIterator
  * @param {string | number} [keyIndex]
  * @param {string | number} [valueIndex]
  */
-function makeIterator (iterator, name, kind, keyIndex = 0, valueIndex = 1) {
-  const object = {
-    index: 0,
-    kind,
-    target: iterator
-  }
-  // The [[Prototype]] internal slot of an iterator prototype object must be %IteratorPrototype%.
-  const iteratorObject = Object.create(esIteratorPrototype)
+function createIterator (name, kInternalIterator, keyIndex = 0, valueIndex = 1) {
+  class FastIterableIterator {
+    /** @type {any} */
+    #target
+    /** @type {'key' | 'value' | 'key+value'} */
+    #kind
+    /** @type {number} */
+    #index
+
+    /**
+     * @see https://webidl.spec.whatwg.org/#dfn-default-iterator-object
+     * @param {unknown} target
+     * @param {'key' | 'value' | 'key+value'} kind
+     */
+    constructor (target, kind) {
+      this.#target = target
+      this.#kind = kind
+      this.#index = 0
+    }
 
-  Object.defineProperty(iteratorObject, 'next', {
-    value: function next () {
+    next () {
       // 1. Let interface be the interface for which the iterator prototype object exists.
-
       // 2. Let thisValue be the this value.
-
       // 3. Let object be ? ToObject(thisValue).
-
       // 4. If object is a platform object, then perform a security
       //    check, passing:
-
       // 5. If object is not a default iterator object for interface,
       //    then throw a TypeError.
-      if (Object.getPrototypeOf(this) !== iteratorObject) {
+      if (typeof this !== 'object' || this === null || !(#target in this)) {
         throw new TypeError(
           `'next' called on an object that does not implement interface ${name} Iterator.`
         )
@@ -776,8 +782,8 @@ function makeIterator (iterator, name, kind, keyIndex = 0, valueIndex = 1) {
       // 6. Let index be object’s index.
       // 7. Let kind be object’s kind.
       // 8. Let values be object’s target's value pairs to iterate over.
-      const { index, kind, target } = object
-      const values = target()
+      const index = this.#index
+      const values = this.#target[kInternalIterator]
 
       // 9. Let len be the length of values.
       const len = values.length
@@ -785,17 +791,25 @@ function makeIterator (iterator, name, kind, keyIndex = 0, valueIndex = 1) {
       // 10. If index is greater than or equal to len, then return
       //     CreateIterResultObject(undefined, true).
       if (index >= len) {
-        return { value: undefined, done: true }
+        return {
+          value: undefined,
+          done: true
+        }
       }
+
       // 11. Let pair be the entry in values at index index.
       const { [keyIndex]: key, [valueIndex]: value } = values[index]
+
       // 12. Set object’s index to index + 1.
-      object.index = index + 1
+      this.#index = index + 1
+
       // 13. Return the iterator result for pair and kind.
+
       // https://webidl.spec.whatwg.org/#iterator-result
+
       // 1. Let result be a value determined by the value of kind:
       let result
-      switch (kind) {
+      switch (this.#kind) {
         case 'key':
           // 1. Let idlKey be pair’s key.
           // 2. Let key be the result of converting idlKey to an
@@ -824,29 +838,108 @@ function makeIterator (iterator, name, kind, keyIndex = 0, valueIndex = 1) {
           result = [key, value]
           break
       }
+
       // 2. Return CreateIterResultObject(result, false).
       return {
         value: result,
         done: false
       }
+    }
+  }
+
+  // https://webidl.spec.whatwg.org/#dfn-iterator-prototype-object
+  // @ts-ignore
+  delete FastIterableIterator.prototype.constructor
+
+  Object.setPrototypeOf(FastIterableIterator.prototype, esIteratorPrototype)
+
+  Object.defineProperties(FastIterableIterator.prototype, {
+    [Symbol.toStringTag]: {
+      writable: false,
+      enumerable: false,
+      configurable: true,
+      value: `${name} Iterator`
     },
-    writable: true,
-    enumerable: true,
-    configurable: true
+    next: { writable: true, enumerable: true, configurable: true }
   })
 
-  // The class string of an iterator prototype object for a given interface is the
-  // result of concatenating the identifier of the interface and the string " Iterator".
-  Object.defineProperty(iteratorObject, Symbol.toStringTag, {
-    value: `${name} Iterator`,
-    writable: false,
-    enumerable: false,
-    configurable: true
-  })
+  /**
+   * @param {unknown} target
+   * @param {'key' | 'value' | 'key+value'} kind
+   * @returns {IterableIterator<any>}
+   */
+  return function (target, kind) {
+    return new FastIterableIterator(target, kind)
+  }
+}
+
+/**
+ * @see https://webidl.spec.whatwg.org/#dfn-iterator-prototype-object
+ * @param {string} name name of the instance
+ * @param {any} object class
+ * @param {symbol} kInternalIterator
+ * @param {string | number} [keyIndex]
+ * @param {string | number} [valueIndex]
+ */
+function iteratorMixin (name, object, kInternalIterator, keyIndex = 0, valueIndex = 1) {
+  const makeIterator = createIterator(name, kInternalIterator, keyIndex, valueIndex)
+
+  const properties = {
+    keys: {
+      writable: true,
+      enumerable: true,
+      configurable: true,
+      value: function keys () {
+        webidl.brandCheck(this, object)
+        return makeIterator(this, 'key')
+      }
+    },
+    values: {
+      writable: true,
+      enumerable: true,
+      configurable: true,
+      value: function values () {
+        webidl.brandCheck(this, object)
+        return makeIterator(this, 'value')
+      }
+    },
+    entries: {
+      writable: true,
+      enumerable: true,
+      configurable: true,
+      value: function entries () {
+        webidl.brandCheck(this, object)
+        return makeIterator(this, 'key+value')
+      }
+    },
+    forEach: {
+      writable: true,
+      enumerable: true,
+      configurable: true,
+      value: function forEach (callbackfn, thisArg = globalThis) {
+        webidl.brandCheck(this, object)
+        webidl.argumentLengthCheck(arguments, 1, { header: `${name}.forEach` })
+        if (typeof callbackfn !== 'function') {
+          throw new TypeError(
+            `Failed to execute 'forEach' on '${name}': parameter 1 is not of type 'Function'.`
+          )
+        }
+        for (const { 0: key, 1: value } of makeIterator(this, 'key+value')) {
+          callbackfn.call(thisArg, value, key, this)
+        }
+      }
+    }
+  }
 
-  // esIteratorPrototype needs to be the prototype of iteratorObject
-  // which is the prototype of an empty object. Yes, it's confusing.
-  return Object.create(iteratorObject)
+  return Object.defineProperties(object.prototype, {
+    ...properties,
+    [Symbol.iterator]: {
+      writable: true,
+      enumerable: false,
+      configurable: true,
+      value: properties.entries.value
+    }
+  })
 }
 
 /**
@@ -1072,7 +1165,7 @@ function simpleRangeHeaderValue (value, allowWhitespace) {
 
   // 13. If allowWhitespace is true, collect a sequence of code points that are HTTP tab
   //     or space, from data given position.
-  // Note from Khafra: its the same fucking step again lol
+  // Note from Khafra: its the same step as in #8 again lol
   if (allowWhitespace) {
     collectASequenceOfCodePoints(
       (char) => char === '\t' || char === ' ',
@@ -1340,7 +1433,6 @@ module.exports = {
   isCancelled,
   createDeferredPromise,
   ReadableStreamFrom,
-  toUSVString,
   tryUpgradeRequestToAPotentiallyTrustworthyURL,
   clampAndCoarsenConnectionTimingInfo,
   coarsenedSharedCurrentTime,
@@ -1365,7 +1457,8 @@ module.exports = {
   sameOrigin,
   normalizeMethod,
   serializeJavascriptValueToJSONString,
-  makeIterator,
+  iteratorMixin,
+  createIterator,
   isValidHeaderName,
   isValidHeaderValue,
   isErrorLike,
@@ -1383,5 +1476,6 @@ module.exports = {
   buildContentRange,
   parseMetadata,
   createInflate,
-  extractMimeType
+  extractMimeType,
+  getDecodeSplit
 }