From eab8f1d6a71d2f6d05e90ed32a238add11761e75 Mon Sep 17 00:00:00 2001 From: Sam Warfield Date: Sat, 10 Jan 2026 17:03:56 -0700 Subject: [PATCH] Rename client config --- common/src/lib.rs | 2 +- gui/src/app.rs | 14 +++++++------- gui/src/imp/desktop.rs | 8 ++++---- gui/src/imp/web.rs | 8 ++++---- gui/src/lib.rs | 2 +- proxy/src/main.rs | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/common/src/lib.rs b/common/src/lib.rs index 0d520a5..97fbbf7 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -1,7 +1,7 @@ use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Deserialize, Serialize, Default)] -pub struct ClientConfig { +pub struct ProxyOverides { pub proxy_url: Option, pub cert_hash: Option>, pub any_server: bool, diff --git a/gui/src/app.rs b/gui/src/app.rs index 22d76d1..aa362da 100644 --- a/gui/src/app.rs +++ b/gui/src/app.rs @@ -2,7 +2,7 @@ use dioxus::prelude::*; use mime_guess::Mime; -use mumble_web2_common::{ClientConfig, ServerStatus}; +use mumble_web2_common::{ProxyOverides, ServerStatus}; use ordermap::OrderSet; use std::collections::HashMap; @@ -23,7 +23,7 @@ pub enum Command { Connect { address: String, username: String, - config: ClientConfig, + config: ProxyOverides, }, SendChat { markdown: String, @@ -309,7 +309,7 @@ pub fn ChatView() -> Element { } #[component] -pub fn ControlView(config: Resource) -> Element { +pub fn ControlView(config: Resource) -> Element { let net: Coroutine = use_coroutine_handle(); let status = &STATE.status; let server = STATE.server.read(); @@ -508,7 +508,7 @@ pub fn ControlView(config: Resource) -> Element { } #[component] -pub fn ServerView(config: Resource) -> Element { +pub fn ServerView(config: Resource) -> Element { let net: Coroutine = use_coroutine_handle(); let server = STATE.server.read(); let Some(&UserState { @@ -546,7 +546,7 @@ pub fn ServerView(config: Resource) -> Element { } #[component] -pub fn LoginView(config: Resource) -> Element { +pub fn LoginView(config: Resource) -> Element { let net: Coroutine = use_coroutine_handle(); let last_status = use_signal(|| None::>); @@ -723,9 +723,9 @@ pub fn app() -> Element { use_coroutine(|rx: UnboundedReceiver| super::network_entrypoint(rx)); let config = use_resource(|| async move { - match imp::load_config().await { + match imp::load_proxy_overides().await { Ok(config) => config, - Err(_) => ClientConfig::default(), + Err(_) => ProxyOverides::default(), } }); diff --git a/gui/src/imp/desktop.rs b/gui/src/imp/desktop.rs index 47472b7..f3caa3f 100644 --- a/gui/src/imp/desktop.rs +++ b/gui/src/imp/desktop.rs @@ -6,7 +6,7 @@ use dioxus::hooks::UnboundedReceiver; use etcetera::{choose_app_strategy, AppStrategy, AppStrategyArgs}; use futures::io::{AsyncRead, AsyncWrite}; use mumble_protocol::control::ClientControlCodec; -use mumble_web2_common::{ClientConfig, ServerStatus}; +use mumble_web2_common::{ProxyOverides, ServerStatus}; use std::collections::HashMap; use std::mem::replace; use std::net::ToSocketAddrs; @@ -284,7 +284,7 @@ pub async fn network_connect( address: String, username: String, event_rx: &mut UnboundedReceiver, - gui_config: &ClientConfig, + gui_config: &ProxyOverides, ) -> Result<(), Error> { info!("connecting"); @@ -366,8 +366,8 @@ pub fn load_server_url() -> Option { config.get("server").cloned() } -pub async fn load_config() -> color_eyre::Result { - Ok(ClientConfig { +pub async fn load_proxy_overides() -> color_eyre::Result { + Ok(ProxyOverides { proxy_url: None, cert_hash: None, any_server: true, diff --git a/gui/src/imp/web.rs b/gui/src/imp/web.rs index 5d8980a..6bbff66 100644 --- a/gui/src/imp/web.rs +++ b/gui/src/imp/web.rs @@ -6,7 +6,7 @@ use futures::{AsyncRead, AsyncWrite}; use gloo_timers::future::TimeoutFuture; use js_sys::Float32Array; use mumble_protocol::control::ClientControlCodec; -use mumble_web2_common::{ClientConfig, ServerStatus}; +use mumble_web2_common::{ProxyOverides, ServerStatus}; use reqwest::Url; use std::future::Future; use std::time::Duration; @@ -329,7 +329,7 @@ pub async fn network_connect( address: String, username: String, event_rx: &mut UnboundedReceiver, - gui_config: &ClientConfig, + gui_config: &ProxyOverides, ) -> Result<(), Error> { info!("connecting"); @@ -422,7 +422,7 @@ pub fn absolute_url(path: &str) -> Result { Ok(Url::parse(&location.href().ey()?)?.join(path)?) } -pub async fn load_config() -> color_eyre::Result { +pub async fn load_proxy_overides() -> color_eyre::Result { let config_url = match option_env!("MUMBLE_WEB2_GUI_CONFIG_URL") { Some(url) => Url::parse(url)?, None => absolute_url("config")?, @@ -431,7 +431,7 @@ pub async fn load_config() -> color_eyre::Result { let config = reqwest::get(config_url) .await? - .json::() + .json::() .await?; Ok(config) diff --git a/gui/src/lib.rs b/gui/src/lib.rs index a8a163d..57cc4a1 100644 --- a/gui/src/lib.rs +++ b/gui/src/lib.rs @@ -20,7 +20,7 @@ use mumble_protocol::voice::VoicePacket; use mumble_protocol::voice::VoicePacketPayload; use mumble_protocol::Clientbound; use mumble_protocol::Serverbound; -use mumble_web2_common::ClientConfig; +use mumble_web2_common::ProxyOverides; use once_cell::sync::Lazy; use std::collections::hash_map::Entry; use std::collections::HashMap; diff --git a/proxy/src/main.rs b/proxy/src/main.rs index 90def5e..a65c86f 100644 --- a/proxy/src/main.rs +++ b/proxy/src/main.rs @@ -1,5 +1,5 @@ use color_eyre::eyre::{anyhow, bail, Context, Result}; -use mumble_web2_common::{ClientConfig, ServerStatus}; +use mumble_web2_common::{ProxyOverides, ServerStatus}; use rand::Rng; use salvo::conn::rustls::{Keycert, RustlsConfig}; use salvo::cors::{AllowOrigin, Cors}; @@ -77,7 +77,7 @@ async fn main() -> Result<()> { .install_default() .map_err(|e| anyhow!("could not install crypto provider {e:?}"))?; - let mut client_config = ClientConfig { + let mut client_config = ProxyOverides { proxy_url: match &server_config.proxy_url { Some(url) => Some(url.to_string()), None => None, @@ -252,13 +252,13 @@ impl StatusCraft { #[derive(Clone)] pub struct ConfigCraft { server_config: Arc, - client_config: ClientConfig, + client_config: ProxyOverides, } #[craft] impl ConfigCraft { #[craft(handler)] - async fn get_config(&self) -> Json { + async fn get_config(&self) -> Json { Json(self.client_config.clone()) }