@mherod/get-cookie 2.0.0-rc.12 → 2.0.0-rc.14

package/dist/index.js

@@ -788,9 +788,10 @@ 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)) {
     const headers = {
-        "User-Agent": new (0, ($parcel$interopDefault($7oI3p$useragents)))().toString()
+        "User-Agent": $cfc07ae4aa2c7e44$var$userAgent
     };
     const defaultOptions = {
         headers: headers,
@@ -799,16 +800,13 @@ async function $cfc07ae4aa2c7e44$export$b24a545a0b39f491(url, options = {}, fetc
     const url2 = `${url}`;
     const url1 = new URL(url2);
     const cookieSpecs = (0, $2d84054eb5f070a6$export$f266452a5050185d)(url1);
-    const cookie = await (0, $4ffeaeb7bb3c0319$export$cfc0723de5712e57)(cookieSpecs).catch(()=>"");
-    if (cookie.length > 0) (0, $7oI3p$lodash.merge)(headers, {
-        Cookie: cookie
-    });
+    headers["Cookie"] = await (0, $4ffeaeb7bb3c0319$export$cfc0723de5712e57)(cookieSpecs).catch(()=>"");
     if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b)["dump-request-headers"]) console.log((0, $7oI3p$colorette.blue)("Request headers:"), headers);
-    const newOptions1 = (0, $7oI3p$lodash.merge)(defaultOptions, options, {
+    const newOptions1 = (0, $7oI3p$lodash.merge)(defaultOptions, {
         headers: headers
-    });
+    }, options);
     try {
-        const res = await fetch(url2, newOptions1);
+        const res = await fetch(url1, newOptions1);
         const headers1 = [];
         res.headers.forEach((value, key)=>{
             headers1.push([
@@ -825,9 +823,13 @@ async function $cfc07ae4aa2c7e44$export$b24a545a0b39f491(url, options = {}, fetc
         // }
         }
         const newUrl = res.headers.get("location");
-        if (res.redirected || 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);
+        if (res.status == 301 || res.status == 302) // const sameHost = new URL(newUrl).host === url1.host;
+        {
+            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);
+            }
         }
         const arrayBuffer1 = res.arrayBuffer();
         async function arrayBuffer() {

package/package.json

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

package/src/fetchWithCookies.ts

@@ -19,7 +19,7 @@ export async function fetchWithCookies(
   options: RequestInit | undefined = {},
   fetch: Function = fetchImpl
 ): Promise<Response> {
-  const headers = {
+  const headers: HeadersInit = {
     "User-Agent": userAgent,
   };
   const defaultOptions: RequestInit = {
@@ -29,18 +29,15 @@ export async function fetchWithCookies(
   const url2: string = `${url}`;
   const url1: URL = new URL(url2);
   const cookieSpecs: CookieSpec[] = cookieSpecsFromUrl(url1);
-  const cookie = await getMergedRenderedCookies(cookieSpecs).catch(() => "");
-  if (cookie.length > 0) {
-    merge(headers, {
-      Cookie: cookie,
-    });
-  }
+  headers["Cookie"] = await getMergedRenderedCookies(cookieSpecs).catch(
+    () => ""
+  );
   if (parsedArgs["dump-request-headers"]) {
     console.log(blue("Request headers:"), headers);
   }
-  const newOptions1: RequestInit = merge(defaultOptions, options, { headers });
+  const newOptions1: RequestInit = merge(defaultOptions, { headers }, options);
   try {
-    const res: Response = await fetch(url2, newOptions1);
+    const res: Response = await fetch(url1, newOptions1);
     const headers: [string, string][] = [];
     res.headers.forEach((value, key) => {
       headers.push([key, value]);
@@ -59,14 +56,19 @@ export async function fetchWithCookies(
     }
 
     const newUrl: string = res.headers.get("location") as string;
-    if (res.status >= 300 && res.status < 400) {
+    if (res.status == 301 || res.status == 302) {
+      // const sameHost = new URL(newUrl).host === url1.host;
       if (newUrl && newUrl !== url2) {
         if (parsedArgs.verbose) {
           console.log(blue(`Redirected to `), yellow(newUrl));
         }
-        return fetchWithCookies(newUrl, newOptions1);
-      } else {
-        throw new Error("Redirected but no new location");
+        return fetchWithCookies(
+          //
+          newUrl,
+          newOptions1,
+          fetch
+          //
+        );
       }
     }