undici 7.0.0-alpha.1 → 7.0.0-alpha.2

package/lib/web/fetch/headers.js

@@ -13,19 +13,18 @@ const { webidl } = require('./webidl')
 const assert = require('node:assert')
 const util = require('node:util')
 
-const kHeadersMap = Symbol('headers map')
-const kHeadersSortedMap = Symbol('headers map sorted')
-
 /**
  * @param {number} code
+ * @returns {code is (0x0a | 0x0d | 0x09 | 0x20)}
  */
 function isHTTPWhiteSpaceCharCode (code) {
-  return code === 0x00a || code === 0x00d || code === 0x009 || code === 0x020
+  return code === 0x0a || code === 0x0d || code === 0x09 || code === 0x20
 }
 
 /**
  * @see https://fetch.spec.whatwg.org/#concept-header-value-normalize
  * @param {string} potentialValue
+ * @returns {string}
  */
 function headerValueNormalize (potentialValue) {
   //  To normalize a byte sequence potentialValue, remove
@@ -39,6 +38,10 @@ function headerValueNormalize (potentialValue) {
   return i === 0 && j === potentialValue.length ? potentialValue : potentialValue.substring(i, j)
 }
 
+/**
+ * @param {Headers} headers
+ * @param {Array|Object} object
+ */
 function fill (headers, object) {
   // To fill a Headers object headers with a given object object, run these steps:
 
@@ -78,6 +81,9 @@ function fill (headers, object) {
 
 /**
  * @see https://fetch.spec.whatwg.org/#concept-headers-append
+ * @param {Headers} headers
+ * @param {string} name
+ * @param {string} value
  */
 function appendHeader (headers, name, value) {
   // 1. Normalize value.
@@ -119,6 +125,67 @@ function appendHeader (headers, name, value) {
   //    privileged no-CORS request headers from headers
 }
 
+// https://fetch.spec.whatwg.org/#concept-header-list-sort-and-combine
+/**
+ * @param {Headers} target
+ */
+function headersListSortAndCombine (target) {
+  const headersList = getHeadersList(target)
+
+  if (!headersList) {
+    return []
+  }
+
+  if (headersList.sortedMap) {
+    return headersList.sortedMap
+  }
+
+  // 1. Let headers be an empty list of headers with the key being the name
+  //    and value the value.
+  const headers = []
+
+  // 2. Let names be the result of convert header names to a sorted-lowercase
+  //    set with all the names of the headers in list.
+  const names = headersList.toSortedArray()
+
+  const cookies = headersList.cookies
+
+  // fast-path
+  if (cookies === null || cookies.length === 1) {
+    // Note: The non-null assertion of value has already been done by `HeadersList#toSortedArray`
+    return (headersList.sortedMap = names)
+  }
+
+  // 3. For each name of names:
+  for (let i = 0; i < names.length; ++i) {
+    const { 0: name, 1: value } = names[i]
+    // 1. If name is `set-cookie`, then:
+    if (name === 'set-cookie') {
+      // 1. Let values be a list of all values of headers in list whose name
+      //    is a byte-case-insensitive match for name, in order.
+
+      // 2. For each value of values:
+      // 1. Append (name, value) to headers.
+      for (let j = 0; j < cookies.length; ++j) {
+        headers.push([name, cookies[j]])
+      }
+    } else {
+      // 2. Otherwise:
+
+      // 1. Let value be the result of getting name from list.
+
+      // 2. Assert: value is non-null.
+      // Note: This operation was done by `HeadersList#toSortedArray`.
+
+      // 3. Append (name, value) to headers.
+      headers.push([name, value])
+    }
+  }
+
+  // 4. Return headers.
+  return (headersList.sortedMap = headers)
+}
+
 function compareHeaderName (a, b) {
   return a[0] < b[0] ? -1 : 1
 }
@@ -127,14 +194,17 @@ class HeadersList {
   /** @type {[string, string][]|null} */
   cookies = null
 
+  sortedMap
+  headersMap
+
   constructor (init) {
     if (init instanceof HeadersList) {
-      this[kHeadersMap] = new Map(init[kHeadersMap])
-      this[kHeadersSortedMap] = init[kHeadersSortedMap]
+      this.headersMap = new Map(init.headersMap)
+      this.sortedMap = init.sortedMap
       this.cookies = init.cookies === null ? null : [...init.cookies]
     } else {
-      this[kHeadersMap] = new Map(init)
-      this[kHeadersSortedMap] = null
+      this.headersMap = new Map(init)
+      this.sortedMap = null
     }
   }
 
@@ -148,12 +218,12 @@ class HeadersList {
     // contains a header whose name is a byte-case-insensitive
     // match for name.
 
-    return this[kHeadersMap].has(isLowerCase ? name : name.toLowerCase())
+    return this.headersMap.has(isLowerCase ? name : name.toLowerCase())
   }
 
   clear () {
-    this[kHeadersMap].clear()
-    this[kHeadersSortedMap] = null
+    this.headersMap.clear()
+    this.sortedMap = null
     this.cookies = null
   }
 
@@ -164,22 +234,22 @@ class HeadersList {
    * @param {boolean} isLowerCase
    */
   append (name, value, isLowerCase) {
-    this[kHeadersSortedMap] = null
+    this.sortedMap = null
 
     // 1. If list contains name, then set name to the first such
     //    header’s name.
     const lowercaseName = isLowerCase ? name : name.toLowerCase()
-    const exists = this[kHeadersMap].get(lowercaseName)
+    const exists = this.headersMap.get(lowercaseName)
 
     // 2. Append (name, value) to list.
     if (exists) {
       const delimiter = lowercaseName === 'cookie' ? '; ' : ', '
-      this[kHeadersMap].set(lowercaseName, {
+      this.headersMap.set(lowercaseName, {
         name: exists.name,
         value: `${exists.value}${delimiter}${value}`
       })
     } else {
-      this[kHeadersMap].set(lowercaseName, { name, value })
+      this.headersMap.set(lowercaseName, { name, value })
     }
 
     if (lowercaseName === 'set-cookie') {
@@ -194,7 +264,7 @@ class HeadersList {
    * @param {boolean} isLowerCase
    */
   set (name, value, isLowerCase) {
-    this[kHeadersSortedMap] = null
+    this.sortedMap = null
     const lowercaseName = isLowerCase ? name : name.toLowerCase()
 
     if (lowercaseName === 'set-cookie') {
@@ -205,7 +275,7 @@ class HeadersList {
     //    the first such header to value and remove the
     //    others.
     // 2. Otherwise, append header (name, value) to list.
-    this[kHeadersMap].set(lowercaseName, { name, value })
+    this.headersMap.set(lowercaseName, { name, value })
   }
 
   /**
@@ -214,14 +284,14 @@ class HeadersList {
    * @param {boolean} isLowerCase
    */
   delete (name, isLowerCase) {
-    this[kHeadersSortedMap] = null
+    this.sortedMap = null
     if (!isLowerCase) name = name.toLowerCase()
 
     if (name === 'set-cookie') {
       this.cookies = null
     }
 
-    this[kHeadersMap].delete(name)
+    this.headersMap.delete(name)
   }
 
   /**
@@ -235,12 +305,12 @@ class HeadersList {
     // 2. Return the values of all headers in list whose name
     //    is a byte-case-insensitive match for name,
     //    separated from each other by 0x2C 0x20, in order.
-    return this[kHeadersMap].get(isLowerCase ? name : name.toLowerCase())?.value ?? null
+    return this.headersMap.get(isLowerCase ? name : name.toLowerCase())?.value ?? null
   }
 
   * [Symbol.iterator] () {
     // use the lowercased name
-    for (const { 0: name, 1: { value } } of this[kHeadersMap]) {
+    for (const { 0: name, 1: { value } } of this.headersMap) {
       yield [name, value]
     }
   }
@@ -248,8 +318,8 @@ class HeadersList {
   get entries () {
     const headers = {}
 
-    if (this[kHeadersMap].size !== 0) {
-      for (const { name, value } of this[kHeadersMap].values()) {
+    if (this.headersMap.size !== 0) {
+      for (const { name, value } of this.headersMap.values()) {
         headers[name] = value
       }
     }
@@ -258,14 +328,14 @@ class HeadersList {
   }
 
   rawValues () {
-    return this[kHeadersMap].values()
+    return this.headersMap.values()
   }
 
   get entriesList () {
     const headers = []
 
-    if (this[kHeadersMap].size !== 0) {
-      for (const { 0: lowerName, 1: { name, value } } of this[kHeadersMap]) {
+    if (this.headersMap.size !== 0) {
+      for (const { 0: lowerName, 1: { name, value } } of this.headersMap) {
         if (lowerName === 'set-cookie') {
           for (const cookie of this.cookies) {
             headers.push([name, cookie])
@@ -281,7 +351,7 @@ class HeadersList {
 
   // https://fetch.spec.whatwg.org/#convert-header-names-to-a-sorted-lowercase-set
   toSortedArray () {
-    const size = this[kHeadersMap].size
+    const size = this.headersMap.size
     const array = new Array(size)
     // In most cases, you will use the fast-path.
     // fast-path: Use binary insertion sort for small arrays.
@@ -292,7 +362,7 @@ class HeadersList {
       }
       // Improve performance by unrolling loop and avoiding double-loop.
       // Double-loop-less version of the binary insertion sort.
-      const iterator = this[kHeadersMap][Symbol.iterator]()
+      const iterator = this.headersMap[Symbol.iterator]()
       const firstValue = iterator.next().value
       // set [name, value] to first index.
       array[0] = [firstValue[0], firstValue[1].value]
@@ -342,7 +412,7 @@ class HeadersList {
       // This case would be a rare occurrence.
       // slow-path: fallback
       let i = 0
-      for (const { 0: name, 1: { value } } of this[kHeadersMap]) {
+      for (const { 0: name, 1: { value } } of this.headersMap) {
         array[i++] = [name, value]
         // https://fetch.spec.whatwg.org/#concept-header-list-sort-and-combine
         // 3.2.2. Assert: value is non-null.
@@ -356,8 +426,15 @@ class HeadersList {
 // https://fetch.spec.whatwg.org/#headers-class
 class Headers {
   #guard
+  /**
+   * @type {HeadersList}
+   */
   #headersList
 
+  /**
+   * @param {HeadersInit|Symbol} [init]
+   * @returns
+   */
   constructor (init = undefined) {
     if (init === kConstruct) {
       return
@@ -545,58 +622,6 @@ class Headers {
     return []
   }
 
-  // https://fetch.spec.whatwg.org/#concept-header-list-sort-and-combine
-  get [kHeadersSortedMap] () {
-    if (this.#headersList[kHeadersSortedMap]) {
-      return this.#headersList[kHeadersSortedMap]
-    }
-
-    // 1. Let headers be an empty list of headers with the key being the name
-    //    and value the value.
-    const headers = []
-
-    // 2. Let names be the result of convert header names to a sorted-lowercase
-    //    set with all the names of the headers in list.
-    const names = this.#headersList.toSortedArray()
-
-    const cookies = this.#headersList.cookies
-
-    // fast-path
-    if (cookies === null || cookies.length === 1) {
-      // Note: The non-null assertion of value has already been done by `HeadersList#toSortedArray`
-      return (this.#headersList[kHeadersSortedMap] = names)
-    }
-
-    // 3. For each name of names:
-    for (let i = 0; i < names.length; ++i) {
-      const { 0: name, 1: value } = names[i]
-      // 1. If name is `set-cookie`, then:
-      if (name === 'set-cookie') {
-        // 1. Let values be a list of all values of headers in list whose name
-        //    is a byte-case-insensitive match for name, in order.
-
-        // 2. For each value of values:
-        // 1. Append (name, value) to headers.
-        for (let j = 0; j < cookies.length; ++j) {
-          headers.push([name, cookies[j]])
-        }
-      } else {
-        // 2. Otherwise:
-
-        // 1. Let value be the result of getting name from list.
-
-        // 2. Assert: value is non-null.
-        // Note: This operation was done by `HeadersList#toSortedArray`.
-
-        // 3. Append (name, value) to headers.
-        headers.push([name, value])
-      }
-    }
-
-    // 4. Return headers.
-    return (this.#headersList[kHeadersSortedMap] = headers)
-  }
-
   [util.inspect.custom] (depth, options) {
     options.depth ??= depth
 
@@ -611,12 +636,19 @@ class Headers {
     o.#guard = guard
   }
 
+  /**
+   * @param {Headers} o
+   */
   static getHeadersList (o) {
     return o.#headersList
   }
 
-  static setHeadersList (o, list) {
-    o.#headersList = list
+  /**
+   * @param {Headers} target
+   * @param {HeadersList} list
+   */
+  static setHeadersList (target, list) {
+    target.#headersList = list
   }
 }
 
@@ -626,7 +658,7 @@ Reflect.deleteProperty(Headers, 'setHeadersGuard')
 Reflect.deleteProperty(Headers, 'getHeadersList')
 Reflect.deleteProperty(Headers, 'setHeadersList')
 
-iteratorMixin('Headers', Headers, kHeadersSortedMap, 0, 1)
+iteratorMixin('Headers', Headers, headersListSortAndCombine, 0, 1)
 
 Object.defineProperties(Headers.prototype, {
   append: kEnumerableProperty,

package/lib/web/fetch/index.js

@@ -7,10 +7,11 @@ const {
   makeAppropriateNetworkError,
   filterResponse,
   makeResponse,
-  fromInnerResponse
+  fromInnerResponse,
+  getResponseState
 } = require('./response')
 const { HeadersList } = require('./headers')
-const { Request, cloneRequest } = require('./request')
+const { Request, cloneRequest, getRequestDispatcher, getRequestState } = require('./request')
 const zlib = require('node:zlib')
 const {
   bytesMatch,
@@ -46,7 +47,6 @@ const {
   createInflate,
   extractMimeType
 } = require('./util')
-const { kState, kDispatcher } = require('./symbols')
 const assert = require('node:assert')
 const { safelyExtractBody, extractBody } = require('./body')
 const {
@@ -143,7 +143,7 @@ function fetch (input, init = undefined) {
   }
 
   // 3. Let request be requestObject’s request.
-  const request = requestObject[kState]
+  const request = getRequestState(requestObject)
 
   // 4. If requestObject’s signal’s aborted flag is set, then:
   if (requestObject.signal.aborted) {
@@ -243,7 +243,7 @@ function fetch (input, init = undefined) {
     request,
     processResponseEndOfBody: handleFetchDone,
     processResponse,
-    dispatcher: requestObject[kDispatcher] // undici
+    dispatcher: getRequestDispatcher(requestObject) // undici
   })
 
   // 14. Return p.
@@ -342,7 +342,7 @@ function abortFetch (p, request, responseObject, error) {
   }
 
   // 4. Let response be responseObject’s response.
-  const response = responseObject[kState]
+  const response = getResponseState(responseObject)
 
   // 5. If response’s body is not null and is readable, then error response’s
   // body with error.
@@ -571,53 +571,46 @@ async function mainFetch (fetchParams, recursive = false) {
   // 11. If response is null, then set response to the result of running
   // the steps corresponding to the first matching statement:
   if (response === null) {
-    response = await (async () => {
-      const currentURL = requestCurrentURL(request)
-
-      if (
-        // - request’s current URL’s origin is same origin with request’s origin,
-        //   and request’s response tainting is "basic"
-        (sameOrigin(currentURL, request.url) && request.responseTainting === 'basic') ||
-        // request’s current URL’s scheme is "data"
-        (currentURL.protocol === 'data:') ||
-        // - request’s mode is "navigate" or "websocket"
-        (request.mode === 'navigate' || request.mode === 'websocket')
-      ) {
-        // 1. Set request’s response tainting to "basic".
-        request.responseTainting = 'basic'
-
-        // 2. Return the result of running scheme fetch given fetchParams.
-        return await schemeFetch(fetchParams)
-      }
-
-      // request’s mode is "same-origin"
-      if (request.mode === 'same-origin') {
-        // 1. Return a network error.
-        return makeNetworkError('request mode cannot be "same-origin"')
-      }
-
-      // request’s mode is "no-cors"
-      if (request.mode === 'no-cors') {
-        // 1. If request’s redirect mode is not "follow", then return a network
-        // error.
-        if (request.redirect !== 'follow') {
-          return makeNetworkError(
-            'redirect mode cannot be "follow" for "no-cors" request'
-          )
-        }
-
+    const currentURL = requestCurrentURL(request)
+    if (
+      // - request’s current URL’s origin is same origin with request’s origin,
+      //   and request’s response tainting is "basic"
+      (sameOrigin(currentURL, request.url) && request.responseTainting === 'basic') ||
+      // request’s current URL’s scheme is "data"
+      (currentURL.protocol === 'data:') ||
+      // - request’s mode is "navigate" or "websocket"
+      (request.mode === 'navigate' || request.mode === 'websocket')
+    ) {
+      // 1. Set request’s response tainting to "basic".
+      request.responseTainting = 'basic'
+
+      // 2. Return the result of running scheme fetch given fetchParams.
+      response = await schemeFetch(fetchParams)
+
+    // request’s mode is "same-origin"
+    } else if (request.mode === 'same-origin') {
+      // 1. Return a network error.
+      response = makeNetworkError('request mode cannot be "same-origin"')
+
+    // request’s mode is "no-cors"
+    } else if (request.mode === 'no-cors') {
+      // 1. If request’s redirect mode is not "follow", then return a network
+      // error.
+      if (request.redirect !== 'follow') {
+        response = makeNetworkError(
+          'redirect mode cannot be "follow" for "no-cors" request'
+        )
+      } else {
         // 2. Set request’s response tainting to "opaque".
         request.responseTainting = 'opaque'
 
         // 3. Return the result of running scheme fetch given fetchParams.
-        return await schemeFetch(fetchParams)
-      }
-
-      // request’s current URL’s scheme is not an HTTP(S) scheme
-      if (!urlIsHttpHttpsScheme(requestCurrentURL(request))) {
-        // Return a network error.
-        return makeNetworkError('URL scheme must be a HTTP(S) scheme')
+        response = await schemeFetch(fetchParams)
       }
+    // request’s current URL’s scheme is not an HTTP(S) scheme
+    } else if (!urlIsHttpHttpsScheme(requestCurrentURL(request))) {
+      // Return a network error.
+      response = makeNetworkError('URL scheme must be a HTTP(S) scheme')
 
       // - request’s use-CORS-preflight flag is set
       // - request’s unsafe-request flag is set and either request’s method is
@@ -631,13 +624,14 @@ async function mainFetch (fetchParams, recursive = false) {
       //    4. Return corsWithPreflightResponse.
       // TODO
 
-      // Otherwise
+    // Otherwise
+    } else {
       //    1. Set request’s response tainting to "cors".
       request.responseTainting = 'cors'
 
       //    2. Return the result of running HTTP fetch given fetchParams.
-      return await httpFetch(fetchParams)
-    })()
+      response = await httpFetch(fetchParams)
+    }
   }
 
   // 12. If recursive is true, then return response.
@@ -809,7 +803,7 @@ function schemeFetch (fetchParams) {
 
       // 2. If request’s method is not `GET`, blobURLEntry is null, or blobURLEntry’s
       //    object is not a Blob object, then return a network error.
-      if (request.method !== 'GET' || !(blob instanceof Blob)) {
+      if (request.method !== 'GET' || !webidl.is.Blob(blob)) {
         return Promise.resolve(makeNetworkError('invalid method'))
       }
 
@@ -1445,7 +1439,7 @@ async function httpNetworkOrCacheFetch (
   //    11. If httpRequest’s referrer is a URL, then append
   //    `Referer`/httpRequest’s referrer, serialized and isomorphic encoded,
   //     to httpRequest’s header list.
-  if (httpRequest.referrer instanceof URL) {
+  if (webidl.is.URL(httpRequest.referrer)) {
     httpRequest.headersList.append('referer', isomorphicEncode(httpRequest.referrer.href), true)
   }
 
@@ -1887,8 +1881,8 @@ async function httpNetworkFetch (
 
   // 11. Let pullAlgorithm be an action that resumes the ongoing fetch
   // if it is suspended.
-  const pullAlgorithm = async () => {
-    await fetchParams.controller.resume()
+  const pullAlgorithm = () => {
+    return fetchParams.controller.resume()
   }
 
   // 12. Let cancelAlgorithm be an algorithm that aborts fetchParams’s
@@ -2149,9 +2143,15 @@ async function httpNetworkFetch (
                   finishFlush: zlib.constants.Z_SYNC_FLUSH
                 }))
               } else if (coding === 'deflate') {
-                decoders.push(createInflate())
+                decoders.push(createInflate({
+                  flush: zlib.constants.Z_SYNC_FLUSH,
+                  finishFlush: zlib.constants.Z_SYNC_FLUSH
+                }))
               } else if (coding === 'br') {
-                decoders.push(zlib.createBrotliDecompress())
+                decoders.push(zlib.createBrotliDecompress({
+                  flush: zlib.constants.BROTLI_OPERATION_FLUSH,
+                  finishFlush: zlib.constants.BROTLI_OPERATION_FLUSH
+                }))
               } else {
                 decoders.length = 0
                 break
@@ -2159,13 +2159,19 @@ async function httpNetworkFetch (
             }
           }
 
+          const onError = this.onError.bind(this)
+
           resolve({
             status,
             statusText,
             headersList,
             body: decoders.length
-              ? pipeline(this.body, ...decoders, () => { })
-              : this.body.on('error', () => { })
+              ? pipeline(this.body, ...decoders, (err) => {
+                if (err) {
+                  this.onError(err)
+                }
+              }).on('error', onError)
+              : this.body.on('error', onError)
           })
 
           return true