fix: align ip-based language and timezone resolution with runtime fallback

lius-new · lius-new · commit 98537f3b73a1 · 2026-05-15T23:54:05.000+08:00
diff --git a/plugins/pages/create-window/src/api/index.ts b/plugins/pages/create-window/src/api/index.ts
@@ -13,7 +13,6 @@ import type {
   CreateTemplateRequest,
   CreateTemplateResponse,
 } from './index.types';
-import { resolveFingerprintConfig } from '../utils/resolve-fingerprint-config';
 
 // 导出类型
 export * from './index.types';
@@ -344,36 +343,7 @@ export async function createEnvironment(
   config: WindowConfig,
   options?: CreateEnvironmentOptions
 ): Promise<CreateEnvironmentResponse> {
-  // 获取代理信息（用于解析指纹配置）
-  const { listProxies } = await import('../../../environment-manager/src/api');
-  let proxyConfig = null;
-
-  if (options?.proxyUuid) {
-    const proxies = await listProxies();
-    const proxy = proxies.find(p => p.uuid === options.proxyUuid);
-    if (proxy) {
-      proxyConfig = {
-        proxy_type: proxy.proxy_type,
-        host: proxy.host,
-        port: proxy.port,
-        username: proxy.username || undefined,
-        password: proxy.password || undefined,
-      };
-    }
-  }
-
-  // 解析指纹配置
-  const resolvedBasicSettings = await resolveFingerprintConfig(
-    config.basicSettings,
-    proxyConfig
-  );
-
-  const resolvedConfig = {
-    ...config,
-    basicSettings: resolvedBasicSettings,
-  };
-
-  const requestData = transformWindowConfigToRequest(resolvedConfig, options);
+  const requestData = transformWindowConfigToRequest(config, options);
   const result = await post<CreateEnvironmentResponse>(
     API_ENDPOINTS.CREATE_ENVIRONMENT,
     requestData
@@ -394,41 +364,8 @@ export async function batchCreateEnvironments(
   proxyUuids: string[] | undefined, // 代理 UUID 数组，按顺序分配给环境
   options?: CreateEnvironmentOptions
 ): Promise<CreateEnvironmentResponse[]> {
-  // 获取代理信息（用于解析指纹配置）
-  const { listProxies } = await import('../../../environment-manager/src/api');
-  const proxies = proxyUuids && proxyUuids.length > 0 ? await listProxies() : [];
-
-  // 解析每个配置的指纹配置
-  const resolvedConfigs = await Promise.all(
-    configs.map(async (config, index) => {
-      // 获取当前环境对应的代理
-      const proxyUuid = proxyUuids && index < proxyUuids.length ? proxyUuids[index] : undefined;
-      const proxy = proxyUuid ? proxies.find(p => p.uuid === proxyUuid) : null;
-
-      // 构建代理配置对象
-      const proxyConfig = proxy ? {
-        proxy_type: proxy.proxy_type,
-        host: proxy.host,
-        port: proxy.port,
-        username: proxy.username || undefined,
-        password: proxy.password || undefined,
-      } : null;
-
-      // 解析指纹配置
-      const resolvedBasicSettings = await resolveFingerprintConfig(
-        config.basicSettings,
-        proxyConfig
-      );
-
-      return {
-        ...config,
-        basicSettings: resolvedBasicSettings,
-      };
-    })
-  );
-
   // 构建批量创建请求
-  const environments: CreateEnvironmentRequest[] = resolvedConfigs.map((config, index) => {
+  const environments: CreateEnvironmentRequest[] = configs.map((config, index) => {
     const request = transformWindowConfigToRequest(config, {
       // 统一设置分组和标签（批量创建时这些应该相同）
       groupUuid: options?.groupUuid,
diff --git a/plugins/pages/create-window/src/hooks/use-create-window.ts b/plugins/pages/create-window/src/hooks/use-create-window.ts
@@ -10,13 +10,12 @@ import {
   updateTemplate,
   transformWindowConfigToRequest,
 } from '../api';
-import {
-  updateEnvironment,
-  listProxies,
-  listAccounts,
-  type ProxyItem,
-  type AccountItem,
-} from '../../../environment-manager/src/api';
+import {
+  updateEnvironment,
+  listAccounts,
+  type ProxyItem,
+  type AccountItem,
+} from '../../../environment-manager/src/api';
 import type { GroupItem, TagItem } from '../../../environment-manager/src/api';
 // @ts-ignore - Cross-plugin import
 import { useSettingsDialogStore, useRefreshStore } from '../../../../services/store/src';
@@ -373,43 +372,15 @@ export function useCreateWindow(
     try {
       // 编辑模式：更新环境
       if (editUuid) {
-        // 获取代理信息（用于解析指纹配置）
-        const proxyUuid = windowConfig.windowInfo.proxyUuids.length > 0
-          ? windowConfig.windowInfo.proxyUuids[0]
-          : undefined;
-
-        let proxyConfig = null;
-        if (proxyUuid) {
-          const proxies = await listProxies();
-          const proxy = proxies.find(p => p.uuid === proxyUuid);
-          if (proxy) {
-            proxyConfig = {
-              proxy_type: proxy.proxy_type,
-              host: proxy.host,
-              port: proxy.port,
-              username: proxy.username || undefined,
-              password: proxy.password || undefined,
-            };
-          }
-        }
-
-        // 解析指纹配置
-        const { resolveFingerprintConfig } = await import('../utils/resolve-fingerprint-config');
-        const resolvedBasicSettings = await resolveFingerprintConfig(
-          windowConfig.basicSettings,
-          proxyConfig
-        );
-
-        const resolvedConfig = {
-          ...windowConfig,
-          basicSettings: resolvedBasicSettings,
-        };
-
-        const request = transformWindowConfigToRequest(resolvedConfig, {
-          groupUuid: selectedGroupUuid,
-          tagUuids: selectedTagUuids.length > 0 ? selectedTagUuids : undefined,
-          accountUuids:
-            windowConfig.windowInfo.accountUuids.length > 0
+        const proxyUuid = windowConfig.windowInfo.proxyUuids.length > 0
+          ? windowConfig.windowInfo.proxyUuids[0]
+          : undefined;
+
+        const request = transformWindowConfigToRequest(windowConfig, {
+          groupUuid: selectedGroupUuid,
+          tagUuids: selectedTagUuids.length > 0 ? selectedTagUuids : undefined,
+          accountUuids:
+            windowConfig.windowInfo.accountUuids.length > 0
               ? windowConfig.windowInfo.accountUuids
               : undefined,
           proxyUuid, // 编辑模式使用第一个代理
diff --git a/src-tauri/src/services/environment/kernel/language.rs b/src-tauri/src/services/environment/kernel/language.rs
@@ -0,0 +1,105 @@
+//! 语言自动检测模块
+
+use super::types::{ProxyConfig, TIMEZONE_DETECTION_TIMEOUT_SECS};
+
+/// 检测语言
+///
+/// # 逻辑
+/// - 有代理配置：先用代理检测，失败则直连检测
+/// - 无代理配置：使用系统代理（reqwest 自动检测）
+///
+/// # 返回
+/// - `Some(language)`: 检测成功
+/// - `None`: 所有检测都失败
+pub async fn detect_language(proxy: Option<&ProxyConfig>) -> Option<String> {
+    if let Some(proxy_cfg) = proxy {
+        detect_with_proxy(proxy_cfg).await
+    } else {
+        detect_with_system_proxy().await
+    }
+}
+
+async fn detect_with_proxy(proxy_cfg: &ProxyConfig) -> Option<String> {
+    let infra_proxy_cfg = proxy_cfg.to_infrastructure_proxy_config();
+    let proxy_client = match crate::infrastructure::proxy::client::build_proxy_client(
+        &infra_proxy_cfg,
+        Some(TIMEZONE_DETECTION_TIMEOUT_SECS),
+    ) {
+        Ok(client) => client,
+        Err(_) => {
+            return detect_with_direct_connection().await;
+        }
+    };
+
+    let proxy_result = crate::infrastructure::proxy::detector::detect_ip_with_timeout(
+        proxy_client,
+        TIMEZONE_DETECTION_TIMEOUT_SECS,
+    )
+    .await;
+
+    if proxy_result.success {
+        let ip_info = proxy_result.ip_info.as_ref()?;
+        infer_language_from_country_code(ip_info.country_code.as_str())
+    } else {
+        detect_with_direct_connection().await
+    }
+}
+
+async fn detect_with_system_proxy() -> Option<String> {
+    let result = crate::infrastructure::proxy::detector::detect_with_system_proxy(
+        TIMEZONE_DETECTION_TIMEOUT_SECS,
+    )
+    .await;
+
+    if result.success {
+        let ip_info = result.ip_info.as_ref()?;
+        infer_language_from_country_code(ip_info.country_code.as_str())
+    } else {
+        None
+    }
+}
+
+async fn detect_with_direct_connection() -> Option<String> {
+    let local_result = crate::infrastructure::proxy::detector::detect_direct_ip_with_timeout(
+        TIMEZONE_DETECTION_TIMEOUT_SECS,
+    )
+    .await;
+
+    if local_result.success {
+        let ip_info = local_result.ip_info.as_ref()?;
+        infer_language_from_country_code(ip_info.country_code.as_str())
+    } else {
+        None
+    }
+}
+
+fn infer_language_from_country_code(country_code: &str) -> Option<String> {
+    let normalized = country_code.trim().to_ascii_uppercase();
+    if normalized.is_empty() {
+        return None;
+    }
+
+    let language = match normalized.as_str() {
+        "CN" => "zh-CN",
+        "TW" => "zh-TW",
+        "HK" => "zh-HK",
+        "US" => "en-US",
+        "GB" => "en-GB",
+        "CA" => "en-CA",
+        "AU" => "en-AU",
+        "JP" => "ja-JP",
+        "KR" => "ko-KR",
+        "FR" => "fr-FR",
+        "DE" => "de-DE",
+        "ES" => "es-ES",
+        "IT" => "it-IT",
+        "RU" => "ru-RU",
+        "BR" => "pt-BR",
+        "MX" => "es-MX",
+        "IN" => "en-IN",
+        "SG" => "en-SG",
+        _ => "en-US",
+    };
+
+    Some(language.to_string())
+}
diff --git a/src-tauri/src/services/environment/kernel/mod.rs b/src-tauri/src/services/environment/kernel/mod.rs
@@ -8,6 +8,7 @@ use std::fs;
 
 pub mod downloader;
 pub mod extension;
+pub mod language;
 mod runtime_bridge;
 mod state;
 pub mod timezone;
diff --git a/src-tauri/src/services/environment/kernel/runtime_bridge.rs b/src-tauri/src/services/environment/kernel/runtime_bridge.rs
@@ -13,6 +13,7 @@ use crate::infrastructure::runtime::{
 };
 
 use super::extension;
+use super::language;
 use super::timezone;
 use super::types::{
     AccountInfo, BatchLaunchRequest, BatchLaunchResult, CdpEndpointResponse, KernelStatusEmitter,
@@ -275,8 +276,26 @@ async fn prepare_start_request(
     );
 
     if let Some(ref mut config) = fingerprint_config {
-        if let Some(detected_timezone) = timezone::detect_timezone(proxy.as_ref()).await {
-            config.timezone = Some(detected_timezone);
+        let should_detect_language = match config.language.as_deref().map(str::trim) {
+            Some(language) => language.is_empty() || language.eq_ignore_ascii_case("ip"),
+            None => true,
+        };
+
+        if should_detect_language {
+            if let Some(detected_language) = language::detect_language(proxy.as_ref()).await {
+                config.language = Some(detected_language);
+            }
+        }
+
+        let should_detect_timezone = match config.timezone.as_deref().map(str::trim) {
+            Some(timezone) => timezone.is_empty() || timezone.eq_ignore_ascii_case("ip"),
+            None => true,
+        };
+
+        if should_detect_timezone {
+            if let Some(detected_timezone) = timezone::detect_timezone(proxy.as_ref()).await {
+                config.timezone = Some(detected_timezone);
+            }
         }
     }
 
@@ -344,7 +363,8 @@ async fn prepare_start_request(
         env_uuid: env_id,
         user_data_dir: user_data_dir.to_string_lossy().to_string(),
         cookies: cookies.map(|items| {
-            items.into_iter()
+            items
+                .into_iter()
                 .map(|item| CookieGroup {
                     site: item.site,
                     cookie_text: item.cookie_text,
