From 3fe4d859dfc10a42bdbfdb78bdceac89a0c5f95f Mon Sep 17 00:00:00 2001
From: Jacky <me@jackyu.cn>
Date: Sat, 3 May 2025 08:13:58 +0800
Subject: [PATCH] feat(ota): show short hash

---
 app/src/api/upgrade.ts           |  8 ++++++++
 app/src/lib/http/error.ts        |  5 +++--
 app/src/version.json             |  2 +-
 app/src/views/system/Upgrade.vue | 15 ++++++++++++---
 internal/version/info.go         | 20 ++++++++------------
 internal/version/version.go      |  2 ++
 6 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/app/src/api/upgrade.ts b/app/src/api/upgrade.ts
index 3c665c58..01d42d07 100644
--- a/app/src/api/upgrade.ts
+++ b/app/src/api/upgrade.ts
@@ -7,6 +7,14 @@ export interface RuntimeInfo {
   ex_path: string
   body: string
   published_at: string
+  cur_version: Info
+}
+
+interface Info {
+  version: string
+  build_id: number
+  total_build: number
+  short_hash: string
 }
 
 const upgrade = {
diff --git a/app/src/lib/http/error.ts b/app/src/lib/http/error.ts
index 8844ba2b..278df2f1 100644
--- a/app/src/lib/http/error.ts
+++ b/app/src/lib/http/error.ts
@@ -32,12 +32,13 @@ export function handleApiError(err: CosyError, dedupe: MessageDedupe) {
     if (!errors[err.scope]) {
       try {
         // Dynamic import error files
-        import(/* @vite-ignore */ `@/constants/errors/${err.scope}.ts`)
+        import(`@/constants/errors/${err.scope}.ts`)
           .then(error => {
             registerError(err.scope!, error.default)
             displayErrorMessage(err, dedupe)
           })
-          .catch(() => {
+          .catch(err => {
+            console.error(err)
             dedupe.error($gettext(err?.message ?? 'Server error'))
           })
       }
diff --git a/app/src/version.json b/app/src/version.json
index 3c57c814..34f9d432 100644
--- a/app/src/version.json
+++ b/app/src/version.json
@@ -1 +1 @@
-{"version":"2.0.0-rc.6","build_id":1,"total_build":417}
\ No newline at end of file
+{"version":"2.0.0-rc.6","build_id":2,"total_build":418}
\ No newline at end of file
diff --git a/app/src/views/system/Upgrade.vue b/app/src/views/system/Upgrade.vue
index 8f0c2d67..77338f14 100644
--- a/app/src/views/system/Upgrade.vue
+++ b/app/src/views/system/Upgrade.vue
@@ -137,6 +137,15 @@ async function performUpgrade() {
     }, 2000)
   }
 }
+
+const performUpgradeBtnText = computed(() => {
+  if (channel.value === 'dev')
+    return $gettext('Install')
+  else if (isLatestVer.value)
+    return $gettext('Reinstall')
+  else
+    return $gettext('Upgrade')
+})
 </script>
 
 <template>
@@ -162,7 +171,7 @@ async function performUpgrade() {
     </AModal>
     <div class="upgrade-container">
       <p>{{ $gettext('You can check Nginx UI upgrade at this page.') }}</p>
-      <h3>{{ $gettext('Current Version') }}: v{{ version.version }}</h3>
+      <h3>{{ $gettext('Current Version') }}: v{{ version.version }} <span class="short-hash">({{ data?.cur_version?.short_hash }})</span></h3>
       <template v-if="getReleaseError">
         <AAlert
           type="error"
@@ -200,7 +209,7 @@ async function performUpgrade() {
         </AFormItem>
         <template v-if="!loading">
           <AAlert
-            v-if="isLatestVer"
+            v-if="isLatestVer && channel !== 'dev'"
             type="success"
             :message="$gettext('You are using the latest version')"
             banner
@@ -226,7 +235,7 @@ async function performUpgrade() {
                 ghost
                 @click="performUpgrade"
               >
-                {{ isLatestVer ? $gettext('Reinstall') : $gettext('Upgrade') }}
+                {{ performUpgradeBtnText }}
               </AButton>
             </ASpace>
           </div>
diff --git a/internal/version/info.go b/internal/version/info.go
index 585db3cf..65122e70 100644
--- a/internal/version/info.go
+++ b/internal/version/info.go
@@ -9,15 +9,10 @@ import (
 )
 
 type RuntimeInfo struct {
-	OS     string `json:"os"`
-	Arch   string `json:"arch"`
-	ExPath string `json:"ex_path"`
-}
-
-type CurVersion struct {
-	Version    string `json:"version"`
-	BuildID    int    `json:"build_id"`
-	TotalBuild int    `json:"total_build"`
+	OS         string `json:"os"`
+	Arch       string `json:"arch"`
+	ExPath     string `json:"ex_path"`
+	CurVersion *Info  `json:"cur_version"`
 }
 
 func GetRuntimeInfo() (r RuntimeInfo, err error) {
@@ -33,9 +28,10 @@ func GetRuntimeInfo() (r RuntimeInfo, err error) {
 	}
 
 	r = RuntimeInfo{
-		OS:     runtime.GOOS,
-		Arch:   runtime.GOARCH,
-		ExPath: realPath,
+		OS:         runtime.GOOS,
+		Arch:       runtime.GOARCH,
+		ExPath:     realPath,
+		CurVersion: GetVersionInfo(),
 	}
 
 	return
diff --git a/internal/version/version.go b/internal/version/version.go
index 81266767..43ab0502 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -11,6 +11,7 @@ type Info struct {
 	Version    string `json:"version"`
 	BuildId    int    `json:"build_id"`
 	TotalBuild int    `json:"total_build"`
+	ShortHash  string `json:"short_hash"`
 }
 
 var versionInfo *Info
@@ -21,6 +22,7 @@ func GetVersionInfo() *Info {
 			Version:    Version,
 			BuildId:    BuildId,
 			TotalBuild: TotalBuild,
+			ShortHash:  GetShortHash(),
 		}
 	}
 	return versionInfo