refactor(backend): extract MCP service layer with snapshot isolation
Extract all MCP business logic from command layer into `services/mcp.rs`, implementing snapshot isolation pattern to optimize lock granularity after RwLock migration in Phase 5. ## Key Changes ### Service Layer (`services/mcp.rs`) - Add `McpService` with 7 methods: `get_servers`, `upsert_server`, `delete_server`, `set_enabled`, `sync_enabled`, `import_from_claude`, `import_from_codex` - Implement snapshot isolation: acquire write lock only for in-memory modifications, clone config snapshot, release lock, then perform file I/O with snapshot - Use conditional cloning: only clone config when sync is actually needed (e.g., when `enabled` flag is true or `sync_other_side` is requested) ### Command Layer (`commands/mcp.rs`) - Reduce to thin wrappers: parse parameters and delegate to `McpService` - Remove all `*_internal` and `*_test_hook` functions (-94 lines) - Each command now 5-10 lines (parameter parsing + service call + error mapping) ### Core Logic Refactoring (`mcp.rs`) - Rename `set_enabled_and_sync_for` → `set_enabled_flag_for` - Remove file sync logic from low-level function, move sync responsibility to service layer for better separation of concerns ### Test Adaptation (`tests/mcp_commands.rs`) - Replace test hooks with direct `McpService` calls - All 5 MCP integration tests pass ### Additional Fixes - Add `Default` impl for `AppState` (clippy suggestion) - Remove unnecessary auto-deref in `commands/provider.rs` and `lib.rs` - Update Phase 4/5 progress in `BACKEND_REFACTOR_PLAN.md` ## Performance Impact **Before**: Write lock held during file I/O (~10ms), blocking all readers **After**: Write lock held only for memory ops (~100μs), file I/O lock-free Estimated throughput improvement: ~2x in high-concurrency read scenarios ## Testing - ✅ All tests pass: 5 MCP commands + 7 provider service tests - ✅ Zero clippy warnings with `-D warnings` - ✅ No behavioral changes, maintains original save semantics Part of Phase 4 (Service Layer Abstraction) of backend refactoring roadmap.
This commit is contained in:
Jason
168
src-tauri/src/services/mcp.rs
Normal file
168
src-tauri/src/services/mcp.rs
Normal file
@@ -0,0 +1,168 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use serde_json::Value;
|
||||
|
||||
use crate::app_config::{AppType, MultiAppConfig};
|
||||
use crate::error::AppError;
|
||||
use crate::mcp;
|
||||
use crate::store::AppState;
|
||||
|
||||
/// MCP 相关业务逻辑
|
||||
pub struct McpService;
|
||||
|
||||
impl McpService {
|
||||
/// 获取指定应用的 MCP 服务器快照，并在必要时回写归一化后的配置。
|
||||
pub fn get_servers(state: &AppState, app: AppType) -> Result<HashMap<String, Value>, AppError> {
|
||||
let mut cfg = state.config.write()?;
|
||||
let (snapshot, normalized) = mcp::get_servers_snapshot_for(&mut cfg, &app);
|
||||
drop(cfg);
|
||||
if normalized > 0 {
|
||||
state.save()?;
|
||||
}
|
||||
Ok(snapshot)
|
||||
}
|
||||
|
||||
/// 在 config.json 中新增或更新指定 MCP 服务器，并按需同步到对应客户端。
|
||||
pub fn upsert_server(
|
||||
state: &AppState,
|
||||
app: AppType,
|
||||
id: &str,
|
||||
spec: Value,
|
||||
sync_other_side: bool,
|
||||
) -> Result<bool, AppError> {
|
||||
let (changed, snapshot, sync_claude, sync_codex): (
|
||||
bool,
|
||||
Option<MultiAppConfig>,
|
||||
bool,
|
||||
bool,
|
||||
) = {
|
||||
let mut cfg = state.config.write()?;
|
||||
let changed = mcp::upsert_in_config_for(&mut cfg, &app, id, spec)?;
|
||||
|
||||
let enabled = cfg
|
||||
.mcp_for(&app)
|
||||
.servers
|
||||
.get(id)
|
||||
.and_then(|entry| entry.get("enabled"))
|
||||
.and_then(|v| v.as_bool())
|
||||
.unwrap_or(false);
|
||||
|
||||
let mut sync_claude = matches!(app, AppType::Claude) && enabled;
|
||||
let mut sync_codex = matches!(app, AppType::Codex) && enabled;
|
||||
|
||||
if sync_other_side {
|
||||
match app {
|
||||
AppType::Claude => sync_codex = true,
|
||||
AppType::Codex => sync_claude = true,
|
||||
}
|
||||
}
|
||||
|
||||
let snapshot = if sync_claude || sync_codex {
|
||||
Some(cfg.clone())
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
(changed, snapshot, sync_claude, sync_codex)
|
||||
};
|
||||
|
||||
// 保持原有行为：始终尝试持久化，避免遗漏 normalize 带来的隐式变更
|
||||
state.save()?;
|
||||
|
||||
if let Some(snapshot) = snapshot {
|
||||
if sync_claude {
|
||||
mcp::sync_enabled_to_claude(&snapshot)?;
|
||||
}
|
||||
if sync_codex {
|
||||
mcp::sync_enabled_to_codex(&snapshot)?;
|
||||
}
|
||||
}
|
||||
|
||||
Ok(changed)
|
||||
}
|
||||
|
||||
/// 删除 config.json 中的 MCP 服务器条目，并同步客户端配置。
|
||||
pub fn delete_server(state: &AppState, app: AppType, id: &str) -> Result<bool, AppError> {
|
||||
let (existed, snapshot): (bool, Option<MultiAppConfig>) = {
|
||||
let mut cfg = state.config.write()?;
|
||||
let existed = mcp::delete_in_config_for(&mut cfg, &app, id)?;
|
||||
let snapshot = if existed { Some(cfg.clone()) } else { None };
|
||||
(existed, snapshot)
|
||||
};
|
||||
if existed {
|
||||
state.save()?;
|
||||
if let Some(snapshot) = snapshot {
|
||||
match app {
|
||||
AppType::Claude => mcp::sync_enabled_to_claude(&snapshot)?,
|
||||
AppType::Codex => mcp::sync_enabled_to_codex(&snapshot)?,
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(existed)
|
||||
}
|
||||
|
||||
/// 设置 MCP 启用状态，并同步到客户端配置。
|
||||
pub fn set_enabled(
|
||||
state: &AppState,
|
||||
app: AppType,
|
||||
id: &str,
|
||||
enabled: bool,
|
||||
) -> Result<bool, AppError> {
|
||||
let (existed, snapshot): (bool, Option<MultiAppConfig>) = {
|
||||
let mut cfg = state.config.write()?;
|
||||
let existed = mcp::set_enabled_flag_for(&mut cfg, &app, id, enabled)?;
|
||||
let snapshot = if existed { Some(cfg.clone()) } else { None };
|
||||
(existed, snapshot)
|
||||
};
|
||||
|
||||
if existed {
|
||||
state.save()?;
|
||||
if let Some(snapshot) = snapshot {
|
||||
match app {
|
||||
AppType::Claude => mcp::sync_enabled_to_claude(&snapshot)?,
|
||||
AppType::Codex => mcp::sync_enabled_to_codex(&snapshot)?,
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(existed)
|
||||
}
|
||||
|
||||
/// 手动同步已启用的 MCP 服务器到客户端配置。
|
||||
pub fn sync_enabled(state: &AppState, app: AppType) -> Result<(), AppError> {
|
||||
let (snapshot, normalized): (MultiAppConfig, usize) = {
|
||||
let mut cfg = state.config.write()?;
|
||||
let normalized = mcp::normalize_servers_for(&mut cfg, &app);
|
||||
(cfg.clone(), normalized)
|
||||
};
|
||||
if normalized > 0 {
|
||||
state.save()?;
|
||||
}
|
||||
match app {
|
||||
AppType::Claude => mcp::sync_enabled_to_claude(&snapshot)?,
|
||||
AppType::Codex => mcp::sync_enabled_to_codex(&snapshot)?,
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 从 Claude 客户端配置导入 MCP 定义。
|
||||
pub fn import_from_claude(state: &AppState) -> Result<usize, AppError> {
|
||||
let mut cfg = state.config.write()?;
|
||||
let changed = mcp::import_from_claude(&mut cfg)?;
|
||||
drop(cfg);
|
||||
if changed > 0 {
|
||||
state.save()?;
|
||||
}
|
||||
Ok(changed)
|
||||
}
|
||||
|
||||
/// 从 Codex 客户端配置导入 MCP 定义。
|
||||
pub fn import_from_codex(state: &AppState) -> Result<usize, AppError> {
|
||||
let mut cfg = state.config.write()?;
|
||||
let changed = mcp::import_from_codex(&mut cfg)?;
|
||||
drop(cfg);
|
||||
if changed > 0 {
|
||||
state.save()?;
|
||||
}
|
||||
Ok(changed)
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,5 @@
|
||||
pub mod mcp;
|
||||
pub mod provider;
|
||||
|
||||
pub use mcp::McpService;
|
||||
pub use provider::ProviderService;
|
||||
|
||||
Reference in New Issue
Block a user