feature gate

Cargo.toml

@@ -13,6 +13,9 @@ keywords = ["http", "proxy", "http-proxy"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+websocket = ["dep:winnow"]
+
 [dependencies]
 tokio = { version = "1.39.3", features = [
     "macros",
@@ -35,11 +38,15 @@ hyper-util = { version = "0.1.7", features = ["tokio"] }
 native-tls = { version = "0.2.12", features = ["alpn"] }
 thiserror = "1.0.62"
 moka = { version = "0.12.8", features = ["sync"] }
-winnow = "0.6.20"
+winnow = { version = "0.6.20", optional = true }
 
 [dev-dependencies]
 axum = { version = "0.7.2", features = ["http2"] }
 clap = { version = "4.5.16", features = ["derive"] }
 rcgen = { version = "0.13.1", features = ["x509-parser"] }
 reqwest = { version = "0.12.7", features = ["native-tls-alpn"] }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+
+[[example]]
+name = "proxy"
+required-features = ["websocket"]

README.md

@@ -15,7 +15,10 @@ use std::path::PathBuf;
 
 use clap::{Args, Parser};
 use futures::StreamExt;
-use http_mitm_proxy::{default_client::Upgrade, DefaultClient, MitmProxy};
+use http_mitm_proxy::{
+    default_client::{websocket, Upgrade},
+    DefaultClient, MitmProxy,
+};
 use moka::sync::Cache;
 use tracing_subscriber::EnvFilter;
 
@@ -99,7 +102,7 @@ async fn main() {
 
                 let (res, upgrade) = client.send_request(req).await?;
 
-                println!("{} -> {}", uri, res.status());
+                // println!("{} -> {}", uri, res.status());
                 if let Some(upgrade) = upgrade {
                     // If the response is an upgrade, e.g. Websocket, you can see traffic.
                     // Modifying upgraded traffic is not supported yet.
@@ -112,14 +115,42 @@ async fn main() {
                     } = upgrade;
                     let url = uri.to_string();
                     tokio::spawn(async move {
+                        let mut buf = Vec::new();
                         while let Some(data) = client_to_server.next().await {
-                            println!("Client -> Server: {} {:?}", url, data);
+                            buf.extend(data);
+                            loop {
+                                let input = &mut buf.as_slice();
+                                if let Ok(frame) = websocket::frame(input) {
+                                    println!(
+                                        "Client -> Server: {} {:?}",
+                                        url,
+                                        String::from_utf8_lossy(&frame.payload_data)
+                                    );
+                                    buf = input.to_vec();
+                                } else {
+                                    break;
+                                }
+                            }
                         }
                     });
                     let url = uri.to_string();
                     tokio::spawn(async move {
+                        let mut buf = Vec::new();
                         while let Some(data) = server_to_client.next().await {
-                            println!("Server -> Client: {} {:?}", url, data);
+                            buf.extend(data);
+                            loop {
+                                let input = &mut buf.as_slice();
+                                if let Ok(frame) = websocket::frame(input) {
+                                    println!(
+                                        "Server -> Client: {} {:?}",
+                                        url,
+                                        String::from_utf8_lossy(&frame.payload_data)
+                                    );
+                                    buf = input.to_vec();
+                                } else {
+                                    break;
+                                }
+                            }
                         }
                     });
                 }

src/default_client.rs

@@ -273,6 +273,7 @@ fn remove_authority<B>(req: &mut Request<B>) {
     *req.uri_mut() = Uri::from_parts(parts).unwrap();
 }
 
+#[cfg(feature = "websocket")]
 pub mod websocket {
     /*
     https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API/Writing_WebSocket_servers