@mercuryworkshop/epoxy-transport 2.0.1 → 2.0.3

package/package.json

@@ -1,16 +1,13 @@
 {
   "name": "@mercuryworkshop/epoxy-transport",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "a bare transport that implements end-to-end encryption with epoxy-tls and wisp",
   "main": "./dist/index.mjs",
   "keywords": [],
   "author": "",
   "type": "module",
-  "scripts": {
-    "build": "node esbuild.bundle.mjs"
-  },
   "dependencies": {
-    "@mercuryworkshop/epoxy-tls": "^2.0.0-3",
+    "@mercuryworkshop/epoxy-tls": "^2.0.2-1",
     "esbuild-plugin-umd-wrapper": "^2.0.0",
     "rollup": "^4.12.0",
     "rollup-plugin-node-resolve": "^5.2.0",
@@ -18,7 +15,7 @@
     "ws": "8.16.0"
   },
   "devDependencies": {
-    "@mercuryworkshop/bare-mux": "^1.1.1",
+    "@mercuryworkshop/bare-mux": "^1.1.3",
     "esbuild": "^0.19.11",
     "esbuild-plugin-d.ts": "^1.2.2"
   },
@@ -33,5 +30,8 @@
         "import": "./lib/index.cjs"
       }
     }
+  },
+  "scripts": {
+    "build": "node esbuild.bundle.mjs"
   }
-}
+}

package/src/main.ts

@@ -6,17 +6,19 @@ export class EpoxyClient implements BareTransport {
 	canstart = true;
 	epxclient: Awaited<ReturnType<any>>["EpoxyClient"]["prototype"] = null!;
 	wisp: string;
+	EpoxyHandlers: Awaited<ReturnType<any>>["EpoxyHandlers"]["prototype"] = null!;
 
 	constructor({ wisp }) {
 		this.wisp = wisp;
 	}
 	async init() {
-		const { EpoxyClient, EpoxyClientOptions } = await epoxy();
+		const { EpoxyClient, EpoxyClientOptions, EpoxyHandlers } = await epoxy();
 
 		let options = new EpoxyClientOptions();
 		options.user_agent = navigator.userAgent;
 		options.udp_extension_required = false;
 		this.epxclient = await new EpoxyClient(this.wisp, ROOTS, options);
+		this.EpoxyHandlers = EpoxyHandlers;
 
 		this.ready = true;
 	}
@@ -56,19 +58,27 @@ export class EpoxyClient implements BareTransport {
 		onmessage: (data: Blob | ArrayBuffer | string) => void,
 		onclose: (code: number, reason: string) => void,
 		onerror: (error: string) => void,
-	): (data: Blob | ArrayBuffer | string) => void {
-		let epsocket = this.epxclient.connect_ws(
+	): [ (data: Blob | ArrayBuffer | string) => void, (code: number, reason: string) => void ] {
+		let handlers = new this.EpoxyHandlers(
 			onopen,
 			onclose,
 			onerror,
-			(data: Uint8Array | string) => data instanceof Uint8Array ? onmessage(data.buffer) : onmessage(data),
+			(data: Uint8Array | string) => data instanceof Uint8Array ? onmessage(data.buffer) : onmessage(data)
+		);
+		let epsocket = this.epxclient.connect_websocket(
+			handlers,
 			url.href,
 			protocols,
-			origin,
+			Object.assign({ "Origin": origin }, requestHeaders)
 		);
 
-		return async (data) => {
-			await epsocket.send(data);
-		}
+		return [ 
+			async (data) => {
+				(await epsocket).send(data);
+			},
+			async (code, reason) => {
+				(await epsocket).close(close, reason)
+			}
+		]
 	}
 }