feat: add proxy settings and make BGM token optional (#60)

* feat: add skip version button

* feat: add custom theme color

* feat: add ImmersiveTitlebar

* feat: simplify HTTP request instances

* feat: add proxy settings

* feat: bgm token not required

* fix: clear import

* feat: optimize style

* Revert "feat: add ImmersiveTitlebar"

This reverts commit c36c0f4.

* Revert "feat: add custom theme color"

This reverts commit a7a72e2.

* fix: resolve conflicts and add missing translations after revert

* refactor: simplify proxy config and make BGM token optional

* refactor: remove requiresBgmToken and simplify withBgmAuth

---------

Co-authored-by: huoshen80 <huoshen80@hotmail.com>

Author: misaka10843

package.json

@@ -71,7 +71,7 @@
 		"@types/react-dom": "^18.3.7",
 		"@vitejs/plugin-react": "^6.0.2",
 		"git-cliff": "^2.13.1",
-		"i18next-cli": "^1.61.0",
+		"i18next-cli": "=1.58.3",
 		"typescript": "^6.0.3",
 		"unocss": "^66.7.0",
 		"vite": "^8.0.16"

pnpm-lock.yaml

@@ -16,6 +16,7 @@ use utils::{
         import_clipboard_image_to_temp, is_portable_mode, move_backup_folder, open_directory,
     },
     game_cover::{delete_cloud_cache, register_game_cover_protocol},
+    http::update_proxy_config,
     launch::{launch_game, stop_game},
     legacy_migration::run_startup_migrations,
     logs::{get_reina_log_level, set_reina_log_level},
@@ -101,6 +102,7 @@ pub fn run() {
             // 用户设置相关 commands
             get_all_settings,
             update_settings,
+            update_proxy_config,
             // BGM OAuth 相关 commands
             bgm_oauth_start_login,
             bgm_oauth_exchange_code,

src-tauri/Cargo.lock

@@ -5,6 +5,7 @@ pub mod bgm_auth;
 pub mod fs;
 pub mod game_cover;
 pub mod game_monitor;
+pub mod http;
 pub mod launch;
 pub mod legacy_migration;
 pub mod logs;

src-tauri/src/lib.rs

@@ -11,16 +11,10 @@ use chrono::Utc;
 use sea_orm::{ActiveModelTrait, DatabaseConnection, Set};
 use serde::Deserialize;
 use tauri::{AppHandle, Emitter, State};
-use tauri_plugin_http::reqwest;
 
 use crate::database::repository::settings_repository::SettingsRepository;
 use crate::entity::user::BgmAuth;
 
-const USER_AGENT: &str = concat!(
-    "huoshen80/ReinaManager/",
-    env!("CARGO_PKG_VERSION"),
-    " (https://github.com/huoshen80/ReinaManager)"
-);
 const BGM_APP_ID: &str = "bgm606669f8b19c14e6e";
 const BGM_REDIRECT_URI: &str = "http://127.0.0.1:23380/callback";
 const BGM_CALLBACK_PORT: u16 = 23380;
@@ -242,9 +236,8 @@ fn parse_callback(stream: &std::net::TcpStream) -> Option<(String, Option<String
 }
 
 async fn request_token(body: &serde_json::Value) -> Result<BgmTokenResponse, String> {
-    let response = reqwest::Client::new()
+    let response = crate::utils::http::get_client()
         .post("https://bgm.tv/oauth/access_token")
-        .header("User-Agent", USER_AGENT)
         .header("Content-Type", "application/json")
         .body(serde_json::to_vec(body).map_err(|e| format!("序列化请求体失败: {}", e))?)
         .send()

src-tauri/src/utils.rs

@@ -1,14 +1,13 @@
 use std::collections::{HashMap, HashSet};
 use std::io::ErrorKind;
 use std::path::{Path, PathBuf};
-use std::sync::{Arc, Mutex, OnceLock};
+use std::sync::{Arc, Mutex};
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 use sea_orm::{DatabaseConnection, EntityTrait};
 use tauri::Manager;
 use tauri::command;
 use tauri::http::{Response, StatusCode};
-use tauri_plugin_http::reqwest::Client;
 use tokio::sync::{RwLock, Semaphore, watch};
 
 use crate::entity::prelude::Games;
@@ -17,18 +16,9 @@ use reina_path::get_base_data_dir;
 const DEFAULT_COVER_EXTENSION: &str = "jpg";
 const DEFAULT_CLOUD_COVER_FILE_NAME: &str = "cloud_cover";
 const MAX_CONCURRENT_COVER_DOWNLOADS: usize = 100;
-const COVER_DOWNLOAD_CONNECT_TIMEOUT_SECS: u64 = 10;
-const COVER_DOWNLOAD_TIMEOUT_SECS: u64 = 60;
 /// 最多重试次数（不含首次），退避延迟为 500ms * 2^attempt
 const COVER_MAX_RETRIES: u32 = 2;
 const COVER_RETRY_BASE_DELAY_MS: u64 = 500;
-const COVER_USER_AGENT: &str = concat!(
-    "huoshen80/ReinaManager/",
-    env!("CARGO_PKG_VERSION"),
-    " (https://github.com/huoshen80/ReinaManager)"
-);
-
-static COVER_HTTP_CLIENT: OnceLock<Client> = OnceLock::new();
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
 struct DownloadKey {
@@ -105,17 +95,6 @@ impl Drop for DownloadCleanupGuard {
     }
 }
 
-fn cover_http_client() -> &'static Client {
-    COVER_HTTP_CLIENT.get_or_init(|| {
-        Client::builder()
-            .connect_timeout(Duration::from_secs(COVER_DOWNLOAD_CONNECT_TIMEOUT_SECS))
-            .timeout(Duration::from_secs(COVER_DOWNLOAD_TIMEOUT_SECS))
-            .user_agent(COVER_USER_AGENT)
-            .build()
-            .expect("failed to build game cover http client")
-    })
-}
-
 fn infer_cache_extension(cloud_url: &str) -> String {
     let url_without_suffix = cloud_url.split(['?', '#']).next().unwrap_or(cloud_url);
     let file_name = url_without_suffix
@@ -344,7 +323,7 @@ async fn try_download_once(
     let cache_path = build_cache_path(game_cover_dir, game_id, &extension);
     let temp_path = build_temp_cache_path(game_cover_dir, game_id, &extension);
 
-    let response = cover_http_client()
+    let response = crate::utils::http::get_client()
         .get(url)
         .send()
         .await

src-tauri/src/utils/bgm_auth.rs

@@ -0,0 +1,61 @@
+use serde::Deserialize;
+use std::sync::{OnceLock, RwLock};
+use std::time::Duration;
+use tauri_plugin_http::reqwest::{Client, NoProxy, Proxy};
+
+const GLOBAL_USER_AGENT: &str = concat!(
+    "huoshen80/ReinaManager/",
+    env!("CARGO_PKG_VERSION"),
+    " (https://github.com/huoshen80/ReinaManager)"
+);
+
+const DEFAULT_CONNECT_TIMEOUT_SECS: u64 = 10;
+const DEFAULT_TIMEOUT_SECS: u64 = 60;
+const LOCAL_PROXY_BYPASS: &str = "localhost,127.0.0.0/8,::1,0.0.0.0,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,169.254.0.0/16,fc00::/7,fe80::/10,.local";
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct ProxyConfig {
+    pub url: String,
+}
+
+static GLOBAL_HTTP_CLIENT: OnceLock<RwLock<Client>> = OnceLock::new();
+
+#[tauri::command]
+pub fn update_proxy_config(config: ProxyConfig) -> Result<(), String> {
+    let client = build_client(config.url.trim())?;
+    let mut guard = http_client()
+        .write()
+        .map_err(|_| "更新 HTTP 客户端失败".to_string())?;
+    *guard = client;
+    Ok(())
+}
+
+fn build_client(proxy_url: &str) -> Result<Client, String> {
+    let mut builder = Client::builder()
+        .connect_timeout(Duration::from_secs(DEFAULT_CONNECT_TIMEOUT_SECS))
+        .timeout(Duration::from_secs(DEFAULT_TIMEOUT_SECS))
+        .user_agent(GLOBAL_USER_AGENT);
+
+    if !proxy_url.is_empty() {
+        let proxy = Proxy::all(proxy_url)
+            .map_err(|e| format!("代理地址无效: {e}"))?
+            .no_proxy(NoProxy::from_string(LOCAL_PROXY_BYPASS));
+        builder = builder.proxy(proxy);
+    }
+
+    builder
+        .build()
+        .map_err(|e| format!("创建 HTTP 客户端失败: {e}"))
+}
+
+fn http_client() -> &'static RwLock<Client> {
+    GLOBAL_HTTP_CLIENT
+        .get_or_init(|| RwLock::new(build_client("").expect("failed to build default http client")))
+}
+
+pub fn get_client() -> Client {
+    http_client()
+        .read()
+        .unwrap_or_else(|e| e.into_inner())
+        .clone()
+}

src-tauri/src/utils/game_cover.rs

@@ -68,17 +68,16 @@ export interface BgmTokenStatus {
 	scope: string | null;
 }
 
-function buildBgmAuthHeaders(token: string) {
-	return {
-		headers: {
-			...BGM_JSON_HEADERS,
-			Authorization: `Bearer ${token}`,
-		},
-	};
+function buildBgmAuthHeaders(token?: string) {
+	const headers: Record<string, string> = { ...BGM_JSON_HEADERS };
+	if (token) {
+		headers.Authorization = `Bearer ${token}`;
+	}
+	return { headers };
 }
 
 function buildBgmRateLimitedOptions(
-	token: string,
+	token?: string,
 	signal?: AbortSignal,
 ): TauriHttpOptions {
 	return {
@@ -173,7 +172,7 @@ const transformBgmData = (BGMdata: any): GameCandidateData => {
  */
 export async function fetchBgmById(
 	id: string,
-	token: string,
+	token?: string,
 	signal?: AbortSignal,
 ): Promise<GameCandidateData> {
 	const BGMdata = (
@@ -203,7 +202,7 @@ export async function fetchBgmById(
  */
 export async function fetchBgmByName(
 	name: string,
-	token: string,
+	token?: string,
 	limit = 25,
 	signal?: AbortSignal,
 ): Promise<GameCandidateData[]> {
@@ -246,7 +245,7 @@ export async function fetchBgmByName(
  */
 export async function fetchBgmByIds(
 	ids: string[],
-	token: string,
+	token?: string,
 	signal?: AbortSignal,
 ): Promise<GameCandidateData[]> {
 	if (ids.length === 0) {

src-tauri/src/utils/http.rs

@@ -59,7 +59,7 @@ function createMetadataError(
 }
 
 function createStableError(
-	code: "bgm_token_required" | "invalid_game_id" | "unsupported_source",
+	code: "invalid_game_id" | "unsupported_source",
 	message: string,
 ): AppError {
 	return new AppError({