@mercuryworkshop/epoxy-transport 2.1.13 → 2.1.15

package/esbuild.bundle.mjs

@@ -1,7 +1,7 @@
 // import { dtsPlugin } from "esbuild-plugin-d.ts";
 import { build } from "esbuild";
 import path from 'node:path'
-import fs from 'node:fs'
+import fs, { readFileSync } from 'node:fs'
 import { umdWrapper } from "esbuild-plugin-umd-wrapper";
 
 const umdWrapperOptions = {
@@ -10,6 +10,24 @@ const umdWrapperOptions = {
   amdLoaderName: "define" // <= default
 }
 
+//for the CJS build: we take the import url and translate it into it's corresponding functions and annd that back to the file.
+const dataUrl = {
+    name: 'data-url-to-functions',
+    setup(build) {
+        build.onLoad({ filter: /\.js$/ }, (args) => {
+            const source = readFileSync(args.path, 'utf-8');
+            const transformedSource = source.replace(/import\s+(?:{[^}]*}\s+from\s+)?['"]data:application\/javascript;base64,([^'"]+)['"];\s*/g, (_, b64) => {
+                const code = Buffer.from(b64, 'base64').toString('utf-8');
+                return code;
+            })
+            return {
+                contents: transformedSource,
+                loader: 'js'
+            }
+        });
+    }
+}
+
 let wasmPlugin = {
   name: 'wasm',
   setup(build) {
@@ -86,7 +104,7 @@ build({
   entryPoints: [`./src/main.ts`],
   outfile: `./dist/index.js`,
   external: ["fs", "ws", "path"],
-  plugins: [wasmPlugin, umdWrapper(umdWrapperOptions)]
+  plugins: [wasmPlugin, dataUrl, umdWrapper(umdWrapperOptions)]
   // plugins: [dtsPlugin({
   //   outDir: `./dist/`,
   //   tsconfig: "tsconfig.json"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@mercuryworkshop/epoxy-transport",
-	"version": "2.1.13",
+	"version": "2.1.15",
 	"description": "a bare transport that implements end-to-end encryption with epoxy-tls and wisp",
 	"main": "./dist/index.mjs",
 	"keywords": [],
@@ -12,7 +12,7 @@
 		"prepare": "npm run build"
 	},
 	"dependencies": {
-		"@mercuryworkshop/epoxy-tls": "2.1.6-1"
+		"@mercuryworkshop/epoxy-tls": "2.1.7-1"
 	},
 	"devDependencies": {
 		"@mercuryworkshop/bare-mux": "^2.0.9",

package/src/main.ts

@@ -1,12 +1,17 @@
 import type { BareHeaders, TransferrableResponse, BareTransport } from "@mercuryworkshop/bare-mux";
-import initEpoxy, { EpoxyClient, EpoxyClientOptions, EpoxyHandlers } from "@mercuryworkshop/epoxy-tls";
+import initEpoxy, { EpoxyClient, EpoxyClientOptions, EpoxyHandlers, info } from "@mercuryworkshop/epoxy-tls";
+
+export { info as epoxyInfo };
+
 export default class EpoxyTransport implements BareTransport {
 	canstart = true;
-	epxclient: Awaited<ReturnType<any>>["EpoxyClient"]["prototype"] = null!;
+	ready = false;
+
+	client: EpoxyClient = null!;
+
 	wisp: string;
 	wisp_v2: boolean;
 	udp_extension_required: boolean;
-	EpoxyHandlers: Awaited<ReturnType<any>>["EpoxyHandlers"]["prototype"] = null!;
 
 	constructor({ wisp, wisp_v2, udp_extension_required }) {
 		this.wisp = wisp;
@@ -20,12 +25,10 @@ export default class EpoxyTransport implements BareTransport {
 		options.user_agent = navigator.userAgent;
 		options.udp_extension_required = this.udp_extension_required;
 		options.wisp_v2 = this.wisp_v2;
-		this.epxclient = new EpoxyClient(this.wisp, options);
-		this.EpoxyHandlers = EpoxyHandlers;
+		this.client = new EpoxyClient(this.wisp, options);
 
 		this.ready = true;
 	}
-	ready = false;
 	async meta() { }
 
 	async request(
@@ -39,12 +42,12 @@ export default class EpoxyTransport implements BareTransport {
 			body = await body.arrayBuffer();
 
 		try {
-			let payload = await this.epxclient.fetch(remote.href, { method, body, headers, redirect: "manual" });
+			let res = await this.client.fetch(remote.href, { method, body, headers, redirect: "manual" });
 			return {
-				body: payload.body!,
-				headers: (payload as any).rawHeaders,
-				status: payload.status,
-				statusText: payload.statusText,
+				body: res.body!,
+				headers: (res as any).rawHeaders,
+				status: res.status,
+				statusText: res.statusText,
 			};
 		} catch (err) {
 			console.error(err);
@@ -62,25 +65,25 @@ export default class EpoxyTransport implements BareTransport {
 		onclose: (code: number, reason: string) => void,
 		onerror: (error: string) => void,
 	): [(data: Blob | ArrayBuffer | string) => void, (code: number, reason: string) => void] {
-		let handlers = new this.EpoxyHandlers(
+		let handlers = new EpoxyHandlers(
 			onopen,
 			onclose,
 			onerror,
 			(data: Uint8Array | string) => data instanceof Uint8Array ? onmessage(data.buffer) : onmessage(data)
 		);
-		let epsocket = this.epxclient.connect_websocket(
+		let ws = this.client.connect_websocket(
 			handlers,
 			url.href,
 			protocols,
-			{ "Origin": origin }
+			Object.assign({ "Origin": origin }, requestHeaders)
 		);
 
 		return [
 			async (data) => {
-				(await epsocket).send(data);
+				(await ws).send(data);
 			},
 			async (code, reason) => {
-				(await epsocket).close(close, reason)
+				(await ws).close(code, reason || "")
 			}
 		]
 	}