add the bypass request, also use it in linkvertise, better readable

Author: reashetyrr

src/bypasses/linkvertise.js

@@ -14,53 +14,50 @@ export default class Linkvertise extends BypassDefinition {
         }
 
         const lvt_this = this;
+        this.helpers.bypassRequests(async data => {
+            if (data.currentTarget?.responseText?.includes('tokens')) {
+                const response = JSON.parse(data.currentTarget.responseText);
 
-        const rawOpen = window.XMLHttpRequest.prototype.open;
+                if (!response.data.valid)
+                    return lvt_this.helpers.insertInfoBox('Please solve the captcha, afterwards we can immediately redirect you');
 
-        window.XMLHttpRequest.prototype.open = function () {
-            this.addEventListener('load', data => {
-                if (data.currentTarget?.responseText?.includes('tokens')) {
-                    const response = JSON.parse(data.currentTarget.responseText);
+                const target_token = response.data.tokens['TARGET'];
+                const ut = localStorage.getItem("X-LINKVERTISE-UT");
+                const linkvertise_link = location.pathname.replace(/\/[0-9]$/, "");
 
-                    if (!response.data.valid)
-                        return lvt_this.helpers.insertInfoBox('Please solve the captcha, afterwards we can immediately redirect you');
+                let result = await fetch(`https://publisher.linkvertise.com/api/v1/redirect/link/static${linkvertise_link}?X-Linkvertise-UT=${ut}`);
+                let json = await result.json();
 
-                    const target_token = response.data.tokens['TARGET'];
-                    const ut = localStorage.getItem("X-LINKVERTISE-UT");
-                    const linkvertise_link = location.pathname.replace(/\/[0-9]$/, "");
+                if (json?.data.link.target_type !== 'URL') {
+                    return lvt_this.helpers.insertInfoBox('Due to copyright reasons we are not bypassing linkvertise stored content (paste, download etc)');
+                }
+
+                if (!json?.data.link.id) return;
 
+                const json_body = {
+                    serial: btoa(JSON.stringify({
+                        timestamp: new Date().getTime(),
+                        random: "6548307",
+                        link_id: json.data.link.id
+                    })),
+                    token: target_token
+                };
 
-                    fetch(`https://publisher.linkvertise.com/api/v1/redirect/link/static${linkvertise_link}?X-Linkvertise-UT=${ut}`).then(r => r.json()).then(json => {
-                        if (json?.data.link.target_type !== 'URL') {
-                            return insertInfoBox('Due to copyright reasons we are not bypassing linkvertise stored content (paste, download etc)');
-                        }
-                        if (json?.data.link.id) {
-                            const json_body = {
-                                serial: btoa(JSON.stringify({
-                                    timestamp: new Date().getTime(),
-                                    random: "6548307",
-                                    link_id: json.data.link.id
-                                })),
-                                token: target_token
-                            }
-                            fetch(`https://publisher.linkvertise.com/api/v1/redirect/link${linkvertise_link}/target?X-Linkvertise-UT=${ut}`, {
-                                method: "POST",
-                                body: JSON.stringify(json_body),
-                                headers: {
-                                    "Accept": 'application/json',
-                                    "Content-Type": 'application/json'
-                                }
-                            }).then(r => r.json()).then(json => {
-                                if (json?.data.target) {
-                                    lvt_this.helpers.safelyNavigate(json.data.target)
-                                }
-                            })
-                        }
-                    })
+                result = await fetch(`https://publisher.linkvertise.com/api/v1/redirect/link${linkvertise_link}/target?X-Linkvertise-UT=${ut}`, {
+                    method: "POST",
+                    body: JSON.stringify(json_body),
+                    headers: {
+                        "Accept": 'application/json',
+                        "Content-Type": 'application/json'
+                    }
+                });
+                json = await result.json();
+
+                if (json?.data.target) {
+                    lvt_this.helpers.safelyNavigate(json.data.target)
                 }
-            });
-            rawOpen.apply(this, arguments);
-        }
+            }
+        });
     }
 }
 

src/helpers/dom.js

@@ -91,10 +91,26 @@ export function isGoodLink(link) {
     return true
 }
 
+export async function bypassRequests(execution_method) {
+    const rawOpen = XMLHttpRequest.prototype.open;
+    XMLHttpRequest.prototype.open = function () {
+        this.addEventListener('load', execution_method);
+        rawOpen.apply(this, arguments);
+    };
+
+    const rawFetch = window.fetch;
+    window.fetch = async (requestInfo, init) =>{
+        const result = await rawFetch(requestInfo, init);
+        execution_method(result);
+        return Promise.resolve(result);
+    };
+}
+
 export default {
     insertInfoBox,
     safelyNavigate,
     unsafelyNavigate,
     parseTarget,
-    isGoodLink
+    isGoodLink,
+    bypassRequests,
 }

src/js/injection_script.js

@@ -27,4 +27,4 @@ if (bypasses.hasOwnProperty(location.host)) {
             }   
         });
     });
-}
+}