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

fix redirects and code cleanup

Browse source
This commit is contained in:
Percs 2024-05-08 10:26:54 -05:00
parent c189e54509
commit 0456df7f48
2 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/bundle/rewriters/headers.ts
View file

@ -22,6 +22,7 @@ const cspHeaders = [
const urlHeaders = [ const urlHeaders = [
"location", "location",
"Location",
"content-location", "content-location",
"referer" "referer"
]; ];

59
src/worker/index.ts
View file

@ -17,50 +17,53 @@ self.ScramjetServiceWorker = class ScramjetServiceWorker {
this.client = new BareClient(); this.client = new BareClient();
} }
route(event: Event | any) { route({ request }: FetchEvent) {
const { request } = event;
if (request.url.startsWith(location.origin + self.__scramjet$config.prefix)) return true; if (request.url.startsWith(location.origin + self.__scramjet$config.prefix)) return true;
else return false; else return false;
} }
async fetch(event: FetchEvent) { async fetch({ request }: FetchEvent) {
try { try {
const url = new URL(self.__scramjet$bundle.rewriters.url.decodeUrl(event.request.url)); const url = new URL(self.__scramjet$bundle.rewriters.url.decodeUrl(request.url));
// implement header rewriting later // implement header rewriting later
const response: BareResponseFetch = await this.client.fetch(url, { const response: BareResponseFetch = await this.client.fetch(url, {
method: event.request.method, method: request.method,
body: event.request.body, body: request.body,
headers: event.request.headers headers: request.headers,
credentials: "omit",
mode: request.mode === "cors" ? request.mode : "same-origin",
cache: request.cache,
redirect: request.redirect,
}); });
let responseBody; let responseBody;
const responseHeaders = self.__scramjet$bundle.rewriters.rewriteHeaders(response.rawHeaders, origin); const responseHeaders = self.__scramjet$bundle.rewriters.rewriteHeaders(response.rawHeaders, origin);
if (response.body) { if (response.body) {
switch (event.request.destination) { switch (request.destination) {
case "iframe": case "iframe":
case "document": case "document":
responseBody = self.__scramjet$bundle.rewriters.rewriteHtml(await response.text(), url.origin); responseBody = self.__scramjet$bundle.rewriters.rewriteHtml(await response.text(), url.origin);
break; break;
case "script": case "script":
responseBody = self.__scramjet$bundle.rewriters.rewriteJs(await response.text(), url.origin); responseBody = self.__scramjet$bundle.rewriters.rewriteJs(await response.text(), url.origin);
break; break;
case "style": case "style":
responseBody = self.__scramjet$bundle.rewriters.rewriteCss(await response.text(), url.origin); responseBody = self.__scramjet$bundle.rewriters.rewriteCss(await response.text(), url.origin);
break; break;
case "sharedworker": case "sharedworker":
break; break;
case "worker": case "worker":
break; break;
default: default:
responseBody = response.body; responseBody = response.body;
break; break;
} }
} }
if (responseHeaders.accept === 'text/event-stream') { if (responseHeaders.accept === "text/event-stream") {
responseHeaders.headers['content-type'] = 'text/event-stream'; responseHeaders.headers["content-type"] = "text/event-stream";
} }
if (crossOriginIsolated) { if (crossOriginIsolated) {
responseHeaders["Cross-Origin-Embedder-Policy"] = "require-corp"; responseHeaders["Cross-Origin-Embedder-Policy"] = "require-corp";
@ -72,7 +75,7 @@ self.ScramjetServiceWorker = class ScramjetServiceWorker {
statusText: response.statusText statusText: response.statusText
}) })
} catch (err) { } catch (err) {
if (!['document', 'iframe'].includes(event.request.destination)) if (!["document", "iframe"].includes(request.destination))
return new Response(undefined, { status: 500 }); return new Response(undefined, { status: 500 });
console.error(err); console.error(err);