Upgrade to doxus 0.7.2

Adds a windows container build and a windows client build.
Outstanding issues:
- I'm not sure if `workflow_dispatch` works. Based on [this PR](https://github.com/go-gitea/gitea/pull/28163) it seems like it should, but I don't see a button. It might only work after merging into the default branch.
- The windows build container is building dioxus from git HEAD because there is an unreleased bugfix we are depending on. We should revert this to a versioned release (maybe using `binstall`) once they cut 0.7.2

Reviewed-on: #2

.gitea/workflows/build-release.yaml

@@ -0,0 +1,85 @@
+name: Build Mumble Web 2
+on: [push]
+
+jobs:
+  linux_build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Install rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+          targets: wasm32-unknown-unknown
+
+      - name: Install cargo binstall
+        run: curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+
+      - name: Install dioxus-cli
+        run: cargo binstall dioxus-cli --version 0.7.2
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Build dioxus project
+        run: dx build --platform web --release -p mumble-web2-gui
+
+      - name: Upload mumble-web2-gui Artifact
+        uses: https://gitea.com/actions/gitea-upload-artifact@v4
+        with:
+          name: mumble-web2-gui
+          path: target/dx/mumble-web2-gui/release/web/public
+          retention-days: 5
+
+      - name: Build proxy
+        run: cargo build --release -p mumble-web2-proxy
+
+      - name: Upload mumble-web2-proxy Artifact
+        uses: https://gitea.com/actions/gitea-upload-artifact@v4
+        with:
+          name: mumble-web2-proxy
+          path: target/release/mumble-web2-proxy
+          retention-days: 5
+
+  windows_build:
+    runs-on: windows
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Restore Rust cache
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ~/.cargo
+            ./target
+          key: rust-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            rust-${{ runner.os }}-
+
+      - name: Pull builder container
+        run: docker pull git.ohea.xyz/mumble/mumble-web2/windows-release-builder:latest
+
+      - name: Bundle dioxus project
+        run: docker run `
+          --mount "type=bind,source=${PWD},target=C:\app" `
+          --workdir "C:\app\gui" `
+          git.ohea.xyz/mumble/mumble-web2/windows-release-builder:latest `
+          C:\Users\ContainerAdministrator\.cargo\bin\dx.exe bundle --verbose --trace -p mumble-web2-gui --release --windows
+
+      - name: Save Rust cache
+        if: always()
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ~/.cargo
+            ./target
+          key: rust-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Upload mumble-web2-gui Windows Artifact
+        uses: https://gitea.com/actions/gitea-upload-artifact@v4
+        with:
+          name: mumble-web2-gui-windows
+          path: gui/dist
+          retention-days: 5

.gitea/workflows/windows-container-build.yaml

@@ -0,0 +1,27 @@
+name: Build Mumble Web 2 release builder containers
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 4 * * *"
+
+jobs:
+  windows-release-builder-container-build:
+    runs-on: windows
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to container registry
+        uses: docker/login-action@v3
+        with:
+          registry: git.ohea.xyz
+          username: ${{ secrets.CI_REGISTRY_USER }}
+          password: ${{ secrets.CI_REGISTRY_PASSWORD }}
+
+      - name: Build Windows image
+        shell: bash
+        run: |
+          docker pull "$(grep -m1 '^FROM' Dockerfile | awk '{print $2}')"
+          docker build -t git.ohea.xyz/mumble/mumble-web2/windows-release-builder:latest -f ./docker/windows-release-builder.Dockerfile .
+          docker push git.ohea.xyz/mumble/mumble-web2/windows-release-builder:latest

.gitignore

@@ -4,6 +4,6 @@ server_hash.txt
 .aider*
 **.pem
 proxy/bundle
