fix(ws): enable hyper upgrades and drain request body for WebSocket support

Author: Tuntii

crates/rustapi-core/src/server.rs

@@ -61,7 +61,11 @@ impl Server {
                     }
                 });
 
-                if let Err(err) = http1::Builder::new().serve_connection(io, service).await {
+                if let Err(err) = http1::Builder::new()
+                    .serve_connection(io, service)
+                    .with_upgrades()
+                    .await
+                {
                     error!("Connection error: {}", err);
                 }
             });
@@ -144,7 +148,8 @@ async fn handle_request(
 fn log_request(method: &http::Method, path: &str, status: StatusCode, start: std::time::Instant) {
     let elapsed = start.elapsed();
 
-    if status.is_success() {
+    // 1xx (Informational), 2xx (Success), 3xx (Redirection) are considered successful requests
+    if status.is_success() || status.is_redirection() || status.is_informational() {
         info!(
             method = %method,
             path = %path,

crates/rustapi-ws/src/extractor.rs

@@ -79,7 +79,10 @@ impl FromRequest for WebSocket {
         let method = req.method();
 
         // Validate the upgrade request
-        let sec_key = validate_upgrade_request(method, headers).map_err(ApiError::from)?;
+        // Note: we clone sec_key to avoid keeping borrow of headers
+        let sec_key = validate_upgrade_request(method, headers)
+            .map_err(ApiError::from)?
+            .to_string();
 
         // Parse requested protocols
         let protocols = headers
@@ -97,6 +100,12 @@ impl FromRequest for WebSocket {
         // Capture OnUpgrade future
         let on_upgrade = req.extensions_mut().remove::<OnUpgrade>();
 
+        // IMPORTANT: Consume the request body to ensure hyper allows the upgrade.
+        if let Some(stream) = req.take_stream() {
+            use http_body_util::BodyExt;
+            let _ = stream.collect().await;
+        }
+
         Ok(Self {
             sec_key,
             protocols,
@@ -106,6 +115,7 @@ impl FromRequest for WebSocket {
     }
 }
 
+
 impl OperationModifier for WebSocket {
     fn update_operation(_op: &mut Operation) {
         // WebSocket endpoints don't have regular request body parameters

crates/rustapi-ws/src/upgrade.rs

@@ -192,7 +192,11 @@ impl IntoResponse for WebSocketUpgrade {
                         callback(socket).await;
                     }
                     Err(e) => {
-                        tracing::error!("WebSocket upgrade failed: {}", e);
+                        tracing::error!("WebSocket upgrade failed: {:?}", e);
+                        // Also try to print the source if available
+                        if let Some(source) = std::error::Error::source(&e) {
+                            tracing::error!("Cause: {:?}", source);
+                        }
                     }
                 }
             });

examples/websocket/src/main.rs

@@ -311,6 +311,7 @@ async fn main() -> std::result::Result<(), Box<dyn std::error::Error + Send + Sy
     tracing_subscriber::fmt()
         .with_env_filter(
             tracing_subscriber::EnvFilter::from_default_env()
+                .add_directive("rustapi_ws=debug".parse().unwrap())
                 .add_directive("websocket_example=debug".parse().unwrap())
                 .add_directive("info".parse().unwrap()),
         )