fix formatting again

This commit is contained in:
Toshit Chawda 2024-07-14 18:25:21 -07:00
parent 774f3d5b5d
commit ddaea9b86a
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
36 changed files with 1720 additions and 1720 deletions

View file

@ -1,30 +1,30 @@
{ {
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"], "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
"parser": "@typescript-eslint/parser", "parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint"], "plugins": ["@typescript-eslint"],
"rules": { "rules": {
"no-await-in-loop": "warn", "no-await-in-loop": "warn",
"no-unused-labels": "error", "no-unused-labels": "error",
"no-unused-vars": "error", "no-unused-vars": "error",
"quotes": ["error", "double"], "quotes": ["error", "double"],
"max-lines-per-function": [ "max-lines-per-function": [
"error", "error",
{ {
"max": 200, "max": 200,
"skipComments": true "skipComments": true
} }
], ],
"getter-return": "error", "getter-return": "error",
"newline-before-return": "error", "newline-before-return": "error",
"no-multiple-empty-lines": "error", "no-multiple-empty-lines": "error",
"no-var": "error", "no-var": "error",
"no-this-before-super": "warn", "no-this-before-super": "warn",
"no-useless-return": "error", "no-useless-return": "error",
"no-shadow": "error", "no-shadow": "error",
"prefer-const": "warn", "prefer-const": "warn",
"no-unreachable": "warn", "no-unreachable": "warn",
"no-undef": "off", "no-undef": "off",
"@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/ban-ts-comment": "off" "@typescript-eslint/ban-ts-comment": "off"
} }
} }

View file

@ -1,60 +1,60 @@
{ {
"name": "@mercuryworkshop/scramjet", "name": "@mercuryworkshop/scramjet",
"version": "1.0.2", "version": "1.0.2",
"description": "An experimental web proxy that aims to be the successor to Ultraviolet", "description": "An experimental web proxy that aims to be the successor to Ultraviolet",
"main": "./lib/index.cjs", "main": "./lib/index.cjs",
"types": "./lib/index.d.js", "types": "./lib/index.d.js",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/MercuryWorkshop/scramjet" "url": "https://github.com/MercuryWorkshop/scramjet"
}, },
"scripts": { "scripts": {
"build": "rspack build", "build": "rspack build",
"dev": "node server.js", "dev": "node server.js",
"prepublish": "pnpm build", "prepublish": "pnpm build",
"pub": "pnpm publish --no-git-checks --access public", "pub": "pnpm publish --no-git-checks --access public",
"format": "prettier --write ." "format": "prettier --config prettier.json --write ."
}, },
"files": [ "files": [
"dist", "dist",
"lib" "lib"
], ],
"keywords": [], "keywords": [],
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"devDependencies": { "devDependencies": {
"@fastify/static": "^7.0.3", "@fastify/static": "^7.0.3",
"@mercuryworkshop/bare-as-module3": "^2.2.2", "@mercuryworkshop/bare-as-module3": "^2.2.2",
"@mercuryworkshop/epoxy-transport": "^2.1.3", "@mercuryworkshop/epoxy-transport": "^2.1.3",
"@mercuryworkshop/libcurl-transport": "^1.3.6", "@mercuryworkshop/libcurl-transport": "^1.3.6",
"@rsdoctor/rspack-plugin": "^0.3.7", "@rsdoctor/rspack-plugin": "^0.3.7",
"@rspack/cli": "^0.7.5", "@rspack/cli": "^0.7.5",
"@rspack/core": "^0.7.5", "@rspack/core": "^0.7.5",
"@tomphttp/bare-server-node": "^2.0.3", "@tomphttp/bare-server-node": "^2.0.3",
"@types/eslint": "^8.56.10", "@types/eslint": "^8.56.10",
"@types/estree": "^1.0.5", "@types/estree": "^1.0.5",
"@types/node": "^20.14.10", "@types/node": "^20.14.10",
"@types/serviceworker": "^0.0.85", "@types/serviceworker": "^0.0.85",
"@typescript-eslint/eslint-plugin": "^6.21.0", "@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0", "@typescript-eslint/parser": "^6.21.0",
"dotenv": "^16.4.5", "dotenv": "^16.4.5",
"eslint": "^8.57.0", "eslint": "^8.57.0",
"fastify": "^4.26.2", "fastify": "^4.26.2",
"prettier": "^3.3.3", "prettier": "^3.3.3",
"tslib": "^2.6.2", "tslib": "^2.6.2",
"typescript": "^5.4.5" "typescript": "^5.4.5"
}, },
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"@mercuryworkshop/bare-mux": "^2.0.2", "@mercuryworkshop/bare-mux": "^2.0.2",
"@webreflection/idb-map": "^0.3.1", "@webreflection/idb-map": "^0.3.1",
"astravel": "^0.6.1", "astravel": "^0.6.1",
"astring": "^1.8.6", "astring": "^1.8.6",
"dom-serializer": "^2.0.0", "dom-serializer": "^2.0.0",
"domhandler": "^5.0.3", "domhandler": "^5.0.3",
"domutils": "^3.1.0", "domutils": "^3.1.0",
"htmlparser2": "^9.1.0", "htmlparser2": "^9.1.0",
"meriyah": "^4.4.2", "meriyah": "^4.4.2",
"parse-domain": "^8.0.2" "parse-domain": "^8.0.2"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"trailingComma": "es5", "trailingComma": "es5",
"useTabs": true, "useTabs": true,
"semi": true, "semi": true,
"singleQuote": false "singleQuote": false
} }

View file

@ -6,48 +6,48 @@ import { fileURLToPath } from "url";
const __dirname = fileURLToPath(new URL(".", import.meta.url)); const __dirname = fileURLToPath(new URL(".", import.meta.url));
export default defineConfig({ export default defineConfig({
// change to production when needed // change to production when needed
mode: "development", mode: "development",
entry: { entry: {
shared: join(__dirname, "src/shared/index.ts"), shared: join(__dirname, "src/shared/index.ts"),
worker: join(__dirname, "src/worker/index.ts"), worker: join(__dirname, "src/worker/index.ts"),
client: join(__dirname, "src/client/index.ts"), client: join(__dirname, "src/client/index.ts"),
config: join(__dirname, "src/scramjet.config.ts"), config: join(__dirname, "src/scramjet.config.ts"),
codecs: join(__dirname, "src/codecs/index.ts"), codecs: join(__dirname, "src/codecs/index.ts"),
}, },
resolve: { resolve: {
extensions: [".ts", ".js"], extensions: [".ts", ".js"],
}, },
module: { module: {
rules: [ rules: [
{ {
test: /\.ts$/, test: /\.ts$/,
use: "builtin:swc-loader", use: "builtin:swc-loader",
exclude: ["/node_modules/"], exclude: ["/node_modules/"],
options: { options: {
jsc: { jsc: {
parser: { parser: {
syntax: "typescript", syntax: "typescript",
}, },
}, },
}, },
type: "javascript/auto", type: "javascript/auto",
}, },
], ],
}, },
output: { output: {
filename: "scramjet.[name].js", filename: "scramjet.[name].js",
path: join(__dirname, "dist"), path: join(__dirname, "dist"),
iife: true, iife: true,
clean: true, clean: true,
}, },
plugins: [ plugins: [
// new RsdoctorRspackPlugin({ // new RsdoctorRspackPlugin({
// supports: { // supports: {
// parseBundle: true, // parseBundle: true,
// banner: true // banner: true
// } // }
// }) // })
], ],
watch: true, watch: true,
}); });

View file

@ -14,71 +14,71 @@ import { libcurlPath } from "@mercuryworkshop/libcurl-transport";
import { bareModulePath } from "@mercuryworkshop/bare-as-module3"; import { bareModulePath } from "@mercuryworkshop/bare-as-module3";
const bare = createBareServer("/bare/", { const bare = createBareServer("/bare/", {
logErrors: true, logErrors: true,
}); });
const fastify = Fastify({ const fastify = Fastify({
serverFactory: (handler) => { serverFactory: (handler) => {
return createServer() return createServer()
.on("request", (req, res) => { .on("request", (req, res) => {
if (bare.shouldRoute(req)) { if (bare.shouldRoute(req)) {
bare.routeRequest(req, res); bare.routeRequest(req, res);
} else { } else {
handler(req, res); handler(req, res);
} }
}) })
.on("upgrade", (req, socket, head) => { .on("upgrade", (req, socket, head) => {
if (bare.shouldRoute(req)) { if (bare.shouldRoute(req)) {
bare.routeUpgrade(req, socket, head); bare.routeUpgrade(req, socket, head);
} else { } else {
socket.end(); socket.end();
} }
}); });
}, },
}); });
fastify.register(fastifyStatic, { fastify.register(fastifyStatic, {
root: join(fileURLToPath(new URL(".", import.meta.url)), "./static"), root: join(fileURLToPath(new URL(".", import.meta.url)), "./static"),
decorateReply: false, decorateReply: false,
}); });
fastify.register(fastifyStatic, { fastify.register(fastifyStatic, {
root: join(fileURLToPath(new URL(".", import.meta.url)), "./dist"), root: join(fileURLToPath(new URL(".", import.meta.url)), "./dist"),
prefix: "/scram/", prefix: "/scram/",
decorateReply: false, decorateReply: false,
}); });
fastify.register(fastifyStatic, { fastify.register(fastifyStatic, {
root: baremuxPath, root: baremuxPath,
prefix: "/baremux/", prefix: "/baremux/",
decorateReply: false, decorateReply: false,
}); });
fastify.register(fastifyStatic, { fastify.register(fastifyStatic, {
root: epoxyPath, root: epoxyPath,
prefix: "/epoxy/", prefix: "/epoxy/",
decorateReply: false, decorateReply: false,
}); });
fastify.register(fastifyStatic, { fastify.register(fastifyStatic, {
root: libcurlPath, root: libcurlPath,
prefix: "/libcurl/", prefix: "/libcurl/",
decorateReply: false, decorateReply: false,
}); });
fastify.register(fastifyStatic, { fastify.register(fastifyStatic, {
root: bareModulePath, root: bareModulePath,
prefix: "/baremod/", prefix: "/baremod/",
decorateReply: false, decorateReply: false,
}); });
fastify.listen({ fastify.listen({
port: process.env.PORT || 1337, port: process.env.PORT || 1337,
}); });
const watch = spawn("pnpm", ["rspack", "-w"], { const watch = spawn("pnpm", ["rspack", "-w"], {
detached: true, detached: true,
cwd: process.cwd(), cwd: process.cwd(),
}); });
watch.stdout.on("data", (data) => { watch.stdout.on("data", (data) => {
console.log(`${data}`); console.log(`${data}`);
}); });
watch.stderr.on("data", (data) => { watch.stderr.on("data", (data) => {
console.log(`${data}`); console.log(`${data}`);
}); });

