Merge pull request #735 from fernandotonon/feat/updater-install-446-448

feat(updater): install + relauncher (#446–448)

Author: fernandotonon

.github/workflows/deploy.yml

@@ -895,10 +895,9 @@ jobs:
     needs: [build-n-cache-assimp-linux, build-n-cache-ogre-linux]
     runs-on: ubuntu-latest
     # Hard cap on the whole job. The full sweep takes ~12 min normally
-    # (build + xvfb + ~25 suites + coverage + sonar). Cap at 45 so a
-    # hung suite or a deadlock surfaces in well under an hour instead
-    # of camping on the runner for GitHub's default 6-hour ceiling.
-    timeout-minutes: 45
+    # (build + xvfb + ~25 suites + coverage + sonar). Cap at 60 so a
+    # cold ccache build on a large PR still finishes under the limit.
+    timeout-minutes: 60
     permissions: read-all
     env: 
           LD_LIBRARY_PATH: gcc_64/lib/:/usr/local/lib/:/usr/local/lib/OGRE/:/usr/local/lib/pkgconfig/:/lib/x86_64-linux-gnu/
@@ -987,9 +986,12 @@ jobs:
         create-symlink: true
 
     - name: Setup headless environment for Qt tests
+      env:
+        DEBIAN_FRONTEND: noninteractive
       run: |
             sudo apt-get update
-            sudo apt-get install -y libxcb-cursor0 libxcb-xinerama0 libx11-dev xvfb \
+            sudo apt-get install -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold \
+                libxcb-cursor0 libxcb-xinerama0 libx11-dev xvfb \
                 mesa-utils libgl1-mesa-dri libegl-mesa0 libgbm1 libglx-mesa0 \
                 libsecret-1-dev libretro-beetle-psx libsodium-dev
             # Start Xvfb with GLX support for Ogre GL initialization

qml/UpdaterDialog.qml

@@ -37,7 +37,8 @@ Window {
             if (event.key === Qt.Key_Escape) {
                 if (UpdaterController.state === UpdaterController.Checking
                     || UpdaterController.state === UpdaterController.Downloading
-                    || UpdaterController.state === UpdaterController.Verifying) {
+                    || UpdaterController.state === UpdaterController.Verifying
+                    || UpdaterController.state === UpdaterController.Installing) {
                     UpdaterController.cancel()
                 }
                 UpdaterController.dismiss()
@@ -100,6 +101,7 @@ Window {
                 case UpdaterController.Downloading: return "Downloading update…"
                 case UpdaterController.Verifying: return "Verifying download…"
                 case UpdaterController.ReadyToInstall: return "Ready to install"
+                case UpdaterController.Installing: return "Installing update…"
                 default: return "Software updates"
                 }
             }
@@ -119,6 +121,7 @@ Window {
             running: UpdaterController.state === UpdaterController.Checking
                      || UpdaterController.state === UpdaterController.Downloading
                      || UpdaterController.state === UpdaterController.Verifying
+                     || UpdaterController.state === UpdaterController.Installing
             visible: running
         }
 
@@ -272,7 +275,7 @@ Window {
             }
         }
 
-        // Ready to install (#444 — install step lands in #446–448)
+        // Ready to install (#446–448)
         ColumnLayout {
             Layout.fillWidth: true
             visible: UpdaterController.state === UpdaterController.ReadyToInstall
@@ -283,11 +286,33 @@ Window {
                 color: PropertiesPanelController.textColor
                 font.pixelSize: 12
                 text: "Update " + UpdaterController.latestVersion +
-                      " downloaded and verified. Automatic installation will be available in a future release."
+                      " downloaded and verified. Install now to replace this copy and restart."
             }
-            InspectorButton {
-                label: "Close"
-                onClicked: { UpdaterController.dismiss(); dialog.close() }
+            RowLayout {
+                spacing: 8
+                InspectorButton {
+                    label: "Install & restart"
+                    primary: true
+                    onClicked: UpdaterController.installUpdate()
+                }
+                InspectorButton {
+                    label: "Later"
+                    onClicked: { UpdaterController.dismiss(); dialog.close() }
+                }
+            }
+        }
+
+        // Installing
+        ColumnLayout {
+            Layout.fillWidth: true
+            visible: UpdaterController.state === UpdaterController.Installing
+            spacing: 8
+            Text {
+                Layout.fillWidth: true
+                wrapMode: Text.WordWrap
+                color: PropertiesPanelController.textColor
+                font.pixelSize: 12
+                text: "Preparing installation. The application will close and restart automatically."
             }
         }
 

src/CMakeLists.txt

@@ -97,14 +97,6 @@ TextureAtlasPacker.cpp
 PaintBufferImageProvider.cpp
 PaintSelectionMask.cpp
 TexturePaintBuffer.cpp
-UpdateVersion.cpp
-updater/InstallFlavor.cpp
-updater/ArtifactResolver.cpp
-updater/UpdateVerifier.cpp
-updater/MinisignVerify.cpp
-updater/GitHubReleaseParser.cpp
-updater/UpdaterWorker.cpp
-updater/UpdaterController.cpp
 TexturePaintController.cpp
 VertexColorBaker.cpp
 VATBaker.cpp
@@ -239,13 +231,6 @@ PaintBufferImageProvider.h
 PaintSelectionMask.h
 TexturePaintBuffer.h
 UpdateVersion.h
-updater/InstallFlavor.h
-updater/ArtifactResolver.h
-updater/UpdateVerifier.h
-updater/MinisignVerify.h
-updater/GitHubReleaseParser.h
-updater/UpdaterWorker.h
-updater/UpdaterController.h
 TexturePaintController.h
 VertexColorBaker.h
 ApplyAtlas.h
@@ -298,6 +283,8 @@ ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/PS1")
 # if we don't include this CMake will not include ui headers properly:
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${BUILD_INCLUDE_DIR} ${BUILD_UIH_DIR})
 
+add_subdirectory(updater)
+
 ##############################################################
 #  Processing ogre-procedural
 ##############################################################
@@ -553,6 +540,7 @@ Qt::QuickControls2
 meshoptimizer
 xatlas
 qtmesh_sodium
+qtmesh_updater
 )
 
 # One-time legacy secret-store read for migration (see CloudCredentialStore).
