[scramjet/controller] fix sw bugs and add client

Author: velzie

packages/scramjet/packages/controller/package.json

@@ -7,6 +7,7 @@
 	"dependencies": {
 		"@mercuryworkshop/scramjet": "workspace:*",
 		"@mercuryworkshop/rpc": "workspace:*",
-		"@mercuryworkshop/bare-mux-custom": "workspace:*"
+		"@mercuryworkshop/bare-mux-custom": "workspace:*",
+		"@mercuryworkshop/libcurl-transport": "workspace:*"
 	}
 }

packages/scramjet/packages/controller/src/index.ts

@@ -1,11 +1,23 @@
 import { MethodsDefinition, RpcHelper } from "@mercuryworkshop/rpc";
 import {
+	codecDecode,
 	CookieJar,
+	rewriteUrl,
 	ScramjetFetchHandler,
 	ScramjetHeaders,
+	setConfig,
 	type ScramjetFetchContext,
 } from "@mercuryworkshop/scramjet";
 import { Controllerbound, SWbound } from "./types";
+import LibcurlClient from "@mercuryworkshop/libcurl-transport";
+import { BareClient } from "@mercuryworkshop/bare-mux-custom";
+
+let lc = new LibcurlClient({
+	wisp: "wss://anura.pro/",
+});
+const client = new BareClient(lc);
+console.log(lc);
+console.log(client);
 
 const cookieJar = new CookieJar();
 
@@ -16,11 +28,58 @@ type Config = {
 	prefix: string;
 };
 
-const config: Config = {
+export const config: Config = {
 	prefix: "/~/sj",
 	virtualWasmPath: "/scramjet.wasm.js",
 };
 
+const cfg = {
+	prefix: "/scramjet/",
+	globals: {
+		wrapfn: "$scramjet$wrap",
+		wrappropertybase: "$scramjet__",
+		wrappropertyfn: "$scramjet$prop",
+		cleanrestfn: "$scramjet$clean",
+		importfn: "$scramjet$import",
+		rewritefn: "$scramjet$rewrite",
+		metafn: "$scramjet$meta",
+		wrappostmessagefn: "$scramjet$wrappostmessage",
+		pushsourcemapfn: "$scramjet$pushsourcemap",
+		trysetfn: "$scramjet$tryset",
+		templocid: "$scramjet$temploc",
+		tempunusedid: "$scramjet$tempunused",
+	},
+	flags: {
+		syncxhr: false,
+		strictRewrites: true,
+		rewriterLogs: false,
+		captureErrors: true,
+		cleanErrors: false,
+		scramitize: false,
+		sourcemaps: true,
+		destructureRewrites: false,
+		allowInvalidJs: false,
+		allowFailedIntercepts: false,
+		antiAntiDebugger: false,
+	},
+	siteFlags: {},
+	codec: {
+		encode: `(url) => {
+						if (!url) return url;
+
+						return encodeURIComponent(url);
+					}`,
+		decode: `(url) => {
+						if (!url) return url;
+
+						return decodeURIComponent(url);
+					}`,
+	},
+	maskedfiles: ["inject.js", "scramjet.wasm.js"],
+};
+
+setConfig(cfg);
+
 const frames: Record<string, Frame> = {};
 
 let wasmPayload: string | null = null;
@@ -29,7 +88,7 @@ function makeId(): string {
 	return Math.random().toString(36).substring(2, 10);
 }
 
-class Controller {
+export class Controller {
 	id: string;
 	prefix: string;
 	frames: Frame[] = [];
@@ -44,9 +103,11 @@ class Controller {
 			this.readyResolve();
 		},
 		request: async (data) => {
+			console.log("REQUEST", data);
 			let path = new URL(data.rawUrl).pathname;
 			const frame = this.frames.find((f) => path.startsWith(f.prefix));
 			if (!frame) throw new Error("No frame found for request");
+			console.log("?");
 
 			if (path.startsWith(frame.prefix + "/" + config.virtualWasmPath)) {
 				if (!wasmPayload) {
@@ -88,6 +149,8 @@ class Controller {
 				}
 			}
 
+			console.log("fR");
+
 			const fetchresponse = await frame.fetchHandler.handleFetch({
 				initialHeaders: sjheaders,
 				rawClientUrl: data.rawClientUrl
@@ -104,6 +167,8 @@ class Controller {
 				cookieStore: this.cookieJar,
 			});
 
+			console.log("???");
+
 			return [
 				{
 					body: fetchresponse.body,
@@ -130,7 +195,7 @@ class Controller {
 		let channel = new MessageChannel();
 		this.rpc = new RpcHelper<Controllerbound, SWbound>(
 			this.methods,
-			"swchannel",
+			"tabchannel-" + this.id,
 			(data, transfer) => {
 				channel.port1.postMessage(data, transfer);
 			}
@@ -151,8 +216,9 @@ class Controller {
 		);
 	}
 
-	createFrame(): Frame {
-		const frame = new Frame(this);
+	createFrame(element?: HTMLIFrameElement): Frame {
+		element ??= document.createElement("iframe");
+		const frame = new Frame(this, element);
 		this.frames.push(frame);
 		return frame;
 	}
@@ -167,12 +233,15 @@ class Frame {
 	id: string;
 	prefix: string;
 
-	constructor(public controller: Controller) {
+	constructor(
+		public controller: Controller,
+		public element: HTMLIFrameElement
+	) {
 		this.id = makeId();
-		this.prefix = this.controller.prefix + "/" + this.id;
+		this.prefix = this.controller.prefix + "/" + this.id + "/";
 
 		this.fetchHandler = new ScramjetFetchHandler({
-			client: null,
+			client,
 			cookieJar: this.controller.cookieJar,
 			prefix: new URL(
 				config.prefix + "/" + this.controller.id + "/" + this.id,
@@ -182,4 +251,14 @@ class Frame {
 			onServerbound: (type, listener) => {},
 		});
 	}
+
+	go(url: string) {
+		const encoded = rewriteUrl(url, {
+			prefix: new URL(this.prefix, location.href),
+			origin: new URL(location.href),
+			base: new URL(location.href),
+		});
+		console.log(encoded);
+		this.element.src = encoded;
+	}
 }

packages/scramjet/packages/controller/src/sw.ts

@@ -11,7 +11,7 @@ class Tab {
 		public id: string,
 		port: MessagePort
 	) {
-		this.rpc = new RpcHelper({}, "tabchannel" + id, (data, transfer) => {
+		this.rpc = new RpcHelper({}, "tabchannel-" + id, (data, transfer) => {
 			port.postMessage(data, transfer);
 		});
 		port.addEventListener("message", (e) => {
@@ -34,13 +34,15 @@ addEventListener("message", (e) => {
 	tabs.push(new Tab(init.prefix, init.id, e.ports[0]));
 });
 
-function shouldRoute(event: FetchEvent): boolean {
-	const tab = tabs.find((tab) => event.request.url.startsWith(tab.prefix));
+export function shouldRoute(event: FetchEvent): boolean {
+	const url = new URL(event.request.url);
+	const tab = tabs.find((tab) => url.pathname.startsWith(tab.prefix));
 	return tab !== undefined;
 }
 
-async function route(event: FetchEvent): Promise<Response> {
-	const tab = tabs.find((tab) => event.request.url.startsWith(tab.prefix))!;
+export async function route(event: FetchEvent): Promise<Response> {
+	const url = new URL(event.request.url);
+	const tab = tabs.find((tab) => url.pathname.startsWith(tab.prefix))!;
 	const client = await clients.get(event.clientId);
 
 	const bareheaders: BareHeaders = {};