View file

@ -1,9 +1,9 @@
import { encodeUrl } from "./shared"; import { encodeUrl } from "./shared";
navigator.sendBeacon = new Proxy(navigator.sendBeacon, { navigator.sendBeacon = new Proxy(navigator.sendBeacon, {
apply(target, thisArg, argArray) { apply(target, thisArg, argArray) {
argArray[0] = encodeUrl(argArray[0]); argArray[0] = encodeUrl(argArray[0]);
return Reflect.apply(target, thisArg, argArray); return Reflect.apply(target, thisArg, argArray);
}, },
}); });

View file

@ -1,26 +1,26 @@
import { rewriteCss } from "./shared"; import { rewriteCss } from "./shared";
const cssProperties = [ const cssProperties = [
"background", "background",
"background-image", "background-image",
"mask", "mask",
"mask-image", "mask-image",
"list-style", "list-style",
"list-style-image", "list-style-image",
"border-image", "border-image",
"border-image-source", "border-image-source",
"cursor", "cursor",
]; ];
// const jsProperties = ["background", "backgroundImage", "mask", "maskImage", "listStyle", "listStyleImage", "borderImage", "borderImageSource", "cursor"]; // const jsProperties = ["background", "backgroundImage", "mask", "maskImage", "listStyle", "listStyleImage", "borderImage", "borderImageSource", "cursor"];
CSSStyleDeclaration.prototype.setProperty = new Proxy( CSSStyleDeclaration.prototype.setProperty = new Proxy(
CSSStyleDeclaration.prototype.setProperty, CSSStyleDeclaration.prototype.setProperty,
{ {
apply(target, thisArg, argArray) { apply(target, thisArg, argArray) {
if (cssProperties.includes(argArray[0])) if (cssProperties.includes(argArray[0]))
argArray[1] = rewriteCss(argArray[1]); argArray[1] = rewriteCss(argArray[1]);
return Reflect.apply(target, thisArg, argArray); return Reflect.apply(target, thisArg, argArray);
}, },
}, }
); );

View file

@ -1,121 +1,121 @@
import { decodeUrl } from "../shared/rewriters/url"; import { decodeUrl } from "../shared/rewriters/url";
import { import {
encodeUrl, encodeUrl,
rewriteCss, rewriteCss,
rewriteHtml, rewriteHtml,
rewriteJs, rewriteJs,
rewriteSrcset, rewriteSrcset,
} from "./shared"; } from "./shared";
const attrObject = { const attrObject = {
nonce: [HTMLElement], nonce: [HTMLElement],
integrity: [HTMLScriptElement, HTMLLinkElement], integrity: [HTMLScriptElement, HTMLLinkElement],
csp: [HTMLIFrameElement], csp: [HTMLIFrameElement],
src: [ src: [
HTMLImageElement, HTMLImageElement,
HTMLMediaElement, HTMLMediaElement,
HTMLIFrameElement, HTMLIFrameElement,
HTMLEmbedElement, HTMLEmbedElement,
HTMLScriptElement, HTMLScriptElement,
], ],
href: [HTMLAnchorElement, HTMLLinkElement], href: [HTMLAnchorElement, HTMLLinkElement],
data: [HTMLObjectElement], data: [HTMLObjectElement],
action: [HTMLFormElement], action: [HTMLFormElement],
formaction: [HTMLButtonElement, HTMLInputElement], formaction: [HTMLButtonElement, HTMLInputElement],
srcdoc: [HTMLIFrameElement], srcdoc: [HTMLIFrameElement],
srcset: [HTMLImageElement, HTMLSourceElement], srcset: [HTMLImageElement, HTMLSourceElement],
imagesrcset: [HTMLLinkElement], imagesrcset: [HTMLLinkElement],
}; };
const attrs = Object.keys(attrObject); const attrs = Object.keys(attrObject);
for (const attr of attrs) { for (const attr of attrs) {
for (const element of attrObject[attr]) { for (const element of attrObject[attr]) {
const descriptor = Object.getOwnPropertyDescriptor(element.prototype, attr); const descriptor = Object.getOwnPropertyDescriptor(element.prototype, attr);
Object.defineProperty(element.prototype, attr, { Object.defineProperty(element.prototype, attr, {
get() { get() {
if (/src|href|data|action|formaction/.test(attr)) { if (/src|href|data|action|formaction/.test(attr)) {
return decodeUrl(descriptor.get.call(this)); return decodeUrl(descriptor.get.call(this));
} }
if (this.__origattrs[attr]) { if (this.__origattrs[attr]) {
return this.__origattrs[attr]; return this.__origattrs[attr];
} }
return descriptor.get.call(this); return descriptor.get.call(this);
}, },
set(value) { set(value) {
this.__origattrs[attr] = value; this.__origattrs[attr] = value;
if (/nonce|integrity|csp/.test(attr)) { if (/nonce|integrity|csp/.test(attr)) {
return; return;
} else if (/src|href|data|action|formaction/.test(attr)) { } else if (/src|href|data|action|formaction/.test(attr)) {
value = encodeUrl(value); value = encodeUrl(value);
} else if (attr === "srcdoc") { } else if (attr === "srcdoc") {
value = rewriteHtml(value); value = rewriteHtml(value);
} else if (/(image)?srcset/.test(attr)) { } else if (/(image)?srcset/.test(attr)) {
value = rewriteSrcset(value); value = rewriteSrcset(value);
} }
descriptor.set.call(this, value); descriptor.set.call(this, value);
}, },
}); });
} }
} }
declare global { declare global {
interface Element { interface Element {
__origattrs: Record<string, string>; __origattrs: Record<string, string>;
} }
} }
Element.prototype.__origattrs = {}; Element.prototype.__origattrs = {};
Element.prototype.getAttribute = new Proxy(Element.prototype.getAttribute, { Element.prototype.getAttribute = new Proxy(Element.prototype.getAttribute, {
apply(target, thisArg, argArray) { apply(target, thisArg, argArray) {
if (attrs.includes(argArray[0]) && thisArg.__origattrs[argArray[0]]) { if (attrs.includes(argArray[0]) && thisArg.__origattrs[argArray[0]]) {
return thisArg.__origattrs[argArray[0]]; return thisArg.__origattrs[argArray[0]];
} }
return Reflect.apply(target, thisArg, argArray); return Reflect.apply(target, thisArg, argArray);
}, },
}); });
Element.prototype.setAttribute = new Proxy(Element.prototype.setAttribute, { Element.prototype.setAttribute = new Proxy(Element.prototype.setAttribute, {
apply(target, thisArg, argArray) { apply(target, thisArg, argArray) {
if (attrs.includes(argArray[0])) { if (attrs.includes(argArray[0])) {
thisArg.__origattrs[argArray[0]] = argArray[1]; thisArg.__origattrs[argArray[0]] = argArray[1];
if (/nonce|integrity|csp/.test(argArray[0])) { if (/nonce|integrity|csp/.test(argArray[0])) {
return; return;
} else if (/src|href|data|action|formaction/.test(argArray[0])) { } else if (/src|href|data|action|formaction/.test(argArray[0])) {
argArray[1] = encodeUrl(argArray[1]); argArray[1] = encodeUrl(argArray[1]);
} else if (argArray[0] === "srcdoc") { } else if (argArray[0] === "srcdoc") {
argArray[1] = rewriteHtml(argArray[1]); argArray[1] = rewriteHtml(argArray[1]);
} else if (/(image)?srcset/.test(argArray[0])) { } else if (/(image)?srcset/.test(argArray[0])) {
argArray[1] = rewriteSrcset(argArray[1]); argArray[1] = rewriteSrcset(argArray[1]);
} else if (argArray[1] === "style") { } else if (argArray[1] === "style") {
argArray[1] = rewriteCss(argArray[1]); argArray[1] = rewriteCss(argArray[1]);
} }
} }
return Reflect.apply(target, thisArg, argArray); return Reflect.apply(target, thisArg, argArray);
}, },
}); });
const innerHTML = Object.getOwnPropertyDescriptor( const innerHTML = Object.getOwnPropertyDescriptor(
Element.prototype, Element.prototype,
"innerHTML", "innerHTML"
); );
Object.defineProperty(Element.prototype, "innerHTML", { Object.defineProperty(Element.prototype, "innerHTML", {
set(value) { set(value) {
if (this instanceof HTMLScriptElement) { if (this instanceof HTMLScriptElement) {
value = rewriteJs(value); value = rewriteJs(value);
} else if (this instanceof HTMLStyleElement) { } else if (this instanceof HTMLStyleElement) {
value = rewriteCss(value); value = rewriteCss(value);
} }
return innerHTML.set.call(this, value); return innerHTML.set.call(this, value);
}, },
}); });

