Skip to content

refactor: simplify request error handling #3364

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jun 25, 2024
Merged

refactor: simplify request error handling #3364

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da3455a
refactor: simplify request error handling
ronag Jun 23, 2024
85d7eed
Merge branch 'main' into request-error
ronag Jun 24, 2024
68320ff
fixup
ronag Jun 24, 2024
bcb26e4
fixup
ronag Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 15 additions & 20 deletions lib/api/api-request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,30 +56,21 @@ class RequestHandler extends AsyncResource {
this.onInfo = onInfo || null
this.throwOnError = throwOnError
this.highWaterMark = highWaterMark
this.signal = signal
this.reason = null
this.removeAbortListener = null

if (util.isStream(body)) {
body.on('error', (err) => {
this.onError(err)
if (signal?.aborted) {
this.reason = signal.reason ?? new RequestAbortedError()
} else if (signal) {
this.removeAbortListener = util.addAbortListener(signal, () => {
this.reason = signal.reason ?? new RequestAbortedError()
if (this.res) {
util.destroy(this.res, this.reason)
} else if (this.abort) {
this.abort(this.reason)
}
})
}

if (this.signal) {
if (this.signal.aborted) {
this.reason = this.signal.reason ?? new RequestAbortedError()
} else {
this.removeAbortListener = util.addAbortListener(this.signal, () => {
this.reason = this.signal.reason ?? new RequestAbortedError()
if (this.res) {
util.destroy(this.res, this.reason)
} else if (this.abort) {
this.abort(this.reason)
}
})
}
}
}

onConnect (abort, context) {
Expand Down Expand Up @@ -174,7 +165,11 @@ class RequestHandler extends AsyncResource {

if (body) {
this.body = null
util.destroy(body, err)

if (util.isStream(body)) {
body.on('error', util.nop)
util.destroy(body, err)
}
}

if (this.removeAbortListener) {
Expand Down