mercuryworkshop-mirror/scramjet
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/scramjet.git synced 2025-05-13 14:30:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various changes to make eslint more happy, null out navigator.sendBeacon to make errors less frequent.

Browse source
This commit is contained in:
wearrrrr 2024-07-14 23:19:19 -05:00 • committed by Percs
parent 6cc293b453
commit ee94ec0df1
4 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/client/beacon.ts
View file

@ -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;
},
});

2
src/client/index.ts
View file

@ -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 {

16
src/shared/rewriters/js.ts
View file

@ -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 {

11
src/worker/index.ts
View file

@ -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);