View file

@ -1,17 +1,17 @@
import { decodeUrl } from "./shared"; import { decodeUrl } from "./shared";
window.history.pushState = new Proxy(window.history.pushState, { window.history.pushState = new Proxy(window.history.pushState, {
apply(target, thisArg, argArray) { apply(target, thisArg, argArray) {
argArray[3] = decodeUrl(argArray[3]); argArray[3] = decodeUrl(argArray[3]);
return Reflect.apply(target, thisArg, argArray); return Reflect.apply(target, thisArg, argArray);
}, },
}); });
window.history.replaceState = new Proxy(window.history.replaceState, { window.history.replaceState = new Proxy(window.history.replaceState, {
apply(target, thisArg, argArray) { apply(target, thisArg, argArray) {
argArray[3] = decodeUrl(argArray[3]); argArray[3] = decodeUrl(argArray[3]);
return Reflect.apply(target, thisArg, argArray); return Reflect.apply(target, thisArg, argArray);
}, },
}); });

View file

@ -16,7 +16,7 @@ import "./url.ts";
import "./beacon.ts"; import "./beacon.ts";
declare global { declare global {
interface Window { interface Window {
$s: any; $s: any;
} }
} }

View file

@ -2,31 +2,31 @@
import { encodeUrl, decodeUrl } from "./shared"; import { encodeUrl, decodeUrl } from "./shared";
function createLocation() { function createLocation() {
const loc = new URL(decodeUrl(location.href)); const loc = new URL(decodeUrl(location.href));
loc.assign = (url: string) => location.assign(encodeUrl(url)); loc.assign = (url: string) => location.assign(encodeUrl(url));
loc.reload = () => location.reload(); loc.reload = () => location.reload();
loc.replace = (url: string) => location.replace(encodeUrl(url)); loc.replace = (url: string) => location.replace(encodeUrl(url));
loc.toString = () => loc.href; loc.toString = () => loc.href;
return loc; return loc;
} }
export const locationProxy = new Proxy(window.location, { export const locationProxy = new Proxy(window.location, {
get(target, prop) { get(target, prop) {
const loc = createLocation(); const loc = createLocation();
return loc[prop]; return loc[prop];
}, },
set(obj, prop, value) { set(obj, prop, value) {
const loc = createLocation(); const loc = createLocation();
if (prop === "href") { if (prop === "href") {
location.href = encodeUrl(value); location.href = encodeUrl(value);
} else { } else {
loc[prop] = value; loc[prop] = value;
} }
return true; return true;
}, },
}); });

View file

@ -1,26 +1,26 @@
import { rewriteJs } from "../shared"; import { rewriteJs } from "../shared";
const FunctionProxy = new Proxy(Function, { const FunctionProxy = new Proxy(Function, {
construct(target, argArray) { construct(target, argArray) {
if (argArray.length === 1) { if (argArray.length === 1) {
return Reflect.construct(target, rewriteJs(argArray[0])); return Reflect.construct(target, rewriteJs(argArray[0]));
} else { } else {
return Reflect.construct( return Reflect.construct(
target, target,
rewriteJs(argArray[argArray.length - 1]), rewriteJs(argArray[argArray.length - 1])
); );
} }
}, },
apply(target, thisArg, argArray) { apply(target, thisArg, argArray) {
if (argArray.length === 1) { if (argArray.length === 1) {
return Reflect.apply(target, undefined, [rewriteJs(argArray[0])]); return Reflect.apply(target, undefined, [rewriteJs(argArray[0])]);
} else { } else {
return Reflect.apply(target, undefined, [ return Reflect.apply(target, undefined, [
...argArray.map((x, index) => index === argArray.length - 1), ...argArray.map((x, index) => index === argArray.length - 1),
rewriteJs(argArray[argArray.length - 1]), rewriteJs(argArray[argArray.length - 1]),
]); ]);
} }
}, },
}); });
delete window.Function; delete window.Function;
@ -28,7 +28,7 @@ delete window.Function;
window.Function = FunctionProxy; window.Function = FunctionProxy;
window.eval = new Proxy(window.eval, { window.eval = new Proxy(window.eval, {
apply(target, thisArg, argArray) { apply(target, thisArg, argArray) {
return Reflect.apply(target, thisArg, [rewriteJs(argArray[0])]); return Reflect.apply(target, thisArg, [rewriteJs(argArray[0])]);
}, },
}); });

View file

@ -3,33 +3,33 @@
import { encodeUrl, rewriteHeaders } from "../shared"; import { encodeUrl, rewriteHeaders } from "../shared";
window.fetch = new Proxy(window.fetch, { window.fetch = new Proxy(window.fetch, {
apply(target, thisArg, argArray) { apply(target, thisArg, argArray) {
argArray[0] = encodeUrl(argArray[0]); argArray[0] = encodeUrl(argArray[0]);
return Reflect.apply(target, thisArg, argArray); return Reflect.apply(target, thisArg, argArray);
}, },
}); });
Headers = new Proxy(Headers, { Headers = new Proxy(Headers, {
construct(target, argArray, newTarget) { construct(target, argArray, newTarget) {
argArray[0] = rewriteHeaders(argArray[0]); argArray[0] = rewriteHeaders(argArray[0]);
return Reflect.construct(target, argArray, newTarget); return Reflect.construct(target, argArray, newTarget);
}, },
}); });
Request = new Proxy(Request, { Request = new Proxy(Request, {
construct(target, argArray, newTarget) { construct(target, argArray, newTarget) {
if (typeof argArray[0] === "string") argArray[0] = encodeUrl(argArray[0]); if (typeof argArray[0] === "string") argArray[0] = encodeUrl(argArray[0]);
return Reflect.construct(target, argArray, newTarget); return Reflect.construct(target, argArray, newTarget);
}, },
}); });
Response.redirect = new Proxy(Response.redirect, { Response.redirect = new Proxy(Response.redirect, {
apply(target, thisArg, argArray) { apply(target, thisArg, argArray) {
argArray[0] = encodeUrl(argArray[0]); argArray[0] = encodeUrl(argArray[0]);
return Reflect.apply(target, thisArg, argArray); return Reflect.apply(target, thisArg, argArray);
}, },
}); });

View file

@ -2,15 +2,15 @@ import { BareClient } from "../shared";
const client = new BareClient(); const client = new BareClient();
WebSocket = new Proxy(WebSocket, { WebSocket = new Proxy(WebSocket, {
construct(target, args) { construct(target, args) {
return client.createWebSocket( return client.createWebSocket(
args[0], args[0],
args[1], args[1],
target, target,
{ {
"User-Agent": navigator.userAgent, "User-Agent": navigator.userAgent,
}, },
ArrayBuffer.prototype, ArrayBuffer.prototype
); );
}, },
}); });

View file

@ -1,23 +1,23 @@
import { encodeUrl, rewriteHeaders } from "../shared"; import { encodeUrl, rewriteHeaders } from "../shared";
XMLHttpRequest.prototype.open = new Proxy(XMLHttpRequest.prototype.open, { XMLHttpRequest.prototype.open = new Proxy(XMLHttpRequest.prototype.open, {
apply(target, thisArg, argArray) { apply(target, thisArg, argArray) {
if (argArray[1]) argArray[1] = encodeUrl(argArray[1]); if (argArray[1]) argArray[1] = encodeUrl(argArray[1]);
return Reflect.apply(target, thisArg, argArray); return Reflect.apply(target, thisArg, argArray);
}, },
}); });
XMLHttpRequest.prototype.setRequestHeader = new Proxy( XMLHttpRequest.prototype.setRequestHeader = new Proxy(
XMLHttpRequest.prototype.setRequestHeader, XMLHttpRequest.prototype.setRequestHeader,
{ {
apply(target, thisArg, argArray) { apply(target, thisArg, argArray) {
let headerObject = Object.fromEntries([argArray]); let headerObject = Object.fromEntries([argArray]);
headerObject = rewriteHeaders(headerObject); headerObject = rewriteHeaders(headerObject);
argArray = Object.entries(headerObject)[0]; argArray = Object.entries(headerObject)[0];
return Reflect.apply(target, thisArg, argArray); return Reflect.apply(target, thisArg, argArray);
}, },
}, }
); );

View file

@ -2,13 +2,13 @@ import { locationProxy } from "./location";
import { windowProxy } from "./window"; import { windowProxy } from "./window";
function scope(identifier: any) { function scope(identifier: any) {
if (identifier instanceof Window) { if (identifier instanceof Window) {
return windowProxy; return windowProxy;
} else if (identifier instanceof Location) { } else if (identifier instanceof Location) {
return locationProxy; return locationProxy;
} }
return identifier; return identifier;
} }
// shorthand because this can get out of hand reall quickly // shorthand because this can get out of hand reall quickly

View file

@ -1,12 +1,12 @@
export const { export const {
util: { isScramjetFile, BareClient }, util: { isScramjetFile, BareClient },
url: { encodeUrl, decodeUrl }, url: { encodeUrl, decodeUrl },
rewrite: { rewrite: {
rewriteCss, rewriteCss,
rewriteHtml, rewriteHtml,
rewriteSrcset, rewriteSrcset,
rewriteJs, rewriteJs,
rewriteHeaders, rewriteHeaders,
rewriteWorkers, rewriteWorkers,
}, },
} = self.$scramjet.shared; } = self.$scramjet.shared;