-config.toml
+/config.toml
 proxy/config.toml
 gui/assets/*_onnx.tar.gz

README.md

@@ -2,13 +2,12 @@
 
 ## Running Desktop
 
-1. `cargo install dioxus-cli --version 0.6.3`
+1. `cargo install dioxus-cli --version 0.7.2`
 2. `dx run -p mumble-web2-gui --platform desktop --release`
 
-
 ## Running Web (development)
 
-1. `cargo install dioxus-cli --version 0.6.3`
+1. `cargo install dioxus-cli --version 0.7.2`
 3. `dx serve -p mumble-web2-gui --platform web`
 2. `cd docker && docker compose up`
 4. connect to `https://localhost:64444`
@@ -16,7 +15,7 @@
 
 ## Running Web (with `proxy` only)
 
-1. `cargo install dioxus-cli --version 0.6.3`
+1. `cargo install dioxus-cli --version 0.7.2`
 2. `dx build -p mumble-web2-gui --platform web --release`
 3. `cp config.toml.example config.toml`
 4. `cargo run -p mumble-web2-proxy` in the background

docker/dioxus.Dockerfile

@@ -1,22 +0,0 @@
-FROM rust:1-bookworm AS base
-
-# Install cargo-binstall for faster CLI installation
-#RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-
-RUN apt-get update && apt-get install -y screen
-
-# Install dioxus-cli version 0.6.3 specifically
-RUN cargo install dioxus-cli --version 0.6.3
-
-# Set working directory
-WORKDIR /app
-
-# Add wasm32 target for web development
-RUN rustup target add wasm32-unknown-unknown
-
-# Set environment variables
-ENV PATH="/root/.cargo/bin:$PATH"
-
-# Default command (can be overridden in docker-compose)
-CMD ["dx", "--help"]
-

docker/docker-compose.yaml

@@ -48,8 +48,6 @@ services:
     ports:
       - "64738:64738/tcp"
       - "64738:64738/udp"
-    environment:
-      - MUMBLE_CONFIG_WELCOMETEXT=Welcome to the Mumble server
     network_mode: host
 #volumes:
 #  caddy_data:

docker/windows-release-builder.Dockerfile

@@ -0,0 +1,54 @@
+# escape=`
+
+# Use a Windows Server Core 2025 image that matches our build host.
+# If the version doesn't match the build host we cannot run
+# this container. I'm not sure with what specificity it has to
+# match, so let's pin this and then upgrade it as we upgrade
+# the host.
+FROM mcr.microsoft.com/windows/servercore:10.0.26100.7171
+
+ENV CMAKE_VERSION=3.31.10
+ENV CMAKE_ARCH=windows-x86_64
+
+# Restore the default Windows shell for correct batch processing.
+SHELL ["cmd", "/S", "/C"]
+
+RUN curl -SL --output vs_buildtools.exe https://aka.ms/vs/17/release/vs_buildtools.exe `
+  && ( start /w vs_buildtools.exe --quiet --wait --norestart --nocache `
+  --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" `
+  --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 `
+  --add Microsoft.VisualStudio.Component.Windows10SDK.19041 `
+  --add Microsoft.VisualStudio.Workload.NativeDesktop `
+  || IF "%ERRORLEVEL%"=="3010" EXIT 0 )
+
+SHELL ["powershell", "-NoLogo", "-ExecutionPolicy", "Bypass", "-Command"]
+
+RUN $ErrorActionPreference = 'Stop'; `
+  $url = \"https://github.com/Kitware/CMake/releases/download/v$env:CMAKE_VERSION/cmake-$env:CMAKE_VERSION-$env:CMAKE_ARCH.zip\"; `
+  $out = 'C:\\cmake.zip'; `
+  (New-Object System.Net.WebClient).DownloadFile($url, $out); `
+  Expand-Archive -Path $out -DestinationPath 'C:\\'; `
+  Remove-Item $out; `
+  $cmakeDir = \"C:\\cmake-$env:CMAKE_VERSION-$env:CMAKE_ARCH\\bin\"; `
+  [Environment]::SetEnvironmentVariable('PATH', $cmakeDir + ';' + $env:PATH, 'Machine')
+
+# Install Chocolatey
+RUN Set-ExecutionPolicy Bypass -Scope Process; `
+  [System.Net.ServicePointManager]::SecurityProtocol = `
+  [System.Net.SecurityProtocolType]::Tls12; `
+  iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
+
+RUN choco install git -y --no-progress
+RUN choco install rustup.install -y --no-progress
+
+RUN rustup toolchain install stable-x86_64-pc-windows-msvc
+RUN rustup default stable-x86_64-pc-windows-msvc
+
+RUN Set-ExecutionPolicy Unrestricted -Scope Process; `
+  iex (iwr "https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.ps1").Content
+
+SHELL ["C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\Common7\\Tools\\VsDevCmd.bat", "&&", "powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"]
+
+RUN cargo binstall dioxus-cli --version 0.7.2
+
+ENTRYPOINT ["C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\Common7\\Tools\\VsDevCmd.bat", "&&", "powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"]

gui/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 # Web Dependencies
 # ================
-dioxus-web = { version = "0.6.3", optional = true }
+dioxus-web = { version = "0.7.2", optional = true }
 wasm-bindgen = { version = "^0.2.92", optional = true }
 wasm-bindgen-futures = { version = "^0.4.42", optional = true }
 wasm-streams = { version = "^0.4.0", optional = true }
@@ -59,7 +59,6 @@ tracing-web = { version = "^0.1.3", optional = true }
 
 # Desktop Dependecies
 # ===================
-dioxus-desktop = { version = "0.6.3", optional = true }
 tokio = { version = "^1.41.1", features = ["net", "rt"], optional = true }
 tokio-rustls = { version = "^0.26.0", optional = true }
 opus = { version = "0.3.0", optional = true }
@@ -68,7 +67,7 @@ dasp_ring_buffer = { version = "0.11.0", optional = true }
 
 # Base Dependencies
 # ================
-dioxus = { version = "0.6.3" }
+dioxus = { version = "0.7.2" }
 once_cell = "1.19.0"
 asynchronous-codec = { workspace = true }
 futures = "^0.3.30"
@@ -89,11 +88,12 @@ tracing = "^0.1.40"
 color-eyre = "^0.6.3"
 crossbeam-queue = "^0.3.11"
 lol_html = "^2.2.0"
-rfd = "^0.15.2"
+rfd = { git = "https://github.com/samsartor/rfd.git", version = "^0.16.0", default-features = false } 
 base64 = "^0.22"
 mime_guess = "^2.0.5"
 async_cell = "^0.2.3"
 reqwest = { version = "^0.12.22", features = ["json"] }
+dioxus-asset-resolver = "0.7.2"
 
 # Denoising
 # =========
@@ -128,4 +128,6 @@ desktop = [
   "opus",
   "cpal",
   "dasp_ring_buffer",
+  "rfd/xdg-portal",
+  "rfd/tokio",
 ]

gui/Dioxus.toml

@@ -31,3 +31,14 @@ script = []
 style = []
 # Javascript code file
 script = []
+
+[bundle]
+identifier = "xyz.ohea.mumble-web-2"
+publisher = "OheaCorp"
+icon = [
+  "icons/32x32.png",
+  "icons/256x256.png",
+  "assets/favicon.ico",
+  "icons/icon.icns",
+  "icons/icon.ico",
+]

gui/assets/main.scss

@@ -8,7 +8,7 @@
   --accent-muted: #ff746c;
   --accent-deafened: #464459;
   --line-width: 2px;
-  --line-color: white;
+  --line-color: oklch(0.7 0 0.99);
 }
 
 body {
@@ -27,7 +27,13 @@ body {
   font-family: Nunito;
   font-size: 15pt;
   font-weight: 600;
+}
 
+hr {
+  color: var(--line-color);
+  background-color: var(--line-color);
+  height: var(--line-width);
+  border: none;
 }
 
 button {
@@ -290,4 +296,10 @@ a:visited {
       color: black;
     }
   }
+
+  &_status {
+    &.is_error {
+      color: red;
+    }
+  }
 }

gui/src/app.rs

@@ -666,15 +666,37 @@ pub fn LoginView(config: Resource<ClientConfig>) -> Element {
                 }
             }
             div {
-                div {
-                    span {}
-                    span {"—"}
-                    span {}
-                }
-                div {
-                    span {"1/100 Online"}
-                    span {"—"}
-                    span {"Version: 1.4.255"}
+                match &*last_status.read() {
+                    None => rsx!(div {
+                        class: "login_status",
+                        span {"···"}
+                    }),
+                    Some(Ok(ServerStatus { success: false, .. })) => rsx!(div {
+                        class: "login_status is_error",
+                        span {
+                            "Could not reach server"
+                        }
+                    }),
+                    Some(Ok(status)) => rsx!(div {
+                        class: "login_status",
+                        if let (Some(users), Some(max_users)) = (status.users, status.max_users) {
+                            span {"{users}/{max_users} Online"}
+                        } else {
+                            span {"Unknown Online"}
+                        }
+                        span {"-"}
+                        if let Some((maj, min, pat)) = status.version {
+                            span {"Version: {maj}.{min}.{pat}"}
+                        } else {
+                            span {"Unknown Version"}
+                        }
+                    }),
+                    Some(Err(_)) => rsx!(div {
+                        class: "login_status is_error",
+                        span {
+                            "Could not reach proxy server"
+                        }
+                    }),
                 }
                 div {
                     {bottom}

gui/src/effects.rs

@@ -2,6 +2,7 @@ use crossbeam::atomic::AtomicCell;
 use df::tract::{mut_slice_as_arrayviewmut, slice_as_arrayview};
 use df::tract::{DfParams, DfTract, RuntimeParams};
 use dioxus::prelude::{asset, manganis, Asset};
+use dioxus_asset_resolver::read_asset_bytes;
 use std::cell::RefCell;
 use std::sync::Arc;
 use tracing::{error, info};
@@ -32,7 +33,7 @@ fn with_denoising_model<O>(
             let cell_task = cell.clone();
             *state = DenoisingModelState::Downloading(cell);
             spawn.spawn(async move {
-                let model_bytes = match imp::read_asset_bytes(&DF_MODEL).await {
+                let model_bytes = match read_asset_bytes(&DF_MODEL).await {
                     Ok(b) => b,
                     Err(e) => {
                         error!("could not read denoising model from \"{DF_MODEL}\": {e:?}");

gui/src/imp/desktop.rs

@@ -121,7 +121,7 @@ impl AudioSystem {
             0,
             vec![
             0;
-            2400 // 50ms of buffer
+            SAMPLE_RATE as usize/4 // 250ms of buffer
         ],
         )));
         let decoder = opus::Decoder::new(SAMPLE_RATE, opus::Channels::Mono)?;
@@ -311,13 +311,3 @@ pub fn init_logging() {
         .with_env_filter(env_filter)
         .init();
 }
-
-// TODO: once we update to dioxus 0.7, swap this out with the dioxus-asset-resolver crate
-pub async fn read_asset_bytes(asset: &dioxus::prelude::Asset) -> color_eyre::Result<Vec<u8>> {
-    let cur_exe = std::env::current_exe().unwrap();
-    let path = cur_exe
-        .parent()
-        .unwrap()
-        .join(asset.to_string().trim_matches('/'));
-    Ok(std::fs::read(&path).with_context(|| format!("native path \"{}\"", path.display()))?)
-}

gui/src/imp/web.rs

@@ -448,12 +448,6 @@ pub fn init_logging() {
     info!("logging initiated");
 }
 
-// TODO: once we update to dioxus 0.7, swap this out with the dioxus-asset-resolver crate
-pub async fn read_asset_bytes(asset: &dioxus::prelude::Asset) -> color_eyre::Result<Vec<u8>> {
-    let url = absolute_url(asset.to_string().trim_matches('/'))?;
-    Ok(reqwest::get(url).await?.bytes().await?.to_vec())
-}
-
 pub struct SpawnHandle;
 
 impl SpawnHandle {

gui/src/main.rs

@@ -1,12 +1,6 @@
-use mumble_web2_gui::{app, imp::init_logging};
+use mumble_web2_gui::{app, imp};
 
 pub fn main() {
-    #[cfg(feature = "desktop")]
-    let _guard = tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()
-        .unwrap()
-        .enter();
-    init_logging();
+    imp::init_logging();
     dioxus::launch(app::app);
 }