From 4b2b4e39ee70f32c78011eccf3fa517170336d26 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 14 Dec 2021 23:03:10 +0100
Subject: [PATCH] Follow redirects properly when making requests

---
 play-dl/Request/index.ts | 51 +++++++++++++++++++++++++---------------
 tsup.config.json         |  3 ++-
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/play-dl/Request/index.ts b/play-dl/Request/index.ts
index 186b076..c5765d6 100644
--- a/play-dl/Request/index.ts
+++ b/play-dl/Request/index.ts
@@ -11,14 +11,6 @@ interface RequestOpts extends RequestOptions {
     cookies?: boolean;
 }
 
-interface ProxyOpts {
-    host: string;
-    port: number;
-    authentication?: {
-        username: string;
-        password: string;
-    };
-}
 /**
  * Main module which play-dl uses to make a request to stream url.
  * @param url URL to make https request to
@@ -39,7 +31,37 @@ export function request_stream(req_url: string, options: RequestOpts = { method:
     });
 }
 /**
- * Main module which play-dl uses to make a proxy or normal request
+ * Makes a request and follows redirects if necessary
+ * @param req_url URL to make https request to
+ * @param cookies_added Whether cookies were added or not
+ * @param options Request options for https request
+ * @returns A promise with the final response object
+ */
+function internalRequest(
+    req_url: string,
+    cookies_added: boolean,
+    options: RequestOpts = { method: 'GET' }
+): Promise<IncomingMessage> {
+    return new Promise(async (resolve, reject) => {
+        let res = await https_getter(req_url, options).catch((err: Error) => err);
+        if (res instanceof Error) {
+            reject(res);
+            return;
+        }
+        if (res.headers && res.headers['set-cookie'] && cookies_added) {
+            cookieHeaders(res.headers['set-cookie']);
+        }
+        if (Number(res.statusCode) >= 300 && Number(res.statusCode) < 400) {
+            res = await internalRequest(res.headers.location as string, cookies_added, options);
+        } else if (Number(res.statusCode) > 400) {
+            reject(new Error(`Got ${res.statusCode} from the request`));
+            return;
+        }
+        resolve(res);
+    });
+}
+/**
+ * Main module which play-dl uses to make a request
  * @param url URL to make https request to
  * @param options Request options for https request
  * @returns body of that request
@@ -61,20 +83,11 @@ export function request(req_url: string, options: RequestOpts = { method: 'GET'
                 'user-agent': getRandomUserAgent()
             };
         }
-        let res = await https_getter(req_url, options).catch((err: Error) => err);
+        const res = await internalRequest(req_url, cookies_added, options).catch((err: Error) => err);
         if (res instanceof Error) {
             reject(res);
             return;
         }
-        if (res.headers && res.headers['set-cookie'] && cookies_added) {
-            cookieHeaders(res.headers['set-cookie']);
-        }
-        if (Number(res.statusCode) >= 300 && Number(res.statusCode) < 400) {
-            res = await https_getter(res.headers.location as string, options).catch((err) => err);
-            if (res instanceof Error) throw res;
-        } else if (Number(res.statusCode) > 400) {
-            reject(new Error(`Got ${res.statusCode} from the request`));
-        }
         const data: string[] = [];
         let decoder: BrotliDecompress | Gunzip | Deflate | undefined = undefined;
         const encoding = res.headers['content-encoding'];
diff --git a/tsup.config.json b/tsup.config.json
index 19b74dd..060e9eb 100644
--- a/tsup.config.json
+++ b/tsup.config.json
@@ -12,5 +12,6 @@
     "skipNodeModulesBundle": true,
     "sourcemap": true,
     "target": "es2021",
-    "splitting": false
+    "splitting": false,
+    "keepNames": true
 }