undici 6.19.8 → 7.0.0-alpha.1

package/lib/web/fetch/formdata-parser.js

@@ -3,7 +3,6 @@
 const { isUSVString, bufferToLowerCasedHeaderName } = require('../../core/util')
 const { utf8DecodeBytes } = require('./util')
 const { HTTP_TOKEN_CODEPOINTS, isomorphicDecode } = require('./data-url')
-const { isFileLike } = require('./file')
 const { makeEntry } = require('./formdata')
 const assert = require('node:assert')
 const { File: NodeFile } = require('node:buffer')
@@ -195,7 +194,7 @@ function multipartFormDataParser (input, mimeType) {
 
     // 5.12. Assert: name is a scalar value string and value is either a scalar value string or a File object.
     assert(isUSVString(name))
-    assert((typeof value === 'string' && isUSVString(value)) || isFileLike(value))
+    assert((typeof value === 'string' && isUSVString(value)) || value instanceof File)
 
     // 5.13. Create an entry with name and value, and append it to entry list.
     entryList.push(makeEntry(name, value, filename))

package/lib/web/fetch/formdata.js

@@ -1,9 +1,8 @@
 'use strict'
 
-const { isBlobLike, iteratorMixin } = require('./util')
+const { iteratorMixin } = require('./util')
 const { kState } = require('./symbols')
 const { kEnumerableProperty } = require('../../core/util')
-const { FileLike, isFileLike } = require('./file')
 const { webidl } = require('./webidl')
 const { File: NativeFile } = require('node:buffer')
 const nodeUtil = require('node:util')
@@ -31,22 +30,20 @@ class FormData {
     const prefix = 'FormData.append'
     webidl.argumentLengthCheck(arguments, 2, prefix)
 
-    if (arguments.length === 3 && !isBlobLike(value)) {
-      throw new TypeError(
-        "Failed to execute 'append' on 'FormData': parameter 2 is not of type 'Blob'"
-      )
+    name = webidl.converters.USVString(name)
+
+    if (arguments.length === 3 || value instanceof Blob) {
+      value = webidl.converters.Blob(value, prefix, 'value')
+
+      if (filename !== undefined) {
+        filename = webidl.converters.USVString(filename)
+      }
+    } else {
+      value = webidl.converters.USVString(value)
     }
 
     // 1. Let value be value if given; otherwise blobValue.
 
-    name = webidl.converters.USVString(name, prefix, 'name')
-    value = isBlobLike(value)
-      ? webidl.converters.Blob(value, prefix, 'value', { strict: false })
-      : webidl.converters.USVString(value, prefix, 'value')
-    filename = arguments.length === 3
-      ? webidl.converters.USVString(filename, prefix, 'filename')
-      : undefined
-
     // 2. Let entry be the result of creating an entry with
     // name, value, and filename if given.
     const entry = makeEntry(name, value, filename)
@@ -61,7 +58,7 @@ class FormData {
     const prefix = 'FormData.delete'
     webidl.argumentLengthCheck(arguments, 1, prefix)
 
-    name = webidl.converters.USVString(name, prefix, 'name')
+    name = webidl.converters.USVString(name)
 
     // The delete(name) method steps are to remove all entries whose name
     // is name from this’s entry list.
@@ -74,7 +71,7 @@ class FormData {
     const prefix = 'FormData.get'
     webidl.argumentLengthCheck(arguments, 1, prefix)
 
-    name = webidl.converters.USVString(name, prefix, 'name')
+    name = webidl.converters.USVString(name)
 
     // 1. If there is no entry whose name is name in this’s entry list,
     // then return null.
@@ -94,7 +91,7 @@ class FormData {
     const prefix = 'FormData.getAll'
     webidl.argumentLengthCheck(arguments, 1, prefix)
 
-    name = webidl.converters.USVString(name, prefix, 'name')
+    name = webidl.converters.USVString(name)
 
     // 1. If there is no entry whose name is name in this’s entry list,
     // then return the empty list.
@@ -111,7 +108,7 @@ class FormData {
     const prefix = 'FormData.has'
     webidl.argumentLengthCheck(arguments, 1, prefix)
 
-    name = webidl.converters.USVString(name, prefix, 'name')
+    name = webidl.converters.USVString(name)
 
     // The has(name) method steps are to return true if there is an entry
     // whose name is name in this’s entry list; otherwise false.
@@ -124,10 +121,16 @@ class FormData {
     const prefix = 'FormData.set'
     webidl.argumentLengthCheck(arguments, 2, prefix)
 
-    if (arguments.length === 3 && !isBlobLike(value)) {
-      throw new TypeError(
-        "Failed to execute 'set' on 'FormData': parameter 2 is not of type 'Blob'"
-      )
+    name = webidl.converters.USVString(name)
+
+    if (arguments.length === 3 || value instanceof Blob) {
+      value = webidl.converters.Blob(value, prefix, 'value')
+
+      if (filename !== undefined) {
+        filename = webidl.converters.USVString(filename)
+      }
+    } else {
+      value = webidl.converters.USVString(value)
     }
 
     // The set(name, value) and set(name, blobValue, filename) method steps
@@ -135,14 +138,6 @@ class FormData {
 
     // 1. Let value be value if given; otherwise blobValue.
 
-    name = webidl.converters.USVString(name, prefix, 'name')
-    value = isBlobLike(value)
-      ? webidl.converters.Blob(value, prefix, 'name', { strict: false })
-      : webidl.converters.USVString(value, prefix, 'name')
-    filename = arguments.length === 3
-      ? webidl.converters.USVString(filename, prefix, 'name')
-      : undefined
-
     // 2. Let entry be the result of creating an entry with name, value, and
     // filename if given.
     const entry = makeEntry(name, value, filename)
@@ -222,10 +217,8 @@ function makeEntry (name, value, filename) {
 
     // 1. If value is not a File object, then set value to a new File object,
     //    representing the same bytes, whose name attribute value is "blob"
-    if (!isFileLike(value)) {
-      value = value instanceof Blob
-        ? new File([value], 'blob', { type: value.type })
-        : new FileLike(value, 'blob', { type: value.type })
+    if (!(value instanceof File)) {
+      value = new File([value], 'blob', { type: value.type })
     }
 
     // 2. If filename is given, then set value to a new File object,
@@ -237,9 +230,7 @@ function makeEntry (name, value, filename) {
         lastModified: value.lastModified
       }
 
-      value = value instanceof NativeFile
-        ? new File([value], filename, options)
-        : new FileLike(value, filename, options)
+      value = new File([value], filename, options)
     }
   }
 

package/lib/web/fetch/headers.js

@@ -645,7 +645,7 @@ Object.defineProperties(Headers.prototype, {
 })
 
 webidl.converters.HeadersInit = function (V, prefix, argument) {
-  if (webidl.util.Type(V) === 'Object') {
+  if (webidl.util.Type(V) === webidl.util.Types.OBJECT) {
     const iterator = Reflect.get(V, Symbol.iterator)
 
     // A work-around to ensure we send the properly-cased Headers when V is a Headers object.

package/lib/web/fetch/index.js

@@ -30,7 +30,6 @@ const {
   determineRequestsReferrer,
   coarsenedSharedCurrentTime,
   createDeferredPromise,
-  isBlobLike,
   sameOrigin,
   isCancelled,
   isAborted,
@@ -58,8 +57,8 @@ const {
   subresourceSet
 } = require('./constants')
 const EE = require('node:events')
-const { Readable, pipeline, finished } = require('node:stream')
-const { addAbortListener, isErrored, isReadable, bufferToLowerCasedHeaderName } = require('../../core/util')
+const { Readable, pipeline, finished, isErrored, isReadable } = require('node:stream')
+const { addAbortListener, bufferToLowerCasedHeaderName } = require('../../core/util')
 const { dataURLProcessor, serializeAMimeType, minimizeSupportedMimeType } = require('./data-url')
 const { getGlobalDispatcher } = require('../../global')
 const { webidl } = require('./webidl')
@@ -327,7 +326,7 @@ function abortFetch (p, request, responseObject, error) {
 
   // 2. If request’s body is not null and is readable, then cancel request’s
   // body with error.
-  if (request.body != null && isReadable(request.body?.stream)) {
+  if (request.body?.stream != null && isReadable(request.body.stream)) {
     request.body.stream.cancel(error).catch((err) => {
       if (err.code === 'ERR_INVALID_STATE') {
         // Node bug?
@@ -347,7 +346,7 @@ function abortFetch (p, request, responseObject, error) {
 
   // 5. If response’s body is not null and is readable, then error response’s
   // body with error.
-  if (response.body != null && isReadable(response.body?.stream)) {
+  if (response.body?.stream != null && isReadable(response.body.stream)) {
     response.body.stream.cancel(error).catch((err) => {
       if (err.code === 'ERR_INVALID_STATE') {
         // Node bug?
@@ -810,7 +809,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' || !isBlobLike(blob)) {
+      if (request.method !== 'GET' || !(blob instanceof Blob)) {
         return Promise.resolve(makeNetworkError('invalid method'))
       }
 
@@ -1460,7 +1459,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', defaultUserAgent)
+    httpRequest.headersList.append('user-agent', defaultUserAgent, true)
   }
 
   //    15. If httpRequest’s cache mode is "default" and httpRequest’s header
@@ -2137,7 +2136,7 @@ async function httpNetworkFetch (
 
           // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Encoding
           if (codings.length !== 0 && request.method !== 'HEAD' && request.method !== 'CONNECT' && !nullBodyStatus.includes(status) && !willFollow) {
-            for (let i = 0; i < codings.length; ++i) {
+            for (let i = codings.length - 1; i >= 0; --i) {
               const coding = codings[i]
               // https://www.rfc-editor.org/rfc/rfc9112.html#section-7.2
               if (coding === 'x-gzip' || coding === 'gzip') {

package/lib/web/fetch/request.js

@@ -28,7 +28,7 @@ const { webidl } = require('./webidl')
 const { URLSerializer } = require('./data-url')
 const { kConstruct } = require('../../core/symbols')
 const assert = require('node:assert')
-const { getMaxListeners, setMaxListeners, getEventListeners, defaultMaxListeners } = require('node:events')
+const { getMaxListeners, setMaxListeners, defaultMaxListeners } = require('node:events')
 
 const kAbortController = Symbol('abortController')
 
@@ -81,7 +81,7 @@ let patchMethodWarning = false
 // https://fetch.spec.whatwg.org/#request-class
 class Request {
   // https://fetch.spec.whatwg.org/#dom-request
-  constructor (input, init = {}) {
+  constructor (input, init = undefined) {
     if (input === kConstruct) {
       return
     }
@@ -400,16 +400,6 @@ class Request {
 
     // 29. If signal is not null, then make this’s signal follow signal.
     if (signal != null) {
-      if (
-        !signal ||
-        typeof signal.aborted !== 'boolean' ||
-        typeof signal.addEventListener !== 'function'
-      ) {
-        throw new TypeError(
-          "Failed to construct 'Request': member signal is not of type AbortSignal."
-        )
-      }
-
       if (signal.aborted) {
         ac.abort(signal.reason)
       } else {
@@ -429,8 +419,6 @@ class Request {
           // This is only available in node >= v19.9.0
           if (typeof getMaxListeners === 'function' && getMaxListeners(signal) === defaultMaxListeners) {
             setMaxListeners(1500, signal)
-          } else if (getEventListeners(signal, 'abort').length >= defaultMaxListeners) {
-            setMaxListeners(1500, signal)
           }
         } catch {}
 
@@ -522,7 +510,7 @@ class Request {
       // not contain `Content-Type`, then append `Content-Type`/Content-Type to
       // this’s headers.
       if (contentType && !getHeadersList(this[kHeaders]).contains('content-type', true)) {
-        this[kHeaders].append('content-type', contentType)
+        this[kHeaders].append('content-type', contentType, true)
       }
     }
 
@@ -928,21 +916,17 @@ Object.defineProperties(Request.prototype, {
   }
 })
 
-webidl.converters.Request = webidl.interfaceConverter(
-  Request
-)
-
 // https://fetch.spec.whatwg.org/#requestinfo
 webidl.converters.RequestInfo = function (V, prefix, argument) {
   if (typeof V === 'string') {
-    return webidl.converters.USVString(V, prefix, argument)
+    return webidl.converters.USVString(V)
   }
 
   if (V instanceof Request) {
-    return webidl.converters.Request(V, prefix, argument)
+    return V
   }
 
-  return webidl.converters.USVString(V, prefix, argument)
+  return webidl.converters.USVString(V)
 }
 
 webidl.converters.AbortSignal = webidl.interfaceConverter(
@@ -1013,8 +997,7 @@ webidl.converters.RequestInit = webidl.dictionaryConverter([
       (signal) => webidl.converters.AbortSignal(
         signal,
         'RequestInit',
-        'signal',
-        { strict: false }
+        'signal'
       )
     )
   },

package/lib/web/fetch/response.js

@@ -9,7 +9,6 @@ const {
   isValidReasonPhrase,
   isCancelled,
   isAborted,
-  isBlobLike,
   serializeJavascriptValueToJSONString,
   isErrorLike,
   isomorphicEncode,
@@ -42,7 +41,7 @@ class Response {
   }
 
   // https://fetch.spec.whatwg.org/#dom-response-json
-  static json (data, init = {}) {
+  static json (data, init = undefined) {
     webidl.argumentLengthCheck(arguments, 1, 'Response.json')
 
     if (init !== null) {
@@ -109,7 +108,7 @@ class Response {
   }
 
   // https://fetch.spec.whatwg.org/#dom-response
-  constructor (body = null, init = {}) {
+  constructor (body = null, init = undefined) {
     if (body === kConstruct) {
       return
     }
@@ -523,38 +522,26 @@ function fromInnerResponse (innerResponse, guard) {
   return response
 }
 
-webidl.converters.ReadableStream = webidl.interfaceConverter(
-  ReadableStream
-)
-
-webidl.converters.FormData = webidl.interfaceConverter(
-  FormData
-)
-
-webidl.converters.URLSearchParams = webidl.interfaceConverter(
-  URLSearchParams
-)
-
 // https://fetch.spec.whatwg.org/#typedefdef-xmlhttprequestbodyinit
 webidl.converters.XMLHttpRequestBodyInit = function (V, prefix, name) {
   if (typeof V === 'string') {
     return webidl.converters.USVString(V, prefix, name)
   }
 
-  if (isBlobLike(V)) {
-    return webidl.converters.Blob(V, prefix, name, { strict: false })
+  if (V instanceof Blob) {
+    return V
   }
 
   if (ArrayBuffer.isView(V) || types.isArrayBuffer(V)) {
-    return webidl.converters.BufferSource(V, prefix, name)
+    return V
   }
 
-  if (util.isFormDataLike(V)) {
-    return webidl.converters.FormData(V, prefix, name, { strict: false })
+  if (V instanceof FormData) {
+    return V
   }
 
   if (V instanceof URLSearchParams) {
-    return webidl.converters.URLSearchParams(V, prefix, name)
+    return V
   }
 
   return webidl.converters.DOMString(V, prefix, name)
@@ -563,7 +550,7 @@ webidl.converters.XMLHttpRequestBodyInit = function (V, prefix, name) {
 // https://fetch.spec.whatwg.org/#bodyinit
 webidl.converters.BodyInit = function (V, prefix, argument) {
   if (V instanceof ReadableStream) {
-    return webidl.converters.ReadableStream(V, prefix, argument)
+    return V
   }
 
   // Note: the spec doesn't include async iterables,

package/lib/web/fetch/symbols.js

@@ -1,7 +1,6 @@
 'use strict'
 
 module.exports = {
-  kUrl: Symbol('url'),
   kHeaders: Symbol('headers'),
   kSignal: Symbol('signal'),
   kState: Symbol('state'),

package/lib/web/fetch/util.js

@@ -6,7 +6,7 @@ const { redirectStatusSet, referrerPolicySet: referrerPolicyTokens, badPortsSet
 const { getGlobalOrigin } = require('./global')
 const { collectASequenceOfCodePoints, collectAnHTTPQuotedString, removeChars, parseMIMEType } = require('./data-url')
 const { performance } = require('node:perf_hooks')
-const { isBlobLike, ReadableStreamFrom, isValidHTTPToken, normalizedMethodRecordsBase } = require('../../core/util')
+const { ReadableStreamFrom, isValidHTTPToken, normalizedMethodRecordsBase } = require('../../core/util')
 const assert = require('node:assert')
 const { isUint8Array } = require('node:util/types')
 const { webidl } = require('./webidl')
@@ -449,7 +449,7 @@ function determineRequestsReferrer (request) {
       // 3. Return referrerOrigin.
       return referrerOrigin
     }
-    case 'strict-origin': // eslint-disable-line
+    case 'strict-origin':
       /**
          * 1. If referrerURL is a potentially trustworthy URL and
          * request’s current URL is not a potentially trustworthy URL,
@@ -472,7 +472,7 @@ function determineRequestsReferrer (request) {
 /**
  * @see https://w3c.github.io/webappsec-referrer-policy/#strip-url
  * @param {URL} url
- * @param {boolean|undefined} originOnly
+ * @param {boolean} [originOnly]
  */
 function stripURLForReferrer (url, originOnly) {
   // 1. Assert: url is a URL.
@@ -1061,13 +1061,6 @@ async function fullyReadBody (body, processBody, processBodyError) {
   }
 }
 
-function isReadableStreamLike (stream) {
-  return stream instanceof ReadableStream || (
-    stream[Symbol.toStringTag] === 'ReadableStream' &&
-    typeof stream.tee === 'function'
-  )
-}
-
 /**
  * @param {ReadableStreamController<Uint8Array>} controller
  */
@@ -1589,7 +1582,6 @@ module.exports = {
   requestCurrentURL,
   responseURL,
   responseLocationURL,
-  isBlobLike,
   isURLPotentiallyTrustworthy,
   isValidReasonPhrase,
   sameOrigin,
@@ -1602,7 +1594,6 @@ module.exports = {
   isErrorLike,
   fullyReadBody,
   bytesMatch,
-  isReadableStreamLike,
   readableStreamClose,
   isomorphicEncode,
   urlIsLocal,