From 9329bcef456dea790c9ac4cb1b63e9a2cbdb3955 Mon Sep 17 00:00:00 2001
From: ospab <ospab@ospab.host>
Date: Thu, 21 May 2026 00:39:12 +0300
Subject: [PATCH] feat: WSS transport mode selector in Flutter UI +
 TransportConfig in Rust

---
 ostp-client/src/config.rs | 40 ++++++++++++++++++++++++++++++++++++++-
 ostp/src/main.rs          |  2 ++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/ostp-client/src/config.rs b/ostp-client/src/config.rs
index b43a9f0..ae633d8 100644
--- a/ostp-client/src/config.rs
+++ b/ostp-client/src/config.rs
@@ -14,6 +14,8 @@ pub struct ClientConfig {
     pub local_proxy: LocalProxyConfig,
     pub turn: TurnConfig,
     #[serde(default)]
+    pub transport: TransportConfig,
+    #[serde(default)]
     pub exclusions: ExclusionConfig,
     #[serde(default)]
     pub multiplex: MultiplexConfig,
@@ -52,8 +54,40 @@ pub struct LocalProxyConfig {
     pub connect_timeout_ms: u64,
 }
 
+/// Transport layer configuration.
+/// `mode` = "udp" (default) or "wss" (WebSocket Secure — bypasses DPI whitelists).
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[derive(Default)]
+pub struct TransportConfig {
+    /// "udp" or "wss"
+    #[serde(default = "default_transport_mode")]
+    pub mode: String,
+    /// WebSocket host (domain for TLS connect and HTTP Host header)
+    #[serde(default)]
+    pub wss_host: String,
+    /// WebSocket HTTP path, e.g. "/ostp"
+    #[serde(default = "default_wss_path")]
+    pub wss_path: String,
+    /// TLS SNI override; defaults to wss_host if empty
+    #[serde(default)]
+    pub wss_sni: String,
+}
+
+fn default_transport_mode() -> String { "udp".to_string() }
+fn default_wss_path() -> String { "/ostp".to_string() }
+
+impl Default for TransportConfig {
+    fn default() -> Self {
+        Self {
+            mode: default_transport_mode(),
+            wss_host: String::new(),
+            wss_path: default_wss_path(),
+            wss_sni: String::new(),
+        }
+    }
+}
+
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct TurnConfig {
     pub enabled: bool,
     pub server_addr: String,
@@ -61,6 +95,7 @@ pub struct TurnConfig {
     pub access_key: String,
 }
 
+
 impl Default for OstpConfig {
     fn default() -> Self {
         Self {
@@ -91,6 +126,7 @@ impl Default for ClientConfig {
             ostp: OstpConfig::default(),
             local_proxy: LocalProxyConfig::default(),
             turn: TurnConfig::default(),
+            transport: TransportConfig::default(),
             exclusions: ExclusionConfig::default(),
             multiplex: MultiplexConfig::default(),
             dns_server: None,
@@ -210,7 +246,9 @@ impl ClientConfig {
                 enabled: mux.enabled.unwrap_or(false),
                 sessions: mux.sessions.unwrap_or(1),
             },
+            transport: TransportConfig::default(),
             dns_server: raw.tun.as_ref().and_then(|t| t.dns.clone()),
         })
+
     }
 }
diff --git a/ostp/src/main.rs b/ostp/src/main.rs
index 909112e..ccdfcbf 100644
--- a/ostp/src/main.rs
+++ b/ostp/src/main.rs
@@ -647,8 +647,10 @@ async fn run_client_directly(client_cfg: ClientConfig) -> Result<()> {
             enabled: client_cfg.mux.as_ref().and_then(|m| m.enabled).unwrap_or(false),
             sessions: client_cfg.mux.as_ref().and_then(|m| m.sessions).unwrap_or(1),
         },
+        transport: ostp_client::config::TransportConfig::default(),
         dns_server: client_cfg.tun.as_ref().and_then(|t| t.dns.clone()),
     };
+
     // Run the client implementation
     ostp_client::runner::run_client(client_conf).await?;
     Ok(())