chore(fetch): add retry option

a11ywatch · Dec 1, 2022 · 16eb3ec · 16eb3ec
1 parent 6daa52f
commit 16eb3ec
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-iframe",
-  "version": "1.8.5",
+  "version": "1.8.9",
   "description": "create iframes on your server to bypass CORS. Reverse engineer security issues.",
   "main": "dist/iframe.js",
   "scripts": {

diff --git a/src/fetch.ts b/src/fetch.ts
@@ -27,30 +27,32 @@ if (!fetcher) {
       }
 
       const getHttp = (url: string) =>
-        url.includes("https://") ? https : http;
+        url.startsWith("https://") ? https : http;
 
       const get = (
         url: string,
         options?: {
           headers?: Record<string, any>;
           agent?: string | (() => string);
-        }
+        },
+        retry?: number
       ) => {
         const { agent, headers } = options ?? {};
+        let fetchOptions = {};
 
         if (typeof agent !== "undefined") {
           if (typeof agent === "function") {
             const ua = agent();
             if (typeof ua !== "undefined") {
-              options = { agent: ua };
+              fetchOptions = { agent: ua };
             }
           } else {
-            options = { agent };
+            fetchOptions = { agent };
           }
         }
 
         if (typeof headers !== "undefined") {
-          options = { ...options, headers };
+          fetchOptions = { ...fetchOptions, headers };
         }
 
         const httpMethod = getHttp(url);
@@ -59,7 +61,10 @@ if (!fetcher) {
           let body = "";
 
           httpMethod
-            .get(url, options, (res) => {
+            .get(url, fetchOptions, (res) => {
+              if((res.statusCode === 301 || res.statusCode === 302) && retry) {
+                return get(res.headers.location, options, --retry)      
+              }
               res.setEncoding("utf8");
 
               res.on("data", (d) => {

diff --git a/src/iframe.ts b/src/iframe.ts
@@ -79,14 +79,14 @@ function configureAgent() {
 }
 
 // NOTE: control type like wappalyzer for usage only on websites that use specefic frameworks like old versions of react, angular, vue, and etc
-const mutateSource = async ({ src = "", key }, url, $html, headers) => {
+const mutateSource = async ({ src = "", key }, url, $html, headers, retry) => {
   if (src && src[0] === "/") {
     try {
       const res = await fetcher(`${url}/${src}`, {
         headers,
         agent,
-      });
-
+      }, retry);
+      
       if (res) {
         const source = typeof process !== "undefined" ? res : await res.text();
         $html(key).html(source);
@@ -109,7 +109,7 @@ function renderErrorHtml({ url, server, noPage = false }) {
 }
 
 async function renderHtml(
-  { url, baseHref, config, head = {} },
+  { url, baseHref, config, head = {}, retry },
   server = false
 ) {
   if (!url) {
@@ -135,7 +135,8 @@ async function renderHtml(
     response = await fetcher(url, {
       headers: head,
       agent,
-    });
+    }, 
+    retry);
   } catch (e) {
     console.error(e);
   }
@@ -178,7 +179,7 @@ async function renderHtml(
       for (const com of inlineMutations) {
         const { key, attribute, src } = com;
         const element = `${key}[${attribute}="${src}"]`;
-        await mutateSource({ key: element, src }, url, $html, headers);
+        await mutateSource({ key: element, src }, url, $html, headers, retry);
         $html(element).removeAttr(attribute);
       }