@mherod/get-cookie 2.0.0-rc.3 → 2.0.0-rc.5

package/dist/index.js

@@ -1,12 +1,14 @@
 #!/usr/bin/env node
 var $7oI3p$lodash = require("lodash");
 var $7oI3p$lrucache = require("lru-cache");
+var $7oI3p$colorette = require("colorette");
 var $7oI3p$fs = require("fs");
 var $7oI3p$crypto = require("crypto");
 var $7oI3p$path = require("path");
 var $7oI3p$child_process = require("child_process");
 var $7oI3p$sqlite3 = require("sqlite3");
 var $7oI3p$toughcookie = require("tough-cookie");
+var $7oI3p$toughcookiefilestore = require("tough-cookie-file-store");
 var $7oI3p$jsonwebtoken = require("jsonwebtoken");
 var $7oI3p$crossfetch = require("cross-fetch");
 var $7oI3p$destr = require("destr");
@@ -181,7 +183,16 @@ function $d66f40b581ba8bfa$export$963c8d651337e4a4(obj) {
 }
 
 
+function $68c0ed99fadee6ca$export$4eadcf0bf35a2ddb(s) {
+    const s1 = s.replaceAll(/\./gi, ".");
+    const s2 = s1.replace(/%/g, ".*");
+    const s3 = s2.replace(/\*/g, ".*");
+    return new RegExp(s3);
+}
+
+
 class $269fe42bfd555305$export$2e2bcd8739ae039 {
+    browserName = "Chrome";
     async queryCookies(name, domain) {
         if (process.platform !== "darwin") throw new Error("This only works on macOS");
         if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).FIREFOX_ONLY) return [];
