Handle macOS app rename during app updates (#4491)

yujonglee · web-flow · commit b0bb3af294b9 · 2026-03-10T22:35:23.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/desktop/src/sidebar/update.tsx b/apps/desktop/src/sidebar/update.tsx
@@ -1,6 +1,5 @@
 import { type UnlistenFn } from "@tauri-apps/api/event";
 import { message } from "@tauri-apps/plugin-dialog";
-import { relaunch } from "@tauri-apps/plugin-process";
 import { useCallback, useEffect, useState } from "react";
 
 import { commands, events } from "@hypr/plugin-updater2";
@@ -14,11 +13,18 @@ export function Update() {
     if (!version) {
       return;
     }
-    const result = await commands.install(version);
-    if (result.status === "ok") {
-      await relaunch();
-    } else {
-      await message(`Failed to install update: ${result.error}`, {
+    const installResult = await commands.install(version);
+    if (installResult.status !== "ok") {
+      await message(`Failed to install update: ${installResult.error}`, {
+        title: "Update Failed",
+        kind: "error",
+      });
+      return;
+    }
+
+    const postInstallResult = await commands.postinstall(installResult.data);
+    if (postInstallResult.status !== "ok") {
+      await message(`Failed to apply update: ${postInstallResult.error}`, {
         title: "Update Failed",
         kind: "error",
       });
diff --git a/plugins/tray/src/menu_items/tray_check_update.rs b/plugins/tray/src/menu_items/tray_check_update.rs
@@ -107,7 +107,14 @@ impl MenuItemHandler for TrayCheckUpdate {
                 let app = app.clone();
                 tauri::async_runtime::spawn(async move {
                     match app.updater2().install(&version).await {
-                        Ok(()) => app.restart(),
+                        Ok(result) => {
+                            if let Err(e) = app.updater2().postinstall(result).await {
+                                app.dialog()
+                                    .message(format!("Failed to apply update: {}", e))
+                                    .title("Update Failed")
+                                    .show(|_| {});
+                            }
+                        }
                         Err(e) => {
                             app.dialog()
                                 .message(format!("Failed to install update: {}", e))
diff --git a/plugins/updater2/Cargo.toml b/plugins/updater2/Cargo.toml
@@ -22,9 +22,12 @@ tokio = { workspace = true, features = ["macros", "time"] }
 tauri = { workspace = true, features = ["test"] }
 tauri-specta = { workspace = true, features = ["derive", "typescript"] }
 
+flate2 = "1"
 serde = { workspace = true }
 specta = { workspace = true }
 strum = { workspace = true, features = ["derive"] }
+tar = "0.4"
+tempfile = { workspace = true }
 
 thiserror = { workspace = true }
 tracing = { workspace = true }
diff --git a/plugins/updater2/build.rs b/plugins/updater2/build.rs
@@ -1,4 +1,4 @@
-const COMMANDS: &[&str] = &["check", "download", "install"];
+const COMMANDS: &[&str] = &["check", "download", "install", "postinstall"];
 
 fn main() {
     tauri_plugin::Builder::new(COMMANDS).build();
diff --git a/plugins/updater2/js/bindings.gen.ts b/plugins/updater2/js/bindings.gen.ts
@@ -22,14 +22,22 @@ async download(version: string) : Promise<Result<null, string>> {
     else return { status: "error", error: e  as any };
 }
 },
-async install(version: string) : Promise<Result<null, string>> {
+async install(version: string) : Promise<Result<InstallResult, string>> {
     try {
     return { status: "ok", data: await TAURI_INVOKE("plugin:updater2|install", { version }) };
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
+async postinstall(result: InstallResult) : Promise<Result<null, string>> {
+    try {
+    return { status: "ok", data: await TAURI_INVOKE("plugin:updater2|postinstall", { result }) };
+} catch (e) {
+    if(e instanceof Error) throw e;
+    else return { status: "error", error: e  as any };
+}
+},
 async maybeEmitUpdated() : Promise<void> {
     await TAURI_INVOKE("plugin:updater2|maybe_emit_updated");
 }
@@ -39,10 +47,12 @@ async maybeEmitUpdated() : Promise<void> {
 
 
 export const events = __makeEvents__<{
+updateDownloadFailedEvent: UpdateDownloadFailedEvent,
 updateDownloadingEvent: UpdateDownloadingEvent,
 updateReadyEvent: UpdateReadyEvent,
 updatedEvent: UpdatedEvent
 }>({
+updateDownloadFailedEvent: "plugin:updater2:update-download-failed-event",
 updateDownloadingEvent: "plugin:updater2:update-downloading-event",
 updateReadyEvent: "plugin:updater2:update-ready-event",
 updatedEvent: "plugin:updater2:updated-event"
@@ -54,6 +64,8 @@ updatedEvent: "plugin:updater2:updated-event"
 
 /** user-defined types **/
 
+export type InstallResult = { kind: "relaunch_current" } | { kind: "macos_bundle_update"; current_path: string; staged_path: string; target_path: string; backup_path: string; stage_dir: string }
+export type UpdateDownloadFailedEvent = { version: string }
 export type UpdateDownloadingEvent = { version: string }
 export type UpdateReadyEvent = { version: string }
 export type UpdatedEvent = { previous: string | null; current: string }
diff --git a/plugins/updater2/permissions/autogenerated/commands/postinstall.toml b/plugins/updater2/permissions/autogenerated/commands/postinstall.toml
@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-postinstall"
+description = "Enables the postinstall command without any pre-configured scope."
+commands.allow = ["postinstall"]
+
+[[permission]]
+identifier = "deny-postinstall"
+description = "Denies the postinstall command without any pre-configured scope."
+commands.deny = ["postinstall"]
diff --git a/plugins/updater2/permissions/autogenerated/reference.md b/plugins/updater2/permissions/autogenerated/reference.md
@@ -7,6 +7,7 @@ Default permissions for the plugin
 - `allow-check`
 - `allow-download`
 - `allow-install`
+- `allow-postinstall`
 - `allow-maybe-emit-updated`
 
 ## Permission Table
@@ -119,6 +120,32 @@ Enables the maybe_emit_updated command without any pre-configured scope.
 
 Denies the maybe_emit_updated command without any pre-configured scope.
 
+</td>
+</tr>
+
+<tr>
+<td>
+
+`updater2:allow-postinstall`
+
+</td>
+<td>
+
+Enables the postinstall command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`updater2:deny-postinstall`
+
+</td>
+<td>
+
+Denies the postinstall command without any pre-configured scope.
+
 </td>
 </tr>
 </table>
diff --git a/plugins/updater2/permissions/default.toml b/plugins/updater2/permissions/default.toml
@@ -1,3 +1,3 @@
 [default]
 description = "Default permissions for the plugin"
-permissions = ["allow-check", "allow-download", "allow-install", "allow-maybe-emit-updated"]
+permissions = ["allow-check", "allow-download", "allow-install", "allow-postinstall", "allow-maybe-emit-updated"]
diff --git a/plugins/updater2/permissions/schemas/schema.json b/plugins/updater2/permissions/schemas/schema.json
@@ -343,10 +343,22 @@
           "markdownDescription": "Denies the maybe_emit_updated command without any pre-configured scope."
         },
         {
-          "description": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-check`\n- `allow-download`\n- `allow-install`\n- `allow-maybe-emit-updated`",
+          "description": "Enables the postinstall command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-postinstall",
+          "markdownDescription": "Enables the postinstall command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the postinstall command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-postinstall",
+          "markdownDescription": "Denies the postinstall command without any pre-configured scope."
+        },
+        {
+          "description": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-check`\n- `allow-download`\n- `allow-install`\n- `allow-postinstall`\n- `allow-maybe-emit-updated`",
           "type": "string",
           "const": "default",
-          "markdownDescription": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-check`\n- `allow-download`\n- `allow-install`\n- `allow-maybe-emit-updated`"
+          "markdownDescription": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-check`\n- `allow-download`\n- `allow-install`\n- `allow-postinstall`\n- `allow-maybe-emit-updated`"
         }
       ]
     }
diff --git a/plugins/updater2/src/commands.rs b/plugins/updater2/src/commands.rs
@@ -1,4 +1,4 @@
-use crate::Updater2PluginExt;
+use crate::{InstallResult, Updater2PluginExt};
 
 #[tauri::command]
 #[specta::specta]
@@ -25,13 +25,25 @@ pub(crate) async fn download<R: tauri::Runtime>(
 pub(crate) async fn install<R: tauri::Runtime>(
     app: tauri::AppHandle<R>,
     version: String,
-) -> Result<(), String> {
+) -> Result<InstallResult, String> {
     app.updater2()
         .install(&version)
         .await
         .map_err(|e| e.to_string())
 }
 
+#[tauri::command]
+#[specta::specta]
+pub(crate) async fn postinstall<R: tauri::Runtime>(
+    app: tauri::AppHandle<R>,
+    result: InstallResult,
+) -> Result<(), String> {
+    app.updater2()
+        .postinstall(result)
+        .await
+        .map_err(|e| e.to_string())
+}
+
 #[tauri::command]
 #[specta::specta]
 pub(crate) fn maybe_emit_updated<R: tauri::Runtime>(app: tauri::AppHandle<R>) {
diff --git a/plugins/updater2/src/error.rs b/plugins/updater2/src/error.rs
@@ -18,6 +18,20 @@ pub enum Error {
     UpdateNotAvailable,
     #[error("version mismatch: expected {expected}, got {actual}")]
     VersionMismatch { expected: String, actual: String },
+    #[error("failed to determine current app path")]
+    FailedToDetermineCurrentAppPath,
+    #[error("failed to determine target app path")]
+    FailedToDetermineTargetAppPath,
+    #[error("invalid update archive: {0}")]
+    InvalidUpdateArchive(String),
+    #[error("failed to schedule installed app launch at {path}: {details}")]
+    FailedToScheduleInstalledAppLaunch { path: String, details: String },
+    #[error("macOS authorization step failed: {details}")]
+    MacosAuthorizationFailed { details: String },
+    #[error("macOS target bundle already exists at {path}")]
+    MacosTargetBundleConflict { path: String },
+    #[error("invalid postinstall state: {0}")]
+    InvalidPostinstallState(String),
 }
 
 impl Serialize for Error {
diff --git a/plugins/updater2/src/ext.rs b/plugins/updater2/src/ext.rs
diff --git a/plugins/updater2/src/lib.rs b/plugins/updater2/src/lib.rs
diff --git a/plugins/updater2/src/migration.rs b/plugins/updater2/src/migration.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const COMMANDS: &[&str] = &["check", "download", "install"];`
	`1`	`+const COMMANDS: &[&str] = &["check", "download", "install", "postinstall"];`
`2`	`2`
`3`	`3`	`fn main() {`
`4`	`4`	`tauri_plugin::Builder::new(COMMANDS).build();`