[core] delete bare-mux

Author: velzie

package.json

@@ -61,7 +61,7 @@
 		"typescript": "^5.8.3"
 	},
 	"dependencies": {
-		"@mercuryworkshop/bare-mux": "^2.1.7",
+		"@mercuryworkshop/epoxy-tls": "2.1.18-1",
 		"dom-serializer": "^2.0.0",
 		"domhandler": "^5.0.3",
 		"domutils": "^3.2.2",

server.js

@@ -11,7 +11,7 @@ import { fileURLToPath } from "node:url";
 import { server as wisp } from "@mercuryworkshop/wisp-js/server";
 
 //transports
-import { baremuxPath } from "@mercuryworkshop/bare-mux/node";
+// import { baremuxPath } from "@mercuryworkshop/bare-mux/node";
 import { epoxyPath } from "@mercuryworkshop/epoxy-transport";
 import { libcurlPath } from "@mercuryworkshop/libcurl-transport";
 import { bareModulePath } from "@mercuryworkshop/bare-as-module3";
@@ -62,11 +62,11 @@ fastify.register(fastifyStatic, {
 	prefix: "/assets/",
 	decorateReply: false,
 });
-fastify.register(fastifyStatic, {
-	root: baremuxPath,
-	prefix: "/baremux/",
-	decorateReply: false,
-});
+// fastify.register(fastifyStatic, {
+// 	root: baremuxPath,
+// 	prefix: "/baremux/",
+// 	decorateReply: false,
+// });
 fastify.register(fastifyStatic, {
 	root: epoxyPath,
 	prefix: "/epoxy/",

src/client/index.ts

@@ -1,14 +1,16 @@
 import { ScramjetFrame } from "@/controller/frame";
+import initEpoxy, {
+	EpoxyClient,
+	EpoxyClientOptions,
+	EpoxyHandlers,
+	info as epoxyInfo,
+} from "@mercuryworkshop/epoxy-tls";
 import { SCRAMJETCLIENT, SCRAMJETFRAME } from "@/symbols";
 import { createDocumentProxy } from "@client/document";
 import { createGlobalProxy } from "@client/global";
 import { getOwnPropertyDescriptorHandler } from "@client/helpers";
 import { createLocationProxy } from "@client/location";
 import { nativeGetOwnPropertyDescriptor } from "@client/natives";
-import {
-	BareClient,
-	type BareClient as BareClientType,
-} from "@mercuryworkshop/bare-mux";
 import { createWrapFn } from "@client/shared/wrap";
 import { NavigateEvent } from "@client/events";
 import { rewriteUrl, unrewriteUrl, type URLMeta } from "@rewriters/url";
@@ -72,7 +74,7 @@ export class ScramjetClient {
 	globalProxy: any;
 	locationProxy: any;
 	serviceWorker: ServiceWorkerContainer;
-	bare: BareClientType;
+	epoxy: EpoxyClient;
 
 	natives: NativeStore;
 	descriptors: DescriptorStore;
@@ -102,22 +104,29 @@ export class ScramjetClient {
 			throw new Error();
 		}
 
+		initEpoxy().then(() => {
+			let options = new EpoxyClientOptions();
+			options.user_agent = navigator.userAgent;
+			this.epoxy = new EpoxyClient(config.wisp, options);
+		});
+
 		if (iswindow) {
-			this.bare = new BareClient();
+			// this.bare = new EpoxyClient();
+			// this.bare = new BareClient();
 		} else {
-			this.bare = new BareClient(
-				new Promise((resolve) => {
-					addEventListener("message", ({ data }) => {
-						if (typeof data !== "object") return;
-						if (
-							"$scramjet$type" in data &&
-							data.$scramjet$type === "baremuxinit"
-						) {
-							resolve(data.port);
-						}
-					});
-				})
-			);
+			// this.bare = new BareClient(
+			// 	new Promise((resolve) => {
+			// 		addEventListener("message", ({ data }) => {
+			// 			if (typeof data !== "object") return;
+			// 			if (
+			// 				"$scramjet$type" in data &&
+			// 				data.$scramjet$type === "baremuxinit"
+			// 			) {
+			// 				resolve(data.port);
+			// 			}
+			// 		});
+			// 	})
+			// );
 		}
 
 		this.serviceWorker = this.global.navigator.serviceWorker;