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

rename encodeUrl to rewriteUrl

Browse source
This commit is contained in:
velzie 2024-10-12 15:00:03 -04:00
parent 839b490c80
commit 3062db5df9
26 changed files with 78 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/worker/fetch.ts
View file

@ -5,8 +5,8 @@ import { FakeServiceWorker } from "./fakesw";
import { CookieStore } from "../shared/cookie";
import {
ScramjetHeaders,
decodeUrl,
encodeUrl,
unrewriteUrl,
rewriteUrl,
rewriteCss,
rewriteHeaders,
rewriteHtml,
@ -32,7 +32,7 @@ export async function swfetch(
if (urlParam.has("url")) {
return Response.redirect(
encodeUrl(urlParam.get("url"), newmeta(new URL(urlParam.get("url"))))
rewriteUrl(urlParam.get("url"), newmeta(new URL(urlParam.get("url"))))
);
}
@ -88,7 +88,7 @@ export async function swfetch(
});
}
const url = new URL(decodeUrl(requesturl));
const url = new URL(unrewriteUrl(requesturl));
const activeWorker: FakeServiceWorker | null = this.serviceWorkers.find(
(w) => w.origin === url.origin
@ -119,7 +119,7 @@ export async function swfetch(
new URL(client.url).pathname.startsWith(self.$scramjet.config.prefix)
) {
// TODO: i was against cors emulation but we might actually break stuff if we send full origin/referrer always
const clientURL = new URL(decodeUrl(client.url));
const clientURL = new URL(unrewriteUrl(client.url));
if (clientURL.toString().includes("youtube.com")) {
// console.log(headers);
} else {
@ -165,7 +165,7 @@ export async function swfetch(
if (!["document", "iframe"].includes(request.destination))
return new Response(undefined, { status: 500 });
return renderError(err, decodeUrl(request.url));
return renderError(err, unrewriteUrl(request.url));
}
}