got 15.0.3 → 15.0.5

package/dist/source/core/index.d.ts

@@ -103,7 +103,7 @@ export default class Request extends Duplex implements RequestEvents<Request> {
     private _triggerRead;
     private readonly _jobs;
     private _cancelTimeouts?;
-    private readonly _abortListenerDisposer?;
+    private _abortListenerDisposer?;
     private _flushed;
     private _aborted;
     private _expectedContentLength?;
@@ -123,6 +123,7 @@ export default class Request extends Duplex implements RequestEvents<Request> {
         end?: boolean;
     }): T;
     unpipe<T extends NodeJS.WritableStream>(destination: T): this;
+    private _attachAbortListener;
     private _shouldIncrementallyDecodeBody;
     private _checkContentLengthMismatch;
     private _finalizeBody;

package/dist/source/core/index.js

@@ -218,24 +218,6 @@ export default class Request extends Duplex {
         if (is.nodeStream(body)) {
             body.once('error', this._onBodyError);
         }
-        if (this.options.signal) {
-            const abort = () => {
-                // See https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/timeout_static#return_value
-                if (this.options.signal?.reason?.name === 'TimeoutError') {
-                    this.destroy(new TimeoutError(this.options.signal.reason, this.timings, this));
-                }
-                else {
-                    this.destroy(new AbortError(this));
-                }
-            };
-            if (this.options.signal.aborted) {
-                abort();
-            }
-            else {
-                const abortListenerDisposer = addAbortListener(this.options.signal, abort);
-                this._abortListenerDisposer = abortListenerDisposer;
-            }
-        }
     }
     async flush() {
         if (this._flushed) {
@@ -243,6 +225,10 @@ export default class Request extends Duplex {
         }
         this._flushed = true;
         try {
+            this._attachAbortListener();
+            if (this.destroyed) {
+                return;
+            }
             await this._finalizeBody();
             if (this.destroyed) {
                 return;
@@ -456,7 +442,13 @@ export default class Request extends Duplex {
                 if (progress.percent < 1) {
                     this.emit('downloadProgress', progress);
                 }
+                if (this._stopReading) {
+                    return;
+                }
                 this.push(data);
+                if (this._stopReading) {
+                    return;
+                }
             }
         }
     }
@@ -558,6 +550,30 @@ export default class Request extends Duplex {
         super.unpipe(destination);
         return this;
     }
+    _attachAbortListener() {
+        if (this._abortListenerDisposer) {
+            return;
+        }
+        const { signal } = this.options;
+        if (!signal) {
+            return;
+        }
+        const abort = () => {
+            // See https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/timeout_static#return_value
+            if (signal.reason?.name === 'TimeoutError') {
+                this.destroy(new TimeoutError(signal.reason, this.timings, this));
+            }
+            else {
+                this.destroy(new AbortError(this));
+            }
+        };
+        if (signal.aborted) {
+            abort();
+        }
+        else {
+            this._abortListenerDisposer = addAbortListener(signal, abort);
+        }
+    }
     _shouldIncrementallyDecodeBody() {
         const { responseType, encoding } = this.options;
         return Boolean(this._noPipe)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "got",
-	"version": "15.0.3",
+	"version": "15.0.5",
 	"description": "Human-friendly and powerful HTTP request library for Node.js",
 	"license": "MIT",
 	"repository": "sindresorhus/got",