fix(ui): remove stale JSON config wire helper

Author: therealaleph

src/bin/ui.rs

@@ -637,162 +637,6 @@ fn save_config(cfg: &Config) -> Result<PathBuf, String> {
     Ok(path)
 }
 
-#[derive(serde::Serialize)]
-struct ConfigWire<'a> {
-    mode: &'a str,
-    google_ip: &'a str,
-    front_domain: &'a str,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    script_id: Option<ScriptIdWire<'a>>,
-    auth_key: &'a str,
-    listen_host: &'a str,
-    listen_port: u16,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    socks5_port: Option<u16>,
-    log_level: &'a str,
-    verify_ssl: bool,
-    #[serde(skip_serializing_if = "std::collections::HashMap::is_empty")]
-    hosts: &'a std::collections::HashMap<String, String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    upstream_socks5: Option<&'a str>,
-    #[serde(skip_serializing_if = "is_zero_u8")]
-    parallel_relay: u8,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    sni_hosts: Option<Vec<&'a str>>,
-    #[serde(skip_serializing_if = "is_false")]
-    normalize_x_graphql: bool,
-    #[serde(skip_serializing_if = "is_false")]
-    youtube_via_relay: bool,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    passthrough_hosts: &'a Vec<String>,
-    // IP-scan knobs. These used to be missing from the wire struct, so
-    // every Save-config silently dropped them — the user would toggle
-    // "fetch from API" on, save, reopen, and find it off again. Add
-    // them here and keep them in sync if Config ever grows more.
-    #[serde(skip_serializing_if = "is_false")]
-    fetch_ips_from_api: bool,
-    max_ips_to_scan: usize,
-    scan_batch_size: usize,
-    google_ip_validation: bool,
-    /// Default false (= bypass DoH). Only emitted when explicitly true
-    /// so unchanged configs stay clean.
-    #[serde(skip_serializing_if = "is_false")]
-    tunnel_doh: bool,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    bypass_doh_hosts: &'a Vec<String>,
-    /// PR #763: default true (= browser DoH rejected, system DNS used).
-    /// Skip when matching default to keep unchanged configs clean —
-    /// emit only when the user has explicitly disabled the block.
-    #[serde(skip_serializing_if = "is_true")]
-    block_doh: bool,
-    /// Default false. Emit only when the user enables STUN/TURN blocking.
-    #[serde(skip_serializing_if = "is_false")]
-    block_stun: bool,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    fronting_groups: &'a Vec<FrontingGroup>,
-    /// Auto-blacklist tuning + batch timeout (#391, #444, #430). Skip
-    /// serialization when matching the historical defaults so unchanged
-    /// configs stay clean — only emitted when the user has explicitly
-    /// tuned them.
-    #[serde(skip_serializing_if = "is_default_strikes")]
-    auto_blacklist_strikes: u32,
-    #[serde(skip_serializing_if = "is_default_window_secs")]
-    auto_blacklist_window_secs: u64,
-    #[serde(skip_serializing_if = "is_default_cooldown_secs")]
-    auto_blacklist_cooldown_secs: u64,
-    #[serde(skip_serializing_if = "is_default_timeout_secs")]
-    request_timeout_secs: u64,
-    /// HTTP/2 multiplexing kill switch. Default false (h2 active); only
-    /// emitted on save when the user has explicitly disabled h2, so
-    /// unchanged configs stay clean.
-    #[serde(skip_serializing_if = "is_false")]
-    force_http1: bool,
-    /// Exit-node config (CF-anti-bot bypass for chatgpt.com / claude.ai /
-    /// grok.com / x.com via exit-node second-hop relay). Skip when fully
-    /// default (disabled with no URL/PSK/hosts) so configs without
-    /// exit-node setup stay clean. Round-tripped through FormState so
-    /// Save preserves user-edited values.
-    #[serde(skip_serializing_if = "is_default_exit_node")]
-    exit_node: &'a mhrv_rs::config::ExitNodeConfig,
-}
-
-fn is_default_strikes(v: &u32) -> bool { *v == 3 }
-fn is_default_window_secs(v: &u64) -> bool { *v == 30 }
-fn is_default_cooldown_secs(v: &u64) -> bool { *v == 120 }
-fn is_default_timeout_secs(v: &u64) -> bool { *v == 30 }
-fn is_default_exit_node(en: &&mhrv_rs::config::ExitNodeConfig) -> bool {
-    !en.enabled
-        && en.relay_url.is_empty()
-        && en.psk.is_empty()
-        && en.hosts.is_empty()
-        && (en.mode.is_empty() || en.mode == "selective")
-}
-
-fn is_false(b: &bool) -> bool {
-    !*b
-}
-
-fn is_true(b: &bool) -> bool {
-    *b
-}
-
-fn is_zero_u8(v: &u8) -> bool {
-    *v == 0
-}
-
-#[derive(serde::Serialize)]
-#[serde(untagged)]
-enum ScriptIdWire<'a> {
-    One(&'a str),
-    Many(Vec<&'a str>),
-}
-
-impl<'a> From<&'a Config> for ConfigWire<'a> {
-    fn from(c: &'a Config) -> Self {
-        let script_id = c.script_id.as_ref().map(|s| match s {
-            ScriptId::One(v) => ScriptIdWire::One(v.as_str()),
-            ScriptId::Many(v) => ScriptIdWire::Many(v.iter().map(String::as_str).collect()),
-        });
-        ConfigWire {
-            mode: c.mode.as_str(),
-            google_ip: c.google_ip.as_str(),
-            front_domain: c.front_domain.as_str(),
-            script_id,
-            auth_key: c.auth_key.as_str(),
-            listen_host: c.listen_host.as_str(),
-            listen_port: c.listen_port,
-            socks5_port: c.socks5_port,
-            log_level: c.log_level.as_str(),
-            verify_ssl: c.verify_ssl,
-            hosts: &c.hosts,
-            upstream_socks5: c.upstream_socks5.as_deref(),
-            parallel_relay: c.parallel_relay,
-            sni_hosts: c
-                .sni_hosts
-                .as_ref()
-                .map(|v| v.iter().map(String::as_str).collect()),
-            normalize_x_graphql: c.normalize_x_graphql,
-            youtube_via_relay: c.youtube_via_relay,
-            passthrough_hosts: &c.passthrough_hosts,
-            fetch_ips_from_api: c.fetch_ips_from_api,
-            max_ips_to_scan: c.max_ips_to_scan,
-            scan_batch_size: c.scan_batch_size,
-            google_ip_validation: c.google_ip_validation,
-            tunnel_doh: c.tunnel_doh,
-            bypass_doh_hosts: &c.bypass_doh_hosts,
-            block_doh: c.block_doh,
-            block_stun: c.block_stun,
-            fronting_groups: &c.fronting_groups,
-            auto_blacklist_strikes: c.auto_blacklist_strikes,
-            auto_blacklist_window_secs: c.auto_blacklist_window_secs,
-            auto_blacklist_cooldown_secs: c.auto_blacklist_cooldown_secs,
-            request_timeout_secs: c.request_timeout_secs,
-            force_http1: c.force_http1,
-            exit_node: &c.exit_node,
-        }
-    }
-}
-
 /// Accent color — same blue used throughout the UI for primary actions.
 const ACCENT: egui::Color32 = egui::Color32::from_rgb(70, 120, 180);
 const ACCENT_HOVER: egui::Color32 = egui::Color32::from_rgb(90, 145, 205);