fix: allow third party AbortControllers (#1609)

* fix: allow third party AbortControllers * fix: lint Co-authored-by: Matthew Aitken <[email protected]>
nodejs · Aug 19, 2022 · 417e7ab · 417e7ab
1 parent 8549a94
commit 417e7ab
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/lib/fetch/request.js b/lib/fetch/request.js
@@ -835,6 +835,10 @@ webidl.converters.RequestInfo = function (V) {
   return webidl.converters.USVString(V)
 }
 
+webidl.converters.AbortSignal = webidl.interfaceConverter(
+  AbortSignal
+)
+
 // https://fetch.spec.whatwg.org/#requestinit
 webidl.converters.RequestInit = webidl.dictionaryConverter([
   {
@@ -909,7 +913,12 @@ webidl.converters.RequestInit = webidl.dictionaryConverter([
   },
   {
     key: 'signal',
-    converter: webidl.converters.any
+    converter: webidl.nullableConverter(
+      (signal) => webidl.converters.AbortSignal(
+        signal,
+        { strict: false }
+      )
+    )
   },
   {
     key: 'window',

diff --git a/test/fetch/request.js b/test/fetch/request.js
@@ -5,7 +5,8 @@
 const { test } = require('tap')
 const {
   Request,
-  Headers
+  Headers,
+  fetch
 } = require('../../')
 const { kState } = require('../../lib/fetch/symbols.js')
 const hasSignalReason = !!~process.version.localeCompare('v16.14.0', undefined, { numeric: true })
@@ -421,3 +422,16 @@ test('invalid RequestInit values', (t) => {
 
   t.end()
 })
+
+test('RequestInit.signal option', async (t) => {
+  t.throws(() => {
+    // eslint-disable-next-line no-new
+    new Request('http://asd', {
+      signal: true
+    })
+  }, TypeError)
+
+  await t.rejects(fetch('http://asd', {
+    signal: false
+  }), TypeError)
+})