@mercuryworkshop/epoxy-transport 2.0.0 → 2.0.2

package/dist/index.js

@@ -1530,14 +1530,17 @@ var EpoxyClient = class {
   canstart = true;
   epxclient = null;
   wisp;
+  EpoxyHandlers = null;
   constructor({ wisp }) {
     this.wisp = wisp;
   }
   async init() {
-    const { EpoxyClient: EpoxyClient2, EpoxyClientOptions } = await epoxy_module_bundled_default();
+    const { EpoxyClient: EpoxyClient2, EpoxyClientOptions, EpoxyHandlers } = await epoxy_module_bundled_default();
     let options = new EpoxyClientOptions();
     options.user_agent = navigator.userAgent;
+    options.udp_extension_required = false;
     this.epxclient = await new EpoxyClient2(this.wisp, certs_module_default, options);
+    this.EpoxyHandlers = EpoxyHandlers;
     this.ready = true;
   }
   ready = false;
@@ -1560,18 +1563,26 @@ var EpoxyClient = class {
     }
   }
   connect(url, origin, protocols, requestHeaders, onopen, onmessage, onclose, onerror) {
-    let epsocket = this.epxclient.connect_ws(
+    let handlers = new this.EpoxyHandlers(
       onopen,
       onclose,
       onerror,
-      (data) => data instanceof Uint8Array ? onmessage(data.buffer) : onmessage(data),
+      (data) => 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);
+      }
+    ];
   }
 };
 if (typeof module.exports == "object" && typeof exports == "object") {

package/dist/module.js

@@ -1491,14 +1491,17 @@ var EpoxyClient = class {
   canstart = true;
   epxclient = null;
   wisp;
+  EpoxyHandlers = null;
   constructor({ wisp }) {
     this.wisp = wisp;
   }
   async init() {
-    const { EpoxyClient: EpoxyClient2, EpoxyClientOptions } = await epoxy_module_bundled_default();
+    const { EpoxyClient: EpoxyClient2, EpoxyClientOptions, EpoxyHandlers } = await epoxy_module_bundled_default();
     let options = new EpoxyClientOptions();
     options.user_agent = navigator.userAgent;
+    options.udp_extension_required = false;
     this.epxclient = await new EpoxyClient2(this.wisp, certs_module_default, options);
+    this.EpoxyHandlers = EpoxyHandlers;
     this.ready = true;
   }
   ready = false;
@@ -1521,18 +1524,26 @@ var EpoxyClient = class {
     }
   }
   connect(url, origin, protocols, requestHeaders, onopen, onmessage, onclose, onerror) {
-    let epsocket = this.epxclient.connect_ws(
+    let handlers = new this.EpoxyHandlers(
       onopen,
       onclose,
       onerror,
-      (data) => data instanceof Uint8Array ? onmessage(data.buffer) : onmessage(data),
+      (data) => 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);
+      }
+    ];
   }
 };
 export {

package/package.json

@@ -1,14 +1,11 @@
 {
   "name": "@mercuryworkshop/epoxy-transport",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "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",
     "esbuild-plugin-umd-wrapper": "^2.0.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

@@ -3,71 +3,82 @@ import epoxy from "@mercuryworkshop/epoxy-tls";
 //@ts-expect-error typescript doesnt follow the npm exports for some reason
 import ROOTS from "@mercuryworkshop/epoxy-tls/certs"
 export class EpoxyClient implements BareTransport {
-  canstart = true;
-  epxclient: Awaited<ReturnType<any>>["EpoxyClient"]["prototype"] = null!;
-  wisp: string;
+	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();
+	constructor({ wisp }) {
+		this.wisp = wisp;
+	}
+	async init() {
+		const { EpoxyClient, EpoxyClientOptions, EpoxyHandlers } = await epoxy();
 
-    let options = new EpoxyClientOptions();
-	  options.user_agent = navigator.userAgent;
-    this.epxclient = await new EpoxyClient(this.wisp, ROOTS, options);
+		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;
-  }
-  ready = false;
-  async meta() { }
+		this.ready = true;
+	}
+	ready = false;
+	async meta() { }
 
-  async request(
-    remote: URL,
-    method: string,
-    body: BodyInit | null,
-    headers: BareHeaders,
-    signal: AbortSignal | undefined
-  ): Promise<TransferrableResponse> {
-    if (body instanceof Blob)
-      body = await body.arrayBuffer();
+	async request(
+		remote: URL,
+		method: string,
+		body: BodyInit | null,
+		headers: BareHeaders,
+		signal: AbortSignal | undefined
+	): Promise<TransferrableResponse> {
+		if (body instanceof Blob)
+			body = await body.arrayBuffer();
 
-    try {
-      let payload = await this.epxclient.fetch(remote.href, { method, body, headers, redirect: "manual" });
-      return {
-        body: payload.body!,
-        headers: (payload as any).rawHeaders,
-        status: payload.status,
-        statusText: payload.statusText,
-      };
-    } catch (err) {
-      console.error(err);
-      throw err;
-    }
-  }
+		try {
+			let payload = await this.epxclient.fetch(remote.href, { method, body, headers, redirect: "manual" });
+			return {
+				body: payload.body!,
+				headers: (payload as any).rawHeaders,
+				status: payload.status,
+				statusText: payload.statusText,
+			};
+		} catch (err) {
+			console.error(err);
+			throw err;
+		}
+	}
 
-  connect(
-    url: URL,
-    origin: string,
-    protocols: string[],
-    requestHeaders: BareHeaders,
-    onopen: (protocol: string) => void,
-    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(
-      onopen,
-      onclose,
-      onerror,
-      (data: Uint8Array | string) => data instanceof Uint8Array ? onmessage(data.buffer) : onmessage(data),
-      url.href,
-      protocols,
-      origin,
-    );
+	connect(
+		url: URL,
+		origin: string,
+		protocols: string[],
+		requestHeaders: BareHeaders,
+		onopen: (protocol: string) => void,
+		onmessage: (data: Blob | ArrayBuffer | string) => void,
+		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(
+			onopen,
+			onclose,
+			onerror,
+			(data: Uint8Array | string) => data instanceof Uint8Array ? onmessage(data.buffer) : onmessage(data)
+		);
+		let epsocket = this.epxclient.connect_websocket(
+			handlers,
+			url.href,
+			protocols,
+			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)
+			}
+		]
+	}
 }