semicolons

This commit is contained in:
Toshit Chawda 2024-07-14 16:31:36 -07:00
parent 56767f5b31
commit 4906b71e47
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
37 changed files with 789 additions and 784 deletions

View file

@ -1,52 +1,52 @@
import { BareResponseFetch } from "@mercuryworkshop/bare-mux"
import IDBMap from "@webreflection/idb-map"
import { BareResponseFetch } from "@mercuryworkshop/bare-mux";
import IDBMap from "@webreflection/idb-map";
declare global {
interface Window {
ScramjetServiceWorker
ScramjetServiceWorker;
}
}
self.ScramjetServiceWorker = class ScramjetServiceWorker {
client: typeof self.$scramjet.shared.util.BareClient.prototype
config: typeof self.$scramjet.config
client: typeof self.$scramjet.shared.util.BareClient.prototype;
config: typeof self.$scramjet.config;
constructor(config = self.$scramjet.config) {
this.client = new self.$scramjet.shared.util.BareClient()
if (!config.prefix) config.prefix = "/scramjet/"
this.config = config
this.client = new self.$scramjet.shared.util.BareClient();
if (!config.prefix) config.prefix = "/scramjet/";
this.config = config;
}
route({ request }: FetchEvent) {
if (request.url.startsWith(location.origin + this.config.prefix))
return true
else return false
return true;
else return false;
}
async fetch({ request }: FetchEvent) {
const urlParam = new URLSearchParams(new URL(request.url).search)
const { encodeUrl, decodeUrl } = self.$scramjet.shared.url
const urlParam = new URLSearchParams(new URL(request.url).search);
const { encodeUrl, decodeUrl } = self.$scramjet.shared.url;
const {
rewriteHeaders,
rewriteHtml,
rewriteJs,
rewriteCss,
rewriteWorkers,
} = self.$scramjet.shared.rewrite
} = self.$scramjet.shared.rewrite;
if (urlParam.has("url")) {
return Response.redirect(
encodeUrl(urlParam.get("url"), new URL(urlParam.get("url")))
)
);
}
try {
const url = new URL(decodeUrl(request.url))
const url = new URL(decodeUrl(request.url));
const cookieStore = new IDBMap(url.host, {
durability: "relaxed",
prefix: "Cookies",
})
});
const response: BareResponseFetch = await this.client.fetch(url, {
method: request.method,
@ -58,41 +58,41 @@ self.ScramjetServiceWorker = class ScramjetServiceWorker {
redirect: request.redirect,
//@ts-ignore why the fuck is this not typed mircosoft
duplex: "half",
})
});
let responseBody
const responseHeaders = rewriteHeaders(response.rawHeaders, url)
let responseBody;
const responseHeaders = rewriteHeaders(response.rawHeaders, url);
for (const cookie of (responseHeaders["set-cookie"] || []) as string[]) {
let cookieParsed = cookie.split(";").map((x) => x.trim().split("="))
let cookieParsed = cookie.split(";").map((x) => x.trim().split("="));
let [key, value] = cookieParsed.shift()
value = value.replace('"', "")
let [key, value] = cookieParsed.shift();
value = value.replace('"', "");
const hostArg = cookieParsed.find(
(x) => x[0].toLowerCase() === "domain"
)
);
cookieParsed = cookieParsed.filter(
(x) => x[0].toLowerCase() !== "domain"
)
let host = hostArg ? hostArg[1] : undefined
);
let host = hostArg ? hostArg[1] : undefined;
if (host && host !== url.host) {
if (host.startsWith(".")) host = host.slice(1)
if (host.startsWith(".")) host = host.slice(1);
const cookieStore = new IDBMap(host, {
durability: "relaxed",
prefix: "Cookies",
})
cookieStore.set(key, { value: value, args: cookieParsed })
});
cookieStore.set(key, { value: value, args: cookieParsed });
} else {
cookieStore.set(key, { value: value, args: cookieParsed })
cookieStore.set(key, { value: value, args: cookieParsed });
}
}
for (let header in responseHeaders) {
// flatten everything past here
if (responseHeaders[header] instanceof Array)
responseHeaders[header] = responseHeaders[header][0]
responseHeaders[header] = responseHeaders[header][0];
}
if (response.body) {
@ -104,67 +104,69 @@ self.ScramjetServiceWorker = class ScramjetServiceWorker {
?.toString()
?.startsWith("text/html")
) {
responseBody = rewriteHtml(await response.text(), url)
responseBody = rewriteHtml(await response.text(), url);
} else {
responseBody = response.body
responseBody = response.body;
}
break
break;
case "script":
responseBody = rewriteJs(await response.text(), url)
break
responseBody = rewriteJs(await response.text(), url);
break;
case "style":
responseBody = rewriteCss(await response.text(), url)
break
responseBody = rewriteCss(await response.text(), url);
break;
case "sharedworker":
case "worker":
responseBody = rewriteWorkers(await response.text(), url)
break
responseBody = rewriteWorkers(await response.text(), url);
break;
default:
responseBody = response.body
break
responseBody = response.body;
break;
}
}
// downloads
if (["document", "iframe"].includes(request.destination)) {
const header = responseHeaders["content-disposition"]
const header = responseHeaders["content-disposition"];
// validate header and test for filename
if (!/\s*?((inline|attachment);\s*?)filename=/i.test(header)) {
// if filename= wasn"t specified then maybe the remote specified to download this as an attachment?
// if it"s invalid then we can still possibly test for the attachment/inline type
const type = /^\s*?attachment/i.test(header) ? "attachment" : "inline"
const type = /^\s*?attachment/i.test(header)
? "attachment"
: "inline";
// set the filename
const [filename] = new URL(response.finalURL).pathname
.split("/")
.slice(-1)
.slice(-1);
responseHeaders["content-disposition"] =
`${type}; filename=${JSON.stringify(filename)}`
`${type}; filename=${JSON.stringify(filename)}`;
}
}
if (responseHeaders["accept"] === "text/event-stream") {
responseHeaders["content-type"] = "text/event-stream"
responseHeaders["content-type"] = "text/event-stream";
}
if (crossOriginIsolated) {
responseHeaders["Cross-Origin-Embedder-Policy"] = "require-corp"
responseHeaders["Cross-Origin-Embedder-Policy"] = "require-corp";
}
return new Response(responseBody, {
headers: responseHeaders as HeadersInit,
status: response.status,
statusText: response.statusText,
})
});
} catch (err) {
if (!["document", "iframe"].includes(request.destination))
return new Response(undefined, { status: 500 })
return new Response(undefined, { status: 500 });
console.error(err)
console.error(err);
return renderError(err, decodeUrl(request.url))
return renderError(err, decodeUrl(request.url));
}
}
}
};
function errorTemplate(trace: string, fetchedURL: string) {
// turn script into a data URI so we don"t have to escape any HTML values
@ -176,7 +178,7 @@ function errorTemplate(trace: string, fetchedURL: string) {
)};
reload.addEventListener("click", () => location.reload());
version.textContent = "0.0.1";
`
`;
return `<!DOCTYPE html>
<html>
@ -215,7 +217,7 @@ function errorTemplate(trace: string, fetchedURL: string) {
}"></script>
</body>
</html>
`
`;
}
/**
@ -226,13 +228,13 @@ function errorTemplate(trace: string, fetchedURL: string) {
function renderError(err, fetchedURL) {
const headers = {
"content-type": "text/html",
}
};
if (crossOriginIsolated) {
headers["Cross-Origin-Embedder-Policy"] = "require-corp"
headers["Cross-Origin-Embedder-Policy"] = "require-corp";
}
return new Response(errorTemplate(String(err), fetchedURL), {
status: 500,
headers: headers,
})
});
}