@@ -588,6 +576,18 @@ if(ENABLE_PS1_RIP AND TARGET Qt6::Gamepad)
     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE HAVE_QT_GAMEPAD)
     target_link_libraries(${CMAKE_PROJECT_NAME} Qt6::Gamepad)
 endif()
+
+if(ENABLE_AUTO_UPDATER AND TARGET qtmesh-relauncher)
+    add_dependencies(${CMAKE_PROJECT_NAME} qtmesh-relauncher)
+    if(APPLE)
+        add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy
+                "${CMAKE_BINARY_DIR}/bin/qtmesh-relauncher"
+                "$<TARGET_BUNDLE_DIR:${CMAKE_PROJECT_NAME}>/Contents/MacOS/qtmesh-relauncher"
+            COMMENT "Copying qtmesh-relauncher into app bundle"
+        )
+    endif()
+endif()
 ENDIF()
 
 ##############################################################
@@ -646,7 +646,7 @@ if(BUILD_TESTS)
     ${OGRE_LIBRARIES}
     ${ASSIMP_LIBRARIES}
     Qt::Widgets Qt::Core Qt::Gui Qt::Test Qt::Network Qt::Qml Qt::Quick Qt::QuickWidgets Qt::QuickControls2
-    meshoptimizer xatlas qtmesh_sodium)
+    meshoptimizer xatlas qtmesh_sodium qtmesh_updater)
 
     # CloudCredentialStore.cpp (compiled into the tests) does a one-time legacy
     # secret-store read in migrateLegacySettingsIfNeeded(), which

src/updater/CMakeLists.txt

