@yanglaofish/fishtools 0.5.1 → 0.5.3

package/node_modules/undici/lib/web/fetch/response.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { Headers, HeadersList, fill, getHeadersGuard, setHeadersGuard, setHeadersList } = require('./headers')
-const { extractBody, cloneBody, mixinBody, streamRegistry, bodyUnusable } = require('./body')
+const { extractBody, cloneBody, mixinBody, hasFinalizationRegistry, streamRegistry, bodyUnusable } = require('./body')
 const util = require('../../core/util')
 const nodeUtil = require('node:util')
 const { kEnumerableProperty } = util
@@ -9,29 +9,28 @@ const {
   isValidReasonPhrase,
   isCancelled,
   isAborted,
+  isBlobLike,
+  serializeJavascriptValueToJSONString,
   isErrorLike,
+  isomorphicEncode,
   environmentSettingsObject: relevantRealm
 } = require('./util')
 const {
   redirectStatusSet,
   nullBodyStatus
 } = require('./constants')
-const { webidl } = require('../webidl')
+const { kState, kHeaders } = require('./symbols')
+const { webidl } = require('./webidl')
+const { FormData } = require('./formdata')
 const { URLSerializer } = require('./data-url')
 const { kConstruct } = require('../../core/symbols')
 const assert = require('node:assert')
-const { isomorphicEncode, serializeJavascriptValueToJSONString } = require('../infra')
+const { types } = require('node:util')
 
 const textEncoder = new TextEncoder('utf-8')
