allow setting a custom bare transport in bundled builds (normal builds still hardcoded)

Author: velzie

packages/chrome/package.json

@@ -15,7 +15,9 @@
 	"dependencies": {
 		"@iconify/types": "^2.0.0",
 		"@ktibow/iconset-ion": "^8.0.13",
-		"@mercuryworkshop/epoxy-transport": "^2.1.27",
+		"@mercuryworkshop/bare-mux-custom": "workspace:*",
+		"@mercuryworkshop/epoxy-transport": "workspace:*",
+		"@mercuryworkshop/libcurl-transport": "workspace:*",
 		"@mercuryworkshop/scramjet": "workspace:scramjet",
 		"devtools-protocol": "^0.0.1339468",
 		"domhandler": "^5.0.3",

packages/chrome/src/IsolatedFrame.tsx

@@ -8,9 +8,9 @@ import {
 	setConfig,
 	unrewriteUrl,
 	type URLMeta,
-	BareClient,
 	ScramjetServiceWorker,
 } from "@mercuryworkshop/scramjet/bundled";
+import { BareClient } from "@mercuryworkshop/bare-mux-custom";
 import { ElementType, type Handler, Parser } from "htmlparser2";
 import { type ChildNode, DomHandler, Element, Comment, Node } from "domhandler";
 import * as tldts from "tldts";
@@ -32,6 +32,8 @@ import { createMenu } from "./components/Menu";
 
 const ISOLATION_ORIGIN = import.meta.env.VITE_ISOLATION_ORIGIN;
 
+import LibcurlClient from "@mercuryworkshop/libcurl-transport";
+
 const cfg = {
 	wisp: "ws://localhost:1337/",
 	prefix: "/scramjet/",
@@ -85,7 +87,11 @@ const cfg = {
 };
 
 setConfig(cfg);
-export const bare = new BareClient();
+export const bare = new BareClient(
+	new LibcurlClient({
+		wisp: cfg.wisp,
+	})
+);
 
 type Controller = {
 	controllerframe: HTMLIFrameElement;

packages/scramjet/src/client/client.ts

@@ -1,12 +1,12 @@
 import { ScramjetFrame } from "@/controller/frame";
-import { BareClient } from "../bare-mux-custom";
+import { BareClient } from "@mercuryworkshop/bare-mux-custom";
 import { SCRAMJETCLIENT, SCRAMJETFRAME } from "@/symbols";
 import { getOwnPropertyDescriptorHandler } from "@client/helpers";
 import { createLocationProxy } from "@client/location";
 import { createWrapFn } from "@client/shared/wrap";
 import { NavigateEvent } from "@client/events";
 import { rewriteUrl, unrewriteUrl, type URLMeta } from "@rewriters/url";
-import { config, flagEnabled } from "@/shared";
+import { bareTransport, config, flagEnabled } from "@/shared";
 import { CookieJar } from "@/shared/cookie";
 import { iswindow } from "./entry";
 import { SingletonBox } from "./singletonbox";
@@ -121,7 +121,7 @@ export class ScramjetClient {
 
 		this.box.registerClient(this, global as Self);
 
-		this.bare = new BareClient();
+		this.bare = new BareClient(bareTransport!);
 
 		this.serviceWorker = this.global.navigator.serviceWorker;
 

packages/scramjet/src/client/shared/requests/websocket.ts

@@ -1,5 +1,5 @@
 import { config } from "@/shared";
-import { type BareWebSocket } from "../../../bare-mux-custom";
+import { type BareWebSocket } from "@mercuryworkshop/bare-mux-custom";
 import { ScramjetClient } from "@client/index";
 
 type FakeWebSocketState = {

packages/scramjet/src/index.ts

@@ -10,5 +10,3 @@ export * from "./worker";
 export * from "./entry";
 export * from "./symbols";
 export * from "./types";
-
-export { BareClient } from "./bare-mux-custom";

packages/scramjet/src/shared/index.ts

@@ -1,3 +1,4 @@
+import { BareTransport } from "@/bare-mux-custom";
 import { ScramjetConfig, ScramjetFlags } from "@/types";
 
 export * from "./cookie";
@@ -32,3 +33,8 @@ export function setConfig(newConfig: ScramjetConfig) {
 	config = newConfig;
 	loadCodecs();
 }
+
+export let bareTransport: BareTransport | null = null;
+export function setBareTransport(transport: BareTransport) {
+	bareTransport = transport;
+}

packages/scramjet/src/worker/fetch.ts

@@ -1,4 +1,8 @@
-import { BareClient, BareHeaders, BareResponseFetch } from "../bare-mux-custom";
+import {
+	BareClient,
+	BareHeaders,
+	BareResponseFetch,
+} from "@mercuryworkshop/bare-mux-custom";
 
 import { MessageW2C, ScramjetServiceWorker } from "@/worker";
 import { renderError } from "@/worker/error";

packages/scramjet/src/worker/index.ts

@@ -4,11 +4,16 @@
 
 import { FakeServiceWorker } from "@/worker/fakesw";
 import { handleFetch, ScramjetFetchContext } from "@/worker/fetch";
-import { BareClient } from "../bare-mux-custom";
+import { BareClient } from "@mercuryworkshop/bare-mux-custom";
 import { ScramjetConfig, ScramjetDB } from "@/types";
 import { asyncSetWasm } from "@rewriters/wasm";
 import { CookieJar } from "@/shared/cookie";
-import { ScramjetHeaders, setConfig, unrewriteUrl } from "@/shared";
+import {
+	bareTransport,
+	ScramjetHeaders,
+	setConfig,
+	unrewriteUrl,
+} from "@/shared";
 import { openDB } from "idb";
 import { ScramjetDownload } from "@client/events";
 import { renderError } from "./error";
@@ -128,7 +133,7 @@ export class ScramjetServiceWorker extends EventTarget {
 
 		if (this.config) {
 			setConfig(this.config);
-			this.client = new BareClient();
+			this.client = new BareClient(bareTransport!);
 			await asyncSetWasm();
 		}
 	}