Merge remote-tracking branch 'vibe/vibe'

Resolve merge conflicts across nvhttp.cpp, custom_actions.wxs, and
VibeshineInstaller.cs. Keeps all Vibepollo-specific features (permission
system, UUID-based app launching, input-only mode, allow_display_changes,
preinstall migration cleanup, service recovery helpers) while porting
upstream improvements:

- Add null-guard on mail::man before raising switch_display event
  during virtual display recovery (prevents potential null deref)
- Wrap runtime config overrides in update_runtime_overrides guard
  to preserve active session state when a second client connects
- Remove PruneWebDir custom action from WiX (upstream fix)
- Add competing product pre-uninstall and restart propagation logic
- Improve installer warning message clarity

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: Nonary

.rgignore

@@ -0,0 +1,38 @@
+# Generated and tool output.
+build/
+out/
+CMakeFiles/
+cmake-build-*/
+test-results/
+tmp/
+venv/
+node_modules/
+.npm/
+
+# Ignore common nested build output directories.
+**/build/**
+**/out/**
+**/CMakeFiles/**
+**/cmake-build-*/
+**/node_modules/**
+**/venv/**
+**/test-results/**
+
+# Third-party policy:
+# Keep third-party mostly excluded and only allow folders we actively modify.
+third-party/*
+!third-party/libwebrtc/
+!third-party/libwebrtc/**
+!third-party/tray/
+!third-party/tray/**
+!third-party/libdisplaydevice/
+!third-party/libdisplaydevice/**
+
+# Handle underscore variant for compatibility with shared command snippets.
+third_party/*
+!third_party/libwebrtc/
+!third_party/libwebrtc/**
+!third_party/tray/
+!third_party/tray/**
+!third_party/libdisplaydevice/
+!third_party/libdisplaydevice/**

cmake/packaging/common.cmake

@@ -33,7 +33,8 @@ endforeach()
 
 # install built vite assets
 install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/assets/web"
-        DESTINATION "${SUNSHINE_ASSETS_DIR}")
+        DESTINATION "${SUNSHINE_ASSETS_DIR}"
+        COMPONENT assets)
 
 # platform specific packaging
 if(WIN32)

packaging/windows/bootstrapper/VibeshineInstaller.cs

@@ -1192,9 +1192,9 @@ private static string BuildVibeshineInstallWarning(InstallerRunner.InstalledProd
         : string.Empty;
 
       return "Vibeshine" + versionSuffix + " was detected on this PC.\n\n"
-        + "Vibeshine does not carry over Vibeshine settings.\n"
+        + "Vibepollo does not carry over Vibeshine settings.\n"
         + "If you intend to stay in the Sunshine ecosystem, Vibeshine is recommended instead.\n\n"
-        + "If this is intentional, continue with Vibeshine.\n"
+        + "If this is intentional, continue with Vibepollo.\n"
         + "Continuing will uninstall Vibeshine before installation.";
     }
 
@@ -1204,7 +1204,7 @@ private static string BuildApolloInstallWarning(InstallerRunner.InstalledProduct
         : string.Empty;
 
       return "Apollo" + versionSuffix + " was detected on this PC.\n\n"
-        + "Vibeshine replaces Apollo and cannot be installed while Apollo is installed.\n"
+        + "Vibepollo replaces Apollo and cannot be installed while Apollo is installed.\n"
         + "Continuing will uninstall Apollo before installation.\n\n"
         + "Click Uninstall Apollo to proceed.";
     }
@@ -1217,8 +1217,8 @@ private string BuildLegacySunshineMigrationWarning() {
         versionSuffix = " (v" + _legacySunshineRegistration.DisplayVersion + ")";
       }
 
-      return "Sunshine" + versionSuffix + " was detected on this PC.\n\n"
-        + "Vibeshine replaces Sunshine and will automatically uninstall Sunshine first, then install Vibeshine.\n"
+      return "Legacy Sunshine" + versionSuffix + " was detected on this PC.\n\n"
+        + "Vibepollo replaces Sunshine. The bootstrapper will uninstall Sunshine first, then start the installation.\n"
         + "No settings will be lost during this migration.\n\n"
         + "Click Uninstall Sunshine to proceed.";
     }
@@ -1230,7 +1230,7 @@ private string BuildLegacyApolloMigrationWarning() {
       }
 
       return "Legacy Apollo" + versionSuffix + " was detected on this PC.\n\n"
-        + "Vibeshine replaces legacy Apollo and will automatically uninstall it first, then install Vibeshine.\n"
+        + "Vibepollo replaces legacy Apollo and will automatically uninstall it first, then install Vibepollo.\n"
         + "No settings will be carried over.\n\n"
         + "Click Uninstall Apollo to proceed.";
     }
@@ -2604,6 +2604,24 @@ public static InstallerResult RunInteractiveInstall(
         return RunElevatedBootstrapperInstall(arguments, installDirectory, installVirtualDisplayDriver, saveInstallLogs);
       }
 
+      var uninstallCompetingProductsResult = UninstallInstalledProducts(
+        "install_remove_competing",
+        true,
+        false,
+        false,
+        false,
+        false,
+        new[] { InstalledProductKind.Apollo, InstalledProductKind.Vibepollo, InstalledProductKind.Sunshine });
+      var competingProductsRequireRestart = uninstallCompetingProductsResult.ExitCode == 3010;
+      if (!uninstallCompetingProductsResult.Succeeded) {
+        return new InstallerResult {
+          Operation = InstallerOperation.Install,
+          ExitCode = uninstallCompetingProductsResult.ExitCode,
+          Message = BuildCompetingProductUninstallFailureMessage(uninstallCompetingProductsResult.Message),
+          LogPath = uninstallCompetingProductsResult.LogPath
+        };
+      }
+
       var msiPath = ResolveMsiPath(arguments.MsiPathOverride);
       var migrationCleanupResult = RunPreinstallMigrationCleanup("preinstall", true, false);
       if (migrationCleanupResult.ExitCode != 0) {
@@ -2625,13 +2643,17 @@ public static InstallerResult RunInteractiveInstall(
         logPath,
         CreatePropertyArgument("INSTALL_ROOT", installDirectory),
         "INSTALL_SUDOVDA=" + (installVirtualDisplayDriver ? "1" : "0"),
+        "SKIP_REMOVE_CONFLICTING_PRODUCTS=1",
         "REBOOT=ReallySuppress",
         "SUPPRESSMSGBOXES=1"
       };
       TryAppendSameProductReinstallProperties(args, msiPath);
 
       var exitCode = RunMsiexec(args, true, false);
       exitCode = RetryInstallWithSameProductReinstallIfNeeded(exitCode, args, msiPath, true, false);
+      if (exitCode == 0 && competingProductsRequireRestart) {
+        exitCode = 3010;
+      }
       if (exitCode != 0 && exitCode != 3010) {
         TryRecoverServiceStateAfterFailedInstall();
       }
@@ -3037,13 +3059,41 @@ public static InstallerResult RunCli(InstallerArguments arguments) {
         cliArgs.Add(logPath);
       }
 
+      var uninstallCompetingProducts = ShouldPreUninstallCompetingProducts(cliArgs);
+      var competingProductsRequireRestart = false;
+      if (uninstallCompetingProducts) {
+        var uninstallCompetingProductsResult = UninstallInstalledProducts(
+          "cli_remove_competing",
+          arguments.IsCliQuietMode(),
+          true,
+          false,
+          false,
+          false,
+          new[] { InstalledProductKind.Apollo, InstalledProductKind.Vibepollo, InstalledProductKind.Sunshine });
+        if (!uninstallCompetingProductsResult.Succeeded) {
+          return new InstallerResult {
+            Operation = InstallerOperation.Install,
+            ExitCode = uninstallCompetingProductsResult.ExitCode,
+            Message = BuildCompetingProductUninstallFailureMessage(uninstallCompetingProductsResult.Message),
+            LogPath = uninstallCompetingProductsResult.LogPath
+          };
+        }
+        competingProductsRequireRestart = uninstallCompetingProductsResult.ExitCode == 3010;
+      }
+      if (uninstallCompetingProducts && !HasProperty(cliArgs, "SKIP_REMOVE_CONFLICTING_PRODUCTS")) {
+        cliArgs.Add("SKIP_REMOVE_CONFLICTING_PRODUCTS=1");
+      }
+
       var exitCode = RunMsiexec(cliArgs, arguments.IsCliQuietMode(), true);
       exitCode = RetryInstallWithSameProductReinstallIfNeeded(
         exitCode,
         cliArgs,
         installMsiPath,
         arguments.IsCliQuietMode(),
         true);
+      if (exitCode == 0 && competingProductsRequireRestart) {
+        exitCode = 3010;
+      }
       if (exitCode != 0 && exitCode != 3010) {
         TryRecoverServiceStateAfterFailedInstall();
       }
@@ -3336,6 +3386,14 @@ private static bool IsServiceRunning(string serviceName) {
       }
     }
 
+    private static string BuildCompetingProductUninstallFailureMessage(string uninstallMessage) {
+      var prefix = "Failed to uninstall Apollo, Vibepollo, or Sunshine before starting Vibepollo installation.";
+      if (string.IsNullOrWhiteSpace(uninstallMessage)) {
+        return prefix;
+      }
+      return prefix + " " + uninstallMessage;
+    }
+
     private static InstallerResult UninstallInstalledProducts(
       string logPhase,
       bool hiddenWindow,
@@ -3645,6 +3703,17 @@ private static bool HasLogSwitch(List<string> args) {
         string.Equals(arg, "/log", StringComparison.OrdinalIgnoreCase));
     }
 
+    private static bool ShouldPreUninstallCompetingProducts(List<string> args) {
+      var operation = args.FirstOrDefault(IsOperationSwitch);
+      if (string.IsNullOrWhiteSpace(operation)) {
+        return false;
+      }
+
+      return string.Equals(operation, "/i", StringComparison.OrdinalIgnoreCase)
+        || string.Equals(operation, "/package", StringComparison.OrdinalIgnoreCase)
+        || string.Equals(operation, "/a", StringComparison.OrdinalIgnoreCase);
+    }
+
     private static string BuildLogPath(string phase) {
       var timestamp = DateTime.UtcNow.ToString("yyyyMMdd_HHmmss");
       return Path.Combine(Path.GetTempPath(), "vibeshine_" + phase + "_" + timestamp + ".log");

packaging/windows/wix/custom_actions.wxs

@@ -126,9 +126,6 @@
     <CustomAction Id="UpdatePathRemove" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Return="check" Impersonate="no" />
     <CustomAction Id="UninstallGamepad" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" />
 
-    <!-- Prune stale web assets directory prior to installing new files (avoids stale hashed JS/CSS) -->
-    <CustomAction Id="PruneWebDir" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no" />
-
     <!-- Uninstall-time actions (deferred, elevated) -->
     <CustomAction Id="RestoreNvPrefsUndo" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Return="check" Impersonate="no" />
     <CustomAction Id="RemoveConflictingProducts" BinaryKey="RemoveConflictingProductsVbs" VBScriptCall="RemoveConflictingProducts" Execute="deferred" Return="check" />
@@ -166,11 +163,6 @@
                  Property="UpdatePathAdd"
                  Value="&quot;[SystemFolder]cmd.exe&quot; /C &quot;&quot;[INSTALL_ROOT]scripts\update-path.bat&quot; add&quot;"/>
 
-    <!-- Immediate setter for pruning installed web assets directory before file copy -->
-    <CustomAction Id="SetPruneWebDir"
-                 Property="PruneWebDir"
-                 Value="&quot;[SystemFolder]WindowsPowerShell\v1.0\powershell.exe&quot; -NoProfile -ExecutionPolicy Bypass -Command &quot;$p='[INSTALL_ROOT]assets\web'; if (Test-Path -LiteralPath $p) { Remove-Item -LiteralPath $p -Recurse -Force -ErrorAction SilentlyContinue }&quot;"/>
-
 
     <!-- Guard NV prefs restore on uninstall: only run if sunshine.exe still exists -->
     <CustomAction Id="SetRestoreNvPrefsUndo"
@@ -191,10 +183,10 @@
     <!-- Immediate setter for quiet stop service -->
     <CustomAction Id="SetStopSvcQuietImmediate"
                  Property="StopSvcQuietImmediate"
-                 Value="&quot;[SystemFolder]WindowsPowerShell\v1.0\powershell.exe&quot; -ExecutionPolicy Bypass -NoProfile -Command &quot;&amp; { $names=@('ApolloService','SunshineService','sunshinesvc'); foreach($n in $names){ $svc=Get-Service -Name $n -ErrorAction SilentlyContinue; if($svc){ if($svc.Status -ne 'Stopped'){ Stop-Service -Name $n -Force -ErrorAction SilentlyContinue; $svc.WaitForStatus('Stopped','00:00:30') } } } }&quot;"/>
+                 Value="&quot;[SystemFolder]WindowsPowerShell\v1.0\powershell.exe&quot; -ExecutionPolicy Bypass -NoProfile -Command &quot;&amp; { $names=@('ApolloService','SunshineService','VibeshineService','sunshinesvc'); foreach($n in $names){ $svc=Get-Service -Name $n -ErrorAction SilentlyContinue; if($svc){ if($svc.Status -ne 'Stopped'){ Stop-Service -Name $n -Force -ErrorAction SilentlyContinue; $svc.WaitForStatus('Stopped','00:00:30') } } } }&quot;"/>
     <CustomAction Id="SetStopSvcQuiet"
                  Property="StopSvcQuiet"
-                 Value="&quot;[SystemFolder]WindowsPowerShell\v1.0\powershell.exe&quot; -ExecutionPolicy Bypass -NoProfile -Command &quot;&amp; { foreach ($name in @('SunshineService','VibeshineService', 'ApolloService')) { $svc = Get-Service -Name $name -ErrorAction SilentlyContinue; if ($svc) { if ($svc.Status -ne 'Stopped') { Stop-Service -Name $name -Force -ErrorAction SilentlyContinue; $svc.WaitForStatus('Stopped','00:00:30') } } } }&quot;"/>
+                 Value="&quot;[SystemFolder]WindowsPowerShell\v1.0\powershell.exe&quot; -ExecutionPolicy Bypass -NoProfile -Command &quot;&amp; { foreach ($name in @('ApolloService','SunshineService','VibeshineService','sunshinesvc')) { $svc = Get-Service -Name $name -ErrorAction SilentlyContinue; if ($svc) { if ($svc.Status -ne 'Stopped') { Stop-Service -Name $name -Force -ErrorAction SilentlyContinue; $svc.WaitForStatus('Stopped','00:00:30') } } } }&quot;"/>
     <!-- Immediate setter to prune everything except the config directory -->
     <CustomAction Id="SetPruneButConfig"
                  Property="PruneButConfig"
@@ -207,7 +199,7 @@
     <!-- Immediate setters for quiet process kill and service removal on manual uninstall -->
     <CustomAction Id="SetKillProcsQuietImmediate"
                  Property="KillProcsQuietImmediate"
-                 Value="&quot;[SystemFolder]WindowsPowerShell\v1.0\powershell.exe&quot; -NoProfile -ExecutionPolicy Bypass -Command &quot;$n='sunshine','sunshinesvc','sunshine_wgc_capture','playnite_launcher'; foreach($p in $n){ Get-Process -Name $p -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue }&quot;"/>
+                 Value="&quot;[SystemFolder]WindowsPowerShell\v1.0\powershell.exe&quot; -NoProfile -ExecutionPolicy Bypass -Command &quot;$n='sunshine','sunshinesvc','sunshine_wgc_capture','playnite_launcher','apollo','apollosvc'; foreach($p in $n){ Get-Process -Name $p -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue }&quot;"/>
     <CustomAction Id="SetKillProcsQuiet"
                  Property="KillProcsQuiet"
                  Value="&quot;[SystemFolder]WindowsPowerShell\v1.0\powershell.exe&quot; -NoProfile -ExecutionPolicy Bypass -Command &quot;$n='sunshine','sunshinesvc','sunshine_wgc_capture','playnite_launcher','apollo','apollosvc'; foreach($p in $n){ Get-Process -Name $p -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue }&quot;"/>

packaging/windows/wix/patch_custom_actions.wxs

@@ -14,6 +14,7 @@
     </Property>
     <Property Id="REMOVEVIRTUALDISPLAYDRIVER" Value="0" Secure="yes"/>
     <Property Id="INSTALL_SUDOVDA" Value="1" Secure="yes"/>
+    <Property Id="SKIP_REMOVE_CONFLICTING_PRODUCTS" Value="0" Secure="yes"/>
     <Condition Message="Administrator privileges are required.">Privileged</Condition>
     <Property Id="VIGEMBUS_PRESENT">
       <RegistrySearch Id="Search_ViGEmBus_Service64" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\ViGEmBus" Name="DisplayName" Type="raw" Win64="yes"/>
@@ -30,11 +31,7 @@
     </Feature>
     <InstallExecuteSequence>
       <!-- Remove conflicting products before installation starts. -->
-      <Custom Action="RemoveConflictingProducts" After="InstallInitialize">NOT Installed AND NOT REMOVE</Custom>
-
-      <!-- Prune web assets folder before installing files to avoid stale hashed assets on upgrade/repair -->
-      <Custom Action="SetPruneWebDir" Before="InstallFiles">NOT REMOVE</Custom>
-      <Custom Action="PruneWebDir" After="SetPruneWebDir">NOT REMOVE</Custom>
+      <Custom Action="RemoveConflictingProducts" After="InstallInitialize">NOT Installed AND NOT REMOVE AND SKIP_REMOVE_CONFLICTING_PRODUCTS &lt;&gt; "1"</Custom>
 
       <!-- Pre-validate stop/kill when UI can't prompt -->
       <Custom Action="SetKillProcsQuietImmediate" Before="InstallValidate">(Installed AND NOT REMOVE AND UILevel &lt; 5) OR (REMOVE = "ALL" AND NOT UPGRADINGPRODUCTCODE)</Custom>

src/nvhttp.cpp

@@ -546,7 +546,10 @@ namespace nvhttp {
                 }
 
                 // Force the capture thread to reinitialize so it rebinds to the recreated display.
-                mail::man->event<int>(mail::switch_display)->raise(-1);
+                if (mail::man) {
+                  // -1 means "reinit only; keep display selection logic intact".
+                  mail::man->event<int>(mail::switch_display)->raise(-1);
+                }
                 BOOST_LOG(info) << "Virtual display recovery: requested capture reinit to pick up recreated display.";
               }
             };
@@ -2104,6 +2107,10 @@ namespace nvhttp {
       host_audio = util::from_view(get_arg(args, "localAudioPlayMode"));
 
       bool no_active_sessions = (rtsp_stream::session_count() == 0);
+      // Runtime overrides are global process state. Do not reapply them while
+      // another RTSP session is active, otherwise a second client can mutate
+      // active stream limits (e.g. fps/encoding-related settings) mid-session.
+      const bool update_runtime_overrides = no_active_sessions;
 
       // Apply per-application runtime config overrides before we build session metadata or
       // prepare display/capture so the effective config is used everywhere.
@@ -2124,36 +2131,40 @@ namespace nvhttp {
         }
       });
 
-      try {
-        // Find the target app and apply its config overrides (if any), then layer on client overrides.
-        std::unordered_map<std::string, std::string> overrides;
-        const auto apps = proc::proc.get_apps();
-        const auto app_iter = std::find_if(apps.begin(), apps.end(), [&](const auto &app) {
-          if (!appuuid_str.empty()) {
-            return app.uuid == appuuid_str;
+      if (update_runtime_overrides) {
+        try {
+          // Find the target app and apply its config overrides (if any), then layer on client overrides.
+          std::unordered_map<std::string, std::string> overrides;
+          const auto apps = proc::proc.get_apps();
+          const auto app_iter = std::find_if(apps.begin(), apps.end(), [&](const auto &app) {
+            if (!appuuid_str.empty()) {
+              return app.uuid == appuuid_str;
+            }
+            return app.id == appid_str;
+          });
+          if (app_iter != apps.end()) {
+            overrides = app_iter->config_overrides;
           }
-          return app.id == appid_str;
-        });
-        if (app_iter != apps.end()) {
-          overrides = app_iter->config_overrides;
-        }
 
-        if (named_cert_p) {
-          for (const auto &[k, v] : named_cert_p->config_overrides) {
-            overrides.insert_or_assign(k, v);
+          if (named_cert_p) {
+            for (const auto &[k, v] : named_cert_p->config_overrides) {
+              overrides.insert_or_assign(k, v);
+            }
           }
-        }
 
-        config::set_runtime_config_overrides(std::move(overrides));
-        runtime_overrides_applied = true;
+          config::set_runtime_config_overrides(std::move(overrides));
+          runtime_overrides_applied = true;
 
-        // Re-apply config so overrides take effect in config::video/config::input/etc.
-        config::apply_config_now();
-      } catch (...) {
-        // If something goes wrong, fall back to global config only.
-        config::clear_runtime_config_overrides();
-        config::apply_config_now();
-        runtime_overrides_applied = true;
+          // Re-apply config so overrides take effect in config::video/config::input/etc.
+          config::apply_config_now();
+        } catch (...) {
+          // If something goes wrong, fall back to global config only.
+          config::clear_runtime_config_overrides();
+          config::apply_config_now();
+          runtime_overrides_applied = true;
+        }
+      } else {
+        BOOST_LOG(debug) << "Launch while an RTSP session is already active; preserving current runtime overrides.";
       }
 
       // Prevent interleaving with hot-apply while we prep/start a session