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

fix postmessage shit

Browse source
This commit is contained in:
velzie 2024-08-02 22:44:16 -04:00
parent 6cccf1f412
commit d011d73a80
No known key found for this signature in database
GPG key ID: 048413F95F0DDE1F
6 changed files with 44 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/worker/fetch.ts
View file

@ -3,6 +3,7 @@ import IDBMap from "@webreflection/idb-map";
import { ParseResultType } from "parse-domain";
import { ScramjetServiceWorker } from ".";
import { renderError } from "./error";
import { FakeServiceWorker } from "./fakesw";
const { encodeUrl, decodeUrl } = self.$scramjet.shared.url;
const { rewriteHeaders, rewriteHtml, rewriteJs, rewriteCss, rewriteWorkers } =
@ -35,14 +36,6 @@ export async function swfetch(
});
}
const activeWorker = this.serviceWorkers.find(
(w) => w.origin === new URL(request.url).origin
);
if (activeWorker) {
// TODO: check scope
return await activeWorker.fetch(request);
}
const urlParam = new URLSearchParams(new URL(request.url).search);
if (urlParam.has("url")) {
@ -53,6 +46,15 @@ export async function swfetch(
try {
const url = new URL(decodeUrl(request.url));
const activeWorker: FakeServiceWorker | null = this.serviceWorkers.find(
(w) => w.origin === url.origin
);
if (activeWorker) {
// TODO: check scope
return await activeWorker.fetch(request);
}
if (url.origin == new URL(request.url).origin) {
throw new Error(
"attempted to fetch from same origin - this means the site has obtained a reference to the real origin, aborting"