@@ -260,15 +271,23 @@ async function $269fe42bfd555305$var$getEncryptedChromeCookie({ name: name , dom
     const wildcardRegexp = /^([*%])$/i;
     const specifiedName = name.match(wildcardRegexp) == null;
     const specifiedDomain = domain.match(wildcardRegexp) == null;
-    if (specifiedName || specifiedDomain) {
+    const wildcardDomain = domain.match(/[%*]/) != null;
+    const queryDomain = specifiedDomain && !wildcardDomain;
+    // if we have a wildcard domain, we need to use a regexp
+    if (specifiedName || queryDomain) {
         sql += ` WHERE `;
         if (specifiedName) {
             sql += `name = '${name}'`;
-            if (specifiedDomain) sql += ` AND `;
+            if (queryDomain) sql += ` AND `;
+        }
+        if (queryDomain) {
+            // leading dot replaced with % to match subdomains
+            const sqlEmbedDomain = domain.replace(/^[.%]?/, "%");
+            sql += `host_key LIKE '${sqlEmbedDomain}';`;
         }
-        if (specifiedDomain) sql += `host_key LIKE '${domain}';`;
     }
-    return (0, $a085b524d8ee9fce$export$f19f611d1fa7c6f3)({
+    console.log("sql", sql);
+    const sqliteQuery1 = await (0, $a085b524d8ee9fce$export$f19f611d1fa7c6f3)({
         file: file,
         sql: sql,
         rowTransform: (row)=>{
@@ -279,6 +298,9 @@ async function $269fe42bfd555305$var$getEncryptedChromeCookie({ name: name , dom
             };
         }
     });
+    return sqliteQuery1.filter((row)=>{
+        return row.domain.match((0, $68c0ed99fadee6ca$export$4eadcf0bf35a2ddb)(domain)) != null;
+    });
 }
 async function $269fe42bfd555305$var$getChromePassword() {
     return (0, $25b78d6746d4ad48$export$8d71c74f97c0202e)('security find-generic-password -w -s "Chrome Safe Storage"');
@@ -355,6 +377,7 @@ function $b744d19cc39f964e$export$da22813e5a2ec500({ name: name , domain: domain
 
 
 class $7bb7da9a77b2fd99$export$2e2bcd8739ae039 {
+    browserName = "Firefox";
     async queryCookies(name, domain) {
         if (process.platform !== "darwin") throw new Error("This only works on macOS");
         if ((0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3).CHROME_ONLY) return [];
@@ -424,6 +447,7 @@ class $7bb7da9a77b2fd99$export$2e2bcd8739ae039 {
 
 
 class $fad6f51bd5c7bae2$export$2e2bcd8739ae039 {
+    browserName = "Safari";
     async queryCookies(name, domain) {
         return [];
     }
@@ -432,39 +456,48 @@ class $fad6f51bd5c7bae2$export$2e2bcd8739ae039 {
 
 
 
-const $0fd79d7b9f7bb064$export$231f8b179925e6a5 = new (0, $7oI3p$toughcookie.MemoryCookieStore)();
-const $0fd79d7b9f7bb064$export$928a906645f9d018 = new (0, $7oI3p$toughcookie.CookieJar)($0fd79d7b9f7bb064$export$231f8b179925e6a5);
 
 
-class $0d3ccbe1f68c2e3d$export$2e2bcd8739ae039 {
+var $53a3bcc99a05dfcf$require$FileCookieStore = $7oI3p$toughcookiefilestore.FileCookieStore;
+const $53a3bcc99a05dfcf$export$6c62df16f2e9c7e8 = new $53a3bcc99a05dfcf$require$FileCookieStore(`${(0, $fac425c10fbbada5$export$a7b6bc01c63cdfc3)["HOME"]}/cookie-star.json`);
+const $53a3bcc99a05dfcf$export$928a906645f9d018 = new (0, $7oI3p$toughcookie.CookieJar)($53a3bcc99a05dfcf$export$6c62df16f2e9c7e8);
+
+
+
+class $e4efb16e005540de$export$2e2bcd8739ae039 {
+    browserName = "internal";
     async queryCookies(name, domain) {
-        if (name == "%" && domain == "%") {
-            const cookies = await (0, $0fd79d7b9f7bb064$export$231f8b179925e6a5).getAllCookies();
-            return cookies.map((cookie)=>{
-                return this.#extracted(cookie, {
-                    name: name,
-                    domain: domain
-                });
+        const exportedCookies = [];
+        // if (name.match(/[%*]/) || domain.match(/[%*]/)) {
+        const cookies = await this.#getAllCookies();
+        const allExportedCookies = cookies.map((cookie)=>{
+            return this.#extracted(cookie, {
+                name: name,
+                domain: domain
             });
-        }
+        });
+        exportedCookies.push(...allExportedCookies);
+        // }
+        const wildcardRegexp = /^([*%])$/i;
+        if (name.match(wildcardRegexp) && domain.match(wildcardRegexp)) return exportedCookies;
         const path = "/";
-        if (name == "%") {
-            const cookies1 = await (0, $0fd79d7b9f7bb064$export$231f8b179925e6a5).findCookies(domain, path);
-            return cookies1.map((cookie)=>{
+        if (domain != "%") {
+            const domain1 = domain.match(/(\w+.+\w+)/gi)?.pop() ?? domain;
+            const url = new URL("https://" + domain1);
+            url.pathname = path;
+            const cookies1 = await this.#getCookies(url.href);
+            const domainCookies = cookies1.map((cookie)=>{
                 return this.#extracted(cookie, {
-                    name: name,
-                    domain: domain
+                    domain: domain,
+                    name: name
                 });
             });
+            exportedCookies.push(...domainCookies);
         }
-        const cookie = await (0, $0fd79d7b9f7bb064$export$231f8b179925e6a5).findCookie(domain, path, name);
-        if (cookie) return [
-            this.#extracted(cookie, {
-                name: name,
-                domain: domain
-            })
-        ];
-        else return [];
+        if (name == "%") return exportedCookies;
+        return exportedCookies.filter((cookie)=>{
+            return cookie.name.match((0, $68c0ed99fadee6ca$export$4eadcf0bf35a2ddb)(name)) && cookie.domain.match((0, $68c0ed99fadee6ca$export$4eadcf0bf35a2ddb)(domain));
+        });
     }
      #extracted(cookie, cookieSpec) {
         return {
@@ -476,18 +509,38 @@ class $0d3ccbe1f68c2e3d$export$2e2bcd8739ae039 {
             }
         };
     }
+     #getCookies(url) {
+        return new Promise((resolve, reject)=>{
+            // @ts-ignore
+            return (0, $53a3bcc99a05dfcf$export$928a906645f9d018).getCookies(url, (err, cookies)=>{
+                if (err) reject(err);
+                else resolve(cookies ?? []);
+            });
+        });
+    }
+     #getAllCookies() {
+        return new Promise((resolve, reject)=>{
+            // @ts-ignore
+            return (0, $53a3bcc99a05dfcf$export$6c62df16f2e9c7e8).getAllCookies((err, cookies)=>{
+                if (err) reject(err);
+                else resolve(cookies ?? []);
+            });
+        });
+    }
 }
 
 
+
 const $f72befa528c23ca7$var$cache = new (0, ($parcel$interopDefault($7oI3p$lrucache)))({
     ttl: 2000,
     max: 10
 });
 class $f72befa528c23ca7$export$2e2bcd8739ae039 {
+    browserName = "all";
     #strategies;
     constructor(){
         this.#strategies = [
-            (0, $0d3ccbe1f68c2e3d$export$2e2bcd8739ae039),
+            (0, $e4efb16e005540de$export$2e2bcd8739ae039),
             (0, $269fe42bfd555305$export$2e2bcd8739ae039),
             (0, $7bb7da9a77b2fd99$export$2e2bcd8739ae039),
             (0, $fad6f51bd5c7bae2$export$2e2bcd8739ae039), 
@@ -496,13 +549,18 @@ class $f72befa528c23ca7$export$2e2bcd8739ae039 {
         });
     }
     async queryCookies(name, domain) {
+        // domain = domain.match(/(\w+.+\w+)/gi)?.pop() ?? domain;
         const key = `${name}:${domain}`;
         const cached = $f72befa528c23ca7$var$cache.get(key);
         if (cached) return cached;
+        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(()=>[]);
+            return cookies.catch((e)=>{
+                console.log((0, $7oI3p$colorette.red)(`Error querying ${strategy.browserName} cookies`), e);
+                return [];
+            });
         }));
         const flat = results.flat();
         $f72befa528c23ca7$var$cache.set(`${name}:${domain}`, flat);
@@ -618,7 +676,7 @@ async function $cfc07ae4aa2c7e44$export$b24a545a0b39f491(url, options = {}, fetc
                 value
             ]);
         });
-        for (const [key, value] of headers)if (key === "set-cookie") await (0, $0fd79d7b9f7bb064$export$928a906645f9d018).setCookie(value, url2);
+        for (const [key, value] of headers)if (key === "set-cookie") await (0, $53a3bcc99a05dfcf$export$928a906645f9d018).setCookie(value, url2);
         const newUrl = res.headers.get("location");
         if (res.redirected || newUrl && newUrl !== url2) return $cfc07ae4aa2c7e44$export$b24a545a0b39f491(newUrl, newOptions1);
         const arrayBuffer1 = res.arrayBuffer();

package/package-lock.json

@@ -1,18 +1,23 @@
 {
   "name": "@mherod/get-cookie",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-rc.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@mherod/get-cookie",
-      "version": "2.0.0-beta.3",
+      "version": "2.0.0-rc.3",
       "license": "ISC",
       "dependencies": {
         "colorette": "^2.0.19",
+        "cross-fetch": "^3.1.5",
+        "destr": "^1.1.1",
         "jsonwebtoken": "^8.5.1",
         "lodash": "^4.17.21",
-        "sqlite3": "^5.1.1"
+        "lru-cache": "^7.14.0",
+        "minimist": "^1.2.6",
+        "sqlite3": "^5.1.1",
+        "tough-cookie": "^4.1.2"
       },
       "bin": {
         "get-cookie": "dist/cli.js"
@@ -22,7 +27,10 @@
         "@parcel/transformer-typescript-types": "^2.7.0",
         "@types/jsonwebtoken": "^8.5.9",
         "@types/lodash": "^4.14.186",
+        "@types/minimist": "^1.2.2",
         "@types/node": "^18.8.2",
+        "@types/tough-cookie": "^4.0.2",
+        "@types/user-agents": "^1.0.2",
         "jest": "^29.0.3",
         "parcel": "^2.7.0",
         "prettier": "^2.7.1",
@@ -2726,10 +2734,16 @@
       "integrity": "sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==",
       "dev": true
     },
+    "node_modules/@types/minimist": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
+      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+      "dev": true
+    },
     "node_modules/@types/node": {
-      "version": "18.8.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.3.tgz",
-      "integrity": "sha512-0os9vz6BpGwxGe9LOhgP/ncvYN5Tx1fNcd2TM3rD/aCGBkysb+ZWpXEocG24h6ZzOi13+VB8HndAQFezsSOw1w==",
+      "version": "18.8.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.4.tgz",
+      "integrity": "sha512-WdlVphvfR/GJCLEMbNA8lJ0lhFNBj4SW3O+O5/cEGw9oYrv0al9zTwuQsq+myDUXgNx2jgBynoVgZ2MMJ6pbow==",
       "dev": true
     },
     "node_modules/@types/parse-json": {
@@ -2750,6 +2764,18 @@
       "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true
     },
+    "node_modules/@types/tough-cookie": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
+      "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
+      "dev": true
+    },
+    "node_modules/@types/user-agents": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/user-agents/-/user-agents-1.0.2.tgz",
+      "integrity": "sha512-WOoL2UJTI6RxV8RB2kS3ZhxjjijI5G1i7mgU7mtlm4LsC1XGCfiV56h+GV4VZnAUkkkLQ4gbFGR/dggT01n0RA==",
+      "dev": true
+    },
     "node_modules/@types/yargs": {
       "version": "17.0.13",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.13.tgz",
@@ -3127,6 +3153,18 @@
         "node": ">= 10"
       }
     },