View file

@ -2,62 +2,62 @@ import IDBMapSync from "@webreflection/idb-map/sync";
import { locationProxy } from "./location"; import { locationProxy } from "./location";
const store = new IDBMapSync(locationProxy.host, { const store = new IDBMapSync(locationProxy.host, {
prefix: "Storage", prefix: "Storage",
durability: "relaxed", durability: "relaxed",
}); });
await store.sync(); await store.sync();
function storageProxy(scope: Storage): Storage { function storageProxy(scope: Storage): Storage {
return new Proxy(scope, { return new Proxy(scope, {
get(target, prop) { get(target, prop) {
switch (prop) { switch (prop) {
case "getItem": case "getItem":
return (key: string) => { return (key: string) => {
return store.get(key); return store.get(key);
}; };
case "setItem": case "setItem":
return (key: string, value: string) => { return (key: string, value: string) => {
store.set(key, value); store.set(key, value);
store.sync(); store.sync();
}; };
case "removeItem": case "removeItem":
return (key: string) => { return (key: string) => {
store.delete(key); store.delete(key);
store.sync(); store.sync();
}; };
case "clear": case "clear":
return () => { return () => {
store.clear(); store.clear();
store.sync(); store.sync();
}; };
case "key": case "key":
return (index: number) => { return (index: number) => {
store.keys()[index]; store.keys()[index];
}; };
case "length": case "length":
return store.size; return store.size;
default: default:
return store.get(prop); return store.get(prop);
} }
}, },
//@ts-ignore //@ts-ignore
set(target, prop, value) { set(target, prop, value) {
store.set(prop, value); store.set(prop, value);
store.sync(); store.sync();
}, },
defineProperty(target, property, attributes) { defineProperty(target, property, attributes) {
store.set(property as string, attributes.value); store.set(property as string, attributes.value);
return true; return true;
}, },
}); });
} }
const localStorageProxy = storageProxy(window.localStorage); const localStorageProxy = storageProxy(window.localStorage);

View file

@ -2,12 +2,12 @@ import { encodeUrl } from "../shared/rewriters/url";
export const URL = globalThis.URL; export const URL = globalThis.URL;
if (globalThis.window) { if (globalThis.window) {
window.URL = new Proxy(URL, { window.URL = new Proxy(URL, {
construct(target, argArray, newTarget) { construct(target, argArray, newTarget) {
if (typeof argArray[0] === "string") argArray[0] = encodeUrl(argArray[0]); if (typeof argArray[0] === "string") argArray[0] = encodeUrl(argArray[0]);
if (typeof argArray[1] === "string") argArray[1] = encodeUrl(argArray[1]); if (typeof argArray[1] === "string") argArray[1] = encodeUrl(argArray[1]);
return Reflect.construct(target, argArray, newTarget); return Reflect.construct(target, argArray, newTarget);
}, },
}); });
} }

View file

@ -1,47 +1,47 @@
import { locationProxy } from "./location"; import { locationProxy } from "./location";
export const windowProxy = new Proxy(window, { export const windowProxy = new Proxy(window, {
get(target, prop) { get(target, prop) {
const propIsString = typeof prop === "string"; const propIsString = typeof prop === "string";
if (propIsString && prop === "location") { if (propIsString && prop === "location") {
return locationProxy; return locationProxy;
} else if ( } else if (
propIsString && propIsString &&
["window", "top", "parent", "self", "globalThis"].includes(prop) ["window", "top", "parent", "self", "globalThis"].includes(prop)
) { ) {
return windowProxy; return windowProxy;
} else if (propIsString && prop === "$scramjet") { } else if (propIsString && prop === "$scramjet") {
return; return;
} else if (propIsString && prop === "addEventListener") { } else if (propIsString && prop === "addEventListener") {
console.log("addEventListener getteetetetetet"); console.log("addEventListener getteetetetetet");
return new Proxy(window.addEventListener, { return new Proxy(window.addEventListener, {
apply(target1, thisArg, argArray) { apply(target1, thisArg, argArray) {
window.addEventListener(argArray[0], argArray[1]); window.addEventListener(argArray[0], argArray[1]);
}, },
}); });
} }
const value = Reflect.get(target, prop); const value = Reflect.get(target, prop);
if (typeof value === "function") { if (typeof value === "function") {
return value.bind(target); return value.bind(target);
} }
return value; return value;
}, },
set(target, prop, newValue) { set(target, prop, newValue) {
// ensures that no apis are overwritten // ensures that no apis are overwritten
if ( if (
typeof prop === "string" && typeof prop === "string" &&
["window", "top", "parent", "self", "globalThis", "location"].includes( ["window", "top", "parent", "self", "globalThis", "location"].includes(
prop, prop
) )
) { ) {
return false; return false;
} }
return Reflect.set(target, prop, newValue); return Reflect.set(target, prop, newValue);
}, },
}); });

View file

@ -1,23 +1,23 @@
import { encodeUrl } from "./shared"; import { encodeUrl } from "./shared";
Worker = new Proxy(Worker, { Worker = new Proxy(Worker, {
construct(target, argArray) { construct(target, argArray) {
argArray[0] = encodeUrl(argArray[0]); argArray[0] = encodeUrl(argArray[0]);
// target is a reference to the object that you are proxying // target is a reference to the object that you are proxying
// Reflect.construct is just a wrapper for calling target // Reflect.construct is just a wrapper for calling target
// you could do new target(...argArray) and it would work the same effectively // you could do new target(...argArray) and it would work the same effectively
return Reflect.construct(target, argArray); return Reflect.construct(target, argArray);
}, },
}); });
Worklet.prototype.addModule = new Proxy(Worklet.prototype.addModule, { Worklet.prototype.addModule = new Proxy(Worklet.prototype.addModule, {
apply(target, thisArg, argArray) { apply(target, thisArg, argArray) {
argArray[0] = encodeUrl(argArray[0]); argArray[0] = encodeUrl(argArray[0]);
return Reflect.apply(target, thisArg, argArray); return Reflect.apply(target, thisArg, argArray);
}, },
}); });
// broken // broken

File diff suppressed because it is too large Load diff

View file

@ -2,46 +2,46 @@ import { enc, dec } from "./aes";
// for some reason eslint was parsing the type inside of the function params as a variable // for some reason eslint was parsing the type inside of the function params as a variable
export interface Codec { export interface Codec {
// eslint-disable-next-line // eslint-disable-next-line
encode: (str: string | undefined) => string; encode: (str: string | undefined) => string;
// eslint-disable-next-line // eslint-disable-next-line
decode: (str: string | undefined) => string; decode: (str: string | undefined) => string;
} }
const xor = { const xor = {
encode: (str: string | undefined, key: number = 2) => { encode: (str: string | undefined, key: number = 2) => {
if (!str) return str; if (!str) return str;
return encodeURIComponent( return encodeURIComponent(
str str
.split("") .split("")
.map((e, i) => .map((e, i) =>
i % key ? String.fromCharCode(e.charCodeAt(0) ^ key) : e, i % key ? String.fromCharCode(e.charCodeAt(0) ^ key) : e
) )
.join(""), .join("")
); );
}, },
decode: (str: string | undefined, key: number = 2) => { decode: (str: string | undefined, key: number = 2) => {
if (!str) return str; if (!str) return str;
return decodeURIComponent(str) return decodeURIComponent(str)
.split("") .split("")
.map((e, i) => (i % key ? String.fromCharCode(e.charCodeAt(0) ^ key) : e)) .map((e, i) => (i % key ? String.fromCharCode(e.charCodeAt(0) ^ key) : e))
.join(""); .join("");
}, },
}; };
const plain = { const plain = {
encode: (str: string | undefined) => { encode: (str: string | undefined) => {
if (!str) return str; if (!str) return str;
return encodeURIComponent(str); return encodeURIComponent(str);
}, },
decode: (str: string | undefined) => { decode: (str: string | undefined) => {
if (!str) return str; if (!str) return str;
return decodeURIComponent(str); return decodeURIComponent(str);
}, },
}; };
/* /*
@ -60,30 +60,30 @@ const aes = {
*/ */
const none = { const none = {
encode: (str: string | undefined) => str, encode: (str: string | undefined) => str,
decode: (str: string | undefined) => str, decode: (str: string | undefined) => str,
}; };
const base64 = { const base64 = {
encode: (str: string | undefined) => { encode: (str: string | undefined) => {
if (!str) return str; if (!str) return str;
return decodeURIComponent(btoa(str)); return decodeURIComponent(btoa(str));
}, },
decode: (str: string | undefined) => { decode: (str: string | undefined) => {
if (!str) return str; if (!str) return str;
return atob(str); return atob(str);
}, },
}; };
if (!self.$scramjet) { if (!self.$scramjet) {
//@ts-expect-error really dumb workaround //@ts-expect-error really dumb workaround
self.$scramjet = {}; self.$scramjet = {};
} }
self.$scramjet.codecs = { self.$scramjet.codecs = {
none, none,
plain, plain,
base64, base64,
xor, xor,
}; };

View file

