Merge pull request #127 from datum-cloud/fix/macos-auto-update

mattdjenkinson · web-flow · commit 68ea20571796 · 2026-03-24T16:44:07.000Z
Fix macos auto update logic
diff --git a/.github/workflows/bundle.yml b/.github/workflows/bundle.yml
@@ -227,6 +227,13 @@ jobs:
             exit 1
           fi
 
+      # DMG build leaves Datum.app under ui/dist; upload-artifact uses ui/dist/** and the release
+      # step used artifacts/**/*, so every file inside the bundle (fonts, PNGs, CodeResources, …)
+      # became a separate GitHub release asset. The DMG already contains the app.
+      - name: Remove unpacked macOS .app from dist before artifact upload
+        if: runner.os == 'macOS'
+        run: rm -rf ui/dist/Datum.app
+
       - name: Cleanup macOS Keychain
         if: runner.os == 'macOS' && always()
         run: |
@@ -368,7 +375,12 @@ jobs:
             Workflow: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
             Assets: Datum.dmg, Datum.AppImage, Datum-setup.exe (see SHA256 checksums below).
-          files: artifacts/**/*
+          # Do not use artifacts/**/* — that uploads every nested file from historical artifact layouts.
+          files: |
+            artifacts/aliases/*
+            artifacts/**/ui/dist/*.dmg
+            artifacts/**/ui/dist/*.AppImage
+            artifacts/**/ui/dist/*.exe
           generate_release_notes: false
 
   update-homebrew:
diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml
@@ -194,6 +194,11 @@ jobs:
             exit 1
           fi
 
+      # See bundle.yml — avoid uploading Datum.app tree as hundreds of separate release assets.
+      - name: Remove unpacked macOS .app from dist before artifact upload
+        if: runner.os == 'macOS'
+        run: rm -rf ui/dist/Datum.app
+
       - name: Cleanup macOS Keychain
         if: runner.os == 'macOS' && always()
         run: |
@@ -269,7 +274,11 @@ jobs:
           make_latest: false
           prerelease: ${{ steps.channel.outputs.prerelease == 'true' }}
           draft: false
-          files: artifacts/**/*
+          files: |
+            artifacts/aliases/*
+            artifacts/**/ui/dist/*.dmg
+            artifacts/**/ui/dist/*.AppImage
+            artifacts/**/ui/dist/*.exe
 
   publish-docker:
     if: ${{ inputs.publish_docker }}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,6 +19,7 @@ dirs-next = "2"
 http-body-util = "0.1.3"
 snafu = "0.8.6"
 hex = "0.4.3"
+http = "1"
 hyper = "1"
 hyper-util = { version = "0.1.19", features = ["full"] }
 iroh = { version = "0.95", default-features = false }
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -11,6 +11,7 @@ data-encoding.workspace = true
 derive_more.workspace = true
 dirs-next.workspace = true
 hex.workspace = true
+http.workspace = true
 http-body-util.workspace = true
 hyper.workspace = true
 hyper-util.workspace = true
diff --git a/lib/src/datum_cloud.rs b/lib/src/datum_cloud.rs
@@ -9,6 +9,7 @@ use tokio::sync::watch;
 use tracing::warn;
 
 use crate::datum_apis::user_invitation::RoleReference;
+use crate::http_user_agent::datum_http_user_agent;
 use crate::{ProjectControlPlaneClient, Repo, SelectedContext};
 
 pub use self::{
@@ -32,7 +33,10 @@ impl DatumCloudClient {
     pub async fn with_repo(env: ApiEnv, repo: Repo) -> Result<Self> {
         let auth = AuthClient::with_repo(env, repo.clone()).await?;
         let session = SessionStateWrapper::from_repo(Some(repo)).await?;
-        let http = reqwest::Client::builder().build().anyerr()?;
+        let http = reqwest::Client::builder()
+            .user_agent(datum_http_user_agent())
+            .build()
+            .anyerr()?;
         let mut client = Self {
             env,
             auth,
@@ -47,7 +51,10 @@ impl DatumCloudClient {
     pub async fn new(env: ApiEnv) -> Result<Self> {
         let auth = AuthClient::new(env).await?;
         let session = SessionStateWrapper::empty();
-        let http = reqwest::Client::builder().build().anyerr()?;
+        let http = reqwest::Client::builder()
+            .user_agent(datum_http_user_agent())
+            .build()
+            .anyerr()?;
         let mut client = Self {
             env,
             auth,
diff --git a/lib/src/datum_cloud/auth.rs b/lib/src/datum_cloud/auth.rs
@@ -22,6 +22,7 @@ use tokio_util::sync::CancellationToken;
 use tracing::{debug, error, info, warn};
 
 use crate::Repo;
+use crate::http_user_agent::datum_http_user_agent;
 
 use self::{redirect_server::RedirectServer, types::OidcTokenResponse};
 use super::ApiEnv;
@@ -142,6 +143,7 @@ impl StatelessClient {
         let http = reqwest::ClientBuilder::new()
             // Following redirects opens the client up to SSRF vulnerabilities.
             .redirect(reqwest::redirect::Policy::none())
+            .user_agent(datum_http_user_agent())
             .build()
             .expect("Client should build");
 
diff --git a/lib/src/http_user_agent.rs b/lib/src/http_user_agent.rs
@@ -0,0 +1,16 @@
+//! Shared [`User-Agent`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent) for
+//! outbound HTTP from Datum Desktop (reqwest and kube). Helps backend logs and support correlate
+//! traffic with app builds.
+//!
+//! The version is [`env!("CARGO_PKG_VERSION")`] for this crate; keep `lib`’s version aligned with
+//! the shipped desktop app when cutting releases.
+
+/// Product token plus version, OS, and CPU arch for support and debugging.
+pub fn datum_http_user_agent() -> String {
+    format!(
+        "Datum Desktop/{} ({}; {})",
+        env!("CARGO_PKG_VERSION"),
+        std::env::consts::OS,
+        std::env::consts::ARCH,
+    )
+}
diff --git a/lib/src/lib.rs b/lib/src/lib.rs
@@ -4,6 +4,7 @@ pub mod datum_apis;
 pub mod datum_cloud;
 pub mod gateway;
 pub mod heartbeat;
+mod http_user_agent;
 mod node;
 pub mod project_control_plane;
 mod repo;
@@ -13,6 +14,7 @@ pub mod update;
 
 pub use config::{Config, DiscoveryMode, GatewayConfig};
 pub use heartbeat::HeartbeatAgent;
+pub use http_user_agent::datum_http_user_agent;
 pub use node::*;
 pub use project_control_plane::ProjectControlPlaneClient;
 pub use repo::Repo;
diff --git a/lib/src/project_control_plane.rs b/lib/src/project_control_plane.rs
@@ -1,13 +1,16 @@
 use std::sync::Arc;
 
 use arc_swap::ArcSwap;
+use http::HeaderValue;
+use http::header::USER_AGENT;
 use kube::{Client, Config};
 use n0_error::{Result, StdResultExt};
 use n0_future::task::AbortOnDropHandle;
 use secrecy::SecretString;
 use tracing::warn;
 
 use crate::datum_cloud::{DatumCloudClient, LoginState};
+use crate::http_user_agent::datum_http_user_agent;
 
 #[derive(derive_more::Debug, Clone)]
 pub struct ProjectControlPlaneClient {
@@ -70,6 +73,9 @@ impl ProjectControlPlaneClient {
             .std_context("Invalid project control plane URL")?;
         let mut config = Config::new(uri);
         config.auth_info.token = Some(SecretString::new(access_token.to_string().into_boxed_str()));
+        let ua = HeaderValue::from_str(&datum_http_user_agent())
+            .std_context("Invalid User-Agent for kube client")?;
+        config.headers.push((USER_AGENT, ua));
         Client::try_from(config).std_context("Failed to create project control plane client")
     }
 
diff --git a/lib/src/update.rs b/lib/src/update.rs
@@ -272,7 +272,7 @@ impl UpdateChecker {
         );
 
         let client = reqwest::Client::builder()
-            .user_agent("DatumConnect/1.0")
+            .user_agent(crate::datum_http_user_agent())
             .build()
             .anyerr()?;
 
@@ -381,7 +381,7 @@ impl UpdateChecker {
     /// Download the update binary to a temporary location
     pub async fn download_update(&self, download_url: &str) -> Result<PathBuf> {
         let client = reqwest::Client::builder()
-            .user_agent("DatumConnect/1.0")
+            .user_agent(crate::datum_http_user_agent())
             .build()
             .anyerr()?;
 
@@ -491,13 +491,32 @@ impl UpdateChecker {
         Ok(())
     }
 
+    /// Parse mount point from `hdiutil attach` stdout. Must not use `-quiet` (it closes stdout).
+    #[cfg(target_os = "macos")]
+    fn parse_hdiutil_attach_mount_point(stdout: &str) -> Option<PathBuf> {
+        for line in stdout.lines().rev() {
+            if !line.contains("/Volumes/") {
+                continue;
+            }
+            let last_col = line
+                .split('\t')
+                .map(str::trim)
+                .filter(|s| !s.is_empty())
+                .last()?;
+            if last_col.starts_with("/Volumes/") {
+                return Some(PathBuf::from(last_col));
+            }
+        }
+        None
+    }
+
     #[cfg(target_os = "macos")]
     fn apply_update_macos_static(dmg_path: &Path) -> Result<()> {
         use std::process::Stdio;
 
-        // Mount DMG
+        // Do not pass `-quiet`: it closes stdout, so the mount point cannot be parsed (man hdiutil).
         let output = Command::new("hdiutil")
-            .args(["attach", "-nobrowse", "-readonly", "-quiet"])
+            .args(["attach", "-nobrowse", "-readonly"])
             .arg(dmg_path)
             .output()
             .anyerr()?;
@@ -513,15 +532,19 @@ impl UpdateChecker {
             .anyerr();
         }
 
-        // Get mount point - last line of stdout is typically "/Volumes/VolumeName"
         let stdout = String::from_utf8_lossy(&output.stdout);
-        let volume = stdout
-            .lines()
-            .last()
-            .ok_or_else(|| IoError::new(ErrorKind::Other, "No mount point from hdiutil"))?;
+        let volume = Self::parse_hdiutil_attach_mount_point(&stdout).ok_or_else(|| {
+            IoError::new(
+                ErrorKind::Other,
+                format!(
+                    "No /Volumes mount point in hdiutil output: {}",
+                    stdout.trim()
+                ),
+            )
+        })?;
 
         // Find .app in the volume
-        let app_path = std::fs::read_dir(volume)
+        let app_path = std::fs::read_dir(&volume)
             .anyerr()?
             .filter_map(|e| e.ok())
             .find(|e| e.path().extension().map_or(false, |ext| ext == "app"))
@@ -543,7 +566,7 @@ impl UpdateChecker {
         // Unmount
         let _ = Command::new("hdiutil")
             .args(["detach", "-force", "-quiet"])
-            .arg(volume)
+            .arg(&volume)
             .status();
 
         if !status.success() {
@@ -686,14 +709,19 @@ exec "$2"
 
         #[cfg(target_os = "macos")]
         {
+            // Do not use hdiutil -quiet when capturing the mount point (quiet closes stdout).
             r#"#!/bin/bash
-set -e
+set -euo pipefail
 DMG="$1"
-VOLUME=$(hdiutil attach -nobrowse -readonly -quiet "$DMG" | tail -n1 | cut -f3-)
-APP=$(find "$VOLUME" -maxdepth 1 -name "*.app" | head -1)
+ATTACH_OUT=$(hdiutil attach -nobrowse -readonly "$DMG")
+VOLUME=$(echo "$ATTACH_OUT" | grep '/Volumes/' | tail -n1 | awk -F'	' '{gsub(/^ +| +$/,"",$NF); print $NF}')
+[ -n "$VOLUME" ] || { echo "hdiutil attach: no /Volumes mount in output" >&2; exit 1; }
+APP=$(find "$VOLUME" -maxdepth 1 -name "*.app" -print -quit)
+[ -n "$APP" ] || { echo "No .app bundle in DMG at $VOLUME" >&2; exit 1; }
+DEST="/Applications/$(basename "$APP")"
 rsync -a --delete "$APP" /Applications/
 hdiutil detach -force -quiet "$VOLUME"
-open -a "Datum"
+open "$DEST"
 "#
             .to_string()
         }
diff --git a/ui/src/main.rs b/ui/src/main.rs
@@ -570,39 +570,47 @@ fn App() -> Element {
         update_channel,
     });
 
-    // Handle install now trigger (from Settings when update_ready is None)
+    // Handle install now (toast or Settings). Read path from update_ready before clearing it —
+    // the toast handler must not clear update_ready before this runs, or we rely only on disk.
     use_effect(move || {
         if !install_now_trigger() {
             return;
         }
         install_now_trigger.set(false);
-        let path = update_ready()
-            .as_ref()
-            .map(|p| p.path.clone())
-            .or_else(|| None);
-        if path.is_none() {
-            // Path not in memory - need to load from checker (async)
+        let path_from_ui = update_ready().as_ref().map(|p| p.path.clone());
+        update_ready.set(None);
+
+        if let Some(path) = path_from_ui {
             let repo = lib::Repo::from_path(lib::Repo::default_location());
             let checker = lib::UpdateChecker::new(repo);
-            tokio::spawn(async move {
-                if let Ok(Some(path)) = checker.get_pending_install_path().await {
+            if let Err(e) = checker.spawn_install_and_restart(&path) {
+                tracing::warn!("Failed to spawn install: {e:#}");
+                return;
+            }
+            std::process::exit(0);
+        }
+
+        let repo = lib::Repo::from_path(lib::Repo::default_location());
+        let checker = lib::UpdateChecker::new(repo);
+        tokio::spawn(async move {
+            match checker.get_pending_install_path().await {
+                Ok(Some(path)) => {
                     if let Err(e) = checker.spawn_install_and_restart(&path) {
                         tracing::warn!("Failed to spawn install: {e:#}");
                         return;
                     }
                     std::process::exit(0);
                 }
-            });
-        } else {
-            let path = path.unwrap();
-            let repo = lib::Repo::from_path(lib::Repo::default_location());
-            let checker = lib::UpdateChecker::new(repo);
-            if let Err(e) = checker.spawn_install_and_restart(&path) {
-                tracing::warn!("Failed to spawn install: {e:#}");
-                return;
+                Ok(None) => {
+                    tracing::warn!(
+                        "Install now: no pending update on disk (settings missing or file gone)"
+                    );
+                }
+                Err(e) => {
+                    tracing::warn!("Install now: failed to read pending update path: {e:#}");
+                }
             }
-            std::process::exit(0);
-        }
+        });
     });
 
     // Tray can trigger opening the add tunnel dialog; Chrome (inside Router) handles navigation + dialog.
@@ -635,7 +643,7 @@ fn App() -> Element {
                                 pending_update_info.set(Some(p.info));
                             }
                             install_now_trigger.set(true);
-                            update_ready.set(None);
+                            // update_ready cleared in install effect after copying the DMG path
                         },
                     }
                 }
