Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: non-object error in abort throws bad error #2597

Merged
merged 1 commit into from
Jan 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion index-fetch.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
}
Expand Down
10 changes: 10 additions & 0 deletions test/fetch/issue-2242.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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.fetch('http://localhost', {
signal: AbortSignal.abort('Already aborted')
}),
/Already aborted/
)
})