From 5be02151e68342617cd2104dfe702091b372df4b Mon Sep 17 00:00:00 2001
From: Toshit Chawda <r58playz@gmail.com>
Date: Wed, 28 Feb 2024 23:08:56 -0800
Subject: [PATCH 1/7] various small improvements

---
 README.md                      |  6 ++-
 client/Cargo.toml              |  2 +-
 client/build.sh                |  2 +-
 client/demo.js                 | 31 +++++++++----
 client/index.html              | 14 +++---
 client/src/lib.rs              | 83 +++++++++++++++-------------------
 client/src/tls_stream.rs       |  6 ++-
 client/src/utils.rs            | 70 ++++++++++++++++++++++------
 client/src/websocket.rs        | 12 +++--
 server/src/main.rs             | 23 ++--------
 simple-wisp-client/src/main.rs |  2 +-
 11 files changed, 146 insertions(+), 105 deletions(-)

diff --git a/README.md b/README.md
index f2d6674..0ccd0d8 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,12 @@ importScripts("epoxy-bundled.js");
 const { EpoxyClient } = await epoxy();
 let client = await new EpoxyClient("wss://localhost:4000", navigator.userAgent, 10);
 
+// You can view and change the user agent and redirect limit
+console.log(client.userAgent);
+client.redirect_limit = 5;
+
 let response = await client.fetch("https://httpbin.org/get");