+    "node_modules/cacache/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "optional": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -3350,6 +3388,14 @@
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
       "dev": true
     },
+    "node_modules/cross-fetch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "dependencies": {
+        "node-fetch": "2.6.7"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -3462,6 +3508,11 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/destr": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/destr/-/destr-1.1.1.tgz",
+      "integrity": "sha512-QqkneF8LrYmwATMdnuD2MLI3GHQIcBnG6qFC2q9bSH430VTCDAVjcspPmUaKhPGtAtPAftIUFqY1obQYQuwmbg=="
+    },
     "node_modules/detect-libc": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
@@ -5257,14 +5308,11 @@
       "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
     },
     "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.0.tgz",
+      "integrity": "sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ==",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/make-dir": {
@@ -5322,6 +5370,18 @@
         "node": ">= 10"
       }
     },
+    "node_modules/make-fetch-happen/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "optional": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/makeerror": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
@@ -5376,6 +5436,11 @@
         "node": "*"
       }
     },
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+    },
     "node_modules/minipass": {
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
@@ -6092,6 +6157,24 @@
         "node": ">= 6"
       }
     },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+    },
     "node_modules/react-error-overlay": {
       "version": "6.0.9",
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
@@ -6141,6 +6224,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+    },
     "node_modules/resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -6250,6 +6338,17 @@
         "node": ">=10"
       }
     },
