Files
cc-switch/src-tauri/src/app_store.rs

145 lines
4.3 KiB
Rust
Raw Normal View History

use serde_json::Value;
use std::path::PathBuf;
use std::sync::{OnceLock, RwLock};
use tauri_plugin_store::StoreExt;
refactor(backend): complete phase 1 - full AppError migration (100%) Finalized the backend error handling refactoring by migrating all remaining modules to use AppError, eliminating all temporary error conversions. ## Changes ### Fully Migrated Modules - **mcp.rs** (129 lines changed) - Migrated 13 functions from Result<T, String> to Result<T, AppError> - Added AppError::McpValidation for domain-specific validation errors - Functions: validate_server_spec, validate_mcp_entry, upsert_in_config_for, delete_in_config_for, set_enabled_and_sync_for, sync_enabled_to_claude, import_from_claude, import_from_codex, sync_enabled_to_codex - Removed all temporary error conversions - **usage_script.rs** (143 lines changed) - Migrated 4 functions: execute_usage_script, send_http_request, validate_result, validate_single_usage - Used AppError::Message for JS runtime errors - Used AppError::InvalidInput for script validation errors - Improved error construction with ok_or_else (lazy evaluation) - **lib.rs** (47 lines changed) - Migrated create_tray_menu() and switch_provider_internal() - Simplified PoisonError handling with AppError::from - Added error logging in update_tray_menu() - Improved error handling in menu update logic - **migration.rs** (10 lines changed) - Migrated migrate_copies_into_config() - Used AppError::io() helper for file operations - **speedtest.rs** (8 lines changed) - Migrated build_client() and test_endpoints() - Used AppError::Message for HTTP client errors - **app_store.rs** (14 lines changed) - Migrated set_app_config_dir_to_store() and migrate_app_config_dir_from_settings() - Used AppError::Message for Tauri Store errors - Used AppError::io() for file system operations ### Fixed Previous Temporary Solutions - **import_export.rs** (2 lines changed) - Removed AppError::Message wrapper for mcp::sync_enabled_to_codex - Now directly calls the AppError-returning function (no conversion needed) - **commands.rs** (6 lines changed) - Updated query_provider_usage() and test_api_endpoints() - Explicit .to_string() conversion for Tauri command interface ## New Error Types - **AppError::McpValidation**: Domain-specific error for MCP configuration validation - Separates MCP validation errors from generic Config errors - Follows domain-driven design principles ## Statistics - Files changed: 8 - Lines changed: +237/-122 (net +115) - Compilation: ✅ Success (7.13s, 0 warnings) - Tests: ✅ 4/4 passed ## Benefits - **100% Migration**: All modules now use AppError consistently - **Domain Errors**: Added McpValidation for better error categorization - **No Temporary Solutions**: Eliminated all AppError::Message conversions for internal calls - **Performance**: Used ok_or_else for lazy error construction - **Maintainability**: Removed ~60 instances of .map_err(|e| format!("...", e)) - **Debugging**: Added error logging in critical paths (tray menu updates) ## Phase 1 Complete Total impact across 3 commits: - 25 files changed - +671/-302 lines (net +369) - 100% of codebase migrated from Result<T, String> to Result<T, AppError> - 0 compilation warnings - All tests passing Ready for Phase 2: Splitting commands.rs by domain. Co-authored-by: Claude <noreply@anthropic.com>
2025-10-27 20:36:08 +08:00
use crate::error::AppError;
/// Store 中的键名
const STORE_KEY_APP_CONFIG_DIR: &str = "app_config_dir_override";
/// 全局缓存的 AppHandle (在应用启动时设置)
static APP_HANDLE: OnceLock<RwLock<Option<tauri::AppHandle>>> = OnceLock::new();
/// 设置全局 AppHandle
pub fn set_app_handle(handle: tauri::AppHandle) {
let store = APP_HANDLE.get_or_init(|| RwLock::new(None));
if let Ok(mut guard) = store.write() {
*guard = Some(handle);
}
}
/// 获取全局 AppHandle
fn get_app_handle() -> Option<tauri::AppHandle> {
let store = APP_HANDLE.get()?;
let guard = store.read().ok()?;
guard.as_ref().cloned()
}
/// 从 Tauri Store 读取 app_config_dir 覆盖配置 (无需 AppHandle 版本)
pub fn get_app_config_dir_override() -> Option<PathBuf> {
let app = get_app_handle()?;
get_app_config_dir_from_store(&app)
}
/// 从 Tauri Store 读取 app_config_dir 覆盖配置(公开函数)
pub fn get_app_config_dir_from_store(app: &tauri::AppHandle) -> Option<PathBuf> {
let store = app.store_builder("app_paths.json").build();
if let Err(e) = &store {
log::warn!("无法创建 Store: {}", e);
return None;
}
let store = store.unwrap();
match store.get(STORE_KEY_APP_CONFIG_DIR) {
Some(Value::String(path_str)) => {
let path_str = path_str.trim();
if path_str.is_empty() {
return None;
}
let path = resolve_path(path_str);
// 验证路径是否存在
if !path.exists() {
log::warn!(
"Store 中配置的 app_config_dir 不存在: {:?}\n\
使",
path
);
return None;
}
log::info!("使用 Store 中的 app_config_dir: {:?}", path);
Some(path)
}
Some(_) => {
log::warn!(
"Store 中的 {} 类型不正确,应为字符串",
STORE_KEY_APP_CONFIG_DIR
);
None
}
None => None,
}
}
/// 写入 app_config_dir 到 Tauri Store
pub fn set_app_config_dir_to_store(
app: &tauri::AppHandle,
path: Option<&str>,
refactor(backend): complete phase 1 - full AppError migration (100%) Finalized the backend error handling refactoring by migrating all remaining modules to use AppError, eliminating all temporary error conversions. ## Changes ### Fully Migrated Modules - **mcp.rs** (129 lines changed) - Migrated 13 functions from Result<T, String> to Result<T, AppError> - Added AppError::McpValidation for domain-specific validation errors - Functions: validate_server_spec, validate_mcp_entry, upsert_in_config_for, delete_in_config_for, set_enabled_and_sync_for, sync_enabled_to_claude, import_from_claude, import_from_codex, sync_enabled_to_codex - Removed all temporary error conversions - **usage_script.rs** (143 lines changed) - Migrated 4 functions: execute_usage_script, send_http_request, validate_result, validate_single_usage - Used AppError::Message for JS runtime errors - Used AppError::InvalidInput for script validation errors - Improved error construction with ok_or_else (lazy evaluation) - **lib.rs** (47 lines changed) - Migrated create_tray_menu() and switch_provider_internal() - Simplified PoisonError handling with AppError::from - Added error logging in update_tray_menu() - Improved error handling in menu update logic - **migration.rs** (10 lines changed) - Migrated migrate_copies_into_config() - Used AppError::io() helper for file operations - **speedtest.rs** (8 lines changed) - Migrated build_client() and test_endpoints() - Used AppError::Message for HTTP client errors - **app_store.rs** (14 lines changed) - Migrated set_app_config_dir_to_store() and migrate_app_config_dir_from_settings() - Used AppError::Message for Tauri Store errors - Used AppError::io() for file system operations ### Fixed Previous Temporary Solutions - **import_export.rs** (2 lines changed) - Removed AppError::Message wrapper for mcp::sync_enabled_to_codex - Now directly calls the AppError-returning function (no conversion needed) - **commands.rs** (6 lines changed) - Updated query_provider_usage() and test_api_endpoints() - Explicit .to_string() conversion for Tauri command interface ## New Error Types - **AppError::McpValidation**: Domain-specific error for MCP configuration validation - Separates MCP validation errors from generic Config errors - Follows domain-driven design principles ## Statistics - Files changed: 8 - Lines changed: +237/-122 (net +115) - Compilation: ✅ Success (7.13s, 0 warnings) - Tests: ✅ 4/4 passed ## Benefits - **100% Migration**: All modules now use AppError consistently - **Domain Errors**: Added McpValidation for better error categorization - **No Temporary Solutions**: Eliminated all AppError::Message conversions for internal calls - **Performance**: Used ok_or_else for lazy error construction - **Maintainability**: Removed ~60 instances of .map_err(|e| format!("...", e)) - **Debugging**: Added error logging in critical paths (tray menu updates) ## Phase 1 Complete Total impact across 3 commits: - 25 files changed - +671/-302 lines (net +369) - 100% of codebase migrated from Result<T, String> to Result<T, AppError> - 0 compilation warnings - All tests passing Ready for Phase 2: Splitting commands.rs by domain. Co-authored-by: Claude <noreply@anthropic.com>
2025-10-27 20:36:08 +08:00
) -> Result<(), AppError> {
let store = app
.store_builder("app_paths.json")
.build()
refactor(backend): complete phase 1 - full AppError migration (100%) Finalized the backend error handling refactoring by migrating all remaining modules to use AppError, eliminating all temporary error conversions. ## Changes ### Fully Migrated Modules - **mcp.rs** (129 lines changed) - Migrated 13 functions from Result<T, String> to Result<T, AppError> - Added AppError::McpValidation for domain-specific validation errors - Functions: validate_server_spec, validate_mcp_entry, upsert_in_config_for, delete_in_config_for, set_enabled_and_sync_for, sync_enabled_to_claude, import_from_claude, import_from_codex, sync_enabled_to_codex - Removed all temporary error conversions - **usage_script.rs** (143 lines changed) - Migrated 4 functions: execute_usage_script, send_http_request, validate_result, validate_single_usage - Used AppError::Message for JS runtime errors - Used AppError::InvalidInput for script validation errors - Improved error construction with ok_or_else (lazy evaluation) - **lib.rs** (47 lines changed) - Migrated create_tray_menu() and switch_provider_internal() - Simplified PoisonError handling with AppError::from - Added error logging in update_tray_menu() - Improved error handling in menu update logic - **migration.rs** (10 lines changed) - Migrated migrate_copies_into_config() - Used AppError::io() helper for file operations - **speedtest.rs** (8 lines changed) - Migrated build_client() and test_endpoints() - Used AppError::Message for HTTP client errors - **app_store.rs** (14 lines changed) - Migrated set_app_config_dir_to_store() and migrate_app_config_dir_from_settings() - Used AppError::Message for Tauri Store errors - Used AppError::io() for file system operations ### Fixed Previous Temporary Solutions - **import_export.rs** (2 lines changed) - Removed AppError::Message wrapper for mcp::sync_enabled_to_codex - Now directly calls the AppError-returning function (no conversion needed) - **commands.rs** (6 lines changed) - Updated query_provider_usage() and test_api_endpoints() - Explicit .to_string() conversion for Tauri command interface ## New Error Types - **AppError::McpValidation**: Domain-specific error for MCP configuration validation - Separates MCP validation errors from generic Config errors - Follows domain-driven design principles ## Statistics - Files changed: 8 - Lines changed: +237/-122 (net +115) - Compilation: ✅ Success (7.13s, 0 warnings) - Tests: ✅ 4/4 passed ## Benefits - **100% Migration**: All modules now use AppError consistently - **Domain Errors**: Added McpValidation for better error categorization - **No Temporary Solutions**: Eliminated all AppError::Message conversions for internal calls - **Performance**: Used ok_or_else for lazy error construction - **Maintainability**: Removed ~60 instances of .map_err(|e| format!("...", e)) - **Debugging**: Added error logging in critical paths (tray menu updates) ## Phase 1 Complete Total impact across 3 commits: - 25 files changed - +671/-302 lines (net +369) - 100% of codebase migrated from Result<T, String> to Result<T, AppError> - 0 compilation warnings - All tests passing Ready for Phase 2: Splitting commands.rs by domain. Co-authored-by: Claude <noreply@anthropic.com>
2025-10-27 20:36:08 +08:00
.map_err(|e| AppError::Message(format!("创建 Store 失败: {}", e)))?;
match path {
Some(p) => {
let trimmed = p.trim();
if !trimmed.is_empty() {
store.set(STORE_KEY_APP_CONFIG_DIR, Value::String(trimmed.to_string()));
log::info!("已将 app_config_dir 写入 Store: {}", trimmed);
} else {
// 空字符串 = 删除配置
store.delete(STORE_KEY_APP_CONFIG_DIR);
log::info!("已从 Store 中删除 app_config_dir 配置");
}
}
None => {
// None = 删除配置
store.delete(STORE_KEY_APP_CONFIG_DIR);
log::info!("已从 Store 中删除 app_config_dir 配置");
}
}
refactor(backend): complete phase 1 - full AppError migration (100%) Finalized the backend error handling refactoring by migrating all remaining modules to use AppError, eliminating all temporary error conversions. ## Changes ### Fully Migrated Modules - **mcp.rs** (129 lines changed) - Migrated 13 functions from Result<T, String> to Result<T, AppError> - Added AppError::McpValidation for domain-specific validation errors - Functions: validate_server_spec, validate_mcp_entry, upsert_in_config_for, delete_in_config_for, set_enabled_and_sync_for, sync_enabled_to_claude, import_from_claude, import_from_codex, sync_enabled_to_codex - Removed all temporary error conversions - **usage_script.rs** (143 lines changed) - Migrated 4 functions: execute_usage_script, send_http_request, validate_result, validate_single_usage - Used AppError::Message for JS runtime errors - Used AppError::InvalidInput for script validation errors - Improved error construction with ok_or_else (lazy evaluation) - **lib.rs** (47 lines changed) - Migrated create_tray_menu() and switch_provider_internal() - Simplified PoisonError handling with AppError::from - Added error logging in update_tray_menu() - Improved error handling in menu update logic - **migration.rs** (10 lines changed) - Migrated migrate_copies_into_config() - Used AppError::io() helper for file operations - **speedtest.rs** (8 lines changed) - Migrated build_client() and test_endpoints() - Used AppError::Message for HTTP client errors - **app_store.rs** (14 lines changed) - Migrated set_app_config_dir_to_store() and migrate_app_config_dir_from_settings() - Used AppError::Message for Tauri Store errors - Used AppError::io() for file system operations ### Fixed Previous Temporary Solutions - **import_export.rs** (2 lines changed) - Removed AppError::Message wrapper for mcp::sync_enabled_to_codex - Now directly calls the AppError-returning function (no conversion needed) - **commands.rs** (6 lines changed) - Updated query_provider_usage() and test_api_endpoints() - Explicit .to_string() conversion for Tauri command interface ## New Error Types - **AppError::McpValidation**: Domain-specific error for MCP configuration validation - Separates MCP validation errors from generic Config errors - Follows domain-driven design principles ## Statistics - Files changed: 8 - Lines changed: +237/-122 (net +115) - Compilation: ✅ Success (7.13s, 0 warnings) - Tests: ✅ 4/4 passed ## Benefits - **100% Migration**: All modules now use AppError consistently - **Domain Errors**: Added McpValidation for better error categorization - **No Temporary Solutions**: Eliminated all AppError::Message conversions for internal calls - **Performance**: Used ok_or_else for lazy error construction - **Maintainability**: Removed ~60 instances of .map_err(|e| format!("...", e)) - **Debugging**: Added error logging in critical paths (tray menu updates) ## Phase 1 Complete Total impact across 3 commits: - 25 files changed - +671/-302 lines (net +369) - 100% of codebase migrated from Result<T, String> to Result<T, AppError> - 0 compilation warnings - All tests passing Ready for Phase 2: Splitting commands.rs by domain. Co-authored-by: Claude <noreply@anthropic.com>
2025-10-27 20:36:08 +08:00
store
.save()
.map_err(|e| AppError::Message(format!("保存 Store 失败: {}", e)))?;
Ok(())
}
/// 解析路径,支持 ~ 开头的相对路径
fn resolve_path(raw: &str) -> PathBuf {
if raw == "~" {
if let Some(home) = dirs::home_dir() {
return home;
}
} else if let Some(stripped) = raw.strip_prefix("~/") {
if let Some(home) = dirs::home_dir() {
return home.join(stripped);
}
} else if let Some(stripped) = raw.strip_prefix("~\\") {
if let Some(home) = dirs::home_dir() {
return home.join(stripped);
}
}
PathBuf::from(raw)
}
/// 从旧的 settings.json 迁移 app_config_dir 到 Store
refactor(backend): complete phase 1 - full AppError migration (100%) Finalized the backend error handling refactoring by migrating all remaining modules to use AppError, eliminating all temporary error conversions. ## Changes ### Fully Migrated Modules - **mcp.rs** (129 lines changed) - Migrated 13 functions from Result<T, String> to Result<T, AppError> - Added AppError::McpValidation for domain-specific validation errors - Functions: validate_server_spec, validate_mcp_entry, upsert_in_config_for, delete_in_config_for, set_enabled_and_sync_for, sync_enabled_to_claude, import_from_claude, import_from_codex, sync_enabled_to_codex - Removed all temporary error conversions - **usage_script.rs** (143 lines changed) - Migrated 4 functions: execute_usage_script, send_http_request, validate_result, validate_single_usage - Used AppError::Message for JS runtime errors - Used AppError::InvalidInput for script validation errors - Improved error construction with ok_or_else (lazy evaluation) - **lib.rs** (47 lines changed) - Migrated create_tray_menu() and switch_provider_internal() - Simplified PoisonError handling with AppError::from - Added error logging in update_tray_menu() - Improved error handling in menu update logic - **migration.rs** (10 lines changed) - Migrated migrate_copies_into_config() - Used AppError::io() helper for file operations - **speedtest.rs** (8 lines changed) - Migrated build_client() and test_endpoints() - Used AppError::Message for HTTP client errors - **app_store.rs** (14 lines changed) - Migrated set_app_config_dir_to_store() and migrate_app_config_dir_from_settings() - Used AppError::Message for Tauri Store errors - Used AppError::io() for file system operations ### Fixed Previous Temporary Solutions - **import_export.rs** (2 lines changed) - Removed AppError::Message wrapper for mcp::sync_enabled_to_codex - Now directly calls the AppError-returning function (no conversion needed) - **commands.rs** (6 lines changed) - Updated query_provider_usage() and test_api_endpoints() - Explicit .to_string() conversion for Tauri command interface ## New Error Types - **AppError::McpValidation**: Domain-specific error for MCP configuration validation - Separates MCP validation errors from generic Config errors - Follows domain-driven design principles ## Statistics - Files changed: 8 - Lines changed: +237/-122 (net +115) - Compilation: ✅ Success (7.13s, 0 warnings) - Tests: ✅ 4/4 passed ## Benefits - **100% Migration**: All modules now use AppError consistently - **Domain Errors**: Added McpValidation for better error categorization - **No Temporary Solutions**: Eliminated all AppError::Message conversions for internal calls - **Performance**: Used ok_or_else for lazy error construction - **Maintainability**: Removed ~60 instances of .map_err(|e| format!("...", e)) - **Debugging**: Added error logging in critical paths (tray menu updates) ## Phase 1 Complete Total impact across 3 commits: - 25 files changed - +671/-302 lines (net +369) - 100% of codebase migrated from Result<T, String> to Result<T, AppError> - 0 compilation warnings - All tests passing Ready for Phase 2: Splitting commands.rs by domain. Co-authored-by: Claude <noreply@anthropic.com>
2025-10-27 20:36:08 +08:00
pub fn migrate_app_config_dir_from_settings(app: &tauri::AppHandle) -> Result<(), AppError> {
// app_config_dir 已从 settings.json 移除,此函数保留但不再执行迁移
// 如果用户在旧版本设置过 app_config_dir需要在 Store 中手动配置
log::info!("app_config_dir 迁移功能已移除,请在设置中重新配置");
// 确保 Store 初始化正常
let _ = get_app_config_dir_from_store(app);
Ok(())
refactor(backend): complete phase 1 - full AppError migration (100%) Finalized the backend error handling refactoring by migrating all remaining modules to use AppError, eliminating all temporary error conversions. ## Changes ### Fully Migrated Modules - **mcp.rs** (129 lines changed) - Migrated 13 functions from Result<T, String> to Result<T, AppError> - Added AppError::McpValidation for domain-specific validation errors - Functions: validate_server_spec, validate_mcp_entry, upsert_in_config_for, delete_in_config_for, set_enabled_and_sync_for, sync_enabled_to_claude, import_from_claude, import_from_codex, sync_enabled_to_codex - Removed all temporary error conversions - **usage_script.rs** (143 lines changed) - Migrated 4 functions: execute_usage_script, send_http_request, validate_result, validate_single_usage - Used AppError::Message for JS runtime errors - Used AppError::InvalidInput for script validation errors - Improved error construction with ok_or_else (lazy evaluation) - **lib.rs** (47 lines changed) - Migrated create_tray_menu() and switch_provider_internal() - Simplified PoisonError handling with AppError::from - Added error logging in update_tray_menu() - Improved error handling in menu update logic - **migration.rs** (10 lines changed) - Migrated migrate_copies_into_config() - Used AppError::io() helper for file operations - **speedtest.rs** (8 lines changed) - Migrated build_client() and test_endpoints() - Used AppError::Message for HTTP client errors - **app_store.rs** (14 lines changed) - Migrated set_app_config_dir_to_store() and migrate_app_config_dir_from_settings() - Used AppError::Message for Tauri Store errors - Used AppError::io() for file system operations ### Fixed Previous Temporary Solutions - **import_export.rs** (2 lines changed) - Removed AppError::Message wrapper for mcp::sync_enabled_to_codex - Now directly calls the AppError-returning function (no conversion needed) - **commands.rs** (6 lines changed) - Updated query_provider_usage() and test_api_endpoints() - Explicit .to_string() conversion for Tauri command interface ## New Error Types - **AppError::McpValidation**: Domain-specific error for MCP configuration validation - Separates MCP validation errors from generic Config errors - Follows domain-driven design principles ## Statistics - Files changed: 8 - Lines changed: +237/-122 (net +115) - Compilation: ✅ Success (7.13s, 0 warnings) - Tests: ✅ 4/4 passed ## Benefits - **100% Migration**: All modules now use AppError consistently - **Domain Errors**: Added McpValidation for better error categorization - **No Temporary Solutions**: Eliminated all AppError::Message conversions for internal calls - **Performance**: Used ok_or_else for lazy error construction - **Maintainability**: Removed ~60 instances of .map_err(|e| format!("...", e)) - **Debugging**: Added error logging in critical paths (tray menu updates) ## Phase 1 Complete Total impact across 3 commits: - 25 files changed - +671/-302 lines (net +369) - 100% of codebase migrated from Result<T, String> to Result<T, AppError> - 0 compilation warnings - All tests passing Ready for Phase 2: Splitting commands.rs by domain. Co-authored-by: Claude <noreply@anthropic.com>
2025-10-27 20:36:08 +08:00
}