@@ -0,0 +1,37 @@
+set(QTMESH_UPDATER_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/../UpdateVersion.cpp
+    InstallFlavor.cpp
+    ArtifactResolver.cpp
+    UpdateVerifier.cpp
+    MinisignVerify.cpp
+    GitHubReleaseParser.cpp
+    UpdaterWorker.cpp
+    UpdaterController.cpp
+    UpdaterInstaller.cpp
+)
+
+add_library(qtmesh_updater STATIC ${QTMESH_UPDATER_SOURCES})
+set_target_properties(qtmesh_updater PROPERTIES
+    AUTOMOC ON
+    POSITION_INDEPENDENT_CODE ON
+)
+target_include_directories(qtmesh_updater
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/..
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
+target_link_libraries(qtmesh_updater
+    PUBLIC
+        Qt6::Core
+        Qt6::Network
+        Qt6::Qml
+        qtmesh_sodium
+)
+
+if(BUILD_TESTS)
+    target_compile_definitions(qtmesh_updater PRIVATE QTMESH_UNIT_TESTS)
+endif()
+
+if(ENABLE_AUTO_UPDATER AND BUILD_QT_MESH_EDITOR)
+    add_subdirectory(relauncher)
+endif()

src/updater/UpdaterController.cpp

@@ -1,5 +1,6 @@
 #include "UpdaterController.h"
 #include "ArtifactResolver.h"
+#include "UpdaterInstaller.h"
 #include "UpdaterWorker.h"
 #include "AppSettingsKeys.h"
 #include "SentryReporter.h"
@@ -34,6 +35,7 @@ QString stateToString(UpdaterController::State state)
     case UpdaterController::State::Downloading: return QStringLiteral("downloading");
     case UpdaterController::State::Verifying: return QStringLiteral("verifying");
     case UpdaterController::State::ReadyToInstall: return QStringLiteral("ready_to_install");
+    case UpdaterController::State::Installing: return QStringLiteral("installing");
     }
     return QStringLiteral("idle");
 }
@@ -369,6 +371,54 @@ void UpdaterController::downloadAndInstall()
     beginDownloadIfNeeded(true);
 }
 
+void UpdaterController::installUpdate()
+{
+    if (m_state != State::ReadyToInstall) {
+        return;
+    }
+
+    SentryReporter::addBreadcrumb(QStringLiteral("updater.install.start"),
+                                  QStringLiteral("version=%1").arg(m_latestVersion));
+    setError(QString());
+    setState(State::Installing);
+    logDialogStateBreadcrumb();
+
+    UpdaterInstaller::InstallContext context;
+    context.stagedArtifactPath = m_stagedArtifactPath;
+    context.releaseTag = m_latestVersion;
+    context.executablePath = QCoreApplication::applicationFilePath();
+    context.installRoot = UpdaterInstaller::resolveInstallRoot(context.executablePath);
+    context.parentPid = QCoreApplication::applicationPid();
+
+    const UpdaterInstaller::InstallPlan plan = UpdaterInstaller::prepareInstall(context);
+    if (!plan.ok) {
+        SentryReporter::addBreadcrumb(QStringLiteral("updater.install.error"),
+                                      plan.errorMessage,
+                                      QStringLiteral("error"));
+        setError(plan.errorMessage.isEmpty()
+                     ? tr("Could not prepare the update for installation.")
+                     : plan.errorMessage);
+        setState(State::Error);
+        logDialogStateBreadcrumb();
+        return;
+    }
+
+    if (!UpdaterInstaller::launchRelauncher(plan)) {
+        SentryReporter::addBreadcrumb(QStringLiteral("updater.install.error"),
+                                      QStringLiteral("relauncher missing or failed to start"),
+                                      QStringLiteral("error"));
+        setError(tr("Could not launch the update installer. "
+                    "Make sure qtmesh-relauncher is next to the application binary."));
+        setState(State::Error);
+        logDialogStateBreadcrumb();
+        return;
+    }
+
+    SentryReporter::addBreadcrumb(QStringLiteral("updater.install.relaunch"),
+                                  plan.manifestPath);
+    QApplication::quit();
+}
+
 void UpdaterController::beginDownloadIfNeeded(bool userInitiated)
 {
     if (m_state != State::UpdateAvailable) {

src/updater/UpdaterController.h

@@ -15,7 +15,8 @@
  * @brief QML-facing singleton orchestrating update checks (#441, #443, #449).
  *
  * Mirrors the LLMManager / SDManager pattern: main-thread controller with
- * a worker thread for HTTP. Install/relaunch land in #446–448.
+ * a worker thread for HTTP. Install/relaunch (#446–448) runs on the main thread
+ * via UpdaterInstaller before the app exits.
  */
 class UpdaterController : public QObject
 {
@@ -52,6 +53,7 @@ class UpdaterController : public QObject
         Downloading,
         Verifying,
         ReadyToInstall,
+        Installing,
     };
     Q_ENUM(State)
 
@@ -84,6 +86,7 @@ class UpdaterController : public QObject
     Q_INVOKABLE void requestCheckDialog();
     Q_INVOKABLE void confirmUnknownInstall();
     Q_INVOKABLE void downloadAndInstall();
+    Q_INVOKABLE void installUpdate();
     Q_INVOKABLE void cancel();
     Q_INVOKABLE void dismiss();
     Q_INVOKABLE void remindLater();