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

package/dist/index.js

@@ -789,7 +789,8 @@ 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 || new Request(url, options);
     const headers = {
         "User-Agent": $cfc07ae4aa2c7e44$var$userAgent
     };
@@ -816,20 +817,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-lock.json

@@ -1,25 +1,25 @@
 {
   "name": "@mherod/get-cookie",
-  "version": "2.0.0-rc.11",
+  "version": "2.0.0-rc.14",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@mherod/get-cookie",
-      "version": "2.0.0-rc.11",
+      "version": "2.0.0-rc.14",
       "license": "ISC",
       "dependencies": {
         "colorette": "^2.0.19",
         "cross-fetch": "^3.1.5",
-        "destr": "^1.1.1",
+        "destr": "^1.2.0",
         "jsonwebtoken": "^8.5.1",
         "lodash": "^4.17.21",
         "lru-cache": "^7.14.0",
-        "minimist": "^1.2.6",
-        "sqlite3": "^5.1.1",
+        "minimist": "^1.2.7",
+        "sqlite3": "^5.1.2",
         "tough-cookie": "^4.1.2",
         "tough-cookie-file-store": "^2.0.3",
-        "user-agents": "^1.0.1165"
+        "user-agents": "^1.0.1178"
       },
       "bin": {
         "get-cookie": "dist/cli.js"
@@ -30,7 +30,7 @@
         "@types/jsonwebtoken": "^8.5.9",
         "@types/lodash": "^4.14.186",
         "@types/minimist": "^1.2.2",
-        "@types/node": "^18.8.2",
+        "@types/node": "^18.11.4",
         "@types/tough-cookie": "^4.0.2",
         "@types/user-agents": "^1.0.2",
         "parcel": "^2.7.0",
@@ -1837,9 +1837,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.8.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.4.tgz",
-      "integrity": "sha512-WdlVphvfR/GJCLEMbNA8lJ0lhFNBj4SW3O+O5/cEGw9oYrv0al9zTwuQsq+myDUXgNx2jgBynoVgZ2MMJ6pbow==",
+      "version": "18.11.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.4.tgz",
+      "integrity": "sha512-BxcJpBu8D3kv/GZkx/gSMz6VnTJREBj/4lbzYOQueUOELkt8WrO6zAcSPmp9uRPEW/d+lUO8QK0W2xnS1hEU0A==",
       "dev": true
     },
     "node_modules/@types/parse-json": {
@@ -2325,9 +2325,9 @@
       }
     },
     "node_modules/destr": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/destr/-/destr-1.1.1.tgz",
