@mherod/get-cookie 2.0.0-rc.15 → 2.0.0-rc.17

package/dist/index.js

@@ -789,7 +789,11 @@ function $2d84054eb5f070a6$export$f266452a5050185d(url) {
 
 
 const $cfc07ae4aa2c7e44$var$userAgent = new (0, ($parcel$interopDefault($7oI3p$useragents)))().toString();
-async function $cfc07ae4aa2c7e44$export$b24a545a0b39f491(url, options = {}, fetch = (0, $7oI3p$crossfetch.fetch)) {
+async function $cfc07ae4aa2c7e44$export$b24a545a0b39f491(url, options = {}, fetch = (0, $7oI3p$crossfetch.fetch), originalRequest) {
+    const originalRequest1 = originalRequest || {
+        url: url,
+        options: options
+    };
     const headers = {
         "User-Agent": $cfc07ae4aa2c7e44$var$userAgent
     };
@@ -816,20 +820,36 @@ async function $cfc07ae4aa2c7e44$export$b24a545a0b39f491(url, options = {}, fetc
         });
         for (const [key, value] of headers1)if (key === "set-cookie") {
             await (0, $53a3bcc99a05dfcf$export$928a906645f9d018).setCookie(value, url2);
-            if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log((0, $7oI3p$colorette.blue)(`Set-Cookie: ${(0, $7oI3p$colorette.yellow)(value)} ${(0, $7oI3p$colorette.yellow)(url2)}`));
-        // const cookie = tough.parse(value);
-        // if (cookie instanceof Cookie) {
-        //   await memoryCookieStore.putCookie(cookie);
-        // }
+            if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log((0, $7oI3p$colorette.blue)(`Set-Cookie:`), (0, $7oI3p$colorette.yellow)(value), (0, $7oI3p$colorette.yellow)(url2));
         }
-        const newUrl = res.headers.get("location");
-        if (res.status == 301 || res.status == 302) // const sameHost = new URL(newUrl).host === url1.host;
+        const newUrl = res.headers.get("location") ?? res.url;
+        const sameHost = new URL(newUrl).host === url1.host;
+        if (res.status == 301 || res.status == 302) // follow the redirect
         {
             if (newUrl && newUrl !== url2) {
                 if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log((0, $7oI3p$colorette.blue)(`Redirected to `), (0, $7oI3p$colorette.yellow)(newUrl));
                 return $cfc07ae4aa2c7e44$export$b24a545a0b39f491(//
-                newUrl, newOptions1, fetch);
+                newUrl, newOptions1, fetch, originalRequest1);
+            }
+        }
+        if (res.status == 303 && newUrl && newUrl !== url2) {
+            // follow the redirect with GET
+            let newOptions2 = {};
+            switch(newOptions1.method){
+                case "POST":
+                case "PUT":
+                case "DELETE":
+                    (0, $7oI3p$lodash.merge)(newOptions2, newOptions1, {
+                        method: "GET"
+                    });
+                    break;
+                default:
+                    (0, $7oI3p$lodash.merge)(newOptions2, newOptions1);
+                    break;
             }
+            if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log((0, $7oI3p$colorette.blue)(`Redirected to `), (0, $7oI3p$colorette.yellow)(newUrl));
+            return $cfc07ae4aa2c7e44$export$b24a545a0b39f491(//
+            newUrl, newOptions2, fetch, originalRequest1);
         }
         const arrayBuffer1 = res.arrayBuffer();
         async function arrayBuffer() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mherod/get-cookie",
-  "version": "2.0.0-rc.15",
+  "version": "2.0.0-rc.17",
   "description": "Node.js module for querying a local user's Chrome cookie",
   "source": "src/index.ts",
   "bin": "dist/cli.js",

package/src/fetchWithCookies.ts

@@ -14,11 +14,18 @@ import CookieSpec from "./CookieSpec";
 
 const userAgent = new UserAgent().toString();
 
+interface FetchRequestInit {
+  url: RequestInfo | URL | string;
+  options?: RequestInit;
+}
+
 export async function fetchWithCookies(
-  url: RequestInfo | URL,
+  url: RequestInfo | URL | string,
   options: RequestInit | undefined = {},
-  fetch: Function = fetchImpl
+  fetch: Function = fetchImpl,
+  originalRequest: FetchRequestInit | undefined = undefined
 ): Promise<Response> {
+  const originalRequest1 = originalRequest || { url, options };
   const headers: HeadersInit = {
     "User-Agent": userAgent,
   };
@@ -46,18 +53,15 @@ export async function fetchWithCookies(
       if (key === "set-cookie") {
         await cookieJar.setCookie(value, url2);
         if (parsedArgs.verbose) {
-          console.log(blue(`Set-Cookie: ${yellow(value)} ${yellow(url2)}`));
+          console.log(blue(`Set-Cookie:`), yellow(value), yellow(url2));
         }
-        // const cookie = tough.parse(value);
-        // if (cookie instanceof Cookie) {
-        //   await memoryCookieStore.putCookie(cookie);
-        // }
       }
     }
 
-    const newUrl: string = res.headers.get("location") as string;
+    const newUrl: string = res.headers.get("location") ?? res.url;
+    const sameHost = new URL(newUrl).host === url1.host;
     if (res.status == 301 || res.status == 302) {
-      // const sameHost = new URL(newUrl).host === url1.host;
+      // follow the redirect
       if (newUrl && newUrl !== url2) {
         if (parsedArgs.verbose) {
           console.log(blue(`Redirected to `), yellow(newUrl));
@@ -66,11 +70,37 @@ export async function fetchWithCookies(
           //
           newUrl,
           newOptions1,
-          fetch
+          fetch,
+          originalRequest1
           //
         );
       }
     }
+    if (res.status == 303 && newUrl && newUrl !== url2) {
+      // follow the redirect with GET
+      let newOptions2: RequestInit = {};
+      switch (newOptions1.method) {
+        case "POST":
+        case "PUT":
+        case "DELETE":
+          merge(newOptions2, newOptions1, { method: "GET" });
+          break;
+        default:
+          merge(newOptions2, newOptions1);
+          break;
+      }
+      if (parsedArgs.verbose) {
+        console.log(blue(`Redirected to `), yellow(newUrl));
+      }
+      return fetchWithCookies(
+        //
+        newUrl,
+        newOptions2,
+        fetch,
+        originalRequest1
+        //
+      );
+    }
 
     const arrayBuffer1: Promise<ArrayBuffer> = res.arrayBuffer();
 
@@ -83,11 +113,11 @@ export async function fetchWithCookies(
     }
 
     async function text(): Promise<string> {
-      return buffer().then((buffer) => buffer.toString("utf8"));
+      return buffer().then((buffer: Buffer) => buffer.toString("utf8"));
     }
 
     async function json(): Promise<any> {
-      return text().then((text) => destr(text));
+      return text().then((text: string) => destr(text));
     }
 
     async function formData(): Promise<FormData> {