@ -1,13 +1,13 @@
if (!self.$scramjet) { if (!self.$scramjet) {
//@ts-expect-error really dumb workaround //@ts-expect-error really dumb workaround
self.$scramjet = {}; self.$scramjet = {};
} }
self.$scramjet.config = { self.$scramjet.config = {
prefix: "/scramjet/", prefix: "/scramjet/",
codec: self.$scramjet.codecs.plain, codec: self.$scramjet.codecs.plain,
config: "/scram/scramjet.config.js", config: "/scram/scramjet.config.js",
shared: "/scram/scramjet.shared.js", shared: "/scram/scramjet.shared.js",
worker: "/scram/scramjet.worker.js", worker: "/scram/scramjet.worker.js",
client: "/scram/scramjet.client.js", client: "/scram/scramjet.client.js",
codecs: "/scram/scramjet.codecs.js", codecs: "/scram/scramjet.codecs.js",
}; };

View file

@ -9,25 +9,25 @@ import { BareClient } from "@mercuryworkshop/bare-mux";
import { parseDomain } from "parse-domain"; import { parseDomain } from "parse-domain";
if (!self.$scramjet) { if (!self.$scramjet) {
//@ts-expect-error really dumb workaround //@ts-expect-error really dumb workaround
self.$scramjet = {}; self.$scramjet = {};
} }
self.$scramjet.shared = { self.$scramjet.shared = {
util: { util: {
isScramjetFile, isScramjetFile,
parseDomain, parseDomain,
BareClient, BareClient,
}, },
url: { url: {
encodeUrl, encodeUrl,
decodeUrl, decodeUrl,
}, },
rewrite: { rewrite: {
rewriteCss, rewriteCss,
rewriteHtml, rewriteHtml,
rewriteSrcset, rewriteSrcset,
rewriteJs, rewriteJs,
rewriteHeaders, rewriteHeaders,
rewriteWorkers, rewriteWorkers,
}, },
}; };

View file