-await response.text();
+console.log(await response.text());
 ```
 See `client/demo.js` for more examples.
 
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 4c336d0..1031bf6 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -12,7 +12,7 @@ http = "1.0.0"
 http-body-util = "0.1.0"
 hyper = { version = "1.1.0", features = ["client", "http1", "http2"] }
 pin-project-lite = "0.2.13"
-wasm-bindgen = "0.2"
+wasm-bindgen = { version = "0.2.91", features = ["enable-interning"] }
 wasm-bindgen-futures = "0.4.39"
 ws_stream_wasm = { version = "0.7.4", features = ["tokio_io"] }
 futures-util = "0.3.30"
diff --git a/client/build.sh b/client/build.sh
index 7f402f0..237915f 100755
--- a/client/build.sh
+++ b/client/build.sh
@@ -27,7 +27,7 @@ echo "module.exports = epoxy" >> epoxy-module-bundled.js
 AUTOGENERATED_TYPEDEFS=$(<"out/epoxy_client.d.ts")
 AUTOGENERATED_TYPEDEFS=${AUTOGENERATED_TYPEDEFS%%export class IntoUnderlyingByteSource*}
 echo "$AUTOGENERATED_TYPEDEFS" >"epoxy-module-bundled.d.ts"
-echo "} export default function epoxy(): Promise<typeof wasm_bindgen>;" >> "epoxy-module-bundled.d.ts"
+echo "} export default function epoxy(maybe_memory?: WebAssembly.Memory): Promise<typeof wasm_bindgen>;" >> "epoxy-module-bundled.d.ts"
 
 cp out/epoxy_client.js epoxy.js
 cp out/epoxy_client.d.ts epoxy.d.ts
diff --git a/client/demo.js b/client/demo.js
index 89b0bd5..694591c 100644
--- a/client/demo.js
+++ b/client/demo.js
@@ -1,6 +1,6 @@
 importScripts("epoxy-bundled.js");
 onmessage = async (msg) => {
-    console.debug("recieved:", msg);
+    console.debug("recieved demo:", msg);
     let [should_feature_test, should_multiparallel_test, should_parallel_test, should_multiperf_test, should_perf_test, should_ws_test, should_tls_test] = msg.data;
     console.log(
         "%cWASM is significantly slower with DevTools open!",
@@ -8,10 +8,15 @@ onmessage = async (msg) => {
     );
 
     const log = (str) => {
-        console.warn(str);
+        console.log(str);
         postMessage(str);
     }
 
+    const plog = (str) => {
+        console.log(str);
+        postMessage(JSON.stringify(str, null, 4));
+    }
+
     const { EpoxyClient } = await epoxy();
 
     const tconn0 = performance.now();
@@ -20,6 +25,11 @@ onmessage = async (msg) => {
     const tconn1 = performance.now();
     log(`conn establish took ${tconn1 - tconn0} ms or ${(tconn1 - tconn0) / 1000} s`);
 
+    // epoxy classes are inspectable
+    console.log(epoxy_client);
+    // you can change the user agent and redirect limit in JS
+    epoxy_client.redirectLimit = 15;
+
     const test_mux = async (url) => {
         const t0 = performance.now();
         await epoxy_client.fetch(url);
@@ -138,23 +148,24 @@ onmessage = async (msg) => {
         log(`avg mux - avg native (${num_tests}): ${total_mux - total_native} ms or ${(total_mux - total_native) / 1000} s`);
     } else if (should_ws_test) {
         let ws = await epoxy_client.connect_ws(
-            () => console.log("opened"),
-            () => console.log("closed"),
+            () => log("opened"),
+            () => log("closed"),
             err => console.error(err),
-            msg => console.log(msg),
+            msg => log(msg),
             "wss://echo.websocket.events",
             [],
             "localhost"
         );
         while (true) {
+            log("sending `data`");
             await ws.send("data");
-            await (new Promise((res, _) => setTimeout(res, 100)));
+            await (new Promise((res, _) => setTimeout(res, 50)));
         }
     } else if (should_tls_test) {
         let decoder = new TextDecoder();
         let ws = await epoxy_client.connect_tls(
-            () => console.log("opened"),
-            () => console.log("closed"),
+            () => log("opened"),
+            () => log("closed"),
             err => console.error(err),
             msg => { console.log(msg); console.log(decoder.decode(msg)) },
             "alicesworld.tech:443",
@@ -163,8 +174,8 @@ onmessage = async (msg) => {
         await ws.close();
     } else {
         let resp = await epoxy_client.fetch("https://httpbin.org/get");
-        console.warn(resp, Object.fromEntries(resp.headers));
-        console.warn(await resp.text());
+        console.log(resp, Object.fromEntries(resp.headers));
+        plog(await resp.json());
     }
     log("done");
 };
diff --git a/client/index.html b/client/index.html
index 718f470..b78d4d8 100644
--- a/client/index.html
+++ b/client/index.html
@@ -3,8 +3,9 @@
 <head>
     <title>epoxy</title>
     <style>
-    body { font-family: sans-serif }
-    #logs > * { font-family: monospace }
+    body { font-family: monospace; font-weight: bold; width: 100%; height: 100%; padding: 0; margin: 0 }
+    body > div { padding: 1em; }
+    #logs > * { margin: 0; font-weight: normal; }
     </style>
     <script>
         const params = (new URL(window.location.href)).searchParams;
@@ -17,8 +18,8 @@
         const should_tls_test = params.has("rawtls_test");
         const worker = new Worker("demo.js");
         worker.onmessage = (msg) => {
-            let el = document.createElement("div");
-            el.textContent = msg.data;
+            let el = document.createElement("pre");
+            el.innerHTML = msg.data;
             document.getElementById("logs").appendChild(el);
             window.scrollTo(0, document.body.scrollHeight);
         };
@@ -28,9 +29,10 @@
 
 <body>
     <div>
-        running... (wait for the browser alert if not running ws test)
+        <div>running... (note: WASM is significantly slower when DevTools is open)</div>
+        <div>logs:</div>
+        <div id="logs"></div>
     </div>
-    <div id="logs"></div>
 </body>
 
 </html>
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 799855b..8467355 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -6,7 +6,7 @@ mod websocket;
 mod wrappers;
 
 use tls_stream::EpxTlsStream;
-use utils::{ReplaceErr, UriExt};
+use utils::{Boolinator, ReplaceErr, UriExt};
 use websocket::EpxWebSocket;
 use wrappers::{IncomingBody, TlsWispService};
 
@@ -25,7 +25,7 @@ use tokio_util::{
     either::Either,
     io::{ReaderStream, StreamReader},
 };
-use wasm_bindgen::prelude::*;
+use wasm_bindgen::{intern, prelude::*};
 use web_sys::TextEncoder;
 use wisp_mux::{tokioio::TokioIo, tower::ServiceWrapper, ClientMux, MuxStreamIo, StreamType};
 use ws_stream_wasm::{WsMessage, WsMeta, WsStream};
@@ -52,13 +52,16 @@ fn init() {
     console_error_panic_hook::set_once();
 }
 
-#[wasm_bindgen]
+
+#[wasm_bindgen(inspectable)]
 pub struct EpoxyClient {
     rustls_config: Arc<rustls::ClientConfig>,
     mux: Arc<ClientMux<SplitSink<WsStream, WsMessage>>>,
     hyper_client: Client<TlsWispService<SplitSink<WsStream, WsMessage>>, HttpBody>,
-    useragent: String,
-    redirect_limit: usize,
+    #[wasm_bindgen(getter_with_clone)]
+    pub useragent: String,
+    #[wasm_bindgen(js_name = "redirectLimit")]
+    pub redirect_limit: usize,
 }
 
 #[wasm_bindgen]
@@ -81,10 +84,11 @@ impl EpoxyClient {
         }
 
         debug!("connecting to ws {:?}", ws_url);
-        let (_, ws) = WsMeta::connect(ws_url, vec!["wisp-v1"])
+        let (_, ws) = WsMeta::connect(ws_url, vec![])
             .await
             .replace_err("Failed to connect to websocket")?;
         debug!("connected!");
+
         let (wtx, wrx) = ws.split();
         let (mux, fut) = ClientMux::new(wrx, wtx).await?;
         let mux = Arc::new(mux);
@@ -128,19 +132,17 @@ impl EpoxyClient {
             .replace_err("Failed to create multiplexor channel")?
             .into_io()
             .into_asyncrw();
-        let cloned_uri = url_host.to_string().clone();
         let connector = TlsConnector::from(self.rustls_config.clone());
-        debug!("connecting channel");
         let io = connector
             .connect(
-                cloned_uri
+                url_host
+                    .to_string()
                     .try_into()
                     .replace_err("Failed to parse URL (rustls)")?,
                 channel,
             )
             .await
             .replace_err("Failed to perform TLS handshake")?;
-        debug!("connected channel");
         Ok(io)
     }
 
@@ -155,24 +157,18 @@ impl EpoxyClient {
             None
         };
 
-        debug!("sending req");
         let res = self
             .hyper_client
             .request(req)
             .await
             .replace_err("Failed to send request");
-        debug!("recieved res");
         match res {
             Ok(res) => {
                 if utils::is_redirect(res.status().as_u16())
                     && let Some(mut new_req) = new_req
                     && let Some(location) = res.headers().get("Location")
                     && let Ok(redirect_url) = new_req.uri().get_redirect(location)
-                    && let Some(redirect_url_authority) = redirect_url
-                        .clone()
-                        .authority()
-                        .replace_err("Redirect URL must have an authority")
-                        .ok()
+                    && let Some(redirect_url_authority) = redirect_url.clone().authority()
                 {
                     *new_req.uri_mut() = redirect_url;
                     new_req.headers_mut().insert(
@@ -246,19 +242,18 @@ impl EpoxyClient {
         let uri = url.parse::<uri::Uri>().replace_err("Failed to parse URL")?;
         let uri_scheme = uri.scheme().replace_err("URL must have a scheme")?;
         if *uri_scheme != uri::Scheme::HTTP && *uri_scheme != uri::Scheme::HTTPS {
-            return Err(jerr!("Scheme must be either `http` or `https`"));
+            return Err(jerri!("Scheme must be either `http` or `https`"));
         }
         let uri_host = uri.host().replace_err("URL must have a host")?;
 
-        let req_method_string: String = match Reflect::get(&options, &jval!("method")) {
+        let req_method_string: String = match Reflect::get(&options, &jvali!("method")) {
             Ok(val) => val.as_string().unwrap_or("GET".to_string()),
             Err(_) => "GET".to_string(),
         };
-        let req_method: http::Method =
-            http::Method::try_from(<String as AsRef<str>>::as_ref(&req_method_string))
-                .replace_err("Invalid http method")?;
+        let req_method: http::Method = http::Method::try_from(req_method_string.as_str())
+            .replace_err("Invalid http method")?;
 
-        let req_should_redirect = match Reflect::get(&options, &jval!("redirect")) {
+        let req_should_redirect = match Reflect::get(&options, &jvali!("redirect")) {
             Ok(val) => !matches!(
                 val.as_string().unwrap_or_default().as_str(),
                 "error" | "manual"
@@ -266,7 +261,7 @@ impl EpoxyClient {
             Err(_) => true,
         };
 
-        let body_jsvalue: Option<JsValue> = Reflect::get(&options, &jval!("body")).ok();
+        let body_jsvalue: Option<JsValue> = Reflect::get(&options, &jvali!("body")).ok();
         let body = if let Some(val) = body_jsvalue {
             if val.is_string() {
                 let str = val
@@ -288,7 +283,7 @@ impl EpoxyClient {
             None => Bytes::new(),
         };
 
-        let headers: Option<Vec<Vec<String>>> = Reflect::get(&options, &jval!("headers"))
+        let headers = Reflect::get(&options, &jvali!("headers"))
             .map(|val| {
                 if val.is_truthy() {
                     Some(utils::entries_of_object(&Object::from(val)))
@@ -301,12 +296,12 @@ impl EpoxyClient {
         let mut builder = Request::builder().uri(uri.clone()).method(req_method);
 
         let headers_map = builder.headers_mut().replace_err("Failed to get headers")?;
-        headers_map.insert("Accept-Encoding", HeaderValue::from_str("gzip, br")?);
-        headers_map.insert("Connection", HeaderValue::from_str("keep-alive")?);
+        headers_map.insert("Accept-Encoding", HeaderValue::from_static("gzip, br"));
+        headers_map.insert("Connection", HeaderValue::from_static("keep-alive"));
         headers_map.insert("User-Agent", HeaderValue::from_str(&self.useragent)?);
         headers_map.insert("Host", HeaderValue::from_str(uri_host)?);
         if body_bytes.is_empty() {
-            headers_map.insert("Content-Length", HeaderValue::from_str("0")?);
+            headers_map.insert("Content-Length", HeaderValue::from_static("0"));
         }
 
         if let Some(headers) = headers {
@@ -314,7 +309,7 @@ impl EpoxyClient {
                 headers_map.insert(
                     HeaderName::from_bytes(hdr[0].as_bytes())
                         .replace_err("Failed to get hdr name")?,
-                    HeaderValue::from_str(hdr[1].clone().as_ref())
+                    HeaderValue::from_bytes(hdr[1].as_bytes())
                         .replace_err("Failed to get hdr value")?,
                 );
             }
@@ -387,45 +382,41 @@ impl EpoxyClient {
 
         Object::define_property(
             &resp,
-            &jval!("url"),
+            &jvali!("url"),
             &utils::define_property_obj(jval!(resp_uri.to_string()), false)
                 .replace_err("Failed to make define_property object for url")?,
         );
 
         Object::define_property(
             &resp,
-            &jval!("redirected"),
+            &jvali!("redirected"),
             &utils::define_property_obj(jval!(req_redirected), false)
                 .replace_err("Failed to make define_property object for redirected")?,
         );
 
         let raw_headers = Object::new();
         for (k, v) in resp_headers_raw.iter() {
-            if let Ok(jv) = Reflect::get(&raw_headers, &jval!(k.to_string())) {
+            let k = jval!(k.to_string());
+            let v = jval!(v.to_str()?.to_string());
+            if let Ok(jv) = Reflect::get(&raw_headers, &k) {
                 if jv.is_array() {
                     let arr = Array::from(&jv);
 
-                    arr.push(&jval!(v.to_str()?.to_string()));
-                    let _ = Reflect::set(&raw_headers, &jval!(k.to_string()), &arr);
+                    arr.push(&v);
+                    Reflect::set(&raw_headers, &k, &arr).flatten("Failed to set rawHeader")?;
                 } else if jv.is_truthy() {
-                    let _ = Reflect::set(
-                        &raw_headers,
-                        &jval!(k.to_string()),
-                        &Array::of2(&jv, &jval!(v.to_str()?.to_string())),
-                    );
+                    Reflect::set(&raw_headers, &k, &Array::of2(&jv, &v))
+                        .flatten("Failed to set rawHeader")?;
                 } else {
-                    let _ = Reflect::set(
-                        &raw_headers,
-                        &jval!(k.to_string()),
-                        &jval!(v.to_str()?.to_string()),
-                    );
+                    Reflect::set(&raw_headers, &k, &v).flatten("Failed to set rawHeader")?;
                 }
             }
         }
         Object::define_property(
             &resp,
-            &jval!("rawHeaders"),
-            &utils::define_property_obj(jval!(&raw_headers), false).replace_err("wjat!!")?,
+            &jvali!("rawHeaders"),
+            &utils::define_property_obj(jval!(&raw_headers), false)
+                .replace_err("Failed to make define_property object for rawHeaders")?,
         );
 
         Ok(resp)
diff --git a/client/src/tls_stream.rs b/client/src/tls_stream.rs
index 97e61a7..e9b229e 100644
--- a/client/src/tls_stream.rs
+++ b/client/src/tls_stream.rs
@@ -4,10 +4,12 @@ use js_sys::Function;
 use tokio::io::{split, AsyncWriteExt, WriteHalf};
 use tokio_util::io::ReaderStream;
 
-#[wasm_bindgen]
+#[wasm_bindgen(inspectable)]
 pub struct EpxTlsStream {
     tx: WriteHalf<EpxIoTlsStream>,
     onerror: Function,
+    #[wasm_bindgen(readonly, getter_with_clone)]
+    pub url: String,
 }
 
 #[wasm_bindgen]
@@ -51,7 +53,7 @@ impl EpxTlsStream {
                 .call0(&Object::default())
                 .replace_err("Failed to call onopen")?;
 
-            Ok(Self { tx, onerror })
+            Ok(Self { tx, onerror, url: url.to_string() })
         }
         .await;
         if let Err(ret) = ret {
diff --git a/client/src/utils.rs b/client/src/utils.rs
index 0c71583..6f45f31 100644
--- a/client/src/utils.rs
+++ b/client/src/utils.rs
@@ -1,4 +1,4 @@
-use wasm_bindgen::prelude::*;
+use wasm_bindgen::{intern, prelude::*};
 
 use hyper::rt::Executor;
 use hyper::{header::HeaderValue, Uri};
@@ -15,7 +15,6 @@ extern "C" {
     pub fn console_error(s: &str);
 }
 
-#[allow(unused_macros)]
 macro_rules! debug {
     ($($t:tt)*) => (utils::console_debug(&format_args!($($t)*).to_string()))
 }
@@ -25,25 +24,34 @@ macro_rules! log {
     ($($t:tt)*) => (utils::console_log(&format_args!($($t)*).to_string()))
 }
 
-#[allow(unused_macros)]
 macro_rules! error {
     ($($t:tt)*) => (utils::console_error(&format_args!($($t)*).to_string()))
 }
 
-#[allow(unused_macros)]
 macro_rules! jerr {
     ($expr:expr) => {
         JsError::new($expr)
     };
 }
 
-#[allow(unused_macros)]
 macro_rules! jval {
     ($expr:expr) => {
         JsValue::from($expr)
     };
 }
 
+macro_rules! jerri {
+    ($expr:expr) => {
+        JsError::new(intern($expr))
+    };
+}
+
+macro_rules! jvali {
+    ($expr:expr) => {
+        JsValue::from(intern($expr))
+    };
+}
+
 pub trait ReplaceErr {
     type Ok;
 
@@ -55,11 +63,11 @@ impl<T, E: std::fmt::Debug> ReplaceErr for Result<T, E> {
     type Ok = T;
 
     fn replace_err(self, err: &str) -> Result<<Self as ReplaceErr>::Ok, JsError> {
-        self.map_err(|oe| jerr!(&format!("{}, original error: {:?}", err, oe)))
+        self.map_err(|_| jerri!(err))
     }
 
     fn replace_err_jv(self, err: &str) -> Result<<Self as ReplaceErr>::Ok, JsValue> {
-        self.map_err(|oe| jval!(&format!("{}, original error: {:?}", err, oe)))
+        self.map_err(|_| jvali!(err))
     }
 }
 
@@ -67,17 +75,52 @@ impl<T> ReplaceErr for Option<T> {
     type Ok = T;
 
     fn replace_err(self, err: &str) -> Result<<Self as ReplaceErr>::Ok, JsError> {
-        self.ok_or_else(|| jerr!(err))
+        self.ok_or_else(|| jerri!(err))
     }
 
     fn replace_err_jv(self, err: &str) -> Result<<Self as ReplaceErr>::Ok, JsValue> {
-        self.ok_or_else(|| jval!(err))
+        self.ok_or_else(|| jvali!(err))
+    }
+}
+
+// the... BOOLINATOR!
+impl ReplaceErr for bool {
+    type Ok = ();
+
+    fn replace_err(self, err: &str) -> Result<(), JsError> {
+        if !self {
+            Err(jerri!(err))
+        } else {
+            Ok(())
+        }
+    }
+
+    fn replace_err_jv(self, err: &str) -> Result<(), JsValue> {
+        if !self {
+            Err(jvali!(err))
+        } else {
+            Ok(())
+        }
+    }
+}
+
+// the... BOOLINATOR!
+pub trait Boolinator {
+    fn flatten(self, err: &str) -> Result<(), JsError>;
+}
+
+impl Boolinator for Result<bool, JsValue> {
+    fn flatten(self, err: &str) -> Result<(), JsError> {
+        if !self.replace_err(err)? {
+            Err(jerri!(err))
+        } else {
+            Ok(())
+        }
     }
 }
 
 pub trait UriExt {
     fn get_redirect(&self, location: &HeaderValue) -> Result<Uri, JsError>;
-    fn is_same_host(&self, other: &Uri) -> bool;
 }
 
 impl UriExt for Uri {
@@ -93,9 +136,6 @@ impl UriExt for Uri {
 
         Ok(Uri::from_parts(new_parts)?)
     }
-    fn is_same_host(&self, other: &Uri) -> bool {
-        self.host() == other.host() && self.port() == other.port()
-    }
 }
 
 #[derive(Clone)]
@@ -129,8 +169,8 @@ pub fn entries_of_object(obj: &Object) -> Vec<Vec<String>> {
 
 pub fn define_property_obj(value: JsValue, writable: bool) -> Result<Object, JsValue> {
     let entries: Array = [
-        Array::of2(&jval!("value"), &jval!(value)),
-        Array::of2(&jval!("writable"), &jval!(writable)),
+        Array::of2(&jval!(intern("value")), &value),
+        Array::of2(&jval!(intern("writable")), &jval!(writable)),
     ]
     .iter()
     .collect::<Array>();
diff --git a/client/src/websocket.rs b/client/src/websocket.rs
index d186b17..3c1d33f 100644
--- a/client/src/websocket.rs
+++ b/client/src/websocket.rs
@@ -15,10 +15,16 @@ use js_sys::Function;
 use std::str::from_utf8;
 use tokio::io::WriteHalf;
 
-#[wasm_bindgen]
+#[wasm_bindgen(inspectable)]
 pub struct EpxWebSocket {
     tx: Arc<Mutex<WebSocketWrite<WriteHalf<TokioIo<Upgraded>>>>>,
     onerror: Function,
+    #[wasm_bindgen(readonly, getter_with_clone)]
+    pub url: String,
+    #[wasm_bindgen(readonly, getter_with_clone)]
+    pub protocols: Vec<String>,
+    #[wasm_bindgen(readonly, getter_with_clone)]
+    pub origin: String,
 }
 
 #[wasm_bindgen]
@@ -53,7 +59,7 @@ impl EpxWebSocket {
                 .method("GET")
                 .uri(url.clone())
                 .header("Host", host)
-                .header("Origin", origin)
+                .header("Origin", origin.clone())
                 .header(UPGRADE, "websocket")
                 .header(CONNECTION, "upgrade")
                 .header("Sec-WebSocket-Key", key)
@@ -109,7 +115,7 @@ impl EpxWebSocket {
                 .call0(&Object::default())
                 .replace_err("Failed to call onopen")?;
 
-            Ok(Self { tx, onerror })
+            Ok(Self { tx, onerror, origin, protocols, url: url.to_string() })
         }
         .await;
         if let Err(ret) = ret {
diff --git a/server/src/main.rs b/server/src/main.rs
index 31dc7dd..f3fd87b 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -9,8 +9,7 @@ use fastwebsockets::{
 };
 use futures_util::{SinkExt, StreamExt, TryFutureExt};
 use hyper::{
-    body::Incoming, header::HeaderValue, server::conn::http1, service::service_fn, Request,
-    Response, StatusCode,
+    body::Incoming, server::conn::http1, service::service_fn, Request, Response, StatusCode,
 };
 use hyper_util::rt::TokioIo;
 use tokio::net::{TcpListener, TcpStream, UdpSocket};
@@ -88,24 +87,10 @@ async fn accept_http(
     if upgrade::is_upgrade_request(&req)
         && let Some(uri) = uri.strip_prefix(&prefix)
     {
-        let (mut res, fut) = upgrade::upgrade(&mut req)?;
+        let (res, fut) = upgrade::upgrade(&mut req)?;
 
-        if let Some(protocols) = req.headers().get("Sec-Websocket-Protocol").and_then(|x| {
-            Some(
-                x.to_str()
-                    .ok()?
-                    .split(',')
-                    .map(|x| x.trim())
-                    .collect::<Vec<&str>>(),
-            )
-        }) && protocols.contains(&"wisp-v1")
-            && (uri.is_empty() || uri == "/")
-        {
+        if uri.is_empty() || uri == "/" {
             tokio::spawn(async move { accept_ws(fut, addr.clone()).await });
-            res.headers_mut().insert(
-                "Sec-Websocket-Protocol",
-                HeaderValue::from_str("wisp-v1").unwrap(),
-            );
         } else {
             let uri = uri.strip_prefix('/').unwrap_or(uri).to_string();
             tokio::spawn(async move { accept_wsproxy(fut, uri, addr.clone()).await });
@@ -119,7 +104,7 @@ async fn accept_http(
         println!("random request to path {:?}", uri);
         Ok(Response::builder()
             .status(StatusCode::OK)
-            .body(HttpBody::new(":3".to_string().into()))
+            .body(HttpBody::new(":3".into()))
             .unwrap())
     }
 }
diff --git a/simple-wisp-client/src/main.rs b/simple-wisp-client/src/main.rs
index 2b3ca0e..7e5cdff 100644
--- a/simple-wisp-client/src/main.rs
+++ b/simple-wisp-client/src/main.rs
@@ -74,7 +74,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     };
     let req = Request::builder()
         .method("GET")
-        .uri(format!("wss://{}:{}/", &addr, addr_port))
+        .uri("/")
         .header("Host", &addr)
         .header(UPGRADE, "websocket")
         .header(CONNECTION, "upgrade")

From 06d3225721a5023099f16b9ff5a3cc2ec37dba90 Mon Sep 17 00:00:00 2001
From: Toshit Chawda <r58playz@gmail.com>
Date: Fri, 1 Mar 2024 22:17:27 -0800
Subject: [PATCH 2/7] properly use intern

---
 client/src/lib.rs   | 28 ++++++++++++++++++++--------
 client/src/utils.rs | 36 ++++++++++--------------------------
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index 8467355..1693e67 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -50,6 +50,18 @@ type EpxIoStream = Either<EpxIoTlsStream, EpxIoUnencryptedStream>;
 #[wasm_bindgen(start)]
 fn init() {
     console_error_panic_hook::set_once();
+    // utils.rs
+    intern("value");
+    intern("writable");
+
+    // main.rs
+    intern("method");
+    intern("redirect");
+    intern("body");
+    intern("headers");
+    intern("url");
+    intern("redirected");
+    intern("rawHeaders");
 }
 
 
@@ -242,18 +254,18 @@ impl EpoxyClient {
         let uri = url.parse::<uri::Uri>().replace_err("Failed to parse URL")?;
         let uri_scheme = uri.scheme().replace_err("URL must have a scheme")?;
         if *uri_scheme != uri::Scheme::HTTP && *uri_scheme != uri::Scheme::HTTPS {
-            return Err(jerri!("Scheme must be either `http` or `https`"));
+            return Err(jerr!("Scheme must be either `http` or `https`"));
         }
         let uri_host = uri.host().replace_err("URL must have a host")?;
 
-        let req_method_string: String = match Reflect::get(&options, &jvali!("method")) {
+        let req_method_string: String = match Reflect::get(&options, &jval!("method")) {
             Ok(val) => val.as_string().unwrap_or("GET".to_string()),
             Err(_) => "GET".to_string(),
         };
         let req_method: http::Method = http::Method::try_from(req_method_string.as_str())
             .replace_err("Invalid http method")?;
 
-        let req_should_redirect = match Reflect::get(&options, &jvali!("redirect")) {
+        let req_should_redirect = match Reflect::get(&options, &jval!("redirect")) {
             Ok(val) => !matches!(
                 val.as_string().unwrap_or_default().as_str(),
                 "error" | "manual"
@@ -261,7 +273,7 @@ impl EpoxyClient {
             Err(_) => true,
         };
 
-        let body_jsvalue: Option<JsValue> = Reflect::get(&options, &jvali!("body")).ok();
+        let body_jsvalue: Option<JsValue> = Reflect::get(&options, &jval!("body")).ok();
         let body = if let Some(val) = body_jsvalue {
             if val.is_string() {
                 let str = val
@@ -283,7 +295,7 @@ impl EpoxyClient {
             None => Bytes::new(),
         };
 
-        let headers = Reflect::get(&options, &jvali!("headers"))
+        let headers = Reflect::get(&options, &jval!("headers"))
             .map(|val| {
                 if val.is_truthy() {
                     Some(utils::entries_of_object(&Object::from(val)))
@@ -382,14 +394,14 @@ impl EpoxyClient {
 
         Object::define_property(
             &resp,
-            &jvali!("url"),
+            &jval!("url"),
             &utils::define_property_obj(jval!(resp_uri.to_string()), false)
                 .replace_err("Failed to make define_property object for url")?,
         );
 
         Object::define_property(
             &resp,
-            &jvali!("redirected"),
+            &jval!("redirected"),
             &utils::define_property_obj(jval!(req_redirected), false)
                 .replace_err("Failed to make define_property object for redirected")?,
         );
@@ -414,7 +426,7 @@ impl EpoxyClient {
         }
         Object::define_property(
             &resp,
-            &jvali!("rawHeaders"),
+            &jval!("rawHeaders"),
             &utils::define_property_obj(jval!(&raw_headers), false)
                 .replace_err("Failed to make define_property object for rawHeaders")?,
         );
diff --git a/client/src/utils.rs b/client/src/utils.rs
index 6f45f31..415a8d6 100644
--- a/client/src/utils.rs
+++ b/client/src/utils.rs
@@ -1,4 +1,4 @@
-use wasm_bindgen::{intern, prelude::*};
+use wasm_bindgen::prelude::*;
 
 use hyper::rt::Executor;
 use hyper::{header::HeaderValue, Uri};
@@ -40,18 +40,6 @@ macro_rules! jval {
     };
 }
 
-macro_rules! jerri {
-    ($expr:expr) => {
-        JsError::new(intern($expr))
-    };
-}
-
-macro_rules! jvali {
-    ($expr:expr) => {
-        JsValue::from(intern($expr))
-    };
-}
-
 pub trait ReplaceErr {
     type Ok;
 
@@ -63,11 +51,11 @@ impl<T, E: std::fmt::Debug> ReplaceErr for Result<T, E> {
     type Ok = T;
 
     fn replace_err(self, err: &str) -> Result<<Self as ReplaceErr>::Ok, JsError> {
-        self.map_err(|_| jerri!(err))
+        self.map_err(|_| jerr!(err))
     }
 
     fn replace_err_jv(self, err: &str) -> Result<<Self as ReplaceErr>::Ok, JsValue> {
-        self.map_err(|_| jvali!(err))
+        self.map_err(|_| jval!(err))
     }
 }
 
@@ -75,11 +63,11 @@ impl<T> ReplaceErr for Option<T> {
     type Ok = T;
 
     fn replace_err(self, err: &str) -> Result<<Self as ReplaceErr>::Ok, JsError> {
-        self.ok_or_else(|| jerri!(err))
+        self.ok_or_else(|| jerr!(err))
     }
 
     fn replace_err_jv(self, err: &str) -> Result<<Self as ReplaceErr>::Ok, JsValue> {
-        self.ok_or_else(|| jvali!(err))
+        self.ok_or_else(|| jval!(err))
     }
 }
 
@@ -89,7 +77,7 @@ impl ReplaceErr for bool {
 
     fn replace_err(self, err: &str) -> Result<(), JsError> {
         if !self {
-            Err(jerri!(err))
+            Err(jerr!(err))
         } else {
             Ok(())
         }
@@ -97,7 +85,7 @@ impl ReplaceErr for bool {
 
     fn replace_err_jv(self, err: &str) -> Result<(), JsValue> {
         if !self {
-            Err(jvali!(err))
+            Err(jval!(err))
         } else {
             Ok(())
         }
@@ -111,11 +99,7 @@ pub trait Boolinator {
 
 impl Boolinator for Result<bool, JsValue> {
     fn flatten(self, err: &str) -> Result<(), JsError> {
-        if !self.replace_err(err)? {
-            Err(jerri!(err))
-        } else {
-            Ok(())
-        }
+        self.replace_err(err)?.replace_err(err)
     }
 }
 
@@ -169,8 +153,8 @@ pub fn entries_of_object(obj: &Object) -> Vec<Vec<String>> {
 
 pub fn define_property_obj(value: JsValue, writable: bool) -> Result<Object, JsValue> {
     let entries: Array = [
-        Array::of2(&jval!(intern("value")), &value),
-        Array::of2(&jval!(intern("writable")), &jval!(writable)),
+        Array::of2(&jval!("value"), &value),
+        Array::of2(&jval!("writable"), &jval!(writable)),
     ]
     .iter()
     .collect::<Array>();

From 1bf1a809bdc17f0d56ab6a88a0fdedef2dacd498 Mon Sep 17 00:00:00 2001
From: Toshit Chawda <r58playz@gmail.com>
Date: Sat, 2 Mar 2024 16:03:18 -0800
Subject: [PATCH 3/7] remove ws_stream_wasm, wisp_mux 1.1.2

---
 Cargo.lock                 |  40 +-------
 client/Cargo.toml          |   7 +-
 client/src/lib.rs          |  13 +--
 client/src/wrappers.rs     | 183 ++++++++++++++++++++++++++++++++++++-
 wisp/Cargo.toml            |   7 +-
 wisp/src/lib.rs            |   6 +-
 wisp/src/ws_stream_wasm.rs |  60 ------------
 7 files changed, 202 insertions(+), 114 deletions(-)
 delete mode 100644 wisp/src/ws_stream_wasm.rs

diff --git a/Cargo.lock b/Cargo.lock
index ac0baec..02b3cd1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -101,7 +101,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c"
 dependencies = [
  "futures",
- "pharos",
  "rustc_version",
  "tokio",
 ]
@@ -365,6 +364,7 @@ dependencies = [
  "base64",
  "bytes",
  "console_error_panic_hook",
+ "event-listener",
  "fastwebsockets",
  "futures-util",
  "getrandom",
@@ -375,6 +375,7 @@ dependencies = [
  "js-sys",
  "pin-project-lite",
  "ring",
+ "send_wrapper",
  "tokio",
  "tokio-rustls",
  "tokio-util",
@@ -385,7 +386,6 @@ dependencies = [
  "web-sys",
  "webpki-roots",
  "wisp-mux",
- "ws_stream_wasm",
 ]
 
 [[package]]
@@ -425,9 +425,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "5.0.0"
+version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b72557800024fabbaa2449dd4bf24e37b93702d457a4d4f2b0dd1f0f039f20c1"
+checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -959,16 +959,6 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "pharos"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414"
-dependencies = [
- "futures",
- "rustc_version",
-]
-
 [[package]]
 name = "pin-project"
 version = "1.1.4"
@@ -1860,7 +1850,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
 [[package]]
 name = "wisp-mux"
-version = "1.1.1"
+version = "1.1.2"
 dependencies = [
  "async_io_stream",
  "bytes",
@@ -1873,26 +1863,6 @@ dependencies = [
  "pin-project-lite",
  "tokio",
  "tower-service",
- "ws_stream_wasm",
-]
-
-[[package]]
-name = "ws_stream_wasm"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5"
-dependencies = [
- "async_io_stream",
- "futures",
- "js-sys",
- "log",
- "pharos",
- "rustc_version",
- "send_wrapper",
- "thiserror",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
 ]
 
 [[package]]
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 1031bf6..a31ed47 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -14,24 +14,25 @@ hyper = { version = "1.1.0", features = ["client", "http1", "http2"] }
 pin-project-lite = "0.2.13"
 wasm-bindgen = { version = "0.2.91", features = ["enable-interning"] }
 wasm-bindgen-futures = "0.4.39"
-ws_stream_wasm = { version = "0.7.4", features = ["tokio_io"] }
 futures-util = "0.3.30"
 js-sys = "0.3.66"
 webpki-roots = "0.26.0"
 tokio-rustls = "0.25.0"
-web-sys = { version = "0.3.66", features = ["TextEncoder", "Response", "ResponseInit"] }
+web-sys = { version = "0.3.66", features = ["TextEncoder", "Response", "ResponseInit", "WebSocket", "BinaryType", "MessageEvent"] }
 wasm-streams = "0.4.0"
 tokio-util = { version = "0.7.10", features = ["io"] }
 async-compression = { version = "0.4.5", features = ["tokio", "gzip", "brotli"] }
 fastwebsockets = { version = "0.6.0", features = ["unstable-split"] }
 base64 = "0.21.7"
-wisp-mux = { path = "../wisp", features = ["ws_stream_wasm", "tokio_io", "hyper_tower"] }
+wisp-mux = { path = "../wisp", features = ["tokio_io", "hyper_tower"] }
 async_io_stream = { version = "0.3.3", features = ["tokio_io"] }
 getrandom = { version = "0.2.12", features = ["js"] }
 hyper-util-wasm = { version = "0.1.3", features = ["client", "client-legacy", "http1", "http2"] }
 tokio = { version = "1.36.0", default-features = false }
 tower-service = "0.3.2"
 console_error_panic_hook = "0.1.7"
+send_wrapper = "0.6.0"
+event-listener = "5.2.0"
 
 [dependencies.ring]
 features = ["wasm32_unknown_unknown_js"]
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 1693e67..862fbf5 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -8,14 +8,14 @@ mod wrappers;
 use tls_stream::EpxTlsStream;
 use utils::{Boolinator, ReplaceErr, UriExt};
 use websocket::EpxWebSocket;
-use wrappers::{IncomingBody, TlsWispService};
+use wrappers::{IncomingBody, TlsWispService, WebSocketWrapper};
 
 use std::sync::Arc;
 
 use async_compression::tokio::bufread as async_comp;
 use async_io_stream::IoStream;
 use bytes::Bytes;
-use futures_util::{stream::SplitSink, StreamExt};
+use futures_util::StreamExt;
 use http::{uri, HeaderName, HeaderValue, Request, Response};
 use hyper::{body::Incoming, Uri};
 use hyper_util_wasm::client::legacy::Client;
@@ -28,7 +28,6 @@ use tokio_util::{
 use wasm_bindgen::{intern, prelude::*};
 use web_sys::TextEncoder;
 use wisp_mux::{tokioio::TokioIo, tower::ServiceWrapper, ClientMux, MuxStreamIo, StreamType};
-use ws_stream_wasm::{WsMessage, WsMeta, WsStream};
 
 type HttpBody = http_body_util::Full<Bytes>;
 
@@ -64,12 +63,11 @@ fn init() {
     intern("rawHeaders");
 }
 
-
 #[wasm_bindgen(inspectable)]
 pub struct EpoxyClient {
     rustls_config: Arc<rustls::ClientConfig>,
-    mux: Arc<ClientMux<SplitSink<WsStream, WsMessage>>>,
-    hyper_client: Client<TlsWispService<SplitSink<WsStream, WsMessage>>, HttpBody>,
+    mux: Arc<ClientMux<WebSocketWrapper>>,
+    hyper_client: Client<TlsWispService<WebSocketWrapper>, HttpBody>,
     #[wasm_bindgen(getter_with_clone)]
     pub useragent: String,
     #[wasm_bindgen(js_name = "redirectLimit")]
@@ -96,12 +94,11 @@ impl EpoxyClient {
         }
 
         debug!("connecting to ws {:?}", ws_url);
-        let (_, ws) = WsMeta::connect(ws_url, vec![])
+        let (wtx, wrx) = WebSocketWrapper::connect(ws_url, vec![])
             .await
             .replace_err("Failed to connect to websocket")?;
         debug!("connected!");
 
-        let (wtx, wrx) = ws.split();
         let (mux, fut) = ClientMux::new(wrx, wtx).await?;
         let mux = Arc::new(mux);
 
diff --git a/client/src/wrappers.rs b/client/src/wrappers.rs
index 5df0814..8513108 100644
--- a/client/src/wrappers.rs
+++ b/client/src/wrappers.rs
@@ -4,11 +4,21 @@ use std::{
     task::{Context, Poll},
 };
 
+use event_listener::Event;
 use futures_util::Stream;
 use hyper::body::Body;
+use js_sys::ArrayBuffer;
 use pin_project_lite::pin_project;
+use send_wrapper::SendWrapper;
 use std::future::Future;
-use wisp_mux::{tokioio::TokioIo, tower::ServiceWrapper, WispError};
+use tokio::sync::mpsc;
+use web_sys::{BinaryType, MessageEvent, WebSocket};
+use wisp_mux::{
+    tokioio::TokioIo,
+    tower::ServiceWrapper,
+    ws::{Frame, LockedWebSocketWrite, WebSocketRead, WebSocketWrite},
+    WispError,
+};
 
 pin_project! {
     pub struct IncomingBody {
@@ -51,7 +61,6 @@ where
     pub rustls_config: Arc<rustls::ClientConfig>,
 }
 
-
 impl<W: wisp_mux::ws::WebSocketWrite + Send + 'static> tower_service::Service<hyper::Uri>
     for TlsWispService<W>
 {
@@ -107,3 +116,173 @@ impl<W: wisp_mux::ws::WebSocketWrite + Send + 'static> Clone for TlsWispService<
         }
     }
 }
+
+#[derive(Debug)]
+pub enum WebSocketError {
+    Closed,
+    Unknown,
+    SendFailed,
+}
+
+impl std::fmt::Display for WebSocketError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
+        use WebSocketError::*;
+        match self {
+            Closed => write!(f, "Websocket closed"),
+            Unknown => write!(f, "Unknown error"),
+            SendFailed => write!(f, "Send failed"),
+        }
+    }
+}
+
+impl std::error::Error for WebSocketError {}
+
+impl From<WebSocketError> for WispError {
+    fn from(err: WebSocketError) -> Self {
+        Self::WsImplError(Box::new(err))
+    }
+}
+
+pub enum WebSocketMessage {
+    Close,
+    Error,
+    Message(Vec<u8>),
+}
+
+pub struct WebSocketWrapper {
+    inner: SendWrapper<WebSocket>,
+
+    // used to retain the closures
+    #[allow(dead_code)]
+    onopen: SendWrapper<Closure<dyn Fn()>>,
+    #[allow(dead_code)]
+    onclose: SendWrapper<Closure<dyn Fn()>>,
+    #[allow(dead_code)]
+    onerror: SendWrapper<Closure<dyn Fn()>>,
+    #[allow(dead_code)]
+    onmessage: SendWrapper<Closure<dyn Fn(MessageEvent)>>,
+}
+
+pub struct WebSocketReader {
+    read_rx: mpsc::UnboundedReceiver<WebSocketMessage>,
+}
+
+impl WebSocketRead for WebSocketReader {
+    async fn wisp_read_frame(
+        &mut self,
+        _: &LockedWebSocketWrite<impl WebSocketWrite>,
+    ) -> Result<Frame, WispError> {
+        use WebSocketMessage::*;
+        match self
+            .read_rx
+            .recv()
+            .await
+            .ok_or(WispError::WsImplError(Box::new(WebSocketError::Closed)))?
+        {
+            Message(bin) => Ok(Frame::binary(bin.into())),
+            Error => Err(WebSocketError::Unknown.into()),
+            Close => Err(WebSocketError::Closed.into()),
+        }
+    }
+}
+
+impl WebSocketWrapper {
+    pub async fn connect(
+        url: String,
+        protocols: Vec<String>,
+    ) -> Result<(Self, WebSocketReader), JsValue> {
+        let ws = if protocols.is_empty() {
+            WebSocket::new(&url)
+        } else {
+            WebSocket::new_with_str_sequence(
+                &url,
+                &protocols
+                    .iter()
+                    .fold(Array::new(), |acc, x| {
+                        acc.push(&jval!(x));
+                        acc
+                    })
+                    .into(),
+            )
+        }
+        .replace_err("Failed to make websocket")?;
+
+        ws.set_binary_type(BinaryType::Arraybuffer);
+
+        let (read_tx, read_rx) = mpsc::unbounded_channel();
+
+        let open_event = Arc::new(Event::new());
+
+        let open_event_tx = open_event.clone();
+        let onopen = Closure::wrap(
+            Box::new(move || while open_event_tx.notify(usize::MAX) == 0 {}) as Box<dyn Fn()>,
+        );
+
+        let onmessage_tx = read_tx.clone();
+        let onmessage = Closure::wrap(Box::new(move |evt: MessageEvent| {
+            if let Ok(arr) = evt.data().dyn_into::<ArrayBuffer>() {
+                let _ =
+                    onmessage_tx.send(WebSocketMessage::Message(Uint8Array::new(&arr).to_vec()));
+            }
+        }) as Box<dyn Fn(MessageEvent)>);
+
+        ws.set_onopen(Some(onopen.as_ref().unchecked_ref()));
+        ws.set_onmessage(Some(onmessage.as_ref().unchecked_ref()));
+
+        let onclose_tx = read_tx.clone();
+        let onclose = Closure::wrap(Box::new(move || {
+            let _ = onclose_tx.send(WebSocketMessage::Close);
+        }) as Box<dyn Fn()>);
+
+        let onerror_tx = read_tx.clone();
+        let onerror = Closure::wrap(Box::new(move || {
+            let _ = onerror_tx.send(WebSocketMessage::Error);
+        }) as Box<dyn Fn()>);
+
+        ws.set_onclose(Some(onclose.as_ref().unchecked_ref()));
+        ws.set_onerror(Some(onerror.as_ref().unchecked_ref()));
+
+        open_event.listen().await;
+
+        Ok((
+            Self {
+                inner: SendWrapper::new(ws),
+                onopen: SendWrapper::new(onopen),
+                onclose: SendWrapper::new(onclose),
+                onerror: SendWrapper::new(onerror),
+                onmessage: SendWrapper::new(onmessage),
+            },
+            WebSocketReader { read_rx },
+        ))
+    }
+}
+
+impl WebSocketWrite for WebSocketWrapper {
+    async fn wisp_write_frame(&mut self, frame: Frame) -> Result<(), WispError> {
+        use wisp_mux::ws::OpCode::*;
+        match frame.opcode {
+            Binary => self
+                .inner
+                .send_with_u8_array(&frame.payload)
+                .map_err(|_| WebSocketError::SendFailed.into()),
+            Text => self
+                .inner
+                .send_with_u8_array(&frame.payload)
+                .map_err(|_| WebSocketError::SendFailed.into()),
+            Close => {
+                let _ = self.inner.close();
+                Ok(())
+            }
+            _ => Err(WispError::WsImplNotSupported),
+        }
+    }
+}
+
+impl Drop for WebSocketWrapper {
+    fn drop(&mut self) {
+        self.inner.set_onopen(None);
+        self.inner.set_onclose(None);
+        self.inner.set_onerror(None);
+        self.inner.set_onmessage(None);
+    }
+}
diff --git a/wisp/Cargo.toml b/wisp/Cargo.toml
index 6d426d2..774a871 100644
--- a/wisp/Cargo.toml
+++ b/wisp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wisp-mux"
-version = "1.1.1"
+version = "1.1.2"
 license = "AGPL-3.0-only"
 description = "A library for easily creating Wisp servers and clients."
 homepage = "https://github.com/MercuryWorkshop/epoxy-tls/tree/multiplexed/wisp"
@@ -20,13 +20,12 @@ hyper-util-wasm = { version = "0.1.3", features = ["client", "client-legacy"], o
 pin-project-lite = "0.2.13"
 tokio = { version = "1.35.1", optional = true, default-features = false }
 tower-service = { version = "0.3.2", optional = true }
-ws_stream_wasm = { version = "0.7.4", optional = true }
 
 [features]
 fastwebsockets = ["dep:fastwebsockets", "dep:tokio"]
-ws_stream_wasm = ["dep:ws_stream_wasm"]
 tokio_io = ["async_io_stream/tokio_io"]
 hyper_tower = ["dep:tower-service", "dep:hyper", "dep:tokio", "dep:hyper-util-wasm"]
 
 [package.metadata.docs.rs]
-features = ["hyper_tower"]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
diff --git a/wisp/src/lib.rs b/wisp/src/lib.rs
index 93cc870..49dc45d 100644
--- a/wisp/src/lib.rs
+++ b/wisp/src/lib.rs
@@ -1,21 +1,23 @@
 #![deny(missing_docs)]
 #![feature(impl_trait_in_assoc_type)]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 //! A library for easily creating [Wisp] clients and servers.
 //!
 //! [Wisp]: https://github.com/MercuryWorkshop/wisp-protocol
 
 #[cfg(feature = "fastwebsockets")]
+#[cfg_attr(docsrs, doc(cfg(feature = "fastwebsockets")))]
 mod fastwebsockets;
 mod packet;
 mod sink_unfold;
 mod stream;
 #[cfg(feature = "hyper_tower")]
+#[cfg_attr(docsrs, doc(cfg(feature = "hyper_tower")))]
 pub mod tokioio;
 #[cfg(feature = "hyper_tower")]
+#[cfg_attr(docsrs, doc(cfg(feature = "hyper_tower")))]
 pub mod tower;
 pub mod ws;
-#[cfg(feature = "ws_stream_wasm")]
-mod ws_stream_wasm;
 
 pub use crate::packet::*;
 pub use crate::stream::*;
diff --git a/wisp/src/ws_stream_wasm.rs b/wisp/src/ws_stream_wasm.rs
deleted file mode 100644
index 410b537..0000000
--- a/wisp/src/ws_stream_wasm.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use futures::{stream::{SplitStream, SplitSink}, SinkExt, StreamExt};
-use ws_stream_wasm::{WsErr, WsMessage, WsStream};
-
-impl From<WsMessage> for crate::ws::Frame {
-    fn from(msg: WsMessage) -> Self {
-        use crate::ws::OpCode;
-        match msg {
-            WsMessage::Text(str) => Self {
-                finished: true,
-                opcode: OpCode::Text,
-                payload: str.into(),
-            },
-            WsMessage::Binary(bin) => Self {
-                finished: true,
-                opcode: OpCode::Binary,
-                payload: bin.into(),
-            },
-        }
-    }
-}
-
-impl TryFrom<crate::ws::Frame> for WsMessage {
-    type Error = crate::WispError;
-    fn try_from(msg: crate::ws::Frame) -> Result<Self, Self::Error> {
-        use crate::ws::OpCode;
-        match msg.opcode {
-            OpCode::Text => Ok(Self::Text(std::str::from_utf8(&msg.payload)?.to_string())),
-            OpCode::Binary => Ok(Self::Binary(msg.payload.to_vec())),
-            _ => Err(Self::Error::WsImplNotSupported),
-        }
-    }
-}
-
-impl From<WsErr> for crate::WispError {
-    fn from(err: WsErr) -> Self {
-        Self::WsImplError(Box::new(err))
-    }
-}
-
-impl crate::ws::WebSocketRead for SplitStream<WsStream> {
-    async fn wisp_read_frame(
-        &mut self,
-        _: &crate::ws::LockedWebSocketWrite<impl crate::ws::WebSocketWrite>,
-    ) -> Result<crate::ws::Frame, crate::WispError> {
-        Ok(self
-            .next()
-            .await
-            .ok_or(crate::WispError::WsImplSocketClosed)?
-            .into())
-    }
-}
-
-impl crate::ws::WebSocketWrite for SplitSink<WsStream, WsMessage> {
-    async fn wisp_write_frame(&mut self, frame: crate::ws::Frame) -> Result<(), crate::WispError> {
-        self
-            .send(frame.try_into()?)
-            .await
-            .map_err(|e| e.into())
-    }
-}

From b36773e5d19f9f8eca80dcbf6faaa5175f822c17 Mon Sep 17 00:00:00 2001
From: Toshit Chawda <r58playz@gmail.com>
Date: Sat, 2 Mar 2024 16:51:16 -0800
Subject: [PATCH 4/7] remove tls from epoxy-server

---
 Cargo.lock         |  1 -
 client/demo.js     |  2 +-
 server/Cargo.toml  |  1 -
 server/src/main.rs | 38 +++++++++-----------------------------
 4 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 02b3cd1..a0ac789 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -402,7 +402,6 @@ dependencies = [
  "hyper",
  "hyper-util",
  "tokio",
- "tokio-native-tls",
  "tokio-util",
  "wisp-mux",
 ]
diff --git a/client/demo.js b/client/demo.js
index 694591c..5dc8fbf 100644
--- a/client/demo.js
+++ b/client/demo.js
@@ -21,7 +21,7 @@ onmessage = async (msg) => {
 
     const tconn0 = performance.now();
     // args: websocket url, user agent, redirect limit 
-    let epoxy_client = await new EpoxyClient("wss://localhost:4000", navigator.userAgent, 10);
+    let epoxy_client = await new EpoxyClient("ws://localhost:4000", navigator.userAgent, 10);
     const tconn1 = performance.now();
     log(`conn establish took ${tconn1 - tconn0} ms or ${(tconn1 - tconn0) / 1000} s`);
 
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 9e3231d..6679a10 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -14,6 +14,5 @@ http-body-util = "0.1.0"
 hyper = { version = "1.1.0", features = ["server", "http1"] }
 hyper-util = { version = "0.1.2", features = ["tokio"] }
 tokio = { version = "1.5.1", features = ["rt-multi-thread", "macros"] }
-tokio-native-tls = "0.3.1"
 tokio-util = { version = "0.7.10", features = ["codec"] }
 wisp-mux = { path = "../wisp", features = ["fastwebsockets", "tokio_io"] }
diff --git a/server/src/main.rs b/server/src/main.rs
index f3fd87b..3411905 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -1,5 +1,5 @@
 #![feature(let_chains)]
-use std::io::{Error, Read};
+use std::io::Error;
 
 use bytes::Bytes;
 use clap::Parser;
@@ -13,7 +13,6 @@ use hyper::{
 };
 use hyper_util::rt::TokioIo;
 use tokio::net::{TcpListener, TcpStream, UdpSocket};
-use tokio_native_tls::{native_tls, TlsAcceptor};
 use tokio_util::codec::{BytesCodec, Framed};
 
 use wisp_mux::{
@@ -27,42 +26,23 @@ type HttpBody = http_body_util::Full<hyper::body::Bytes>;
 struct Cli {
     #[arg(long, default_value = "")]
     prefix: String,
-    #[arg(
-        long = "port",
-        short = 'l',
-        value_name = "PORT",
-        default_value = "4000"
-    )]
-    listen_port: String,
-    #[arg(long, short, value_parser)]
-    pubkey: clio::Input,
-    #[arg(long, short = 'P', value_parser)]
-    privkey: clio::Input,
+    #[arg(long, short, default_value = "4000")]
+    port: String,
+    #[arg(long = "host", short, value_name = "HOST", default_value = "0.0.0.0")]
+    bind_host: String,
 }
 
 #[tokio::main(flavor = "multi_thread")]
 async fn main() -> Result<(), Error> {
-    let mut opt = Cli::parse();
-    let mut pem = Vec::new();
-    opt.pubkey.read_to_end(&mut pem)?;
-    let mut key = Vec::new();
-    opt.privkey.read_to_end(&mut key)?;
-    let identity = native_tls::Identity::from_pkcs8(&pem, &key).expect("failed to make identity");
+    let opt = Cli::parse();
+    let addr = format!("{}:{}", opt.bind_host, opt.port);
 
-    let socket = TcpListener::bind(format!("0.0.0.0:{}", opt.listen_port))
-        .await
-        .expect("failed to bind");
-    let acceptor = TlsAcceptor::from(
-        native_tls::TlsAcceptor::new(identity).expect("failed to make tls acceptor"),
-    );
-    let acceptor = std::sync::Arc::new(acceptor);
+    let socket = TcpListener::bind(&addr).await.expect("failed to bind");
 
-    println!("listening on 0.0.0.0:4000");
+    println!("listening on `{}`", addr);
     while let Ok((stream, addr)) = socket.accept().await {
-        let acceptor_cloned = acceptor.clone();
         let prefix_cloned = opt.prefix.clone();
         tokio::spawn(async move {
-            let stream = acceptor_cloned.accept(stream).await.expect("not tls");
             let io = TokioIo::new(stream);
             let service =
                 service_fn(move |res| accept_http(res, addr.to_string(), prefix_cloned.clone()));

From 4edf27198ab0c7d8e46e784883fe22f8da78d41e Mon Sep 17 00:00:00 2001
From: Toshit Chawda <r58playz@gmail.com>
Date: Sat, 2 Mar 2024 17:40:22 -0800
Subject: [PATCH 5/7] clean up build.sh, license as LGPL

---
 .gitignore        |   6 -
 README.md         |   4 +-
 client/Cargo.toml |   3 +-
 client/LICENSE    | 841 ++++++++++++++++++++++++++++++++++++++++++++++
 client/build.sh   |  40 ++-
 client/demo.js    |   3 +-
 client/index.html |   2 +-
 package.json      |  12 +-
 wisp/Cargo.toml   |   4 +-
 wisp/LICENSE      | 310 +++++++++++++----
 10 files changed, 1125 insertions(+), 100 deletions(-)
 create mode 100644 client/LICENSE

diff --git a/.gitignore b/.gitignore
index 1cd2570..cb02600 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,4 @@
 client/pkg
 client/out
 .direnv
-client/epoxy-bundled.js
-client/epoxy-module-bundled.js
-client/epoxy-module-bundled.d.ts
-client/epoxy.js
-client/epoxy.d.ts
-client/epoxy.wasm
 pnpm-lock.yaml
diff --git a/README.md b/README.md
index 0ccd0d8..effdf6d 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,9 @@ Epoxy is an encrypted proxy for browser javascript. It allows you to make reques
 ## Using the client
 Epoxy must be run from within a web worker and must be served with the [security headers needed for `SharedArrayBuffer`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer#security_requirements). Here is a simple usage example:
 ```javascript
