further simplify proxy config

gui/src/imp/desktop.rs

@@ -5,7 +5,7 @@ use dioxus::hooks::{UnboundedReceiver, UnboundedSender};
 use futures::io::{AsyncRead, AsyncWrite};
 use mumble_protocol::control::{ClientControlCodec, ControlPacket};
 use mumble_protocol::Serverbound;
-use mumble_web2_common::GuiConfig;
+use mumble_web2_common::ClientConfig;
 use std::net::ToSocketAddrs;
 use std::sync::Mutex;
 use std::{fmt, io, sync::Arc};
@@ -188,7 +188,7 @@ pub async fn network_connect(
     address: String,
     username: String,
     event_rx: &mut UnboundedReceiver<Command>,
-    gui_config: &GuiConfig,
+    gui_config: &ClientConfig,
 ) -> Result<(), Error> {
     info!("connecting");
 
@@ -228,7 +228,7 @@ pub fn load_username() -> Option<String> {
     return None;
 }
 
-pub async fn load_config() -> color_eyre::Result<GuiConfig> {
+pub async fn load_config() -> color_eyre::Result<ClientConfig> {
     color_eyre::eyre::bail!(
         "there is no config on desktop because desktops cannot be configured as they are tables"
     )

gui/src/imp/web.rs

@@ -7,7 +7,7 @@ use gloo_timers::future::TimeoutFuture;
 use mumble_protocol::control::{ClientControlCodec, ControlPacket};
 use mumble_protocol::voice::{VoicePacket, VoicePacketPayload};
 use mumble_protocol::Serverbound;
-use mumble_web2_common::GuiConfig;
+use mumble_web2_common::ClientConfig;
 use reqwest::Url;
 use std::time::Duration;
 use tracing::level_filters::LevelFilter;
@@ -178,8 +178,8 @@ impl AudioPlayer {
 // Borrowed from
 // https://github.com/security-union/videocall-rs/blob/main/videocall-client/src/decode/config.rs#L6
 fn configure_audio_context() -> AudioContext {
-    let mut audio_context_options = AudioContextOptions::new();
-    audio_context_options.sample_rate(48000 as f32);
+    let audio_context_options = AudioContextOptions::new();
+    audio_context_options.set_sample_rate(48000 as f32);
     let audio_context = AudioContext::new_with_context_options(&audio_context_options).unwrap();
     audio_context
 }
@@ -198,12 +198,14 @@ async fn run_encoder_worklet(
     audio_context: &AudioContext,
     mut each: impl FnMut(Vec<u8>) + 'static,
 ) -> Result<AudioWorkletNode, Error> {
+    let constraints = MediaStreamConstraints::new();
+    constraints.set_audio(&JsValue::TRUE);
     let stream = window()
         .unwrap()
         .navigator()
         .media_devices()
         .ey()?
-        .get_user_media_with_constraints(MediaStreamConstraints::new().audio(&JsValue::TRUE))
+        .get_user_media_with_constraints(&constraints)
         .ey()?
         .into_future()
         .await
@@ -309,7 +311,7 @@ pub async fn network_connect(
     address: String,
     username: String,
     event_rx: &mut UnboundedReceiver<Command>,
-    gui_config: &GuiConfig,
+    gui_config: &ClientConfig,
 ) -> Result<(), Error> {
     info!("connecting");
 
@@ -388,7 +390,7 @@ pub fn load_username() -> Option<String> {
         .ok()?
 }
 
-pub async fn load_config() -> color_eyre::Result<GuiConfig> {
+pub async fn load_config() -> color_eyre::Result<ClientConfig> {
     let config_url = match option_env!("MUMBLE_WEB2_GUI_CONFIG_URL") {
         Some(url) => Url::parse(url)?,
         None => {
@@ -399,7 +401,10 @@ pub async fn load_config() -> color_eyre::Result<GuiConfig> {
     };
     info!("loading config from {}", config_url);
 
-    let config = reqwest::get(config_url).await?.json::<GuiConfig>().await?;
+    let config = reqwest::get(config_url)
+        .await?
+        .json::<ClientConfig>()
+        .await?;
 
     Ok(config)
 }