@yanglaofish/fishtools 0.5.2 → 0.5.3

package/node_modules/undici/lib/web/cache/cache.js

@@ -1,22 +1,23 @@
 'use strict'
 
-const assert = require('node:assert')
-
-const { kConstruct } = require('../../core/symbols')
+const { kConstruct } = require('./symbols')
 const { urlEquals, getFieldValues } = require('./util')
 const { kEnumerableProperty, isDisturbed } = require('../../core/util')
-const { webidl } = require('../webidl')
-const { cloneResponse, fromInnerResponse, getResponseState } = require('../fetch/response')
-const { Request, fromInnerRequest, getRequestState } = require('../fetch/request')
+const { webidl } = require('../fetch/webidl')
+const { Response, cloneResponse, fromInnerResponse } = require('../fetch/response')
+const { Request, fromInnerRequest } = require('../fetch/request')
+const { kState } = require('../fetch/symbols')
 const { fetching } = require('../fetch/index')
-const { urlIsHttpHttpsScheme, readAllBytes } = require('../fetch/util')
+const { urlIsHttpHttpsScheme, createDeferredPromise, readAllBytes } = require('../fetch/util')
+const assert = require('node:assert')
+
 /**
  * @see https://w3c.github.io/ServiceWorker/#dfn-cache-batch-operation
  * @typedef {Object} CacheBatchOperation
  * @property {'delete' | 'put'} type
  * @property {any} request
  * @property {any} response
- * @property {import('../../../types/cache').CacheQueryOptions} options
+ * @property {import('../../types/cache').CacheQueryOptions} options
  */
 
 /**
@@ -41,12 +42,12 @@ class Cache {
   }
 
   async match (request, options = {}) {
-    webidl.brandCheck(this, webidl.is.Cache)
+    webidl.brandCheck(this, Cache)
 
     const prefix = 'Cache.match'
     webidl.argumentLengthCheck(arguments, 1, prefix)
 
-    request = webidl.converters.RequestInfo(request)
+    request = webidl.converters.RequestInfo(request, prefix, 'request')
     options = webidl.converters.CacheQueryOptions(options, prefix, 'options')
 
     const p = this.#internalMatchAll(request, options, 1)
@@ -59,22 +60,22 @@ class Cache {
   }
 
   async matchAll (request = undefined, options = {}) {
-    webidl.brandCheck(this, webidl.is.Cache)
+    webidl.brandCheck(this, Cache)
 
     const prefix = 'Cache.matchAll'
-    if (request !== undefined) request = webidl.converters.RequestInfo(request)
+    if (request !== undefined) request = webidl.converters.RequestInfo(request, prefix, 'request')
     options = webidl.converters.CacheQueryOptions(options, prefix, 'options')
 
     return this.#internalMatchAll(request, options)
   }
 
   async add (request) {
-    webidl.brandCheck(this, webidl.is.Cache)
+    webidl.brandCheck(this, Cache)
 
     const prefix = 'Cache.add'
     webidl.argumentLengthCheck(arguments, 1, prefix)
 
-    request = webidl.converters.RequestInfo(request)
+    request = webidl.converters.RequestInfo(request, prefix, 'request')
 
     // 1.
     const requests = [request]
@@ -87,7 +88,7 @@ class Cache {
   }
 
   async addAll (requests) {
-    webidl.brandCheck(this, webidl.is.Cache)
+    webidl.brandCheck(this, Cache)
 
     const prefix = 'Cache.addAll'
     webidl.argumentLengthCheck(arguments, 1, prefix)
@@ -115,7 +116,7 @@ class Cache {
       }
 
       // 3.1
-      const r = getRequestState(request)
+      const r = request[kState]
 
       // 3.2
       if (!urlIsHttpHttpsScheme(r.url) || r.method !== 'GET') {
@@ -133,7 +134,7 @@ class Cache {
     // 5.
     for (const request of requests) {
       // 5.1
-      const r = getRequestState(new Request(request))
+      const r = new Request(request)[kState]
 
       // 5.2
       if (!urlIsHttpHttpsScheme(r.url)) {
@@ -151,7 +152,7 @@ class Cache {
       requestList.push(r)
 
       // 5.6
-      const responsePromise = Promise.withResolvers()
+      const responsePromise = createDeferredPromise()
 
       // 5.7
       fetchControllers.push(fetching({
@@ -185,10 +186,7 @@ class Cache {
             }
           }
         },
-        // Possible spec bug. If the body is never read, `processResponseEndOfBody` (which is attached to a TransformStream's flush hook)
-        // never runs, so this would hang. This hook, on the other hand, always reads the body.
-        // https://github.com/nodejs/undici/issues/5615
-        processResponseConsumeBody (response) {
+        processResponseEndOfBody (response) {
           // 1.
           if (response.aborted) {
             responsePromise.reject(new DOMException('aborted', 'AbortError'))
@@ -232,7 +230,7 @@ class Cache {
     }
 
     // 7.5
-    const cacheJobPromise = Promise.withResolvers()
+    const cacheJobPromise = createDeferredPromise()
 
     // 7.6.1
     let errorData = null
@@ -260,22 +258,22 @@ class Cache {
   }
 
   async put (request, response) {
-    webidl.brandCheck(this, webidl.is.Cache)
+    webidl.brandCheck(this, Cache)
 
     const prefix = 'Cache.put'
     webidl.argumentLengthCheck(arguments, 2, prefix)
 
-    request = webidl.converters.RequestInfo(request)
+    request = webidl.converters.RequestInfo(request, prefix, 'request')
     response = webidl.converters.Response(response, prefix, 'response')
 
     // 1.
     let innerRequest = null
 
     // 2.
-    if (webidl.is.Request(request)) {
-      innerRequest = getRequestState(request)
+    if (request instanceof Request) {
+      innerRequest = request[kState]
     } else { // 3.
-      innerRequest = getRequestState(new Request(request))
+      innerRequest = new Request(request)[kState]
     }
 
     // 4.
@@ -287,7 +285,7 @@ class Cache {
     }
 
     // 5.
-    const innerResponse = getResponseState(response)
+    const innerResponse = response[kState]
 
     // 6.
     if (innerResponse.status === 206) {
@@ -326,7 +324,7 @@ class Cache {
     const clonedResponse = cloneResponse(innerResponse)
 
     // 10.
-    const bodyReadPromise = Promise.withResolvers()
+    const bodyReadPromise = createDeferredPromise()
 
     // 11.
     if (innerResponse.body != null) {
@@ -337,7 +335,7 @@ class Cache {
       const reader = stream.getReader()
 
       // 11.3
-      readAllBytes(reader, bodyReadPromise.resolve, bodyReadPromise.reject)
+      readAllBytes(reader).then(bodyReadPromise.resolve, bodyReadPromise.reject)
     } else {
       bodyReadPromise.resolve(undefined)
     }
@@ -365,7 +363,7 @@ class Cache {
     }
 
     // 19.1
-    const cacheJobPromise = Promise.withResolvers()
+    const cacheJobPromise = createDeferredPromise()
 
     // 19.2.1
     let errorData = null
@@ -391,12 +389,12 @@ class Cache {
   }
 
   async delete (request, options = {}) {
-    webidl.brandCheck(this, webidl.is.Cache)
+    webidl.brandCheck(this, Cache)
 
     const prefix = 'Cache.delete'
     webidl.argumentLengthCheck(arguments, 1, prefix)
 
-    request = webidl.converters.RequestInfo(request)
+    request = webidl.converters.RequestInfo(request, prefix, 'request')
     options = webidl.converters.CacheQueryOptions(options, prefix, 'options')
 
     /**
@@ -404,8 +402,8 @@ class Cache {
      */
     let r = null
 
