remove DOMException, structuredClone, WeakRef, FinalizationRegistry w…

…orkarounds

README.md

@@ -180,8 +180,6 @@ Implements [fetch](https://fetch.spec.whatwg.org/#fetch-method).
 * https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch
 * https://fetch.spec.whatwg.org/#fetch-method
 
-Only supported on Node 16.8+.
-
 Basic usage example:
 
 ```js

lib/compat/dispatcher-weakref.js

@@ -1,7 +1,5 @@
 'use strict'
 
-/* istanbul ignore file: only for Node 12 */
-
 const { kConnected, kSize } = require('../core/symbols')
 
 class CompatWeakRef {
@@ -41,8 +39,5 @@ module.exports = function () {
       FinalizationRegistry: CompatFinalizer
     }
   }
-  return {
-    WeakRef: global.WeakRef || CompatWeakRef,
-    FinalizationRegistry: global.FinalizationRegistry || CompatFinalizer
-  }
+  return { WeakRef, FinalizationRegistry }
 }

lib/fetch/body.js

@@ -13,7 +13,6 @@ const {
 const { FormData } = require('./formdata')
 const { kState } = require('./symbols')
 const { webidl } = require('./webidl')
-const { DOMException, structuredClone } = require('./constants')
 const { Blob, File: NativeFile } = require('buffer')
 const { kBodyUsed } = require('../core/symbols')
 const assert = require('assert')

lib/fetch/constants.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const { MessageChannel, receiveMessageOnPort } = require('worker_threads')
-
 const corsSafeListedMethods = ['GET', 'HEAD', 'POST']
 const corsSafeListedMethodsSet = new Set(corsSafeListedMethods)
 
@@ -92,41 +90,7 @@ const subresource = [
 ]
 const subresourceSet = new Set(subresource)
 
-/** @type {globalThis['DOMException']} */
-const DOMException = globalThis.DOMException ?? (() => {
-  // DOMException was only made a global in Node v17.0.0,
-  // but fetch supports >= v16.8.
-  try {
-    atob('~')
-  } catch (err) {
-    return Object.getPrototypeOf(err).constructor
-  }
-})()
-
-let channel
-
-/** @type {globalThis['structuredClone']} */
-const structuredClone =
-  globalThis.structuredClone ??
-  // https://github.com/nodejs/node/blob/b27ae24dcc4251bad726d9d84baf678d1f707fed/lib/internal/structured_clone.js
-  // structuredClone was added in v17.0.0, but fetch supports v16.8
-  function structuredClone (value, options = undefined) {
-    if (arguments.length === 0) {
-      throw new TypeError('missing argument')
-    }
-
-    if (!channel) {
-      channel = new MessageChannel()
-    }
-    channel.port1.unref()
-    channel.port2.unref()
-    channel.port1.postMessage(value, options?.transfer)
-    return receiveMessageOnPort(channel.port2).message
-  }
-
 module.exports = {
-  DOMException,
-  structuredClone,
   subresource,
   forbiddenMethods,
   requestBodyHeader,

lib/fetch/index.js

@@ -52,8 +52,7 @@ const {
   nullBodyStatus,
   safeMethodsSet,
   requestBodyHeader,
-  subresourceSet,
-  DOMException
+  subresourceSet
 } = require('./constants')
 const { kHeadersList } = require('../core/symbols')
 const EE = require('events')

lib/fetch/response.js

@@ -15,8 +15,7 @@ const {
 } = require('./util')
 const {
   redirectStatusSet,
-  nullBodyStatus,
-  DOMException
+  nullBodyStatus
 } = require('./constants')
 const { kState, kHeaders, kGuard, kRealm } = require('./symbols')
 const { webidl } = require('./webidl')

lib/fetch/util.js

@@ -1179,11 +1179,6 @@ function buildContentRange (rangeStart, rangeEnd, fullLength) {
   return contentRange
 }
 
-/**
- * Fetch supports node >= 16.8.0, but Object.hasOwn was added in v16.9.0.
- */
-const hasOwn = Object.hasOwn || ((dict, key) => Object.prototype.hasOwnProperty.call(dict, key))
-
 module.exports = {
   isAborted,
   isCancelled,
@@ -1216,7 +1211,6 @@ module.exports = {
   makeIterator,
   isValidHeaderName,
   isValidHeaderValue,
-  hasOwn,
   isErrorLike,
   fullyReadBody,
   bytesMatch,

lib/fetch/webidl.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { types } = require('util')
-const { hasOwn, toUSVString } = require('./util')
+const { toUSVString } = require('./util')
 
 /** @type {import('../../types/webidl').Webidl} */
 const webidl = {}
@@ -346,7 +346,7 @@ webidl.dictionaryConverter = function (converters) {
       const { key, defaultValue, required, converter } = options
 
       if (required === true) {
-        if (!hasOwn(dictionary, key)) {
+        if (!Object.hasOwn(dictionary, key)) {
           throw webidl.errors.exception({
             header: 'Dictionary',
             message: `Missing required key "${key}".`
@@ -355,7 +355,7 @@ webidl.dictionaryConverter = function (converters) {
       }
 
       let value = dictionary[key]
-      const hasDefault = hasOwn(options, 'defaultValue')
+      const hasDefault = Object.hasOwn(options, 'defaultValue')
 
       // Only use defaultValue if value is undefined and
       // a defaultValue options was provided.

lib/fileapi/util.js

@@ -9,7 +9,6 @@ const {
 } = require('./symbols')
 const { ProgressEvent } = require('./progressevent')
 const { getEncoding } = require('./encoding')
-const { DOMException } = require('../fetch/constants')
 const { serializeAMimeType, parseMIMEType } = require('../fetch/dataURL')
 const { types } = require('util')
 const { StringDecoder } = require('string_decoder')

lib/websocket/websocket.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const { webidl } = require('../fetch/webidl')
-const { DOMException } = require('../fetch/constants')
 const { URLSerializer } = require('../fetch/dataURL')
 const { getGlobalOrigin } = require('../fetch/global')
 const { staticPropertyDescriptors, states, opcodes, emptyBuffer } = require('./constants')

test/fetch/abort.js

@@ -4,7 +4,6 @@ const { test } = require('tap')
 const { fetch } = require('../..')
 const { createServer } = require('http')
 const { once } = require('events')
-const { DOMException } = require('../../lib/fetch/constants')
 
 const { AbortController: NPMAbortController } = require('abort-controller')
 

test/fetch/abort2.js

@@ -4,7 +4,6 @@ const { test } = require('tap')
 const { fetch } = require('../..')
 const { createServer } = require('http')
 const { once } = require('events')
-const { DOMException } = require('../../lib/fetch/constants')
 
 /* global AbortController */
 

test/fetch/issue-2171.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const { fetch } = require('../..')
-const { DOMException } = require('../../lib/fetch/constants')
 const { once } = require('events')
 const { createServer } = require('http')
 const { test } = require('tap')

test/jest/instanceof-error.test.js

@@ -10,7 +10,6 @@ jest.useRealTimers()
 
 it('isErrorLike sanity check', () => {
   const { isErrorLike } = require('../../lib/fetch/util')
-  const { DOMException } = require('../../lib/fetch/constants')
   const error = new DOMException('')
 
   // https://github.com/facebook/jest/issues/2549