undici 6.6.1 → 6.7.0

package/lib/{fetch → web/fetch}/webidl.js

@@ -1,9 +1,9 @@
 'use strict'
 
-const { types } = require('node:util')
-const { toUSVString } = require('./util')
+const { types, inspect } = require('node:util')
+const { toUSVString } = require('../../core/util')
 
-/** @type {import('../../types/webidl').Webidl} */
+/** @type {import('../../../types/webidl').Webidl} */
 const webidl = {}
 webidl.converters = {}
 webidl.util = {}
@@ -34,10 +34,14 @@ webidl.errors.invalidArgument = function (context) {
 
 // https://webidl.spec.whatwg.org/#implements
 webidl.brandCheck = function (V, I, opts = undefined) {
-  if (opts?.strict !== false && !(V instanceof I)) {
-    throw new TypeError('Illegal invocation')
+  if (opts?.strict !== false) {
+    if (!(V instanceof I)) {
+      throw new TypeError('Illegal invocation')
+    }
   } else {
-    return V?.[Symbol.toStringTag] === I.prototype[Symbol.toStringTag]
+    if (V?.[Symbol.toStringTag] !== I.prototype[Symbol.toStringTag]) {
+      throw new TypeError('Illegal invocation')
+    }
   }
 }
 
@@ -132,7 +136,7 @@ webidl.util.ConvertToInt = function (V, bitLength, signedness, opts = {}) {
     ) {
       throw webidl.errors.exception({
         header: 'Integer conversion',
-        message: `Could not convert ${V} to an integer.`
+        message: `Could not convert ${webidl.util.Stringify(V)} to an integer.`
       })
     }
 
@@ -212,9 +216,24 @@ webidl.util.IntegerPart = function (n) {
   return r
 }
 
+webidl.util.Stringify = function (V) {
+  const type = webidl.util.Type(V)
+
+  switch (type) {
+    case 'Symbol':
+      return `Symbol(${V.description})`
+    case 'Object':
+      return inspect(V)
+    case 'String':
+      return `"${V}"`
+    default:
+      return `${V}`
+  }
+}
+
 // https://webidl.spec.whatwg.org/#es-sequence
 webidl.sequenceConverter = function (converter) {
-  return (V) => {
+  return (V, Iterable) => {
     // 1. If Type(V) is not Object, throw a TypeError.
     if (webidl.util.Type(V) !== 'Object') {
       throw webidl.errors.exception({
@@ -225,7 +244,7 @@ webidl.sequenceConverter = function (converter) {
 
     // 2. Let method be ? GetMethod(V, @@iterator).
     /** @type {Generator} */
-    const method = V?.[Symbol.iterator]?.()
+    const method = typeof Iterable === 'function' ? Iterable() : V?.[Symbol.iterator]?.()
     const seq = []
 
     // 3. If method is undefined, throw a TypeError.
@@ -269,8 +288,8 @@ webidl.recordConverter = function (keyConverter, valueConverter) {
     const result = {}
 
     if (!types.isProxy(O)) {
-      // Object.keys only returns enumerable properties
-      const keys = Object.keys(O)
+      // 1. Let desc be ? O.[[GetOwnProperty]](key).
+      const keys = [...Object.getOwnPropertyNames(O), ...Object.getOwnPropertySymbols(O)]
 
       for (const key of keys) {
         // 1. Let typedKey be key converted to an IDL value of type K.
@@ -320,7 +339,7 @@ webidl.interfaceConverter = function (i) {
     if (opts.strict !== false && !(V instanceof i)) {
       throw webidl.errors.exception({
         header: i.name,
-        message: `Expected ${V} to be an instance of ${i.name}.`
+        message: `Expected ${webidl.util.Stringify(V)} to be an instance of ${i.name}.`
       })
     }
 
@@ -511,8 +530,8 @@ webidl.converters.ArrayBuffer = function (V, opts = {}) {
     !types.isAnyArrayBuffer(V)
   ) {
     throw webidl.errors.conversionFailed({
-      prefix: `${V}`,
-      argument: `${V}`,
+      prefix: webidl.util.Stringify(V),
+      argument: webidl.util.Stringify(V),
       types: ['ArrayBuffer']
     })
   }
@@ -532,7 +551,12 @@ webidl.converters.ArrayBuffer = function (V, opts = {}) {
   //    with the [AllowResizable] extended attribute, and
   //    IsResizableArrayBuffer(V) is true, then throw a
   //    TypeError.
-  // Note: resizable ArrayBuffers are currently a proposal.
+  if (V.resizable || V.growable) {
+    throw webidl.errors.exception({
+      header: 'ArrayBuffer',
+      message: 'Received a resizable ArrayBuffer.'
+    })
+  }
 
   // 4. Return the IDL ArrayBuffer value that is a
   //    reference to the same object as V.
@@ -552,7 +576,7 @@ webidl.converters.TypedArray = function (V, T, opts = {}) {
   ) {
     throw webidl.errors.conversionFailed({
       prefix: `${T.name}`,
-      argument: `${V}`,
+      argument: webidl.util.Stringify(V),
       types: [T.name]
     })
   }
@@ -572,7 +596,12 @@ webidl.converters.TypedArray = function (V, T, opts = {}) {
   //    with the [AllowResizable] extended attribute, and
   //    IsResizableArrayBuffer(V.[[ViewedArrayBuffer]]) is
   //    true, then throw a TypeError.
-  // Note: resizable array buffers are currently a proposal
+  if (V.buffer.resizable || V.buffer.growable) {
+    throw webidl.errors.exception({
+      header: 'ArrayBuffer',
+      message: 'Received a resizable ArrayBuffer.'
+    })
+  }
 
   // 5. Return the IDL value of type T that is a reference
   //    to the same object as V.
@@ -604,7 +633,12 @@ webidl.converters.DataView = function (V, opts = {}) {
   //    with the [AllowResizable] extended attribute, and
   //    IsResizableArrayBuffer(V.[[ViewedArrayBuffer]]) is
   //    true, then throw a TypeError.
-  // Note: resizable ArrayBuffers are currently a proposal
+  if (V.buffer.resizable || V.buffer.growable) {
+    throw webidl.errors.exception({
+      header: 'ArrayBuffer',
+      message: 'Received a resizable ArrayBuffer.'
+    })
+  }
 
   // 4. Return the IDL DataView value that is a reference
   //    to the same object as V.
@@ -625,7 +659,7 @@ webidl.converters.BufferSource = function (V, opts = {}) {
     return webidl.converters.DataView(V, opts, { ...opts, allowShared: false })
   }
 
-  throw new TypeError(`Could not convert ${V} to a BufferSource.`)
+  throw new TypeError(`Could not convert ${webidl.util.Stringify(V)} to a BufferSource.`)
 }
 
 webidl.converters['sequence<ByteString>'] = webidl.sequenceConverter(

package/lib/{fileapi → web/fileapi}/filereader.js

@@ -13,7 +13,7 @@ const {
   kAborted
 } = require('./symbols')
 const { webidl } = require('../fetch/webidl')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 
 class FileReader extends EventTarget {
   constructor () {

package/lib/{fileapi → web/fileapi}/util.js

@@ -9,7 +9,7 @@ const {
 } = require('./symbols')
 const { ProgressEvent } = require('./progressevent')
 const { getEncoding } = require('./encoding')
-const { serializeAMimeType, parseMIMEType } = require('../fetch/dataURL')
+const { serializeAMimeType, parseMIMEType } = require('../fetch/data-url')
 const { types } = require('node:util')
 const { StringDecoder } = require('string_decoder')
 const { btoa } = require('node:buffer')

package/lib/{websocket → web/websocket}/connection.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { uid, states } = require('./constants')
+const { uid, states, sentCloseFrameState } = require('./constants')
 const {
   kReadyState,
   kSentClose,
@@ -8,18 +8,19 @@ const {
   kReceivedClose
 } = require('./symbols')
 const { fireEvent, failWebsocketConnection } = require('./util')
-const { channels } = require('../core/diagnostics')
+const { channels } = require('../../core/diagnostics')
 const { CloseEvent } = require('./events')
 const { makeRequest } = require('../fetch/request')
 const { fetching } = require('../fetch/index')
 const { Headers } = require('../fetch/headers')
-const { getGlobalDispatcher } = require('../global')
-const { kHeadersList } = require('../core/symbols')
+const { getDecodeSplit } = require('../fetch/util')
+const { kHeadersList } = require('../../core/symbols')
 
 /** @type {import('crypto')} */
 let crypto
 try {
   crypto = require('node:crypto')
+/* c8 ignore next 3 */
 } catch {
 
 }
@@ -100,7 +101,7 @@ function establishWebSocketConnection (url, protocols, ws, onEstablish, options)
   const controller = fetching({
     request,
     useParallelQueue: true,
-    dispatcher: options.dispatcher ?? getGlobalDispatcher(),
+    dispatcher: options.dispatcher,
     processResponse (response) {
       // 1. If response is a network error or its status is not 101,
       //    fail the WebSocket connection.
@@ -177,9 +178,18 @@ function establishWebSocketConnection (url, protocols, ws, onEstablish, options)
       //    the WebSocket Connection_.
       const secProtocol = response.headersList.get('Sec-WebSocket-Protocol')
 
-      if (secProtocol !== null && secProtocol !== request.headersList.get('Sec-WebSocket-Protocol')) {
-        failWebsocketConnection(ws, 'Protocol was not set in the opening handshake.')
-        return
+      if (secProtocol !== null) {
+        const requestProtocols = getDecodeSplit('sec-websocket-protocol', request.headersList)
+
+        // The client can request that the server use a specific subprotocol by
+        // including the |Sec-WebSocket-Protocol| field in its handshake.  If it
+        // is specified, the server needs to include the same field and one of
+        // the selected subprotocol values in its response for the connection to
+        // be established.
+        if (!requestProtocols.includes(secProtocol)) {
+          failWebsocketConnection(ws, 'Protocol was not set in the opening handshake.')
+          return
+        }
       }
 
       response.socket.on('data', onSocketData)
@@ -220,7 +230,7 @@ function onSocketClose () {
   // If the TCP connection was closed after the
   // WebSocket closing handshake was completed, the WebSocket connection
   // is said to have been closed _cleanly_.
-  const wasClean = ws[kSentClose] && ws[kReceivedClose]
+  const wasClean = ws[kSentClose] === sentCloseFrameState.SENT && ws[kReceivedClose]
 
   let code = 1005
   let reason = ''
@@ -230,7 +240,7 @@ function onSocketClose () {
   if (result) {
     code = result.code ?? 1005
     reason = result.reason
-  } else if (!ws[kSentClose]) {
+  } else if (ws[kSentClose] !== sentCloseFrameState.SENT) {
     // If _The WebSocket
     // Connection is Closed_ and no Close control frame was received by the
     // endpoint (such as could occur if the underlying transport connection

package/lib/{websocket → web/websocket}/constants.js

@@ -20,6 +20,12 @@ const states = {
   CLOSED: 3
 }
 
+const sentCloseFrameState = {
+  NOT_SENT: 0,
+  PROCESSING: 1,
+  SENT: 2
+}
+
 const opcodes = {
   CONTINUATION: 0x0,
   TEXT: 0x1,
@@ -42,6 +48,7 @@ const emptyBuffer = Buffer.allocUnsafe(0)
 
 module.exports = {
   uid,
+  sentCloseFrameState,
   staticPropertyDescriptors,
   states,
   opcodes,

package/lib/{websocket → web/websocket}/events.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { webidl } = require('../fetch/webidl')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 const { MessagePort } = require('node:worker_threads')
 
 /**

package/lib/{websocket → web/websocket}/frame.js

@@ -6,6 +6,7 @@ const { maxUnsigned16Bit } = require('./constants')
 let crypto
 try {
   crypto = require('node:crypto')
+/* c8 ignore next 3 */
 } catch {
 
 }

package/lib/{websocket → web/websocket}/receiver.js

@@ -1,9 +1,9 @@
 'use strict'
 
 const { Writable } = require('node:stream')
-const { parserStates, opcodes, states, emptyBuffer } = require('./constants')
+const { parserStates, opcodes, states, emptyBuffer, sentCloseFrameState } = require('./constants')
 const { kReadyState, kSentClose, kResponse, kReceivedClose } = require('./symbols')
-const { channels } = require('../core/diagnostics')
+const { channels } = require('../../core/diagnostics')
 const { isValidStatusCode, failWebsocketConnection, websocketMessageReceived } = require('./util')
 const { WebsocketFrameSend } = require('./frame')
 
@@ -12,6 +12,8 @@ const { WebsocketFrameSend } = require('./frame')
 // Copyright (c) 2013 Arnout Kazemier and contributors
 // Copyright (c) 2016 Luigi Pinca and contributors
 
+const textDecoder = new TextDecoder('utf-8', { fatal: true })
+
 class ByteParser extends Writable {
   #buffers = []
   #byteOffset = 0
@@ -100,9 +102,9 @@ class ByteParser extends Writable {
 
           const body = this.consume(payloadLength)
 
-          this.#info.closeInfo = this.parseCloseBody(false, body)
+          this.#info.closeInfo = this.parseCloseBody(body)
 
-          if (!this.ws[kSentClose]) {
+          if (this.ws[kSentClose] !== sentCloseFrameState.SENT) {
             // If an endpoint receives a Close frame and did not previously send a
             // Close frame, the endpoint MUST send a Close frame in response.  (When
             // sending a Close frame in response, the endpoint typically echos the
@@ -118,7 +120,7 @@ class ByteParser extends Writable {
               closeFrame.createFrame(opcodes.CLOSE),
               (err) => {
                 if (!err) {
-                  this.ws[kSentClose] = true
+                  this.ws[kSentClose] = sentCloseFrameState.SENT
                 }
               }
             )
@@ -288,7 +290,7 @@ class ByteParser extends Writable {
     return buffer
   }
 
-  parseCloseBody (onlyCode, data) {
+  parseCloseBody (data) {
     // https://datatracker.ietf.org/doc/html/rfc6455#section-7.1.5
     /** @type {number|undefined} */
     let code
@@ -300,14 +302,6 @@ class ByteParser extends Writable {
       code = data.readUInt16BE(0)
     }
 
-    if (onlyCode) {
-      if (!isValidStatusCode(code)) {
-        return null
-      }
-
-      return { code }
-    }
-
     // https://datatracker.ietf.org/doc/html/rfc6455#section-7.1.6
     /** @type {Buffer} */
     let reason = data.subarray(2)
@@ -322,8 +316,7 @@ class ByteParser extends Writable {
     }
 
     try {
-      // TODO: optimize this
-      reason = new TextDecoder('utf-8', { fatal: true }).decode(reason)
+      reason = textDecoder.decode(reason)
     } catch {
       return null
     }

package/lib/{websocket → web/websocket}/util.js

@@ -8,6 +8,17 @@ const { MessageEvent, ErrorEvent } = require('./events')
 
 /**
  * @param {import('./websocket').WebSocket} ws
+ * @returns {boolean}
+ */
+function isConnecting (ws) {
+  // If the WebSocket connection is not yet established, and the connection
+  // is not yet closed, then the WebSocket connection is in the CONNECTING state.
+  return ws[kReadyState] === states.CONNECTING
+}
+
+/**
+ * @param {import('./websocket').WebSocket} ws
+ * @returns {boolean}
  */
 function isEstablished (ws) {
   // If the server's response is validated as provided for above, it is
@@ -18,6 +29,7 @@ function isEstablished (ws) {
 
 /**
  * @param {import('./websocket').WebSocket} ws
+ * @returns {boolean}
  */
 function isClosing (ws) {
   // Upon either sending or receiving a Close control frame, it is said
@@ -28,6 +40,7 @@ function isClosing (ws) {
 
 /**
  * @param {import('./websocket').WebSocket} ws
+ * @returns {boolean}
  */
 function isClosed (ws) {
   return ws[kReadyState] === states.CLOSED
@@ -55,6 +68,8 @@ function fireEvent (e, target, eventConstructor = Event, eventInitDict = {}) {
   target.dispatchEvent(event)
 }
 
+const textDecoder = new TextDecoder('utf-8', { fatal: true })
+
 /**
  * @see https://websockets.spec.whatwg.org/#feedback-from-the-protocol
  * @param {import('./websocket').WebSocket} ws
@@ -74,7 +89,7 @@ function websocketMessageReceived (ws, type, data) {
     // -> type indicates that the data is Text
     //      a new DOMString containing data
     try {
-      dataForEvent = new TextDecoder('utf-8', { fatal: true }).decode(data)
+      dataForEvent = textDecoder.decode(data)
     } catch {
       failWebsocketConnection(ws, 'Received invalid UTF-8 in text frame.')
       return
@@ -119,31 +134,29 @@ function isValidSubprotocol (protocol) {
     return false
   }
 
-  for (const char of protocol) {
-    const code = char.charCodeAt(0)
+  for (let i = 0; i < protocol.length; ++i) {
+    const code = protocol.charCodeAt(i)
 
     if (
-      code < 0x21 ||
+      code < 0x21 || // CTL, contains SP (0x20) and HT (0x09)
       code > 0x7E ||
-      char === '(' ||
-      char === ')' ||
-      char === '<' ||
-      char === '>' ||
-      char === '@' ||
-      char === ',' ||
-      char === ';' ||
-      char === ':' ||
-      char === '\\' ||
-      char === '"' ||
-      char === '/' ||
-      char === '[' ||
-      char === ']' ||
-      char === '?' ||
-      char === '=' ||
-      char === '{' ||
-      char === '}' ||
-      code === 32 || // SP
-      code === 9 // HT
+      code === 0x22 || // "
+      code === 0x28 || // (
+      code === 0x29 || // )
+      code === 0x2C || // ,
+      code === 0x2F || // /
+      code === 0x3A || // :
+      code === 0x3B || // ;
+      code === 0x3C || // <
+      code === 0x3D || // =
+      code === 0x3E || // >
+      code === 0x3F || // ?
+      code === 0x40 || // @
+      code === 0x5B || // [
+      code === 0x5C || // \
+      code === 0x5D || // ]
+      code === 0x7B || // {
+      code === 0x7D // }
     ) {
       return false
     }
@@ -190,6 +203,7 @@ function failWebsocketConnection (ws, reason) {
 }
 
 module.exports = {
+  isConnecting,
   isEstablished,
   isClosing,
   isClosed,

package/lib/{websocket → web/websocket}/websocket.js

@@ -1,9 +1,9 @@
 'use strict'
 
 const { webidl } = require('../fetch/webidl')
-const { URLSerializer } = require('../fetch/dataURL')
+const { URLSerializer } = require('../fetch/data-url')
 const { getGlobalOrigin } = require('../fetch/global')
-const { staticPropertyDescriptors, states, opcodes, emptyBuffer } = require('./constants')
+const { staticPropertyDescriptors, states, sentCloseFrameState, opcodes, emptyBuffer } = require('./constants')
 const {
   kWebSocketURL,
   kReadyState,
@@ -13,12 +13,20 @@ const {
   kSentClose,
   kByteParser
 } = require('./symbols')
-const { isEstablished, isClosing, isValidSubprotocol, failWebsocketConnection, fireEvent } = require('./util')
+const {
+  isConnecting,
+  isEstablished,
+  isClosed,
+  isClosing,
+  isValidSubprotocol,
+  failWebsocketConnection,
+  fireEvent
+} = require('./util')
 const { establishWebSocketConnection } = require('./connection')
 const { WebsocketFrameSend } = require('./frame')
 const { ByteParser } = require('./receiver')
-const { kEnumerableProperty, isBlobLike } = require('../core/util')
-const { getGlobalDispatcher } = require('../global')
+const { kEnumerableProperty, isBlobLike } = require('../../core/util')
+const { getGlobalDispatcher } = require('../../global')
 const { types } = require('node:util')
 
 let experimentalWarned = false
@@ -132,6 +140,8 @@ class WebSocket extends EventTarget {
     // be CONNECTING (0).
     this[kReadyState] = WebSocket.CONNECTING
 
+    this[kSentClose] = sentCloseFrameState.NOT_SENT
+
     // The extensions attribute must initially return the empty string.
 
     // The protocol attribute must initially return the empty string.
@@ -184,7 +194,7 @@ class WebSocket extends EventTarget {
     }
 
     // 3. Run the first matching steps from the following list:
-    if (this[kReadyState] === WebSocket.CLOSING || this[kReadyState] === WebSocket.CLOSED) {
+    if (isClosing(this) || isClosed(this)) {
       // If this's ready state is CLOSING (2) or CLOSED (3)
       // Do nothing.
     } else if (!isEstablished(this)) {
@@ -193,7 +203,7 @@ class WebSocket extends EventTarget {
       // to CLOSING (2).
       failWebsocketConnection(this, 'Connection was closed before it was established.')
       this[kReadyState] = WebSocket.CLOSING
-    } else if (!isClosing(this)) {
+    } else if (this[kSentClose] === sentCloseFrameState.NOT_SENT) {
       // If the WebSocket closing handshake has not yet been started
       // Start the WebSocket closing handshake and set this's ready
       // state to CLOSING (2).
@@ -204,6 +214,8 @@ class WebSocket extends EventTarget {
       // - If reason is also present, then reasonBytes must be
       //   provided in the Close message after the status code.
 
+      this[kSentClose] = sentCloseFrameState.PROCESSING
+
       const frame = new WebsocketFrameSend()
 
       // If neither code nor reason is present, the WebSocket Close
@@ -230,7 +242,7 @@ class WebSocket extends EventTarget {
 
       socket.write(frame.createFrame(opcodes.CLOSE), (err) => {
         if (!err) {
-          this[kSentClose] = true
+          this[kSentClose] = sentCloseFrameState.SENT
         }
       })
 
@@ -258,7 +270,7 @@ class WebSocket extends EventTarget {
 
     // 1. If this's ready state is CONNECTING, then throw an
     //    "InvalidStateError" DOMException.
-    if (this[kReadyState] === WebSocket.CONNECTING) {
+    if (isConnecting(this)) {
       throw new DOMException('Sent before connected.', 'InvalidStateError')
     }