-      "integrity": "sha512-QqkneF8LrYmwATMdnuD2MLI3GHQIcBnG6qFC2q9bSH430VTCDAVjcspPmUaKhPGtAtPAftIUFqY1obQYQuwmbg=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destr/-/destr-1.2.0.tgz",
+      "integrity": "sha512-JG+cG4ZPB1L27sl2C2URg8MIOmIUtTbE5wEx02BpmrTCqg/hXxFKXsYsnODl5PdpqNRaS1KQGUQ56V8jk8XpYQ=="
     },
     "node_modules/detect-indent": {
       "version": "6.0.0",
@@ -3266,9 +3266,12 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/minipass": {
       "version": "3.1.6",
@@ -4319,9 +4322,9 @@
       }
     },
     "node_modules/user-agents": {
-      "version": "1.0.1166",
-      "resolved": "https://registry.npmjs.org/user-agents/-/user-agents-1.0.1166.tgz",
-      "integrity": "sha512-/8J171KFx2McruR5C7pVSReA5YVeve4bDizT+JL77C7R+v0/Hq9wTTfvxIGd5TDWP98TXnmOghifZtFbjUHMuA==",
+      "version": "1.0.1178",
+      "resolved": "https://registry.npmjs.org/user-agents/-/user-agents-1.0.1178.tgz",
+      "integrity": "sha512-xcE6igv9dKy3ZrGwHr6ga1eDXyr0ln+BF/OhtoLxm86CHk1APqxo9HqvLYYNS3s80XwuVdl7vdEhMXCTXXCPpw==",
       "dependencies": {
         "dot-json": "^1.2.2",
         "lodash.clonedeep": "^4.5.0"
@@ -5643,9 +5646,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "18.8.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.4.tgz",
-      "integrity": "sha512-WdlVphvfR/GJCLEMbNA8lJ0lhFNBj4SW3O+O5/cEGw9oYrv0al9zTwuQsq+myDUXgNx2jgBynoVgZ2MMJ6pbow==",
+      "version": "18.11.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.4.tgz",
+      "integrity": "sha512-BxcJpBu8D3kv/GZkx/gSMz6VnTJREBj/4lbzYOQueUOELkt8WrO6zAcSPmp9uRPEW/d+lUO8QK0W2xnS1hEU0A==",
       "dev": true
     },
     "@types/parse-json": {
@@ -6012,9 +6015,9 @@
       "optional": true
     },
     "destr": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/destr/-/destr-1.1.1.tgz",
-      "integrity": "sha512-QqkneF8LrYmwATMdnuD2MLI3GHQIcBnG6qFC2q9bSH430VTCDAVjcspPmUaKhPGtAtPAftIUFqY1obQYQuwmbg=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destr/-/destr-1.2.0.tgz",
+      "integrity": "sha512-JG+cG4ZPB1L27sl2C2URg8MIOmIUtTbE5wEx02BpmrTCqg/hXxFKXsYsnODl5PdpqNRaS1KQGUQ56V8jk8XpYQ=="
     },
     "detect-indent": {
       "version": "6.0.0",
@@ -6670,9 +6673,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="
     },
     "minipass": {
       "version": "3.1.6",
@@ -7436,9 +7439,9 @@
       }
     },
     "user-agents": {
-      "version": "1.0.1166",
-      "resolved": "https://registry.npmjs.org/user-agents/-/user-agents-1.0.1166.tgz",
-      "integrity": "sha512-/8J171KFx2McruR5C7pVSReA5YVeve4bDizT+JL77C7R+v0/Hq9wTTfvxIGd5TDWP98TXnmOghifZtFbjUHMuA==",
+      "version": "1.0.1178",
+      "resolved": "https://registry.npmjs.org/user-agents/-/user-agents-1.0.1178.tgz",
+      "integrity": "sha512-xcE6igv9dKy3ZrGwHr6ga1eDXyr0ln+BF/OhtoLxm86CHk1APqxo9HqvLYYNS3s80XwuVdl7vdEhMXCTXXCPpw==",
       "requires": {
         "dot-json": "^1.2.2",
         "lodash.clonedeep": "^4.5.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mherod/get-cookie",
-  "version": "2.0.0-rc.14",
+  "version": "2.0.0-rc.16",
   "description": "Node.js module for querying a local user's Chrome cookie",
   "source": "src/index.ts",
   "bin": "dist/cli.js",
@@ -59,15 +59,15 @@
   "dependencies": {
     "colorette": "^2.0.19",
     "cross-fetch": "^3.1.5",
-    "destr": "^1.1.1",
+    "destr": "^1.2.0",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.0",
-    "minimist": "^1.2.6",
-    "sqlite3": "^5.1.1",
+    "minimist": "^1.2.7",
+    "sqlite3": "^5.1.2",
     "tough-cookie": "^4.1.2",
     "tough-cookie-file-store": "^2.0.3",
-    "user-agents": "^1.0.1165"
+    "user-agents": "^1.0.1178"
   },
   "devDependencies": {
     "@parcel/packager-ts": "^2.7.0",
@@ -75,7 +75,7 @@
     "@types/jsonwebtoken": "^8.5.9",
     "@types/lodash": "^4.14.186",
     "@types/minimist": "^1.2.2",
-    "@types/node": "^18.8.2",
+    "@types/node": "^18.11.4",
     "@types/tough-cookie": "^4.0.2",
     "@types/user-agents": "^1.0.2",
     "parcel": "^2.7.0",

package/src/fetchWithCookies.ts

@@ -17,8 +17,10 @@ const userAgent = new UserAgent().toString();
 export async function fetchWithCookies(
   url: RequestInfo | URL,
   options: RequestInit | undefined = {},
-  fetch: Function = fetchImpl
+  fetch: Function = fetchImpl,
+  originalRequest: Request | undefined = undefined
 ): Promise<Response> {
+  const originalRequest1 = originalRequest || new Request(url, options);
   const headers: HeadersInit = {
     "User-Agent": userAgent,
   };
@@ -46,18 +48,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 +65,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 +108,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> {