undici 6.5.0 → 6.6.1

package/lib/fetch/response.js

@@ -23,8 +23,8 @@ const { FormData } = require('./formdata')
 const { getGlobalOrigin } = require('./global')
 const { URLSerializer } = require('./dataURL')
 const { kHeadersList, kConstruct } = require('../core/symbols')
-const assert = require('assert')
-const { types } = require('util')
+const assert = require('node:assert')
+const { types } = require('node:util')
 
 const textEncoder = new TextEncoder('utf-8')
 
@@ -38,13 +38,8 @@ class Response {
     // The static error() method steps are to return the result of creating a
     // Response object, given a new network error, "immutable", and this’s
     // relevant Realm.
-    const responseObject = new Response(kConstruct)
-    responseObject[kState] = makeNetworkError()
-    responseObject[kRealm] = relevantRealm
-    responseObject[kHeaders] = new Headers(kConstruct)
-    responseObject[kHeaders][kHeadersList] = responseObject[kState].headersList
-    responseObject[kHeaders][kGuard] = 'immutable'
-    responseObject[kHeaders][kRealm] = relevantRealm
+    const responseObject = fromInnerResponse(makeNetworkError(), 'immutable', relevantRealm)
+
     return responseObject
   }
 
@@ -67,13 +62,7 @@ class Response {
     // 3. Let responseObject be the result of creating a Response object, given a new response,
     //    "response", and this’s relevant Realm.
     const relevantRealm = { settingsObject: {} }
-    const responseObject = new Response(kConstruct)
-    responseObject[kState] = makeResponse({})
-    responseObject[kRealm] = relevantRealm
-    responseObject[kHeaders] = new Headers(kConstruct)
-    responseObject[kHeaders][kHeadersList] = responseObject[kState].headersList
-    responseObject[kHeaders][kGuard] = 'response'
-    responseObject[kHeaders][kRealm] = relevantRealm
+    const responseObject = fromInnerResponse(makeResponse({}), 'response', relevantRealm)
 
     // 4. Perform initialize a response given responseObject, init, and (body, "application/json").
     initializeResponse(responseObject, init, { body: body[0], type: 'application/json' })
@@ -99,25 +88,17 @@ class Response {
     try {
       parsedURL = new URL(url, getGlobalOrigin())
     } catch (err) {
-      throw Object.assign(new TypeError('Failed to parse URL from ' + url), {
-        cause: err
-      })
+      throw new TypeError(`Failed to parse URL from ${url}`, { cause: err })
     }
 
     // 3. If status is not a redirect status, then throw a RangeError.
     if (!redirectStatusSet.has(status)) {
-      throw new RangeError('Invalid status code ' + status)
+      throw new RangeError(`Invalid status code ${status}`)
     }
 
     // 4. Let responseObject be the result of creating a Response object,
     // given a new response, "immutable", and this’s relevant Realm.
-    const responseObject = new Response(kConstruct)
-    responseObject[kState] = makeResponse({})
-    responseObject[kRealm] = relevantRealm
-    responseObject[kHeaders] = new Headers(kConstruct)
-    responseObject[kHeaders][kHeadersList] = responseObject[kState].headersList
-    responseObject[kHeaders][kGuard] = 'immutable'
-    responseObject[kHeaders][kRealm] = relevantRealm
+    const responseObject = fromInnerResponse(makeResponse({}), 'immutable', relevantRealm)
 
     // 5. Set responseObject’s response’s status to status.
     responseObject[kState].status = status
@@ -257,7 +238,7 @@ class Response {
     webidl.brandCheck(this, Response)
 
     // 1. If this is unusable, then throw a TypeError.
-    if (this.bodyUsed || (this.body && this.body.locked)) {
+    if (this.bodyUsed || this.body?.locked) {
       throw webidl.errors.exception({
         header: 'Response.clone',
         message: 'Body has already been consumed.'
@@ -269,15 +250,7 @@ class Response {
 
     // 3. Return the result of creating a Response object, given
     // clonedResponse, this’s headers’s guard, and this’s relevant Realm.
-    const clonedResponseObject = new Response(kConstruct)
-    clonedResponseObject[kState] = clonedResponse
-    clonedResponseObject[kRealm] = this[kRealm]
-    clonedResponseObject[kHeaders] = new Headers(kConstruct)
-    clonedResponseObject[kHeaders][kHeadersList] = clonedResponse.headersList
-    clonedResponseObject[kHeaders][kGuard] = this[kHeaders][kGuard]
-    clonedResponseObject[kHeaders][kRealm] = this[kHeaders][kRealm]
-
-    return clonedResponseObject
+    return fromInnerResponse(clonedResponse, this[kHeaders][kGuard], this[kRealm])
   }
 }
 
@@ -497,7 +470,7 @@ function initializeResponse (response, init, body) {
     if (nullBodyStatus.includes(response.status)) {
       throw webidl.errors.exception({
         header: 'Response constructor',
-        message: 'Invalid response status code ' + response.status
+        message: `Invalid response status code ${response.status}`
       })
     }
 
@@ -512,6 +485,24 @@ function initializeResponse (response, init, body) {
   }
 }
 
+/**
+ * @see https://fetch.spec.whatwg.org/#response-create
+ * @param {any} innerResponse
+ * @param {'request' | 'immutable' | 'request-no-cors' | 'response' | 'none'} guard
+ * @param {any} [realm]
+ * @returns {Response}
+ */
+function fromInnerResponse (innerResponse, guard, realm) {
+  const response = new Response(kConstruct)
+  response[kState] = innerResponse
+  response[kRealm] = realm
+  response[kHeaders] = new Headers(kConstruct)
+  response[kHeaders][kHeadersList] = innerResponse.headersList
+  response[kHeaders][kGuard] = guard
+  response[kHeaders][kRealm] = realm
+  return response
+}
+
 webidl.converters.ReadableStream = webidl.interfaceConverter(
   ReadableStream
 )
@@ -588,5 +579,6 @@ module.exports = {
   makeAppropriateNetworkError,
   filterResponse,
   Response,
-  cloneResponse
+  cloneResponse,
+  fromInnerResponse
 }

package/lib/fetch/util.js

@@ -1,10 +1,13 @@
 'use strict'
 
+const { Transform } = require('node:stream')
+const zlib = require('node:zlib')
 const { redirectStatusSet, referrerPolicySet: referrerPolicyTokens, badPortsSet } = require('./constants')
 const { getGlobalOrigin } = require('./global')
-const { performance } = require('perf_hooks')
+const { collectASequenceOfCodePoints, collectAnHTTPQuotedString, removeChars, parseMIMEType } = require('./dataURL')
+const { performance } = require('node:perf_hooks')
 const { isBlobLike, toUSVString, ReadableStreamFrom, isValidHTTPToken } = require('../core/util')
-const assert = require('assert')
+const assert = require('node:assert')
 const { isUint8Array } = require('util/types')
 
 // https://nodejs.org/api/crypto.html#determining-if-crypto-support-is-unavailable
@@ -12,7 +15,7 @@ const { isUint8Array } = require('util/types')
 let crypto
 
 try {
-  crypto = require('crypto')
+  crypto = require('node:crypto')
 } catch {
 
 }
@@ -272,7 +275,7 @@ function coarsenTime (timestamp, crossOriginIsolatedCapability) {
 }
 
 // https://fetch.spec.whatwg.org/#clamp-and-coarsen-connection-timing-info
-function clampAndCoursenConnectionTimingInfo (connectionTimingInfo, defaultStartTime, crossOriginIsolatedCapability) {
+function clampAndCoarsenConnectionTimingInfo (connectionTimingInfo, defaultStartTime, crossOriginIsolatedCapability) {
   if (!connectionTimingInfo?.startTime || connectionTimingInfo.startTime < defaultStartTime) {
     return {
       domainLookupStartTime: defaultStartTime,
@@ -736,19 +739,23 @@ const esIteratorPrototype = Object.getPrototypeOf(Object.getPrototypeOf([][Symbo
 
 /**
  * @see https://webidl.spec.whatwg.org/#dfn-iterator-prototype-object
- * @param {() => unknown[]} iterator
+ * @param {() => unknown} iterator
  * @param {string} name name of the instance
  * @param {'key'|'value'|'key+value'} kind
+ * @param {string | number} [keyIndex]
+ * @param {string | number} [valueIndex]
  */
-function makeIterator (iterator, name, kind) {
+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)
 
-  const i = {
-    next () {
+  Object.defineProperty(iteratorObject, 'next', {
+    value: function next () {
       // 1. Let interface be the interface for which the iterator prototype object exists.
 
       // 2. Let thisValue be the this value.
@@ -760,7 +767,7 @@ function makeIterator (iterator, name, kind) {
 
       // 5. If object is not a default iterator object for interface,
       //    then throw a TypeError.
-      if (Object.getPrototypeOf(this) !== i) {
+      if (Object.getPrototypeOf(this) !== iteratorObject) {
         throw new TypeError(
           `'next' called on an object that does not implement interface ${name} Iterator.`
         )
@@ -780,68 +787,66 @@ function makeIterator (iterator, name, kind) {
       if (index >= len) {
         return { value: undefined, done: true }
       }
-
       // 11. Let pair be the entry in values at index index.
-      const pair = values[index]
-
+      const { [keyIndex]: key, [valueIndex]: value } = values[index]
       // 12. Set object’s index to index + 1.
       object.index = index + 1
-
       // 13. Return the iterator result for pair and kind.
-      return iteratorResult(pair, kind)
+      // https://webidl.spec.whatwg.org/#iterator-result
+      // 1. Let result be a value determined by the value of kind:
+      let result
+      switch (kind) {
+        case 'key':
+          // 1. Let idlKey be pair’s key.
+          // 2. Let key be the result of converting idlKey to an
+          //    ECMAScript value.
+          // 3. result is key.
+          result = key
+          break
+        case 'value':
+          // 1. Let idlValue be pair’s value.
+          // 2. Let value be the result of converting idlValue to
+          //    an ECMAScript value.
+          // 3. result is value.
+          result = value
+          break
+        case 'key+value':
+          // 1. Let idlKey be pair’s key.
+          // 2. Let idlValue be pair’s value.
+          // 3. Let key be the result of converting idlKey to an
+          //    ECMAScript value.
+          // 4. Let value be the result of converting idlValue to
+          //    an ECMAScript value.
+          // 5. Let array be ! ArrayCreate(2).
+          // 6. Call ! CreateDataProperty(array, "0", key).
+          // 7. Call ! CreateDataProperty(array, "1", value).
+          // 8. result is array.
+          result = [key, value]
+          break
+      }
+      // 2. Return CreateIterResultObject(result, false).
+      return {
+        value: result,
+        done: false
+      }
     },
-    // 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".
-    [Symbol.toStringTag]: `${name} Iterator`
-  }
-
-  // The [[Prototype]] internal slot of an iterator prototype object must be %IteratorPrototype%.
-  Object.setPrototypeOf(i, esIteratorPrototype)
-  // esIteratorPrototype needs to be the prototype of i
-  // which is the prototype of an empty object. Yes, it's confusing.
-  return Object.setPrototypeOf({}, i)
-}
+    writable: true,
+    enumerable: true,
+    configurable: true
+  })
 
-// https://webidl.spec.whatwg.org/#iterator-result
-function iteratorResult (pair, kind) {
-  let result
-
-  // 1. Let result be a value determined by the value of kind:
-  switch (kind) {
-    case 'key': {
-      // 1. Let idlKey be pair’s key.
-      // 2. Let key be the result of converting idlKey to an
-      //    ECMAScript value.
-      // 3. result is key.
-      result = pair[0]
-      break
-    }
-    case 'value': {
-      // 1. Let idlValue be pair’s value.
-      // 2. Let value be the result of converting idlValue to
-      //    an ECMAScript value.
-      // 3. result is value.
-      result = pair[1]
-      break
-    }
-    case 'key+value': {
-      // 1. Let idlKey be pair’s key.
-      // 2. Let idlValue be pair’s value.
-      // 3. Let key be the result of converting idlKey to an
-      //    ECMAScript value.
-      // 4. Let value be the result of converting idlValue to
-      //    an ECMAScript value.
-      // 5. Let array be ! ArrayCreate(2).
-      // 6. Call ! CreateDataProperty(array, "0", key).
-      // 7. Call ! CreateDataProperty(array, "1", value).
-      // 8. result is array.
-      result = pair
-      break
-    }
-  }
+  // 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
+  })
 
-  // 2. Return CreateIterResultObject(result, false).
-  return { value: result, done: false }
+  // esIteratorPrototype needs to be the prototype of iteratorObject
+  // which is the prototype of an empty object. Yes, it's confusing.
+  return Object.create(iteratorObject)
 }
 
 /**
@@ -887,29 +892,6 @@ function isReadableStreamLike (stream) {
   )
 }
 
-/**
- * @see https://infra.spec.whatwg.org/#isomorphic-decode
- * @param {Uint8Array} input
- */
-function isomorphicDecode (input) {
-  // 1. To isomorphic decode a byte sequence input, return a string whose code point
-  //    length is equal to input’s length and whose code points have the same values
-  //    as the values of input’s bytes, in the same order.
-  const length = input.length
-  if ((2 << 15) - 1 > length) {
-    return String.fromCharCode.apply(null, input)
-  }
-  let result = ''; let i = 0
-  let addition = (2 << 15) - 1
-  while (i < length) {
-    if (i + addition > length) {
-      addition = length - i
-    }
-    result += String.fromCharCode.apply(null, input.subarray(i, i += addition))
-  }
-  return result
-}
-
 /**
  * @param {ReadableStreamController<Uint8Array>} controller
  */
@@ -1007,18 +989,12 @@ function urlIsHttpHttpsScheme (url) {
   return protocol === 'http:' || protocol === 'https:'
 }
 
-/** @type {import('./dataURL')['collectASequenceOfCodePoints']} */
-let collectASequenceOfCodePoints
-
 /**
  * @see https://fetch.spec.whatwg.org/#simple-range-header-value
  * @param {string} value
  * @param {boolean} allowWhitespace
  */
 function simpleRangeHeaderValue (value, allowWhitespace) {
-  // Note: avoid circular require
-  collectASequenceOfCodePoints ??= require('./dataURL').collectASequenceOfCodePoints
-
   // 1. Let data be the isomorphic decoding of value.
   // Note: isomorphic decoding takes a sequence of bytes (ie. a Uint8Array) and turns it into a string,
   // nothing more. We obviously don't need to do that if value is a string already.
@@ -1174,6 +1150,191 @@ function buildContentRange (rangeStart, rangeEnd, fullLength) {
   return contentRange
 }
 
+// A Stream, which pipes the response to zlib.createInflate() or
+// zlib.createInflateRaw() depending on the first byte of the Buffer.
+// If the lower byte of the first byte is 0x08, then the stream is
+// interpreted as a zlib stream, otherwise it's interpreted as a
+// raw deflate stream.
+class InflateStream extends Transform {
+  _transform (chunk, encoding, callback) {
+    if (!this._inflateStream) {
+      if (chunk.length === 0) {
+        callback()
+        return
+      }
+      this._inflateStream = (chunk[0] & 0x0F) === 0x08
+        ? zlib.createInflate()
+        : zlib.createInflateRaw()
+
+      this._inflateStream.on('data', this.push.bind(this))
+      this._inflateStream.on('end', () => this.push(null))
+      this._inflateStream.on('error', (err) => this.destroy(err))
+    }
+
+    this._inflateStream.write(chunk, encoding, callback)
+  }
+
+  _final (callback) {
+    if (this._inflateStream) {
+      this._inflateStream.end()
+      this._inflateStream = null
+    }
+    callback()
+  }
+}
+
+function createInflate () {
+  return new InflateStream()
+}
+
+/**
+ * @see https://fetch.spec.whatwg.org/#concept-header-extract-mime-type
+ * @param {import('./headers').HeadersList} headers
+ */
+function extractMimeType (headers) {
+  // 1. Let charset be null.
+  let charset = null
+
+  // 2. Let essence be null.
+  let essence = null
+
+  // 3. Let mimeType be null.
+  let mimeType = null
+
+  // 4. Let values be the result of getting, decoding, and splitting `Content-Type` from headers.
+  const values = getDecodeSplit('content-type', headers)
+
+  // 5. If values is null, then return failure.
+  if (values === null) {
+    return 'failure'
+  }
+
+  // 6. For each value of values:
+  for (const value of values) {
+    // 6.1. Let temporaryMimeType be the result of parsing value.
+    const temporaryMimeType = parseMIMEType(value)
+
+    // 6.2. If temporaryMimeType is failure or its essence is "*/*", then continue.
+    if (temporaryMimeType === 'failure' || temporaryMimeType.essence === '*/*') {
+      continue
+    }
+
+    // 6.3. Set mimeType to temporaryMimeType.
+    mimeType = temporaryMimeType
+
+    // 6.4. If mimeType’s essence is not essence, then:
+    if (mimeType.essence !== essence) {
+      // 6.4.1. Set charset to null.
+      charset = null
+
+      // 6.4.2. If mimeType’s parameters["charset"] exists, then set charset to
+      //        mimeType’s parameters["charset"].
+      if (mimeType.parameters.has('charset')) {
+        charset = mimeType.parameters.get('charset')
+      }
+
+      // 6.4.3. Set essence to mimeType’s essence.
+      essence = mimeType.essence
+    } else if (!mimeType.parameters.has('charset') && charset !== null) {
+      // 6.5. Otherwise, if mimeType’s parameters["charset"] does not exist, and
+      //      charset is non-null, set mimeType’s parameters["charset"] to charset.
+      mimeType.parameters.set('charset', charset)
+    }
+  }
+
+  // 7. If mimeType is null, then return failure.
+  if (mimeType == null) {
+    return 'failure'
+  }
+
+  // 8. Return mimeType.
+  return mimeType
+}
+
+/**
+ * @see https://fetch.spec.whatwg.org/#header-value-get-decode-and-split
+ * @param {string|null} value
+ */
+function gettingDecodingSplitting (value) {
+  // 1. Let input be the result of isomorphic decoding value.
+  const input = value
+
+  // 2. Let position be a position variable for input, initially pointing at the start of input.
+  const position = { position: 0 }
+
+  // 3. Let values be a list of strings, initially empty.
+  const values = []
+
+  // 4. Let temporaryValue be the empty string.
+  let temporaryValue = ''
+
+  // 5. While position is not past the end of input:
+  while (position.position < input.length) {
+    // 5.1. Append the result of collecting a sequence of code points that are not U+0022 (")
+    //      or U+002C (,) from input, given position, to temporaryValue.
+    temporaryValue += collectASequenceOfCodePoints(
+      (char) => char !== '"' && char !== ',',
+      input,
+      position
+    )
+
+    // 5.2. If position is not past the end of input, then:
+    if (position.position < input.length) {
+      // 5.2.1. If the code point at position within input is U+0022 ("), then:
+      if (input.charCodeAt(position.position) === 0x22) {
+        // 5.2.1.1. Append the result of collecting an HTTP quoted string from input, given position, to temporaryValue.
+        temporaryValue += collectAnHTTPQuotedString(
+          input,
+          position
+        )
+
+        // 5.2.1.2. If position is not past the end of input, then continue.
+        if (position.position < input.length) {
+          continue
+        }
+      } else {
+        // 5.2.2. Otherwise:
+
+        // 5.2.2.1. Assert: the code point at position within input is U+002C (,).
+        assert(input.charCodeAt(position.position) === 0x2C)
+
+        // 5.2.2.2. Advance position by 1.
+        position.position++
+      }
+    }
+
+    // 5.3. Remove all HTTP tab or space from the start and end of temporaryValue.
+    temporaryValue = removeChars(temporaryValue, true, true, (char) => char === 0x9 || char === 0x20)
+
+    // 5.4. Append temporaryValue to values.
+    values.push(temporaryValue)
+
+    // 5.6. Set temporaryValue to the empty string.
+    temporaryValue = ''
+  }
+
+  // 6. Return values.
+  return values
+}
+
+/**
+ * @see https://fetch.spec.whatwg.org/#concept-header-list-get-decode-split
+ * @param {string} name lowercase header name
+ * @param {import('./headers').HeadersList} list
+ */
+function getDecodeSplit (name, list) {
+  // 1. Let value be the result of getting name from list.
+  const value = list.get(name, true)
+
+  // 2. If value is null, then return null.
+  if (value === null) {
+    return null
+  }
+
+  // 3. Return the result of getting, decoding, and splitting value.
+  return gettingDecodingSplitting(value)
+}
+
 module.exports = {
   isAborted,
   isCancelled,
@@ -1181,7 +1342,7 @@ module.exports = {
   ReadableStreamFrom,
   toUSVString,
   tryUpgradeRequestToAPotentiallyTrustworthyURL,
-  clampAndCoursenConnectionTimingInfo,
+  clampAndCoarsenConnectionTimingInfo,
   coarsenedSharedCurrentTime,
   determineRequestsReferrer,
   makePolicyContainer,
@@ -1213,7 +1374,6 @@ module.exports = {
   isReadableStreamLike,
   readableStreamClose,
   isomorphicEncode,
-  isomorphicDecode,
   urlIsLocal,
   urlHasHttpsScheme,
   urlIsHttpHttpsScheme,
@@ -1221,5 +1381,7 @@ module.exports = {
   normalizeMethodRecord,
   simpleRangeHeaderValue,
   buildContentRange,
-  parseMetadata
+  parseMetadata,
+  createInflate,
+  extractMimeType
 }

package/lib/fetch/webidl.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { types } = require('util')
+const { types } = require('node:util')
 const { toUSVString } = require('./util')
 
 /** @type {import('../../types/webidl').Webidl} */

package/lib/fileapi/util.js

@@ -10,9 +10,9 @@ const {
 const { ProgressEvent } = require('./progressevent')
 const { getEncoding } = require('./encoding')
 const { serializeAMimeType, parseMIMEType } = require('../fetch/dataURL')
-const { types } = require('util')
+const { types } = require('node:util')
 const { StringDecoder } = require('string_decoder')
-const { btoa } = require('buffer')
+const { btoa } = require('node:buffer')
 
 /** @type {PropertyDescriptor} */
 const staticPropertyDescriptors = {

package/lib/handler/RedirectHandler.js

@@ -2,9 +2,9 @@
 
 const util = require('../core/util')
 const { kBodyUsed } = require('../core/symbols')
-const assert = require('assert')
+const assert = require('node:assert')
 const { InvalidArgumentError } = require('../core/errors')
-const EE = require('events')
+const EE = require('node:events')
 
 const redirectableStatusCodes = [300, 301, 302, 303, 307, 308]
 

package/lib/handler/RetryHandler.js

@@ -1,4 +1,4 @@
-const assert = require('assert')
+const assert = require('node:assert')
 
 const { kRetryHandlerDefaultRetry } = require('../core/symbols')
 const { RequestRetryError } = require('../core/errors')
@@ -148,10 +148,10 @@ class RetryHandler {
       return
     }
 
-    let retryAfterHeader = headers != null && headers['retry-after']
+    let retryAfterHeader = headers?.['retry-after']
     if (retryAfterHeader) {
       retryAfterHeader = Number(retryAfterHeader)
-      retryAfterHeader = isNaN(retryAfterHeader)
+      retryAfterHeader = Number.isNaN(retryAfterHeader)
         ? calculateRetryAfterHeader(retryAfterHeader)
         : retryAfterHeader * 1e3 // Retry-After is in seconds
     }