Merge remote-tracking branch 'origin/main' into remove-windows-vite-log-warning

crates/tuono_lib/src/lib.rs

@@ -14,8 +14,7 @@ mod response;
 mod server;
 mod services;
 mod ssr;
-mod vite_reverse_proxy;
-mod vite_websocket_proxy;
+mod vite;
 
 pub use mode::Mode;
 pub use payload::Payload;

crates/tuono_lib/src/server.rs

@@ -9,10 +9,8 @@ use tuono_internal::config::Config;
 use tuono_internal::tuono_println;
 
 use crate::env::load_env_vars;
-use crate::{
-    catch_all::catch_all, services::logger::LoggerLayer, vite_reverse_proxy::vite_reverse_proxy,
-    vite_websocket_proxy::vite_websocket_proxy,
-};
+use crate::vite::{vite_reverse_proxy, vite_websocket_proxy};
+use crate::{catch_all::catch_all, services::logger::LoggerLayer};
 
 const DEV_PUBLIC_DIR: &str = "public";
 const PROD_PUBLIC_DIR: &str = "out/client";

crates/tuono_lib/src/vite/mod.rs

@@ -0,0 +1,5 @@
+mod reverse_proxy;
+mod websocket_proxy;
+
+pub use reverse_proxy::vite_reverse_proxy;
+pub use websocket_proxy::vite_websocket_proxy;

crates/tuono_lib/src/vite/websocket_proxy.rs

@@ -105,8 +105,19 @@ async fn handle_socket(mut tuono_socket: WebSocket) {
             };
 
             if let Err(err) = tuono_sender.send(msg_to_browser).await {
-                if err.to_string() != Error::AlreadyClosed.to_string() {
-                    eprintln!("Failed to send back message from vite to browser: {err}")
+                let err_str = &err.to_string();
+                let error = err
+                    .into_inner()
+                    .downcast::<Error>()
+                    .unwrap_or(Box::new(Error::Io(std::io::Error::new(
+                        std::io::ErrorKind::Other,
+                        "Failed to parse error into tungstenite::Error",
+                    ))));
+
+                match *error {
+                    Error::AlreadyClosed => {}
+                    Error::Io(err) => eprintln!("IO error received from vite: {}", err.to_string()),
+                    _ => eprintln!("Failed to send back message from vite to browser: {err_str}"),
                 }
             }
         }