refactor: simplify request error handling (#3364)

* refactor: simplify request error handling

* fixup

* fixup

lib/api/api-request.js

@@ -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) {
@@ -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) {