Run update installer silently (#314)

Co-authored-by: Owen McGirr <o.a.mcgirr@gmail.com>

Author: enaboapps

installer/SwitchifyPc.DotNet.nsi

@@ -66,6 +66,10 @@ Section "Switchify PC" SecMain
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Switchify PC" "UninstallString" "$INSTDIR\Uninstall.exe"
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Switchify PC" "NoModify" 1
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Switchify PC" "NoRepair" 1
+
+  IfSilent 0 done
+  Exec '"$INSTDIR\${APP_EXE}"'
+  done:
 SectionEnd
 
 Section "Uninstall"
@@ -118,6 +122,20 @@ Function CloseRunningAppForInstall
     Return
   ${EndIf}
 
+  IfSilent silent_force_close force_prompt
+
+  silent_force_close:
+  DetailPrint "Closing Switchify PC..."
+  nsExec::ExecToStack 'cmd /c taskkill /IM "${APP_EXE}" /F /T >NUL 2>NUL'
+  Pop $0
+  Pop $1
+  Call WaitForAppExit
+  ${If} $0 == 0
+    Return
+  ${EndIf}
+  SetErrorLevel 1
+  Abort
+
   force_prompt:
   MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "Switchify PC needs to close before installation can continue.$\r$\n$\r$\nClick OK to close Switchify PC and continue installing, or Cancel to stop the installer." IDOK force_close IDCANCEL cancel
 
@@ -176,6 +194,20 @@ Function un.CloseRunningAppForInstall
     Return
   ${EndIf}
 
+  IfSilent silent_force_close force_prompt
+
+  silent_force_close:
+  DetailPrint "Closing Switchify PC..."
+  nsExec::ExecToStack 'cmd /c taskkill /IM "${APP_EXE}" /F /T >NUL 2>NUL'
+  Pop $0
+  Pop $1
+  Call un.WaitForAppExit
+  ${If} $0 == 0
+    Return
+  ${EndIf}
+  SetErrorLevel 1
+  Abort
+
   force_prompt:
   MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "Switchify PC needs to close before uninstalling can continue.$\r$\n$\r$\nClick OK to close Switchify PC and continue uninstalling, or Cancel to stop the uninstaller." IDOK force_close IDCANCEL cancel
 

scripts/Verify-DotnetPackage.ps1

@@ -49,6 +49,10 @@ function Assert-InstallerScript {
   Assert-Includes -Content $content -Expected 'find /I "${APP_EXE}"' -Label 'installer process detection'
   Assert-Includes -Content $content -Expected '--quit-for-install' -Label 'installer graceful app quit signal'
   Assert-Includes -Content $content -Expected 'taskkill /IM "${APP_EXE}" /F /T' -Label 'installer force-close fallback'
+  Assert-Includes -Content $content -Expected 'IfSilent' -Label 'installer silent-mode handling'
+  Assert-Includes -Content $content -Expected 'Exec ''"$INSTDIR\${APP_EXE}"''' -Label 'installer silent relaunch'
+  Assert-Includes -Content $content -Expected 'silent_force_close:' -Label 'installer silent force-close path'
+  Assert-Includes -Content $content -Expected 'SetErrorLevel 1' -Label 'installer silent failure exit code'
   Assert-Includes -Content $content -Expected 'Software\Microsoft\Windows\CurrentVersion\Uninstall\Switchify PC' -Label 'installer uninstall registry key'
 }
 

src/SwitchifyPc.App/SettingsWindow.xaml.cs

@@ -145,13 +145,6 @@ await RunActionAsync(
     private async void InstallUpdate_Click(object sender, RoutedEventArgs e)
     {
         if (controller is null) return;
-        MessageBoxResult confirmation = WpfMessageBox.Show(
-            "Open the downloaded Switchify PC installer?\n\nThe installer will open in Windows and may close Switchify PC while the update is installed. If you rely on Switchify to control this computer, make sure you have another way to complete the installer before continuing.",
-            "Install update?",
-            MessageBoxButton.OKCancel,
-            MessageBoxImage.Warning,
-            MessageBoxResult.Cancel);
-        if (confirmation != MessageBoxResult.OK) return;
 
         await RunActionAsync(async () =>
         {

src/SwitchifyPc.Core/Updates/UpdateModels.cs

@@ -96,3 +96,5 @@ public sealed record UpdateInstallerLaunchResult(bool Ok, UpdateInstallFailureRe
     public static UpdateInstallerLaunchResult Success() => new(true);
     public static UpdateInstallerLaunchResult Failure(UpdateInstallFailureReason reason) => new(false, reason);
 }
+
+public sealed record UpdateInstallerLaunchOptions(bool Silent);

src/SwitchifyPc.Core/Updates/UpdateService.cs

@@ -12,7 +12,10 @@ Task<UpdateDownloadOutcome> DownloadUpdateAsync(
 
 public interface IUpdateInstallerLauncher
 {
-    Task<UpdateInstallerLaunchResult> LaunchAsync(string? installerPath, CancellationToken cancellationToken = default);
+    Task<UpdateInstallerLaunchResult> LaunchAsync(
+        string? installerPath,
+        UpdateInstallerLaunchOptions options,
+        CancellationToken cancellationToken = default);
 }
 
 public interface IUpdatePollScheduler
@@ -228,7 +231,9 @@ public async Task<UpdateInstallResult> InstallDownloadedUpdateAsync(Cancellation
             installerPath = downloadedInstallerPath;
         }
 
-        UpdateInstallerLaunchResult result = await installerLauncher.LaunchAsync(installerPath, cancellationToken).ConfigureAwait(false);
+        UpdateInstallerLaunchResult result = await installerLauncher
+            .LaunchAsync(installerPath, new UpdateInstallerLaunchOptions(Silent: true), cancellationToken)
+            .ConfigureAwait(false);
         return result.Ok
             ? UpdateInstallResult.Success()
             : UpdateInstallResult.Failure(result.Reason ?? UpdateInstallFailureReason.InstallerLaunchFailed);

src/SwitchifyPc.Tests/UpdateServiceTests.cs

@@ -103,6 +103,7 @@ public async Task InstallOpensDownloadedInstallerAndKeepsServiceState()
         Assert.True(result.Ok);
         Assert.Equal(1, launcher.LaunchCalls);
         Assert.Equal(@"C:\cache\Switchify-PC-Setup-0.2.0-x64.exe", launcher.LastInstallerPath);
+        Assert.Equal(new UpdateInstallerLaunchOptions(Silent: true), launcher.LastOptions);
         Assert.Equal(UpdateDownloadStatus.Downloaded, service.GetState().Download.Status);
     }
 
@@ -291,12 +292,17 @@ private sealed class FakeInstallerLauncher : IUpdateInstallerLauncher
     {
         public int LaunchCalls { get; private set; }
         public string? LastInstallerPath { get; private set; }
+        public UpdateInstallerLaunchOptions? LastOptions { get; private set; }
         public UpdateInstallerLaunchResult Result { get; init; } = UpdateInstallerLaunchResult.Success();
 
-        public Task<UpdateInstallerLaunchResult> LaunchAsync(string? installerPath, CancellationToken cancellationToken = default)
+        public Task<UpdateInstallerLaunchResult> LaunchAsync(
+            string? installerPath,
+            UpdateInstallerLaunchOptions options,
+            CancellationToken cancellationToken = default)
         {
             LaunchCalls++;
             LastInstallerPath = installerPath;
+            LastOptions = options;
             return Task.FromResult(Result);
         }
     }

src/SwitchifyPc.Tests/WindowsUpdateInstallerLauncherTests.cs

@@ -12,7 +12,9 @@ public async Task ReturnsInstallerUnavailableWhenInstallerPathIsMissing()
         FakeProcessShell shell = new();
         WindowsUpdateInstallerLauncher launcher = new(shell, _ => false);
 
-        UpdateInstallerLaunchResult result = await launcher.LaunchAsync(@"C:\cache\missing.exe");
+        UpdateInstallerLaunchResult result = await launcher.LaunchAsync(
+            @"C:\cache\missing.exe",
+            new UpdateInstallerLaunchOptions(Silent: false));
 
         Assert.False(result.Ok);
         Assert.Equal(UpdateInstallFailureReason.InstallerUnavailable, result.Reason);
@@ -25,7 +27,9 @@ public async Task ReturnsInstallerUnavailableWhenInstallerPathIsNull()
         FakeProcessShell shell = new();
         WindowsUpdateInstallerLauncher launcher = new(shell, _ => true);
 
-        UpdateInstallerLaunchResult result = await launcher.LaunchAsync(null);
+        UpdateInstallerLaunchResult result = await launcher.LaunchAsync(
+            null,
+            new UpdateInstallerLaunchOptions(Silent: false));
 
         Assert.False(result.Ok);
         Assert.Equal(UpdateInstallFailureReason.InstallerUnavailable, result.Reason);
@@ -38,23 +42,45 @@ public async Task OpensInstallerThroughWindowsShell()
         FakeProcessShell shell = new();
         WindowsUpdateInstallerLauncher launcher = new(shell, _ => true);
 
-        UpdateInstallerLaunchResult result = await launcher.LaunchAsync(@"C:\cache\Switchify-PC-Setup-0.2.0-x64.exe");
+        UpdateInstallerLaunchResult result = await launcher.LaunchAsync(
+            @"C:\cache\Switchify-PC-Setup-0.2.0-x64.exe",
+            new UpdateInstallerLaunchOptions(Silent: false));
 
         Assert.True(result.Ok);
         Assert.NotNull(shell.LastStartInfo);
         Assert.Equal(@"C:\cache\Switchify-PC-Setup-0.2.0-x64.exe", shell.LastStartInfo.FileName);
+        Assert.Equal(string.Empty, shell.LastStartInfo.Arguments);
         Assert.True(shell.LastStartInfo.UseShellExecute);
         Assert.Equal(ProcessWindowStyle.Normal, shell.LastStartInfo.WindowStyle);
         Assert.Equal(@"C:\cache", shell.LastStartInfo.WorkingDirectory);
     }
 
+    [Fact]
+    public async Task LaunchesSilentInstallerWithNsisSilentArgument()
+    {
+        FakeProcessShell shell = new();
+        WindowsUpdateInstallerLauncher launcher = new(shell, _ => true);
+
+        UpdateInstallerLaunchResult result = await launcher.LaunchAsync(
+            @"C:\cache\Switchify-PC-Setup-0.2.0-x64.exe",
+            new UpdateInstallerLaunchOptions(Silent: true));
+
+        Assert.True(result.Ok);
+        Assert.NotNull(shell.LastStartInfo);
+        Assert.Equal("/S", shell.LastStartInfo.Arguments);
+        Assert.True(shell.LastStartInfo.UseShellExecute);
+        Assert.Equal(ProcessWindowStyle.Normal, shell.LastStartInfo.WindowStyle);
+    }
+
     [Fact]
     public async Task ReturnsLaunchFailedWhenShellReturnsFalse()
     {
         FakeProcessShell shell = new() { StartResult = false };
         WindowsUpdateInstallerLauncher launcher = new(shell, _ => true);
 
-        UpdateInstallerLaunchResult result = await launcher.LaunchAsync(@"C:\cache\setup.exe");
+        UpdateInstallerLaunchResult result = await launcher.LaunchAsync(
+            @"C:\cache\setup.exe",
+            new UpdateInstallerLaunchOptions(Silent: false));
 
         Assert.False(result.Ok);
         Assert.Equal(UpdateInstallFailureReason.InstallerLaunchFailed, result.Reason);
@@ -66,7 +92,9 @@ public async Task ReturnsLaunchFailedWhenShellThrows()
         FakeProcessShell shell = new() { ThrowOnStart = true };
         WindowsUpdateInstallerLauncher launcher = new(shell, _ => true);
 
-        UpdateInstallerLaunchResult result = await launcher.LaunchAsync(@"C:\cache\setup.exe");
+        UpdateInstallerLaunchResult result = await launcher.LaunchAsync(
+            @"C:\cache\setup.exe",
+            new UpdateInstallerLaunchOptions(Silent: false));
 
         Assert.False(result.Ok);
         Assert.Equal(UpdateInstallFailureReason.InstallerLaunchFailed, result.Reason);

src/SwitchifyPc.Windows/Updates/WindowsUpdateInstallerLauncher.cs

@@ -29,7 +29,10 @@ public WindowsUpdateInstallerLauncher(IProcessShell? processShell = null, Func<s
         this.fileExists = fileExists ?? File.Exists;
     }
 
-    public Task<UpdateInstallerLaunchResult> LaunchAsync(string? installerPath, CancellationToken cancellationToken = default)
+    public Task<UpdateInstallerLaunchResult> LaunchAsync(
+        string? installerPath,
+        UpdateInstallerLaunchOptions options,
+        CancellationToken cancellationToken = default)
     {
         if (string.IsNullOrWhiteSpace(installerPath) || !fileExists(installerPath))
         {
@@ -42,6 +45,7 @@ public Task<UpdateInstallerLaunchResult> LaunchAsync(string? installerPath, Canc
             ProcessStartInfo startInfo = new()
             {
                 FileName = installerPath,
+                Arguments = options.Silent ? "/S" : string.Empty,
                 UseShellExecute = true,
                 WindowStyle = ProcessWindowStyle.Normal,
                 WorkingDirectory = Path.GetDirectoryName(installerPath) ?? string.Empty