@mercuryworkshop/epoxy-transport 1.0.2 → 2.0.0

package/package.json

@@ -1,17 +1,16 @@
 {
   "name": "@mercuryworkshop/epoxy-transport",
-  "version": "1.0.2",
+  "version": "2.0.0",
   "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.1.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,5 +1,7 @@
 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!;
@@ -8,9 +10,12 @@ export class EpoxyClient implements BareTransport {
   constructor({ wisp }) {
     this.wisp = wisp;
   }
-  async init() {
-    let { EpoxyClient } = await epoxy();
-    this.epxclient = await new EpoxyClient(this.wisp, navigator.userAgent, 10);
+  async init() {  
+    const { EpoxyClient, EpoxyClientOptions } = await epoxy();
+
+    let options = new EpoxyClientOptions();
+	  options.user_agent = navigator.userAgent;
+    this.epxclient = await new EpoxyClient(this.wisp, ROOTS, options);
 
     this.ready = true;
   }
@@ -26,14 +31,19 @@ export class EpoxyClient implements BareTransport {
   ): Promise<TransferrableResponse> {
     if (body instanceof Blob)
       body = await body.arrayBuffer();
-    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,
-    };
+    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(
@@ -57,7 +67,7 @@ export class EpoxyClient implements BareTransport {
     );
 
     return async (data) => {
-      (await epsocket).send(data);
-    };
+        await epsocket.send(data);
+    }
   }
 }