perf: Optimize the timing for obtaining version information (#285)

Author: fit2bot

i18n/locales/en.json

@@ -132,7 +132,7 @@
     "InvalidCertificateGeneric": "Login failed: certificate or secure connection issue.",
     "NetworkError": "Login failed: network error. Please check connectivity.",
     "VersionIncompatible": "The client version is incompatible with JumpServer versions earlier than v4.10.12-lts. Please download and use the v3.0.7 client.",
-    "VersionNoMatch": "The client version does not match the JumpServer version. Please download and use the v{version} client."
+    "VersionNoMatch": "The client version does not match the JumpServer version. Please download and use the v{version} client, or upgrade JumpServer to the latest version."
   },
   "Asset": {
     "GetAssetFailed": "Get asset failed, please refresh and try again"

i18n/locales/zh.json

@@ -130,7 +130,7 @@
     "InvalidCertificateGeneric": "登录失败：证书或安全连接异常。",
     "NetworkError": "登录失败：网络异常，请检查连接",
     "VersionIncompatible": "客户端与JumpServer 版本（< v4.10.12-lts）不匹配，请下载使用 v3.0.7 的客户端",
-    "VersionNoMatch": "客户端与 JumpServer 版本不匹配，请下载使用 v{version} 版本的客户端"
+    "VersionNoMatch": "客户端与 JumpServer 版本不匹配，请下载使用 v{version} 版本的客户端或将 JumpServer 更新至最新"
   },
   "Loading": {
     "Loading": "加载中",

src-tauri/src/commands/auth_login.rs

@@ -237,22 +237,13 @@ pub async fn auth_login(
 
         // 发起请求
         let user_service = UserService::new(site.clone(), access_token.clone());
-        let (profile, permission_orgs, current_org, xpack_message, version_message) = tokio::join!(
+        let (profile, permission_orgs, current_org, xpack_message) = tokio::join!(
             user_service.get_user_profile(),
             user_service.get_permission_orgs(),
             user_service.get_current_org(),
             user_service.get_xpack_message(),
-            user_service.get_version_message(),
         );
 
-        let version = if version_message.status == 200 && version_message.success {
-            version_message.data
-        } else if version_message.status == 404 {
-            "incompatible".to_string()
-        } else {
-            "".to_string()
-        };
-
         let license_valid = if xpack_message.status == 200 && xpack_message.success {
             serde_json::from_str::<Value>(&xpack_message.data)
                 .ok()
@@ -270,7 +261,6 @@ pub async fn auth_login(
             "login-success-detected",
             serde_json::json!({
                 "status": "success",
-                "version": version,
                 "bearer": access_token,
                 "profile": profile,
                 "resolved_site": site,

src-tauri/src/commands/get_version_message.rs

@@ -0,0 +1,20 @@
+use crate::service::version::VersionService;
+
+#[tauri::command]
+pub async fn get_version_message(site: String) -> Result<String, String> {
+    if site.trim().is_empty() {
+        return Err("site is empty".to_string());
+    }
+
+    let version_service = VersionService::new(site);
+    let version_message = version_service.get_version_message().await;
+
+    if version_message.status == 200 && version_message.success {
+        Ok(version_message.data)
+    } else if version_message.status == 404 {
+        Ok("incompatible".to_string())
+    } else {
+        Ok("".to_string())
+    }
+}
+

src-tauri/src/commands/mod.rs

@@ -4,6 +4,7 @@ pub mod get_assets;
 pub mod get_config;
 pub mod get_setting;
 pub mod get_token;
+pub mod get_version_message;
 pub mod list_system_fonts;
 pub mod logout;
 pub mod pull_up;

src-tauri/src/lib.rs

@@ -13,6 +13,7 @@ use crate::commands::get_assets::get_assets;
 use crate::commands::get_config::get_config;
 use crate::commands::get_setting::get_setting;
 use crate::commands::get_token::get_connect_token;
+use crate::commands::get_version_message::get_version_message;
 use crate::commands::http_callback::init_http_callback_server;
 use crate::commands::list_system_fonts::list_system_fonts;
 use crate::commands::logout::logout;
@@ -160,6 +161,7 @@ pub fn run() {
             minimize_window,
             get_asset_detail,
             get_connect_token,
+            get_version_message,
             list_system_fonts,
             toggle_maximize_window,
             update_config_selection,

src-tauri/src/service/mod.rs

@@ -8,3 +8,4 @@ pub(crate) mod token;
 pub(crate) mod token_oauth;
 pub(crate) mod user;
 pub(crate) mod http_callback;
+pub(crate) mod version;

src-tauri/src/service/user.rs

@@ -32,12 +32,6 @@ impl UserService {
         get_with_response(&url, &self.bearer_token).await
     }
 
-    pub async fn get_version_message(&self) -> ApiResponse {
-        let url = format!("{}/api/v1/settings/client/versions/", self.origin);
-        log::info!("获取当前版本信息: {}", url);
-        get_with_response(&url, &self.bearer_token).await
-    }
-
     pub async fn get_xpack_message(&self) -> ApiResponse {
         let url = format!("{}/api/v1/settings/public/", self.origin);
         log::info!("获取当前public信息: {}", url);

src-tauri/src/service/version.rs

@@ -0,0 +1,20 @@
+use crate::commands::requests::{get_with_response, ApiResponse};
+
+#[derive(Clone)]
+pub struct VersionService {
+    origin: String,
+}
+
+impl VersionService {
+    pub fn new(origin: String) -> Self {
+        Self { origin }
+    }
+
+    pub async fn get_version_message(&self) -> ApiResponse {
+        let url = format!("{}/api/v1/settings/client/versions/", self.origin);
+        log::info!("获取当前版本信息: {}", url);
+        // 该接口为公开接口，不需要 bearer_token
+        get_with_response(&url, "").await
+    }
+}
+

ui/components/SideBar/profile.vue

@@ -6,6 +6,11 @@ import type { LangType, ThemeType, UserData } from "~/types/index";
 import { useSettingManager } from "~/composables/useSettingManager";
 import { useUserInfoStore } from "~/store/modules/userInfo";
 
+interface VersionAlertPayload {
+  type: string;
+  version?: string;
+}
+
 const props = defineProps<{ collapse: boolean }>();
 
 const toast = useToast();
@@ -203,6 +208,53 @@ function normalizeSite(value: string): string {
   return s.replace(/\/+$/, "");
 }
 
+function normalizeVersionMessage(raw: string) {
+  if (raw === "incompatible") {
+    return { status: "incompatible" as const, versions: [] as string[] };
+  }
+
+  if (!raw) {
+    return { status: "list" as const, versions: [] as string[] };
+  }
+
+  try {
+    const parsed = JSON.parse(raw);
+    const versions = Array.isArray(parsed)
+      ? parsed.map((item) => (item == null ? "" : String(item))).filter((v) => v.length > 0)
+      : [];
+    return { status: "list" as const, versions };
+  } catch {
+    return { status: "list" as const, versions: [] as string[] };
+  }
+}
+
+const emitVersionAlertAndCloseModal = (payload: VersionAlertPayload) => {
+  openModal.value = false;
+  loginBtn.value = false;
+  useEventBus().emit("versionAlert", payload);
+};
+
+const checkVersionBeforeOAuth = async (site: string) => {
+  const [rawVersionMessage, appVersion] = await Promise.all([
+    useTauriCoreInvoke<string>("get_version_message", { site }).catch(() => ""),
+    useTauriAppGetVersion().catch(() => "")
+  ]);
+
+  const { status: versionStatus, versions } = normalizeVersionMessage(rawVersionMessage);
+
+  if (versionStatus === "incompatible") {
+    emitVersionAlertAndCloseModal({ type: "incompatible" });
+    return false;
+  }
+
+  if (appVersion && versions.length > 0 && !versions.includes(appVersion)) {
+    emitVersionAlertAndCloseModal({ type: "noMatch", version: versions[versions.length - 1] });
+    return false;
+  }
+
+  return true;
+};
+
 /**
  * @description 打开登录页面
  */
@@ -366,6 +418,9 @@ const handleConfirm = async () => {
   try {
     clearLoginBtnUnlockTimer();
     loginBtn.value = true;
+    const ok = await checkVersionBeforeOAuth(normalizedSite);
+    if (!ok) return;
+
     await useTauriCoreInvoke("auth_login", {
       site: normalizedSite
     });