+    "node_modules/semver/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -6670,6 +6769,20 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/tough-cookie": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
+      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
@@ -6776,6 +6889,14 @@
         "imurmurhash": "^0.1.4"
       }
     },
+    "node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/update-browserslist-db": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
@@ -6802,6 +6923,15 @@
         "browserslist": ">= 4.21.0"
       }
     },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -8926,10 +9056,16 @@
       "integrity": "sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==",
       "dev": true
     },
+    "@types/minimist": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
+      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+      "dev": true
+    },
     "@types/node": {
-      "version": "18.8.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.3.tgz",
-      "integrity": "sha512-0os9vz6BpGwxGe9LOhgP/ncvYN5Tx1fNcd2TM3rD/aCGBkysb+ZWpXEocG24h6ZzOi13+VB8HndAQFezsSOw1w==",
+      "version": "18.8.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.4.tgz",
+      "integrity": "sha512-WdlVphvfR/GJCLEMbNA8lJ0lhFNBj4SW3O+O5/cEGw9oYrv0al9zTwuQsq+myDUXgNx2jgBynoVgZ2MMJ6pbow==",
       "dev": true
     },
     "@types/parse-json": {
@@ -8950,6 +9086,18 @@
       "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true
     },
+    "@types/tough-cookie": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
+      "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
+      "dev": true
+    },
+    "@types/user-agents": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/user-agents/-/user-agents-1.0.2.tgz",
+      "integrity": "sha512-WOoL2UJTI6RxV8RB2kS3ZhxjjijI5G1i7mgU7mtlm4LsC1XGCfiV56h+GV4VZnAUkkkLQ4gbFGR/dggT01n0RA==",
+      "dev": true
+    },
     "@types/yargs": {
       "version": "17.0.13",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.13.tgz",
@@ -9243,6 +9391,17 @@
         "ssri": "^8.0.1",
         "tar": "^6.0.2",
         "unique-filename": "^1.1.1"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "optional": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
       }
     },
     "callsites": {
@@ -9414,6 +9573,14 @@
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
       "dev": true
     },
