[chrome] properly initialize scramjet

Author: velzie

packages/chrome/public/controller.sw.js

@@ -78,7 +78,7 @@ export function App(props: {}, cx: ComponentContext) {
 }
 App.style = css`
 	:scope {
-		background-color: var(--toolbar);
+		background-color: var(--frame);
 		--separator-color: color-mix(in srgb, currentColor 10%, transparent);
 	}
 	.separator {

packages/chrome/src/App.tsx

@@ -315,7 +315,7 @@ export function createFetchHandler(controller: Controller) {
 			let promises: Promise<any>[] = [];
 			for (const context of contexts) {
 				if (context.alive()) {
-					console.log("sending to " + context.id, context.windowproxy);
+					// console.log("sending to " + context.id, context.windowproxy);
 					promises.push(
 						context.rpc.call("setCookie", {
 							url: url.href,
@@ -325,18 +325,18 @@ export function createFetchHandler(controller: Controller) {
 				}
 			}
 			if (promises.length === 0) return;
-			console.log("actually sent");
+			// console.log("actually sent");
 
 			// a context could be deadlocked, so add a safety
-			await Promise.race([
-				new Promise((res) =>
-					setTimeout(() => {
-						console.error("a context deadlocked! hit timeout");
-						res(null);
-					}, 1000)
-				),
-				Promise.all(promises),
-			]);
+			// await Promise.race([
+			// 	new Promise((res) =>
+			// 		setTimeout(() => {
+			// 			console.error("a context deadlocked! hit timeout");
+			// 			res(null);
+			// 		}, 1000)
+			// 	),
+			// 	Promise.all(promises),
+			// ]);
 		},
 	});
 

packages/chrome/src/proxy/scramjet.ts

@@ -1,12 +1,8 @@
 import {
 	CookieJar,
 	iswindow,
-	loadAndHook,
 	SCRAMJETCLIENT,
 	ScramjetClient,
-	ScramjetClientInit,
-	ScramjetInitConfig,
-	ScramjetInterface,
 	setWasm,
 } from "@mercuryworkshop/scramjet";
 import { FrameSequence, InjectScramjetInit } from "./types";
@@ -31,7 +27,9 @@ export function loadScramjet({
 
 	const transport = new LibcurlClient({ wisp });
 
-	loadAndHook({
+	if (SCRAMJETCLIENT in self) return;
+
+	client = new ScramjetClient(globalThis, {
 		context: {
 			interface: {
 				getInjectScripts,
@@ -45,6 +43,5 @@ export function loadScramjet({
 		transport,
 		sendSetCookie: async (url: URL, cookie: string) => {},
 	});
-
-	client = self[SCRAMJETCLIENT];
+	client.hook();
 }