undici 4.11.0 → 4.12.0

package/README.md

@@ -203,13 +203,13 @@ not support or does not fully implement.
 * https://fetch.spec.whatwg.org/#garbage-collection
 
 The [Fetch Standard](https://fetch.spec.whatwg.org) allows users to skip consuming the response body by relying on
-[garbage collection](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Memory_Management#garbage_collection) to release connection resources. Undici does the same. However,
-garbage collection in Node is less aggressive and deterministic (due to the lack
-of clear idle periods that browser have through the rendering refresh rate)
-which means that leaving the release of connection resources to the garbage collector
-can lead to excessive connection usage, reduced performance (due to less connection re-use),
-and even stalls or deadlocks when running out of connections. Therefore, it is highly
-recommended to always either consume or cancel the response body.
+[garbage collection](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Memory_Management#garbage_collection) to release connection resources. Undici does not do the same. Therefore, it is important to always either consume or cancel the response body.
+
+Garbage collection in Node is less aggressive and deterministic
+(due to the lack of clear idle periods that browser have through the rendering refresh rate)
+which means that leaving the release of connection resources to the garbage collector can lead
+to excessive connection usage, reduced performance (due to less connection re-use), and even
+stalls or deadlocks when running out of connections.
 
 ```js
 // Do
@@ -289,7 +289,7 @@ pipeline requests, without checking whether the connection is persistent.
 Hence, automatic fallback to HTTP/1.0 or HTTP/1.1 without pipelining is
 not supported.
 
-Undici will immediately pipeline when retrying requests afters a failed
+Undici will immediately pipeline when retrying requests after a failed
 connection. However, Undici will not retry the first remaining requests in
 the prior pipeline and instead error the corresponding callback/promise/stream.
 

package/lib/api/readable.js

@@ -56,8 +56,8 @@ module.exports = class BodyReadable extends Readable {
   }
 
   emit (ev, ...args) {
-    // Waiting for: https://github.com/nodejs/node/pull/39589
     if (ev === 'data') {
+      // Node < 16.7
       this._readableState.dataEmitted = true
     } else if (ev === 'error') {
       // Node < 16
@@ -93,17 +93,16 @@ module.exports = class BodyReadable extends Readable {
   }
 
   push (chunk) {
-    if (this[kConsume] && chunk !== null && !this[kReading]) {
+    if (this[kConsume] && chunk !== null) {
       consumePush(this[kConsume], chunk)
-      return true
-    } else {
-      return super.push(chunk)
+      return this[kReading] ? super.push(chunk) : true
     }
+    return super.push(chunk)
   }
 
   // https://fetch.spec.whatwg.org/#dom-body-text
   async text () {
-    return toUSVString(await consume(this, 'text'))
+    return consume(this, 'text')
   }
 
   // https://fetch.spec.whatwg.org/#dom-body-json
@@ -145,7 +144,7 @@ module.exports = class BodyReadable extends Readable {
     return this[kBody]
   }
 
-  async dump(opts) {
+  async dump (opts) {
     let limit = opts && Number.isFinite(opts.limit) ? opts.limit : 262144
     try {
       for await (const chunk of this) {
@@ -233,7 +232,7 @@ function consumeEnd (consume) {
 
   try {
     if (type === 'text') {
-      resolve(Buffer.concat(body))
+      resolve(toUSVString(Buffer.concat(body)))
     } else if (type === 'json') {
       resolve(JSON.parse(Buffer.concat(body)))
     } else if (type === 'arrayBuffer') {
@@ -275,8 +274,10 @@ function consumeFinish (consume, err) {
     consume.resolve()
   }
 
-  consume.reject = null
+  consume.type = null
+  consume.stream = null
   consume.resolve = null
-  consume.decoder = null
+  consume.reject = null
+  consume.length = 0
   consume.body = null
 }

package/lib/balanced-pool.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const {
-  BalancedPoolMissingUpstreamError,
+  BalancedPoolMissingUpstreamError
 } = require('./core/errors')
 const {
   PoolBase,
@@ -9,8 +9,8 @@ const {
   kNeedDrain,
   kAddClient,
   kRemoveClient,
-  kDispatch,
- } = require('./pool-base')
+  kDispatch
+} = require('./pool-base')
 const Pool = require('./pool')
 const { kUrl } = require('./core/symbols')
 
@@ -73,7 +73,7 @@ class BalancedPool extends PoolBase {
       throw new BalancedPoolMissingUpstreamError()
     }
 
-    let dispatcher = this[kClients].find(dispatcher => (
+    const dispatcher = this[kClients].find(dispatcher => (
       !dispatcher[kNeedDrain] &&
       dispatcher.closed !== true &&
       dispatcher.destroyed !== true

package/lib/core/util.js

@@ -150,7 +150,7 @@ function isDestroyed (stream) {
   return !stream || !!(stream.destroyed || stream[kDestroyed])
 }
 
-function isAborted (stream) {
+function isReadableAborted (stream) {
   const state = stream && stream._readableState
   return isDestroyed(stream) && state && !state.endEmitted
 }
@@ -244,15 +244,28 @@ function validateHandler (handler, method, upgrade) {
 // A body is disturbed if it has been read from and it cannot
 // be re-used without losing state or data.
 function isDisturbed (body) {
-  const state = body && body._readableState
   return !!(body && (
-    (stream.isDisturbed && stream.isDisturbed(body)) ||
-    body[kBodyUsed] ||
-    body.readableDidRead || (state && state.dataEmitted) ||
-    isAborted(body)
+    stream.isDisturbed
+      ? stream.isDisturbed(body) || body[kBodyUsed] // TODO (fix): Why is body[kBodyUsed] needed?
+      : body[kBodyUsed] ||
+        body.readableDidRead ||
+        (body._readableState && body._readableState.dataEmitted) ||
+        isReadableAborted(body)
   ))
 }
 
+function isErrored (body) {
+  return !!(body && (
+    stream.isErrored
+      ? stream.isErrored(body)
+      : /state: 'errored'/.test(nodeUtil.inspect(body)
+  )))
+}
+
+function isReadable (body) {
+  return !!(body && /state: 'readable'/.test(nodeUtil.inspect(body)))
+}
+
 function getSocketInfo (socket) {
   return {
     localAddress: socket.localAddress,
@@ -310,8 +323,10 @@ module.exports = {
   kEnumerableProperty,
   nop,
   isDisturbed,
+  isErrored,
+  isReadable,
   toUSVString: nodeUtil.toUSVString || ((val) => `${val}`),
-  isAborted,
+  isReadableAborted,
   isBlobLike,
   parseOrigin,
   parseURL,

package/lib/fetch/body.js

@@ -9,6 +9,7 @@ const { kBodyUsed } = require('../core/symbols')
 const assert = require('assert')
 const nodeUtil = require('util')
 const { NotSupportedError } = require('../core/errors')
+const { isErrored } = require('../core/util')
 
 let ReadableStream
 
@@ -169,7 +170,7 @@ function extractBody (object, keepalive = false) {
   }
 
   // 8. If action is non-null, then run these steps in in parallel:
-  if (action !== null) {
+  if (action != null) {
     // Run action.
     let iterator
     stream = new ReadableStream({
@@ -187,7 +188,7 @@ function extractBody (object, keepalive = false) {
           // Whenever one or more bytes are available and stream is not errored,
           // enqueue a Uint8Array wrapping an ArrayBuffer containing the available
           // bytes into stream.
-          if (!/state: 'errored'/.test(nodeUtil.inspect(stream))) {
+          if (!isErrored(stream)) {
             controller.enqueue(new Uint8Array(value))
           }
         }
@@ -348,19 +349,12 @@ const properties = {
   }
 }
 
-function cancelBody (body, reason) {
-  if (body.stream && !/state: 'errored'/.test(nodeUtil.inspect(body.stream))) {
-    body.stream.cancel(reason)
-  }
-}
-
 function mixinBody (prototype) {
   Object.assign(prototype, methods)
   Object.defineProperties(prototype, properties)
 }
 
 module.exports = {
-  cancelBody,
   extractBody,
   safelyExtractBody,
   cloneBody,

package/lib/fetch/file.js

@@ -118,6 +118,7 @@ class FileLike {
     this[kState] = {
       blobLike,
       name: n,
+      type: t,
       lastModified: d
     }
   }

package/lib/fetch/headers.js

@@ -153,7 +153,7 @@ class Headers {
   constructor (...args) {
     if (
       args[0] !== undefined &&
-      !(typeof args[0] === 'object' && args[0] !== null) &&
+      !(typeof args[0] === 'object' && args[0] != null) &&
       !Array.isArray(args[0])
     ) {
       throw new TypeError(

package/lib/fetch/index.js

@@ -24,7 +24,7 @@ const {
   requestCurrentURL,
   setRequestReferrerPolicyOnRedirect,
   tryUpgradeRequestToAPotentiallyTrustworthyURL,
-  makeTimingInfo,
+  createOpaqueTimingInfo,
   appendFetchMetadata,
   corsCheck,
   crossOriginResourcePolicyCheck,
@@ -34,7 +34,7 @@ const {
 const { kState, kHeaders, kGuard, kRealm } = require('./symbols')
 const { AbortError } = require('../core/errors')
 const assert = require('assert')
-const { safelyExtractBody, cancelBody } = require('./body')
+const { safelyExtractBody } = require('./body')
 const {
   redirectStatus,
   nullBodyStatus,
@@ -44,14 +44,32 @@ const {
 } = require('./constants')
 const { kHeadersList } = require('../core/symbols')
 const EE = require('events')
-const { PassThrough, pipeline, compose } = require('stream')
+const { PassThrough, pipeline } = require('stream')
+const { isErrored, isReadable } = require('../core/util')
 
 let ReadableStream
 
-// https://fetch.spec.whatwg.org/#garbage-collection
-const registry = new FinalizationRegistry((abort) => {
-  abort()
-})
+class Fetch extends EE {
+  constructor (dispatcher) {
+    super()
+
+    this.dispatcher = dispatcher
+    this.terminated = null
+    this.connection = null
+    this.dump = false
+  }
+
+  terminate ({ reason, aborted } = {}) {
+    if (this.terminated) {
+      return
+    }
+    this.terminated = { aborted, reason }
+
+    this.connection?.destroy(reason)
+
+    this.emit('terminated', reason)
+  }
+}
 
 // https://fetch.spec.whatwg.org/#fetch-method
 async function fetch (...args) {
@@ -73,26 +91,7 @@ async function fetch (...args) {
   const resource = args[0]
   const init = args.length >= 1 ? args[1] ?? {} : {}
 
-  const context = Object.assign(new EE(), {
-    dispatcher: this,
-    terminated: false,
-    connection: null,
-    dump: false,
-    terminate ({ reason, aborted } = {}) {
-      if (this.terminated) {
-        return
-      }
-
-      if (this.connection) {
-        this.connection.destroy()
-        this.connection = null
-      }
-
-      this.terminated = { aborted }
-
-      this.emit('terminated', reason)
-    }
-  })
+  const context = new Fetch(this)
 
   // 1. Let p be a new promise.
   const p = createDeferredPromise()
@@ -154,7 +153,7 @@ async function fetch (...args) {
   const handleFetchDone = (response) =>
     finalizeAndReportTiming(response, 'fetch')
 
-  // 12. Fetch request with processResponseDone set to handleFetchDone,
+  // 12. Fetch request with processResponseEndOfBody set to handleFetchDone,
   // and processResponse given response being these substeps:
   const processResponse = (response) => {
     // 1. If locallyAborted is true, terminate these substeps.
@@ -194,7 +193,7 @@ async function fetch (...args) {
   fetching
     .call(context, {
       request,
-      processResponseDone: handleFetchDone,
+      processResponseEndOfBody: handleFetchDone,
       processResponse
     })
     .catch((err) => {
@@ -227,11 +226,9 @@ function finalizeAndReportTiming (response, initiatorType = 'other') {
 
   // 6. If response’s timing allow passed flag is not set, then:
   if (!timingInfo.timingAllowPassed) {
-    //  1. Set timingInfo to a new fetch timing info whose start time and
-    //  post-redirect start time are timingInfo’s start time.
-    timingInfo = makeTimingInfo({
-      startTime: timingInfo.startTime,
-      postRedirectStartTime: timingInfo.postRedirectStartTime
+    //  1. Set timingInfo to a the result of creating an opaque timing info for timingInfo.
+    timingInfo = createOpaqueTimingInfo({
+      startTime: timingInfo.startTime
     })
 
     //  2. Set cacheState to the empty string.
@@ -266,8 +263,6 @@ function markResourceTiming () {
 
 // https://fetch.spec.whatwg.org/#abort-fetch
 function abortFetch (p, request, responseObject) {
-  const context = this
-
   // 1. Let error be an "AbortError" DOMException.
   const error = new AbortError()
 
@@ -276,8 +271,14 @@ function abortFetch (p, request, responseObject) {
 
   // 3. If request’s body is not null and is readable, then cancel request’s
   // body with error.
-  if (request.body !== null) {
-    cancelBody(request.body, error)
+  if (request.body != null && isReadable(request.body?.stream)) {
+    request.body.stream.cancel(error).catch((err) => {
+      if (err.code === 'ERR_INVALID_STATE') {
+        // Node bug?
+        return
+      }
+      throw err
+    })
   }
 
   // 4. If responseObject is null, then return.
@@ -290,13 +291,27 @@ function abortFetch (p, request, responseObject) {
 
   // 6. If response’s body is not null and is readable, then error response’s
   // body with error.
-  if (response.body != null) {
-    context.connection.destroy(error)
+  if (response.body != null && isReadable(response.body?.stream)) {
+    response.body.stream.cancel(error).catch((err) => {
+      if (err.code === 'ERR_INVALID_STATE') {
+        // Node bug?
+        return
+      }
+      throw err
+    })
   }
 }
 
 // https://fetch.spec.whatwg.org/#fetching
-function fetching ({ request, processResponse, processResponseDone }) {
+function fetching ({
+  request,
+  processRequestBodyChunkLength,
+  processRequestEndOfBody,
+  processResponse,
+  processResponseEndOfBody,
+  processResponseConsumeBody,
+  useParallelQueue = false,
+}) {
   // 1. Let taskDestination be null.
   let taskDestination = null
 
@@ -304,7 +319,7 @@ function fetching ({ request, processResponse, processResponseDone }) {
   let crossOriginIsolatedCapability = false
 
   // 3. If request’s client is non-null, then:
-  if (request.client !== null) {
+  if (request.client != null) {
     // 1. Set taskDestination to request’s client’s global object.
     taskDestination = request.client.globalObject
 
@@ -322,26 +337,28 @@ function fetching ({ request, processResponse, processResponseDone }) {
   // post-redirect start time are the coarsened shared current time given
   // crossOriginIsolatedCapability.
   const currenTime = coarsenedSharedCurrentTime(crossOriginIsolatedCapability)
-  const timingInfo = makeTimingInfo({
-    startTime: currenTime,
-    postRedirectStartTime: currenTime
+  const timingInfo = createOpaqueTimingInfo({
+    startTime: currenTime
   })
 
-  // 6. Let fetchParams be a new fetch params whose request is request, timing
-  // info is timingInfo, process request body is processRequestBody,
-  // process request end-of-body is processRequestEndOfBody, process response
-  // is processResponse, process response end-of-body is
-  // processResponseEndOfBody, process response done is processResponseDone,
-  // task destination is taskDestination, and cross-origin isolated capability
-  // is crossOriginIsolatedCapability.
+  // 6. Let fetchParams be a new fetch params whose
+  // request is request,
+  // timing info is timingInfo,
+  // process request body chunk length is processRequestBodyChunkLength,
+  // process request end-of-body is processRequestEndOfBody,
+  // process response is processResponse,
+  // process response consume body is processResponseConsumeBody,
+  // process response end-of-body is processResponseEndOfBody,
+  // task destination is taskDestination,
+  // and cross-origin isolated capability is crossOriginIsolatedCapability.
   const fetchParams = {
     request,
     timingInfo,
-    processRequestBody: null,
-    processRequestEndOfBody: null,
+    processRequestBodyChunkLength,
+    processRequestEndOfBody,
     processResponse,
-    processResponseEndOfBody: null,
-    processResponseDone,
+    processResponseConsumeBody,
+    processResponseEndOfBody,
     taskDestination,
     crossOriginIsolatedCapability
   }
@@ -374,7 +391,7 @@ function fetching ({ request, processResponse, processResponseDone }) {
   if (request.policyContainer === 'client') {
     // 1. If request’s client is non-null, then set request’s policy
     // container to a clone of request’s client’s policy container. [HTML]
-    if (request.client !== null) {
+    if (request.client != null) {
       request.policyContainer = clonePolicyContainer(
         request.client.policyContainer
       )
@@ -649,7 +666,7 @@ async function mainFetch (fetchParams, recursive = false) {
       nullBodyStatus.includes(internalResponse.status))
   ) {
     internalResponse.body = null
-    context.connection.dump = true
+    context.dump = true
   }
 
   // 20. If request’s integrity metadata is not the empty string, then:
@@ -659,10 +676,9 @@ async function mainFetch (fetchParams, recursive = false) {
     const processBodyError = (reason) =>
       fetchFinale(fetchParams, makeNetworkError(reason))
 
-    // 2. If request’s response tainting is "opaque", response is a network
-    // error, or response’s body is null, then run processBodyError and abort
-    // these steps.
-    if (request.responseTainting === 'opaque' && response.status === 0) {
+    // 2. If request’s response tainting is "opaque", or response’s body is null,
+    // then run processBodyError and abort these steps.
+    if (request.responseTainting === 'opaque' || response.body == null) {
       processBodyError(response.error)
       return
     }
@@ -704,7 +720,7 @@ function finalizeResponse (fetchParams, response) {
   // 2, If fetchParams’s process response done is not null, then queue a fetch
   // task to run fetchParams’s process response done given response, with
   // fetchParams’s task destination.
-  if (fetchParams.processResponseDone !== null) {
+  if (fetchParams.processResponseDone != null) {
     fetchParams.processResponseDone(response)
   }
 }
@@ -716,17 +732,17 @@ function fetchFinale (fetchParams, response) {
   // 1. If fetchParams’s process response is non-null,
   // then queue a fetch task to run fetchParams’s process response
   // given response, with fetchParams’s task destination.
-  if (fetchParams.processResponse !== null) {
+  if (fetchParams.processResponse != null) {
     fetchParams.processResponse(response)
   }
 
-  // 2. If fetchParams’s process response end-of-body is non-null, then:.
+  // 2. If fetchParams’s process response consume is non-null, then:.
   //    TODO
   //    1. Let processBody given nullOrBytes be this step: run fetchParams’s
-  //    process response end-of-body given response and nullOrBytes.on.
+  //    process response consume given response and nullOrBytes.on.
   //    TODO
   //    2. Let processBodyError be this step: run fetchParams’s process
-  //    response end-of-body given response and failure.on.
+  //    response consume given response and failure.on.
   //    TODO
   //    3. If response’s body is null, then queue a fetch task to run
   //    processBody given null, with fetchParams’s task destination.on.
@@ -915,7 +931,7 @@ async function httpRedirectFetch (fetchParams, response) {
   // and request’s body’s source is null, then return a network error.
   if (
     actualResponse.status !== 303 &&
-    request.body !== null &&
+    request.body != null &&
     request.body.source == null
   ) {
     return makeNetworkError()
@@ -953,7 +969,7 @@ async function httpRedirectFetch (fetchParams, response) {
 
   // 14. If request’s body is non-null, then set request’s body to the first return
   // value of safely extracting request’s body’s source.
-  if (request.body !== null) {
+  if (request.body != null) {
     assert(request.body.source)
     request.body = safelyExtractBody(request.body.source)[0]
   }
@@ -1058,7 +1074,7 @@ async function httpNetworkOrCacheFetch (
 
   //    7. If contentLength is non-null, then set contentLengthHeaderValue to
   //    contentLength, serialized and isomorphic encoded.
-  if (contentLength !== null) {
+  if (contentLength != null) {
     // TODO: isomorphic encoded
     contentLengthHeaderValue = String(contentLength)
   }
@@ -1066,13 +1082,13 @@ async function httpNetworkOrCacheFetch (
   //    8. If contentLengthHeaderValue is non-null, then append
   //    `Content-Length`/contentLengthHeaderValue to httpRequest’s header
   //    list.
-  if (contentLengthHeaderValue !== null) {
+  if (contentLengthHeaderValue != null) {
     httpRequest.headersList.append('content-length', contentLengthHeaderValue)
   }
 
   //    9. If contentLength is non-null and httpRequest’s keepalive is true,
   //    then:
-  if (contentLength !== null && httpRequest.keepalive) {
+  if (contentLength != null && httpRequest.keepalive) {
     // NOTE: keepalive is a noop outside of browser context.
   }
 
@@ -1259,11 +1275,15 @@ async function httpNetworkOrCacheFetch (
     // 3. If the ongoing fetch is terminated, then:
     if (context.terminated) {
       // 1. Let aborted be the termination’s aborted flag.
+      const aborted = context.terminated.aborted
+
       // 2. If aborted is set, then return an aborted network error.
+      if (aborted) {
+        return makeNetworkError(new AbortError())
+      }
+
       // 3. Return a network error.
-      return makeNetworkError(
-        context.terminated.aborted ? new AbortError() : null
-      )
+      return makeNetworkError(context.terminated.reason)
     }
 
     // 4. Prompt the end user as appropriate in request’s window and store
@@ -1283,7 +1303,7 @@ async function httpNetworkOrCacheFetch (
     // isNewConnectionFetch is false
     !isNewConnectionFetch &&
     // request’s body is null, or request’s body is non-null and request’s body’s source is non-null
-    (request.body == null || request.body.source !== null)
+    (request.body == null || request.body.source != null)
   ) {
     // then:
 
@@ -1293,10 +1313,12 @@ async function httpNetworkOrCacheFetch (
       const aborted = context.terminated.aborted
 
       // 2. If aborted is set, then return an aborted network error.
-      const reason = aborted ? new AbortError() : new Error('terminated')
+      if (aborted) {
+        return makeNetworkError(new AbortError())
+      }
 
       // 3. Return a network error.
-      return makeNetworkError(reason)
+      return makeNetworkError(context.terminated.reason)
     }
 
     // 2. Set response to the result of running HTTP-network-or-cache
@@ -1335,41 +1357,16 @@ function httpNetworkFetch (
   return new Promise((resolve) => {
     assert(!context.connection || context.connection.destroyed)
 
-    const connection = (context.connection = {
+    context.connection = {
       abort: null,
-      controller: null,
       destroyed: false,
-      errored: false,
-      dump: false,
       destroy (err) {
-        if (this.destroyed) {
-          return
-        }
-
-        this.destroyed = true
-
-        if (this.abort) {
-          this.abort()
-          this.abort = null
-        }
-
-        if (err) {
-          this.errored = err
-        }
-
-        if (this.controller) {
-          try {
-            this.controller.error(err ?? new AbortError())
-            this.controller = null
-          } catch (err) {
-            // Will throw TypeError if body is not readable.
-            if (err.name !== 'TypeError') {
-              throw err
-            }
-          }
+        if (!this.destroyed) {
+          this.destroyed = true
+          this.abort?.(err ?? new AbortError())
         }
       }
-    })
+    }
 
     // 1. Let request be fetchParams’s request.
     const request = fetchParams.request
@@ -1505,16 +1502,18 @@ function httpNetworkFetch (
     // 9. If aborted, then:
     function onRequestAborted () {
       // 1. Let aborted be the termination’s aborted flag.
-      const aborted = context.terminated.aborted
+      const aborted = this.terminated.aborted
 
       // 2. If connection uses HTTP/2, then transmit an RST_STREAM frame.
-      connection.destroy()
+      this.connection.destroy()
 
       // 3. If aborted is set, then return an aborted network error.
-      const reason = aborted ? new AbortError() : new Error('terminated')
+      if (aborted) {
+        return resolve(makeNetworkError(new AbortError()))
+      }
 
       // 4. Return a network error.
-      resolve(makeNetworkError(reason))
+      return resolve(makeNetworkError(this.terminated.reason))
     }
 
     // 10. Let pullAlgorithm be an action that resumes the ongoing fetch
@@ -1529,7 +1528,7 @@ function httpNetworkFetch (
 
     // 12. Let highWaterMark be a non-negative, non-NaN number, chosen by
     // the user agent.
-    const highWaterMark = 65536
+    const highWaterMark = 64 * 1024 // Same as nodejs fs streams.
 
     // 13. Let sizeAlgorithm be an algorithm that accepts a chunk object
     // and returns a non-negative, non-NaN, non-infinite number, chosen by the user agent.
@@ -1543,20 +1542,23 @@ function httpNetworkFetch (
       ReadableStream = require('stream/web').ReadableStream
     }
 
+    let pullResolve
+
     const stream = new ReadableStream(
       {
         async start (controller) {
-          connection.controller = controller
+          context.controller = controller
         },
-        async pull () {
-          if (pullAlgorithm) {
-            pullAlgorithm()
-          } else {
-            pullAlgorithm = null
+        async pull (controller) {
+          if (!pullAlgorithm) {
+            await new Promise((resolve) => {
+              pullResolve = resolve
+            })
           }
+          await pullAlgorithm(controller)
         },
         async cancel (reason) {
-          cancelAlgorithm()
+          await cancelAlgorithm(reason)
         }
       },
       { highWaterMark }
@@ -1586,7 +1588,7 @@ function httpNetworkFetch (
       finalizeResponse(fetchParams, response)
 
       // 2. Let aborted be the termination’s aborted flag.
-      const aborted = context.terminated.aborted
+      const aborted = this.terminated.aborted
 
       // 3. If aborted is set, then:
       if (aborted) {
@@ -1594,15 +1596,19 @@ function httpNetworkFetch (
         response.aborted = true
 
         // 2. If stream is readable, error stream with an "AbortError" DOMException.
-        connection.destroy(new AbortError())
+        if (isReadable(stream)) {
+          this.controller.error(new AbortError())
+        }
       } else {
         // 4. Otherwise, if stream is readable, error stream with a TypeError.
-        connection.destroy(new TypeError('terminated'))
+        if (isReadable(stream)) {
+          this.controller.error(new TypeError('terminated'))
+        }
       }
 
       // 5. If connection uses HTTP/2, then transmit an RST_STREAM frame.
       // 6. Otherwise, the user agent should close connection unless it would be bad for performance to do so.
-      connection.destroy()
+      this.connection.destroy()
     }
 
     // 19. Return response.
@@ -1621,12 +1627,17 @@ function httpNetworkFetch (
       },
       {
         decoder: null,
+        abort: null,
+        context,
 
         onConnect (abort) {
+          // TODO (fix): Do we need connection here?
+          const { connection } = this.context
+
           if (connection.destroyed) {
             abort(new AbortError())
           } else {
-            connection.abort = abort
+            this.abort = connection.abort = abort
           }
         },
 
@@ -1643,19 +1654,14 @@ function httpNetworkFetch (
             )
           }
 
-          const hasPulled = pullAlgorithm !== undefined
-
-          const body = { stream }
-          registry.register(body, connection.abort)
-
           response = makeResponse({
             status,
             statusText,
             headersList: headers[kHeadersList],
-            body
+            body: { stream }
           })
 
-          context.on('terminated', onResponseAborted)
+          this.context.on('terminated', onResponseAborted)
 
           const codings =
             headers
@@ -1680,31 +1686,18 @@ function httpNetworkFetch (
             }
           }
 
-          let iterator
-
           if (decoders.length > 1) {
-            if (compose) {
-              this.decoder = compose(...decoders)
-              iterator = this.decoder[Symbol.asyncIterator]()
-            } else {
-              this.decoder = new PassThrough()
-              iterator = pipeline(this.decoder, ...decoders, () => {})[
-                Symbol.asyncIterator
-              ]()
-            }
-          } else if (decoders.length === 1) {
-            this.decoder = decoders[0]
-            iterator = this.decoder[Symbol.asyncIterator]()
-          } else {
-            this.decoder = new PassThrough()
-            iterator = this.decoder[Symbol.asyncIterator]()
+            pipeline(...decoders, () => {})
+          } else if (decoders.length === 0) {
+            // TODO (perf): Avoid intermediate.
+            decoders.push(new PassThrough())
           }
 
-          if (this.decoder) {
-            this.decoder.on('drain', resume)
-          }
+          this.decoder = decoders[0].on('drain', resume)
+
+          const iterator = decoders[decoders.length - 1][Symbol.asyncIterator]()
 
-          pullAlgorithm = async () => {
+          pullAlgorithm = async (controller) => {
             // 4. Set bytes to the result of handling content codings given
             // codings and bytes.
             let bytes
@@ -1720,10 +1713,6 @@ function httpNetworkFetch (
               }
             }
 
-            if (!connection.controller) {
-              return
-            }
-
             if (bytes === undefined) {
               // 2. Otherwise, if the bytes transmission for response’s message
               // body is done normally and stream is readable, then close
@@ -1731,13 +1720,7 @@ function httpNetworkFetch (
               // abort these in-parallel steps.
               finalizeResponse(fetchParams, response)
 
-              context.off('terminated', onResponseAborted)
-              context.off('terminated', onRequestAborted)
-
-              connection.controller.close()
-              connection.controller = null
-
-              connection.destroy()
+              controller.close()
 
               return
             }
@@ -1747,27 +1730,28 @@ function httpNetworkFetch (
 
             // 6. If bytes is failure, then terminate the ongoing fetch.
             if (bytes instanceof Error) {
-              context.terminate({ reason: bytes })
+              this.context.terminate({ reason: bytes })
               return
             }
 
             // 7. Enqueue a Uint8Array wrapping an ArrayBuffer containing bytes
-            //  into stream.
-            connection.controller.enqueue(new Uint8Array(bytes))
+            // into stream.
+            controller.enqueue(new Uint8Array(bytes))
 
             // 8. If stream is errored, then terminate the ongoing fetch.
-            if (connection.errored) {
-              context.terminate({ reason: connection.errored })
+            if (isErrored(stream)) {
+              this.context.terminate()
               return
             }
 
             // 9. If stream doesn’t need more data ask the user agent to suspend
-            //  the ongoing fetch.
-            return connection.controller.desiredSize > 0
+            // the ongoing fetch.
+            return controller.desiredSize > 0
           }
 
-          if (hasPulled) {
-            pullAlgorithm()
+          if (pullResolve) {
+            pullResolve()
+            pullResolve = null
           }
 
           resolve(response)
@@ -1776,7 +1760,7 @@ function httpNetworkFetch (
         },
 
         onData (chunk) {
-          if (connection.dump) {
+          if (this.context.dump) {
             return
           }
 
@@ -1798,17 +1782,14 @@ function httpNetworkFetch (
           return this.decoder.write(bytes)
         },
 
-        async onComplete () {
+        onComplete () {
           this.decoder.end()
         },
 
         onError (error) {
-          context.off('terminated', onResponseAborted)
-          context.off('terminated', onRequestAborted)
-
-          connection.destroy(error)
+          this.decoder?.destroy(error)
 
-          context.terminate({ reason: error })
+          this.context.terminate({ reason: error })
 
           if (!response) {
             resolve(makeNetworkError(error))

package/lib/fetch/request.js

@@ -28,6 +28,10 @@ let TransformStream
 
 const kInit = Symbol('init')
 
+const requestFinalizer = new FinalizationRegistry(({ signal, abort }) => {
+  signal.removeEventListener('abort', abort)
+})
+
 // https://fetch.spec.whatwg.org/#request-class
 class Request {
   // https://fetch.spec.whatwg.org/#dom-request
@@ -123,7 +127,7 @@ class Request {
     }
 
     // 10. If init["window"] exists and is non-null, then throw a TypeError.
-    if ('window' in init && window !== null) {
+    if ('window' in init && window != null) {
       throw new TypeError(`'window' option '${window}' must be null`)
     }
 
@@ -134,8 +138,48 @@ class Request {
 
     // 12. Set request to a new request with the following properties:
     request = makeRequest({
-      ...request,
-      window
+      // URL request’s URL.
+      // undici implementation note: this is set as the first item in request's urlList in makeRequest
+      // method request’s method. 
+      method: request.method,
+      // header list A copy of request’s header list.
+      // undici implementation note: headersList is cloned in makeRequest
+      headersList: request.headersList,
+      // unsafe-request flag Set. 
+      unsafeRequest: request.unsafeRequest,
+      // client This’s relevant settings object.
+      client: request.client,
+      // window window.
+      window,
+      // priority request’s priority. 
+      priority: request.priority,
+      // origin request’s origin. The propagation of the origin is only significant for navigation requests
+      // being handled by a service worker. In this scenario a request can have an origin that is different 
+      // from the current client.
+      origin: request.origin,
+      // referrer request’s referrer.
+      referrer: request.referrer, 
+      // referrer policy request’s referrer policy.
+      referrerPolicy: request.referrerPolicy,
+      // mode request’s mode.
+      mode: request.mode, 
+      // credentials mode request’s credentials mode.
+      credentials: request.credentials,
+      // cache mode request’s cache mode.
+      cache: request.cache,
+      // redirect mode request’s redirect mode.
+      redirect: request.redirect, 
+      // integrity metadata request’s integrity metadata.
+      integrity: request.integrity,
+      // keepalive request’s keepalive.
+      keepalive: request.keepalive,
+      // reload-navigation flag request’s reload-navigation flag.
+      reloadNavigation: request.reloadNavigation,
+      // history-navigation flag request’s history-navigation flag.
+      historyNavigation: request.historyNavigation,
+      // URL list A clone of request’s URL list.
+      // undici implementation note: urlList is cloned in makeRequest
+      urlList: request.urlList
     })
 
     // 13. If init is not empty, then:
@@ -151,11 +195,20 @@ class Request {
       // 3. Unset request’s history-navigation flag.
       request.historyNavigation = false
 
-      // 4. Set request’s referrer to "client"
+      // 4. Set request’s origin to "client".
+      request.origin = 'client'
+
+      // 5. Set request’s referrer to "client"
       request.referrer = 'client'
 
-      // 5. Set request’s referrer policy to the empty string.
+      // 6. Set request’s referrer policy to the empty string.
       request.referrerPolicy = ''
+
+      // 7. Set request’s URL to request’s current URL.
+      request.url = request.urlList[request.urlList.length - 1]
+
+      // 8. Set request’s URL list to « request’s URL ».
+      request.urlList = [request.url]
     }
 
     // 14. If init["referrer"] exists, then:
@@ -164,7 +217,7 @@ class Request {
       const referrer = init.referrer
 
       // 2. If referrer is the empty string, then set request’s referrer to "no-referrer".
-      if (!referrer === '') {
+      if (referrer === '') {
         request.referrer = 'no-referrer'
       } else {
         // 1. Let parsedReferrer be the result of parsing referrer with
@@ -223,7 +276,7 @@ class Request {
     }
 
     // 18. If mode is non-null, set request’s mode to mode.
-    if (mode !== null) {
+    if (mode != null) {
       request.mode = mode
     }
 
@@ -328,14 +381,9 @@ class Request {
       if (signal.aborted) {
         ac.abort()
       } else {
-        // TODO: Remove this listener on failure/success.
-        signal.addEventListener(
-          'abort',
-          function () {
-            ac.abort()
-          },
-          { once: true }
-        )
+        const abort = () => ac.abort()
+        signal.addEventListener('abort', abort, { once: true })
+        requestFinalizer.register(this, { signal, abort })
       }
     }
 
@@ -769,7 +817,7 @@ function cloneRequest (request) {
 
   // 2. If request’s body is non-null, set newRequest’s body to the
   // result of cloning request’s body.
-  if (request.body !== null) {
+  if (request.body != null) {
     newRequest.body = cloneBody(request.body)
   }
 

package/lib/fetch/response.js

@@ -327,7 +327,7 @@ function cloneResponse (response) {
 
   // 3. If response’s body is non-null, then set newResponse’s body to the
   // result of cloning response’s body.
-  if (response.body !== null) {
+  if (response.body != null) {
     newResponse.body = cloneBody(response.body)
   }
 

package/lib/fetch/util.js

@@ -253,20 +253,20 @@ function coarsenedSharedCurrentTime (crossOriginIsolatedCapability) {
   return performance.now()
 }
 
-function makeTimingInfo (init) {
+// https://fetch.spec.whatwg.org/#create-an-opaque-timing-info
+function createOpaqueTimingInfo (timingInfo) {
   return {
-    startTime: 0,
+    startTime: timingInfo.startTime ?? 0,
     redirectStartTime: 0,
     redirectEndTime: 0,
-    postRedirectStartTime: 0,
+    postRedirectStartTime: timingInfo.startTime ?? 0,
     finalServiceWorkerStartTime: 0,
     finalNetworkResponseStartTime: 0,
     finalNetworkRequestStartTime: 0,
     endTime: 0,
     encodedBodySize: 0,
     decodedBodySize: 0,
-    finalConnectionTimingInfo: null,
-    ...init
+    finalConnectionTimingInfo: null
   }
 }
 
@@ -318,8 +318,7 @@ module.exports = {
   TAOCheck,
   corsCheck,
   crossOriginResourcePolicyCheck,
-  ReadableStreamFrom,
-  makeTimingInfo,
+  createOpaqueTimingInfo,
   setRequestReferrerPolicyOnRedirect,
   isValidHTTPToken,
   requestBadPort,

package/lib/pool-base.js

@@ -7,7 +7,7 @@ const {
   InvalidArgumentError
 } = require('./core/errors')
 const FixedQueue = require('./node/fixed-queue')
-const { kSize, kRunning, kPending, kBusy } = require('./core/symbols')
+const { kSize, kRunning, kPending, kBusy, kUrl } = require('./core/symbols')
 
 const kClients = Symbol('clients')
 const kNeedDrain = Symbol('needDrain')
@@ -257,5 +257,5 @@ module.exports = {
   kNeedDrain,
   kAddClient,
   kRemoveClient,
-  kDispatch,
+  kDispatch
 }

package/lib/pool.js

@@ -5,11 +5,11 @@ const {
   kClients,
   kNeedDrain,
   kAddClient,
-  kDispatch,
- } = require('./pool-base')
+  kDispatch
+} = require('./pool-base')
 const Client = require('./client')
 const {
-  InvalidArgumentError,
+  InvalidArgumentError
 } = require('./core/errors')
 const util = require('./core/util')
 const { kUrl } = require('./core/symbols')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "undici",
-  "version": "4.11.0",
+  "version": "4.12.0",
   "description": "An HTTP/1.1 client, written from scratch for Node.js",
   "homepage": "https://undici.nodejs.org",
   "bugs": {