fix(wizard): add startup splash and tighten update checks

Author: RadNotRed

src/app.rs

@@ -121,7 +121,7 @@ enum UpdateStatus {
     Checking,
     Available(UpdateInfo),
     Current,
-    Error(String),
+    Error,
 }
 
 struct App {
@@ -276,7 +276,7 @@ impl App {
                 }
             }
             UpdateCheckState::Error(error) => {
-                self.update_status = UpdateStatus::Error(error.clone());
+                self.update_status = UpdateStatus::Error;
                 if outcome.manual {
                     self.last_status = format!("Update check failed: {error}");
                 }
@@ -862,7 +862,7 @@ impl App {
             UpdateStatus::Checking => "Update: checking...".to_string(),
             UpdateStatus::Available(info) => format!("Update: {} available", info.version),
             UpdateStatus::Current => format!("Update: current ({})", env!("CARGO_PKG_VERSION")),
-            UpdateStatus::Error(_) => "Update: check failed".to_string(),
+            UpdateStatus::Error => "Update: check failed".to_string(),
         }
     }
 
@@ -871,8 +871,8 @@ impl App {
             "Opening Setup Wizard...".to_string()
         } else if let UpdateStatus::Available(info) = &self.update_status {
             format!("Update available - {}", info.version)
-        } else if let UpdateStatus::Error(error) = &self.update_status {
-            truncate(&format!("Update check failed: {error}"), 44)
+        } else if matches!(self.update_status, UpdateStatus::Error) {
+            "Update check failed".to_string()
         } else if self.config_error.is_some() {
             "Config error - open Setup Wizard".to_string()
         } else if self.syncing {

src/platform.rs

@@ -45,7 +45,7 @@ pub fn eject_drive(root: &Path) -> Result<()> {
 pub fn open_path(path: &Path) -> Result<()> {
     #[cfg(target_os = "windows")]
     {
-        return run_hidden("explorer.exe", &[&path.display().to_string()]);
+        return start_process_windows(&path.display().to_string());
     }
     #[cfg(target_os = "macos")]
     {
@@ -62,7 +62,7 @@ pub fn open_path(path: &Path) -> Result<()> {
 pub fn open_url(url: &str) -> Result<()> {
     #[cfg(target_os = "windows")]
     {
-        return run_hidden("explorer.exe", &[url]);
+        return start_process_windows(url);
     }
     #[cfg(target_os = "macos")]
     {
@@ -116,6 +116,68 @@ pub fn prompt_for_update(current_version: &str, latest_version: &str) -> bool {
     )
 }
 
+pub fn show_wizard_loading_indicator(signal_path: &Path) -> Result<()> {
+    #[cfg(target_os = "windows")]
+    {
+        let signal_path = powershell_single_quoted(&signal_path.display().to_string());
+        let script = format!(
+            "Add-Type -AssemblyName System.Windows.Forms; \
+             Add-Type -AssemblyName System.Drawing; \
+             $signal = '{signal_path}'; \
+             $form = New-Object System.Windows.Forms.Form; \
+             $form.Text = 'ShadowSync'; \
+             $form.StartPosition = 'CenterScreen'; \
+             $form.Size = New-Object System.Drawing.Size(360, 128); \
+             $form.TopMost = $true; \
+             $form.FormBorderStyle = 'FixedDialog'; \
+             $form.ControlBox = $false; \
+             $form.MinimizeBox = $false; \
+             $form.MaximizeBox = $false; \
+             $label = New-Object System.Windows.Forms.Label; \
+             $label.Text = 'Opening Setup Wizard...'; \
+             $label.AutoSize = $true; \
+             $label.Location = New-Object System.Drawing.Point(22, 18); \
+             $label.Font = New-Object System.Drawing.Font('Segoe UI', 11); \
+             $bar = New-Object System.Windows.Forms.ProgressBar; \
+             $bar.Style = 'Marquee'; \
+             $bar.MarqueeAnimationSpeed = 25; \
+             $bar.Size = New-Object System.Drawing.Size(300, 20); \
+             $bar.Location = New-Object System.Drawing.Point(22, 54); \
+             $hint = New-Object System.Windows.Forms.Label; \
+             $hint.Text = 'This should only take a moment.'; \
+             $hint.AutoSize = $true; \
+             $hint.Location = New-Object System.Drawing.Point(22, 82); \
+             $hint.ForeColor = [System.Drawing.Color]::DimGray; \
+             $form.Controls.Add($label); \
+             $form.Controls.Add($bar); \
+             $form.Controls.Add($hint); \
+             $timer = New-Object System.Windows.Forms.Timer; \
+             $timer.Interval = 150; \
+             $timer.Add_Tick({{ if (-not (Test-Path -LiteralPath $signal)) {{ $form.Close() }} }}); \
+             $timer.Start(); \
+             $timeout = New-Object System.Windows.Forms.Timer; \
+             $timeout.Interval = 20000; \
+             $timeout.Add_Tick({{ $form.Close() }}); \
+             $timeout.Start(); \
+             [void]$form.ShowDialog()"
+        );
+        return run_hidden_detached(
+            "powershell.exe",
+            &[
+                "-NoLogo",
+                "-NoProfile",
+                "-NonInteractive",
+                "-ExecutionPolicy",
+                "Bypass",
+                "-Command",
+                &script,
+            ],
+        );
+    }
+    #[allow(unreachable_code)]
+    Ok(())
+}
+
 pub fn sleep_short(duration: Duration) {
     thread::sleep(duration);
 }
@@ -227,6 +289,44 @@ fn run_hidden(program: &str, args: &[&str]) -> Result<()> {
     }
 }
 
+#[cfg(target_os = "windows")]
+fn run_hidden_detached(program: &str, args: &[&str]) -> Result<()> {
+    use std::os::windows::process::CommandExt;
+
+    const CREATE_NO_WINDOW: u32 = 0x0800_0000;
+    Command::new(program)
+        .creation_flags(CREATE_NO_WINDOW)
+        .args(args)
+        .spawn()
+        .with_context(|| format!("failed to start {program}"))?;
+    Ok(())
+}
+
+#[cfg(target_os = "windows")]
+fn start_process_windows(target: &str) -> Result<()> {
+    let command = format!(
+        "Start-Process -FilePath '{}'",
+        powershell_single_quoted(target)
+    );
+    run_hidden(
+        "powershell.exe",
+        &[
+            "-NoLogo",
+            "-NoProfile",
+            "-NonInteractive",
+            "-ExecutionPolicy",
+            "Bypass",
+            "-Command",
+            &command,
+        ],
+    )
+}
+
+#[cfg(target_os = "windows")]
+fn powershell_single_quoted(value: &str) -> String {
+    value.replace('\'', "''")
+}
+
 #[cfg(not(target_os = "windows"))]
 fn run_status(program: &str, args: &[&str]) -> Result<()> {
     let status = Command::new(program)

src/update.rs

@@ -9,8 +9,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::config::AppPaths;
 
-const GITHUB_LATEST_RELEASE_API: &str =
-    "https://api.github.com/repos/RadNotRed/ShadowSync/releases/latest";
+const GITHUB_RELEASES_API: &str =
+    "https://api.github.com/repos/RadNotRed/ShadowSync/releases?per_page=10";
 pub const RELEASES_PAGE_URL: &str = "https://github.com/RadNotRed/ShadowSync/releases";
 const UPDATE_CACHE_FILE: &str = "update-state.json";
 const AUTOMATIC_CHECK_INTERVAL: Duration = Duration::from_secs(24 * 60 * 60);
@@ -48,6 +48,8 @@ struct CachedUpdateState {
 struct GitHubRelease {
     tag_name: String,
     html_url: String,
+    #[serde(default)]
+    draft: bool,
 }
 
 pub fn load_cached_available_update(paths: &AppPaths, current_version: &str) -> Option<UpdateInfo> {
@@ -119,17 +121,22 @@ fn fetch_latest_release(current_version: &str) -> Result<Option<UpdateInfo>> {
         .timeout(Duration::from_secs(10))
         .build()
         .context("failed to build update client")?;
-    let release = client
-        .get(GITHUB_LATEST_RELEASE_API)
+    let releases = client
+        .get(GITHUB_RELEASES_API)
         .header("User-Agent", format!("ShadowSync/{current_version}"))
         .header("Accept", "application/vnd.github+json")
+        .header("X-GitHub-Api-Version", "2022-11-28")
         .send()
         .context("failed to contact GitHub Releases")?
         .error_for_status()
         .context("GitHub Releases responded with an error")?
-        .json::<GitHubRelease>()
+        .json::<Vec<GitHubRelease>>()
         .context("failed to parse the GitHub release response")?;
 
+    let Some(release) = releases.into_iter().find(|release| !release.draft) else {
+        return Ok(None);
+    };
+
     let version = normalize_tag(&release.tag_name);
     if !is_newer_version(&version, current_version) {
         return Ok(None);