+    "cross-fetch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "requires": {
+        "node-fetch": "2.6.7"
+      }
+    },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -9494,6 +9661,11 @@
       "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
       "optional": true
     },
+    "destr": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/destr/-/destr-1.1.1.tgz",
+      "integrity": "sha512-QqkneF8LrYmwATMdnuD2MLI3GHQIcBnG6qFC2q9bSH430VTCDAVjcspPmUaKhPGtAtPAftIUFqY1obQYQuwmbg=="
+    },
     "detect-libc": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
@@ -10774,12 +10946,9 @@
       "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
     },
     "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "requires": {
-        "yallist": "^4.0.0"
-      }
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.0.tgz",
+      "integrity": "sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ=="
     },
     "make-dir": {
       "version": "3.1.0",
@@ -10824,6 +10993,17 @@
         "promise-retry": "^2.0.1",
         "socks-proxy-agent": "^6.0.0",
         "ssri": "^8.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "optional": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
       }
     },
     "makeerror": {
@@ -10871,6 +11051,11 @@
         "brace-expansion": "^1.1.7"
       }
     },
+    "minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+    },
     "minipass": {
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
@@ -11394,6 +11579,21 @@
         "sisteransi": "^1.0.5"
       }
     },
+    "psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+    },
+    "querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+    },
     "react-error-overlay": {
       "version": "6.0.9",
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
@@ -11434,6 +11634,11 @@
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
       "dev": true
     },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+    },
     "resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -11497,6 +11702,16 @@
       "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "requires": {
         "lru-cache": "^6.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
       }
     },
     "set-blocking": {
@@ -11811,6 +12026,17 @@
         "is-number": "^7.0.0"
       }
     },
+    "tough-cookie": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
+      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+      "requires": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      }
+    },
     "tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
@@ -11879,6 +12105,11 @@
         "imurmurhash": "^0.1.4"
       }
     },
+    "universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="
+    },
     "update-browserslist-db": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
@@ -11889,6 +12120,15 @@
         "picocolors": "^1.0.0"
       }
     },
+    "url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",

package/package.json

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

package/src/CookieSpec.ts

@@ -1,4 +1,4 @@
 export default interface CookieSpec {
-  name: string;
   domain: string;
+  name: string;
 }

package/src/CookieStore.ts