-let getResponseHeaders, setResponseHeaders, getResponseState, setResponseState
 
 // https://fetch.spec.whatwg.org/#response-class
 class Response {
-  /** @type {Headers} */
-  #headers
-
-  #state
-
   // Creates network error Response.
   static error () {
     // The static error() method steps are to return the result of creating a
@@ -43,10 +42,12 @@ class Response {
   }
 
   // https://fetch.spec.whatwg.org/#dom-response-json
-  static json (data, init = undefined) {
+  static json (data, init = {}) {
     webidl.argumentLengthCheck(arguments, 1, 'Response.json')
 
-    init = webidl.converters.ResponseInit(init)
+    if (init !== null) {
+      init = webidl.converters.ResponseInit(init)
+    }
 
     // 1. Let bytes the result of running serialize a JavaScript value to JSON bytes on data.
     const bytes = textEncoder.encode(
@@ -95,41 +96,40 @@ class Response {
     const responseObject = fromInnerResponse(makeResponse({}), 'immutable')
 
     // 5. Set responseObject’s response’s status to status.
-    responseObject.#state.status = status
+    responseObject[kState].status = status
 
     // 6. Let value be parsedURL, serialized and isomorphic encoded.
     const value = isomorphicEncode(URLSerializer(parsedURL))
 
     // 7. Append `Location`/value to responseObject’s response’s header list.
-    responseObject.#state.headersList.append('location', value, true)
+    responseObject[kState].headersList.append('location', value, true)
 
     // 8. Return responseObject.
     return responseObject
   }
 
   // https://fetch.spec.whatwg.org/#dom-response
-  constructor (body = null, init = undefined) {
+  constructor (body = null, init = {}) {
     webidl.util.markAsUncloneable(this)
-
     if (body === kConstruct) {
       return
     }
 
     if (body !== null) {
-      body = webidl.converters.BodyInit(body, 'Response', 'body')
+      body = webidl.converters.BodyInit(body)
     }
 
     init = webidl.converters.ResponseInit(init)
 
     // 1. Set this’s response to a new response.
-    this.#state = makeResponse({})
+    this[kState] = makeResponse({})
 
     // 2. Set this’s headers to a new Headers object with this’s relevant
     // Realm, whose header list is this’s response’s header list and guard
     // is "response".
-    this.#headers = new Headers(kConstruct)
-    setHeadersGuard(this.#headers, 'response')
-    setHeadersList(this.#headers, this.#state.headersList)
+    this[kHeaders] = new Headers(kConstruct)
+    setHeadersGuard(this[kHeaders], 'response')
+    setHeadersList(this[kHeaders], this[kState].headersList)
 
     // 3. Let bodyWithType be null.
     let bodyWithType = null
@@ -146,17 +146,17 @@ class Response {
 
   // Returns response’s type, e.g., "cors".
   get type () {
-    webidl.brandCheck(this, webidl.is.Response)
+    webidl.brandCheck(this, Response)
 
     // The type getter steps are to return this’s response’s type.
-    return this.#state.type
+    return this[kState].type
   }
 
   // Returns response’s URL, if it has one; otherwise the empty string.
   get url () {
-    webidl.brandCheck(this, webidl.is.Response)
+    webidl.brandCheck(this, Response)
 
-    const urlList = this.#state.urlList
+    const urlList = this[kState].urlList
 
     // The url getter steps are to return the empty string if this’s
     // response’s URL is null; otherwise this’s response’s URL,
@@ -172,65 +172,65 @@ class Response {
 
   // Returns whether response was obtained through a redirect.
   get redirected () {
-    webidl.brandCheck(this, webidl.is.Response)
+    webidl.brandCheck(this, Response)
 
     // The redirected getter steps are to return true if this’s response’s URL
     // list has more than one item; otherwise false.
-    return this.#state.urlList.length > 1
+    return this[kState].urlList.length > 1
   }
 
   // Returns response’s status.
   get status () {
-    webidl.brandCheck(this, webidl.is.Response)
+    webidl.brandCheck(this, Response)
 
     // The status getter steps are to return this’s response’s status.
-    return this.#state.status
+    return this[kState].status
   }
 
   // Returns whether response’s status is an ok status.
   get ok () {
-    webidl.brandCheck(this, webidl.is.Response)
+    webidl.brandCheck(this, Response)
 
     // The ok getter steps are to return true if this’s response’s status is an
     // ok status; otherwise false.
-    return this.#state.status >= 200 && this.#state.status <= 299
+    return this[kState].status >= 200 && this[kState].status <= 299
   }
 
   // Returns response’s status message.
   get statusText () {
-    webidl.brandCheck(this, webidl.is.Response)
+    webidl.brandCheck(this, Response)
 
     // The statusText getter steps are to return this’s response’s status
     // message.
-    return this.#state.statusText
+    return this[kState].statusText
   }
 
   // Returns response’s headers as Headers.
   get headers () {
-    webidl.brandCheck(this, webidl.is.Response)
+    webidl.brandCheck(this, Response)
 
     // The headers getter steps are to return this’s headers.
-    return this.#headers
+    return this[kHeaders]
   }
 
   get body () {
-    webidl.brandCheck(this, webidl.is.Response)
+    webidl.brandCheck(this, Response)
 
-    return this.#state.body ? this.#state.body.stream : null
+    return this[kState].body ? this[kState].body.stream : null
   }
 
   get bodyUsed () {
-    webidl.brandCheck(this, webidl.is.Response)
+    webidl.brandCheck(this, Response)
 
-    return !!this.#state.body && util.isDisturbed(this.#state.body.stream)
+    return !!this[kState].body && util.isDisturbed(this[kState].body.stream)
   }
 
   // Returns a clone of response.
   clone () {
-    webidl.brandCheck(this, webidl.is.Response)
+    webidl.brandCheck(this, Response)
 
     // 1. If this is unusable, then throw a TypeError.
-    if (bodyUnusable(this.#state)) {
+    if (bodyUnusable(this)) {
       throw webidl.errors.exception({
         header: 'Response.clone',
         message: 'Body has already been consumed.'
@@ -238,17 +238,16 @@ class Response {
     }
 
     // 2. Let clonedResponse be the result of cloning this’s response.
-    const clonedResponse = cloneResponse(this.#state)
+    const clonedResponse = cloneResponse(this[kState])
 
     // Note: To re-register because of a new stream.
-    // Don't set finalizers other than for fetch responses.
-    if (this.#state.urlList.length !== 0 && this.#state.body?.stream) {
-      streamRegistry.register(this, new WeakRef(this.#state.body.stream))
+    if (hasFinalizationRegistry && this[kState].body?.stream) {
+      streamRegistry.register(this, new WeakRef(this[kState].body.stream))
     }
 
     // 3. Return the result of creating a Response object, given
     // clonedResponse, this’s headers’s guard, and this’s relevant Realm.
-    return fromInnerResponse(clonedResponse, getHeadersGuard(this.#headers))
+    return fromInnerResponse(clonedResponse, getHeadersGuard(this[kHeaders]))
   }
 
   [nodeUtil.inspect.custom] (depth, options) {
@@ -272,45 +271,9 @@ class Response {
 
     return `Response ${nodeUtil.formatWithOptions(options, properties)}`
   }
-
-  static {
-    /**
-     * @param {Response} response
-     */
-    getResponseHeaders = (response) => {
-      return response.#headers
-    }
-
-    /**
-     * @param {Response} response
-     * @param {Headers} newHeaders
-     */
-    setResponseHeaders = (response, newHeaders) => {
-      response.#headers = newHeaders
-    }
-
-    /**
-     * @param {Response} response
-     */
-    getResponseState = (response) => {
-      return response.#state
-    }
-
-    /**
-     * @param {Response} response
-     * @param {any} newState
-     */
-    setResponseState = (response, newState) => {
-      response.#state = newState
-    }
-
-    webidl.is.Response = (arg) => {
-      return arg != null && typeof arg === 'object' && #state in arg
-    }
-  }
 }
 
-mixinBody(Response, getResponseState, webidl.is.Response)
+mixinBody(Response)
 
 Object.defineProperties(Response.prototype, {
   type: kEnumerableProperty,
@@ -355,7 +318,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) {
-    newResponse.body = cloneBody(response.body)
+    newResponse.body = cloneBody(newResponse, response.body)
   }
 
   // 4. Return newResponse.
@@ -453,7 +416,7 @@ function filterResponse (response, type) {
 
     return makeFilteredResponse(response, {
       type: 'opaque',
-      urlList: [],
+      urlList: Object.freeze([]),
       status: 0,
       statusText: '',
       body: null
@@ -507,17 +470,17 @@ function initializeResponse (response, init, body) {
 
   // 3. Set response’s response’s status to init["status"].
   if ('status' in init && init.status != null) {
-    getResponseState(response).status = init.status
+    response[kState].status = init.status
   }
 
   // 4. Set response’s response’s status message to init["statusText"].
   if ('statusText' in init && init.statusText != null) {
-    getResponseState(response).statusText = init.statusText
+    response[kState].statusText = init.statusText
   }
 
   // 5. If init["headers"] exists, then fill response’s headers with init["headers"].
   if ('headers' in init && init.headers != null) {
-    fill(getResponseHeaders(response), init.headers)
+    fill(response[kHeaders], init.headers)
   }
 
   // 6. If body was given, then:
@@ -531,12 +494,12 @@ function initializeResponse (response, init, body) {
     }
 
     // 2. Set response's body to body's body.
-    getResponseState(response).body = body.body
+    response[kState].body = body.body
 
     // 3. If body's type is non-null and response's header list does not contain
     //    `Content-Type`, then append (`Content-Type`, body's type) to response's header list.
-    if (body.type != null && !getResponseState(response).headersList.contains('content-type', true)) {
-      getResponseState(response).headersList.append('content-type', body.type, true)
+    if (body.type != null && !response[kState].headersList.contains('content-type', true)) {
+      response[kState].headersList.append('content-type', body.type, true)
     }
   }
 }
@@ -549,14 +512,12 @@ function initializeResponse (response, init, body) {
  */
 function fromInnerResponse (innerResponse, guard) {
   const response = new Response(kConstruct)
-  setResponseState(response, innerResponse)
-  const headers = new Headers(kConstruct)
-  setResponseHeaders(response, headers)
-  setHeadersList(headers, innerResponse.headersList)
-  setHeadersGuard(headers, guard)
-
-  // Note: If innerResponse's urlList contains a URL, it is a fetch response.
-  if (innerResponse.urlList.length !== 0 && innerResponse.body?.stream) {
+  response[kState] = innerResponse
+  response[kHeaders] = new Headers(kConstruct)
+  setHeadersList(response[kHeaders], innerResponse.headersList)
+  setHeadersGuard(response[kHeaders], guard)
+
+  if (hasFinalizationRegistry && innerResponse.body?.stream) {
     // If the target (response) is reclaimed, the cleanup callback may be called at some point with
     // the held value provided for it (innerResponse.body.stream). The held value can be any value:
     // a primitive or an object, even undefined. If the held value is an object, the registry keeps
@@ -568,26 +529,38 @@ 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 (webidl.is.Blob(V)) {
-    return V
+  if (isBlobLike(V)) {
+    return webidl.converters.Blob(V, prefix, name, { strict: false })
   }
 
-  if (webidl.is.BufferSource(V)) {
-    return V
+  if (ArrayBuffer.isView(V) || types.isArrayBuffer(V)) {
+    return webidl.converters.BufferSource(V, prefix, name)
   }
 
-  if (webidl.is.FormData(V)) {
-    return V
+  if (util.isFormDataLike(V)) {
+    return webidl.converters.FormData(V, prefix, name, { strict: false })
   }
 
-  if (webidl.is.URLSearchParams(V)) {
-    return V
+  if (V instanceof URLSearchParams) {
+    return webidl.converters.URLSearchParams(V, prefix, name)
   }
 
   return webidl.converters.DOMString(V, prefix, name)
@@ -595,8 +568,8 @@ webidl.converters.XMLHttpRequestBodyInit = function (V, prefix, name) {
 
 // https://fetch.spec.whatwg.org/#bodyinit
 webidl.converters.BodyInit = function (V, prefix, argument) {
-  if (webidl.is.ReadableStream(V)) {
-    return V
+  if (V instanceof ReadableStream) {
+    return webidl.converters.ReadableStream(V, prefix, argument)
   }
 
   // Note: the spec doesn't include async iterables,
@@ -633,6 +606,5 @@ module.exports = {
   filterResponse,
   Response,
   cloneResponse,
-  fromInnerResponse,
-  getResponseState
+  fromInnerResponse
 }

package/node_modules/undici/lib/web/fetch/symbols.js

@@ -0,0 +1,9 @@
+'use strict'
+
+module.exports = {
+  kUrl: Symbol('url'),
+  kHeaders: Symbol('headers'),
+  kSignal: Symbol('signal'),
+  kState: Symbol('state'),
+  kDispatcher: Symbol('dispatcher')
+}