-    if (webidl.is.Request(request)) {
-      r = getRequestState(request)
+    if (request instanceof Request) {
+      r = request[kState]
 
       if (r.method !== 'GET' && !options.ignoreMethod) {
         return false
@@ -413,7 +411,7 @@ class Cache {
     } else {
       assert(typeof request === 'string')
 
-      r = getRequestState(new Request(request))
+      r = new Request(request)[kState]
     }
 
     /** @type {CacheBatchOperation[]} */
@@ -428,7 +426,7 @@ class Cache {
 
     operations.push(operation)
 
-    const cacheJobPromise = Promise.withResolvers()
+    const cacheJobPromise = createDeferredPromise()
 
     let errorData = null
     let requestResponses
@@ -453,15 +451,15 @@ class Cache {
   /**
    * @see https://w3c.github.io/ServiceWorker/#dom-cache-keys
    * @param {any} request
-   * @param {import('../../../types/cache').CacheQueryOptions} options
+   * @param {import('../../types/cache').CacheQueryOptions} options
    * @returns {Promise<readonly Request[]>}
    */
   async keys (request = undefined, options = {}) {
-    webidl.brandCheck(this, webidl.is.Cache)
+    webidl.brandCheck(this, Cache)
 
     const prefix = 'Cache.keys'
 
-    if (request !== undefined) request = webidl.converters.RequestInfo(request)
+    if (request !== undefined) request = webidl.converters.RequestInfo(request, prefix, 'request')
     options = webidl.converters.CacheQueryOptions(options, prefix, 'options')
 
     // 1.
@@ -470,21 +468,21 @@ class Cache {
     // 2.
     if (request !== undefined) {
       // 2.1
-      if (webidl.is.Request(request)) {
+      if (request instanceof Request) {
         // 2.1.1
-        r = getRequestState(request)
+        r = request[kState]
 
         // 2.1.2
         if (r.method !== 'GET' && !options.ignoreMethod) {
           return []
         }
       } else if (typeof request === 'string') { // 2.2
-        r = getRequestState(new Request(request))
+        r = new Request(request)[kState]
       }
     }
 
     // 4.
-    const promise = Promise.withResolvers()
+    const promise = createDeferredPromise()
 
     // 5.
     // 5.1
@@ -517,7 +515,6 @@ class Cache {
       for (const request of requests) {
         const requestObject = fromInnerRequest(
           request,
-          undefined,
           new AbortController().signal,
           'immutable'
         )
@@ -671,7 +668,7 @@ class Cache {
   /**
    * @see https://w3c.github.io/ServiceWorker/#query-cache
    * @param {any} requestQuery
-   * @param {import('../../../types/cache').CacheQueryOptions} options
+   * @param {import('../../types/cache').CacheQueryOptions} options
    * @param {requestResponseList} targetStorage
    * @returns {requestResponseList}
    */
@@ -696,7 +693,7 @@ class Cache {
    * @param {any} requestQuery
    * @param {any} request
    * @param {any | null} response
-   * @param {import('../../../types/cache').CacheQueryOptions | undefined} options
+   * @param {import('../../types/cache').CacheQueryOptions | undefined} options
    * @returns {boolean}
    */
   #requestMatchesCachedItem (requestQuery, request, response = null, options) {
@@ -752,9 +749,9 @@ class Cache {
 
     // 2.
     if (request !== undefined) {
-      if (webidl.is.Request(request)) {
+      if (request instanceof Request) {
         // 2.1.1
-        r = getRequestState(request)
+        r = request[kState]
 
         // 2.1.2
         if (r.method !== 'GET' && !options.ignoreMethod) {
@@ -762,7 +759,7 @@ class Cache {
         }
       } else if (typeof request === 'string') {
         // 2.2.1
-        r = getRequestState(new Request(request))
+        r = new Request(request)[kState]
       }
     }
 
@@ -795,9 +792,9 @@ class Cache {
     // 5.5.2
     for (const response of responses) {
       // 5.5.2.1
-      const responseObject = fromInnerResponse(cloneResponse(response), 'immutable')
+      const responseObject = fromInnerResponse(response, 'immutable')
 
-      responseList.push(responseObject)
+      responseList.push(responseObject.clone())
 
       if (responseList.length >= maxResponses) {
         break
@@ -807,12 +804,6 @@ class Cache {
     // 6.
     return Object.freeze(responseList)
   }
-
-  static {
-    webidl.is.Cache = (arg) => {
-      return arg != null && typeof arg === 'object' && #relevantRequestResponseList in arg
-    }
-  }
 }
 
 Object.defineProperties(Cache.prototype, {
@@ -857,10 +848,7 @@ webidl.converters.MultiCacheQueryOptions = webidl.dictionaryConverter([
   }
 ])
 
-webidl.converters.Response = webidl.interfaceConverter(
-  webidl.is.Response,
-  'Response'
-)
+webidl.converters.Response = webidl.interfaceConverter(Response)
 
 webidl.converters['sequence<RequestInfo>'] = webidl.sequenceConverter(
   webidl.converters.RequestInfo

package/node_modules/undici/lib/web/cache/cachestorage.js

@@ -1,9 +1,9 @@
 'use strict'
 
+const { kConstruct } = require('./symbols')
 const { Cache } = require('./cache')
-const { webidl } = require('../webidl')
+const { webidl } = require('../fetch/webidl')
 const { kEnumerableProperty } = require('../../core/util')
-const { kConstruct } = require('../../core/symbols')
 
 class CacheStorage {
   /**
@@ -21,7 +21,7 @@ class CacheStorage {
   }
 
   async match (request, options = {}) {
-    webidl.brandCheck(this, webidl.is.CacheStorage)
+    webidl.brandCheck(this, CacheStorage)
     webidl.argumentLengthCheck(arguments, 1, 'CacheStorage.match')
 
     request = webidl.converters.RequestInfo(request)
@@ -58,7 +58,7 @@ class CacheStorage {
    * @returns {Promise<boolean>}
    */
   async has (cacheName) {
-    webidl.brandCheck(this, webidl.is.CacheStorage)
+    webidl.brandCheck(this, CacheStorage)
 
     const prefix = 'CacheStorage.has'
     webidl.argumentLengthCheck(arguments, 1, prefix)
@@ -76,7 +76,7 @@ class CacheStorage {
    * @returns {Promise<Cache>}
    */
   async open (cacheName) {
-    webidl.brandCheck(this, webidl.is.CacheStorage)
+    webidl.brandCheck(this, CacheStorage)
 
     const prefix = 'CacheStorage.open'
     webidl.argumentLengthCheck(arguments, 1, prefix)
@@ -110,7 +110,7 @@ class CacheStorage {
    * @returns {Promise<boolean>}
    */
   async delete (cacheName) {
-    webidl.brandCheck(this, webidl.is.CacheStorage)
+    webidl.brandCheck(this, CacheStorage)
 
     const prefix = 'CacheStorage.delete'
     webidl.argumentLengthCheck(arguments, 1, prefix)
@@ -125,7 +125,7 @@ class CacheStorage {
    * @returns {Promise<string[]>}
    */
   async keys () {
-    webidl.brandCheck(this, webidl.is.CacheStorage)
+    webidl.brandCheck(this, CacheStorage)
 
     // 2.1
     const keys = this.#caches.keys()
@@ -133,12 +133,6 @@ class CacheStorage {
     // 2.2
     return [...keys]
   }
-
-  static {
-    webidl.is.CacheStorage = (arg) => {
-      return arg != null && typeof arg === 'object' && #caches in arg
-    }
-  }
 }
 
 Object.defineProperties(CacheStorage.prototype, {

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

@@ -0,0 +1,5 @@
+'use strict'
+
+module.exports = {
+  kConstruct: require('../../core/symbols').kConstruct
+}

package/node_modules/undici/lib/web/cookies/index.js

@@ -2,33 +2,21 @@
 
 const { parseSetCookie } = require('./parse')
 const { stringify } = require('./util')
-const { webidl } = require('../webidl')
-
-const globalHeadersBrandCheck = (arg) => webidl.brandCheck(arg, webidl.util.MakeTypeAssertion(globalThis.Headers))
-const undiciHeadersBrandCheck = (arg) => webidl.brandCheck(arg, webidl.is.Headers)
-
-function brandCheckHeaders (arg) {
-  try {
-    undiciHeadersBrandCheck(arg)
-    return
-  } catch {
-  }
-
-  globalHeadersBrandCheck(arg)
-}
+const { webidl } = require('../fetch/webidl')
+const { Headers } = require('../fetch/headers')
 
 /**
  * @typedef {Object} Cookie
  * @property {string} name
  * @property {string} value
- * @property {Date|number} [expires]
- * @property {number} [maxAge]
- * @property {string} [domain]
- * @property {string} [path]
- * @property {boolean} [secure]
- * @property {boolean} [httpOnly]
- * @property {'Strict'|'Lax'|'None'} [sameSite]
- * @property {string[]} [unparsed]
+ * @property {Date|number|undefined} expires
+ * @property {number|undefined} maxAge
+ * @property {string|undefined} domain
+ * @property {string|undefined} path
+ * @property {boolean|undefined} secure
+ * @property {boolean|undefined} httpOnly
+ * @property {'Strict'|'Lax'|'None'} sameSite
+ * @property {string[]} unparsed
  */
 
 /**
@@ -38,14 +26,10 @@ function brandCheckHeaders (arg) {
 function getCookies (headers) {
   webidl.argumentLengthCheck(arguments, 1, 'getCookies')
 
-  brandCheckHeaders(headers)
+  webidl.brandCheck(headers, Headers, { strict: false })
 
   const cookie = headers.get('cookie')
-
-  // A null prototype keeps a cookie named `__proto__` from hitting the
-  // Object.prototype setter, which would silently drop it.
-  /** @type {Record<string, string>} */
-  const out = { __proto__: null }
+  const out = {}
 
   if (!cookie) {
     return out
@@ -67,7 +51,7 @@ function getCookies (headers) {
  * @returns {void}
  */
 function deleteCookie (headers, name, attributes) {
-  brandCheckHeaders(headers)
+  webidl.brandCheck(headers, Headers, { strict: false })
 
   const prefix = 'deleteCookie'
   webidl.argumentLengthCheck(arguments, 2, prefix)
@@ -92,7 +76,7 @@ function deleteCookie (headers, name, attributes) {
 function getSetCookies (headers) {
   webidl.argumentLengthCheck(arguments, 1, 'getSetCookies')
 
-  brandCheckHeaders(headers)
+  webidl.brandCheck(headers, Headers, { strict: false })
 
   const cookies = headers.getSetCookie()
 
@@ -103,16 +87,6 @@ function getSetCookies (headers) {
   return cookies.map((pair) => parseSetCookie(pair))
 }
 
-/**
- * Parses a cookie string
- * @param {string} cookie
- */
-function parseCookie (cookie) {
-  cookie = webidl.converters.DOMString(cookie)
-
-  return parseSetCookie(cookie)
-}
-
 /**
  * @param {Headers} headers
  * @param {Cookie} cookie
@@ -121,14 +95,14 @@ function parseCookie (cookie) {
 function setCookie (headers, cookie) {
   webidl.argumentLengthCheck(arguments, 2, 'setCookie')
 
-  brandCheckHeaders(headers)
+  webidl.brandCheck(headers, Headers, { strict: false })
 
   cookie = webidl.converters.Cookie(cookie)
 
   const str = stringify(cookie)
 
   if (str) {
-    headers.append('set-cookie', str, true)
+    headers.append('Set-Cookie', str)
   }
 }
 
@@ -198,7 +172,7 @@ webidl.converters.Cookie = webidl.dictionaryConverter([
   {
     converter: webidl.sequenceConverter(webidl.converters.DOMString),
     key: 'unparsed',
-    defaultValue: () => []
+    defaultValue: () => new Array(0)
   }
 ])
 
@@ -206,6 +180,5 @@ module.exports = {
   getCookies,
   deleteCookie,
   getSetCookies,
-  setCookie,
-  parseCookie
+  setCookie
 }