@mherod/get-cookie 2.0.0-rc.6 → 2.0.0-rc.7

package/dist/index.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 var $7oI3p$lodash = require("lodash");
+var $7oI3p$minimist = require("minimist");
 var $7oI3p$lrucache = require("lru-cache");
 var $7oI3p$colorette = require("colorette");
 var $7oI3p$fs = require("fs");
@@ -12,6 +13,7 @@ var $7oI3p$toughcookiefilestore = require("tough-cookie-file-store");
 var $7oI3p$jsonwebtoken = require("jsonwebtoken");
 var $7oI3p$crossfetch = require("cross-fetch");
 var $7oI3p$destr = require("destr");
+var $7oI3p$useragents = require("user-agents");
 
 function $parcel$export(e, n, v, s) {
   Object.defineProperty(e, n, {get: v, set: s, enumerable: true, configurable: true});
@@ -42,11 +44,9 @@ $parcel$export(module.exports, "getFirefoxCookie", () => $f9b70200901ad17d$expor
 $parcel$export(module.exports, "getGroupedRenderedCookies", () => $300d8b33187a203c$export$4d2e9997e2c23417);
 $parcel$export(module.exports, "fetchWithCookies", () => $cfc07ae4aa2c7e44$export$b24a545a0b39f491);
 
-const $fac425c10fbbada5$export$a7b6bc01c63cdfc3 = {};
-(0, $7oI3p$lodash.merge)($fac425c10fbbada5$export$a7b6bc01c63cdfc3, process.env);
-const $fac425c10fbbada5$export$a7c5707626fc90f = $fac425c10fbbada5$export$a7b6bc01c63cdfc3["HOME"];
-if (!$fac425c10fbbada5$export$a7c5707626fc90f) throw new Error("HOME environment variable is not set");
 
+const $ef3d5dc2fd8022f5$export$6f4ae1207c703045 = process.argv ?? [];
+const $ef3d5dc2fd8022f5$export$c348dfaf65040d9b = (0, ($parcel$interopDefault($7oI3p$minimist)))($ef3d5dc2fd8022f5$export$6f4ae1207c703045.slice(2));
 
 
 
@@ -68,35 +68,26 @@ async function $25b78d6746d4ad48$export$8d71c74f97c0202e(command) {
         });
     });
 }
-function $25b78d6746d4ad48$export$d53bf2de587a369(result) {
-    if (result == null) return null;
-    if (process.env.VERBOSE) console.log("result", result);
-    if (typeof result === "string" && result.length > 0) return result;
-    if (result.slice && result.toString) // noinspection JSCheckFunctionSignatures
-    return result.toString("utf8");
-    return null;
-}
-function $25b78d6746d4ad48$export$99ce3e33a555daf1(input) {
-    return typeof input !== "string" || input.length === 0;
-}
-function $25b78d6746d4ad48$export$5348b46700dd771c(input) {
-    return typeof input == "string" && input.length > 0;
-}
 
 
 
