@mherod/get-cookie 2.0.0-beta.7 → 2.0.0-beta.9

package/src/browsers/FirefoxCookieQueryStrategy.ts

@@ -5,7 +5,7 @@ import { toStringOrNull } from "../utils";
 import { findAllFiles } from "../findAllFiles";
 import * as path from "path";
 import { doSqliteQuery1 } from "../doSqliteQuery1";
-import ExportedCookie from "../ExportedCookie";
+import { ExportedCookie } from "../ExportedCookie";
 
 export default class FirefoxCookieQueryStrategy implements CookieQueryStrategy {
   async queryCookies(name: string, domain: string): Promise<ExportedCookie[]> {

package/src/browsers/SafariCookieQueryStrategy.ts

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

package/src/cli.ts

@@ -5,8 +5,8 @@ import { queryCookies } from "./queryCookies";
 import { argv } from "./argv";
 import { groupBy } from "lodash";
 import { blue, green } from "colorette";
-import ExportedCookie from "./ExportedCookie";
 import { resultsRendered } from "./resultsRendered";
+import { ExportedCookie } from "./ExportedCookie";
 
 function combinedString(results: ExportedCookie[]) {
   return blue(resultsRendered(results));

package/src/doSqliteQuery1.ts

@@ -1,6 +1,6 @@
 import * as fs from "fs";
 import * as sqlite3 from "sqlite3";
-import CookieRow from "./CookieRow";
+import { CookieRow } from "./CookieRow";
 
 export async function doSqliteQuery1(file: string, sql: string): Promise<CookieRow[]> {
   if (!fs.existsSync(file)) {

package/src/fetchWithCookies.ts

@@ -11,19 +11,33 @@ export async function fetchWithCookies(
   url: RequestInfo | URL,
   options: RequestInit | undefined = {}
 ): Promise<FetchResponse> {
-  const url1 = new URL(`${url}`);
-  const cookie: string[] = await getGroupedRenderedCookies({
+  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"
+    },
+    redirect: "manual"
+  };
+  const url2: string = `${url}`;
+  const url1: URL = new URL(url2);
+  const domain = url1.hostname.replace(/^.*(\.\w+\.\w+)$/, (match, p1) => {
+    return `%${p1}`;
+  });
+  const cookies: string[] = await getGroupedRenderedCookies({
     name: "%",
-    domain: url1.hostname
+    domain: domain
   });
-  merge(options, {
-    credentials: "include",
+  const cookie = cookies.pop();
+  const newOptions1: RequestInit = merge(defaultOptions, options, {
     headers: {
-      Cookie: cookie.pop()
+      Cookie: cookie
     }
   });
   try {
-    const res = await fetch(url, options);
+    const res = await fetch(url2, newOptions1);
+    const newUrl = res.headers.get("location") as string;
+    if (res.redirected || newUrl && newUrl !== url2) {
+      return fetchWithCookies(newUrl, newOptions1);
+    }
     const arrayBuffer1 = res.arrayBuffer();
     const arrayBuffer = async () => arrayBuffer1;
     const buffer = async () => arrayBuffer().then(Buffer.from);

package/src/getGroupedRenderedCookies.ts

@@ -1,9 +1,9 @@
-import ExportedCookie from "./ExportedCookie";
 import { queryCookies } from "./queryCookies";
 import CompositeCookieQueryStrategy from "./browsers/CompositeCookieQueryStrategy";
 import { groupBy } from "lodash";
 import { resultsRendered } from "./resultsRendered";
-import CookieRequest from "./CookieRequest";
+import { CookieRequest } from "./CookieRequest";
+import { ExportedCookie } from "./ExportedCookie";
 
 export async function getGroupedRenderedCookies(
   //

package/src/index.ts

@@ -5,10 +5,12 @@ import { queryCookies } from "./queryCookies";
 import FirefoxCookieQueryStrategy from "./browsers/FirefoxCookieQueryStrategy";
 import ChromeCookieQueryStrategy from "./browsers/ChromeCookieQueryStrategy";
 import CompositeCookieQueryStrategy from "./browsers/CompositeCookieQueryStrategy";
+import { CookieRequest } from "./CookieRequest";
+import { ExportedCookie } from "./ExportedCookie";
 import { getGroupedRenderedCookies } from "./getGroupedRenderedCookies";
 import { fetchWithCookies } from "./fetchWithCookies";
 
-export async function getCookie(params: { name: string; domain: string; }) {
+export async function getCookie(params: CookieRequest): Promise<ExportedCookie | undefined> {
   const cookies = await queryCookies(
     params,
     new CompositeCookieQueryStrategy()
@@ -21,12 +23,7 @@ export async function getCookie(params: { name: string; domain: string; }) {
   }
 }
 
-/**
- *
- * @param params
- * @returns {Promise<*>}
- */
-export async function getFirefoxCookie(params: { name: string; domain: string; }) {
+export async function getFirefoxCookie(params: CookieRequest): Promise<ExportedCookie | undefined> {
   const cookies = await queryCookies(
     params,
     new FirefoxCookieQueryStrategy()
@@ -39,12 +36,7 @@ export async function getFirefoxCookie(params: { name: string; domain: string; }
   }
 }
 
-/**
- *
- * @param params
- * @returns {Promise<*>}
- */
-export async function getChromeCookie(params: { name: string; domain: string; }) {
+export async function getChromeCookie(params: CookieRequest): Promise<ExportedCookie | undefined> {
   const cookies = await queryCookies(
     params,
     new ChromeCookieQueryStrategy()
@@ -57,10 +49,11 @@ export async function getChromeCookie(params: { name: string; domain: string; })
   }
 }
 
-export default {
-  getCookie,
-  getFirefoxCookie,
-  getChromeCookie,
+export {
   getGroupedRenderedCookies,
-  fetchWithCookies
-}
+  fetchWithCookies,
+};
+
+export * from "./CookieRequest";
+export * from "./CookieRow";
+export * from "./ExportedCookie";

package/src/queryCookies.ts

@@ -3,8 +3,8 @@ import { uniqBy } from "lodash";
 import CompositeCookieQueryStrategy from "./browsers/CompositeCookieQueryStrategy";
 import CookieQueryStrategy from "./browsers/CookieQueryStrategy";
 import isValidJwt from "./isValidJwt";
-import ExportedCookie from "./ExportedCookie";
-import CookieRequest from "./CookieRequest";
+import { CookieRequest } from "./CookieRequest";
+import { ExportedCookie } from "./ExportedCookie";
 
 export async function queryCookies(
   {

package/src/resultsRendered.ts

@@ -1,5 +1,5 @@
-import ExportedCookie from "./ExportedCookie";
 import { uniqBy } from "lodash";
+import { ExportedCookie } from "./ExportedCookie";
 
 export function resultsRendered(results: ExportedCookie[]) {
   return uniqBy(results, (r) => r.name)