-importScripts("epoxy-bundled.js");
+import epoxy from "./epoxy-module-bundled.js";
+// or
+// importScripts("epoxy-bundled.js");
 
 const { EpoxyClient } = await epoxy();
 let client = await new EpoxyClient("wss://localhost:4000", navigator.userAgent, 10);
diff --git a/client/Cargo.toml b/client/Cargo.toml
index a31ed47..03cbe3a 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
 name = "epoxy-client"
-version = "1.0.0"
+version = "1.1.0"
 edition = "2021"
+license = "LGPL-3.0-only"
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/client/LICENSE b/client/LICENSE
new file mode 100644
index 0000000..7b6bec5
--- /dev/null
+++ b/client/LICENSE
@@ -0,0 +1,841 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
+
diff --git a/client/build.sh b/client/build.sh
index 237915f..f420ffa 100755
--- a/client/build.sh
+++ b/client/build.sh
@@ -2,36 +2,42 @@
 set -euo pipefail
 shopt -s inherit_errexit
 
-rm -rf out/ || true
+rm -r out/ || true
 mkdir out/
+rm -r pkg/ || true
+mkdir pkg/
 
-RUSTFLAGS='-C target-feature=+atomics,+bulk-memory' cargo build --target wasm32-unknown-unknown -Z build-std=panic_abort,std --release
-echo "[ws] cargo finished"
+RUSTFLAGS='-C target-feature=+atomics,+bulk-memory,+simd128' cargo build --target wasm32-unknown-unknown -Z build-std=panic_abort,std --release
+echo "[epx] cargo finished"
 wasm-bindgen --weak-refs --target no-modules --no-modules-global epoxy --out-dir out/ ../target/wasm32-unknown-unknown/release/epoxy_client.wasm
