@yanglaofish/fishtools 0.5.2 → 0.6.0

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

@@ -2,18 +2,15 @@
 
 const { pipeline } = require('node:stream')
 const { fetching } = require('../fetch')
-const { webidl } = require('../webidl')
+const { makeRequest } = require('../fetch/request')
+const { webidl } = require('../fetch/webidl')
 const { EventSourceStream } = require('./eventsource-stream')
 const { parseMIMEType } = require('../fetch/data-url')
 const { createFastMessageEvent } = require('../websocket/events')
 const { isNetworkError } = require('../fetch/response')
-const { isValidHeaderValue, kEnumerableProperty } = require('../../core/util')
+const { delay } = require('./util')
+const { kEnumerableProperty } = require('../../core/util')
 const { environmentSettingsObject } = require('../fetch/util')
-const { createPotentialCORSRequest } = require('./util')
-const { getGlobalDispatcher } = require('../../global')
-const { isomorphicDecode } = require('../infra')
-
-const textEncoder = new TextEncoder()
 
 let experimentalWarned = false
 
@@ -31,8 +28,7 @@ const defaultReconnectionTime = 3000
 
 /**
  * The readyState attribute represents the state of the connection.
- * @typedef ReadyState
- * @type {0|1|2}
+ * @enum
  * @readonly
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html#dom-eventsource-readystate-dev
  */
@@ -84,12 +80,9 @@ class EventSource extends EventTarget {
     message: null
   }
 
-  #url
+  #url = null
   #withCredentials = false
 
-  /**
-   * @type {ReadyState}
-   */
   #readyState = CONNECTING
 
   #request = null
@@ -105,7 +98,7 @@ class EventSource extends EventTarget {
   /**
    * Creates a new EventSource object.
    * @param {string} url
-   * @param {EventSourceInit} [eventSourceInitDict={}]
+   * @param {EventSourceInit} [eventSourceInitDict]
    * @see https://html.spec.whatwg.org/multipage/server-sent-events.html#the-eventsource-interface
    */
   constructor (url, eventSourceInitDict = {}) {
@@ -124,13 +117,13 @@ class EventSource extends EventTarget {
       })
     }
 
-    url = webidl.converters.USVString(url)
+    url = webidl.converters.USVString(url, prefix, 'url')
     eventSourceInitDict = webidl.converters.EventSourceInitDict(eventSourceInitDict, prefix, 'eventSourceInitDict')
 
-    this.#dispatcher = eventSourceInitDict.node.dispatcher || eventSourceInitDict.dispatcher
+    this.#dispatcher = eventSourceInitDict.dispatcher
     this.#state = {
       lastEventId: '',
-      reconnectionTime: eventSourceInitDict.node.reconnectionTime
+      reconnectionTime: defaultReconnectionTime
     }
 
     // 2. Let settings be ev's relevant settings object.