@@ -0,0 +1,10 @@
+import { CookieJar } from "tough-cookie";
+import { env } from "./global";
+const { FileCookieStore } = require("tough-cookie-file-store");
+
+export const cookieStore = new FileCookieStore(
+  `${env["HOME"]}/cookie-star.json`
+);
+// export const cookieStore = new MemoryCookieStore();
+
+export const cookieJar = new CookieJar(cookieStore);

package/src/StringToRegex.ts

@@ -0,0 +1,6 @@
+export function stringToRegex(s: string): RegExp {
+  const s1 = s.replaceAll(/\./gi, ".");
+  const s2 = s1.replace(/%/g, ".*");
+  const s3 = s2.replace(/\*/g, ".*");
+  return new RegExp(s3);
+}

package/src/browsers/ChromeCookieQueryStrategy.ts

@@ -11,8 +11,11 @@ import { isCookieRow } from "../IsCookieRow";
 import { isExportedCookie } from "../IsExportedCookie";
 import CookieRow from "../CookieRow";
 import ExportedCookie from "../ExportedCookie";
+import { stringToRegex } from "../StringToRegex";
 
 export default class ChromeCookieQueryStrategy implements CookieQueryStrategy {
+  browserName = "Chrome";
+
   async queryCookies(name: string, domain: string): Promise<ExportedCookie[]> {
     if (process.platform !== "darwin") {
       throw new Error("This only works on macOS");
@@ -56,7 +59,7 @@ async function getPromise(name: string, domain: string): Promise<CookieRow[]> {
     const promises: Promise<CookieRow[]>[] = files.map((file) =>
       getPromise1(name, domain, file)
     );
-    const results1: Awaited<CookieRow[]>[] = await Promise.all(promises);
+    const results1: CookieRow[][] = await Promise.all(promises);
     return results1.flat().filter(isCookieRow);
   } catch (error) {
     if (env.VERBOSE) {
@@ -143,22 +146,29 @@ async function getEncryptedChromeCookie({
   let sql;
   //language=SQL
   sql = "SELECT encrypted_value, name, host_key FROM cookies";
+
   const wildcardRegexp = /^([*%])$/i;
   const specifiedName = name.match(wildcardRegexp) == null;
   const specifiedDomain = domain.match(wildcardRegexp) == null;
-  if (specifiedName || specifiedDomain) {
+  const wildcardDomain = domain.match(/[%*]/) != null;
+  const queryDomain = specifiedDomain && !wildcardDomain;
+  // if we have a wildcard domain, we need to use a regexp
+  if (specifiedName || queryDomain) {
     sql += ` WHERE `;
     if (specifiedName) {
       sql += `name = '${name}'`;
-      if (specifiedDomain) {
+      if (queryDomain) {
         sql += ` AND `;
       }
     }
-    if (specifiedDomain) {
-      sql += `host_key LIKE '${domain}';`;
+    if (queryDomain) {
+      // leading dot replaced with % to match subdomains
+      const sqlEmbedDomain = domain.replace(/^[.%]?/, "%");
+      sql += `host_key LIKE '${sqlEmbedDomain}';`;
     }
   }
-  return doSqliteQuery1({
+  console.log("sql", sql);
+  const sqliteQuery1: CookieRow[] = await doSqliteQuery1({
     file: file,
     sql: sql,
     rowTransform: (row) => {
@@ -169,6 +179,9 @@ async function getEncryptedChromeCookie({
       };
     },
   });
+  return sqliteQuery1.filter((row) => {
+    return row.domain.match(stringToRegex(domain)) != null;
+  });
 }
 
 async function getChromePassword(): Promise<string> {

package/src/browsers/CompositeCookieQueryStrategy.ts

@@ -4,7 +4,8 @@ import SafariCookieQueryStrategy from "./SafariCookieQueryStrategy";
 import CookieQueryStrategy from "./CookieQueryStrategy";
 import ExportedCookie from "../ExportedCookie";
 import LRUCache from "lru-cache";
-import MemoryCookieStoreQueryStrategy from "./MemoryCookieJarQueryStrategy";
+import CookieStoreQueryStrategy from "./CookieStoreQueryStrategy";
+import { red } from "colorette";
 
 const cache = new LRUCache<string, ExportedCookie[]>({
   ttl: 1000 * 2,
@@ -14,11 +15,13 @@ const cache = new LRUCache<string, ExportedCookie[]>({
 export default class CompositeCookieQueryStrategy
   implements CookieQueryStrategy
 {
+  browserName = "all";
+
   #strategies;
 
   constructor() {
     this.#strategies = [
-      MemoryCookieStoreQueryStrategy,
+      CookieStoreQueryStrategy,
       ChromeCookieQueryStrategy,
       FirefoxCookieQueryStrategy,
       SafariCookieQueryStrategy,
@@ -28,19 +31,24 @@ export default class CompositeCookieQueryStrategy
   }
 
   async queryCookies(name: string, domain: string): Promise<ExportedCookie[]> {
+    // domain = domain.match(/(\w+.+\w+)/gi)?.pop() ?? domain;
     const key = `${name}:${domain}`;
     const cached = cache.get(key);
     if (cached) {
       return cached;
     }
-    const results = await Promise.all(
-      this.#strategies.map(async (strategy) => {
+    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(() => []);
+        return cookies.catch((e) => {
+          console.log(red(`Error querying ${strategy.browserName} cookies`), e);
+          return [];
+        });
       })
     );
     const flat: ExportedCookie[] = results.flat();

package/src/browsers/CookieQueryStrategy.ts

@@ -1,5 +1,6 @@
 import ExportedCookie from "../ExportedCookie";
 
 export default interface CookieQueryStrategy {
+  browserName: string;
   queryCookies(name: string, domain: string): Promise<ExportedCookie[]>;
 }

package/src/browsers/CookieStoreQueryStrategy.ts

@@ -0,0 +1,91 @@
+import CookieQueryStrategy from "./CookieQueryStrategy";
+import CookieSpec from "../CookieSpec";
+import ExportedCookie from "../ExportedCookie";
+import { Cookie } from "tough-cookie";
+import { cookieStore, cookieJar } from "../CookieStore";
+import { stringToRegex } from "../StringToRegex";
+
+export default class CookieStoreQueryStrategy implements CookieQueryStrategy {
+  browserName = "internal";
+
+  async queryCookies(name: string, domain: string): Promise<ExportedCookie[]> {
+    const exportedCookies: ExportedCookie[] = [];
+
+    // if (name.match(/[%*]/) || domain.match(/[%*]/)) {
+    const cookies: Cookie[] = await this.#getAllCookies();
+    const allExportedCookies = cookies.map((cookie: Cookie) => {
+      return this.#extracted(cookie, { name, domain });
+    });
+    exportedCookies.push(...allExportedCookies);
+    // }
+
+    const wildcardRegexp = /^([*%])$/i;
+    if (name.match(wildcardRegexp) && domain.match(wildcardRegexp)) {
+      return exportedCookies;
+    }
+
+    const path = "/";
+
+    if (domain != "%") {
+      const domain1 = domain.match(/(\w+.+\w+)/gi)?.pop() ?? domain;
+      const url = new URL("https://" + domain1);
+      url.pathname = path;
+      const cookies: Cookie[] = await this.#getCookies(url.href);
+      const domainCookies = cookies.map((cookie: Cookie) => {
+        return this.#extracted(cookie, {
+          domain,
+          name,
+        });
+      });
+      exportedCookies.push(...domainCookies);
+    }
+
+    if (name == "%") {
+      return exportedCookies;
+    }
+
+    return exportedCookies.filter((cookie: ExportedCookie) => {
+      return (
+        cookie.name.match(stringToRegex(name)) &&
+        cookie.domain.match(stringToRegex(domain))
+      );
+    });
+  }
+
+  #extracted(cookie: Cookie, cookieSpec: CookieSpec): ExportedCookie {
+    return {
+      domain: cookie.domain ?? cookieSpec.domain,
+      name: cookie.key ?? cookieSpec.name,
+      value: cookie.value,
+      meta: {
+        file: "memory",
+      },
+    };
+  }
+
+  #getCookies(url: string): Promise<Cookie[]> {
+    return new Promise((resolve, reject) => {
+      // @ts-ignore
+      return cookieJar.getCookies(url, (err, cookies) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve(cookies ?? []);
+        }
+      });
+    });
+  }
+
+  #getAllCookies(): Promise<Cookie[]> {
+    return new Promise((resolve, reject) => {
+      // @ts-ignore
+      return cookieStore.getAllCookies((err, cookies) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve(cookies ?? []);
+        }
+      });
+    });
+  }
+}

package/src/browsers/FirefoxCookieQueryStrategy.ts

@@ -10,6 +10,8 @@ import CookieSpec from "../CookieSpec";
 import { specialCases } from "../SpecialCases";
 
 export default class FirefoxCookieQueryStrategy implements CookieQueryStrategy {
+  browserName = "Firefox";
+
   async queryCookies(name: string, domain: string): Promise<ExportedCookie[]> {
     if (process.platform !== "darwin") {
       throw new Error("This only works on macOS");

package/src/browsers/SafariCookieQueryStrategy.ts

@@ -2,6 +2,8 @@ import CookieQueryStrategy from "./CookieQueryStrategy";
 import ExportedCookie from "../ExportedCookie";
 
 export default class SafariCookieQueryStrategy implements CookieQueryStrategy {
+  browserName = "Safari";
+
   async queryCookies(name: string, domain: string): Promise<ExportedCookie[]> {
     return [];
   }

package/src/fetchWithCookies.ts

@@ -6,7 +6,7 @@ import { merge } from "lodash";
 import destr from "destr";
 import CookieSpec from "./CookieSpec";
 import { getGroupedRenderedCookies } from "./getGroupedRenderedCookies";
-import { cookieJar } from "./MemoryCookieStore";
+import { cookieJar } from "./CookieStore";
 
 export async function fetchWithCookies(
   url: RequestInfo | URL,

package/src/MemoryCookieStore.ts

@@ -1,5 +0,0 @@
-import { CookieJar, MemoryCookieStore } from "tough-cookie";
-
-export const memoryCookieStore = new MemoryCookieStore();
-
-export const cookieJar = new CookieJar(memoryCookieStore);

package/src/browsers/MemoryCookieJarQueryStrategy.ts

@@ -1,53 +0,0 @@
-import ExportedCookie from "../ExportedCookie";
-import CookieQueryStrategy from "./CookieQueryStrategy";
-import { Cookie } from "tough-cookie";
-import CookieSpec from "../CookieSpec";
-import { memoryCookieStore } from "../MemoryCookieStore";
-
-export default class MemoryCookieStoreQueryStrategy
-  implements CookieQueryStrategy
-{
-  async queryCookies(name: string, domain: string): Promise<ExportedCookie[]> {
-    if (name == "%" && domain == "%") {
-      const cookies: Cookie[] = await memoryCookieStore.getAllCookies();
-      return cookies.map((cookie) => {
-        return this.#extracted(cookie, { name, domain });
-      });
-    }
-
-    const path = "/";
-
-    if (name == "%") {
-      const cookies: Cookie[] = await memoryCookieStore.findCookies(
-        domain,
-        path
-      );
-      return cookies.map((cookie) => {
-        return this.#extracted(cookie, { name, domain });
-      });
-    }
-
-    const cookie: Cookie | null = await memoryCookieStore.findCookie(
-      domain,
-      path,
-      name
-    );
-
-    if (cookie) {
-      return [this.#extracted(cookie, { name, domain })];
-    } else {
-      return [];
-    }
-  }
-
-  #extracted(cookie: Cookie, cookieSpec: CookieSpec): ExportedCookie {
-    return {
-      domain: cookie.domain ?? cookieSpec.domain,
-      name: cookie.key ?? cookieSpec.name,
-      value: cookie.value,
-      meta: {
-        file: "memory",
-      },
-    };
-  }
-}