@mherod/get-cookie 2.0.0-beta.9 → 2.0.0-rc.2

package/src/fetchWithCookies.ts

@@ -4,7 +4,7 @@ import { fetch } from "cross-fetch";
 import { merge } from "lodash";
 // noinspection SpellCheckingInspection
 import destr from "destr";
-import FetchResponse from "./fetchResponse";
+import FetchResponse from "./FetchResponse";
 import { getGroupedRenderedCookies } from "./getGroupedRenderedCookies";
 
 export async function fetchWithCookies(
@@ -13,9 +13,10 @@ export async function fetchWithCookies(
 ): Promise<FetchResponse> {
   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":
+        "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"
+    redirect: "manual",
   };
   const url2: string = `${url}`;
   const url1: URL = new URL(url2);
@@ -24,18 +25,18 @@ export async function fetchWithCookies(
   });
   const cookies: string[] = await getGroupedRenderedCookies({
     name: "%",
-    domain: domain
-  });
+    domain: domain,
+  }).catch(() => []);
   const cookie = cookies.pop();
   const newOptions1: RequestInit = merge(defaultOptions, options, {
     headers: {
-      Cookie: cookie
-    }
+      Cookie: cookie,
+    },
   });
   try {
-    const res = await fetch(url2, newOptions1);
+    const res: Response = await fetch(url2, newOptions1);
     const newUrl = res.headers.get("location") as string;
-    if (res.redirected || newUrl && newUrl !== url2) {
+    if (res.redirected || (newUrl && newUrl !== url2)) {
       return fetchWithCookies(newUrl, newOptions1);
     }
     const arrayBuffer1 = res.arrayBuffer();
@@ -43,7 +44,8 @@ export async function fetchWithCookies(
     const buffer = async () => arrayBuffer().then(Buffer.from);
     const text = async () => buffer().then((buffer) => buffer.toString("utf8"));
     const json = async () => text().then(destr);
-    const formData = async () => text().then((text) => new URLSearchParams(text));
+    const formData = async () =>
+      text().then((text) => new URLSearchParams(text));
     const source2 = {
       status: res.status,
       statusText: res.statusText,
@@ -52,7 +54,7 @@ export async function fetchWithCookies(
       buffer,
       text,
       json,
-      formData
+      formData,
       //
     };
     return merge({}, res, source2);

package/src/findAllFiles.ts

@@ -1,18 +1,16 @@
 import { env } from "./global";
 import * as fs from "fs";
 
-export async function findAllFiles(
-  {
-    path,
-    name,
-    maxDepth = 2
-//
-  }: {
-    path: string;
-    name: string;
-    maxDepth?: number;
-  }
-): Promise<string[]> {
+export async function findAllFiles({
+  path,
+  name,
+  maxDepth = 2,
+}: //
+{
+  path: string;
+  name: string;
+  maxDepth?: number;
+}): Promise<string[]> {
   const rootSegments = path.split("/").length;
 
   if (env.VERBOSE) {
@@ -45,7 +43,7 @@ export async function findAllFiles(
           const subFiles = await findAllFiles({
             path: filePath,
             name: name,
-            maxDepth: 2
+            maxDepth: 2,
           });
           files.push(...subFiles);
         } catch (e) {

package/src/getGroupedRenderedCookies.ts

@@ -2,18 +2,18 @@ import { queryCookies } from "./queryCookies";
 import CompositeCookieQueryStrategy from "./browsers/CompositeCookieQueryStrategy";
 import { groupBy } from "lodash";
 import { resultsRendered } from "./resultsRendered";
-import { CookieRequest } from "./CookieRequest";
+import { CookieSpec } from "./CookieSpec";
 import { ExportedCookie } from "./ExportedCookie";
 
 export async function getGroupedRenderedCookies(
   //
   {
     name,
-    domain
-    //
-  }: CookieRequest
-  //
-): Promise<string[]> {
+    domain,
+  }: //
+  CookieSpec
+): //
+Promise<string[]> {
   const cookies: ExportedCookie[] = await queryCookies(
     { name, domain },
     new CompositeCookieQueryStrategy()

package/src/global.ts

@@ -1,4 +1,5 @@
-const { merge } = require("lodash");
+import { merge } from "lodash";
+
 export const env: any = {};
 merge(env, process.env);
 export const HOME: string = env["HOME"];

package/src/index.ts

@@ -5,12 +5,14 @@ import { queryCookies } from "./queryCookies";
 import FirefoxCookieQueryStrategy from "./browsers/FirefoxCookieQueryStrategy";
 import ChromeCookieQueryStrategy from "./browsers/ChromeCookieQueryStrategy";
 import CompositeCookieQueryStrategy from "./browsers/CompositeCookieQueryStrategy";
-import { CookieRequest } from "./CookieRequest";
+import { CookieSpec } from "./CookieSpec";
 import { ExportedCookie } from "./ExportedCookie";
 import { getGroupedRenderedCookies } from "./getGroupedRenderedCookies";
 import { fetchWithCookies } from "./fetchWithCookies";
 
-export async function getCookie(params: CookieRequest): Promise<ExportedCookie | undefined> {
+export async function getCookie(
+  params: CookieSpec
+): Promise<ExportedCookie | undefined> {
   const cookies = await queryCookies(
     params,
     new CompositeCookieQueryStrategy()
@@ -23,7 +25,9 @@ export async function getCookie(params: CookieRequest): Promise<ExportedCookie |
   }
 }
 
-export async function getFirefoxCookie(params: CookieRequest): Promise<ExportedCookie | undefined> {
+export async function getFirefoxCookie(
+  params: CookieSpec
+): Promise<ExportedCookie | undefined> {
   const cookies = await queryCookies(
     params,
     new FirefoxCookieQueryStrategy()
@@ -36,7 +40,9 @@ export async function getFirefoxCookie(params: CookieRequest): Promise<ExportedC
   }
 }
 
-export async function getChromeCookie(params: CookieRequest): Promise<ExportedCookie | undefined> {
+export async function getChromeCookie(
+  params: CookieSpec
+): Promise<ExportedCookie | undefined> {
   const cookies = await queryCookies(
     params,
     new ChromeCookieQueryStrategy()
@@ -49,11 +55,8 @@ export async function getChromeCookie(params: CookieRequest): Promise<ExportedCo
   }
 }
 
-export {
-  getGroupedRenderedCookies,
-  fetchWithCookies,
-};
+export { getGroupedRenderedCookies, fetchWithCookies };
 
-export * from "./CookieRequest";
+export * from "./CookieSpec";
 export * from "./CookieRow";
 export * from "./ExportedCookie";

package/src/isValidJwt.ts

@@ -1,4 +1,4 @@
-import jsonwebtoken from "jsonwebtoken";
+import jsonwebtoken, { JwtPayload } from "jsonwebtoken";
 import { env } from "./global";
 
 export default function isValidJwt(token: any) {
@@ -7,6 +7,16 @@ export default function isValidJwt(token: any) {
     if (env.VERBOSE) {
       console.log(result);
     }
+    const payload: JwtPayload = result?.payload as JwtPayload;
+    if (payload) {
+      const exp = payload.exp;
+      if (exp) {
+        const now = new Date().getTime() / 1000;
+        if (now > exp) {
+          return false;
+        }
+      }
+    }
     return true;
   } catch (err) {
     return false;

package/src/queryCookies.ts

@@ -3,14 +3,11 @@ import { uniqBy } from "lodash";
 import CompositeCookieQueryStrategy from "./browsers/CompositeCookieQueryStrategy";
 import CookieQueryStrategy from "./browsers/CookieQueryStrategy";
 import isValidJwt from "./isValidJwt";
-import { CookieRequest } from "./CookieRequest";
+import { CookieSpec } from "./CookieSpec";
 import { ExportedCookie } from "./ExportedCookie";
 
 export async function queryCookies(
-  {
-    name,
-    domain
-  }: CookieRequest,
+  { name, domain }: CookieSpec,
   strategy: CookieQueryStrategy = new CompositeCookieQueryStrategy()
 ) {
   const results: ExportedCookie[] = await strategy.queryCookies(name, domain);

package/src/unpackHeaders.ts

@@ -0,0 +1,13 @@
+export function unpackHeaders(headerArgs: string[] | string) {
+  const headers: any = {};
+  if (Array.isArray(headerArgs)) {
+    for (const h of headerArgs) {
+      const [key, value] = h.split("=");
+      headers[key] = value;
+    }
+  } else {
+    const [key, value] = headerArgs.split("=");
+    headers[key] = value;
+  }
+  return headers;
+}

package/src/utils.ts

@@ -1,6 +1,6 @@
 // noinspection JSUnusedGlobalSymbols
 
-import {exec, ExecException} from "child_process";
+import { exec, ExecException } from "child_process";
 
 export async function execSimple(command: string): Promise<string> {
   return new Promise((resolve, reject) => {
@@ -24,11 +24,6 @@ export async function execSimple(command: string): Promise<string> {
   });
 }
 
-/**
- *
- * @param result
- * @returns {string|null}
- */
 export function toStringOrNull(result: any) {
   if (result == null) {
     return null;
@@ -50,7 +45,6 @@ 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;
 }