+const $fac425c10fbbada5$export$a7b6bc01c63cdfc3 = {};
+(0, $7oI3p$lodash.merge)($fac425c10fbbada5$export$a7b6bc01c63cdfc3, process.env);
+const $fac425c10fbbada5$export$a7c5707626fc90f = $fac425c10fbbada5$export$a7b6bc01c63cdfc3["HOME"];
+if (!$fac425c10fbbada5$export$a7c5707626fc90f) throw new Error("HOME environment variable is not set");
+
+
 
 
 
 async function $e62c2c56eb720f29$export$2c9faf86071156ae({ path: path , name: name , maxDepth: maxDepth = 2  }) {
     const rootSegments = path.split("/").length;
-    if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.log(`Searching for ${name} in ${path}`);
     const files = [];
     let readdirSync;
     try {
         readdirSync = $7oI3p$fs.readdirSync(path);
     } catch (e) {
-        if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.log(`Error reading ${path}`, e);
+        if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log(`Error reading ${path}`, e);
         return [];
     }
     for (const file of readdirSync){
@@ -105,7 +96,7 @@ async function $e62c2c56eb720f29$export$2c9faf86071156ae({ path: path , name: na
         try {
             stat = $7oI3p$fs.statSync(filePath);
         } catch (e1) {
-            if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.error(`Error getting stat for ${filePath}`, e1);
+            if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.error(`Error getting stat for ${filePath}`, e1);
             continue;
         }
         if (stat.isDirectory()) {
@@ -117,11 +108,11 @@ async function $e62c2c56eb720f29$export$2c9faf86071156ae({ path: path , name: na
                 });
                 files.push(...subFiles);
             } catch (e2) {
-                if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.error(e2);
+                if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.error(e2);
             }
         } else if (file === name) files.push(filePath);
     }
-    if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) {
+    if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) {
         if (files.length > 0) {
             console.log(`Found ${files.length} ${name} files`);
             console.log(files);
@@ -136,6 +127,7 @@ async function $e62c2c56eb720f29$export$2c9faf86071156ae({ path: path , name: na
 
 
 
+
 async function $a085b524d8ee9fce$export$f19f611d1fa7c6f3({ file: file , sql: sql , rowTransform: rowTransform  }) {
     if (!file || file && !$7oI3p$fs.existsSync(file)) throw new Error(`doSqliteQuery1: file ${file} does not exist`);
     const db = new $7oI3p$sqlite3.Database(file);
@@ -163,7 +155,7 @@ async function $a085b524d8ee9fce$export$f19f611d1fa7c6f3({ file: file , sql: sql
                 resolve(cookieRows);
                 return;
             }
-            if (process.env.VERBOSE) console.log(`doSqliteQuery1: rows ${JSON.stringify(rows1)}`);
+            if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log(`doSqliteQuery1: rows ${JSON.stringify(rows1)}`);
             resolve([
                 rows1
             ]);
@@ -191,6 +183,7 @@ function $68c0ed99fadee6ca$export$4eadcf0bf35a2ddb(s) {
 }
 
 
+
 class $269fe42bfd555305$export$2e2bcd8739ae039 {
     browserName = "Chrome";
     async queryCookies(name, domain) {
@@ -211,7 +204,7 @@ async function $269fe42bfd555305$var$getPromise1(name, domain, file) {
             file: file
         });
     } catch (e) {
-        if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.log("Error getting encrypted cookie", e);
+        if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log("Error getting encrypted cookie", e);
         return [];
     }
 }
@@ -225,7 +218,7 @@ async function $269fe42bfd555305$var$getPromise(name, domain) {
         const results1 = await Promise.all(promises);
         return results1.flat().filter((0, $af69dfb8766652d8$export$bc926c43858bd3cb));
     } catch (error) {
-        if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.log("error", error);
+        if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log("error", error);
         return [];
     }
 }
@@ -234,7 +227,7 @@ async function $269fe42bfd555305$var$decryptValue(password, encryptedValue) {
     try {
         d = await $269fe42bfd555305$var$decrypt(password, encryptedValue);
     } catch (e) {
-        if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.log("Error decrypting cookie", e);
+        if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log("Error decrypting cookie", e);
         d = null;
     }
     return d ?? encryptedValue.toString("utf-8");
@@ -255,13 +248,13 @@ async function $269fe42bfd555305$var$getChromeCookies({ name: name , domain: dom
         };
     });
     const results = (await Promise.all(decrypted)).filter((0, $d66f40b581ba8bfa$export$963c8d651337e4a4));
-    if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.log("results", results);
+    if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log("results", results);
     return results;
 }
 const $269fe42bfd555305$var$chromeLocal = $7oI3p$path.join((0, $fac425c10fbbada5$export$a7c5707626fc90f), "Library", "Application Support", "Google", "Chrome");
 async function $269fe42bfd555305$var$getEncryptedChromeCookie({ name: name , domain: domain , file: file = $7oI3p$path.join($269fe42bfd555305$var$chromeLocal, "Default", "Cookies")  }) {
     if (!(0, $7oI3p$fs.existsSync)(file)) throw new Error(`File ${file} does not exist`);
-    if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) {
+    if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) {
         const s = file.split("/").slice(-3).join("/");
         console.log(`Trying Chrome (at ${s}) cookie ${name} for domain ${domain}`);
     }
@@ -286,7 +279,6 @@ async function $269fe42bfd555305$var$getEncryptedChromeCookie({ name: name , dom
             sql += `host_key LIKE '${sqlEmbedDomain}';`;
         }
     }
-    console.log("sql", sql);
     const sqliteQuery1 = await (0, $a085b524d8ee9fce$export$f19f611d1fa7c6f3)({
         file: file,
         sql: sql,
@@ -313,21 +305,21 @@ async function $269fe42bfd555305$var$decrypt(password, encryptedData) {
     if (!(encryptedData1 instanceof Buffer)) {
         if (Array.isArray(encryptedData1) && encryptedData1[0] instanceof Buffer) {
             [encryptedData1] = encryptedData1;
-            if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.log(`encryptedData is an array of buffers, selected first: ${encryptedData1}`);
+            if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log(`encryptedData is an array of buffers, selected first: ${encryptedData1}`);
         } else throw new Error("encryptedData must be a Buffer: " + encryptedData1);
         encryptedData1 = Buffer.from(encryptedData1);
     }
-    if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.log(`Trying to decrypt with password ${password}`);
+    if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log(`Trying to decrypt with password ${password}`);
     return new Promise((resolve, reject)=>{
         $7oI3p$crypto.pbkdf2(password, "saltysalt", 1003, 16, "sha1", (error, buffer)=>{
             try {
                 if (error) {
-                    if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.log("Error doing pbkdf2", error);
+                    if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log("Error doing pbkdf2", error);
                     reject(error);
                     return;
                 }
                 if (buffer.length !== 16) {
-                    if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.log("Error doing pbkdf2, buffer length is not 16", buffer.length);
+                    if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log("Error doing pbkdf2, buffer length is not 16", buffer.length);
                     reject(new Error("Buffer length is not 16"));
                     return;
                 }
@@ -337,7 +329,7 @@ async function $269fe42bfd555305$var$decrypt(password, encryptedData) {
                 decipher.setAutoPadding(false);
                 if (encryptedData1 && encryptedData1.slice) encryptedData1 = encryptedData1.slice(3);
                 if (encryptedData1.length % 16 !== 0) {
-                    if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.log("Error doing pbkdf2, encryptedData length is not a multiple of 16", encryptedData1.length);
+                    if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log("Error doing pbkdf2, encryptedData length is not a multiple of 16", encryptedData1.length);
                     reject(new Error("encryptedData length is not a multiple of 16"));
                     return;
                 }
@@ -345,7 +337,7 @@ async function $269fe42bfd555305$var$decrypt(password, encryptedData) {
                 try {
                     decipher.final("utf-8");
                 } catch (e) {
-                    if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.log("Error doing decipher.final()", e);
+                    if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log("Error doing decipher.final()", e);
                     reject(e);
                     return;
                 }
@@ -531,6 +523,8 @@ class $e4efb16e005540de$export$2e2bcd8739ae039 {
 
 
 
+
+
 const $f72befa528c23ca7$var$cache = new (0, ($parcel$interopDefault($7oI3p$lrucache)))({
     ttl: 2000,
     max: 10
@@ -553,11 +547,18 @@ class $f72befa528c23ca7$export$2e2bcd8739ae039 {
         const key = `${name}:${domain}`;
         const cached = $f72befa528c23ca7$var$cache.get(key);
         if (cached) return cached;
-        console.log("Querying cookies:", name, domain);
+        if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose) console.log("Querying cookies:", name, domain);
         const results = await Promise.all(this.#strategies.map(async (strategy)=>{
             // @ts-ignore
-            const cookies = strategy.queryCookies(name, domain);
-            return cookies.catch((e)=>{
+            return strategy.queryCookies(name, domain).then((cookies)=>{
+                return cookies.map((cookie)=>{
+                    return (0, $7oI3p$lodash.merge)(cookie, {
+                        meta: {
+                            browser: strategy.browserName
+                        }
+                    });
+                });
+            }).catch((e)=>{
                 console.log((0, $7oI3p$colorette.red)(`Error querying ${strategy.browserName} cookies`), e);
                 return [];
             });
@@ -576,7 +577,7 @@ function $9a6b2ace073cf1d7$export$2e2bcd8739ae039(token) {
         const result = (0, ($parcel$interopDefault($7oI3p$jsonwebtoken))).decode(token, {
             complete: true
         });
-        if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).VERBOSE) console.log(result);
+        if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b).verbose && result) console.log(result);
         const payload = result?.payload;
         if (payload) {
             const exp = payload.exp;
@@ -594,16 +595,19 @@ function $9a6b2ace073cf1d7$export$2e2bcd8739ae039(token) {
 
 async function $7a068a32d4710f0b$export$e6d428437cf2cacb({ name: name , domain: domain  }, strategy = new (0, $f72befa528c23ca7$export$2e2bcd8739ae039)()) {
     const results = await strategy.queryCookies(name, domain);
-    const results1 = (0, $7oI3p$lodash.uniqBy)(results, JSON.stringify);
-    const jwtCookies = [];
-    for (const result of results1){
-        const value = result.value;
-        if ((0, $9a6b2ace073cf1d7$export$2e2bcd8739ae039)(value)) jwtCookies.push(result);
-    }
-    const resultsUniq = (0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).REQUIRE_JWT ? jwtCookies : results1;
-    return (0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).SINGLE ? [
-        resultsUniq[0]
-    ] : resultsUniq;
+    const allCookies = (0, $7oI3p$lodash.uniqBy)(results, JSON.stringify);
+    if ((0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b)["require-jwt"]) {
+        const jwtCookies = [];
+        for (const result of allCookies){
+            const value = result.value;
+            if ((0, $9a6b2ace073cf1d7$export$2e2bcd8739ae039)(value)) jwtCookies.push(result);
+        }
+        return (0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b)["single"] ? [
+            jwtCookies[0]
+        ] : jwtCookies;
+    } else return (0, $ef3d5dc2fd8022f5$export$c348dfaf65040d9b)["single"] ? [
+        allCookies[0]
+    ] : allCookies;
 }
 
 
@@ -617,10 +621,11 @@ async function $8481e2034946cc4b$export$4be65e66cfa2648a(params) {
 
 
 
+
 async function $1a92ef2038b55530$export$e5637297e9eb6f2e(params) {
     const cookies = await (0, $7a068a32d4710f0b$export$e6d428437cf2cacb)(params, new (0, $269fe42bfd555305$export$2e2bcd8739ae039)());
-    if (Array.isArray(cookies) && cookies.length > 0) return cookies.find((cookie)=>cookie != null);
-    else throw new Error("Cookie not found");
+    if (cookies.length == 0) throw new Error("Cookie not found");
+    return cookies.find((0, $d66f40b581ba8bfa$export$963c8d651337e4a4));
 }
 
 
@@ -636,29 +641,27 @@ async function $f9b70200901ad17d$export$c44c5fdef43f0941(params) {
 
 
 
-
 function $9c43c2ed82e63570$export$9abc0a414b0d8b8f(results) {
     return (0, $7oI3p$lodash.uniqBy)(results, (r)=>r.name).map((r)=>r.name + "=" + r.value).join("; ");
 }
 
 
-async function $300d8b33187a203c$export$4d2e9997e2c23417(//
-{ name: name , domain: domain  }) {
+
+async function $300d8b33187a203c$export$4d2e9997e2c23417({ name: name , domain: domain  }) {
     const cookies = await (0, $7a068a32d4710f0b$export$e6d428437cf2cacb)({
         name: name,
         domain: domain
     }, new (0, $f72befa528c23ca7$export$2e2bcd8739ae039)());
-    if (Array.isArray(cookies) && cookies.length > 0) {
-        const results = await (0, $7a068a32d4710f0b$export$e6d428437cf2cacb)({
-            name: name,
-            domain: domain
-        });
-        const groupedByFile = (0, $7oI3p$lodash.groupBy)(results, (r)=>r.meta?.file);
-        return Object.keys(groupedByFile).map((file)=>{
-            const results = groupedByFile[file];
-            return (0, $9c43c2ed82e63570$export$9abc0a414b0d8b8f)(results);
-        });
-    } else throw new Error("Cookie not found");
+    if (cookies.length == 0) throw new Error("Cookie not found");
+    const results = await (0, $7a068a32d4710f0b$export$e6d428437cf2cacb)({
+        name: name,
+        domain: domain
+    });
+    const groupedByFile = (0, $7oI3p$lodash.groupBy)(results, (r)=>r.meta?.file);
+    return Object.keys(groupedByFile).map((file)=>{
+        const results = groupedByFile[file];
+        return (0, $9c43c2ed82e63570$export$9abc0a414b0d8b8f)(results);
+    });
 }
 
 
@@ -667,10 +670,13 @@ async function $300d8b33187a203c$export$4d2e9997e2c23417(//
 
 
 
+
+
+
 async function $cfc07ae4aa2c7e44$export$b24a545a0b39f491(url, options = {}, fetch = (0, $7oI3p$crossfetch.fetch)) {
     const defaultOptions = {
         headers: {
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
+            "User-Agent": new (0, ($parcel$interopDefault($7oI3p$useragents)))().toString()
         },
         redirect: "manual"
     };
@@ -699,9 +705,19 @@ async function $cfc07ae4aa2c7e44$export$b24a545a0b39f491(url, options = {}, fetc
                 value
             ]);
         });
-        for (const [key, value] of headers)if (key === "set-cookie") await (0, $53a3bcc99a05dfcf$export$928a906645f9d018).setCookie(value, url2);
+        for (const [key, value] of headers)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);
+        // }
+        }
         const newUrl = res.headers.get("location");
-        if (res.redirected || newUrl && newUrl !== url2) return $cfc07ae4aa2c7e44$export$b24a545a0b39f491(newUrl, newOptions1);
+        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);
+        }
         const arrayBuffer1 = res.arrayBuffer();
         async function arrayBuffer() {
             return arrayBuffer1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mherod/get-cookie",
-  "version": "2.0.0-rc.6",
+  "version": "2.0.0-rc.7",
   "description": "Node.js module for querying a local user's Chrome cookie",
   "source": "src/index.ts",
   "bin": "dist/cli.js",
@@ -67,7 +67,8 @@
     "minimist": "^1.2.6",
     "sqlite3": "^5.1.1",
     "tough-cookie": "^4.1.2",
-    "tough-cookie-file-store": "^2.0.3"
+    "tough-cookie-file-store": "^2.0.3",
+    "user-agents": "^1.0.1165"
   },
   "devDependencies": {
     "@parcel/packager-ts": "^2.7.0",

package/src/argv.ts

@@ -1 +1,5 @@
+import minimist from "minimist";
+
 export const argv: string[] = process.argv ?? [];
+
+export const parsedArgs: minimist.ParsedArgs = minimist(argv.slice(2));

package/src/browsers/ChromeCookieQueryStrategy.ts

@@ -12,6 +12,7 @@ import { isExportedCookie } from "../IsExportedCookie";
 import CookieRow from "../CookieRow";
 import ExportedCookie from "../ExportedCookie";
 import { stringToRegex } from "../StringToRegex";
+import { parsedArgs } from "../argv";
 
 export default class ChromeCookieQueryStrategy implements CookieQueryStrategy {
   browserName = "Chrome";
@@ -43,7 +44,7 @@ async function getPromise1(
       file: file,
     });
   } catch (e) {
-    if (env.VERBOSE) {
+    if (parsedArgs.verbose) {
       console.log("Error getting encrypted cookie", e);
     }
     return [];
@@ -62,7 +63,7 @@ async function getPromise(name: string, domain: string): Promise<CookieRow[]> {
     const results1: CookieRow[][] = await Promise.all(promises);
     return results1.flat().filter(isCookieRow);
   } catch (error) {
-    if (env.VERBOSE) {
+    if (parsedArgs.verbose) {
       console.log("error", error);
     }
     return [];
@@ -74,7 +75,7 @@ async function decryptValue(password: string, encryptedValue: Buffer) {
   try {
     d = await decrypt(password, encryptedValue);
   } catch (e) {
-    if (env.VERBOSE) {
+    if (parsedArgs.verbose) {
       console.log("Error decrypting cookie", e);
     }
     d = null;
@@ -112,7 +113,7 @@ Promise<ExportedCookie[]> {
   const results: ExportedCookie[] = (await Promise.all(decrypted)).filter(
     isExportedCookie
   );
-  if (env.VERBOSE) {
+  if (parsedArgs.verbose) {
     console.log("results", results);
   }
   return results;
@@ -139,7 +140,7 @@ async function getEncryptedChromeCookie({
   if (!existsSync(file)) {
     throw new Error(`File ${file} does not exist`);
   }
-  if (env.VERBOSE) {
+  if (parsedArgs.verbose) {
     const s = file.split("/").slice(-3).join("/");
     console.log(`Trying Chrome (at ${s}) cookie ${name} for domain ${domain}`);
   }
@@ -167,7 +168,6 @@ async function getEncryptedChromeCookie({
       sql += `host_key LIKE '${sqlEmbedDomain}';`;
     }
   }
-  console.log("sql", sql);
   const sqliteQuery1: CookieRow[] = await doSqliteQuery1({
     file: file,
     sql: sql,
@@ -205,7 +205,7 @@ async function decrypt(
   if (!(encryptedData1 instanceof Buffer)) {
     if (Array.isArray(encryptedData1) && encryptedData1[0] instanceof Buffer) {
       [encryptedData1] = encryptedData1;
-      if (env.VERBOSE) {
+      if (parsedArgs.verbose) {
         console.log(
           `encryptedData is an array of buffers, selected first: ${encryptedData1}`
         );
@@ -215,14 +215,14 @@ async function decrypt(
     }
     encryptedData1 = Buffer.from(encryptedData1);
   }
-  if (env.VERBOSE) {
+  if (parsedArgs.verbose) {
     console.log(`Trying to decrypt with password ${password}`);
   }
   return new Promise((resolve, reject) => {
     crypto.pbkdf2(password, "saltysalt", 1003, 16, "sha1", (error, buffer) => {
       try {
         if (error) {
-          if (env.VERBOSE) {
+          if (parsedArgs.verbose) {
             console.log("Error doing pbkdf2", error);
           }
           reject(error);
@@ -230,7 +230,7 @@ async function decrypt(
         }
 
         if (buffer.length !== 16) {
-          if (env.VERBOSE) {
+          if (parsedArgs.verbose) {
             console.log(
               "Error doing pbkdf2, buffer length is not 16",
               buffer.length
@@ -250,7 +250,7 @@ async function decrypt(
         }
 
         if (encryptedData1.length % 16 !== 0) {
-          if (env.VERBOSE) {
+          if (parsedArgs.verbose) {
             console.log(
               "Error doing pbkdf2, encryptedData length is not a multiple of 16",
               encryptedData1.length
@@ -264,7 +264,7 @@ async function decrypt(
         try {
           decipher.final("utf-8");
         } catch (e) {
-          if (env.VERBOSE) {
+          if (parsedArgs.verbose) {
             console.log("Error doing decipher.final()", e);
           }
           reject(e);

package/src/browsers/CompositeCookieQueryStrategy.ts

@@ -6,6 +6,8 @@ import ExportedCookie from "../ExportedCookie";
 import LRUCache from "lru-cache";
 import CookieStoreQueryStrategy from "./CookieStoreQueryStrategy";
 import { red } from "colorette";
+import { merge } from "lodash";
+import { parsedArgs } from "../argv";
 
 const cache = new LRUCache<string, ExportedCookie[]>({
   ttl: 1000 * 2,
@@ -37,18 +39,30 @@ export default class CompositeCookieQueryStrategy
     if (cached) {
       return cached;
     }
-    console.log("Querying cookies:", name, domain);
+    if (parsedArgs.verbose) {
+      console.log("Querying cookies:", name, domain);
+    }
     const results: ExportedCookie[][] = await Promise.all(
       this.#strategies.map(async (strategy: CookieQueryStrategy) => {
         // @ts-ignore
-        const cookies: Promise<ExportedCookie[]> = strategy.queryCookies(
-          name,
-          domain
-        );
-        return cookies.catch((e) => {
-          console.log(red(`Error querying ${strategy.browserName} cookies`), e);
-          return [];
-        });
+        return strategy
+          .queryCookies(name, domain)
+          .then((cookies: ExportedCookie[]) => {
+            return cookies.map((cookie: ExportedCookie) => {
+              return merge(cookie, {
+                meta: {
+                  browser: strategy.browserName,
+                },
+              });
+            });
+          })
+          .catch((e) => {
+            console.log(
+              red(`Error querying ${strategy.browserName} cookies`),
+              e
+            );
+            return [];
+          });
       })
     );
     const flat: ExportedCookie[] = results.flat();

package/src/cli.ts

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
-import minimist from "minimist";
-import { argv } from "./argv";
+import { argv, parsedArgs } from "./argv";
 import { queryCookies } from "./queryCookies";
 import { groupBy } from "lodash";
 import { green, red, yellow } from "colorette";
@@ -10,8 +9,6 @@ import { fetchWithCookies } from "./fetchWithCookies";
 import { unpackHeaders } from "./unpackHeaders";
 import CookieSpec from "./CookieSpec";
 
-const parsedArgs: minimist.ParsedArgs = minimist(argv.slice(2));
-
 async function cliQueryCookies({ name, domain }: CookieSpec) {
   try {
     const results = await queryCookies({ name, domain });

package/src/doSqliteQuery1.ts

@@ -2,6 +2,7 @@ import * as fs from "fs";
 import * as sqlite3 from "sqlite3";
 import CookieRow from "./CookieRow";
 import { merge } from "lodash";
+import { parsedArgs } from "./argv";
 
 interface DoSqliteQuery1Params {
   file: string;
@@ -42,7 +43,7 @@ export async function doSqliteQuery1({
         resolve(cookieRows);
         return;
       }
-      if (process.env.VERBOSE) {
+      if (parsedArgs.verbose) {
         console.log(`doSqliteQuery1: rows ${JSON.stringify(rows1)}`);
       }
       resolve([rows1]);

package/src/fetchWithCookies.ts

@@ -7,6 +7,9 @@ import destr from "destr";
 import CookieSpec from "./CookieSpec";
 import { getGroupedRenderedCookies } from "./getGroupedRenderedCookies";
 import { cookieJar } from "./CookieStore";
+import UserAgent from "user-agents";
+import { parsedArgs } from "./argv";
+import { blue, yellow } from "colorette";
 
 export async function fetchWithCookies(
   url: RequestInfo | URL,
@@ -15,8 +18,7 @@ export async function fetchWithCookies(
 ): Promise<Response> {
   const defaultOptions: RequestInit = {
     headers: {
-      "User-Agent":
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36",
+      "User-Agent": new UserAgent().toString(),
     },
     redirect: "manual",
   };
@@ -47,6 +49,9 @@ export async function fetchWithCookies(
     for (const [key, value] of headers) {
       if (key === "set-cookie") {
         await cookieJar.setCookie(value, url2);
+        if (parsedArgs.verbose) {
+          console.log(blue(`Set-Cookie: ${yellow(value)} ${yellow(url2)}`));
+        }
         // const cookie = tough.parse(value);
         // if (cookie instanceof Cookie) {
         //   await memoryCookieStore.putCookie(cookie);
@@ -56,6 +61,9 @@ export async function fetchWithCookies(
 
     const newUrl: string = res.headers.get("location") as string;
     if (res.redirected || (newUrl && newUrl !== url2)) {
+      if (parsedArgs.verbose) {
+        console.log(blue(`Redirected to `), yellow(newUrl));
+      }
       return fetchWithCookies(newUrl, newOptions1);
     }
 

package/src/findAllFiles.ts

@@ -1,5 +1,6 @@
 import { env } from "./global";
 import * as fs from "fs";
+import { parsedArgs } from "./argv";
 
 export async function findAllFiles({
   path,
@@ -12,16 +13,12 @@ export async function findAllFiles({
   maxDepth?: number;
 }): Promise<string[]> {
   const rootSegments = path.split("/").length;
-
-  if (env.VERBOSE) {
-    console.log(`Searching for ${name} in ${path}`);
-  }
   const files: string[] = [];
   let readdirSync;
   try {
     readdirSync = fs.readdirSync(path);
   } catch (e) {
-    if (env.VERBOSE) {
+    if (parsedArgs.verbose) {
       console.log(`Error reading ${path}`, e);
     }
     return [];
@@ -32,7 +29,7 @@ export async function findAllFiles({
     try {
       stat = fs.statSync(filePath);
     } catch (e) {
-      if (env.VERBOSE) {
+      if (parsedArgs.verbose) {
         console.error(`Error getting stat for ${filePath}`, e);
       }
       continue;
@@ -47,7 +44,7 @@ export async function findAllFiles({
           });
           files.push(...subFiles);
         } catch (e) {
-          if (env.VERBOSE) {
+          if (parsedArgs.verbose) {
             console.error(e);
           }
         }
@@ -56,7 +53,7 @@ export async function findAllFiles({
       files.push(filePath);
     }
   }
-  if (env.VERBOSE) {
+  if (parsedArgs.verbose) {
     if (files.length > 0) {
       console.log(`Found ${files.length} ${name} files`);
       console.log(files);

package/src/getChromeCookie.ts

@@ -2,6 +2,7 @@ import CookieSpec from "./CookieSpec";
 import ExportedCookie from "./ExportedCookie";
 import { queryCookies } from "./queryCookies";
 import ChromeCookieQueryStrategy from "./browsers/ChromeCookieQueryStrategy";
+import { isExportedCookie } from "./IsExportedCookie";
 
 export async function getChromeCookie(
   params: CookieSpec
@@ -11,9 +12,8 @@ export async function getChromeCookie(
     new ChromeCookieQueryStrategy()
     //
   );
-  if (Array.isArray(cookies) && cookies.length > 0) {
-    return cookies.find((cookie) => cookie != null);
-  } else {
+  if (cookies.length == 0) {
     throw new Error("Cookie not found");
   }
+  return cookies.find(isExportedCookie);
 }

package/src/getGroupedRenderedCookies.ts

@@ -1,32 +1,29 @@
-import { queryCookies } from "./queryCookies";
-import CompositeCookieQueryStrategy from "./browsers/CompositeCookieQueryStrategy";
 import { groupBy } from "lodash";
+import { queryCookies } from "./queryCookies";
 import { resultsRendered } from "./resultsRendered";
+import CompositeCookieQueryStrategy from "./browsers/CompositeCookieQueryStrategy";
 import CookieSpec from "./CookieSpec";
 import ExportedCookie from "./ExportedCookie";
 
-export async function getGroupedRenderedCookies(
-  //
-  {
-    name,
-    domain,
-  }: //
-  CookieSpec
-): //
-Promise<string[]> {
+export async function getGroupedRenderedCookies({
+  name,
+  domain,
+}: CookieSpec): Promise<string[]> {
   const cookies: ExportedCookie[] = await queryCookies(
-    { name, domain },
+    {
+      name,
+      domain,
+    },
     new CompositeCookieQueryStrategy()
     //
   );
-  if (Array.isArray(cookies) && cookies.length > 0) {
-    const results: ExportedCookie[] = await queryCookies({ name, domain });
-    const groupedByFile = groupBy(results, (r) => r.meta?.file);
-    return Object.keys(groupedByFile).map((file: string) => {
-      const results: ExportedCookie[] = groupedByFile[file];
-      return resultsRendered(results);
-    });
-  } else {
+  if (cookies.length == 0) {
     throw new Error("Cookie not found");
   }
+  const results: ExportedCookie[] = await queryCookies({ name, domain });
+  const groupedByFile = groupBy(results, (r: ExportedCookie) => r.meta?.file);
+  return Object.keys(groupedByFile).map((file: string) => {
+    const results: ExportedCookie[] = groupedByFile[file];
+    return resultsRendered(results);
+  });
 }

package/src/isValidJwt.ts

@@ -1,10 +1,10 @@
 import jsonwebtoken, { JwtPayload } from "jsonwebtoken";
-import { env } from "./global";
+import { parsedArgs } from "./argv";
 
 export default function isValidJwt(token: any) {
   try {
     const result = jsonwebtoken.decode(token, { complete: true });
-    if (env.VERBOSE) {
+    if (parsedArgs.verbose && result) {
       console.log(result);
     }
     const payload: JwtPayload = result?.payload as JwtPayload;

package/src/queryCookies.ts

@@ -1,5 +1,5 @@
-import { env } from "./global";
 import { uniqBy } from "lodash";
+import { parsedArgs } from "./argv";
 import CompositeCookieQueryStrategy from "./browsers/CompositeCookieQueryStrategy";
 import CookieQueryStrategy from "./browsers/CookieQueryStrategy";
 import isValidJwt from "./isValidJwt";
@@ -9,16 +9,20 @@ import ExportedCookie from "./ExportedCookie";
 export async function queryCookies(
   { name, domain }: CookieSpec,
   strategy: CookieQueryStrategy = new CompositeCookieQueryStrategy()
-) {
+): Promise<ExportedCookie[]> {
   const results: ExportedCookie[] = await strategy.queryCookies(name, domain);
-  const results1: ExportedCookie[] = uniqBy(results, JSON.stringify);
-  const jwtCookies = [];
-  for (const result of results1) {
-    const value = result.value;
-    if (isValidJwt(value)) {
-      jwtCookies.push(result);
+  const allCookies: ExportedCookie[] = uniqBy(results, JSON.stringify);
+
+  if (parsedArgs["require-jwt"]) {
+    const jwtCookies = [];
+    for (const result of allCookies) {
+      const value: string = result.value;
+      if (isValidJwt(value)) {
+        jwtCookies.push(result);
+      }
     }
+    return parsedArgs["single"] ? [jwtCookies[0]] : jwtCookies;
+  } else {
+    return parsedArgs["single"] ? [allCookies[0]] : allCookies;
   }
-  const resultsUniq = env.REQUIRE_JWT ? jwtCookies : results1;
-  return env.SINGLE ? [resultsUniq[0]] : resultsUniq;
 }

package/src/utils.ts

@@ -1,6 +1,7 @@
 // noinspection JSUnusedGlobalSymbols
 
 import { exec, ExecException } from "child_process";
+import { parsedArgs } from "./argv";
 
 export async function execSimple(command: string): Promise<string> {
   return new Promise((resolve, reject) => {
@@ -23,28 +24,3 @@ export async function execSimple(command: string): Promise<string> {
     );
   });
 }
-
-export function toStringOrNull(result: any) {
-  if (result == null) {
-    return null;
-  }
-  if (process.env.VERBOSE) {
-    console.log("result", result);
-  }
-  if (typeof result === "string" && result.length > 0) {
-    return result;
-  }
-  if (result.slice && result.toString) {
-    // noinspection JSCheckFunctionSignatures
-    return result.toString("utf8");
-  }
-  return null;
-}
-
-export function invalidString(input: any): boolean {
-  return typeof input !== "string" || input.length === 0;
-}
-
-export function validString(input: any): input is string {
-  return typeof input == "string" && input.length > 0;
-}