@@ -157,29 +150,40 @@ class EventSource extends EventTarget {
     // 7. If the value of eventSourceInitDict's withCredentials member is true,
     // then set corsAttributeState to Use Credentials and set ev's
     // withCredentials attribute to true.
-    if (eventSourceInitDict.withCredentials === true) {
+    if (eventSourceInitDict.withCredentials) {
       corsAttributeState = USE_CREDENTIALS
       this.#withCredentials = true
     }
 
     // 8. Let request be the result of creating a potential-CORS request given
     // urlRecord, the empty string, and corsAttributeState.
-    const request = createPotentialCORSRequest(urlRecord, '', corsAttributeState)
+    const initRequest = {
+      redirect: 'follow',
+      keepalive: true,
+      // @see https://html.spec.whatwg.org/multipage/urls-and-fetching.html#cors-settings-attributes
+      mode: 'cors',
+      credentials: corsAttributeState === 'anonymous'
+        ? 'same-origin'
+        : 'omit',
+      referrer: 'no-referrer'
+    }
 
     // 9. Set request's client to settings.
-    request.client = environmentSettingsObject.settingsObject
+    initRequest.client = environmentSettingsObject.settingsObject
 
     // 10. User agents may set (`Accept`, `text/event-stream`) in request's header list.
-    request.headersList.set('Accept', 'text/event-stream')
+    initRequest.headersList = [['accept', { name: 'accept', value: 'text/event-stream' }]]
 
     // 11. Set request's cache mode to "no-store".
-    request.cache = 'no-store'
+    initRequest.cache = 'no-store'
 
     // 12. Set request's initiator type to "other".
-    request.initiator = 'other'
+    initRequest.initiator = 'other'
+
+    initRequest.urlList = [new URL(this.#url)]
 
     // 13. Set ev's request to request.
-    this.#request = request
+    this.#request = makeRequest(initRequest)
 
     this.#connect()
   }
@@ -187,12 +191,10 @@ class EventSource extends EventTarget {
   /**
    * Returns the state of this EventSource object's connection. It can have the
    * values described below.
-   * @returns {ReadyState}
+   * @returns {0|1|2}
    * @readonly
    */
   get readyState () {
-    webidl.brandCheck(this, webidl.is.EventSource)
-
     return this.#readyState
   }
 
@@ -202,8 +204,6 @@ class EventSource extends EventTarget {
    * @returns {string}
    */
   get url () {
-    webidl.brandCheck(this, webidl.is.EventSource)
-
     return this.#url
   }
 
@@ -212,8 +212,6 @@ class EventSource extends EventTarget {
    * instantiated with CORS credentials set (true), or not (false, the default).
    */
   get withCredentials () {
-    webidl.brandCheck(this, webidl.is.EventSource)
-
     return this.#withCredentials
   }
 
@@ -229,9 +227,12 @@ class EventSource extends EventTarget {
 
     // 14. Let processEventSourceEndOfBody given response res be the following step: if res is not a network error, then reestablish the connection.
     const processEventSourceEndOfBody = (response) => {
-      if (!isNetworkError(response)) {
-        return this.#reconnect()
+      if (isNetworkError(response)) {
+        this.dispatchEvent(new Event('error'))
+        this.close()
       }
+
+      this.#reconnect()
     }
 
     // 15. Fetch request, with processResponseEndOfBody set to processEventSourceEndOfBody...
@@ -291,7 +292,6 @@ class EventSource extends EventTarget {
 
       const eventSourceStream = new EventSourceStream({
         eventSourceSettings: this.#state,
-        maxEventSize: this.#dispatcher.eventSourceOptions?.maxEventSize,
         push: (event) => {
           this.dispatchEvent(createFastMessageEvent(
             event.type,
@@ -317,9 +317,9 @@ class EventSource extends EventTarget {
 
   /**
    * @see https://html.spec.whatwg.org/multipage/server-sent-events.html#sse-processing-model
-   * @returns {void}
+   * @returns {Promise<void>}
    */
-  #reconnect () {
+  async #reconnect () {
     // When a user agent is to reestablish the connection, the user agent must
     // run the following steps. These steps are run in parallel, not as part of
     // a task. (The tasks that it queues, of course, are run like normal tasks
@@ -337,31 +337,27 @@ class EventSource extends EventTarget {
     this.dispatchEvent(new Event('error'))
 
     // 2. Wait a delay equal to the reconnection time of the event source.
-    setTimeout(() => {
-      // 5. Queue a task to run the following steps:
-
-      //   1. If the EventSource object's readyState attribute is not set to
-      //      CONNECTING, then return.
-      if (this.#readyState !== CONNECTING) return
-
-      //   2. Let request be the EventSource object's request.
-      //   3. If the EventSource object's last event ID string is not the empty
-      //      string, then:
-      //      1. Let lastEventIDValue be the EventSource object's last event ID
-      //         string, encoded as UTF-8.
-      //      2. Set (`Last-Event-ID`, lastEventIDValue) in request's header
-      //         list.
-      this.#request.headersList.delete('last-event-id', true)
-      if (this.#state.lastEventId.length) {
-        const lastEventId = isomorphicDecode(textEncoder.encode(this.#state.lastEventId))
-        if (isValidHeaderValue(lastEventId)) {
-          this.#request.headersList.set('last-event-id', lastEventId, true)
-        }
-      }
+    await delay(this.#state.reconnectionTime)
+
+    // 5. Queue a task to run the following steps:
+
+    //   1. If the EventSource object's readyState attribute is not set to
+    //      CONNECTING, then return.
+    if (this.#readyState !== CONNECTING) return
+
+    //   2. Let request be the EventSource object's request.
+    //   3. If the EventSource object's last event ID string is not the empty
+    //      string, then:
+    //      1. Let lastEventIDValue be the EventSource object's last event ID
+    //         string, encoded as UTF-8.
+    //      2. Set (`Last-Event-ID`, lastEventIDValue) in request's header
+    //         list.
+    if (this.#state.lastEventId.length) {
+      this.#request.headersList.set('last-event-id', this.#state.lastEventId, true)
+    }
 
-      //   4. Fetch request and process the response obtained in this fashion, if any, as described earlier in this section.
-      this.#connect()
-    }, this.#state.reconnectionTime)?.unref()
+    //   4. Fetch request and process the response obtained in this fashion, if any, as described earlier in this section.
+    this.#connect()
   }
 
   /**
@@ -369,7 +365,7 @@ class EventSource extends EventTarget {
    * CLOSED.
    */
   close () {
-    webidl.brandCheck(this, webidl.is.EventSource)
+    webidl.brandCheck(this, EventSource)
 
     if (this.#readyState === CLOSED) return
     this.#readyState = CLOSED
@@ -378,79 +374,55 @@ class EventSource extends EventTarget {
   }
 
   get onopen () {
-    webidl.brandCheck(this, webidl.is.EventSource)
-
     return this.#events.open
   }
 
   set onopen (fn) {
-    webidl.brandCheck(this, webidl.is.EventSource)
-
     if (this.#events.open) {
       this.removeEventListener('open', this.#events.open)
     }
 
-    const listener = webidl.converters.EventHandlerNonNull(fn)
-
-    if (listener !== null) {
-      this.addEventListener('open', listener)
+    if (typeof fn === 'function') {
       this.#events.open = fn
+      this.addEventListener('open', fn)
     } else {
       this.#events.open = null
     }
   }
 
   get onmessage () {
-    webidl.brandCheck(this, webidl.is.EventSource)
-
     return this.#events.message
   }
 
   set onmessage (fn) {
-    webidl.brandCheck(this, webidl.is.EventSource)
-
     if (this.#events.message) {
       this.removeEventListener('message', this.#events.message)
     }
 
-    const listener = webidl.converters.EventHandlerNonNull(fn)
-
-    if (listener !== null) {
-      this.addEventListener('message', listener)
+    if (typeof fn === 'function') {
       this.#events.message = fn
+      this.addEventListener('message', fn)
     } else {
       this.#events.message = null
     }
   }
 
   get onerror () {
-    webidl.brandCheck(this, webidl.is.EventSource)
-
     return this.#events.error
   }
 
   set onerror (fn) {
-    webidl.brandCheck(this, webidl.is.EventSource)
-
     if (this.#events.error) {
       this.removeEventListener('error', this.#events.error)
     }
 
-    const listener = webidl.converters.EventHandlerNonNull(fn)
-
-    if (listener !== null) {
-      this.addEventListener('error', listener)
+    if (typeof fn === 'function') {
       this.#events.error = fn
+      this.addEventListener('error', fn)
     } else {
       this.#events.error = null
     }
   }
-
-  static {
-    webidl.is.EventSource = (arg) => {
-      return arg != null && typeof arg === 'object' && #events in arg
-    }
-  }
 }
 
 const constantsPropertyDescriptors = {
@@ -498,23 +470,7 @@ webidl.converters.EventSourceInitDict = webidl.dictionaryConverter([
   },
   {
     key: 'dispatcher', // undici only
-    converter: webidl.converters.any,
-    defaultValue: () => getGlobalDispatcher()
-  },
-  {
-    key: 'node', // undici only
-    converter: webidl.dictionaryConverter([
-      {
-        key: 'reconnectionTime',
-        converter: webidl.converters['unsigned long'],
-        defaultValue: () => defaultReconnectionTime
-      },
-      {
-        key: 'dispatcher',
-        converter: webidl.converters.any
-      }
-    ]),
-    defaultValue: () => ({})
+    converter: webidl.converters.any
   }
 ])
 

package/node_modules/undici/lib/web/eventsource/util.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const { makeRequest } = require('../fetch/request')
-
 /**
  * Checks if the given value is a valid LastEventId.
  * @param {string} value
@@ -25,36 +23,15 @@ function isASCIINumber (value) {
   return true
 }
 
-function createPotentialCORSRequest (url, destination, corsAttributeState, sameOriginFallback) {
-  // 1. Let mode be "no-cors" if corsAttributeState is No CORS, and "cors" otherwise.
-  let mode = corsAttributeState === 'no cors' ? 'no-cors' : 'cors'
-
-  // 2. If same-origin fallback flag is set and mode is "no-cors", set mode to "same-origin".
-  if (sameOriginFallback && mode === 'no-cors') {
-    mode = 'same-origin'
-  }
-
-  // 3. Let credentialsMode be "include".
-  let credentialsMode = 'include'
-
-  // 4. If corsAttributeState is Anonymous, set credentialsMode to "same-origin".
-  if (corsAttributeState === 'anonymous') {
-    credentialsMode = 'same-origin'
-  }
-
-  // 5. Return a new request whose URL is url, destination is destination, mode is mode,
-  //    credentials mode is credentialsMode, and whose use-URL-credentials flag is set.
-  return makeRequest({
-    urlList: [url],
-    destination,
-    mode,
-    credentials: credentialsMode,
-    useURLCredentials: true
+// https://github.com/nodejs/undici/issues/2664
+function delay (ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms).unref()
   })
 }
 
 module.exports = {
   isValidLastEventId,
   isASCIINumber,
-  createPotentialCORSRequest
+  delay
 }