@ -4,31 +4,31 @@
import { encodeUrl } from "./url"; import { encodeUrl } from "./url";
export function rewriteCss(css: string, origin?: URL) { export function rewriteCss(css: string, origin?: URL) {
const regex = const regex =
/(@import\s+(?!url\())?\s*url\(\s*(['"]?)([^'")]+)\2\s*\)|@import\s+(['"])([^'"]+)\4/g; /(@import\s+(?!url\())?\s*url\(\s*(['"]?)([^'")]+)\2\s*\)|@import\s+(['"])([^'"]+)\4/g;
return css.replace( return css.replace(
regex, regex,
( (
match, match,
importStatement, importStatement,
urlQuote, urlQuote,
urlContent, urlContent,
importQuote, importQuote,
importContent, importContent
) => { ) => {
const url = urlContent || importContent; const url = urlContent || importContent;
const encodedUrl = encodeUrl(url.trim(), origin); const encodedUrl = encodeUrl(url.trim(), origin);
if (importStatement) { if (importStatement) {
return `@import url(${urlQuote}${encodedUrl}${urlQuote})`; return `@import url(${urlQuote}${encodedUrl}${urlQuote})`;
} }
if (importQuote) { if (importQuote) {
return `@import ${importQuote}${encodedUrl}${importQuote}`; return `@import ${importQuote}${encodedUrl}${importQuote}`;
} }
return `url(${urlQuote}${encodedUrl}${urlQuote})`; return `url(${urlQuote}${encodedUrl}${urlQuote})`;
}, }
); );
} }

View file

@ -1,50 +1,50 @@
import { encodeUrl } from "./url"; import { encodeUrl } from "./url";
import { BareHeaders } from "@mercuryworkshop/bare-mux"; import { BareHeaders } from "@mercuryworkshop/bare-mux";
const cspHeaders = [ const cspHeaders = [
"cross-origin-embedder-policy", "cross-origin-embedder-policy",
"cross-origin-opener-policy", "cross-origin-opener-policy",
"cross-origin-resource-policy", "cross-origin-resource-policy",
"content-security-policy", "content-security-policy",
"content-security-policy-report-only", "content-security-policy-report-only",
"expect-ct", "expect-ct",
"feature-policy", "feature-policy",
"origin-isolation", "origin-isolation",
"strict-transport-security", "strict-transport-security",
"upgrade-insecure-requests", "upgrade-insecure-requests",
"x-content-type-options", "x-content-type-options",
"x-download-options", "x-download-options",
"x-frame-options", "x-frame-options",
"x-permitted-cross-domain-policies", "x-permitted-cross-domain-policies",
"x-powered-by", "x-powered-by",
"x-xss-protection", "x-xss-protection",
// This needs to be emulated, but for right now it isn't that important of a feature to be worried about // This needs to be emulated, but for right now it isn't that important of a feature to be worried about
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Clear-Site-Data // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Clear-Site-Data
"clear-site-data", "clear-site-data",
]; ];
const urlHeaders = ["location", "content-location", "referer"]; const urlHeaders = ["location", "content-location", "referer"];
export function rewriteHeaders(rawHeaders: BareHeaders, origin?: URL) { export function rewriteHeaders(rawHeaders: BareHeaders, origin?: URL) {
const headers = {}; const headers = {};
for (const key in rawHeaders) { for (const key in rawHeaders) {
headers[key.toLowerCase()] = rawHeaders[key]; headers[key.toLowerCase()] = rawHeaders[key];
} }
cspHeaders.forEach((header) => { cspHeaders.forEach((header) => {
delete headers[header]; delete headers[header];
}); });
urlHeaders.forEach((header) => { urlHeaders.forEach((header) => {
if (headers[header]) if (headers[header])
headers[header] = encodeUrl(headers[header] as string, origin); headers[header] = encodeUrl(headers[header] as string, origin);
}); });
if (headers["link"]) { if (headers["link"]) {
headers["link"] = headers["link"].replace(/<(.*?)>/gi, (match) => headers["link"] = headers["link"].replace(/<(.*?)>/gi, (match) =>
encodeUrl(match, origin), encodeUrl(match, origin)
); );
} }
return headers; return headers;
} }

View file

@ -7,121 +7,121 @@ import { rewriteCss } from "./css";
import { rewriteJs } from "./js"; import { rewriteJs } from "./js";
export function isScramjetFile(src: string) { export function isScramjetFile(src: string) {
let bool = false; let bool = false;
["codecs", "client", "shared", "worker", "config"].forEach((file) => { ["codecs", "client", "shared", "worker", "config"].forEach((file) => {
if (src === self.$scramjet.config[file]) bool = true; if (src === self.$scramjet.config[file]) bool = true;
}); });
return bool; return bool;
} }
export function rewriteHtml(html: string, origin?: URL) { export function rewriteHtml(html: string, origin?: URL) {
const handler = new DomHandler((err, dom) => dom); const handler = new DomHandler((err, dom) => dom);
const parser = new Parser(handler); const parser = new Parser(handler);
parser.write(html); parser.write(html);
parser.end(); parser.end();
return render(traverseParsedHtml(handler.root, origin)); return render(traverseParsedHtml(handler.root, origin));
} }
// i need to add the attributes in during rewriting // i need to add the attributes in during rewriting
function traverseParsedHtml(node, origin?: URL) { function traverseParsedHtml(node, origin?: URL) {
/* csp attributes */ /* csp attributes */
for (const cspAttr of ["nonce", "integrity", "csp"]) { for (const cspAttr of ["nonce", "integrity", "csp"]) {
if (hasAttrib(node, cspAttr)) { if (hasAttrib(node, cspAttr)) {
node.attribs[`data-${cspAttr}`] = node.attribs[cspAttr]; node.attribs[`data-${cspAttr}`] = node.attribs[cspAttr];
delete node.attribs[cspAttr]; delete node.attribs[cspAttr];
} }
} }
/* url attributes */ /* url attributes */
for (const urlAttr of ["src", "href", "action", "formaction"]) { for (const urlAttr of ["src", "href", "action", "formaction"]) {
if (hasAttrib(node, urlAttr) && !isScramjetFile(node.attribs[urlAttr])) { if (hasAttrib(node, urlAttr) && !isScramjetFile(node.attribs[urlAttr])) {
const value = node.attribs[urlAttr]; const value = node.attribs[urlAttr];
node.attribs[`data-${urlAttr}`] = value; node.attribs[`data-${urlAttr}`] = value;
node.attribs[urlAttr] = encodeUrl(value, origin); node.attribs[urlAttr] = encodeUrl(value, origin);
} }
} }
/* other */ /* other */
for (const srcsetAttr of ["srcset", "imagesrcset"]) { for (const srcsetAttr of ["srcset", "imagesrcset"]) {
if (hasAttrib(node, srcsetAttr)) { if (hasAttrib(node, srcsetAttr)) {
const value = node.attribs[srcsetAttr]; const value = node.attribs[srcsetAttr];
node.attribs[`data-${srcsetAttr}`] = value; node.attribs[`data-${srcsetAttr}`] = value;
node.attribs[srcsetAttr] = rewriteSrcset(value, origin); node.attribs[srcsetAttr] = rewriteSrcset(value, origin);
} }
} }
if (hasAttrib(node, "srcdoc")) if (hasAttrib(node, "srcdoc"))
node.attribs.srcdoc = rewriteHtml(node.attribs.srcdoc, origin); node.attribs.srcdoc = rewriteHtml(node.attribs.srcdoc, origin);
if (hasAttrib(node, "style")) if (hasAttrib(node, "style"))
node.attribs.style = rewriteCss(node.attribs.style, origin); node.attribs.style = rewriteCss(node.attribs.style, origin);
if (node.name === "style" && node.children[0] !== undefined) if (node.name === "style" && node.children[0] !== undefined)
node.children[0].data = rewriteCss(node.children[0].data, origin); node.children[0].data = rewriteCss(node.children[0].data, origin);
if ( if (
node.name === "script" && node.name === "script" &&
/(application|text)\/javascript|importmap|undefined/.test( /(application|text)\/javascript|importmap|undefined/.test(
node.attribs.type, node.attribs.type
) && ) &&
node.children[0] !== undefined node.children[0] !== undefined
) { ) {
let js = node.children[0].data; let js = node.children[0].data;
const htmlcomment = /<!--[\s\S]*?-->/g; const htmlcomment = /<!--[\s\S]*?-->/g;
js = js.replace(htmlcomment, ""); js = js.replace(htmlcomment, "");
node.children[0].data = rewriteJs(js, origin); node.children[0].data = rewriteJs(js, origin);
} }
if (node.name === "meta" && hasAttrib(node, "http-equiv")) { if (node.name === "meta" && hasAttrib(node, "http-equiv")) {
if (node.attribs["http-equiv"] === "content-security-policy") { if (node.attribs["http-equiv"] === "content-security-policy") {
node = {}; node = {};
} else if ( } else if (
node.attribs["http-equiv"] === "refresh" && node.attribs["http-equiv"] === "refresh" &&
node.attribs.content.includes("url") node.attribs.content.includes("url")
) { ) {
const contentArray = node.attribs.content.split("url="); const contentArray = node.attribs.content.split("url=");
contentArray[1] = encodeUrl(contentArray[1].trim(), origin); contentArray[1] = encodeUrl(contentArray[1].trim(), origin);
node.attribs.content = contentArray.join("url="); node.attribs.content = contentArray.join("url=");
} }
} }
if (node.name === "head") { if (node.name === "head") {
const scramjetScripts = []; const scramjetScripts = [];
["codecs", "config", "shared", "client"].forEach((script) => { ["codecs", "config", "shared", "client"].forEach((script) => {
scramjetScripts.push( scramjetScripts.push(
new Element("script", { new Element("script", {
src: self.$scramjet.config[script], src: self.$scramjet.config[script],
"data-scramjet": "", "data-scramjet": "",
}), })
); );
}); });
node.children.unshift(...scramjetScripts); node.children.unshift(...scramjetScripts);
} }
if (node.childNodes) { if (node.childNodes) {
for (const childNode in node.childNodes) { for (const childNode in node.childNodes) {
node.childNodes[childNode] = traverseParsedHtml( node.childNodes[childNode] = traverseParsedHtml(
node.childNodes[childNode], node.childNodes[childNode],
origin, origin
); );
} }
} }
return node; return node;
} }
export function rewriteSrcset(srcset: string, origin?: URL) { export function rewriteSrcset(srcset: string, origin?: URL) {
const urls = srcset.split(/ [0-9]+x,? ?/g); const urls = srcset.split(/ [0-9]+x,? ?/g);
if (!urls) return ""; if (!urls) return "";
const sufixes = srcset.match(/ [0-9]+x,? ?/g); const sufixes = srcset.match(/ [0-9]+x,? ?/g);
if (!sufixes) return ""; if (!sufixes) return "";
const rewrittenUrls = urls.map((url, i) => { const rewrittenUrls = urls.map((url, i) => {
if (url && sufixes[i]) { if (url && sufixes[i]) {
return encodeUrl(url, origin) + sufixes[i]; return encodeUrl(url, origin) + sufixes[i];
} }
}); });
return rewrittenUrls.join(""); return rewrittenUrls.join("");
} }

View file

@ -17,91 +17,91 @@ import * as ESTree from "estree";
// parent // parent
export function rewriteJs(js: string, origin?: URL) { export function rewriteJs(js: string, origin?: URL) {
try { try {
const ast = parseModule(js, { const ast = parseModule(js, {
module: true, module: true,
webcompat: true, webcompat: true,
}); });
const identifierList = [ const identifierList = [
"window", "window",
"self", "self",
"globalThis", "globalThis",
"this", "this",
"parent", "parent",
"top", "top",
"location", "location",
]; ];
const customTraveler = makeTraveler({ const customTraveler = makeTraveler({
ImportDeclaration: (node: ESTree.ImportDeclaration) => { ImportDeclaration: (node: ESTree.ImportDeclaration) => {
node.source.value = encodeUrl(node.source.value as string, origin); node.source.value = encodeUrl(node.source.value as string, origin);
}, },
ImportExpression: (node: ESTree.ImportExpression) => { ImportExpression: (node: ESTree.ImportExpression) => {
if (node.source.type === "Literal") { if (node.source.type === "Literal") {
node.source.value = encodeUrl(node.source.value as string, origin); node.source.value = encodeUrl(node.source.value as string, origin);
} else if (node.source.type === "Identifier") { } else if (node.source.type === "Identifier") {
// this is for things that import something like // this is for things that import something like
// const moduleName = "name"; // const moduleName = "name";
// await import(moduleName); // await import(moduleName);
node.source.name = `__wrapImport(${node.source.name})`; node.source.name = `__wrapImport(${node.source.name})`;
} }
}, },
ExportAllDeclaration: (node: ESTree.ExportAllDeclaration) => { ExportAllDeclaration: (node: ESTree.ExportAllDeclaration) => {
node.source.value = encodeUrl(node.source.value as string, origin); node.source.value = encodeUrl(node.source.value as string, origin);
}, },
ExportNamedDeclaration: (node: ESTree.ExportNamedDeclaration) => { ExportNamedDeclaration: (node: ESTree.ExportNamedDeclaration) => {
// strings are Literals in ESTree syntax but these will always be strings // strings are Literals in ESTree syntax but these will always be strings
if (node.source) if (node.source)
node.source.value = encodeUrl(node.source.value as string, origin); node.source.value = encodeUrl(node.source.value as string, origin);
}, },
MemberExpression: (node: ESTree.MemberExpression) => { MemberExpression: (node: ESTree.MemberExpression) => {
if ( if (
node.object.type === "Identifier" && node.object.type === "Identifier" &&
identifierList.includes(node.object.name) identifierList.includes(node.object.name)
) { ) {
node.object.name = `globalThis.$s(${node.object.name})`; node.object.name = `globalThis.$s(${node.object.name})`;
} }
}, },
AssignmentExpression: (node: ESTree.AssignmentExpression) => { AssignmentExpression: (node: ESTree.AssignmentExpression) => {
if ( if (
node.left.type === "Identifier" && node.left.type === "Identifier" &&
identifierList.includes(node.left.name) identifierList.includes(node.left.name)
) { ) {
node.left.name = `globalThis.$s(${node.left.name})`; node.left.name = `globalThis.$s(${node.left.name})`;
} }
if ( if (
node.right.type === "Identifier" && node.right.type === "Identifier" &&
identifierList.includes(node.right.name) identifierList.includes(node.right.name)
) { ) {
node.right.name = `globalThis.$s(${node.right.name})`; node.right.name = `globalThis.$s(${node.right.name})`;
} }
}, },
VariableDeclarator: (node: ESTree.VariableDeclarator) => { VariableDeclarator: (node: ESTree.VariableDeclarator) => {
if ( if (
node.init && node.init &&
node.init.type === "Identifier" && node.init.type === "Identifier" &&
identifierList.includes(node.init.name) identifierList.includes(node.init.name)
) { ) {
node.init.name = `globalThis.$s(${node.init.name})`; node.init.name = `globalThis.$s(${node.init.name})`;
} }
}, },
}); });
customTraveler.go(ast); customTraveler.go(ast);
return generate(ast); return generate(ast);
} catch (e) { } catch (e) {
console.error(e); console.error(e);
console.log(js); console.log(js);
return js; return js;
} }
} }

View file

@ -2,60 +2,60 @@ import { URL } from "../../client/url";
import { rewriteJs } from "./js"; import { rewriteJs } from "./js";
function canParseUrl(url: string, origin?: URL) { function canParseUrl(url: string, origin?: URL) {
try { try {
new URL(url, origin); new URL(url, origin);
return true; return true;
} catch { } catch {
return false; return false;
} }
} }
// something is broken with this but i didn't debug it // something is broken with this but i didn't debug it
export function encodeUrl(url: string | URL, origin?: URL) { export function encodeUrl(url: string | URL, origin?: URL) {
if (url instanceof URL) { if (url instanceof URL) {
return url.toString(); return url.toString();
} }
if (!origin) { if (!origin) {
origin = new URL( origin = new URL(
self.$scramjet.config.codec.decode( self.$scramjet.config.codec.decode(
location.href.slice( location.href.slice(
(location.origin + self.$scramjet.config.prefix).length, (location.origin + self.$scramjet.config.prefix).length
), )
), )
); );
} }
// is this the correct behavior? // is this the correct behavior?
if (!url) url = origin.href; if (!url) url = origin.href;
if (url.startsWith("javascript:")) { if (url.startsWith("javascript:")) {
return "javascript:" + rewriteJs(url.slice("javascript:".length)); return "javascript:" + rewriteJs(url.slice("javascript:".length));
} else if (/^(#|mailto|about|data)/.test(url)) { } else if (/^(#|mailto|about|data)/.test(url)) {
return url; return url;
} else if (canParseUrl(url, origin)) { } else if (canParseUrl(url, origin)) {
return ( return (
location.origin + location.origin +
self.$scramjet.config.prefix + self.$scramjet.config.prefix +
self.$scramjet.config.codec.encode(new URL(url, origin).href) self.$scramjet.config.codec.encode(new URL(url, origin).href)
); );
} }
} }
// something is also broken with this but i didn't debug it // something is also broken with this but i didn't debug it
export function decodeUrl(url: string | URL) { export function decodeUrl(url: string | URL) {
if (url instanceof URL) { if (url instanceof URL) {
return url.toString(); return url.toString();
} }
if (/^(#|about|data|mailto|javascript)/.test(url)) { if (/^(#|about|data|mailto|javascript)/.test(url)) {
return url; return url;
} else if (canParseUrl(url)) { } else if (canParseUrl(url)) {
return self.$scramjet.config.codec.decode( return self.$scramjet.config.codec.decode(
url.slice((location.origin + self.$scramjet.config.prefix).length), url.slice((location.origin + self.$scramjet.config.prefix).length)
); );
} else { } else {
return url; return url;
} }
} }

View file

@ -1,12 +1,12 @@
import { rewriteJs } from "./js"; import { rewriteJs } from "./js";
export function rewriteWorkers(js: string, origin?: URL) { export function rewriteWorkers(js: string, origin?: URL) {
let str = new String().toString()[ let str = new String().toString()[
//@ts-expect-error //@ts-expect-error
("codecs", "config", "shared", "client") ("codecs", "config", "shared", "client")
].forEach((script) => { ].forEach((script) => {
str += `import "${self.$scramjet.config[script]}"\n`; str += `import "${self.$scramjet.config[script]}"\n`;
}); });
str += rewriteJs(js, origin); str += rewriteJs(js, origin);
return str; return str;
} }

76
src/types.d.ts vendored
View file

@ -10,42 +10,42 @@ import { BareClient } from "@mercuryworkshop/bare-mux";
import { parseDomain } from "parse-domain"; import { parseDomain } from "parse-domain";
declare global { declare global {
interface Window { interface Window {
$scramjet: { $scramjet: {
shared: { shared: {
url: { url: {
encodeUrl: typeof encodeUrl; encodeUrl: typeof encodeUrl;
decodeUrl: typeof decodeUrl; decodeUrl: typeof decodeUrl;
}; };
rewrite: { rewrite: {
rewriteCss: typeof rewriteCss; rewriteCss: typeof rewriteCss;
rewriteHtml: typeof rewriteHtml; rewriteHtml: typeof rewriteHtml;
rewriteSrcset: typeof rewriteSrcset; rewriteSrcset: typeof rewriteSrcset;
rewriteJs: typeof rewriteJs; rewriteJs: typeof rewriteJs;
rewriteHeaders: typeof rewriteHeaders; rewriteHeaders: typeof rewriteHeaders;
rewriteWorkers: typeof rewriteWorkers; rewriteWorkers: typeof rewriteWorkers;
}; };
util: { util: {
BareClient: typeof BareClient; BareClient: typeof BareClient;
isScramjetFile: typeof isScramjetFile; isScramjetFile: typeof isScramjetFile;
parseDomain: typeof parseDomain; parseDomain: typeof parseDomain;
}; };
}; };
config: { config: {
prefix: string; prefix: string;
codec: Codec; codec: Codec;
config: string; config: string;
shared: string; shared: string;
worker: string; worker: string;
client: string; client: string;
codecs: string; codecs: string;
}; };
codecs: { codecs: {
none: Codec; none: Codec;
plain: Codec; plain: Codec;
base64: Codec; base64: Codec;
xor: Codec; xor: Codec;
}; };
}; };
} }
} }

View file

@ -4,208 +4,208 @@ import { ParseResultType } from "parse-domain";
import { parse } from "path"; import { parse } from "path";
declare global { declare global {
interface Window { interface Window {
ScramjetServiceWorker; ScramjetServiceWorker;
} }
} }
self.ScramjetServiceWorker = class ScramjetServiceWorker { self.ScramjetServiceWorker = class ScramjetServiceWorker {
client: typeof self.$scramjet.shared.util.BareClient.prototype; client: typeof self.$scramjet.shared.util.BareClient.prototype;
config: typeof self.$scramjet.config; config: typeof self.$scramjet.config;
constructor(config = self.$scramjet.config) { constructor(config = self.$scramjet.config) {
this.client = new self.$scramjet.shared.util.BareClient(); this.client = new self.$scramjet.shared.util.BareClient();
if (!config.prefix) config.prefix = "/scramjet/"; if (!config.prefix) config.prefix = "/scramjet/";
this.config = config; this.config = config;
} }
route({ request }: FetchEvent) { route({ request }: FetchEvent) {
if (request.url.startsWith(location.origin + this.config.prefix)) if (request.url.startsWith(location.origin + this.config.prefix))
return true; return true;
else return false; else return false;
} }
async fetch({ request }: FetchEvent) { async fetch({ request }: FetchEvent) {
const urlParam = new URLSearchParams(new URL(request.url).search); const urlParam = new URLSearchParams(new URL(request.url).search);
const { encodeUrl, decodeUrl } = self.$scramjet.shared.url; const { encodeUrl, decodeUrl } = self.$scramjet.shared.url;
const { const {
rewriteHeaders, rewriteHeaders,
rewriteHtml, rewriteHtml,
rewriteJs, rewriteJs,
rewriteCss, rewriteCss,
rewriteWorkers, rewriteWorkers,
} = self.$scramjet.shared.rewrite; } = self.$scramjet.shared.rewrite;
const { parseDomain } = self.$scramjet.shared.util; const { parseDomain } = self.$scramjet.shared.util;
if (urlParam.has("url")) { if (urlParam.has("url")) {
return Response.redirect( return Response.redirect(
encodeUrl(urlParam.get("url"), new URL(urlParam.get("url"))), encodeUrl(urlParam.get("url"), new URL(urlParam.get("url")))
); );
} }
try { try {
const url = new URL(decodeUrl(request.url)); const url = new URL(decodeUrl(request.url));
const cookieStore = new IDBMap(url.host, { const cookieStore = new IDBMap(url.host, {
durability: "relaxed", durability: "relaxed",
prefix: "Cookies", prefix: "Cookies",
}); });
const response: BareResponseFetch = await this.client.fetch(url, { const response: BareResponseFetch = await this.client.fetch(url, {
method: request.method, method: request.method,
body: request.body, body: request.body,
headers: request.headers, headers: request.headers,
credentials: "omit", credentials: "omit",
mode: request.mode === "cors" ? request.mode : "same-origin", mode: request.mode === "cors" ? request.mode : "same-origin",
cache: request.cache, cache: request.cache,
redirect: request.redirect, redirect: request.redirect,
//@ts-ignore why the fuck is this not typed mircosoft //@ts-ignore why the fuck is this not typed mircosoft
duplex: "half", duplex: "half",
}); });
let responseBody; let responseBody;
const responseHeaders = rewriteHeaders(response.rawHeaders, url); const responseHeaders = rewriteHeaders(response.rawHeaders, url);
for (const cookie of (responseHeaders["set-cookie"] || []) as string[]) { 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(); let [key, value] = cookieParsed.shift();
value = value.replace('"', ""); value = value.replace('"', "");
const hostArg = cookieParsed.find((x) => x[0] === "Domain"); const hostArg = cookieParsed.find((x) => x[0] === "Domain");
cookieParsed = cookieParsed.filter((x) => x[0] !== "Domain"); cookieParsed = cookieParsed.filter((x) => x[0] !== "Domain");
let host = hostArg ? hostArg[1] : undefined; let host = hostArg ? hostArg[1] : undefined;
if (url.protocol === "http" && cookieParsed.includes(["Secure"])) if (url.protocol === "http" && cookieParsed.includes(["Secure"]))
continue; continue;
if ( if (
cookieParsed.includes(["SameSite", "None"]) && cookieParsed.includes(["SameSite", "None"]) &&
!cookieParsed.includes(["Secure"]) !cookieParsed.includes(["Secure"])
) )
continue; continue;
if (host && host !== url.host) { if (host && host !== url.host) {
if (host.startsWith(".")) host = host.slice(1); if (host.startsWith(".")) host = host.slice(1);
const urlDomain = parseDomain(url.hostname); const urlDomain = parseDomain(url.hostname);
if (urlDomain.type === ParseResultType.Listed) { if (urlDomain.type === ParseResultType.Listed) {
const { subDomains: _, domain, topLevelDomains } = urlDomain; const { subDomains: _, domain, topLevelDomains } = urlDomain;
if (!host.endsWith([domain, ...topLevelDomains].join("."))) if (!host.endsWith([domain, ...topLevelDomains].join(".")))
continue; continue;
} else { } else {
continue; continue;
} }
const realCookieStore = new IDBMap(host, { const realCookieStore = new IDBMap(host, {
durability: "relaxed", durability: "relaxed",
prefix: "Cookies", prefix: "Cookies",
}); });
realCookieStore.set(key, { realCookieStore.set(key, {
value: value, value: value,
args: cookieParsed, args: cookieParsed,
subdomain: true, subdomain: true,
}); });
} else { } else {
cookieStore.set(key, { cookieStore.set(key, {
value: value, value: value,
args: cookieParsed, args: cookieParsed,
subdomain: false, subdomain: false,
}); });
} }
} }
for (let header in responseHeaders) { for (let header in responseHeaders) {
// flatten everything past here // flatten everything past here
if (responseHeaders[header] instanceof Array) if (responseHeaders[header] instanceof Array)
responseHeaders[header] = responseHeaders[header][0]; responseHeaders[header] = responseHeaders[header][0];
} }
if (response.body) { if (response.body) {
switch (request.destination) { switch (request.destination) {
case "iframe": case "iframe":
case "document": case "document":
if ( if (
responseHeaders["content-type"] responseHeaders["content-type"]
?.toString() ?.toString()
?.startsWith("text/html") ?.startsWith("text/html")
) { ) {
responseBody = rewriteHtml(await response.text(), url); responseBody = rewriteHtml(await response.text(), url);
} else { } else {
responseBody = response.body; responseBody = response.body;
} }
break; break;
case "script": case "script":
responseBody = rewriteJs(await response.text(), url); responseBody = rewriteJs(await response.text(), url);
break; break;
case "style": case "style":
responseBody = rewriteCss(await response.text(), url); responseBody = rewriteCss(await response.text(), url);
break; break;
case "sharedworker": case "sharedworker":
case "worker": case "worker":
responseBody = rewriteWorkers(await response.text(), url); responseBody = rewriteWorkers(await response.text(), url);
break; break;
default: default:
responseBody = response.body; responseBody = response.body;
break; break;
} }
} }
// downloads // downloads
if (["document", "iframe"].includes(request.destination)) { if (["document", "iframe"].includes(request.destination)) {
const header = responseHeaders["content-disposition"]; const header = responseHeaders["content-disposition"];
// validate header and test for filename // validate header and test for filename
if (!/\s*?((inline|attachment);\s*?)filename=/i.test(header)) { 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 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 // if it"s invalid then we can still possibly test for the attachment/inline type
const type = /^\s*?attachment/i.test(header) const type = /^\s*?attachment/i.test(header)
? "attachment" ? "attachment"
: "inline"; : "inline";
// set the filename // set the filename
const [filename] = new URL(response.finalURL).pathname const [filename] = new URL(response.finalURL).pathname
.split("/") .split("/")
.slice(-1); .slice(-1);
responseHeaders["content-disposition"] = responseHeaders["content-disposition"] =
`${type}; filename=${JSON.stringify(filename)}`; `${type}; filename=${JSON.stringify(filename)}`;
} }
} }
if (responseHeaders["accept"] === "text/event-stream") { if (responseHeaders["accept"] === "text/event-stream") {
responseHeaders["content-type"] = "text/event-stream"; responseHeaders["content-type"] = "text/event-stream";
} }
if (crossOriginIsolated) { if (crossOriginIsolated) {
responseHeaders["Cross-Origin-Embedder-Policy"] = "require-corp"; responseHeaders["Cross-Origin-Embedder-Policy"] = "require-corp";
} }
return new Response(responseBody, { return new Response(responseBody, {
headers: responseHeaders as HeadersInit, headers: responseHeaders as HeadersInit,
status: response.status, status: response.status,
statusText: response.statusText, statusText: response.statusText,
}); });
} catch (err) { } catch (err) {
if (!["document", "iframe"].includes(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);
return renderError(err, decodeUrl(request.url)); return renderError(err, decodeUrl(request.url));
} }
} }
}; };
function errorTemplate(trace: string, fetchedURL: string) { function errorTemplate(trace: string, fetchedURL: string) {
// turn script into a data URI so we don"t have to escape any HTML values // turn script into a data URI so we don"t have to escape any HTML values
const script = ` const script = `
errorTrace.value = ${JSON.stringify(trace)}; errorTrace.value = ${JSON.stringify(trace)};
fetchedURL.textContent = ${JSON.stringify(fetchedURL)}; fetchedURL.textContent = ${JSON.stringify(fetchedURL)};
for (const node of document.querySelectorAll("#hostname")) node.textContent = ${JSON.stringify( for (const node of document.querySelectorAll("#hostname")) node.textContent = ${JSON.stringify(
location.hostname, location.hostname
)}; )};
reload.addEventListener("click", () => location.reload()); reload.addEventListener("click", () => location.reload());
version.textContent = "0.0.1"; version.textContent = "0.0.1";
`; `;
return `<!DOCTYPE html> return `<!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
@ -238,8 +238,8 @@ function errorTemplate(trace: string, fetchedURL: string) {
<hr /> <hr />
<p><i>Scramjet v<span id="version"></span></i></p> <p><i>Scramjet v<span id="version"></span></i></p>
<script src="${ <script src="${
"data:application/javascript," + encodeURIComponent(script) "data:application/javascript," + encodeURIComponent(script)
}"></script> }"></script>
</body> </body>
</html> </html>
`; `;
@ -251,15 +251,15 @@ function errorTemplate(trace: string, fetchedURL: string) {
* @param {string} fetchedURL * @param {string} fetchedURL
*/ */
function renderError(err, fetchedURL) { function renderError(err, fetchedURL) {
const headers = { const headers = {
"content-type": "text/html", "content-type": "text/html",
}; };
if (crossOriginIsolated) { if (crossOriginIsolated) {
headers["Cross-Origin-Embedder-Policy"] = "require-corp"; headers["Cross-Origin-Embedder-Policy"] = "require-corp";
} }
return new Response(errorTemplate(String(err), fetchedURL), { return new Response(errorTemplate(String(err), fetchedURL), {
status: 500, status: 500,
headers: headers, headers: headers,
}); });
} }

View file

@ -1,39 +1,39 @@
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Document</title> <title>Document</title>
<link rel="prefetch" href="/scram/scramjet.worker.js" /> <link rel="prefetch" href="/scram/scramjet.worker.js" />
<link rel="prefetch" href="/scram/scramjet.shared.js" /> <link rel="prefetch" href="/scram/scramjet.shared.js" />
<link <link
href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&amp;family=Inter+Tight:ital,wght@0,100..900;1,100..900&amp;family=Inter:wght@100..900&amp;display=swap&amp;" href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&amp;family=Inter+Tight:ital,wght@0,100..900;1,100..900&amp;family=Inter:wght@100..900&amp;display=swap&amp;"
rel="stylesheet" rel="stylesheet"
/> />
<style> <style>
body, body,
html, html,
#app { #app {
font-family: font-family:
"Inter", "Inter",
system-ui, system-ui,
-apple-system, -apple-system,
BlinkMacSystemFont, BlinkMacSystemFont,
sans-serif; sans-serif;
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
margin: 0; margin: 0;
padding: 0; padding: 0;
background-color: #121212; background-color: #121212;
overflow: hidden; overflow: hidden;
} }
</style> </style>
</head> </head>
<body> <body>
<script src="https://unpkg.com/dreamland"></script> <script src="https://unpkg.com/dreamland"></script>
<script src="/baremux/index.js" defer></script> <script src="/baremux/index.js" defer></script>
<script src="/scram/scramjet.codecs.js" defer></script> <script src="/scram/scramjet.codecs.js" defer></script>
<script src="/scram/scramjet.config.js" defer></script> <script src="/scram/scramjet.config.js" defer></script>
<script src="ui.js" defer></script> <script src="ui.js" defer></script>
</body> </body>
</html> </html>

View file

@ -1,20 +1,20 @@
importScripts( importScripts(
"/scram/scramjet.codecs.js", "/scram/scramjet.codecs.js",
"/scram/scramjet.config.js", "/scram/scramjet.config.js",
"/scram/scramjet.shared.js", "/scram/scramjet.shared.js",
"/scram/scramjet.worker.js", "/scram/scramjet.worker.js"
); );
const scramjet = new ScramjetServiceWorker(); const scramjet = new ScramjetServiceWorker();
async function handleRequest(event) { async function handleRequest(event) {
if (scramjet.route(event)) { if (scramjet.route(event)) {
return scramjet.fetch(event); return scramjet.fetch(event);
} }
return fetch(event.request); return fetch(event.request);
} }
self.addEventListener("fetch", (event) => { self.addEventListener("fetch", (event) => {
event.respondWith(handleRequest(event)); event.respondWith(handleRequest(event));
}); });

View file

@ -1,33 +1,33 @@
navigator.serviceWorker navigator.serviceWorker
.register("./sw.js", { .register("./sw.js", {
scope: $scramjet.config.prefix, scope: $scramjet.config.prefix,
}) })
.then((reg) => { .then((reg) => {
reg.update(); reg.update();
}); });
const connection = new BareMux.BareMuxConnection("/baremux/worker.js"); const connection = new BareMux.BareMuxConnection("/baremux/worker.js");
const flex = css` const flex = css`
display: flex; display: flex;
`; `;
const col = css` const col = css`
flex-direction: column; flex-direction: column;
`; `;
const store = $store( const store = $store(
{ {
url: "https://google.com", url: "https://google.com",
wispurl: "wss://wisp.mercurywork.shop/", wispurl: "wss://wisp.mercurywork.shop/",
bareurl: bareurl:
(location.protocol === "https:" ? "https" : "http") + (location.protocol === "https:" ? "https" : "http") +
"://" + "://" +
location.host + location.host +
"/bare/", "/bare/",
}, },
{ ident: "settings", backing: "localstorage", autosave: "auto" }, { ident: "settings", backing: "localstorage", autosave: "auto" }
); );
connection.setTransport("/baremod/index.mjs", [store.bareurl]); connection.setTransport("/baremod/index.mjs", [store.bareurl]);
function App() { function App() {
this.urlencoded = ""; this.urlencoded = "";
this.css = ` this.css = `
width: 100%; width: 100%;
height: 100%; height: 100%;
color: #e0def4; color: #e0def4;
@ -86,7 +86,7 @@ function App() {
} }
`; `;
return html` return html`
<div> <div>
<h1>Percury Unblocker</h1> <h1>Percury Unblocker</h1>
<p>surf the unblocked and mostly buggy web</p> <p>surf the unblocked and mostly buggy web</p>
@ -110,5 +110,5 @@ function App() {
} }
window.addEventListener("load", () => { window.addEventListener("load", () => {
document.body.appendChild(h(App)); document.body.appendChild(h(App));
}); });