From 542d51c42f1d04e8100022d2ec0a5403a50ec7f6 Mon Sep 17 00:00:00 2001
From: Sam Sartor <me@samsartor.com>
Date: Fri, 8 Nov 2024 15:18:53 -0700
Subject: [PATCH] slight error log fix

---
 Cargo.lock | 1 +
 Cargo.toml | 1 +
 src/lib.rs | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b72b081..f78638c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1736,6 +1736,7 @@ dependencies = [
  "futures-channel",
  "gloo-timers 0.3.0",
  "html-purifier",
+ "js-sys",
  "manganis",
  "markdown",
  "merge-io",
diff --git a/Cargo.toml b/Cargo.toml
index bbe1e85..f35fb7c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,6 +18,7 @@ tokio-util = { version = "0.7.11", features = ["codec"]}
 wasm-bindgen = "0.2.92"
 wasm-bindgen-futures = "0.4.42"
 wasm-streams = "0.4.0"
+js-sys = "0.3.70"
 web-sys = { version = "0.3.70", features = ["WebTransport", "console", "WebTransportOptions", "WebTransportBidirectionalStream", "WebTransportSendStream", "WebTransportReceiveStream", "Navigator", "MediaDevices", "AudioDecoder", "AudioDecoderInit", "AudioData", "AudioEncoderConfig", "AudioDecoderConfig", "EncodedAudioChunk", "EncodedAudioChunkInit", "EncodedAudioChunkType", "CodecState", "MediaStreamTrackGenerator", "MediaStreamTrackGeneratorInit", "AudioContext", "AudioContextOptions", "MediaStream", "GainNode", "MediaStreamAudioSourceNode", "BaseAudioContext", "AudioDestinationNode", "AudioWorkletNode", "AudioWorklet", "AudioWorkletProcessor", "MediaStreamConstraints", "WorkletOptions", "AudioEncoder", "AudioEncoderInit", "AudioDataInit", "HtmlAnchorElement", "Url", "Blob", "AudioDataCopyToOptions", "AudioSampleFormat"] }
 anyhow = "1.0.86"
 byteorder = "1.5.0"
diff --git a/src/lib.rs b/src/lib.rs
index 4678ce7..4dead63 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -354,15 +354,16 @@ pub async fn network_entrypoint(mut event_rx: UnboundedReceiver<Command>) {
         };
 
         if let Err(error) = network_connect(address, username, &mut event_rx).await {
-            *STATE.status.write() = ConnectionState::Failed(format!("{error:?}"));
             console::error_1(&error);
+            let text = js_sys::Object::from(error).to_string().into();
+            *STATE.status.write() = ConnectionState::Failed(text);
         }
     }
 }
 
 macro_rules! bail {
     ($($x:tt)*) => {
-        return Err(wasm_bindgen::JsError::new(&format!($($x)*)).into());
+        return Err(wasm_bindgen::JsError::new(&format!($($x)*)).into())
     };
 }
 
@@ -413,8 +414,7 @@ async fn network_connect(
     console::log_1(&transport.clone().into());
 
     if let Err(e) = wasm_bindgen_futures::JsFuture::from(transport.ready()).await {
-        console::log_1(&e.into());
-        panic!();
+        bail!("could not connect to transport: {e:?}");
     }
 
     console::log_1(&"Transport is ready.".into());