-echo "[ws] wasm-bindgen finished"
+echo "[epx] wasm-bindgen finished"
 
 mv out/epoxy_client_bg.wasm out/epoxy_client_unoptimized.wasm
 time wasm-opt -Oz --vacuum --dce --enable-threads --enable-bulk-memory --enable-simd out/epoxy_client_unoptimized.wasm -o out/epoxy_client_bg.wasm
-echo "[ws] wasm-opt finished"
+echo "[epx] wasm-opt finished"
 
 AUTOGENERATED_SOURCE=$(<"out/epoxy_client.js")
 # patch for websocket sharedarraybuffer error
 AUTOGENERATED_SOURCE=${AUTOGENERATED_SOURCE//getObject(arg0).send(getArrayU8FromWasm0(arg1, arg2)/getObject(arg0).send(new Uint8Array(getArrayU8FromWasm0(arg1, arg2))}
+
 WASM_BASE64=$(base64 -w0 out/epoxy_client_bg.wasm)
-AUTOGENERATED_SOURCE=${AUTOGENERATED_SOURCE//__wbg_init(input, maybe_memory) \{/__wbg_init(input, maybe_memory) \{$'\n'if (!input) \{input=\'data:application/wasm;base64,$WASM_BASE64\'\}}
-AUTOGENERATED_SOURCE=${AUTOGENERATED_SOURCE//return __wbg_finalize_init\(instance\, module\);/__wbg_finalize_init\(instance\, module\); return epoxy}
-echo "$AUTOGENERATED_SOURCE" > epoxy-bundled.js
-cp epoxy-bundled.js epoxy-module-bundled.js
-echo "module.exports = epoxy" >> epoxy-module-bundled.js
+AUTOGENERATED_SOURCE=${AUTOGENERATED_SOURCE//__wbg_init(input, maybe_memory) \{/__wbg_init(maybe_memory) \{$'\n'let input=\'data:application/wasm;base64,$WASM_BASE64\'}
+AUTOGENERATED_SOURCE=${AUTOGENERATED_SOURCE//return __wbg_finalize_init(instance, module);/__wbg_finalize_init(instance, module);$'\n'return epoxy;}
+AUTOGENERATED_SOURCE=${AUTOGENERATED_SOURCE//if (wasm !== undefined) return wasm;/if (wasm !== undefined) return epoxy;}
+
+echo "$AUTOGENERATED_SOURCE" > pkg/epoxy-bundled.js
+
+cp pkg/epoxy-bundled.js pkg/epoxy-module-bundled.js
+echo "export default epoxy;" >> pkg/epoxy-module-bundled.js
 
 AUTOGENERATED_TYPEDEFS=$(<"out/epoxy_client.d.ts")
 AUTOGENERATED_TYPEDEFS=${AUTOGENERATED_TYPEDEFS%%export class IntoUnderlyingByteSource*}
-echo "$AUTOGENERATED_TYPEDEFS" >"epoxy-module-bundled.d.ts"
-echo "} export default function epoxy(maybe_memory?: WebAssembly.Memory): Promise<typeof wasm_bindgen>;" >> "epoxy-module-bundled.d.ts"
+echo "$AUTOGENERATED_TYPEDEFS" > pkg/epoxy-module-bundled.d.ts
+echo "}\nexport default function epoxy(maybe_memory?: WebAssembly.Memory): Promise<typeof wasm_bindgen>;" >> pkg/epoxy-module-bundled.d.ts
+echo "$AUTOGENERATED_TYPEDEFS" > pkg/epoxy-bundled.d.ts
+echo "}\ndeclare function epoxy(maybe_memory?: WebAssembly.Memory): Promise<typeof wasm_bindgen>;" >> pkg/epoxy-bundled.d.ts
 
-cp out/epoxy_client.js epoxy.js
-cp out/epoxy_client.d.ts epoxy.d.ts
-cp out/epoxy_client_bg.wasm epoxy.wasm
+cp out/epoxy_client_bg.wasm pkg/epoxy.wasm
 
-rm -rf out/
-echo "[ws] done!"
+rm -r out/
+echo "[epx] done!"
diff --git a/client/demo.js b/client/demo.js
index 5dc8fbf..8fcbe48 100644
--- a/client/demo.js
+++ b/client/demo.js
@@ -1,4 +1,5 @@
-importScripts("epoxy-bundled.js");
+import epoxy from "./pkg/epoxy-module-bundled.js";
+
 onmessage = async (msg) => {
     console.debug("recieved demo:", msg);
     let [should_feature_test, should_multiparallel_test, should_parallel_test, should_multiperf_test, should_perf_test, should_ws_test, should_tls_test] = msg.data;
diff --git a/client/index.html b/client/index.html
index b78d4d8..6dda924 100644
--- a/client/index.html
+++ b/client/index.html
@@ -16,7 +16,7 @@
         const should_perf_test = params.has("perf_test");
         const should_ws_test = params.has("ws_test");
         const should_tls_test = params.has("rawtls_test");
-        const worker = new Worker("demo.js");
+        const worker = new Worker("demo.js", {type:'module'});
         worker.onmessage = (msg) => {
             let el = document.createElement("pre");
             el.innerHTML = msg.data;
diff --git a/package.json b/package.json
index 15b432c..2b8b573 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mercuryworkshop/epoxy-tls",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "A wasm library for using raw encrypted tls/ssl/https/websocket streams on the browser",
   "scripts": {
     "build": "cd client && ./build.sh"
@@ -15,9 +15,9 @@
   ],
   "author": "MercuryWorkshop",
   "repository": "https://github.com/MercuryWorkshop/epoxy-tls",
-  "license": "MIT",
-  "browser": "./client/epoxy-module-bundled.js",
-  "module": "./client/epoxy-module-bundled.js",
-  "main": "./client/epoxy-module-bundled.js",
-  "types": "./client/epoxy-module-bundled.d.ts"
+  "license": "LGPL-3.0-only",
+  "browser": "./client/pkg/epoxy-module-bundled.js",
+  "module": "./client/pkg/epoxy-module-bundled.js",
+  "main": "./client/pkg/epoxy-module-bundled.js",
+  "types": "./client/pkg/epoxy-module-bundled.d.ts"
 }
diff --git a/wisp/Cargo.toml b/wisp/Cargo.toml
index 774a871..48ab3b0 100644
--- a/wisp/Cargo.toml
+++ b/wisp/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "wisp-mux"
-version = "1.1.2"
-license = "AGPL-3.0-only"
+version = "1.1.3"
+license = "LGPL-3.0-only"
 description = "A library for easily creating Wisp servers and clients."
 homepage = "https://github.com/MercuryWorkshop/epoxy-tls/tree/multiplexed/wisp"
 repository = "https://github.com/MercuryWorkshop/epoxy-tls/tree/multiplexed/wisp"
diff --git a/wisp/LICENSE b/wisp/LICENSE
index 0ad25db..7b6bec5 100644
--- a/wisp/LICENSE
+++ b/wisp/LICENSE
@@ -1,5 +1,171 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
@@ -7,15 +173,17 @@
 
                             Preamble
 
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
+the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -24,34 +192,44 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
 
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -60,7 +238,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU Affero General Public License.
+  "This License" refers to version 3 of the GNU General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -537,45 +715,35 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
+  13. Use with the GNU Affero General Public License.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
+under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
+Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
+GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
+versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -633,29 +801,41 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
+    GNU General Public License for more details.
 
-    You should have received a copy of the GNU Affero General Public License
+    You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
+For more information on this, and how to apply and follow the GNU GPL, see
 <https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
+

From 75c48ccded70ffa7f5a2164c63ad52ac5aed4c35 Mon Sep 17 00:00:00 2001
From: Toshit Chawda <r58playz@gmail.com>
Date: Sat, 2 Mar 2024 20:16:10 -0800
Subject: [PATCH 6/7] fix issue with null bodies, move npm package to client/

---
 .npmignore          | 14 ---------
 Cargo.lock          |  4 +--
 client/.npmignore   |  5 ++++
 client/Cargo.toml   |  2 +-
 client/package.json | 26 ++++++++++++++++
 client/src/lib.rs   | 72 ++++++++++++++++++++++++---------------------
 client/src/utils.rs |  8 +++--
 package.json        | 23 ---------------
 8 files changed, 79 insertions(+), 75 deletions(-)
 delete mode 100644 .npmignore
 create mode 100644 client/.npmignore
 create mode 100644 client/package.json
 delete mode 100644 package.json

diff --git a/.npmignore b/.npmignore
deleted file mode 100644
index d0f5b3d..0000000
--- a/.npmignore
+++ /dev/null
@@ -1,14 +0,0 @@
-/target
-server/
-out/
-client/src
-client/pkg
-client/out
-client/demo.js
-client/index.html
-client/build.sh
-client/Cargo.toml
-.direnv
-Cargo.toml
-Cargo.lock
-pnpm-lock.yaml
diff --git a/Cargo.lock b/Cargo.lock
index a0ac789..9555a12 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -357,7 +357,7 @@ dependencies = [
 
 [[package]]
 name = "epoxy-client"
-version = "1.0.0"
+version = "1.1.1"
 dependencies = [
  "async-compression",
  "async_io_stream",
@@ -1849,7 +1849,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
 [[package]]
 name = "wisp-mux"
-version = "1.1.2"
+version = "1.1.3"
 dependencies = [
  "async_io_stream",
  "bytes",
diff --git a/client/.npmignore b/client/.npmignore
new file mode 100644
index 0000000..b60043a
--- /dev/null
+++ b/client/.npmignore
@@ -0,0 +1,5 @@
+build.sh
+Cargo.toml
+serve.py
+src
+
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 03cbe3a..877caec 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "epoxy-client"
-version = "1.1.0"
+version = "1.1.1"
 edition = "2021"
 license = "LGPL-3.0-only"
 
diff --git a/client/package.json b/client/package.json
new file mode 100644
index 0000000..316b643
--- /dev/null
+++ b/client/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "@mercuryworkshop/epoxy-tls",
+  "version": "1.1.1",
+  "description": "A wasm library for using raw encrypted tls/ssl/https/websocket streams on the browser",
+  "scripts": {
+    "build": "./build.sh"
+  },
+  "keywords": [
+    "wasm",
+    "ssl",
+    "tls",
+    "rust",
+    "proxy",
+    "http"
+  ],
+  "author": "MercuryWorkshop",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MercuryWorkshop/epoxy-tls.git"
+  },
+  "license": "LGPL-3.0-only",
+  "browser": "./pkg/epoxy-module-bundled.js",
+  "module": "./pkg/epoxy-module-bundled.js",
+  "main": "./pkg/epoxy-module-bundled.js",
+  "types": "./pkg/epoxy-module-bundled.d.ts"
+}
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 862fbf5..cd26347 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -352,42 +352,48 @@ impl EpoxyClient {
             .status(resp.status().as_u16())
             .status_text(resp.status().canonical_reason().unwrap_or_default());
 
-        let compression = match resp
-            .headers()
-            .get("Content-Encoding")
-            .and_then(|val| val.to_str().ok())
-            .unwrap_or_default()
-        {
-            "gzip" => Some(EpxCompression::Gzip),
-            "br" => Some(EpxCompression::Brotli),
-            _ => None,
-        };
+        let stream = if !utils::is_null_body(resp.status().as_u16()) {
+            let compression = match resp
+                .headers()
+                .get("Content-Encoding")
+                .and_then(|val| val.to_str().ok())
+                .unwrap_or_default()
+            {
+                "gzip" => Some(EpxCompression::Gzip),
+                "br" => Some(EpxCompression::Brotli),
+                _ => None,
+            };
 
-        let incoming_body = IncomingBody::new(resp.into_body());
-        let decompressed_body = match compression {
-            Some(alg) => match alg {
-                EpxCompression::Gzip => Either::Left(Either::Left(ReaderStream::new(
-                    async_comp::GzipDecoder::new(StreamReader::new(incoming_body)),
-                ))),
-                EpxCompression::Brotli => Either::Left(Either::Right(ReaderStream::new(
-                    async_comp::BrotliDecoder::new(StreamReader::new(incoming_body)),
-                ))),
-            },
-            None => Either::Right(incoming_body),
-        };
-        let stream = wasm_streams::ReadableStream::from_stream(decompressed_body.map(|x| {
-            Ok(Uint8Array::from(
-                x.replace_err_jv("Failed to get frame from response")?
-                    .as_ref(),
+            let incoming_body = IncomingBody::new(resp.into_body());
+
+            let decompressed_body = match compression {
+                Some(alg) => match alg {
+                    EpxCompression::Gzip => Either::Left(Either::Left(ReaderStream::new(
+                        async_comp::GzipDecoder::new(StreamReader::new(incoming_body)),
+                    ))),
+                    EpxCompression::Brotli => Either::Left(Either::Right(ReaderStream::new(
+                        async_comp::BrotliDecoder::new(StreamReader::new(incoming_body)),
+                    ))),
+                },
+                None => Either::Right(incoming_body),
+            };
+            Some(
+                wasm_streams::ReadableStream::from_stream(decompressed_body.map(|x| {
+                    Ok(Uint8Array::from(
+                        x.replace_err_jv("Failed to get frame from response")?
+                            .as_ref(),
+                    )
+                    .into())
+                }))
+                .into_raw(),
             )
-            .into())
-        }));
+        } else {
+            None
+        };
 
-        let resp = web_sys::Response::new_with_opt_readable_stream_and_init(
-            Some(&stream.into_raw()),
-            &respinit,
-        )
-        .replace_err("Failed to make response")?;
+        let resp =
+            web_sys::Response::new_with_opt_readable_stream_and_init(stream.as_ref(), &respinit)
+                .replace_err("Failed to make response")?;
 
         Object::define_property(
             &resp,
diff --git a/client/src/utils.rs b/client/src/utils.rs
index 415a8d6..1b71b48 100644
--- a/client/src/utils.rs
+++ b/client/src/utils.rs
@@ -51,11 +51,11 @@ impl<T, E: std::fmt::Debug> ReplaceErr for Result<T, E> {
     type Ok = T;
 
     fn replace_err(self, err: &str) -> Result<<Self as ReplaceErr>::Ok, JsError> {
-        self.map_err(|_| jerr!(err))
+        self.map_err(|x| jerr!(&format!("{}, original error: {:?}", err, x)))
     }
 
     fn replace_err_jv(self, err: &str) -> Result<<Self as ReplaceErr>::Ok, JsValue> {
-        self.map_err(|_| jval!(err))
+        self.map_err(|x| jval!(&format!("{}, original error: {:?}", err, x)))
     }
 }
 
@@ -165,6 +165,10 @@ pub fn is_redirect(code: u16) -> bool {
     [301, 302, 303, 307, 308].contains(&code)
 }
 
+pub fn is_null_body(code: u16) -> bool {
+    [101, 204, 205, 304].contains(&code)
+}
+
 pub fn get_is_secure(url: &Uri) -> Result<bool, JsError> {
     let url_scheme_str = url.scheme_str().replace_err("URL must have a scheme")?;
     match url_scheme_str {
diff --git a/package.json b/package.json
deleted file mode 100644
index 2b8b573..0000000
--- a/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "@mercuryworkshop/epoxy-tls",
-  "version": "1.1.0",
-  "description": "A wasm library for using raw encrypted tls/ssl/https/websocket streams on the browser",
-  "scripts": {
-    "build": "cd client && ./build.sh"
-  },
-  "keywords": [
-    "wasm",
-    "ssl",
-    "tls",
-    "rust",
-    "proxy",
-    "http"
-  ],
-  "author": "MercuryWorkshop",
-  "repository": "https://github.com/MercuryWorkshop/epoxy-tls",
-  "license": "LGPL-3.0-only",
-  "browser": "./client/pkg/epoxy-module-bundled.js",
-  "module": "./client/pkg/epoxy-module-bundled.js",
-  "main": "./client/pkg/epoxy-module-bundled.js",
-  "types": "./client/pkg/epoxy-module-bundled.d.ts"
-}

From 5a24f53454f81ab262ae75bbf7ea04f7291e77fd Mon Sep 17 00:00:00 2001
From: Toshit Chawda <r58playz@gmail.com>
Date: Sun, 3 Mar 2024 10:47:10 -0800
Subject: [PATCH 7/7] add udp sockets

---
 Cargo.lock               |  2 +-
 client/Cargo.toml        |  2 +-
 client/demo.js           | 26 +++++++++++-
 client/index.html        | 14 ++++++-
 client/package.json      |  2 +-
 client/src/lib.rs        | 13 ++++++
 client/src/tls_stream.rs |  2 -
 client/src/udp_stream.rs | 89 ++++++++++++++++++++++++++++++++++++++++
 server/src/main.rs       |  6 ++-
 9 files changed, 146 insertions(+), 10 deletions(-)
 create mode 100644 client/src/udp_stream.rs

diff --git a/Cargo.lock b/Cargo.lock
index 9555a12..26f9aec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -357,7 +357,7 @@ dependencies = [
 
 [[package]]
 name = "epoxy-client"
-version = "1.1.1"
+version = "1.2.0"
 dependencies = [
  "async-compression",
  "async_io_stream",
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 877caec..e9d5e6f 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "epoxy-client"
-version = "1.1.1"
+version = "1.2.0"
 edition = "2021"
 license = "LGPL-3.0-only"
 
diff --git a/client/demo.js b/client/demo.js
index 8fcbe48..8858e13 100644
--- a/client/demo.js
+++ b/client/demo.js
@@ -2,7 +2,16 @@ import epoxy from "./pkg/epoxy-module-bundled.js";
 
 onmessage = async (msg) => {
     console.debug("recieved demo:", msg);
-    let [should_feature_test, should_multiparallel_test, should_parallel_test, should_multiperf_test, should_perf_test, should_ws_test, should_tls_test] = msg.data;
+    let [
+        should_feature_test,
+        should_multiparallel_test,
+        should_parallel_test,
+        should_multiperf_test,
+        should_perf_test,
+        should_ws_test,
+        should_tls_test,
+        should_udp_test
+    ] = msg.data;
     console.log(
         "%cWASM is significantly slower with DevTools open!",
         "color:red;font-size:3rem;font-weight:bold"
@@ -168,10 +177,23 @@ onmessage = async (msg) => {
             () => log("opened"),
             () => log("closed"),
             err => console.error(err),
-            msg => { console.log(msg); console.log(decoder.decode(msg)) },
+            msg => { console.log(msg); log(decoder.decode(msg)) },
             "alicesworld.tech:443",
         );
         await ws.send("GET / HTTP 1.1\r\nHost: alicesworld.tech\r\nConnection: close\r\n\r\n");
+        await (new Promise((res, _) => setTimeout(res, 500)));
+        await ws.close();
+    } else if (should_udp_test) {
+        let decoder = new TextDecoder();
+        // nc -ulp 5000
+        let ws = await epoxy_client.connect_udp(
+            () => log("opened"),
+            () => log("closed"),
+            err => console.error(err),
+            msg => { console.log(msg); log(decoder.decode(msg)) },
+            "127.0.0.1:5000",
+        );
+        await (new Promise((res, _) => setTimeout(res, 5000)));
         await ws.close();
     } else {
         let resp = await epoxy_client.fetch("https://httpbin.org/get");
diff --git a/client/index.html b/client/index.html
index 6dda924..c013161 100644
--- a/client/index.html
+++ b/client/index.html
@@ -16,14 +16,24 @@
         const should_perf_test = params.has("perf_test");
         const should_ws_test = params.has("ws_test");
         const should_tls_test = params.has("rawtls_test");
+        const should_udp_test = params.has("udp_test");
         const worker = new Worker("demo.js", {type:'module'});
         worker.onmessage = (msg) => {
             let el = document.createElement("pre");
-            el.innerHTML = msg.data;
+            el.textContent = msg.data;
             document.getElementById("logs").appendChild(el);
             window.scrollTo(0, document.body.scrollHeight);
         };
-        worker.postMessage([should_feature_test, should_multiparallel_test, should_parallel_test, should_multiperf_test, should_perf_test, should_ws_test, should_tls_test]);
+        worker.postMessage([
+            should_feature_test,
+            should_multiparallel_test,
+            should_parallel_test,
+            should_multiperf_test,
+            should_perf_test,
+            should_ws_test,
+            should_tls_test,
+            should_udp_test
+        ]);
     </script>
 </head>
 
diff --git a/client/package.json b/client/package.json
index 316b643..3c3a2c6 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mercuryworkshop/epoxy-tls",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "A wasm library for using raw encrypted tls/ssl/https/websocket streams on the browser",
   "scripts": {
     "build": "./build.sh"
diff --git a/client/src/lib.rs b/client/src/lib.rs
index cd26347..ce8e495 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -2,10 +2,12 @@
 #[macro_use]
 mod utils;
 mod tls_stream;
+mod udp_stream;
 mod websocket;
 mod wrappers;
 
 use tls_stream::EpxTlsStream;
+use udp_stream::EpxUdpStream;
 use utils::{Boolinator, ReplaceErr, UriExt};
 use websocket::EpxWebSocket;
 use wrappers::{IncomingBody, TlsWispService, WebSocketWrapper};
@@ -247,6 +249,17 @@ impl EpoxyClient {
         EpxTlsStream::connect(self, onopen, onclose, onerror, onmessage, url).await
     }
 
+    pub async fn connect_udp(
+        &self,
+        onopen: Function,
+        onclose: Function,
+        onerror: Function,
+        onmessage: Function,
+        url: String,
+    ) -> Result<EpxUdpStream, JsError> {
+        EpxUdpStream::connect(self, onopen, onclose, onerror, onmessage, url).await
+    }
+
     pub async fn fetch(&self, url: String, options: Object) -> Result<web_sys::Response, JsError> {
         let uri = url.parse::<uri::Uri>().replace_err("Failed to parse URL")?;
         let uri_scheme = uri.scheme().replace_err("URL must have a scheme")?;
diff --git a/client/src/tls_stream.rs b/client/src/tls_stream.rs
index e9b229e..3975982 100644
--- a/client/src/tls_stream.rs
+++ b/client/src/tls_stream.rs
@@ -19,8 +19,6 @@ impl EpxTlsStream {
         Err(jerr!("Use EpoxyClient.connect_tls() instead."))
     }
 
-    // shut up
-    #[allow(clippy::too_many_arguments)]
     pub async fn connect(
         tcp: &EpoxyClient,
         onopen: Function,
diff --git a/client/src/udp_stream.rs b/client/src/udp_stream.rs
new file mode 100644
index 0000000..721fe48
--- /dev/null
+++ b/client/src/udp_stream.rs
@@ -0,0 +1,89 @@
+use crate::*;
+
+use futures_util::{stream::SplitSink, SinkExt};
+use js_sys::Function;
+
+#[wasm_bindgen(inspectable)]
+pub struct EpxUdpStream {
+    tx: SplitSink<MuxStreamIo, Vec<u8>>,
+    onerror: Function,
+    #[wasm_bindgen(readonly, getter_with_clone)]
+    pub url: String,
+}
+
+#[wasm_bindgen]
+impl EpxUdpStream {
+    #[wasm_bindgen(constructor)]
+    pub fn new() -> Result<EpxUdpStream, JsError> {
+        Err(jerr!("Use EpoxyClient.connect_udp() instead."))
+    }
+
+    pub async fn connect(
+        tcp: &EpoxyClient,
+        onopen: Function,
+        onclose: Function,
+        onerror: Function,
+        onmessage: Function,
+        url: String,
+    ) -> Result<EpxUdpStream, JsError> {
+        let onerr = onerror.clone();
+        let ret: Result<EpxUdpStream, JsError> = async move {
+            let url = Uri::try_from(url).replace_err("Failed to parse URL")?;
+            let url_host = url.host().replace_err("URL must have a host")?;
+            let url_port = url.port().replace_err("URL must have a port")?.into();
+
+            let io = tcp
+                .mux
+                .client_new_stream(StreamType::Udp, url_host.to_string(), url_port)
+                .await
+                .replace_err("Failed to open multiplexor channel")?
+                .into_io();
+            let (tx, mut rx) = io.split();
+
+            wasm_bindgen_futures::spawn_local(async move {
+                while let Some(Ok(data)) = rx.next().await {
+                    let _ = onmessage.call1(
+                        &JsValue::null(),
+                        &jval!(Uint8Array::from(data.to_vec().as_slice())),
+                    );
+                }
+                let _ = onclose.call0(&JsValue::null());
+            });
+
+            onopen
+                .call0(&Object::default())
+                .replace_err("Failed to call onopen")?;
+
+            Ok(Self {
+                tx,
+                onerror,
+                url: url.to_string(),
+            })
+        }
+        .await;
+        if let Err(ret) = ret {
+            let _ = onerr.call1(&JsValue::null(), &jval!(ret.clone()));
+            Err(ret)
+        } else {
+            ret
+        }
+    }
+
+    #[wasm_bindgen]
+    pub async fn send(&mut self, payload: Uint8Array) -> Result<(), JsError> {
+        let onerr = self.onerror.clone();
+        let ret = self.tx.send(payload.to_vec()).await;
+        if let Err(ret) = ret {
+            let _ = onerr.call1(&JsValue::null(), &jval!(format!("{}", ret)));
+            Err(ret.into())
+        } else {
+            Ok(ret?)
+        }
+    }
+
+    #[wasm_bindgen]
+    pub async fn close(&mut self) -> Result<(), JsError> {
+        self.tx.close().await?;
+        Ok(())
+    }
+}
diff --git a/server/src/main.rs b/server/src/main.rs
index 3411905..dd215e7 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -108,7 +108,11 @@ async fn handle_mux(
                 .map_err(|x| WispError::Other(Box::new(x)))?;
         }
         StreamType::Udp => {
-            let udp_socket = UdpSocket::bind(uri)
+            let udp_socket = UdpSocket::bind("0.0.0.0:0")
+                .await
+                .map_err(|x| WispError::Other(Box::new(x)))?;
+            udp_socket
+                .connect(uri)
                 .await
                 .map_err(|x| WispError::Other(Box::new(x)))?;
             let mut data = vec![0u8; 65507]; // udp standard max datagram size