fix: fix sometimes making an extra request on redirects

fent · Nov 20, 2020 · 37b7f5d · 37b7f5d
1 parent e72c5f6
commit 37b7f5d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -195,6 +195,7 @@ function Miniget(url: string, options: Miniget.Options = {}): Miniget.Stream {
 
     const cleanup = () => {
       activeRequest.removeListener('error', onError);
+      activeRequest.removeListener('close', onRequestClose);
       activeResponse?.removeListener('data', onData);
       activeDecodedStream?.removeListener('end', onEnd);
       activeDecodedStream?.removeListener('error', onError);
@@ -221,23 +222,23 @@ function Miniget(url: string, options: Miniget.Options = {}): Miniget.Stream {
           setTimeout(doDownload, res.headers['retry-after'] ? parseInt(res.headers['retry-after'], 10) * 1000: 0);
           stream.emit('redirect', url);
         }
-        return;
+        return cleanup();
 
         // Check for rate limiting.
       } else if (retryStatusCodes.has(res.statusCode)) {
         if (!retryRequest({ retryAfter: parseInt(res.headers['retry-after'], 10) })) {
           let err = new Miniget.MinigetError('Status code: ' + res.statusCode, res.statusCode);
           stream.emit('error', err);
         }
-        return;
+        return cleanup();
       } else if (res.statusCode < 200 || 400 <= res.statusCode) {
         let err = new Miniget.MinigetError('Status code: ' + res.statusCode, res.statusCode);
         if (res.statusCode >= 500) {
           onError(err, res.statusCode);
         } else {
           stream.emit('error', err);
         }
-        return;
+        return cleanup();
       }
 
       activeDecodedStream = res as unknown as Transform;