@mercuryworkshop/epoxy-transport 1.1.0 → 2.0.1

package/package.json

@@ -1,17 +1,16 @@
 {
   "name": "@mercuryworkshop/epoxy-transport",
-  "version": "1.1.0",
+  "version": "2.0.1",
   "description": "a bare transport that implements end-to-end encryption with epoxy-tls and wisp",
   "main": "./dist/index.mjs",
   "keywords": [],
   "author": "",
   "type": "module",
-  "license": "LGPL",
   "scripts": {
     "build": "node esbuild.bundle.mjs"
   },
   "dependencies": {
-    "@mercuryworkshop/epoxy-tls": "^1.4.1",
+    "@mercuryworkshop/epoxy-tls": "^2.0.0-3",
     "esbuild-plugin-umd-wrapper": "^2.0.0",
     "rollup": "^4.12.0",
     "rollup-plugin-node-resolve": "^5.2.0",
@@ -19,6 +18,7 @@
     "ws": "8.16.0"
   },
   "devDependencies": {
+    "@mercuryworkshop/bare-mux": "^1.1.1",
     "esbuild": "^0.19.11",
     "esbuild-plugin-d.ts": "^1.2.2"
   },

package/src/main.ts

@@ -1,72 +1,74 @@
 import { BareHeaders, BareResponse, TransferrableResponse, type BareTransport } from "@mercuryworkshop/bare-mux";
 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;
 
-  constructor({ wisp }) {
-    this.wisp = wisp;
-  }
-  async init() {
-    let { EpoxyClient } = await epoxy();
-    this.epxclient = await new EpoxyClient(this.wisp, navigator.userAgent, 10);
+	constructor({ wisp }) {
+		this.wisp = wisp;
+	}
+	async init() {
+		const { EpoxyClient, EpoxyClientOptions } = await epoxy();
 
-    this.ready = true;
-  }
-  ready = false;
-  async meta() { }
+		let options = new EpoxyClientOptions();
+		options.user_agent = navigator.userAgent;
+		options.udp_extension_required = false;
+		this.epxclient = await new EpoxyClient(this.wisp, ROOTS, options);
 
-  async request(
-    remote: URL,
-    method: string,
-    body: BodyInit | null,
-    headers: BareHeaders,
-    signal: AbortSignal | undefined
-  ): Promise<TransferrableResponse> {
-    if (body instanceof Blob)
-      body = await body.arrayBuffer();
+		this.ready = true;
+	}
+	ready = false;
+	async meta() { }
 
-    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;
-    }
-  }
+	async request(
+		remote: URL,
+		method: string,
+		body: BodyInit | null,
+		headers: BareHeaders,
+		signal: AbortSignal | undefined
+	): Promise<TransferrableResponse> {
+		if (body instanceof Blob)
+			body = await body.arrayBuffer();
 
-  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,
-    );
+		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;
+		}
+	}
 
-    return async (data) => {
-      if (typeof data === 'string') {
-        (await epsocket).send_text(data);
-      } else {
-        (await epsocket).send_binary(data);
-      }
-    };
-  }
+	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,
+		);
+
+		return async (data) => {
+			await epsocket.send(data);
+		}
+	}
 }