Prevent calling .abort() on a destroyed request

sindresorhus · Apr 26, 2020 · 63c1b72 · 63c1b72
1 parent 3da16e0
commit 63c1b72
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/source/core/index.ts b/source/core/index.ts
@@ -1447,12 +1447,14 @@ export default class Request extends Duplex implements RequestEvents<Request> {
 
 	_destroy(error: Error | null, callback: (error: Error | null) => void): void {
 		if (kRequest in this) {
-			// TODO: Remove the next `if` when https://github.com/nodejs/node/issues/32851 gets fixed
-			if (!(this[kResponse]?.complete)) {
+			// TODO: Remove the next `if` when these get fixed:
+			// - https://github.com/nodejs/node/issues/32851
+			// - https://github.com/nock/nock/issues/1981
+			if (!this[kResponse]?.complete && !this[kRequest]?.destroyed) {
 				this[kRequest]!.abort();
 			}
 		} else {
-			this.once('finalized', (): void => {
+			this.prependOnceListener('finalized', (): void => {
 				if (kRequest in this) {
 					this[kRequest]!.abort();
 				}

diff --git a/source/core/utils/timed-out.ts b/source/core/utils/timed-out.ts
@@ -68,10 +68,6 @@ export default (request: ClientRequest, delays: Delays, options: TimedOutOptions
 	const {host, hostname} = options;
 
 	const timeoutHandler = (delay: number, event: string): void => {
-		if (request.socket) {
-			(request.socket as any)._hadError = true;
-		}
-
 		request.destroy(new TimeoutError(delay, event));
 	};