【app】fix 在macos更新成功但重启失败的问题

tzfun · Sep 10, 2024 · 6020e3f · 6020e3f
1 parent 51f7b09
commit 6020e3f
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 11 deletions.
diff --git a/app/src-tauri/Cargo.lock b/app/src-tauri/Cargo.lock
diff --git a/app/src-tauri/Cargo.toml b/app/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "etcd-workbench"
-version = "1.0.1"
+version = "1.0.0"
 description = "Etcd Workbench"
 authors = ["beifengtz"]
 edition = "2021"
@@ -13,7 +13,7 @@ tauri-build = { version = "1", features = [] }
 # [target.'cfg(target_os = "macos")'.dependencies]
 
 [dependencies]
-tauri = { version = "1", features = ["os-all", "shell-open", "window-all", "dialog-open", "dialog-save", "updater", "clipboard-write-text", "macos-private-api"] }
+tauri = { version = "1", features = [ "process-relaunch", "os-all", "shell-open", "window-all", "dialog-open", "dialog-save", "updater", "clipboard-write-text", "macos-private-api"] }
 #fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

diff --git a/app/src-tauri/tauri.conf.json b/app/src-tauri/tauri.conf.json
@@ -35,7 +35,7 @@
         "label": "main",
         "title": "Etcd Workbench",
         "width": 1200,
-        "height": 900,
+        "height": 800,
         "minWidth": 1000,
         "minHeight": 700,
         "center": true,

diff --git a/app/src-tauri/tauri.macos.conf.json b/app/src-tauri/tauri.macos.conf.json
@@ -15,14 +15,17 @@
       "dialog": {
         "open": true,
         "save": true
+      },
+      "process": {
+        "relaunch": true
       }
     },
     "windows": [
       {
         "label": "main",
         "title": "Etcd Workbench",
         "width": 1200,
-        "height": 900,
+        "height": 800,
         "minWidth": 900,
         "minHeight": 500,
         "center": true,

diff --git a/app/src-tauri/tauri.windows.conf.json b/app/src-tauri/tauri.windows.conf.json
@@ -22,7 +22,7 @@
         "label": "main",
         "title": "Etcd Workbench",
         "width": 1200,
-        "height": 900,
+        "height": 800,
         "minWidth": 900,
         "minHeight": 500,
         "center": true,

diff --git a/app/src/App.vue b/app/src/App.vue
@@ -8,7 +8,7 @@ import WindowsSystemBar from "~/components/system-bar/WindowsSystemBar.vue";
 import MacSystemBar from "~/components/system-bar/MacSystemBar.vue";
 import AppSetting from "~/pages/setting/AppSetting.vue";
 import AppMain from "~/pages/main/AppMain.vue";
-import {_checkUpdate, _listenLocal, EventName} from "~/common/events.ts";
+import {_alertError, _checkUpdate, _listenLocal, EventName} from "~/common/events.ts";
 import {_loadSettings, _useSettings, _useUpdateInfo} from "~/common/store.ts";
 import {DEFAULT_SETTING_CONFIG} from "~/common/transport/setting.ts";
 import {installUpdate} from "@tauri-apps/api/updater";
@@ -107,9 +107,13 @@ onMounted(async () => {
       updateInfo.latestVersion = manifest
 
       if (settings.autoUpdate) {
-        await installUpdate()
+        installUpdate().catch(e => {
+          console.error(e)
+          _alertError("A new version was found but the update failed. Please update manually or go to GitHub to download the latest version.")
+        })
       }
-    }).catch(() => {
+    }).catch(e => {
+      console.error(e)
       updateInfo.valid = false
     })
   }

diff --git a/app/src/common/events.ts b/app/src/common/events.ts
@@ -228,10 +228,13 @@ export function _checkUpdateAndInstall() {
         ).then(() => {
             _loading(true)
             installUpdate().then(async () => {
-                await relaunch()
+                relaunch().catch((e:string) => {
+                    console.error(e)
+                    _alertError("Unable to relaunch, please relaunch manually.")
+                })
             }).catch(e => {
                 console.error(e)
-                _alertError("Download failed: " + e)
+                _alertError("Unable to download: " + e)
             }).finally(() => {
                 _loading(false)
             })

diff --git a/scripts/lib/build_app.py b/scripts/lib/build_app.py
@@ -144,6 +144,7 @@ def build_web(bin_name, skip_merge_jar = False):
 
     os.chdir('web')
     web_path = os.getcwd()
+    execute("nvm use 22")
     execute("pnpm install")
     execute("pnpm run build")