diff --git a/src/client/beacon.ts b/src/client/beacon.ts index f84804b..6a7d70c 100644 --- a/src/client/beacon.ts +++ b/src/client/beacon.ts @@ -1,9 +1,10 @@ -import { encodeUrl } from "./shared"; +// import { encodeUrl } from "./shared"; navigator.sendBeacon = new Proxy(navigator.sendBeacon, { - apply(target, thisArg, argArray) { - argArray[0] = encodeUrl(argArray[0]); + apply() { + // argArray[0] = encodeUrl(argArray[0]); - return Reflect.apply(target, thisArg, argArray); + // return Reflect.apply(target, thisArg, argArray); + return null; }, }); diff --git a/src/client/index.ts b/src/client/index.ts index 8f6c56f..3db716d 100644 --- a/src/client/index.ts +++ b/src/client/index.ts @@ -13,7 +13,7 @@ import "./css.ts"; import "./history.ts"; import "./worker.ts"; import "./url.ts"; -import "./beacon.ts"; +import "./beacon.ts" declare global { interface Window { diff --git a/src/shared/rewriters/js.ts b/src/shared/rewriters/js.ts index 411f195..d17852d 100644 --- a/src/shared/rewriters/js.ts +++ b/src/shared/rewriters/js.ts @@ -1,8 +1,8 @@ -import { parseModule } from "meriyah"; -import { generate } from "astring"; -import { makeTraveler } from "astravel"; -import { encodeUrl } from "./url"; -import * as ESTree from "estree"; +// import { parseModule } from "meriyah"; +// import { generate } from "astring"; +// import { makeTraveler } from "astravel"; +// import { encodeUrl } from "./url"; +// import * as ESTree from "estree"; // i am a cat. i like to be petted. i like to be fed. i like to be @@ -19,9 +19,11 @@ import * as ESTree from "estree"; import init, { rewrite_js } from "../../../rewriter/out/rewriter.js"; init("/rewriter_bg.wasm"); -export function rewriteJs(js: string, origin?: URL) { - let f = rewrite_js(js); +// Also can take in origin?: URL +export function rewriteJs(js: string) { + const f = rewrite_js(js); console.log(f) + return f } // try { diff --git a/src/worker/index.ts b/src/worker/index.ts index 10bb0c2..1b91538 100644 --- a/src/worker/index.ts +++ b/src/worker/index.ts @@ -1,7 +1,7 @@ import { BareResponseFetch } from "@mercuryworkshop/bare-mux"; import IDBMap from "@webreflection/idb-map"; import { ParseResultType } from "parse-domain"; -import { parse } from "path"; +// import { parse } from "path"; declare global { interface Window { @@ -70,7 +70,7 @@ self.ScramjetServiceWorker = class ScramjetServiceWorker { let cookieParsed = cookie.split(";").map((x) => x.trim().split("=")); let [key, value] = cookieParsed.shift(); - value = value.replace('"', ""); + value = value.replace("\"", ""); const hostArg = cookieParsed.find((x) => x[0] === "Domain"); cookieParsed = cookieParsed.filter((x) => x[0] !== "Domain"); @@ -89,7 +89,7 @@ self.ScramjetServiceWorker = class ScramjetServiceWorker { const urlDomain = parseDomain(url.hostname); if (urlDomain.type === ParseResultType.Listed) { - const { subDomains: _, domain, topLevelDomains } = urlDomain; + const { subDomains: domain, topLevelDomains } = urlDomain; if (!host.endsWith([domain, ...topLevelDomains].join("."))) continue; } else { @@ -114,7 +114,7 @@ self.ScramjetServiceWorker = class ScramjetServiceWorker { } } - for (let header in responseHeaders) { + for (const header in responseHeaders) { // flatten everything past here if (responseHeaders[header] instanceof Array) responseHeaders[header] = responseHeaders[header][0]; @@ -135,7 +135,8 @@ self.ScramjetServiceWorker = class ScramjetServiceWorker { } break; case "script": - responseBody = rewriteJs(await response.text(), url); + // responseBody = rewriteJs(await response.text(), url); + responseBody = rewriteJs(await response.text()); break; case "style": responseBody = rewriteCss(await response.text(), url);