@mherod/get-cookie 2.0.0-rc.30 → 2.0.0-rc.32

package/src/fetchWithCookies.ts

@@ -4,10 +4,7 @@ import { fetch as fetchImpl } from "cross-fetch";
 import { merge } from "lodash";
 // noinspection SpellCheckingInspection
 import destr from "destr";
-import { cookieJarPromise } from "./CookieStore";
-import UserAgent from "user-agents";
 import { parsedArgs } from "./argv";
-import { blue, redBright, yellow } from "colorette";
 import { getMergedRenderedCookies } from "./getMergedRenderedCookies";
 import { cookieSpecsFromUrl } from "./cookieSpecsFromUrl";
 import CookieSpec from "./CookieSpec";
@@ -18,7 +15,8 @@ if (typeof fetchImpl !== "function") {
   throw new Error("fetch is not a function");
 }
 
-const userAgent = new UserAgent().toString();
+const userAgent =
+  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36";
 
 interface FetchRequestInit {
   url: RequestInfo | URL | string;
@@ -29,7 +27,7 @@ export async function fetchWithCookies(
   url: RequestInfo | URL | string,
   options: RequestInit | undefined = {},
   fetch: Function = fetchImpl as Function,
-  originalRequest: FetchRequestInit | undefined = undefined
+  originalRequest: FetchRequestInit | undefined = undefined,
 ): Promise<Response> {
   if (typeof fetch !== "function") {
     const message = "fetch is not a function";
@@ -52,11 +50,11 @@ export async function fetchWithCookies(
     (err) => {
       consola.error(err);
       return "";
-    }
+    },
   );
   if (parsedArgs["dump-request-headers"]) {
-    consola.info(redBright("Request URL:"), url1.href);
-    consola.info(blue("Request headers:"), headers);
+    consola.info("Request URL:", url1.href);
+    consola.info("Request headers:", headers);
   }
   const newOptions1: RequestInit = merge(defaultOptions, { headers }, options);
   try {
@@ -82,14 +80,14 @@ export async function fetchWithCookies(
       // follow the redirect
       if (newUrl && newUrl !== url2) {
         if (parsedArgs.verbose || parsedArgs["dump-response-headers"]) {
-          console.log(blue(`Redirected to `), yellow(newUrl));
+          console.log(`Redirected to `, newUrl);
         }
         return fetchWithCookies(
           //
           newUrl,
           newOptions1,
           fetch,
-          originalRequest1
+          originalRequest1,
           //
         );
       }
@@ -114,14 +112,14 @@ export async function fetchWithCookies(
           break;
       }
       if (parsedArgs.verbose) {
-        console.log(blue(`Redirected to `), yellow(newUrl));
+        console.log(`Redirected to `, newUrl);
       }
       return fetchWithCookies(
         //
         newUrl,
         newOptions2,
         fetch,
-        originalRequest1
+        originalRequest1,
         //
       );
     }
@@ -146,7 +144,7 @@ export async function fetchWithCookies(
 
     async function formData(): Promise<FormData> {
       const urlSearchParams: URLSearchParams = await text().then(
-        (text) => new URLSearchParams(text)
+        (text) => new URLSearchParams(text),
       );
       const formData = new FormData();
       for (const [key, value] of urlSearchParams.entries()) {

package/src/findAllFiles.ts

@@ -11,7 +11,7 @@ type FindFilesOptions = {
 
 export function findAllFiles(
   //
-  { path, name, maxDepth = 2 }: FindFilesOptions
+  { path, name, maxDepth = 2 }: FindFilesOptions,
 ): //
 string[] {
   if (!existsSync(path)) {

package/src/getChromeCookie.ts

@@ -5,11 +5,11 @@ import ChromeCookieQueryStrategy from "./browsers/ChromeCookieQueryStrategy";
 import { isExportedCookie } from "./ExportedCookie";
 
 export async function getChromeCookie(
-  params: CookieSpec
+  params: CookieSpec,
 ): Promise<ExportedCookie | undefined> {
   const cookies = await queryCookies(
     params,
-    new ChromeCookieQueryStrategy()
+    new ChromeCookieQueryStrategy(),
     //
   );
   if (cookies.length == 0) {

package/src/getCookie.ts

@@ -4,12 +4,12 @@ import { queryCookies } from "./queryCookies";
 import CompositeCookieQueryStrategy from "./browsers/CompositeCookieQueryStrategy";
 
 export async function getCookie(
-  params: CookieSpec
+  params: CookieSpec,
 ): Promise<ExportedCookie | undefined> {
   //
   const cookies = await queryCookies(
     params,
-    new CompositeCookieQueryStrategy()
+    new CompositeCookieQueryStrategy(),
     //
   );
   if (Array.isArray(cookies) && cookies.length > 0) {

package/src/getFirefoxCookie.ts

@@ -4,11 +4,11 @@ import { queryCookies } from "./queryCookies";
 import FirefoxCookieQueryStrategy from "./browsers/FirefoxCookieQueryStrategy";
 
 export async function getFirefoxCookie(
-  params: CookieSpec
+  params: CookieSpec,
 ): Promise<ExportedCookie | undefined> {
   const cookies: ExportedCookie[] = await queryCookies(
     params,
-    new FirefoxCookieQueryStrategy()
+    new FirefoxCookieQueryStrategy(),
     //
   );
   if (Array.isArray(cookies) && cookies.length > 0) {

package/src/getGroupedRenderedCookies.ts

@@ -5,7 +5,7 @@ import ExportedCookie from "./ExportedCookie";
 import { comboQueryCookieSpec } from "./comboQueryCookieSpec";
 
 export async function getGroupedRenderedCookies(
-  cookieSpec: MultiCookieSpec
+  cookieSpec: MultiCookieSpec,
 ): Promise<string[]> {
   const cookies: ExportedCookie[] = await comboQueryCookieSpec(cookieSpec);
   if (cookies.length == 0) {

package/src/getMergedRenderedCookies.test.ts

@@ -0,0 +1,25 @@
+import { getMergedRenderedCookies } from "./getMergedRenderedCookies";
+import { MultiCookieSpec } from "./CookieSpec";
+
+describe("getMergedRenderedCookies", () => {
+  it("should return empty string if no cookies are present", async () => {
+    const cookieSpec: MultiCookieSpec = [];
+    const result = await getMergedRenderedCookies(cookieSpec);
+    expect(result).toBe("");
+  });
+
+  it("should return rendered cookies if cookies are present", async () => {
+    const cookieSpec: MultiCookieSpec = [
+      {
+        name: "sessionCookie",
+        domain: "www.example.com",
+      },
+      {
+        name: "persistentCookie",
+        domain: "www.example.com",
+      },
+    ];
+    const result = await getMergedRenderedCookies(cookieSpec);
+    expect(result).not.toBe("");
+  });
+});

package/src/getMergedRenderedCookies.ts

@@ -5,7 +5,7 @@ import ExportedCookie from "./ExportedCookie";
 import consola from "consola";
 
 export async function getMergedRenderedCookies(
-  cookieSpec: MultiCookieSpec
+  cookieSpec: MultiCookieSpec,
 ): Promise<string> {
   const cookies: ExportedCookie[] = await comboQueryCookieSpec(cookieSpec);
   return cookies.length > 0 ? resultsRendered(cookies) : "";

package/src/queryCookies.ts

@@ -10,9 +10,12 @@ export async function queryCookies(
   {
     name,
     domain,
+    limit,
   }: //
-  CookieSpec,
-  strategy: CookieQueryStrategy = new CompositeCookieQueryStrategy()
+  CookieSpec & {
+    limit?: number;
+  },
+  strategy: CookieQueryStrategy = new CompositeCookieQueryStrategy(),
 ): Promise<ExportedCookie[]> {
   //
   const results: ExportedCookie[] = await strategy.queryCookies(name, domain);

package/src/util/flatMapAsync.ts

@@ -4,7 +4,7 @@
 export async function flatMapAsync<T, O>(
   array: T[], // The input array to transform.
   callback: (value: T, index: number, array: T[]) => Promise<O[]>, // The async function to apply to each input array element.,
-  or?: O[] | ((error: any) => O[] | Promise<O[]>) // An optional callback to handle errors.
+  or?: O[] | ((error: any) => O[] | Promise<O[]>), // An optional callback to handle errors.
 ): Promise<O[]> {
   if (or) {
     return flatMapAsync(
@@ -15,7 +15,7 @@ export async function flatMapAsync<T, O>(
         } catch (error) {
           return typeof or == "function" ? or(error) : or;
         }
-      }
+      },
       //
     );
   }

package/tsconfig.json

@@ -1,9 +1,16 @@
 {
-  "include": ["src/**.ts", "src/**.tsx", "src/**.js", "src/**.jsx"],
+  "include": [
+    "src/**.ts",
+    "src/**.tsx",
+    "src/**.js",
+    "src/**.jsx",
+    "src/**.test.ts",
+    "src/**.test.js"
+  ],
   "compilerOptions": {
     "moduleResolution": "node",
     "target": "es6",
-    "types": ["node"],
+    "types": ["node", "jest"],
     "lib": ["es2015", "es2017", "es2021", "dom"],
     "strict": true,
     "skipDefaultLibCheck": true,