@mherod/get-cookie 2.0.0-rc.8 → 2.0.0-rc.9

package/dist/index.js

@@ -41,6 +41,7 @@ function $parcel$interopDefault(a) {
 $parcel$export(module.exports, "getCookie", () => $8481e2034946cc4b$export$4be65e66cfa2648a);
 $parcel$export(module.exports, "getChromeCookie", () => $1a92ef2038b55530$export$e5637297e9eb6f2e);
 $parcel$export(module.exports, "getFirefoxCookie", () => $f9b70200901ad17d$export$c44c5fdef43f0941);
+$parcel$export(module.exports, "getMergedRenderedCookies", () => $4ffeaeb7bb3c0319$export$cfc0723de5712e57);
 $parcel$export(module.exports, "getGroupedRenderedCookies", () => $300d8b33187a203c$export$4d2e9997e2c23417);
 $parcel$export(module.exports, "fetchWithCookies", () => $cfc07ae4aa2c7e44$export$b24a545a0b39f491);
 
@@ -722,6 +723,23 @@ async function $300d8b33187a203c$export$4d2e9997e2c23417({ name: name , domain:
 
 
 
+async function $4ffeaeb7bb3c0319$export$cfc0723de5712e57({ name: name , domain: domain  }) {
+    const cookies = await (0, $7a068a32d4710f0b$export$e6d428437cf2cacb)({
+        name: name,
+        domain: domain
+    }, new (0, $f72befa528c23ca7$export$2e2bcd8739ae039)());
+    if (cookies.length == 0) throw new Error("Cookie not found");
+    const results = await (0, $7a068a32d4710f0b$export$e6d428437cf2cacb)({
+        name: name,
+        domain: domain
+    });
+    return (0, $9c43c2ed82e63570$export$9abc0a414b0d8b8f)(results);
+}
+
+
+
+
+
 
 
 
@@ -743,23 +761,28 @@ async function $cfc07ae4aa2c7e44$export$b24a545a0b39f491(url, options = {}, fetc
         name: "%",
         domain: domain
     };
-    const cookies = await (0, $300d8b33187a203c$export$4d2e9997e2c23417)(cookieSpec).catch(()=>[]);
-    const cookie = cookies.pop();
+    // const cookies: string[] = await getGroupedRenderedCookies(cookieSpec).catch(
+    //   () => []
+    // );
+    // const cookie = cookies.pop();
+    const cookie = await (0, $4ffeaeb7bb3c0319$export$cfc0723de5712e57)(cookieSpec).catch(()=>"");
+    const headers = {};
+    if (cookie.length > 0) (0, $7oI3p$lodash.merge)(headers, {
+        Cookie: cookie
+    });
     const newOptions1 = (0, $7oI3p$lodash.merge)(defaultOptions, options, {
-        headers: {
-            Cookie: cookie
-        }
+        headers: headers
     });
     try {
         const res = await fetch(url2, newOptions1);
-        const headers = [];
+        const headers1 = [];
         res.headers.forEach((value, key)=>{
-            headers.push([
+            headers1.push([
                 key,
                 value
             ]);
         });
-        for (const [key, value] of headers)if (key === "set-cookie") {
+        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);

package/package.json

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

package/src/fetchWithCookies.ts

@@ -5,11 +5,11 @@ import { merge } from "lodash";
 // noinspection SpellCheckingInspection
 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";
+import { getMergedRenderedCookies } from "./getMergedRenderedCookies";
 
 export async function fetchWithCookies(
   url: RequestInfo | URL,
@@ -31,15 +31,18 @@ export async function fetchWithCookies(
     name: "%",
     domain: domain,
   };
-  const cookies: string[] = await getGroupedRenderedCookies(cookieSpec).catch(
-    () => []
-  );
-  const cookie = cookies.pop();
-  const newOptions1: RequestInit = merge(defaultOptions, options, {
-    headers: {
+  // const cookies: string[] = await getGroupedRenderedCookies(cookieSpec).catch(
+  //   () => []
+  // );
+  // const cookie = cookies.pop();
+  const cookie = await getMergedRenderedCookies(cookieSpec).catch(() => "");
+  const headers = {};
+  if (cookie.length > 0) {
+    merge(headers, {
       Cookie: cookie,
-    },
-  });
+    });
+  }
+  const newOptions1: RequestInit = merge(defaultOptions, options, { headers });
   try {
     const res: Response = await fetch(url2, newOptions1);
     const headers: [string, string][] = [];

package/src/getMergedRenderedCookies.ts

@@ -0,0 +1,25 @@
+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 getMergedRenderedCookies({
+  name,
+  domain,
+}: CookieSpec): Promise<string> {
+  const cookies: ExportedCookie[] = await queryCookies(
+    {
+      name,
+      domain,
+    },
+    new CompositeCookieQueryStrategy()
+    //
+  );
+  if (cookies.length == 0) {
+    throw new Error("Cookie not found");
+  }
+  const results: ExportedCookie[] = await queryCookies({ name, domain });
+  return resultsRendered(results);
+}

package/src/index.ts

@@ -5,12 +5,14 @@ import { getCookie } from "./getCookie";
 import { getChromeCookie } from "./getChromeCookie";
 import { getFirefoxCookie } from "./getFirefoxCookie";
 import { getGroupedRenderedCookies } from "./getGroupedRenderedCookies";
+import { getMergedRenderedCookies } from "./getMergedRenderedCookies";
 import { fetchWithCookies } from "./fetchWithCookies";
 
 export {
   getCookie,
   getChromeCookie,
   getFirefoxCookie,
+  getMergedRenderedCookies,
   getGroupedRenderedCookies,
   fetchWithCookies,
   //