fix: non-object error in abort throws bad error

nodejs · Jan 7, 2024 · e093856 · e093856
1 parent 62278d5
commit e093856
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/index-fetch.js b/index-fetch.js
@@ -4,7 +4,9 @@ const fetchImpl = require('./lib/fetch').fetch
 
 module.exports.fetch = function fetch (resource, init = undefined) {
   return fetchImpl(resource, init).catch((err) => {
-    Error.captureStackTrace(err, this)
+    if (typeof err === 'object') {
+      Error.captureStackTrace(err, this)
+    }
     throw err
   })
 }

diff --git a/test/fetch/issue-2242.js b/test/fetch/issue-2242.js
@@ -3,6 +3,7 @@
 const { test } = require('node:test')
 const assert = require('node:assert')
 const { fetch } = require('../..')
+const nodeFetch = require('../../index-fetch')
 
 test('fetch with signal already aborted', async () => {
   await assert.rejects(
@@ -12,3 +13,12 @@ test('fetch with signal already aborted', async () => {
     /Already aborted/
   )
 })
+
+test('fetch with signal already aborted (from index-fetch)', async () => {
+  await assert.rejects(
+    nodeFetch('http://localhost', {
+      signal: AbortSignal.abort('Already aborted')
+    }),
+    /Already aborted/
+  )
+})