mirror of
https://github.com/farion1231/cc-switch.git
synced 2026-07-26 23:56:02 +08:00
Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3faa0164ab | |||
| 4eb983c58f | |||
| cef3812745 | |||
| 6c9a7ef949 | |||
| 48c434a20a | |||
| 4f6dfff179 | |||
| 4b9cca12d3 | |||
| 8db44a78b2 | |||
| efad0c0f91 | |||
| b536bd0366 | |||
| 783bc60329 | |||
| 924e5386f9 | |||
| 74f67bc1ee | |||
| ae5d05b08c | |||
| 4edb08cd53 | |||
| a8ea99c3fe | |||
| 22c0e7bb5c | |||
| 8af31c3e61 | |||
| e1d4dd7f55 | |||
| 6ce6f16a99 |
@@ -181,7 +181,7 @@ Download `CC-Switch-v{version}-macOS.zip` from the [Releases](../../releases) pa
|
|||||||
|
|
||||||
> **Note**: Since the author doesn't have an Apple Developer account, you may see an "unidentified developer" warning on first launch. Please close it first, then go to "System Settings" → "Privacy & Security" → click "Open Anyway", and you'll be able to open it normally afterwards.
|
> **Note**: Since the author doesn't have an Apple Developer account, you may see an "unidentified developer" warning on first launch. Please close it first, then go to "System Settings" → "Privacy & Security" → click "Open Anyway", and you'll be able to open it normally afterwards.
|
||||||
|
|
||||||
### ArchLinux 用户
|
### Arch Linux Users
|
||||||
|
|
||||||
**Install via paru (Recommended)**
|
**Install via paru (Recommended)**
|
||||||
|
|
||||||
|
|||||||
@@ -75,6 +75,7 @@ pub async fn get_auto_failover_enabled(
|
|||||||
/// 注意:关闭故障转移时不会清除队列,队列内容会保留供下次开启时使用
|
/// 注意:关闭故障转移时不会清除队列,队列内容会保留供下次开启时使用
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn set_auto_failover_enabled(
|
pub async fn set_auto_failover_enabled(
|
||||||
|
app: tauri::AppHandle,
|
||||||
state: tauri::State<'_, AppState>,
|
state: tauri::State<'_, AppState>,
|
||||||
app_type: String,
|
app_type: String,
|
||||||
enabled: bool,
|
enabled: bool,
|
||||||
@@ -98,5 +99,14 @@ pub async fn set_auto_failover_enabled(
|
|||||||
.db
|
.db
|
||||||
.update_proxy_config_for_app(config)
|
.update_proxy_config_for_app(config)
|
||||||
.await
|
.await
|
||||||
.map_err(|e| e.to_string())
|
.map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
|
// 刷新托盘菜单,确保状态同步
|
||||||
|
if let Ok(new_menu) = crate::tray::create_tray_menu(&app, &state) {
|
||||||
|
if let Some(tray) = app.tray_by_id("main") {
|
||||||
|
let _ = tray.set_menu(Some(new_menu));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,3 +80,30 @@ pub async fn set_rectifier_config(
|
|||||||
.map_err(|e| e.to_string())?;
|
.map_err(|e| e.to_string())?;
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 获取日志配置
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn get_log_config(
|
||||||
|
state: tauri::State<'_, crate::AppState>,
|
||||||
|
) -> Result<crate::proxy::types::LogConfig, String> {
|
||||||
|
state.db.get_log_config().map_err(|e| e.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 设置日志配置
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn set_log_config(
|
||||||
|
state: tauri::State<'_, crate::AppState>,
|
||||||
|
config: crate::proxy::types::LogConfig,
|
||||||
|
) -> Result<bool, String> {
|
||||||
|
state
|
||||||
|
.db
|
||||||
|
.set_log_config(&config)
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
log::set_max_level(config.to_level_filter());
|
||||||
|
log::info!(
|
||||||
|
"日志配置已更新: enabled={}, level={}",
|
||||||
|
config.enabled,
|
||||||
|
config.level
|
||||||
|
);
|
||||||
|
Ok(true)
|
||||||
|
}
|
||||||
|
|||||||
@@ -614,4 +614,51 @@ impl Database {
|
|||||||
log::info!("已删除所有 Live 配置备份");
|
log::info!("已删除所有 Live 配置备份");
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ==================== Sync Methods for Tray Menu ====================
|
||||||
|
|
||||||
|
/// 同步获取应用的 proxy 启用状态和自动故障转移状态
|
||||||
|
///
|
||||||
|
/// 用于托盘菜单构建等同步场景
|
||||||
|
/// 返回 (enabled, auto_failover_enabled)
|
||||||
|
pub fn get_proxy_flags_sync(&self, app_type: &str) -> (bool, bool) {
|
||||||
|
let conn = match self.conn.lock() {
|
||||||
|
Ok(c) => c,
|
||||||
|
Err(_) => return (false, false),
|
||||||
|
};
|
||||||
|
|
||||||
|
conn.query_row(
|
||||||
|
"SELECT enabled, auto_failover_enabled FROM proxy_config WHERE app_type = ?1",
|
||||||
|
[app_type],
|
||||||
|
|row| Ok((row.get::<_, i32>(0)? != 0, row.get::<_, i32>(1)? != 0)),
|
||||||
|
)
|
||||||
|
.unwrap_or((false, false))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 同步设置应用的 proxy 启用状态和自动故障转移状态
|
||||||
|
///
|
||||||
|
/// 用于托盘菜单点击等同步场景
|
||||||
|
pub fn set_proxy_flags_sync(
|
||||||
|
&self,
|
||||||
|
app_type: &str,
|
||||||
|
enabled: bool,
|
||||||
|
auto_failover_enabled: bool,
|
||||||
|
) -> Result<(), AppError> {
|
||||||
|
let conn = self
|
||||||
|
.conn
|
||||||
|
.lock()
|
||||||
|
.map_err(|e| AppError::Database(format!("Mutex lock failed: {e}")))?;
|
||||||
|
|
||||||
|
conn.execute(
|
||||||
|
"UPDATE proxy_config SET enabled = ?2, auto_failover_enabled = ?3, updated_at = datetime('now') WHERE app_type = ?1",
|
||||||
|
rusqlite::params![
|
||||||
|
app_type,
|
||||||
|
if enabled { 1 } else { 0 },
|
||||||
|
if auto_failover_enabled { 1 } else { 0 },
|
||||||
|
],
|
||||||
|
)
|
||||||
|
.map_err(|e| AppError::Database(e.to_string()))?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -186,4 +186,22 @@ impl Database {
|
|||||||
.map_err(|e| AppError::Database(format!("序列化整流器配置失败: {e}")))?;
|
.map_err(|e| AppError::Database(format!("序列化整流器配置失败: {e}")))?;
|
||||||
self.set_setting("rectifier_config", &json)
|
self.set_setting("rectifier_config", &json)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- 日志配置 ---
|
||||||
|
|
||||||
|
/// 获取日志配置
|
||||||
|
pub fn get_log_config(&self) -> Result<crate::proxy::types::LogConfig, AppError> {
|
||||||
|
match self.get_setting("log_config")? {
|
||||||
|
Some(json) => serde_json::from_str(&json)
|
||||||
|
.map_err(|e| AppError::Database(format!("解析日志配置失败: {e}"))),
|
||||||
|
None => Ok(crate::proxy::types::LogConfig::default()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 更新日志配置
|
||||||
|
pub fn set_log_config(&self, config: &crate::proxy::types::LogConfig) -> Result<(), AppError> {
|
||||||
|
let json = serde_json::to_string(config)
|
||||||
|
.map_err(|e| AppError::Database(format!("序列化日志配置失败: {e}")))?;
|
||||||
|
self.set_setting("log_config", &json)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+33
-10
@@ -266,33 +266,41 @@ pub fn run() {
|
|||||||
log::warn!("初始化 Updater 插件失败,已跳过:{e}");
|
log::warn!("初始化 Updater 插件失败,已跳过:{e}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 初始化日志(Debug 和 Release 模式都启用 Info 级别)
|
// 初始化日志(单文件输出到 <app_config_dir>/logs/cc-switch.log)
|
||||||
// 日志同时输出到控制台和文件(<app_config_dir>/logs/;若设置了覆盖则使用覆盖目录)
|
|
||||||
{
|
{
|
||||||
use tauri_plugin_log::{RotationStrategy, Target, TargetKind, TimezoneStrategy};
|
use tauri_plugin_log::{RotationStrategy, Target, TargetKind, TimezoneStrategy};
|
||||||
|
|
||||||
let log_dir = panic_hook::get_log_dir();
|
let log_dir = panic_hook::get_log_dir();
|
||||||
|
|
||||||
|
// 确保日志目录存在
|
||||||
|
if let Err(e) = std::fs::create_dir_all(&log_dir) {
|
||||||
|
eprintln!("创建日志目录失败: {e}");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 启动时删除旧日志文件,实现单文件覆盖效果
|
||||||
|
let log_file_path = log_dir.join("cc-switch.log");
|
||||||
|
let _ = std::fs::remove_file(&log_file_path);
|
||||||
|
|
||||||
app.handle().plugin(
|
app.handle().plugin(
|
||||||
tauri_plugin_log::Builder::default()
|
tauri_plugin_log::Builder::default()
|
||||||
.level(log::LevelFilter::Info)
|
// 初始化为 Trace,允许后续通过 log::set_max_level() 动态调整级别
|
||||||
|
.level(log::LevelFilter::Trace)
|
||||||
.targets([
|
.targets([
|
||||||
// 输出到控制台
|
|
||||||
Target::new(TargetKind::Stdout),
|
Target::new(TargetKind::Stdout),
|
||||||
// 输出到日志文件
|
|
||||||
Target::new(TargetKind::Folder {
|
Target::new(TargetKind::Folder {
|
||||||
path: log_dir,
|
path: log_dir,
|
||||||
file_name: Some("cc-switch".into()),
|
file_name: Some("cc-switch".into()),
|
||||||
}),
|
}),
|
||||||
])
|
])
|
||||||
.rotation_strategy(RotationStrategy::KeepAll)
|
// 单文件模式:启动时删除旧文件,达到大小时轮转
|
||||||
.max_file_size(5_000_000) // 5MB 单文件上限
|
// 注意:KeepSome(n) 内部会做 n-2 运算,n=1 会导致 usize 下溢
|
||||||
|
// KeepSome(2) 是最小安全值,表示不保留轮转文件
|
||||||
|
.rotation_strategy(RotationStrategy::KeepSome(2))
|
||||||
|
// 单文件大小限制 1GB
|
||||||
|
.max_file_size(1024 * 1024 * 1024)
|
||||||
.timezone_strategy(TimezoneStrategy::UseLocal)
|
.timezone_strategy(TimezoneStrategy::UseLocal)
|
||||||
.build(),
|
.build(),
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
// 清理旧日志文件,只保留最近 2 个
|
|
||||||
panic_hook::cleanup_old_logs();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 初始化数据库
|
// 初始化数据库
|
||||||
@@ -660,6 +668,19 @@ pub fn run() {
|
|||||||
// 将同一个实例注入到全局状态,避免重复创建导致的不一致
|
// 将同一个实例注入到全局状态,避免重复创建导致的不一致
|
||||||
app.manage(app_state);
|
app.manage(app_state);
|
||||||
|
|
||||||
|
// 从数据库加载日志配置并应用
|
||||||
|
{
|
||||||
|
let db = &app.state::<AppState>().db;
|
||||||
|
if let Ok(log_config) = db.get_log_config() {
|
||||||
|
log::set_max_level(log_config.to_level_filter());
|
||||||
|
log::info!(
|
||||||
|
"已加载日志配置: enabled={}, level={}",
|
||||||
|
log_config.enabled,
|
||||||
|
log_config.level
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 初始化 SkillService
|
// 初始化 SkillService
|
||||||
let skill_service = SkillService::new();
|
let skill_service = SkillService::new();
|
||||||
app.manage(commands::skill::SkillServiceState(Arc::new(skill_service)));
|
app.manage(commands::skill::SkillServiceState(Arc::new(skill_service)));
|
||||||
@@ -757,6 +778,8 @@ pub fn run() {
|
|||||||
commands::save_settings,
|
commands::save_settings,
|
||||||
commands::get_rectifier_config,
|
commands::get_rectifier_config,
|
||||||
commands::set_rectifier_config,
|
commands::set_rectifier_config,
|
||||||
|
commands::get_log_config,
|
||||||
|
commands::set_log_config,
|
||||||
commands::restart_app,
|
commands::restart_app,
|
||||||
commands::check_for_updates,
|
commands::check_for_updates,
|
||||||
commands::is_portable_mode,
|
commands::is_portable_mode,
|
||||||
|
|||||||
@@ -96,10 +96,7 @@ pub fn convert_to_opencode_format(spec: &Value) -> Result<Value, AppError> {
|
|||||||
result.insert("enabled".into(), json!(true));
|
result.insert("enabled".into(), json!(true));
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
return Err(AppError::McpValidation(format!(
|
return Err(AppError::McpValidation(format!("Unknown MCP type: {typ}")));
|
||||||
"Unknown MCP type: {}",
|
|
||||||
typ
|
|
||||||
)));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -171,8 +168,7 @@ pub fn convert_from_opencode_format(spec: &Value) -> Result<Value, AppError> {
|
|||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
return Err(AppError::McpValidation(format!(
|
return Err(AppError::McpValidation(format!(
|
||||||
"Unknown OpenCode MCP type: {}",
|
"Unknown OpenCode MCP type: {typ}"
|
||||||
typ
|
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -230,16 +226,16 @@ pub fn import_from_opencode(config: &mut MultiAppConfig) -> Result<usize, AppErr
|
|||||||
let unified_spec = match convert_from_opencode_format(&spec) {
|
let unified_spec = match convert_from_opencode_format(&spec) {
|
||||||
Ok(s) => s,
|
Ok(s) => s,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::warn!("Skip invalid OpenCode MCP server '{}': {}", id, e);
|
log::warn!("Skip invalid OpenCode MCP server '{id}': {e}");
|
||||||
errors.push(format!("{}: {}", id, e));
|
errors.push(format!("{id}: {e}"));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Validate the converted spec
|
// Validate the converted spec
|
||||||
if let Err(e) = validate_server_spec(&unified_spec) {
|
if let Err(e) = validate_server_spec(&unified_spec) {
|
||||||
log::warn!("Skip invalid MCP server '{}' after conversion: {}", id, e);
|
log::warn!("Skip invalid MCP server '{id}' after conversion: {e}");
|
||||||
errors.push(format!("{}: {}", id, e));
|
errors.push(format!("{id}: {e}"));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -248,7 +244,7 @@ pub fn import_from_opencode(config: &mut MultiAppConfig) -> Result<usize, AppErr
|
|||||||
if !existing.apps.opencode {
|
if !existing.apps.opencode {
|
||||||
existing.apps.opencode = true;
|
existing.apps.opencode = true;
|
||||||
changed += 1;
|
changed += 1;
|
||||||
log::info!("MCP server '{}' enabled for OpenCode", id);
|
log::info!("MCP server '{id}' enabled for OpenCode");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// New server: default to only OpenCode enabled
|
// New server: default to only OpenCode enabled
|
||||||
@@ -271,7 +267,7 @@ pub fn import_from_opencode(config: &mut MultiAppConfig) -> Result<usize, AppErr
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
changed += 1;
|
changed += 1;
|
||||||
log::info!("Imported new MCP server '{}' from OpenCode", id);
|
log::info!("Imported new MCP server '{id}' from OpenCode");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ pub fn write_opencode_config(config: &Value) -> Result<(), AppError> {
|
|||||||
// 复用统一的原子写入逻辑(兼容 Windows 上目标文件已存在的情况)
|
// 复用统一的原子写入逻辑(兼容 Windows 上目标文件已存在的情况)
|
||||||
write_json_file(&path, config)?;
|
write_json_file(&path, config)?;
|
||||||
|
|
||||||
log::debug!("OpenCode config written to {:?}", path);
|
log::debug!("OpenCode config written to {path:?}");
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -165,7 +165,7 @@ pub fn get_typed_providers() -> Result<IndexMap<String, OpenCodeProviderConfig>,
|
|||||||
result.insert(id, config);
|
result.insert(id, config);
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::warn!("Failed to parse provider '{}': {}", id, e);
|
log::warn!("Failed to parse provider '{id}': {e}");
|
||||||
// Skip invalid providers but continue
|
// Skip invalid providers but continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -219,4 +219,3 @@ pub fn remove_mcp_server(id: &str) -> Result<(), AppError> {
|
|||||||
|
|
||||||
write_opencode_config(&config)
|
write_opencode_config(&config)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,9 +12,6 @@ use std::sync::OnceLock;
|
|||||||
/// 应用版本号(从 Cargo.toml 读取)
|
/// 应用版本号(从 Cargo.toml 读取)
|
||||||
const APP_VERSION: &str = env!("CARGO_PKG_VERSION");
|
const APP_VERSION: &str = env!("CARGO_PKG_VERSION");
|
||||||
|
|
||||||
/// 日志文件保留数量
|
|
||||||
const LOG_FILES_TO_KEEP: usize = 2;
|
|
||||||
|
|
||||||
static APP_CONFIG_DIR: OnceLock<PathBuf> = OnceLock::new();
|
static APP_CONFIG_DIR: OnceLock<PathBuf> = OnceLock::new();
|
||||||
|
|
||||||
pub fn init_app_config_dir(dir: PathBuf) {
|
pub fn init_app_config_dir(dir: PathBuf) {
|
||||||
@@ -46,48 +43,6 @@ pub fn get_log_dir() -> PathBuf {
|
|||||||
get_app_config_dir().join("logs")
|
get_app_config_dir().join("logs")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 清理旧日志文件,只保留最近 N 个
|
|
||||||
///
|
|
||||||
/// 在应用启动时调用,确保日志文件不会无限增长。
|
|
||||||
pub fn cleanup_old_logs() {
|
|
||||||
let log_dir = get_log_dir();
|
|
||||||
|
|
||||||
if !log_dir.exists() {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 读取目录中的所有 .log 文件
|
|
||||||
let mut log_files: Vec<_> = match std::fs::read_dir(&log_dir) {
|
|
||||||
Ok(entries) => entries
|
|
||||||
.filter_map(|e| e.ok())
|
|
||||||
.map(|e| e.path())
|
|
||||||
.filter(|p| p.extension().map(|ext| ext == "log").unwrap_or(false))
|
|
||||||
.collect(),
|
|
||||||
Err(_) => return,
|
|
||||||
};
|
|
||||||
|
|
||||||
// 如果文件数量不超过保留数量,无需清理
|
|
||||||
if log_files.len() <= LOG_FILES_TO_KEEP {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 按修改时间排序(最新的在前)
|
|
||||||
log_files.sort_by(|a, b| {
|
|
||||||
let time_a = a.metadata().and_then(|m| m.modified()).ok();
|
|
||||||
let time_b = b.metadata().and_then(|m| m.modified()).ok();
|
|
||||||
time_b.cmp(&time_a) // 降序
|
|
||||||
});
|
|
||||||
|
|
||||||
// 删除多余的旧文件
|
|
||||||
for old_file in log_files.into_iter().skip(LOG_FILES_TO_KEEP) {
|
|
||||||
if let Err(e) = std::fs::remove_file(&old_file) {
|
|
||||||
log::warn!("清理旧日志文件失败 {}: {e}", old_file.display());
|
|
||||||
} else {
|
|
||||||
log::info!("已清理旧日志文件: {}", old_file.display());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// 安全获取环境信息(不会 panic)
|
/// 安全获取环境信息(不会 panic)
|
||||||
fn get_system_info() -> String {
|
fn get_system_info() -> String {
|
||||||
let os = std::env::consts::OS;
|
let os = std::env::consts::OS;
|
||||||
|
|||||||
@@ -142,6 +142,55 @@ pub struct UsageResult {
|
|||||||
pub error: Option<String>,
|
pub error: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 供应商单独的模型测试配置
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
|
||||||
|
pub struct ProviderTestConfig {
|
||||||
|
/// 是否启用单独配置(false 时使用全局配置)
|
||||||
|
#[serde(default)]
|
||||||
|
pub enabled: bool,
|
||||||
|
/// 测试用的模型名称(覆盖全局配置)
|
||||||
|
#[serde(rename = "testModel", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub test_model: Option<String>,
|
||||||
|
/// 超时时间(秒)
|
||||||
|
#[serde(rename = "timeoutSecs", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub timeout_secs: Option<u64>,
|
||||||
|
/// 测试提示词
|
||||||
|
#[serde(rename = "testPrompt", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub test_prompt: Option<String>,
|
||||||
|
/// 降级阈值(毫秒)
|
||||||
|
#[serde(
|
||||||
|
rename = "degradedThresholdMs",
|
||||||
|
skip_serializing_if = "Option::is_none"
|
||||||
|
)]
|
||||||
|
pub degraded_threshold_ms: Option<u64>,
|
||||||
|
/// 最大重试次数
|
||||||
|
#[serde(rename = "maxRetries", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub max_retries: Option<u32>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 供应商单独的代理配置
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
|
||||||
|
pub struct ProviderProxyConfig {
|
||||||
|
/// 是否启用单独配置(false 时使用全局/系统代理)
|
||||||
|
#[serde(default)]
|
||||||
|
pub enabled: bool,
|
||||||
|
/// 代理类型:http, https, socks5
|
||||||
|
#[serde(rename = "proxyType", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub proxy_type: Option<String>,
|
||||||
|
/// 代理主机
|
||||||
|
#[serde(rename = "proxyHost", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub proxy_host: Option<String>,
|
||||||
|
/// 代理端口
|
||||||
|
#[serde(rename = "proxyPort", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub proxy_port: Option<u16>,
|
||||||
|
/// 代理用户名(可选)
|
||||||
|
#[serde(rename = "proxyUsername", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub proxy_username: Option<String>,
|
||||||
|
/// 代理密码(可选)
|
||||||
|
#[serde(rename = "proxyPassword", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub proxy_password: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
/// 供应商元数据
|
/// 供应商元数据
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
|
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
|
||||||
pub struct ProviderMeta {
|
pub struct ProviderMeta {
|
||||||
@@ -172,6 +221,12 @@ pub struct ProviderMeta {
|
|||||||
/// 每月消费限额(USD)
|
/// 每月消费限额(USD)
|
||||||
#[serde(rename = "limitMonthlyUsd", skip_serializing_if = "Option::is_none")]
|
#[serde(rename = "limitMonthlyUsd", skip_serializing_if = "Option::is_none")]
|
||||||
pub limit_monthly_usd: Option<String>,
|
pub limit_monthly_usd: Option<String>,
|
||||||
|
/// 供应商单独的模型测试配置
|
||||||
|
#[serde(rename = "testConfig", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub test_config: Option<ProviderTestConfig>,
|
||||||
|
/// 供应商单独的代理配置
|
||||||
|
#[serde(rename = "proxyConfig", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub proxy_config: Option<ProviderProxyConfig>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ProviderManager {
|
impl ProviderManager {
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ const HEADER_BLACKLIST: &[&str] = &[
|
|||||||
// 认证类(会被覆盖)
|
// 认证类(会被覆盖)
|
||||||
"authorization",
|
"authorization",
|
||||||
"x-api-key",
|
"x-api-key",
|
||||||
|
"x-goog-api-key",
|
||||||
// 连接类(由 HTTP 客户端管理)
|
// 连接类(由 HTTP 客户端管理)
|
||||||
"host",
|
"host",
|
||||||
"content-length",
|
"content-length",
|
||||||
@@ -585,8 +586,9 @@ impl RequestForwarder {
|
|||||||
// 默认使用空白名单,过滤所有 _ 前缀字段
|
// 默认使用空白名单,过滤所有 _ 前缀字段
|
||||||
let filtered_body = filter_private_params_with_whitelist(request_body, &[]);
|
let filtered_body = filter_private_params_with_whitelist(request_body, &[]);
|
||||||
|
|
||||||
// 每次请求时获取最新的全局 HTTP 客户端(支持热更新代理配置)
|
// 获取 HTTP 客户端:优先使用供应商单独代理配置,否则使用全局客户端
|
||||||
let client = super::http_client::get();
|
let proxy_config = provider.meta.as_ref().and_then(|m| m.proxy_config.as_ref());
|
||||||
|
let client = super::http_client::get_for_provider(proxy_config);
|
||||||
let mut request = client.post(&url);
|
let mut request = client.post(&url);
|
||||||
|
|
||||||
// 只有当 timeout > 0 时才设置请求超时
|
// 只有当 timeout > 0 时才设置请求超时
|
||||||
@@ -662,6 +664,17 @@ impl RequestForwarder {
|
|||||||
request = request.header("anthropic-version", version_str);
|
request = request.header("anthropic-version", version_str);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 输出请求信息日志
|
||||||
|
let tag = adapter.name();
|
||||||
|
log::debug!("[{tag}] >>> 请求 URL: {url}");
|
||||||
|
if let Ok(body_str) = serde_json::to_string(&filtered_body) {
|
||||||
|
log::debug!(
|
||||||
|
"[{tag}] >>> 请求体内容 ({}字节): {}",
|
||||||
|
body_str.len(),
|
||||||
|
body_str
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// 发送请求
|
// 发送请求
|
||||||
let response = request.json(&filtered_body).send().await.map_err(|e| {
|
let response = request.json(&filtered_body).send().await.map_err(|e| {
|
||||||
if e.is_timeout() {
|
if e.is_timeout() {
|
||||||
|
|||||||
@@ -3,8 +3,11 @@
|
|||||||
//! 提供支持全局代理配置的 HTTP 客户端。
|
//! 提供支持全局代理配置的 HTTP 客户端。
|
||||||
//! 所有需要发送 HTTP 请求的模块都应使用此模块提供的客户端。
|
//! 所有需要发送 HTTP 请求的模块都应使用此模块提供的客户端。
|
||||||
|
|
||||||
|
use crate::provider::ProviderProxyConfig;
|
||||||
use once_cell::sync::OnceCell;
|
use once_cell::sync::OnceCell;
|
||||||
use reqwest::Client;
|
use reqwest::Client;
|
||||||
|
use std::env;
|
||||||
|
use std::net::IpAddr;
|
||||||
use std::sync::RwLock;
|
use std::sync::RwLock;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
@@ -155,23 +158,15 @@ pub fn update_proxy(proxy_url: Option<&str>) -> Result<(), String> {
|
|||||||
|
|
||||||
/// 获取全局 HTTP 客户端
|
/// 获取全局 HTTP 客户端
|
||||||
///
|
///
|
||||||
/// 返回配置了代理的客户端(如果已配置代理),否则返回直连客户端。
|
/// 返回配置了代理的客户端(如果已配置代理),否则返回跟随系统代理的客户端。
|
||||||
pub fn get() -> Client {
|
pub fn get() -> Client {
|
||||||
GLOBAL_CLIENT
|
GLOBAL_CLIENT
|
||||||
.get()
|
.get()
|
||||||
.and_then(|lock| lock.read().ok())
|
.and_then(|lock| lock.read().ok())
|
||||||
.map(|c| c.clone())
|
.map(|c| c.clone())
|
||||||
.unwrap_or_else(|| {
|
.unwrap_or_else(|| {
|
||||||
// 如果还没初始化,创建一个默认客户端(配置与 build_client 一致)
|
|
||||||
log::warn!("[GlobalProxy] [GP-004] Client not initialized, using fallback");
|
log::warn!("[GlobalProxy] [GP-004] Client not initialized, using fallback");
|
||||||
Client::builder()
|
build_client(None).unwrap_or_default()
|
||||||
.timeout(Duration::from_secs(600))
|
|
||||||
.connect_timeout(Duration::from_secs(30))
|
|
||||||
.pool_max_idle_per_host(10)
|
|
||||||
.tcp_keepalive(Duration::from_secs(60))
|
|
||||||
.no_proxy()
|
|
||||||
.build()
|
|
||||||
.unwrap_or_default()
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -199,7 +194,7 @@ fn build_client(proxy_url: Option<&str>) -> Result<Client, String> {
|
|||||||
.pool_max_idle_per_host(10)
|
.pool_max_idle_per_host(10)
|
||||||
.tcp_keepalive(Duration::from_secs(60));
|
.tcp_keepalive(Duration::from_secs(60));
|
||||||
|
|
||||||
// 有代理地址则使用代理,否则直连
|
// 有代理地址则使用代理,否则跟随系统代理
|
||||||
if let Some(url) = proxy_url {
|
if let Some(url) = proxy_url {
|
||||||
// 先验证 URL 格式和 scheme
|
// 先验证 URL 格式和 scheme
|
||||||
let parsed = url::Url::parse(url)
|
let parsed = url::Url::parse(url)
|
||||||
@@ -219,8 +214,16 @@ fn build_client(proxy_url: Option<&str>) -> Result<Client, String> {
|
|||||||
builder = builder.proxy(proxy);
|
builder = builder.proxy(proxy);
|
||||||
log::debug!("[GlobalProxy] Proxy configured: {}", mask_url(url));
|
log::debug!("[GlobalProxy] Proxy configured: {}", mask_url(url));
|
||||||
} else {
|
} else {
|
||||||
builder = builder.no_proxy();
|
// 未设置全局代理时,让 reqwest 自动检测系统代理(环境变量)
|
||||||
log::debug!("[GlobalProxy] Direct connection (no proxy)");
|
// 若系统代理指向本机,禁用系统代理避免自环
|
||||||
|
if system_proxy_points_to_loopback() {
|
||||||
|
builder = builder.no_proxy();
|
||||||
|
log::warn!(
|
||||||
|
"[GlobalProxy] System proxy points to localhost, bypassing to avoid recursion"
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
log::debug!("[GlobalProxy] Following system proxy (no explicit proxy configured)");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
builder
|
builder
|
||||||
@@ -228,6 +231,50 @@ fn build_client(proxy_url: Option<&str>) -> Result<Client, String> {
|
|||||||
.map_err(|e| format!("Failed to build HTTP client: {e}"))
|
.map_err(|e| format!("Failed to build HTTP client: {e}"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn system_proxy_points_to_loopback() -> bool {
|
||||||
|
const KEYS: [&str; 6] = [
|
||||||
|
"HTTP_PROXY",
|
||||||
|
"http_proxy",
|
||||||
|
"HTTPS_PROXY",
|
||||||
|
"https_proxy",
|
||||||
|
"ALL_PROXY",
|
||||||
|
"all_proxy",
|
||||||
|
];
|
||||||
|
|
||||||
|
KEYS.iter()
|
||||||
|
.filter_map(|key| env::var(key).ok())
|
||||||
|
.map(|value| value.trim().to_string())
|
||||||
|
.filter(|value| !value.is_empty())
|
||||||
|
.any(|value| proxy_points_to_loopback(&value))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn proxy_points_to_loopback(value: &str) -> bool {
|
||||||
|
fn host_is_loopback(host: &str) -> bool {
|
||||||
|
if host.eq_ignore_ascii_case("localhost") {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
host.parse::<IpAddr>()
|
||||||
|
.map(|ip| ip.is_loopback())
|
||||||
|
.unwrap_or(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Ok(parsed) = url::Url::parse(value) {
|
||||||
|
if let Some(host) = parsed.host_str() {
|
||||||
|
return host_is_loopback(host);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
let with_scheme = format!("http://{value}");
|
||||||
|
if let Ok(parsed) = url::Url::parse(&with_scheme) {
|
||||||
|
if let Some(host) = parsed.host_str() {
|
||||||
|
return host_is_loopback(host);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
/// 隐藏 URL 中的敏感信息(用于日志)
|
/// 隐藏 URL 中的敏感信息(用于日志)
|
||||||
pub fn mask_url(url: &str) -> String {
|
pub fn mask_url(url: &str) -> String {
|
||||||
if let Ok(parsed) = url::Url::parse(url) {
|
if let Ok(parsed) = url::Url::parse(url) {
|
||||||
@@ -247,9 +294,109 @@ pub fn mask_url(url: &str) -> String {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 根据供应商单独代理配置构建代理 URL
|
||||||
|
///
|
||||||
|
/// 将 ProviderProxyConfig 转换为代理 URL 字符串
|
||||||
|
fn build_proxy_url_from_config(config: &ProviderProxyConfig) -> Option<String> {
|
||||||
|
let proxy_type = config.proxy_type.as_deref().unwrap_or("http");
|
||||||
|
let host = config.proxy_host.as_deref()?;
|
||||||
|
let port = config.proxy_port?;
|
||||||
|
|
||||||
|
// 构建带认证的代理 URL
|
||||||
|
if let (Some(username), Some(password)) = (&config.proxy_username, &config.proxy_password) {
|
||||||
|
if !username.is_empty() && !password.is_empty() {
|
||||||
|
return Some(format!(
|
||||||
|
"{proxy_type}://{username}:{password}@{host}:{port}"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Some(format!("{proxy_type}://{host}:{port}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 根据供应商单独代理配置构建 HTTP 客户端
|
||||||
|
///
|
||||||
|
/// 如果供应商配置了单独代理(enabled = true),则使用该代理构建客户端;
|
||||||
|
/// 否则返回 None,调用方应使用全局客户端。
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
/// * `proxy_config` - 供应商的代理配置
|
||||||
|
///
|
||||||
|
/// # Returns
|
||||||
|
/// 如果配置有效则返回 Some(Client),否则返回 None
|
||||||
|
pub fn build_client_for_provider(proxy_config: Option<&ProviderProxyConfig>) -> Option<Client> {
|
||||||
|
let config = proxy_config.filter(|c| c.enabled)?;
|
||||||
|
|
||||||
|
let proxy_url = build_proxy_url_from_config(config)?;
|
||||||
|
|
||||||
|
log::debug!(
|
||||||
|
"[ProviderProxy] Building client with proxy: {}",
|
||||||
|
mask_url(&proxy_url)
|
||||||
|
);
|
||||||
|
|
||||||
|
// 构建带代理的客户端
|
||||||
|
let proxy = match reqwest::Proxy::all(&proxy_url) {
|
||||||
|
Ok(p) => p,
|
||||||
|
Err(e) => {
|
||||||
|
log::error!(
|
||||||
|
"[ProviderProxy] Failed to create proxy from '{}': {}",
|
||||||
|
mask_url(&proxy_url),
|
||||||
|
e
|
||||||
|
);
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
match Client::builder()
|
||||||
|
.timeout(Duration::from_secs(600))
|
||||||
|
.connect_timeout(Duration::from_secs(30))
|
||||||
|
.pool_max_idle_per_host(10)
|
||||||
|
.tcp_keepalive(Duration::from_secs(60))
|
||||||
|
.proxy(proxy)
|
||||||
|
.build()
|
||||||
|
{
|
||||||
|
Ok(client) => {
|
||||||
|
log::info!(
|
||||||
|
"[ProviderProxy] Client built with proxy: {}",
|
||||||
|
mask_url(&proxy_url)
|
||||||
|
);
|
||||||
|
Some(client)
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
log::error!("[ProviderProxy] Failed to build client: {e}");
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取供应商专用的 HTTP 客户端
|
||||||
|
///
|
||||||
|
/// 优先使用供应商单独代理配置,如果未启用则返回全局客户端。
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
/// * `proxy_config` - 供应商的代理配置
|
||||||
|
///
|
||||||
|
/// # Returns
|
||||||
|
/// 返回适合该供应商的 HTTP 客户端
|
||||||
|
pub fn get_for_provider(proxy_config: Option<&ProviderProxyConfig>) -> Client {
|
||||||
|
// 优先使用供应商单独代理
|
||||||
|
if let Some(client) = build_client_for_provider(proxy_config) {
|
||||||
|
return client;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 回退到全局客户端
|
||||||
|
get()
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
use std::sync::{Mutex, OnceLock};
|
||||||
|
|
||||||
|
fn env_lock() -> &'static Mutex<()> {
|
||||||
|
static LOCK: OnceLock<Mutex<()>> = OnceLock::new();
|
||||||
|
LOCK.get_or_init(|| Mutex::new(()))
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_mask_url() {
|
fn test_mask_url() {
|
||||||
@@ -298,4 +445,40 @@ mod tests {
|
|||||||
let result = build_client(Some("invalid-scheme://127.0.0.1:7890"));
|
let result = build_client(Some("invalid-scheme://127.0.0.1:7890"));
|
||||||
assert!(result.is_err(), "Should reject invalid proxy scheme");
|
assert!(result.is_err(), "Should reject invalid proxy scheme");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_proxy_points_to_loopback() {
|
||||||
|
assert!(proxy_points_to_loopback("http://127.0.0.1:7890"));
|
||||||
|
assert!(proxy_points_to_loopback("socks5://localhost:1080"));
|
||||||
|
assert!(proxy_points_to_loopback("127.0.0.1:7890"));
|
||||||
|
assert!(!proxy_points_to_loopback("http://192.168.1.10:7890"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_system_proxy_points_to_loopback() {
|
||||||
|
let _guard = env_lock().lock().unwrap();
|
||||||
|
|
||||||
|
let keys = [
|
||||||
|
"HTTP_PROXY",
|
||||||
|
"http_proxy",
|
||||||
|
"HTTPS_PROXY",
|
||||||
|
"https_proxy",
|
||||||
|
"ALL_PROXY",
|
||||||
|
"all_proxy",
|
||||||
|
];
|
||||||
|
|
||||||
|
for key in &keys {
|
||||||
|
std::env::remove_var(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::env::set_var("HTTP_PROXY", "http://127.0.0.1:7890");
|
||||||
|
assert!(system_proxy_points_to_loopback());
|
||||||
|
|
||||||
|
std::env::set_var("HTTP_PROXY", "http://10.0.0.2:7890");
|
||||||
|
assert!(!system_proxy_points_to_loopback());
|
||||||
|
|
||||||
|
for key in &keys {
|
||||||
|
std::env::remove_var(key);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -104,7 +104,6 @@ pub fn create_anthropic_sse_stream(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if let Ok(chunk) = serde_json::from_str::<OpenAIStreamChunk>(data) {
|
if let Ok(chunk) = serde_json::from_str::<OpenAIStreamChunk>(data) {
|
||||||
// 仅在 DEBUG 级别简短记录 SSE 事件
|
|
||||||
log::debug!("[Claude/OpenRouter] <<< SSE chunk received");
|
log::debug!("[Claude/OpenRouter] <<< SSE chunk received");
|
||||||
|
|
||||||
if message_id.is_none() {
|
if message_id.is_none() {
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ use super::{
|
|||||||
use axum::response::{IntoResponse, Response};
|
use axum::response::{IntoResponse, Response};
|
||||||
use bytes::Bytes;
|
use bytes::Bytes;
|
||||||
use futures::stream::{Stream, StreamExt};
|
use futures::stream::{Stream, StreamExt};
|
||||||
|
use reqwest::header::HeaderMap;
|
||||||
use rust_decimal::Decimal;
|
use rust_decimal::Decimal;
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
use std::{
|
use std::{
|
||||||
@@ -47,6 +48,12 @@ pub async fn handle_streaming(
|
|||||||
parser_config: &UsageParserConfig,
|
parser_config: &UsageParserConfig,
|
||||||
) -> Response {
|
) -> Response {
|
||||||
let status = response.status();
|
let status = response.status();
|
||||||
|
log::debug!(
|
||||||
|
"[{}] 已接收上游流式响应: status={}, headers={}",
|
||||||
|
ctx.tag,
|
||||||
|
status.as_u16(),
|
||||||
|
format_headers(response.headers())
|
||||||
|
);
|
||||||
let mut builder = axum::response::Response::builder().status(status);
|
let mut builder = axum::response::Response::builder().status(status);
|
||||||
|
|
||||||
// 复制响应头
|
// 复制响应头
|
||||||
@@ -94,6 +101,19 @@ pub async fn handle_non_streaming(
|
|||||||
log::error!("[{}] 读取响应失败: {e}", ctx.tag);
|
log::error!("[{}] 读取响应失败: {e}", ctx.tag);
|
||||||
ProxyError::ForwardFailed(format!("Failed to read response body: {e}"))
|
ProxyError::ForwardFailed(format!("Failed to read response body: {e}"))
|
||||||
})?;
|
})?;
|
||||||
|
log::debug!(
|
||||||
|
"[{}] 已接收上游响应体: status={}, bytes={}, headers={}",
|
||||||
|
ctx.tag,
|
||||||
|
status.as_u16(),
|
||||||
|
body_bytes.len(),
|
||||||
|
format_headers(&response_headers)
|
||||||
|
);
|
||||||
|
|
||||||
|
log::debug!(
|
||||||
|
"[{}] 上游响应体内容: {}",
|
||||||
|
ctx.tag,
|
||||||
|
String::from_utf8_lossy(&body_bytes)
|
||||||
|
);
|
||||||
|
|
||||||
// 解析并记录使用量
|
// 解析并记录使用量
|
||||||
if let Ok(json_value) = serde_json::from_slice::<Value>(&body_bytes) {
|
if let Ok(json_value) = serde_json::from_slice::<Value>(&body_bytes) {
|
||||||
@@ -470,6 +490,12 @@ pub fn create_logged_passthrough_stream(
|
|||||||
|
|
||||||
match chunk_result {
|
match chunk_result {
|
||||||
Some(Ok(bytes)) => {
|
Some(Ok(bytes)) => {
|
||||||
|
if is_first_chunk {
|
||||||
|
log::debug!(
|
||||||
|
"[{tag}] 已接收上游流式首包: bytes={}",
|
||||||
|
bytes.len()
|
||||||
|
);
|
||||||
|
}
|
||||||
is_first_chunk = false;
|
is_first_chunk = false;
|
||||||
let text = String::from_utf8_lossy(&bytes);
|
let text = String::from_utf8_lossy(&bytes);
|
||||||
buffer.push_str(&text);
|
buffer.push_str(&text);
|
||||||
@@ -488,13 +514,9 @@ pub fn create_logged_passthrough_stream(
|
|||||||
if let Some(c) = &collector {
|
if let Some(c) = &collector {
|
||||||
c.push(json_value.clone()).await;
|
c.push(json_value.clone()).await;
|
||||||
}
|
}
|
||||||
log::debug!(
|
log::debug!("[{tag}] <<< SSE 事件: {data}");
|
||||||
"[{}] <<< SSE 事件: {}",
|
|
||||||
tag,
|
|
||||||
data.chars().take(100).collect::<String>()
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
log::debug!("[{tag}] <<< SSE 数据: {}", data.chars().take(100).collect::<String>());
|
log::debug!("[{tag}] <<< SSE 数据: {data}");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
log::debug!("[{tag}] <<< SSE: [DONE]");
|
log::debug!("[{tag}] <<< SSE: [DONE]");
|
||||||
@@ -523,3 +545,14 @@ pub fn create_logged_passthrough_stream(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn format_headers(headers: &HeaderMap) -> String {
|
||||||
|
headers
|
||||||
|
.iter()
|
||||||
|
.map(|(key, value)| {
|
||||||
|
let value_str = value.to_str().unwrap_or("<non-utf8>");
|
||||||
|
format!("{key}={value_str}")
|
||||||
|
})
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join(", ")
|
||||||
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ use super::{
|
|||||||
};
|
};
|
||||||
use crate::database::Database;
|
use crate::database::Database;
|
||||||
use axum::{
|
use axum::{
|
||||||
|
extract::DefaultBodyLimit,
|
||||||
routing::{get, post},
|
routing::{get, post},
|
||||||
Router,
|
Router,
|
||||||
};
|
};
|
||||||
@@ -224,6 +225,8 @@ impl ProxyServer {
|
|||||||
// Gemini API (支持带前缀和不带前缀)
|
// Gemini API (支持带前缀和不带前缀)
|
||||||
.route("/v1beta/*path", post(handlers::handle_gemini))
|
.route("/v1beta/*path", post(handlers::handle_gemini))
|
||||||
.route("/gemini/v1beta/*path", post(handlers::handle_gemini))
|
.route("/gemini/v1beta/*path", post(handlers::handle_gemini))
|
||||||
|
// 提高默认请求体大小限制(避免 413 Payload Too Large)
|
||||||
|
.layer(DefaultBodyLimit::max(200 * 1024 * 1024))
|
||||||
.layer(cors)
|
.layer(cors)
|
||||||
.with_state(self.state.clone())
|
.with_state(self.state.clone())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,13 +16,13 @@ pub struct ProxyConfig {
|
|||||||
/// 是否正在接管 Live 配置
|
/// 是否正在接管 Live 配置
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub live_takeover_active: bool,
|
pub live_takeover_active: bool,
|
||||||
/// 流式首字超时(秒)- 等待首个数据块的最大时间
|
/// 流式首字超时(秒)- 等待首个数据块的最大时间,范围 1-120 秒,默认 60 秒
|
||||||
#[serde(default = "default_streaming_first_byte_timeout")]
|
#[serde(default = "default_streaming_first_byte_timeout")]
|
||||||
pub streaming_first_byte_timeout: u64,
|
pub streaming_first_byte_timeout: u64,
|
||||||
/// 流式静默超时(秒)- 两个数据块之间的最大间隔
|
/// 流式静默超时(秒)- 两个数据块之间的最大间隔,范围 60-600 秒,填 0 禁用(防止中途卡住)
|
||||||
#[serde(default = "default_streaming_idle_timeout")]
|
#[serde(default = "default_streaming_idle_timeout")]
|
||||||
pub streaming_idle_timeout: u64,
|
pub streaming_idle_timeout: u64,
|
||||||
/// 非流式总超时(秒)- 非流式请求的总超时时间
|
/// 非流式总超时(秒)- 非流式请求的总超时时间,范围 60-1200 秒,默认 600 秒(10 分钟)
|
||||||
#[serde(default = "default_non_streaming_timeout")]
|
#[serde(default = "default_non_streaming_timeout")]
|
||||||
pub non_streaming_timeout: u64,
|
pub non_streaming_timeout: u64,
|
||||||
}
|
}
|
||||||
@@ -221,6 +221,50 @@ fn default_true() -> bool {
|
|||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn default_log_level() -> String {
|
||||||
|
"info".to_string()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 日志配置
|
||||||
|
///
|
||||||
|
/// 存储在 settings 表的 log_config 字段中(JSON 格式)
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct LogConfig {
|
||||||
|
/// 总开关:是否启用日志
|
||||||
|
#[serde(default = "default_true")]
|
||||||
|
pub enabled: bool,
|
||||||
|
/// 日志级别: error, warn, info, debug, trace
|
||||||
|
#[serde(default = "default_log_level")]
|
||||||
|
pub level: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for LogConfig {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
enabled: true,
|
||||||
|
level: "info".to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl LogConfig {
|
||||||
|
/// 将配置转换为 log::LevelFilter
|
||||||
|
pub fn to_level_filter(&self) -> log::LevelFilter {
|
||||||
|
if !self.enabled {
|
||||||
|
return log::LevelFilter::Off;
|
||||||
|
}
|
||||||
|
match self.level.to_lowercase().as_str() {
|
||||||
|
"error" => log::LevelFilter::Error,
|
||||||
|
"warn" => log::LevelFilter::Warn,
|
||||||
|
"info" => log::LevelFilter::Info,
|
||||||
|
"debug" => log::LevelFilter::Debug,
|
||||||
|
"trace" => log::LevelFilter::Trace,
|
||||||
|
_ => log::LevelFilter::Info,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
@@ -254,4 +298,60 @@ mod tests {
|
|||||||
assert!(!config.enabled);
|
assert!(!config.enabled);
|
||||||
assert!(!config.request_thinking_signature);
|
assert!(!config.request_thinking_signature);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_log_config_default() {
|
||||||
|
let config = LogConfig::default();
|
||||||
|
assert!(config.enabled);
|
||||||
|
assert_eq!(config.level, "info");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_log_config_serde_default() {
|
||||||
|
let json = "{}";
|
||||||
|
let config: LogConfig = serde_json::from_str(json).unwrap();
|
||||||
|
assert!(config.enabled);
|
||||||
|
assert_eq!(config.level, "info");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_log_config_to_level_filter() {
|
||||||
|
let mut config = LogConfig::default();
|
||||||
|
|
||||||
|
config.level = "error".to_string();
|
||||||
|
assert_eq!(config.to_level_filter(), log::LevelFilter::Error);
|
||||||
|
|
||||||
|
config.level = "warn".to_string();
|
||||||
|
assert_eq!(config.to_level_filter(), log::LevelFilter::Warn);
|
||||||
|
|
||||||
|
config.level = "info".to_string();
|
||||||
|
assert_eq!(config.to_level_filter(), log::LevelFilter::Info);
|
||||||
|
|
||||||
|
config.level = "debug".to_string();
|
||||||
|
assert_eq!(config.to_level_filter(), log::LevelFilter::Debug);
|
||||||
|
|
||||||
|
config.level = "trace".to_string();
|
||||||
|
assert_eq!(config.to_level_filter(), log::LevelFilter::Trace);
|
||||||
|
|
||||||
|
// 无效级别回退到 info
|
||||||
|
config.level = "invalid".to_string();
|
||||||
|
assert_eq!(config.to_level_filter(), log::LevelFilter::Info);
|
||||||
|
|
||||||
|
// 禁用时返回 Off
|
||||||
|
config.enabled = false;
|
||||||
|
config.level = "debug".to_string();
|
||||||
|
assert_eq!(config.to_level_filter(), log::LevelFilter::Off);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_log_config_serde_roundtrip() {
|
||||||
|
let config = LogConfig {
|
||||||
|
enabled: true,
|
||||||
|
level: "debug".to_string(),
|
||||||
|
};
|
||||||
|
let json = serde_json::to_string(&config).unwrap();
|
||||||
|
let parsed: LogConfig = serde_json::from_str(&json).unwrap();
|
||||||
|
assert!(parsed.enabled);
|
||||||
|
assert_eq!(parsed.level, "debug");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -500,18 +500,12 @@ pub(crate) fn remove_opencode_provider_from_live(provider_id: &str) -> Result<()
|
|||||||
|
|
||||||
// Check if OpenCode config directory exists
|
// Check if OpenCode config directory exists
|
||||||
if !opencode_config::get_opencode_dir().exists() {
|
if !opencode_config::get_opencode_dir().exists() {
|
||||||
log::debug!(
|
log::debug!("OpenCode config directory doesn't exist, skipping removal of '{provider_id}'");
|
||||||
"OpenCode config directory doesn't exist, skipping removal of '{}'",
|
|
||||||
provider_id
|
|
||||||
);
|
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
opencode_config::remove_provider(provider_id)?;
|
opencode_config::remove_provider(provider_id)?;
|
||||||
log::info!(
|
log::info!("OpenCode provider '{provider_id}' removed from live config");
|
||||||
"OpenCode provider '{}' removed from live config",
|
|
||||||
provider_id
|
|
||||||
);
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -535,10 +529,7 @@ pub fn import_opencode_providers_from_live(state: &AppState) -> Result<usize, Ap
|
|||||||
for (id, config) in providers {
|
for (id, config) in providers {
|
||||||
// Skip if already exists in database
|
// Skip if already exists in database
|
||||||
if existing.contains_key(&id) {
|
if existing.contains_key(&id) {
|
||||||
log::debug!(
|
log::debug!("OpenCode provider '{id}' already exists in database, skipping");
|
||||||
"OpenCode provider '{}' already exists in database, skipping",
|
|
||||||
id
|
|
||||||
);
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -546,7 +537,7 @@ pub fn import_opencode_providers_from_live(state: &AppState) -> Result<usize, Ap
|
|||||||
let settings_config = match serde_json::to_value(&config) {
|
let settings_config = match serde_json::to_value(&config) {
|
||||||
Ok(v) => v,
|
Ok(v) => v,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::warn!("Failed to serialize OpenCode provider '{}': {}", id, e);
|
log::warn!("Failed to serialize OpenCode provider '{id}': {e}");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -561,12 +552,12 @@ pub fn import_opencode_providers_from_live(state: &AppState) -> Result<usize, Ap
|
|||||||
|
|
||||||
// Save to database
|
// Save to database
|
||||||
if let Err(e) = state.db.save_provider("opencode", &provider) {
|
if let Err(e) = state.db.save_provider("opencode", &provider) {
|
||||||
log::warn!("Failed to import OpenCode provider '{}': {}", id, e);
|
log::warn!("Failed to import OpenCode provider '{id}': {e}");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
imported += 1;
|
imported += 1;
|
||||||
log::info!("Imported OpenCode provider '{}' from live config", id);
|
log::info!("Imported OpenCode provider '{id}' from live config");
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(imported)
|
Ok(imported)
|
||||||
|
|||||||
@@ -323,7 +323,12 @@ impl SkillService {
|
|||||||
.ok_or_else(|| anyhow!("Skill not found: {id}"))?;
|
.ok_or_else(|| anyhow!("Skill not found: {id}"))?;
|
||||||
|
|
||||||
// 从所有应用目录删除
|
// 从所有应用目录删除
|
||||||
for app in [AppType::Claude, AppType::Codex, AppType::Gemini, AppType::OpenCode] {
|
for app in [
|
||||||
|
AppType::Claude,
|
||||||
|
AppType::Codex,
|
||||||
|
AppType::Gemini,
|
||||||
|
AppType::OpenCode,
|
||||||
|
] {
|
||||||
let _ = Self::remove_from_app(&skill.directory, &app);
|
let _ = Self::remove_from_app(&skill.directory, &app);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -382,7 +387,12 @@ impl SkillService {
|
|||||||
|
|
||||||
let mut unmanaged: HashMap<String, UnmanagedSkill> = HashMap::new();
|
let mut unmanaged: HashMap<String, UnmanagedSkill> = HashMap::new();
|
||||||
|
|
||||||
for app in [AppType::Claude, AppType::Codex, AppType::Gemini, AppType::OpenCode] {
|
for app in [
|
||||||
|
AppType::Claude,
|
||||||
|
AppType::Codex,
|
||||||
|
AppType::Gemini,
|
||||||
|
AppType::OpenCode,
|
||||||
|
] {
|
||||||
let app_dir = match Self::get_app_skills_dir(&app) {
|
let app_dir = match Self::get_app_skills_dir(&app) {
|
||||||
Ok(d) => d,
|
Ok(d) => d,
|
||||||
Err(_) => continue,
|
Err(_) => continue,
|
||||||
@@ -464,7 +474,12 @@ impl SkillService {
|
|||||||
let mut source_path: Option<PathBuf> = None;
|
let mut source_path: Option<PathBuf> = None;
|
||||||
let mut found_in: Vec<String> = Vec::new();
|
let mut found_in: Vec<String> = Vec::new();
|
||||||
|
|
||||||
for app in [AppType::Claude, AppType::Codex, AppType::Gemini, AppType::OpenCode] {
|
for app in [
|
||||||
|
AppType::Claude,
|
||||||
|
AppType::Codex,
|
||||||
|
AppType::Gemini,
|
||||||
|
AppType::OpenCode,
|
||||||
|
] {
|
||||||
if let Ok(app_dir) = Self::get_app_skills_dir(&app) {
|
if let Ok(app_dir) = Self::get_app_skills_dir(&app) {
|
||||||
let skill_path = app_dir.join(&dir_name);
|
let skill_path = app_dir.join(&dir_name);
|
||||||
if skill_path.exists() {
|
if skill_path.exists() {
|
||||||
@@ -985,7 +1000,12 @@ pub fn migrate_skills_to_ssot(db: &Arc<Database>) -> Result<usize> {
|
|||||||
let mut discovered: HashMap<String, SkillApps> = HashMap::new();
|
let mut discovered: HashMap<String, SkillApps> = HashMap::new();
|
||||||
|
|
||||||
// 扫描各应用目录
|
// 扫描各应用目录
|
||||||
for app in [AppType::Claude, AppType::Codex, AppType::Gemini, AppType::OpenCode] {
|
for app in [
|
||||||
|
AppType::Claude,
|
||||||
|
AppType::Codex,
|
||||||
|
AppType::Gemini,
|
||||||
|
AppType::OpenCode,
|
||||||
|
] {
|
||||||
let app_dir = match SkillService::get_app_skills_dir(&app) {
|
let app_dir = match SkillService::get_app_skills_dir(&app) {
|
||||||
Ok(d) => d,
|
Ok(d) => d,
|
||||||
Err(_) => continue,
|
Err(_) => continue,
|
||||||
|
|||||||
@@ -78,15 +78,19 @@ pub struct StreamCheckService;
|
|||||||
|
|
||||||
impl StreamCheckService {
|
impl StreamCheckService {
|
||||||
/// 执行流式健康检查(带重试)
|
/// 执行流式健康检查(带重试)
|
||||||
|
///
|
||||||
|
/// 如果 Provider 配置了单独的测试配置(meta.testConfig),则使用该配置覆盖全局配置
|
||||||
pub async fn check_with_retry(
|
pub async fn check_with_retry(
|
||||||
app_type: &AppType,
|
app_type: &AppType,
|
||||||
provider: &Provider,
|
provider: &Provider,
|
||||||
config: &StreamCheckConfig,
|
config: &StreamCheckConfig,
|
||||||
) -> Result<StreamCheckResult, AppError> {
|
) -> Result<StreamCheckResult, AppError> {
|
||||||
|
// 合并供应商单独配置和全局配置
|
||||||
|
let effective_config = Self::merge_provider_config(provider, config);
|
||||||
let mut last_result = None;
|
let mut last_result = None;
|
||||||
|
|
||||||
for attempt in 0..=config.max_retries {
|
for attempt in 0..=effective_config.max_retries {
|
||||||
let result = Self::check_once(app_type, provider, config).await;
|
let result = Self::check_once(app_type, provider, &effective_config).await;
|
||||||
|
|
||||||
match &result {
|
match &result {
|
||||||
Ok(r) if r.success => {
|
Ok(r) if r.success => {
|
||||||
@@ -97,7 +101,7 @@ impl StreamCheckService {
|
|||||||
}
|
}
|
||||||
Ok(r) => {
|
Ok(r) => {
|
||||||
// 失败但非异常,判断是否重试
|
// 失败但非异常,判断是否重试
|
||||||
if Self::should_retry(&r.message) && attempt < config.max_retries {
|
if Self::should_retry(&r.message) && attempt < effective_config.max_retries {
|
||||||
last_result = Some(r.clone());
|
last_result = Some(r.clone());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -107,7 +111,8 @@ impl StreamCheckService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
if Self::should_retry(&e.to_string()) && attempt < config.max_retries {
|
if Self::should_retry(&e.to_string()) && attempt < effective_config.max_retries
|
||||||
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
return Err(AppError::Message(e.to_string()));
|
return Err(AppError::Message(e.to_string()));
|
||||||
@@ -123,10 +128,51 @@ impl StreamCheckService {
|
|||||||
http_status: None,
|
http_status: None,
|
||||||
model_used: String::new(),
|
model_used: String::new(),
|
||||||
tested_at: chrono::Utc::now().timestamp(),
|
tested_at: chrono::Utc::now().timestamp(),
|
||||||
retry_count: config.max_retries,
|
retry_count: effective_config.max_retries,
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 合并供应商单独配置和全局配置
|
||||||
|
///
|
||||||
|
/// 如果供应商配置了 meta.testConfig 且 enabled 为 true,则使用供应商配置覆盖全局配置
|
||||||
|
fn merge_provider_config(
|
||||||
|
provider: &Provider,
|
||||||
|
global_config: &StreamCheckConfig,
|
||||||
|
) -> StreamCheckConfig {
|
||||||
|
let test_config = provider
|
||||||
|
.meta
|
||||||
|
.as_ref()
|
||||||
|
.and_then(|m| m.test_config.as_ref())
|
||||||
|
.filter(|tc| tc.enabled);
|
||||||
|
|
||||||
|
match test_config {
|
||||||
|
Some(tc) => StreamCheckConfig {
|
||||||
|
timeout_secs: tc.timeout_secs.unwrap_or(global_config.timeout_secs),
|
||||||
|
max_retries: tc.max_retries.unwrap_or(global_config.max_retries),
|
||||||
|
degraded_threshold_ms: tc
|
||||||
|
.degraded_threshold_ms
|
||||||
|
.unwrap_or(global_config.degraded_threshold_ms),
|
||||||
|
claude_model: tc
|
||||||
|
.test_model
|
||||||
|
.clone()
|
||||||
|
.unwrap_or_else(|| global_config.claude_model.clone()),
|
||||||
|
codex_model: tc
|
||||||
|
.test_model
|
||||||
|
.clone()
|
||||||
|
.unwrap_or_else(|| global_config.codex_model.clone()),
|
||||||
|
gemini_model: tc
|
||||||
|
.test_model
|
||||||
|
.clone()
|
||||||
|
.unwrap_or_else(|| global_config.gemini_model.clone()),
|
||||||
|
test_prompt: tc
|
||||||
|
.test_prompt
|
||||||
|
.clone()
|
||||||
|
.unwrap_or_else(|| global_config.test_prompt.clone()),
|
||||||
|
},
|
||||||
|
None => global_config.clone(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// 单次流式检查
|
/// 单次流式检查
|
||||||
async fn check_once(
|
async fn check_once(
|
||||||
app_type: &AppType,
|
app_type: &AppType,
|
||||||
@@ -144,8 +190,9 @@ impl StreamCheckService {
|
|||||||
.extract_auth(provider)
|
.extract_auth(provider)
|
||||||
.ok_or_else(|| AppError::Message("API Key not found".to_string()))?;
|
.ok_or_else(|| AppError::Message("API Key not found".to_string()))?;
|
||||||
|
|
||||||
// 使用全局 HTTP 客户端(已包含代理配置)
|
// 获取 HTTP 客户端:优先使用供应商单独代理配置,否则使用全局客户端
|
||||||
let client = crate::proxy::http_client::get();
|
let proxy_config = provider.meta.as_ref().and_then(|m| m.proxy_config.as_ref());
|
||||||
|
let client = crate::proxy::http_client::get_for_provider(proxy_config);
|
||||||
let request_timeout = std::time::Duration::from_secs(config.timeout_secs);
|
let request_timeout = std::time::Duration::from_secs(config.timeout_secs);
|
||||||
|
|
||||||
let model_to_test = Self::resolve_test_model(app_type, provider, config);
|
let model_to_test = Self::resolve_test_model(app_type, provider, config);
|
||||||
@@ -389,6 +436,8 @@ impl StreamCheckService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Gemini 流式检查
|
/// Gemini 流式检查
|
||||||
|
///
|
||||||
|
/// 使用 Gemini 原生 API 格式 (streamGenerateContent)
|
||||||
async fn check_gemini_stream(
|
async fn check_gemini_stream(
|
||||||
client: &Client,
|
client: &Client,
|
||||||
base_url: &str,
|
base_url: &str,
|
||||||
@@ -398,20 +447,28 @@ impl StreamCheckService {
|
|||||||
timeout: std::time::Duration,
|
timeout: std::time::Duration,
|
||||||
) -> Result<(u16, String), AppError> {
|
) -> Result<(u16, String), AppError> {
|
||||||
let base = base_url.trim_end_matches('/');
|
let base = base_url.trim_end_matches('/');
|
||||||
let url = format!("{base}/v1/chat/completions");
|
// Gemini 原生 API: /v1beta/models/{model}:streamGenerateContent?alt=sse
|
||||||
|
// 智能处理 /v1beta 路径:如果 base_url 不包含版本路径,则添加 /v1beta
|
||||||
|
// alt=sse 参数使 API 返回 SSE 格式(text/event-stream)而非 JSON 数组
|
||||||
|
let url = if base.contains("/v1beta") || base.contains("/v1/") {
|
||||||
|
format!("{base}/models/{model}:streamGenerateContent?alt=sse")
|
||||||
|
} else {
|
||||||
|
format!("{base}/v1beta/models/{model}:streamGenerateContent?alt=sse")
|
||||||
|
};
|
||||||
|
|
||||||
|
// Gemini 原生请求体格式
|
||||||
let body = json!({
|
let body = json!({
|
||||||
"model": model,
|
"contents": [{
|
||||||
"messages": [{ "role": "user", "content": test_prompt }],
|
"role": "user",
|
||||||
"max_tokens": 1,
|
"parts": [{ "text": test_prompt }]
|
||||||
"temperature": 0,
|
}]
|
||||||
"stream": true
|
|
||||||
});
|
});
|
||||||
|
|
||||||
let response = client
|
let response = client
|
||||||
.post(&url)
|
.post(&url)
|
||||||
.header("Authorization", format!("Bearer {}", auth.api_key))
|
.header("x-goog-api-key", &auth.api_key)
|
||||||
.header("Content-Type", "application/json")
|
.header("Content-Type", "application/json")
|
||||||
|
.header("Accept", "text/event-stream")
|
||||||
.timeout(timeout)
|
.timeout(timeout)
|
||||||
.json(&body)
|
.json(&body)
|
||||||
.send()
|
.send()
|
||||||
|
|||||||
+157
-42
@@ -15,6 +15,7 @@ pub struct TrayTexts {
|
|||||||
pub show_main: &'static str,
|
pub show_main: &'static str,
|
||||||
pub no_provider_hint: &'static str,
|
pub no_provider_hint: &'static str,
|
||||||
pub quit: &'static str,
|
pub quit: &'static str,
|
||||||
|
pub auto_label: &'static str,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TrayTexts {
|
impl TrayTexts {
|
||||||
@@ -24,17 +25,20 @@ impl TrayTexts {
|
|||||||
show_main: "Open main window",
|
show_main: "Open main window",
|
||||||
no_provider_hint: " (No providers yet, please add them from the main window)",
|
no_provider_hint: " (No providers yet, please add them from the main window)",
|
||||||
quit: "Quit",
|
quit: "Quit",
|
||||||
|
auto_label: "Auto (Failover)",
|
||||||
},
|
},
|
||||||
"ja" => Self {
|
"ja" => Self {
|
||||||
show_main: "メインウィンドウを開く",
|
show_main: "メインウィンドウを開く",
|
||||||
no_provider_hint:
|
no_provider_hint:
|
||||||
" (プロバイダーがまだありません。メイン画面から追加してください)",
|
" (プロバイダーがまだありません。メイン画面から追加してください)",
|
||||||
quit: "終了",
|
quit: "終了",
|
||||||
|
auto_label: "自動 (フェイルオーバー)",
|
||||||
},
|
},
|
||||||
_ => Self {
|
_ => Self {
|
||||||
show_main: "打开主界面",
|
show_main: "打开主界面",
|
||||||
no_provider_hint: " (无供应商,请在主界面添加)",
|
no_provider_hint: " (无供应商,请在主界面添加)",
|
||||||
quit: "退出",
|
quit: "退出",
|
||||||
|
auto_label: "自动 (故障转移)",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -50,6 +54,9 @@ pub struct TrayAppSection {
|
|||||||
pub log_name: &'static str,
|
pub log_name: &'static str,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Auto 菜单项后缀
|
||||||
|
pub const AUTO_SUFFIX: &str = "auto";
|
||||||
|
|
||||||
pub const TRAY_SECTIONS: [TrayAppSection; 3] = [
|
pub const TRAY_SECTIONS: [TrayAppSection; 3] = [
|
||||||
TrayAppSection {
|
TrayAppSection {
|
||||||
app_type: AppType::Claude,
|
app_type: AppType::Claude,
|
||||||
@@ -84,6 +91,7 @@ fn append_provider_section<'a>(
|
|||||||
manager: Option<&crate::provider::ProviderManager>,
|
manager: Option<&crate::provider::ProviderManager>,
|
||||||
section: &TrayAppSection,
|
section: &TrayAppSection,
|
||||||
tray_texts: &TrayTexts,
|
tray_texts: &TrayTexts,
|
||||||
|
app_state: &AppState,
|
||||||
) -> Result<MenuBuilder<'a, tauri::Wry, tauri::AppHandle<tauri::Wry>>, AppError> {
|
) -> Result<MenuBuilder<'a, tauri::Wry, tauri::AppHandle<tauri::Wry>>, AppError> {
|
||||||
let Some(manager) = manager else {
|
let Some(manager) = manager else {
|
||||||
return Ok(menu_builder);
|
return Ok(menu_builder);
|
||||||
@@ -111,6 +119,23 @@ fn append_provider_section<'a>(
|
|||||||
return Ok(menu_builder.item(&empty_hint));
|
return Ok(menu_builder.item(&empty_hint));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 获取 proxy 状态,决定 Auto 是否选中
|
||||||
|
let (proxy_enabled, auto_failover) =
|
||||||
|
app_state.db.get_proxy_flags_sync(section.app_type.as_str());
|
||||||
|
let auto_mode = proxy_enabled && auto_failover;
|
||||||
|
|
||||||
|
// 添加 Auto 菜单项(始终显示在供应商列表前)
|
||||||
|
let auto_item = CheckMenuItem::with_id(
|
||||||
|
app,
|
||||||
|
format!("{}{}", section.prefix, AUTO_SUFFIX),
|
||||||
|
tray_texts.auto_label,
|
||||||
|
true,
|
||||||
|
auto_mode,
|
||||||
|
None::<&str>,
|
||||||
|
)
|
||||||
|
.map_err(|e| AppError::Message(format!("创建{}Auto菜单项失败: {e}", section.log_name)))?;
|
||||||
|
menu_builder = menu_builder.item(&auto_item);
|
||||||
|
|
||||||
let mut sorted_providers: Vec<_> = manager.providers.iter().collect();
|
let mut sorted_providers: Vec<_> = manager.providers.iter().collect();
|
||||||
sorted_providers.sort_by(|(_, a), (_, b)| {
|
sorted_providers.sort_by(|(_, a), (_, b)| {
|
||||||
match (a.sort_index, b.sort_index) {
|
match (a.sort_index, b.sort_index) {
|
||||||
@@ -131,7 +156,8 @@ fn append_provider_section<'a>(
|
|||||||
});
|
});
|
||||||
|
|
||||||
for (id, provider) in sorted_providers {
|
for (id, provider) in sorted_providers {
|
||||||
let is_current = manager.current == *id;
|
// Auto 模式下所有供应商都不选中
|
||||||
|
let is_current = !auto_mode && manager.current == *id;
|
||||||
let item = CheckMenuItem::with_id(
|
let item = CheckMenuItem::with_id(
|
||||||
app,
|
app,
|
||||||
format!("{}{}", section.prefix, id),
|
format!("{}{}", section.prefix, id),
|
||||||
@@ -150,13 +176,27 @@ fn append_provider_section<'a>(
|
|||||||
/// 处理供应商托盘事件
|
/// 处理供应商托盘事件
|
||||||
pub fn handle_provider_tray_event(app: &tauri::AppHandle, event_id: &str) -> bool {
|
pub fn handle_provider_tray_event(app: &tauri::AppHandle, event_id: &str) -> bool {
|
||||||
for section in TRAY_SECTIONS.iter() {
|
for section in TRAY_SECTIONS.iter() {
|
||||||
if let Some(provider_id) = event_id.strip_prefix(section.prefix) {
|
if let Some(suffix) = event_id.strip_prefix(section.prefix) {
|
||||||
log::info!("切换到{}供应商: {provider_id}", section.log_name);
|
// 处理 Auto 点击
|
||||||
|
if suffix == AUTO_SUFFIX {
|
||||||
|
log::info!("切换到{} Auto模式", section.log_name);
|
||||||
|
let app_handle = app.clone();
|
||||||
|
let app_type = section.app_type.clone();
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
if let Err(e) = handle_auto_click(&app_handle, &app_type) {
|
||||||
|
log::error!("切换{}Auto模式失败: {e}", section.log_name);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理供应商点击
|
||||||
|
log::info!("切换到{}供应商: {suffix}", section.log_name);
|
||||||
let app_handle = app.clone();
|
let app_handle = app.clone();
|
||||||
let provider_id = provider_id.to_string();
|
let provider_id = suffix.to_string();
|
||||||
let app_type = section.app_type.clone();
|
let app_type = section.app_type.clone();
|
||||||
tauri::async_runtime::spawn_blocking(move || {
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
if let Err(e) = switch_provider_internal(&app_handle, app_type, provider_id) {
|
if let Err(e) = handle_provider_click(&app_handle, &app_type, &provider_id) {
|
||||||
log::error!("切换{}供应商失败: {e}", section.log_name);
|
log::error!("切换{}供应商失败: {e}", section.log_name);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -166,6 +206,110 @@ pub fn handle_provider_tray_event(app: &tauri::AppHandle, event_id: &str) -> boo
|
|||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 处理 Auto 点击:启用 proxy 和 auto_failover
|
||||||
|
fn handle_auto_click(app: &tauri::AppHandle, app_type: &AppType) -> Result<(), AppError> {
|
||||||
|
if let Some(app_state) = app.try_state::<AppState>() {
|
||||||
|
let app_type_str = app_type.as_str();
|
||||||
|
|
||||||
|
// 真正启用 failover:启动代理服务 + 执行接管 + 开启 auto_failover
|
||||||
|
let proxy_service = &app_state.proxy_service;
|
||||||
|
|
||||||
|
// 1) 确保代理服务运行(会自动设置 proxy_enabled = true)
|
||||||
|
let is_running = futures::executor::block_on(proxy_service.is_running());
|
||||||
|
if !is_running {
|
||||||
|
log::info!("[Tray] Auto 模式:启动代理服务");
|
||||||
|
if let Err(e) = futures::executor::block_on(proxy_service.start()) {
|
||||||
|
log::error!("[Tray] 启动代理服务失败: {e}");
|
||||||
|
return Err(AppError::Message(format!("启动代理服务失败: {e}")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2) 执行 Live 配置接管(确保该 app 被代理接管)
|
||||||
|
log::info!("[Tray] Auto 模式:对 {app_type_str} 执行接管");
|
||||||
|
if let Err(e) =
|
||||||
|
futures::executor::block_on(proxy_service.set_takeover_for_app(app_type_str, true))
|
||||||
|
{
|
||||||
|
log::error!("[Tray] 执行接管失败: {e}");
|
||||||
|
return Err(AppError::Message(format!("执行接管失败: {e}")));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3) 设置 auto_failover_enabled = true
|
||||||
|
app_state
|
||||||
|
.db
|
||||||
|
.set_proxy_flags_sync(app_type_str, true, true)?;
|
||||||
|
|
||||||
|
// 4) 更新托盘菜单
|
||||||
|
if let Ok(new_menu) = create_tray_menu(app, app_state.inner()) {
|
||||||
|
if let Some(tray) = app.tray_by_id("main") {
|
||||||
|
let _ = tray.set_menu(Some(new_menu));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 5) 发射事件到前端
|
||||||
|
let event_data = serde_json::json!({
|
||||||
|
"appType": app_type_str,
|
||||||
|
"proxyEnabled": true,
|
||||||
|
"autoFailoverEnabled": true
|
||||||
|
});
|
||||||
|
if let Err(e) = app.emit("proxy-flags-changed", event_data.clone()) {
|
||||||
|
log::error!("发射 proxy-flags-changed 事件失败: {e}");
|
||||||
|
}
|
||||||
|
// 发射 provider-switched 事件(保持向后兼容,Auto 切换也算一种切换)
|
||||||
|
if let Err(e) = app.emit("provider-switched", event_data) {
|
||||||
|
log::error!("发射 provider-switched 事件失败: {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 处理供应商点击:关闭 auto_failover + 切换供应商
|
||||||
|
fn handle_provider_click(
|
||||||
|
app: &tauri::AppHandle,
|
||||||
|
app_type: &AppType,
|
||||||
|
provider_id: &str,
|
||||||
|
) -> Result<(), AppError> {
|
||||||
|
if let Some(app_state) = app.try_state::<AppState>() {
|
||||||
|
let app_type_str = app_type.as_str();
|
||||||
|
|
||||||
|
// 获取当前 proxy 状态,保持 enabled 不变,只关闭 auto_failover
|
||||||
|
let (proxy_enabled, _) = app_state.db.get_proxy_flags_sync(app_type_str);
|
||||||
|
app_state
|
||||||
|
.db
|
||||||
|
.set_proxy_flags_sync(app_type_str, proxy_enabled, false)?;
|
||||||
|
|
||||||
|
// 切换供应商
|
||||||
|
crate::commands::switch_provider(
|
||||||
|
app_state.clone(),
|
||||||
|
app_type_str.to_string(),
|
||||||
|
provider_id.to_string(),
|
||||||
|
)
|
||||||
|
.map_err(AppError::Message)?;
|
||||||
|
|
||||||
|
// 更新托盘菜单
|
||||||
|
if let Ok(new_menu) = create_tray_menu(app, app_state.inner()) {
|
||||||
|
if let Some(tray) = app.tray_by_id("main") {
|
||||||
|
let _ = tray.set_menu(Some(new_menu));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 发射事件到前端
|
||||||
|
let event_data = serde_json::json!({
|
||||||
|
"appType": app_type_str,
|
||||||
|
"proxyEnabled": proxy_enabled,
|
||||||
|
"autoFailoverEnabled": false,
|
||||||
|
"providerId": provider_id
|
||||||
|
});
|
||||||
|
if let Err(e) = app.emit("proxy-flags-changed", event_data.clone()) {
|
||||||
|
log::error!("发射 proxy-flags-changed 事件失败: {e}");
|
||||||
|
}
|
||||||
|
// 发射 provider-switched 事件(保持向后兼容)
|
||||||
|
if let Err(e) = app.emit("provider-switched", event_data) {
|
||||||
|
log::error!("发射 provider-switched 事件失败: {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
/// 创建动态托盘菜单
|
/// 创建动态托盘菜单
|
||||||
pub fn create_tray_menu(
|
pub fn create_tray_menu(
|
||||||
app: &tauri::AppHandle,
|
app: &tauri::AppHandle,
|
||||||
@@ -197,8 +341,14 @@ pub fn create_tray_menu(
|
|||||||
current: current_id,
|
current: current_id,
|
||||||
};
|
};
|
||||||
|
|
||||||
menu_builder =
|
menu_builder = append_provider_section(
|
||||||
append_provider_section(app, menu_builder, Some(&manager), section, &tray_texts)?;
|
app,
|
||||||
|
menu_builder,
|
||||||
|
Some(&manager),
|
||||||
|
section,
|
||||||
|
&tray_texts,
|
||||||
|
app_state,
|
||||||
|
)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 分隔符和退出菜单
|
// 分隔符和退出菜单
|
||||||
@@ -263,38 +413,3 @@ pub fn handle_tray_menu_event(app: &tauri::AppHandle, event_id: &str) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 内部切换供应商函数
|
|
||||||
pub fn switch_provider_internal(
|
|
||||||
app: &tauri::AppHandle,
|
|
||||||
app_type: AppType,
|
|
||||||
provider_id: String,
|
|
||||||
) -> Result<(), AppError> {
|
|
||||||
if let Some(app_state) = app.try_state::<AppState>() {
|
|
||||||
// 在使用前先保存需要的值
|
|
||||||
let app_type_str = app_type.as_str().to_string();
|
|
||||||
let provider_id_clone = provider_id.clone();
|
|
||||||
|
|
||||||
crate::commands::switch_provider(app_state.clone(), app_type_str.clone(), provider_id)
|
|
||||||
.map_err(AppError::Message)?;
|
|
||||||
|
|
||||||
// 切换成功后重新创建托盘菜单
|
|
||||||
if let Ok(new_menu) = create_tray_menu(app, app_state.inner()) {
|
|
||||||
if let Some(tray) = app.tray_by_id("main") {
|
|
||||||
if let Err(e) = tray.set_menu(Some(new_menu)) {
|
|
||||||
log::error!("更新托盘菜单失败: {e}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 发射事件到前端,通知供应商已切换
|
|
||||||
let event_data = serde_json::json!({
|
|
||||||
"appType": app_type_str,
|
|
||||||
"providerId": provider_id_clone
|
|
||||||
});
|
|
||||||
if let Err(e) = app.emit("provider-switched", event_data) {
|
|
||||||
log::error!("发射供应商切换事件失败: {e}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|||||||
+64
-20
@@ -15,6 +15,7 @@ import {
|
|||||||
RefreshCw,
|
RefreshCw,
|
||||||
Search,
|
Search,
|
||||||
Download,
|
Download,
|
||||||
|
BarChart2,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import type { Provider } from "@/types";
|
import type { Provider } from "@/types";
|
||||||
import type { EnvConflict } from "@/types/env";
|
import type { EnvConflict } from "@/types/env";
|
||||||
@@ -41,6 +42,7 @@ import { SettingsPage } from "@/components/settings/SettingsPage";
|
|||||||
import { UpdateBadge } from "@/components/UpdateBadge";
|
import { UpdateBadge } from "@/components/UpdateBadge";
|
||||||
import { EnvWarningBanner } from "@/components/env/EnvWarningBanner";
|
import { EnvWarningBanner } from "@/components/env/EnvWarningBanner";
|
||||||
import { ProxyToggle } from "@/components/proxy/ProxyToggle";
|
import { ProxyToggle } from "@/components/proxy/ProxyToggle";
|
||||||
|
import { FailoverToggle } from "@/components/proxy/FailoverToggle";
|
||||||
import UsageScriptModal from "@/components/UsageScriptModal";
|
import UsageScriptModal from "@/components/UsageScriptModal";
|
||||||
import UnifiedMcpPanel from "@/components/mcp/UnifiedMcpPanel";
|
import UnifiedMcpPanel from "@/components/mcp/UnifiedMcpPanel";
|
||||||
import PromptPanel from "@/components/prompts/PromptPanel";
|
import PromptPanel from "@/components/prompts/PromptPanel";
|
||||||
@@ -353,7 +355,10 @@ function App() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Generate a unique provider key for OpenCode duplication
|
// Generate a unique provider key for OpenCode duplication
|
||||||
const generateUniqueOpencodeKey = (originalKey: string, existingKeys: string[]): string => {
|
const generateUniqueOpencodeKey = (
|
||||||
|
originalKey: string,
|
||||||
|
existingKeys: string[],
|
||||||
|
): string => {
|
||||||
const baseKey = `${originalKey}-copy`;
|
const baseKey = `${originalKey}-copy`;
|
||||||
|
|
||||||
if (!existingKeys.includes(baseKey)) {
|
if (!existingKeys.includes(baseKey)) {
|
||||||
@@ -374,7 +379,9 @@ function App() {
|
|||||||
const newSortIndex =
|
const newSortIndex =
|
||||||
provider.sortIndex !== undefined ? provider.sortIndex + 1 : undefined;
|
provider.sortIndex !== undefined ? provider.sortIndex + 1 : undefined;
|
||||||
|
|
||||||
const duplicatedProvider: Omit<Provider, "id" | "createdAt"> & { providerKey?: string } = {
|
const duplicatedProvider: Omit<Provider, "id" | "createdAt"> & {
|
||||||
|
providerKey?: string;
|
||||||
|
} = {
|
||||||
name: `${provider.name} copy`,
|
name: `${provider.name} copy`,
|
||||||
settingsConfig: JSON.parse(JSON.stringify(provider.settingsConfig)), // 深拷贝
|
settingsConfig: JSON.parse(JSON.stringify(provider.settingsConfig)), // 深拷贝
|
||||||
websiteUrl: provider.websiteUrl,
|
websiteUrl: provider.websiteUrl,
|
||||||
@@ -390,7 +397,10 @@ function App() {
|
|||||||
// OpenCode: generate unique provider key (used as ID)
|
// OpenCode: generate unique provider key (used as ID)
|
||||||
if (activeApp === "opencode") {
|
if (activeApp === "opencode") {
|
||||||
const existingKeys = Object.keys(providers);
|
const existingKeys = Object.keys(providers);
|
||||||
duplicatedProvider.providerKey = generateUniqueOpencodeKey(provider.id, existingKeys);
|
duplicatedProvider.providerKey = generateUniqueOpencodeKey(
|
||||||
|
provider.id,
|
||||||
|
existingKeys,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2️⃣ 如果原供应商有 sortIndex,需要将后续所有供应商的 sortIndex +1
|
// 2️⃣ 如果原供应商有 sortIndex,需要将后续所有供应商的 sortIndex +1
|
||||||
@@ -499,7 +509,12 @@ function App() {
|
|||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
case "skillsDiscovery":
|
case "skillsDiscovery":
|
||||||
return <SkillsPage ref={skillsPageRef} initialApp={activeApp === "opencode" ? "claude" : activeApp} />;
|
return (
|
||||||
|
<SkillsPage
|
||||||
|
ref={skillsPageRef}
|
||||||
|
initialApp={activeApp === "opencode" ? "claude" : activeApp}
|
||||||
|
/>
|
||||||
|
);
|
||||||
case "mcp":
|
case "mcp":
|
||||||
return (
|
return (
|
||||||
<UnifiedMcpPanel
|
<UnifiedMcpPanel
|
||||||
@@ -633,7 +648,7 @@ function App() {
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className="flex h-full items-center justify-between gap-2 px-6"
|
className="mx-auto flex h-full max-w-[56rem] items-center justify-between gap-2 px-4"
|
||||||
data-tauri-drag-region
|
data-tauri-drag-region
|
||||||
style={{ WebkitAppRegion: "drag" } as any}
|
style={{ WebkitAppRegion: "drag" } as any}
|
||||||
>
|
>
|
||||||
@@ -672,8 +687,8 @@ function App() {
|
|||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<div className="flex items-center gap-2">
|
||||||
<div className="flex items-center gap-2">
|
<div className="relative inline-flex items-center">
|
||||||
<a
|
<a
|
||||||
href="https://github.com/farion1231/cc-switch"
|
href="https://github.com/farion1231/cc-switch"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
@@ -687,31 +702,48 @@ function App() {
|
|||||||
>
|
>
|
||||||
CC Switch
|
CC Switch
|
||||||
</a>
|
</a>
|
||||||
|
<UpdateBadge
|
||||||
|
onClick={() => {
|
||||||
|
setSettingsDefaultTab("about");
|
||||||
|
setCurrentView("settings");
|
||||||
|
}}
|
||||||
|
className="absolute -top-4 -right-4"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
onClick={() => {
|
||||||
|
setSettingsDefaultTab("general");
|
||||||
|
setCurrentView("settings");
|
||||||
|
}}
|
||||||
|
title={t("common.settings")}
|
||||||
|
className="hover:bg-black/5 dark:hover:bg-white/5"
|
||||||
|
>
|
||||||
|
<Settings className="w-4 h-4" />
|
||||||
|
</Button>
|
||||||
|
{isCurrentAppTakeoverActive && (
|
||||||
<Button
|
<Button
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
size="icon"
|
size="icon"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setSettingsDefaultTab("general");
|
setSettingsDefaultTab("usage");
|
||||||
setCurrentView("settings");
|
setCurrentView("settings");
|
||||||
}}
|
}}
|
||||||
title={t("common.settings")}
|
title={t("settings.usage.title", {
|
||||||
|
defaultValue: "使用统计",
|
||||||
|
})}
|
||||||
className="hover:bg-black/5 dark:hover:bg-white/5"
|
className="hover:bg-black/5 dark:hover:bg-white/5"
|
||||||
>
|
>
|
||||||
<Settings className="w-4 h-4" />
|
<BarChart2 className="w-4 h-4" />
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
)}
|
||||||
<UpdateBadge
|
</div>
|
||||||
onClick={() => {
|
|
||||||
setSettingsDefaultTab("about");
|
|
||||||
setCurrentView("settings");
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
className="flex items-center gap-2 h-[32px]"
|
className="flex items-center gap-1.5 h-[32px]"
|
||||||
style={{ WebkitAppRegion: "no-drag" } as any}
|
style={{ WebkitAppRegion: "no-drag" } as any}
|
||||||
>
|
>
|
||||||
{currentView === "prompts" && (
|
{currentView === "prompts" && (
|
||||||
@@ -794,7 +826,19 @@ function App() {
|
|||||||
{currentView === "providers" && (
|
{currentView === "providers" && (
|
||||||
<>
|
<>
|
||||||
{activeApp !== "opencode" && (
|
{activeApp !== "opencode" && (
|
||||||
<ProxyToggle activeApp={activeApp} />
|
<>
|
||||||
|
<ProxyToggle activeApp={activeApp} />
|
||||||
|
<div
|
||||||
|
className={cn(
|
||||||
|
"transition-all duration-300 ease-in-out overflow-hidden",
|
||||||
|
isCurrentAppTakeoverActive
|
||||||
|
? "opacity-100 max-w-[100px] scale-100"
|
||||||
|
: "opacity-0 max-w-0 scale-75 pointer-events-none",
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<FailoverToggle activeApp={activeApp} />
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<AppSwitcher activeApp={activeApp} onSwitch={setActiveApp} />
|
<AppSwitcher activeApp={activeApp} onSwitch={setActiveApp} />
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
@@ -1,6 +1,6 @@
|
|||||||
import { X, Download } from "lucide-react";
|
|
||||||
import { useUpdate } from "@/contexts/UpdateContext";
|
import { useUpdate } from "@/contexts/UpdateContext";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
|
||||||
interface UpdateBadgeProps {
|
interface UpdateBadgeProps {
|
||||||
className?: string;
|
className?: string;
|
||||||
@@ -8,56 +8,39 @@ interface UpdateBadgeProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function UpdateBadge({ className = "", onClick }: UpdateBadgeProps) {
|
export function UpdateBadge({ className = "", onClick }: UpdateBadgeProps) {
|
||||||
const { hasUpdate, updateInfo, isDismissed, dismissUpdate } = useUpdate();
|
const { hasUpdate, updateInfo } = useUpdate();
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
const isActive = hasUpdate && updateInfo;
|
||||||
|
const title = isActive
|
||||||
|
? t("settings.updateAvailable", {
|
||||||
|
version: updateInfo?.availableVersion ?? "",
|
||||||
|
})
|
||||||
|
: t("settings.checkForUpdates");
|
||||||
|
|
||||||
// 如果没有更新或已关闭,不显示
|
if (!isActive) {
|
||||||
if (!hasUpdate || isDismissed || !updateInfo) {
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
title={title}
|
||||||
|
aria-label={title}
|
||||||
|
onClick={onClick}
|
||||||
className={`
|
className={`
|
||||||
flex items-center gap-1.5 px-2.5 py-1
|
relative h-6 w-6 rounded-full
|
||||||
bg-white dark:bg-gray-800
|
${isActive ? "text-blue-600 dark:text-blue-300 hover:bg-blue-50 dark:hover:bg-blue-500/10" : "text-muted-foreground hover:bg-muted/60"}
|
||||||
border border-border-default
|
|
||||||
rounded-lg text-xs
|
|
||||||
shadow-sm
|
|
||||||
transition-all duration-200
|
|
||||||
${onClick ? "cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-750" : ""}
|
|
||||||
${className}
|
${className}
|
||||||
`}
|
`}
|
||||||
role={onClick ? "button" : undefined}
|
|
||||||
tabIndex={onClick ? 0 : -1}
|
|
||||||
onClick={onClick}
|
|
||||||
onKeyDown={(e) => {
|
|
||||||
if (!onClick) return;
|
|
||||||
if (e.key === "Enter" || e.key === " ") {
|
|
||||||
e.preventDefault();
|
|
||||||
onClick();
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
<Download className="w-3 h-3 text-blue-500 dark:text-blue-400" />
|
<span
|
||||||
<span className="text-gray-700 dark:text-gray-300 font-medium">
|
className={`
|
||||||
{t("settings.updateBadge")}
|
absolute inset-0 m-auto h-2 w-2 rounded-full ring-1 ring-background
|
||||||
</span>
|
${isActive ? "bg-blue-500 dark:bg-blue-400" : "bg-blue-300/70 dark:bg-blue-300/60"}
|
||||||
<button
|
`}
|
||||||
onClick={(e) => {
|
/>
|
||||||
e.stopPropagation();
|
</Button>
|
||||||
dismissUpdate();
|
|
||||||
}}
|
|
||||||
className="
|
|
||||||
ml-1 -mr-0.5 p-0.5 rounded
|
|
||||||
hover:bg-gray-100 dark:hover:bg-gray-700
|
|
||||||
transition-colors
|
|
||||||
focus:outline-none focus:ring-2 focus:ring-blue-500/20
|
|
||||||
"
|
|
||||||
aria-label={t("common.close")}
|
|
||||||
>
|
|
||||||
<X className="w-3 h-3 text-muted-foreground" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,9 +94,7 @@ export const FullScreenPanel: React.FC<FullScreenPanelProps> = ({
|
|||||||
|
|
||||||
{/* Content */}
|
{/* Content */}
|
||||||
<div className="flex-1 overflow-y-auto scroll-overlay">
|
<div className="flex-1 overflow-y-auto scroll-overlay">
|
||||||
<div className="px-6 py-6 space-y-6 w-full">
|
<div className="px-6 py-6 space-y-6 w-full">{children}</div>
|
||||||
{children}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Footer */}
|
{/* Footer */}
|
||||||
|
|||||||
@@ -24,7 +24,9 @@ interface AddProviderDialogProps {
|
|||||||
open: boolean;
|
open: boolean;
|
||||||
onOpenChange: (open: boolean) => void;
|
onOpenChange: (open: boolean) => void;
|
||||||
appId: AppId;
|
appId: AppId;
|
||||||
onSubmit: (provider: Omit<Provider, "id"> & { providerKey?: string }) => Promise<void> | void;
|
onSubmit: (
|
||||||
|
provider: Omit<Provider, "id"> & { providerKey?: string },
|
||||||
|
) => Promise<void> | void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function AddProviderDialog({
|
export function AddProviderDialog({
|
||||||
@@ -186,7 +188,9 @@ export function AddProviderDialog({
|
|||||||
}
|
}
|
||||||
} else if (appId === "opencode") {
|
} else if (appId === "opencode") {
|
||||||
// OpenCode uses options.baseURL
|
// OpenCode uses options.baseURL
|
||||||
const options = parsedConfig.options as Record<string, any> | undefined;
|
const options = parsedConfig.options as
|
||||||
|
| Record<string, any>
|
||||||
|
| undefined;
|
||||||
if (options?.baseURL) {
|
if (options?.baseURL) {
|
||||||
addUrl(options.baseURL);
|
addUrl(options.baseURL);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -129,8 +129,8 @@ export function EditProviderDialog({
|
|||||||
};
|
};
|
||||||
}, [
|
}, [
|
||||||
provider?.id, // 只依赖 ID,provider 对象更新不会触发重新计算
|
provider?.id, // 只依赖 ID,provider 对象更新不会触发重新计算
|
||||||
|
provider?.meta, // 需要依赖 meta 以便正确初始化 testConfig 和 proxyConfig
|
||||||
initialSettingsConfig,
|
initialSettingsConfig,
|
||||||
// 注意:不依赖 provider 的其他字段,防止表单重置
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const handleSubmit = useCallback(
|
const handleSubmit = useCallback(
|
||||||
|
|||||||
@@ -64,7 +64,8 @@ export function ProviderActions({
|
|||||||
const isOpenCodeMode = appId === "opencode";
|
const isOpenCodeMode = appId === "opencode";
|
||||||
|
|
||||||
// 故障转移模式下的按钮逻辑(OpenCode 不支持故障转移)
|
// 故障转移模式下的按钮逻辑(OpenCode 不支持故障转移)
|
||||||
const isFailoverMode = !isOpenCodeMode && isAutoFailoverEnabled && onToggleFailover;
|
const isFailoverMode =
|
||||||
|
!isOpenCodeMode && isAutoFailoverEnabled && onToggleFailover;
|
||||||
|
|
||||||
// 处理主按钮点击
|
// 处理主按钮点击
|
||||||
const handleMainButtonClick = () => {
|
const handleMainButtonClick = () => {
|
||||||
|
|||||||
@@ -29,7 +29,10 @@ interface BasicFormFieldsProps {
|
|||||||
beforeNameSlot?: ReactNode;
|
beforeNameSlot?: ReactNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function BasicFormFields({ form, beforeNameSlot }: BasicFormFieldsProps) {
|
export function BasicFormFields({
|
||||||
|
form,
|
||||||
|
beforeNameSlot,
|
||||||
|
}: BasicFormFieldsProps) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const [iconDialogOpen, setIconDialogOpen] = useState(false);
|
const [iconDialogOpen, setIconDialogOpen] = useState(false);
|
||||||
|
|
||||||
|
|||||||
@@ -525,7 +525,7 @@ const EndpointSpeedTest: React.FC<EndpointSpeedTestProps> = ({
|
|||||||
<div className="space-y-1.5">
|
<div className="space-y-1.5">
|
||||||
<div className="flex gap-2">
|
<div className="flex gap-2">
|
||||||
<Input
|
<Input
|
||||||
type="url"
|
type="text"
|
||||||
value={customUrl}
|
value={customUrl}
|
||||||
placeholder={t("endpointTest.addEndpointPlaceholder")}
|
placeholder={t("endpointTest.addEndpointPlaceholder")}
|
||||||
onChange={(event) => setCustomUrl(event.target.value)}
|
onChange={(event) => setCustomUrl(event.target.value)}
|
||||||
|
|||||||
@@ -265,7 +265,7 @@ export function OpenCodeFormFields({
|
|||||||
const handleModelOptionKeyChange = (
|
const handleModelOptionKeyChange = (
|
||||||
modelKey: string,
|
modelKey: string,
|
||||||
oldKey: string,
|
oldKey: string,
|
||||||
newKey: string
|
newKey: string,
|
||||||
) => {
|
) => {
|
||||||
if (!newKey.trim() || oldKey === newKey) return;
|
if (!newKey.trim() || oldKey === newKey) return;
|
||||||
const model = models[modelKey];
|
const model = models[modelKey];
|
||||||
@@ -283,7 +283,7 @@ export function OpenCodeFormFields({
|
|||||||
const handleModelOptionValueChange = (
|
const handleModelOptionValueChange = (
|
||||||
modelKey: string,
|
modelKey: string,
|
||||||
optionKey: string,
|
optionKey: string,
|
||||||
value: string
|
value: string,
|
||||||
) => {
|
) => {
|
||||||
const model = models[modelKey];
|
const model = models[modelKey];
|
||||||
let parsedValue: unknown;
|
let parsedValue: unknown;
|
||||||
@@ -443,7 +443,9 @@ export function OpenCodeFormFields({
|
|||||||
/>
|
/>
|
||||||
<Input
|
<Input
|
||||||
value={value}
|
value={value}
|
||||||
onChange={(e) => handleExtraOptionValueChange(key, e.target.value)}
|
onChange={(e) =>
|
||||||
|
handleExtraOptionValueChange(key, e.target.value)
|
||||||
|
}
|
||||||
placeholder={t("opencode.extraOptionValuePlaceholder", {
|
placeholder={t("opencode.extraOptionValuePlaceholder", {
|
||||||
defaultValue: "600000",
|
defaultValue: "600000",
|
||||||
})}
|
})}
|
||||||
@@ -521,7 +523,7 @@ export function OpenCodeFormFields({
|
|||||||
<ChevronRight
|
<ChevronRight
|
||||||
className={cn(
|
className={cn(
|
||||||
"h-4 w-4 transition-transform",
|
"h-4 w-4 transition-transform",
|
||||||
expandedModels.has(key) && "rotate-90"
|
expandedModels.has(key) && "rotate-90",
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
</Button>
|
</Button>
|
||||||
@@ -575,17 +577,24 @@ export function OpenCodeFormFields({
|
|||||||
<>
|
<>
|
||||||
{Object.entries(model.options || {}).map(
|
{Object.entries(model.options || {}).map(
|
||||||
([optKey, optValue]) => (
|
([optKey, optValue]) => (
|
||||||
<div key={optKey} className="flex items-center gap-2">
|
<div
|
||||||
|
key={optKey}
|
||||||
|
className="flex items-center gap-2"
|
||||||
|
>
|
||||||
<ModelOptionKeyInput
|
<ModelOptionKeyInput
|
||||||
optionKey={optKey}
|
optionKey={optKey}
|
||||||
onChange={(newKey) =>
|
onChange={(newKey) =>
|
||||||
handleModelOptionKeyChange(key, optKey, newKey)
|
handleModelOptionKeyChange(
|
||||||
|
key,
|
||||||
|
optKey,
|
||||||
|
newKey,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
placeholder={t(
|
placeholder={t(
|
||||||
"opencode.modelOptionKeyPlaceholder",
|
"opencode.modelOptionKeyPlaceholder",
|
||||||
{
|
{
|
||||||
defaultValue: "provider",
|
defaultValue: "provider",
|
||||||
}
|
},
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
<Input
|
<Input
|
||||||
@@ -598,14 +607,14 @@ export function OpenCodeFormFields({
|
|||||||
handleModelOptionValueChange(
|
handleModelOptionValueChange(
|
||||||
key,
|
key,
|
||||||
optKey,
|
optKey,
|
||||||
e.target.value
|
e.target.value,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
placeholder={t(
|
placeholder={t(
|
||||||
"opencode.modelOptionValuePlaceholder",
|
"opencode.modelOptionValuePlaceholder",
|
||||||
{
|
{
|
||||||
defaultValue: '{"order": ["baseten"]}',
|
defaultValue: '{"order": ["baseten"]}',
|
||||||
}
|
},
|
||||||
)}
|
)}
|
||||||
className="flex-1"
|
className="flex-1"
|
||||||
/>
|
/>
|
||||||
@@ -621,7 +630,7 @@ export function OpenCodeFormFields({
|
|||||||
<Trash2 className="h-4 w-4" />
|
<Trash2 className="h-4 w-4" />
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
)
|
),
|
||||||
)}
|
)}
|
||||||
<div className="flex items-center justify-end">
|
<div className="flex items-center justify-end">
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
@@ -0,0 +1,455 @@
|
|||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { useState, useEffect } from "react";
|
||||||
|
import {
|
||||||
|
ChevronDown,
|
||||||
|
ChevronRight,
|
||||||
|
FlaskConical,
|
||||||
|
Globe,
|
||||||
|
Eye,
|
||||||
|
EyeOff,
|
||||||
|
X,
|
||||||
|
} from "lucide-react";
|
||||||
|
import { Input } from "@/components/ui/input";
|
||||||
|
import { Label } from "@/components/ui/label";
|
||||||
|
import { Switch } from "@/components/ui/switch";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
import type { ProviderTestConfig, ProviderProxyConfig } from "@/types";
|
||||||
|
|
||||||
|
interface ProviderAdvancedConfigProps {
|
||||||
|
testConfig: ProviderTestConfig;
|
||||||
|
proxyConfig: ProviderProxyConfig;
|
||||||
|
onTestConfigChange: (config: ProviderTestConfig) => void;
|
||||||
|
onProxyConfigChange: (config: ProviderProxyConfig) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 从 ProviderProxyConfig 构建完整 URL */
|
||||||
|
function buildProxyUrl(config: ProviderProxyConfig): string {
|
||||||
|
if (!config.proxyHost) return "";
|
||||||
|
|
||||||
|
const protocol = config.proxyType || "http";
|
||||||
|
const host = config.proxyHost;
|
||||||
|
const port = config.proxyPort || (protocol === "socks5" ? 1080 : 7890);
|
||||||
|
|
||||||
|
return `${protocol}://${host}:${port}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 从完整 URL 解析为 ProviderProxyConfig */
|
||||||
|
function parseProxyUrl(url: string): Partial<ProviderProxyConfig> {
|
||||||
|
if (!url.trim()) {
|
||||||
|
return { proxyHost: undefined, proxyPort: undefined, proxyType: undefined };
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const parsed = new URL(url);
|
||||||
|
const protocol = parsed.protocol.replace(":", "") as
|
||||||
|
| "http"
|
||||||
|
| "https"
|
||||||
|
| "socks5";
|
||||||
|
const host = parsed.hostname;
|
||||||
|
const port = parsed.port ? parseInt(parsed.port, 10) : undefined;
|
||||||
|
|
||||||
|
return {
|
||||||
|
proxyType: protocol,
|
||||||
|
proxyHost: host || undefined,
|
||||||
|
proxyPort: port,
|
||||||
|
};
|
||||||
|
} catch {
|
||||||
|
// 尝试简单解析(不是标准 URL 格式)
|
||||||
|
const match = url.match(/^(?:(\w+):\/\/)?([^:]+)(?::(\d+))?$/);
|
||||||
|
if (match) {
|
||||||
|
return {
|
||||||
|
proxyType: (match[1] as "http" | "https" | "socks5") || "http",
|
||||||
|
proxyHost: match[2] || undefined,
|
||||||
|
proxyPort: match[3] ? parseInt(match[3], 10) : undefined,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ProviderAdvancedConfig({
|
||||||
|
testConfig,
|
||||||
|
proxyConfig,
|
||||||
|
onTestConfigChange,
|
||||||
|
onProxyConfigChange,
|
||||||
|
}: ProviderAdvancedConfigProps) {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const [isTestConfigOpen, setIsTestConfigOpen] = useState(testConfig.enabled);
|
||||||
|
const [isProxyConfigOpen, setIsProxyConfigOpen] = useState(
|
||||||
|
proxyConfig.enabled,
|
||||||
|
);
|
||||||
|
const [showPassword, setShowPassword] = useState(false);
|
||||||
|
|
||||||
|
// 代理 URL 输入状态(仅在初始化时从 proxyConfig 构建)
|
||||||
|
const [proxyUrl, setProxyUrl] = useState(() => buildProxyUrl(proxyConfig));
|
||||||
|
|
||||||
|
// 标记是否为用户主动输入(用于区分外部更新和用户输入)
|
||||||
|
const [isUserTyping, setIsUserTyping] = useState(false);
|
||||||
|
|
||||||
|
// 同步外部 testConfig.enabled 变化到展开状态
|
||||||
|
useEffect(() => {
|
||||||
|
setIsTestConfigOpen(testConfig.enabled);
|
||||||
|
}, [testConfig.enabled]);
|
||||||
|
|
||||||
|
// 同步外部 proxyConfig.enabled 变化到展开状态
|
||||||
|
useEffect(() => {
|
||||||
|
setIsProxyConfigOpen(proxyConfig.enabled);
|
||||||
|
}, [proxyConfig.enabled]);
|
||||||
|
|
||||||
|
// 仅在外部 proxyConfig 变化且非用户输入时同步(如:重置表单、加载数据)
|
||||||
|
useEffect(() => {
|
||||||
|
if (!isUserTyping) {
|
||||||
|
const newUrl = buildProxyUrl(proxyConfig);
|
||||||
|
if (newUrl !== proxyUrl) {
|
||||||
|
setProxyUrl(newUrl);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, [proxyConfig.proxyType, proxyConfig.proxyHost, proxyConfig.proxyPort]);
|
||||||
|
|
||||||
|
// 处理代理 URL 变化(用户输入时不触发 URL 重建)
|
||||||
|
const handleProxyUrlChange = (value: string) => {
|
||||||
|
setIsUserTyping(true);
|
||||||
|
setProxyUrl(value);
|
||||||
|
const parsed = parseProxyUrl(value);
|
||||||
|
onProxyConfigChange({
|
||||||
|
...proxyConfig,
|
||||||
|
...parsed,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
// 输入框失焦时结束用户输入状态
|
||||||
|
const handleProxyUrlBlur = () => {
|
||||||
|
setIsUserTyping(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
// 清除代理配置
|
||||||
|
const handleClearProxy = () => {
|
||||||
|
setProxyUrl("");
|
||||||
|
onProxyConfigChange({
|
||||||
|
...proxyConfig,
|
||||||
|
proxyType: undefined,
|
||||||
|
proxyHost: undefined,
|
||||||
|
proxyPort: undefined,
|
||||||
|
proxyUsername: undefined,
|
||||||
|
proxyPassword: undefined,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-4">
|
||||||
|
{/* 模型测试配置 */}
|
||||||
|
<div className="rounded-lg border border-border/50 bg-muted/20">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="flex w-full items-center justify-between p-4 hover:bg-muted/30 transition-colors"
|
||||||
|
onClick={() => setIsTestConfigOpen(!isTestConfigOpen)}
|
||||||
|
>
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<FlaskConical className="h-4 w-4 text-muted-foreground" />
|
||||||
|
<span className="font-medium">
|
||||||
|
{t("providerAdvanced.testConfig", {
|
||||||
|
defaultValue: "模型测试配置",
|
||||||
|
})}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<div
|
||||||
|
className="flex items-center gap-2"
|
||||||
|
onClick={(e) => e.stopPropagation()}
|
||||||
|
>
|
||||||
|
<Label
|
||||||
|
htmlFor="test-config-enabled"
|
||||||
|
className="text-sm text-muted-foreground"
|
||||||
|
>
|
||||||
|
{t("providerAdvanced.useCustomConfig", {
|
||||||
|
defaultValue: "使用单独配置",
|
||||||
|
})}
|
||||||
|
</Label>
|
||||||
|
<Switch
|
||||||
|
id="test-config-enabled"
|
||||||
|
checked={testConfig.enabled}
|
||||||
|
onCheckedChange={(checked) => {
|
||||||
|
onTestConfigChange({ ...testConfig, enabled: checked });
|
||||||
|
if (checked) setIsTestConfigOpen(true);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{isTestConfigOpen ? (
|
||||||
|
<ChevronDown className="h-4 w-4 text-muted-foreground" />
|
||||||
|
) : (
|
||||||
|
<ChevronRight className="h-4 w-4 text-muted-foreground" />
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</button>
|
||||||
|
<div
|
||||||
|
className={cn(
|
||||||
|
"overflow-hidden transition-all duration-200",
|
||||||
|
isTestConfigOpen
|
||||||
|
? "max-h-[500px] opacity-100"
|
||||||
|
: "max-h-0 opacity-0",
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<div className="border-t border-border/50 p-4 space-y-4">
|
||||||
|
<p className="text-sm text-muted-foreground">
|
||||||
|
{t("providerAdvanced.testConfigDesc", {
|
||||||
|
defaultValue:
|
||||||
|
"为此供应商配置单独的模型测试参数,不启用时使用全局配置。",
|
||||||
|
})}
|
||||||
|
</p>
|
||||||
|
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="test-model">
|
||||||
|
{t("providerAdvanced.testModel", {
|
||||||
|
defaultValue: "测试模型",
|
||||||
|
})}
|
||||||
|
</Label>
|
||||||
|
<Input
|
||||||
|
id="test-model"
|
||||||
|
value={testConfig.testModel || ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
onTestConfigChange({
|
||||||
|
...testConfig,
|
||||||
|
testModel: e.target.value || undefined,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
placeholder={t("providerAdvanced.testModelPlaceholder", {
|
||||||
|
defaultValue: "留空使用全局配置",
|
||||||
|
})}
|
||||||
|
disabled={!testConfig.enabled}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="test-timeout">
|
||||||
|
{t("providerAdvanced.timeoutSecs", {
|
||||||
|
defaultValue: "超时时间(秒)",
|
||||||
|
})}
|
||||||
|
</Label>
|
||||||
|
<Input
|
||||||
|
id="test-timeout"
|
||||||
|
type="number"
|
||||||
|
min={1}
|
||||||
|
max={300}
|
||||||
|
value={testConfig.timeoutSecs || ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
onTestConfigChange({
|
||||||
|
...testConfig,
|
||||||
|
timeoutSecs: e.target.value
|
||||||
|
? parseInt(e.target.value, 10)
|
||||||
|
: undefined,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
placeholder="45"
|
||||||
|
disabled={!testConfig.enabled}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="test-prompt">
|
||||||
|
{t("providerAdvanced.testPrompt", {
|
||||||
|
defaultValue: "测试提示词",
|
||||||
|
})}
|
||||||
|
</Label>
|
||||||
|
<Input
|
||||||
|
id="test-prompt"
|
||||||
|
value={testConfig.testPrompt || ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
onTestConfigChange({
|
||||||
|
...testConfig,
|
||||||
|
testPrompt: e.target.value || undefined,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
placeholder="Who are you?"
|
||||||
|
disabled={!testConfig.enabled}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="degraded-threshold">
|
||||||
|
{t("providerAdvanced.degradedThreshold", {
|
||||||
|
defaultValue: "降级阈值(毫秒)",
|
||||||
|
})}
|
||||||
|
</Label>
|
||||||
|
<Input
|
||||||
|
id="degraded-threshold"
|
||||||
|
type="number"
|
||||||
|
min={100}
|
||||||
|
max={60000}
|
||||||
|
value={testConfig.degradedThresholdMs || ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
onTestConfigChange({
|
||||||
|
...testConfig,
|
||||||
|
degradedThresholdMs: e.target.value
|
||||||
|
? parseInt(e.target.value, 10)
|
||||||
|
: undefined,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
placeholder="6000"
|
||||||
|
disabled={!testConfig.enabled}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="space-y-2">
|
||||||
|
<Label htmlFor="max-retries">
|
||||||
|
{t("providerAdvanced.maxRetries", {
|
||||||
|
defaultValue: "最大重试次数",
|
||||||
|
})}
|
||||||
|
</Label>
|
||||||
|
<Input
|
||||||
|
id="max-retries"
|
||||||
|
type="number"
|
||||||
|
min={0}
|
||||||
|
max={10}
|
||||||
|
value={testConfig.maxRetries ?? ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
onTestConfigChange({
|
||||||
|
...testConfig,
|
||||||
|
maxRetries: e.target.value
|
||||||
|
? parseInt(e.target.value, 10)
|
||||||
|
: undefined,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
placeholder="2"
|
||||||
|
disabled={!testConfig.enabled}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 代理配置 */}
|
||||||
|
<div className="rounded-lg border border-border/50 bg-muted/20">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="flex w-full items-center justify-between p-4 hover:bg-muted/30 transition-colors"
|
||||||
|
onClick={() => setIsProxyConfigOpen(!isProxyConfigOpen)}
|
||||||
|
>
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<Globe className="h-4 w-4 text-muted-foreground" />
|
||||||
|
<span className="font-medium">
|
||||||
|
{t("providerAdvanced.proxyConfig", {
|
||||||
|
defaultValue: "代理配置",
|
||||||
|
})}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<div
|
||||||
|
className="flex items-center gap-2"
|
||||||
|
onClick={(e) => e.stopPropagation()}
|
||||||
|
>
|
||||||
|
<Label
|
||||||
|
htmlFor="proxy-config-enabled"
|
||||||
|
className="text-sm text-muted-foreground"
|
||||||
|
>
|
||||||
|
{t("providerAdvanced.useCustomProxy", {
|
||||||
|
defaultValue: "使用单独代理",
|
||||||
|
})}
|
||||||
|
</Label>
|
||||||
|
<Switch
|
||||||
|
id="proxy-config-enabled"
|
||||||
|
checked={proxyConfig.enabled}
|
||||||
|
onCheckedChange={(checked) => {
|
||||||
|
onProxyConfigChange({ ...proxyConfig, enabled: checked });
|
||||||
|
if (checked) setIsProxyConfigOpen(true);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{isProxyConfigOpen ? (
|
||||||
|
<ChevronDown className="h-4 w-4 text-muted-foreground" />
|
||||||
|
) : (
|
||||||
|
<ChevronRight className="h-4 w-4 text-muted-foreground" />
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</button>
|
||||||
|
<div
|
||||||
|
className={cn(
|
||||||
|
"overflow-hidden transition-all duration-200",
|
||||||
|
isProxyConfigOpen
|
||||||
|
? "max-h-[500px] opacity-100"
|
||||||
|
: "max-h-0 opacity-0",
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<div className="border-t border-border/50 p-4 space-y-3">
|
||||||
|
<p className="text-sm text-muted-foreground">
|
||||||
|
{t("providerAdvanced.proxyConfigDesc", {
|
||||||
|
defaultValue:
|
||||||
|
"为此供应商配置单独的网络代理,不启用时使用系统代理或全局设置。",
|
||||||
|
})}
|
||||||
|
</p>
|
||||||
|
|
||||||
|
{/* 代理地址输入框(仿照全局代理样式) */}
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<Input
|
||||||
|
placeholder="http://127.0.0.1:7890 / socks5://127.0.0.1:1080"
|
||||||
|
value={proxyUrl}
|
||||||
|
onChange={(e) => handleProxyUrlChange(e.target.value)}
|
||||||
|
onBlur={handleProxyUrlBlur}
|
||||||
|
className="font-mono text-sm flex-1"
|
||||||
|
disabled={!proxyConfig.enabled}
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="outline"
|
||||||
|
size="icon"
|
||||||
|
disabled={!proxyConfig.enabled || !proxyUrl}
|
||||||
|
onClick={handleClearProxy}
|
||||||
|
title={t("common.clear", { defaultValue: "清除" })}
|
||||||
|
>
|
||||||
|
<X className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 认证信息:用户名 + 密码(可选) */}
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<Input
|
||||||
|
placeholder={t("providerAdvanced.proxyUsername", {
|
||||||
|
defaultValue: "用户名(可选)",
|
||||||
|
})}
|
||||||
|
value={proxyConfig.proxyUsername || ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
onProxyConfigChange({
|
||||||
|
...proxyConfig,
|
||||||
|
proxyUsername: e.target.value || undefined,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
className="font-mono text-sm flex-1"
|
||||||
|
disabled={!proxyConfig.enabled}
|
||||||
|
/>
|
||||||
|
<div className="relative flex-1">
|
||||||
|
<Input
|
||||||
|
type={showPassword ? "text" : "password"}
|
||||||
|
placeholder={t("providerAdvanced.proxyPassword", {
|
||||||
|
defaultValue: "密码(可选)",
|
||||||
|
})}
|
||||||
|
value={proxyConfig.proxyPassword || ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
onProxyConfigChange({
|
||||||
|
...proxyConfig,
|
||||||
|
proxyPassword: e.target.value || undefined,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
className="font-mono text-sm pr-10"
|
||||||
|
disabled={!proxyConfig.enabled}
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="absolute right-0 top-0 h-full px-3 hover:bg-transparent"
|
||||||
|
onClick={() => setShowPassword(!showPassword)}
|
||||||
|
tabIndex={-1}
|
||||||
|
disabled={!proxyConfig.enabled}
|
||||||
|
>
|
||||||
|
{showPassword ? (
|
||||||
|
<EyeOff className="h-4 w-4 text-muted-foreground" />
|
||||||
|
) : (
|
||||||
|
<Eye className="h-4 w-4 text-muted-foreground" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -8,7 +8,12 @@ import { Form, FormField, FormItem, FormMessage } from "@/components/ui/form";
|
|||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import { providerSchema, type ProviderFormData } from "@/lib/schemas/provider";
|
import { providerSchema, type ProviderFormData } from "@/lib/schemas/provider";
|
||||||
import type { AppId } from "@/lib/api";
|
import type { AppId } from "@/lib/api";
|
||||||
import type { ProviderCategory, ProviderMeta } from "@/types";
|
import type {
|
||||||
|
ProviderCategory,
|
||||||
|
ProviderMeta,
|
||||||
|
ProviderTestConfig,
|
||||||
|
ProviderProxyConfig,
|
||||||
|
} from "@/types";
|
||||||
import {
|
import {
|
||||||
providerPresets,
|
providerPresets,
|
||||||
type ProviderPreset,
|
type ProviderPreset,
|
||||||
@@ -41,6 +46,7 @@ import { BasicFormFields } from "./BasicFormFields";
|
|||||||
import { ClaudeFormFields } from "./ClaudeFormFields";
|
import { ClaudeFormFields } from "./ClaudeFormFields";
|
||||||
import { CodexFormFields } from "./CodexFormFields";
|
import { CodexFormFields } from "./CodexFormFields";
|
||||||
import { GeminiFormFields } from "./GeminiFormFields";
|
import { GeminiFormFields } from "./GeminiFormFields";
|
||||||
|
import { ProviderAdvancedConfig } from "./ProviderAdvancedConfig";
|
||||||
import {
|
import {
|
||||||
useProviderCategory,
|
useProviderCategory,
|
||||||
useApiKeyState,
|
useApiKeyState,
|
||||||
@@ -87,7 +93,11 @@ const OPENCODE_DEFAULT_CONFIG = JSON.stringify(
|
|||||||
|
|
||||||
type PresetEntry = {
|
type PresetEntry = {
|
||||||
id: string;
|
id: string;
|
||||||
preset: ProviderPreset | CodexProviderPreset | GeminiProviderPreset | OpenCodeProviderPreset;
|
preset:
|
||||||
|
| ProviderPreset
|
||||||
|
| CodexProviderPreset
|
||||||
|
| GeminiProviderPreset
|
||||||
|
| OpenCodeProviderPreset;
|
||||||
};
|
};
|
||||||
|
|
||||||
interface ProviderFormProps {
|
interface ProviderFormProps {
|
||||||
@@ -151,6 +161,14 @@ export function ProviderForm({
|
|||||||
() => initialData?.meta?.endpointAutoSelect ?? true,
|
() => initialData?.meta?.endpointAutoSelect ?? true,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// 高级配置:模型测试和代理配置
|
||||||
|
const [testConfig, setTestConfig] = useState<ProviderTestConfig>(
|
||||||
|
() => initialData?.meta?.testConfig ?? { enabled: false },
|
||||||
|
);
|
||||||
|
const [proxyConfig, setProxyConfig] = useState<ProviderProxyConfig>(
|
||||||
|
() => initialData?.meta?.proxyConfig ?? { enabled: false },
|
||||||
|
);
|
||||||
|
|
||||||
// 使用 category hook
|
// 使用 category hook
|
||||||
const { category } = useProviderCategory({
|
const { category } = useProviderCategory({
|
||||||
appId,
|
appId,
|
||||||
@@ -168,6 +186,8 @@ export function ProviderForm({
|
|||||||
setDraftCustomEndpoints([]);
|
setDraftCustomEndpoints([]);
|
||||||
}
|
}
|
||||||
setEndpointAutoSelect(initialData?.meta?.endpointAutoSelect ?? true);
|
setEndpointAutoSelect(initialData?.meta?.endpointAutoSelect ?? true);
|
||||||
|
setTestConfig(initialData?.meta?.testConfig ?? { enabled: false });
|
||||||
|
setProxyConfig(initialData?.meta?.proxyConfig ?? { enabled: false });
|
||||||
}, [appId, initialData]);
|
}, [appId, initialData]);
|
||||||
|
|
||||||
const defaultValues: ProviderFormData = useMemo(
|
const defaultValues: ProviderFormData = useMemo(
|
||||||
@@ -506,7 +526,7 @@ export function ProviderForm({
|
|||||||
if (!opencodeProvidersData?.providers) return [];
|
if (!opencodeProvidersData?.providers) return [];
|
||||||
// Exclude current provider ID when in edit mode
|
// Exclude current provider ID when in edit mode
|
||||||
return Object.keys(opencodeProvidersData.providers).filter(
|
return Object.keys(opencodeProvidersData.providers).filter(
|
||||||
(k) => k !== providerId
|
(k) => k !== providerId,
|
||||||
);
|
);
|
||||||
}, [opencodeProvidersData?.providers, providerId]);
|
}, [opencodeProvidersData?.providers, providerId]);
|
||||||
|
|
||||||
@@ -521,7 +541,11 @@ export function ProviderForm({
|
|||||||
const [opencodeNpm, setOpencodeNpm] = useState<string>(() => {
|
const [opencodeNpm, setOpencodeNpm] = useState<string>(() => {
|
||||||
if (appId !== "opencode") return "@ai-sdk/openai-compatible";
|
if (appId !== "opencode") return "@ai-sdk/openai-compatible";
|
||||||
try {
|
try {
|
||||||
const config = JSON.parse(initialData?.settingsConfig ? JSON.stringify(initialData.settingsConfig) : OPENCODE_DEFAULT_CONFIG);
|
const config = JSON.parse(
|
||||||
|
initialData?.settingsConfig
|
||||||
|
? JSON.stringify(initialData.settingsConfig)
|
||||||
|
: OPENCODE_DEFAULT_CONFIG,
|
||||||
|
);
|
||||||
return config.npm || "@ai-sdk/openai-compatible";
|
return config.npm || "@ai-sdk/openai-compatible";
|
||||||
} catch {
|
} catch {
|
||||||
return "@ai-sdk/openai-compatible";
|
return "@ai-sdk/openai-compatible";
|
||||||
@@ -531,7 +555,11 @@ export function ProviderForm({
|
|||||||
const [opencodeApiKey, setOpencodeApiKey] = useState<string>(() => {
|
const [opencodeApiKey, setOpencodeApiKey] = useState<string>(() => {
|
||||||
if (appId !== "opencode") return "";
|
if (appId !== "opencode") return "";
|
||||||
try {
|
try {
|
||||||
const config = JSON.parse(initialData?.settingsConfig ? JSON.stringify(initialData.settingsConfig) : OPENCODE_DEFAULT_CONFIG);
|
const config = JSON.parse(
|
||||||
|
initialData?.settingsConfig
|
||||||
|
? JSON.stringify(initialData.settingsConfig)
|
||||||
|
: OPENCODE_DEFAULT_CONFIG,
|
||||||
|
);
|
||||||
return config.options?.apiKey || "";
|
return config.options?.apiKey || "";
|
||||||
} catch {
|
} catch {
|
||||||
return "";
|
return "";
|
||||||
@@ -541,17 +569,27 @@ export function ProviderForm({
|
|||||||
const [opencodeBaseUrl, setOpencodeBaseUrl] = useState<string>(() => {
|
const [opencodeBaseUrl, setOpencodeBaseUrl] = useState<string>(() => {
|
||||||
if (appId !== "opencode") return "";
|
if (appId !== "opencode") return "";
|
||||||
try {
|
try {
|
||||||
const config = JSON.parse(initialData?.settingsConfig ? JSON.stringify(initialData.settingsConfig) : OPENCODE_DEFAULT_CONFIG);
|
const config = JSON.parse(
|
||||||
|
initialData?.settingsConfig
|
||||||
|
? JSON.stringify(initialData.settingsConfig)
|
||||||
|
: OPENCODE_DEFAULT_CONFIG,
|
||||||
|
);
|
||||||
return config.options?.baseURL || "";
|
return config.options?.baseURL || "";
|
||||||
} catch {
|
} catch {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const [opencodeModels, setOpencodeModels] = useState<Record<string, OpenCodeModel>>(() => {
|
const [opencodeModels, setOpencodeModels] = useState<
|
||||||
|
Record<string, OpenCodeModel>
|
||||||
|
>(() => {
|
||||||
if (appId !== "opencode") return {};
|
if (appId !== "opencode") return {};
|
||||||
try {
|
try {
|
||||||
const config = JSON.parse(initialData?.settingsConfig ? JSON.stringify(initialData.settingsConfig) : OPENCODE_DEFAULT_CONFIG);
|
const config = JSON.parse(
|
||||||
|
initialData?.settingsConfig
|
||||||
|
? JSON.stringify(initialData.settingsConfig)
|
||||||
|
: OPENCODE_DEFAULT_CONFIG,
|
||||||
|
);
|
||||||
return config.models || {};
|
return config.models || {};
|
||||||
} catch {
|
} catch {
|
||||||
return {};
|
return {};
|
||||||
@@ -559,10 +597,16 @@ export function ProviderForm({
|
|||||||
});
|
});
|
||||||
|
|
||||||
// OpenCode extra options state (e.g., timeout, setCacheKey)
|
// OpenCode extra options state (e.g., timeout, setCacheKey)
|
||||||
const [opencodeExtraOptions, setOpencodeExtraOptions] = useState<Record<string, string>>(() => {
|
const [opencodeExtraOptions, setOpencodeExtraOptions] = useState<
|
||||||
|
Record<string, string>
|
||||||
|
>(() => {
|
||||||
if (appId !== "opencode") return {};
|
if (appId !== "opencode") return {};
|
||||||
try {
|
try {
|
||||||
const config = JSON.parse(initialData?.settingsConfig ? JSON.stringify(initialData.settingsConfig) : OPENCODE_DEFAULT_CONFIG);
|
const config = JSON.parse(
|
||||||
|
initialData?.settingsConfig
|
||||||
|
? JSON.stringify(initialData.settingsConfig)
|
||||||
|
: OPENCODE_DEFAULT_CONFIG,
|
||||||
|
);
|
||||||
const options = config.options || {};
|
const options = config.options || {};
|
||||||
const extra: Record<string, string> = {};
|
const extra: Record<string, string> = {};
|
||||||
const knownKeys = ["baseURL", "apiKey", "headers"];
|
const knownKeys = ["baseURL", "apiKey", "headers"];
|
||||||
@@ -583,7 +627,9 @@ export function ProviderForm({
|
|||||||
(npm: string) => {
|
(npm: string) => {
|
||||||
setOpencodeNpm(npm);
|
setOpencodeNpm(npm);
|
||||||
try {
|
try {
|
||||||
const config = JSON.parse(form.getValues("settingsConfig") || OPENCODE_DEFAULT_CONFIG);
|
const config = JSON.parse(
|
||||||
|
form.getValues("settingsConfig") || OPENCODE_DEFAULT_CONFIG,
|
||||||
|
);
|
||||||
config.npm = npm;
|
config.npm = npm;
|
||||||
form.setValue("settingsConfig", JSON.stringify(config, null, 2));
|
form.setValue("settingsConfig", JSON.stringify(config, null, 2));
|
||||||
} catch {
|
} catch {
|
||||||
@@ -597,7 +643,9 @@ export function ProviderForm({
|
|||||||
(apiKey: string) => {
|
(apiKey: string) => {
|
||||||
setOpencodeApiKey(apiKey);
|
setOpencodeApiKey(apiKey);
|
||||||
try {
|
try {
|
||||||
const config = JSON.parse(form.getValues("settingsConfig") || OPENCODE_DEFAULT_CONFIG);
|
const config = JSON.parse(
|
||||||
|
form.getValues("settingsConfig") || OPENCODE_DEFAULT_CONFIG,
|
||||||
|
);
|
||||||
if (!config.options) config.options = {};
|
if (!config.options) config.options = {};
|
||||||
config.options.apiKey = apiKey;
|
config.options.apiKey = apiKey;
|
||||||
form.setValue("settingsConfig", JSON.stringify(config, null, 2));
|
form.setValue("settingsConfig", JSON.stringify(config, null, 2));
|
||||||
@@ -612,7 +660,9 @@ export function ProviderForm({
|
|||||||
(baseUrl: string) => {
|
(baseUrl: string) => {
|
||||||
setOpencodeBaseUrl(baseUrl);
|
setOpencodeBaseUrl(baseUrl);
|
||||||
try {
|
try {
|
||||||
const config = JSON.parse(form.getValues("settingsConfig") || OPENCODE_DEFAULT_CONFIG);
|
const config = JSON.parse(
|
||||||
|
form.getValues("settingsConfig") || OPENCODE_DEFAULT_CONFIG,
|
||||||
|
);
|
||||||
if (!config.options) config.options = {};
|
if (!config.options) config.options = {};
|
||||||
config.options.baseURL = baseUrl.trim().replace(/\/+$/, "");
|
config.options.baseURL = baseUrl.trim().replace(/\/+$/, "");
|
||||||
form.setValue("settingsConfig", JSON.stringify(config, null, 2));
|
form.setValue("settingsConfig", JSON.stringify(config, null, 2));
|
||||||
@@ -627,7 +677,9 @@ export function ProviderForm({
|
|||||||
(models: Record<string, OpenCodeModel>) => {
|
(models: Record<string, OpenCodeModel>) => {
|
||||||
setOpencodeModels(models);
|
setOpencodeModels(models);
|
||||||
try {
|
try {
|
||||||
const config = JSON.parse(form.getValues("settingsConfig") || OPENCODE_DEFAULT_CONFIG);
|
const config = JSON.parse(
|
||||||
|
form.getValues("settingsConfig") || OPENCODE_DEFAULT_CONFIG,
|
||||||
|
);
|
||||||
config.models = models;
|
config.models = models;
|
||||||
form.setValue("settingsConfig", JSON.stringify(config, null, 2));
|
form.setValue("settingsConfig", JSON.stringify(config, null, 2));
|
||||||
} catch {
|
} catch {
|
||||||
@@ -641,7 +693,9 @@ export function ProviderForm({
|
|||||||
(options: Record<string, string>) => {
|
(options: Record<string, string>) => {
|
||||||
setOpencodeExtraOptions(options);
|
setOpencodeExtraOptions(options);
|
||||||
try {
|
try {
|
||||||
const config = JSON.parse(form.getValues("settingsConfig") || OPENCODE_DEFAULT_CONFIG);
|
const config = JSON.parse(
|
||||||
|
form.getValues("settingsConfig") || OPENCODE_DEFAULT_CONFIG,
|
||||||
|
);
|
||||||
if (!config.options) config.options = {};
|
if (!config.options) config.options = {};
|
||||||
|
|
||||||
// Remove old extra options (keep only known keys)
|
// Remove old extra options (keep only known keys)
|
||||||
@@ -883,6 +937,9 @@ export function ProviderForm({
|
|||||||
payload.meta = {
|
payload.meta = {
|
||||||
...(baseMeta ?? {}),
|
...(baseMeta ?? {}),
|
||||||
endpointAutoSelect,
|
endpointAutoSelect,
|
||||||
|
// 添加高级配置
|
||||||
|
testConfig: testConfig.enabled ? testConfig : undefined,
|
||||||
|
proxyConfig: proxyConfig.enabled ? proxyConfig : undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
onSubmit(payload);
|
onSubmit(payload);
|
||||||
@@ -1122,32 +1179,44 @@ export function ProviderForm({
|
|||||||
<Input
|
<Input
|
||||||
id="opencode-key"
|
id="opencode-key"
|
||||||
value={opencodeProviderKey}
|
value={opencodeProviderKey}
|
||||||
onChange={(e) => setOpencodeProviderKey(e.target.value.toLowerCase().replace(/[^a-z0-9-]/g, ""))}
|
onChange={(e) =>
|
||||||
|
setOpencodeProviderKey(
|
||||||
|
e.target.value.toLowerCase().replace(/[^a-z0-9-]/g, ""),
|
||||||
|
)
|
||||||
|
}
|
||||||
placeholder={t("opencode.providerKeyPlaceholder")}
|
placeholder={t("opencode.providerKeyPlaceholder")}
|
||||||
disabled={isEditMode}
|
disabled={isEditMode}
|
||||||
className={
|
className={
|
||||||
(existingOpencodeKeys.includes(opencodeProviderKey) && !isEditMode) ||
|
(existingOpencodeKeys.includes(opencodeProviderKey) &&
|
||||||
(opencodeProviderKey.trim() !== "" && !/^[a-z0-9]+(-[a-z0-9]+)*$/.test(opencodeProviderKey))
|
!isEditMode) ||
|
||||||
|
(opencodeProviderKey.trim() !== "" &&
|
||||||
|
!/^[a-z0-9]+(-[a-z0-9]+)*$/.test(opencodeProviderKey))
|
||||||
? "border-destructive"
|
? "border-destructive"
|
||||||
: ""
|
: ""
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
{existingOpencodeKeys.includes(opencodeProviderKey) && !isEditMode && (
|
{existingOpencodeKeys.includes(opencodeProviderKey) &&
|
||||||
<p className="text-xs text-destructive">
|
!isEditMode && (
|
||||||
{t("opencode.providerKeyDuplicate")}
|
<p className="text-xs text-destructive">
|
||||||
</p>
|
{t("opencode.providerKeyDuplicate")}
|
||||||
)}
|
</p>
|
||||||
{opencodeProviderKey.trim() !== "" && !/^[a-z0-9]+(-[a-z0-9]+)*$/.test(opencodeProviderKey) && (
|
)}
|
||||||
<p className="text-xs text-destructive">
|
{opencodeProviderKey.trim() !== "" &&
|
||||||
{t("opencode.providerKeyInvalid")}
|
!/^[a-z0-9]+(-[a-z0-9]+)*$/.test(opencodeProviderKey) && (
|
||||||
</p>
|
<p className="text-xs text-destructive">
|
||||||
)}
|
{t("opencode.providerKeyInvalid")}
|
||||||
{!(existingOpencodeKeys.includes(opencodeProviderKey) && !isEditMode) &&
|
</p>
|
||||||
(opencodeProviderKey.trim() === "" || /^[a-z0-9]+(-[a-z0-9]+)*$/.test(opencodeProviderKey)) && (
|
)}
|
||||||
<p className="text-xs text-muted-foreground">
|
{!(
|
||||||
{t("opencode.providerKeyHint")}
|
existingOpencodeKeys.includes(opencodeProviderKey) &&
|
||||||
</p>
|
!isEditMode
|
||||||
)}
|
) &&
|
||||||
|
(opencodeProviderKey.trim() === "" ||
|
||||||
|
/^[a-z0-9]+(-[a-z0-9]+)*$/.test(opencodeProviderKey)) && (
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
{t("opencode.providerKeyHint")}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
) : undefined
|
) : undefined
|
||||||
}
|
}
|
||||||
@@ -1391,6 +1460,14 @@ export function ProviderForm({
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* 高级配置:模型测试和代理配置 */}
|
||||||
|
<ProviderAdvancedConfig
|
||||||
|
testConfig={testConfig}
|
||||||
|
proxyConfig={proxyConfig}
|
||||||
|
onTestConfigChange={setTestConfig}
|
||||||
|
onProxyConfigChange={setProxyConfig}
|
||||||
|
/>
|
||||||
|
|
||||||
{showButtons && (
|
{showButtons && (
|
||||||
<div className="flex justify-end gap-2">
|
<div className="flex justify-end gap-2">
|
||||||
<Button variant="outline" type="button" onClick={onCancel}>
|
<Button variant="outline" type="button" onClick={onCancel}>
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ export function EndpointField({
|
|||||||
</div>
|
</div>
|
||||||
<Input
|
<Input
|
||||||
id={id}
|
id={id}
|
||||||
type="url"
|
type="text"
|
||||||
value={value}
|
value={value}
|
||||||
onChange={(e) => onChange(e.target.value)}
|
onChange={(e) => onChange(e.target.value)}
|
||||||
placeholder={placeholder}
|
placeholder={placeholder}
|
||||||
|
|||||||
@@ -25,9 +25,9 @@ export function AutoFailoverConfigPanel({
|
|||||||
const [formData, setFormData] = useState({
|
const [formData, setFormData] = useState({
|
||||||
autoFailoverEnabled: false,
|
autoFailoverEnabled: false,
|
||||||
maxRetries: "3",
|
maxRetries: "3",
|
||||||
streamingFirstByteTimeout: "30",
|
streamingFirstByteTimeout: "60",
|
||||||
streamingIdleTimeout: "60",
|
streamingIdleTimeout: "120",
|
||||||
nonStreamingTimeout: "300",
|
nonStreamingTimeout: "600",
|
||||||
circuitFailureThreshold: "5",
|
circuitFailureThreshold: "5",
|
||||||
circuitSuccessThreshold: "2",
|
circuitSuccessThreshold: "2",
|
||||||
circuitTimeoutSeconds: "60",
|
circuitTimeoutSeconds: "60",
|
||||||
@@ -67,9 +67,9 @@ export function AutoFailoverConfigPanel({
|
|||||||
// 定义各字段的有效范围
|
// 定义各字段的有效范围
|
||||||
const ranges = {
|
const ranges = {
|
||||||
maxRetries: { min: 0, max: 10 },
|
maxRetries: { min: 0, max: 10 },
|
||||||
streamingFirstByteTimeout: { min: 0, max: 180 },
|
streamingFirstByteTimeout: { min: 1, max: 120 },
|
||||||
streamingIdleTimeout: { min: 0, max: 600 },
|
streamingIdleTimeout: { min: 0, max: 600 },
|
||||||
nonStreamingTimeout: { min: 0, max: 1800 },
|
nonStreamingTimeout: { min: 60, max: 1200 },
|
||||||
circuitFailureThreshold: { min: 1, max: 20 },
|
circuitFailureThreshold: { min: 1, max: 20 },
|
||||||
circuitSuccessThreshold: { min: 1, max: 10 },
|
circuitSuccessThreshold: { min: 1, max: 10 },
|
||||||
circuitTimeoutSeconds: { min: 0, max: 300 },
|
circuitTimeoutSeconds: { min: 0, max: 300 },
|
||||||
@@ -307,8 +307,8 @@ export function AutoFailoverConfigPanel({
|
|||||||
<Input
|
<Input
|
||||||
id={`streamingFirstByte-${appType}`}
|
id={`streamingFirstByte-${appType}`}
|
||||||
type="number"
|
type="number"
|
||||||
min="0"
|
min="1"
|
||||||
max="180"
|
max="120"
|
||||||
value={formData.streamingFirstByteTimeout}
|
value={formData.streamingFirstByteTimeout}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
setFormData({
|
setFormData({
|
||||||
@@ -321,7 +321,7 @@ export function AutoFailoverConfigPanel({
|
|||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
{t(
|
{t(
|
||||||
"proxy.autoFailover.streamingFirstByteHint",
|
"proxy.autoFailover.streamingFirstByteHint",
|
||||||
"等待首个数据块的最大时间",
|
"等待首个数据块的最大时间,范围 1-120 秒,默认 60 秒",
|
||||||
)}
|
)}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
@@ -347,7 +347,7 @@ export function AutoFailoverConfigPanel({
|
|||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
{t(
|
{t(
|
||||||
"proxy.autoFailover.streamingIdleHint",
|
"proxy.autoFailover.streamingIdleHint",
|
||||||
"数据块之间的最大间隔",
|
"数据块之间的最大间隔,范围 60-600 秒,填 0 禁用(防止中途卡住)",
|
||||||
)}
|
)}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
@@ -359,8 +359,8 @@ export function AutoFailoverConfigPanel({
|
|||||||
<Input
|
<Input
|
||||||
id={`nonStreaming-${appType}`}
|
id={`nonStreaming-${appType}`}
|
||||||
type="number"
|
type="number"
|
||||||
min="0"
|
min="60"
|
||||||
max="1800"
|
max="1200"
|
||||||
value={formData.nonStreamingTimeout}
|
value={formData.nonStreamingTimeout}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
setFormData({
|
setFormData({
|
||||||
@@ -373,7 +373,7 @@ export function AutoFailoverConfigPanel({
|
|||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
{t(
|
{t(
|
||||||
"proxy.autoFailover.nonStreamingHint",
|
"proxy.autoFailover.nonStreamingHint",
|
||||||
"非流式请求的总超时时间",
|
"非流式请求的总超时时间,范围 60-1200 秒,默认 600 秒(10 分钟)",
|
||||||
)}
|
)}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
/**
|
||||||
|
* 故障转移切换开关组件
|
||||||
|
*
|
||||||
|
* 放置在主界面头部,用于一键启用/关闭自动故障转移
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { Shuffle, Loader2 } from "lucide-react";
|
||||||
|
import { Switch } from "@/components/ui/switch";
|
||||||
|
import {
|
||||||
|
useAutoFailoverEnabled,
|
||||||
|
useSetAutoFailoverEnabled,
|
||||||
|
} from "@/lib/query/failover";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import type { AppId } from "@/lib/api";
|
||||||
|
|
||||||
|
interface FailoverToggleProps {
|
||||||
|
className?: string;
|
||||||
|
activeApp: AppId;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FailoverToggle({ className, activeApp }: FailoverToggleProps) {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const { data: isEnabled = false, isLoading } =
|
||||||
|
useAutoFailoverEnabled(activeApp);
|
||||||
|
const setEnabled = useSetAutoFailoverEnabled();
|
||||||
|
|
||||||
|
const handleToggle = (checked: boolean) => {
|
||||||
|
setEnabled.mutate({ appType: activeApp, enabled: checked });
|
||||||
|
};
|
||||||
|
|
||||||
|
const appLabel =
|
||||||
|
activeApp === "claude"
|
||||||
|
? "Claude"
|
||||||
|
: activeApp === "codex"
|
||||||
|
? "Codex"
|
||||||
|
: "Gemini";
|
||||||
|
|
||||||
|
const tooltipText = isEnabled
|
||||||
|
? t("failover.tooltip.enabled", {
|
||||||
|
app: appLabel,
|
||||||
|
defaultValue: `${appLabel} 故障转移已启用\n自动切换到下一个可用供应商`,
|
||||||
|
})
|
||||||
|
: t("failover.tooltip.disabled", {
|
||||||
|
app: appLabel,
|
||||||
|
defaultValue: `启用 ${appLabel} 故障转移\n当当前供应商失败时自动切换`,
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className={cn(
|
||||||
|
"flex items-center gap-1 px-1.5 h-8 rounded-lg bg-muted/50 transition-all",
|
||||||
|
className,
|
||||||
|
)}
|
||||||
|
title={tooltipText}
|
||||||
|
>
|
||||||
|
{setEnabled.isPending || isLoading ? (
|
||||||
|
<Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
|
||||||
|
) : (
|
||||||
|
<Shuffle
|
||||||
|
className={cn(
|
||||||
|
"h-4 w-4 transition-colors",
|
||||||
|
isEnabled
|
||||||
|
? "text-emerald-500 animate-pulse"
|
||||||
|
: "text-muted-foreground",
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<Switch
|
||||||
|
checked={isEnabled}
|
||||||
|
onCheckedChange={handleToggle}
|
||||||
|
disabled={setEnabled.isPending || isLoading}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -55,39 +55,29 @@ export function ProxyToggle({ className, activeApp }: ProxyToggleProps) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={cn("p-1 rounded-xl transition-all", className)}
|
className={cn(
|
||||||
|
"flex items-center gap-1 px-1.5 h-8 rounded-lg bg-muted/50 transition-all",
|
||||||
|
className,
|
||||||
|
)}
|
||||||
title={tooltipText}
|
title={tooltipText}
|
||||||
>
|
>
|
||||||
<div className="flex items-center gap-2 px-2 h-8 rounded-md cursor-default">
|
{isPending ? (
|
||||||
{isPending ? (
|
<Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
|
||||||
<Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
|
) : (
|
||||||
) : (
|
<Radio
|
||||||
<Radio
|
|
||||||
className={cn(
|
|
||||||
"h-4 w-4 transition-colors",
|
|
||||||
takeoverEnabled
|
|
||||||
? "text-emerald-500 animate-pulse"
|
|
||||||
: "text-muted-foreground",
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<span
|
|
||||||
className={cn(
|
className={cn(
|
||||||
"text-sm font-medium transition-colors select-none",
|
"h-4 w-4 transition-colors",
|
||||||
takeoverEnabled
|
takeoverEnabled
|
||||||
? "text-emerald-600 dark:text-emerald-400"
|
? "text-emerald-500 animate-pulse"
|
||||||
: "text-muted-foreground",
|
: "text-muted-foreground",
|
||||||
)}
|
)}
|
||||||
>
|
|
||||||
Proxy
|
|
||||||
</span>
|
|
||||||
<Switch
|
|
||||||
checked={takeoverEnabled}
|
|
||||||
onCheckedChange={handleToggle}
|
|
||||||
disabled={isPending}
|
|
||||||
className="ml-1"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
)}
|
||||||
|
<Switch
|
||||||
|
checked={takeoverEnabled}
|
||||||
|
onCheckedChange={handleToggle}
|
||||||
|
disabled={isPending}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import {
|
|||||||
Terminal,
|
Terminal,
|
||||||
CheckCircle2,
|
CheckCircle2,
|
||||||
AlertCircle,
|
AlertCircle,
|
||||||
Sparkles,
|
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
@@ -20,6 +19,7 @@ import { useUpdate } from "@/contexts/UpdateContext";
|
|||||||
import { relaunchApp } from "@/lib/updater";
|
import { relaunchApp } from "@/lib/updater";
|
||||||
import { Badge } from "@/components/ui/badge";
|
import { Badge } from "@/components/ui/badge";
|
||||||
import { motion } from "framer-motion";
|
import { motion } from "framer-motion";
|
||||||
|
import appIcon from "@/assets/icons/app-icon.png";
|
||||||
|
|
||||||
interface AboutSectionProps {
|
interface AboutSectionProps {
|
||||||
isPortable: boolean;
|
isPortable: boolean;
|
||||||
@@ -204,7 +204,7 @@ export function AboutSection({ isPortable }: AboutSectionProps) {
|
|||||||
<div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
|
<div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<Sparkles className="h-5 w-5 text-primary" />
|
<img src={appIcon} alt="CC Switch" className="h-5 w-5" />
|
||||||
<h4 className="text-lg font-semibold text-foreground">
|
<h4 className="text-lg font-semibold text-foreground">
|
||||||
CC Switch
|
CC Switch
|
||||||
</h4>
|
</h4>
|
||||||
|
|||||||
@@ -0,0 +1,119 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { toast } from "sonner";
|
||||||
|
import { Switch } from "@/components/ui/switch";
|
||||||
|
import { Label } from "@/components/ui/label";
|
||||||
|
import {
|
||||||
|
Select,
|
||||||
|
SelectContent,
|
||||||
|
SelectItem,
|
||||||
|
SelectTrigger,
|
||||||
|
SelectValue,
|
||||||
|
} from "@/components/ui/select";
|
||||||
|
import { settingsApi, type LogConfig } from "@/lib/api/settings";
|
||||||
|
|
||||||
|
const LOG_LEVELS = ["error", "warn", "info", "debug", "trace"] as const;
|
||||||
|
|
||||||
|
export function LogConfigPanel() {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const [config, setConfig] = useState<LogConfig>({
|
||||||
|
enabled: true,
|
||||||
|
level: "info",
|
||||||
|
});
|
||||||
|
const [isLoading, setIsLoading] = useState(true);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
settingsApi
|
||||||
|
.getLogConfig()
|
||||||
|
.then(setConfig)
|
||||||
|
.catch((e) => console.error("Failed to load log config:", e))
|
||||||
|
.finally(() => setIsLoading(false));
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleChange = async (updates: Partial<LogConfig>) => {
|
||||||
|
const newConfig = { ...config, ...updates };
|
||||||
|
setConfig(newConfig);
|
||||||
|
try {
|
||||||
|
await settingsApi.setLogConfig(newConfig);
|
||||||
|
} catch (e) {
|
||||||
|
console.error("Failed to save log config:", e);
|
||||||
|
toast.error(String(e));
|
||||||
|
setConfig(config);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (isLoading) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-6">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<div className="space-y-0.5">
|
||||||
|
<Label>{t("settings.advanced.logConfig.enabled")}</Label>
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
{t("settings.advanced.logConfig.enabledDescription")}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<Switch
|
||||||
|
checked={config.enabled}
|
||||||
|
onCheckedChange={(checked) => handleChange({ enabled: checked })}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<div className="space-y-0.5">
|
||||||
|
<Label>{t("settings.advanced.logConfig.level")}</Label>
|
||||||
|
<p className="text-xs text-muted-foreground">
|
||||||
|
{t("settings.advanced.logConfig.levelDescription")}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<Select
|
||||||
|
value={config.level}
|
||||||
|
disabled={!config.enabled}
|
||||||
|
onValueChange={(value) =>
|
||||||
|
handleChange({ level: value as LogConfig["level"] })
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<SelectTrigger className="w-[120px]">
|
||||||
|
<SelectValue />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
{LOG_LEVELS.map((level) => (
|
||||||
|
<SelectItem key={level} value={level}>
|
||||||
|
{t(`settings.advanced.logConfig.levels.${level}`)}
|
||||||
|
</SelectItem>
|
||||||
|
))}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 日志级别说明 */}
|
||||||
|
<div className="rounded-lg bg-muted/50 p-4 text-xs space-y-1.5">
|
||||||
|
<p className="font-medium text-muted-foreground mb-2">
|
||||||
|
{t("settings.advanced.logConfig.levelHint")}
|
||||||
|
</p>
|
||||||
|
<div className="grid gap-1 text-muted-foreground">
|
||||||
|
<p>
|
||||||
|
<span className="font-mono text-red-500">error</span> -{" "}
|
||||||
|
{t("settings.advanced.logConfig.levelDesc.error")}
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<span className="font-mono text-orange-500">warn</span> -{" "}
|
||||||
|
{t("settings.advanced.logConfig.levelDesc.warn")}
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<span className="font-mono text-blue-500">info</span> -{" "}
|
||||||
|
{t("settings.advanced.logConfig.levelDesc.info")}
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<span className="font-mono text-green-500">debug</span> -{" "}
|
||||||
|
{t("settings.advanced.logConfig.levelDesc.debug")}
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<span className="font-mono text-gray-500">trace</span> -{" "}
|
||||||
|
{t("settings.advanced.logConfig.levelDesc.trace")}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -11,6 +11,7 @@ import {
|
|||||||
ChevronDown,
|
ChevronDown,
|
||||||
Zap,
|
Zap,
|
||||||
Globe,
|
Globe,
|
||||||
|
ScrollText,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import * as AccordionPrimitive from "@radix-ui/react-accordion";
|
import * as AccordionPrimitive from "@radix-ui/react-accordion";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
@@ -44,6 +45,7 @@ import { AutoFailoverConfigPanel } from "@/components/proxy/AutoFailoverConfigPa
|
|||||||
import { FailoverQueueManager } from "@/components/proxy/FailoverQueueManager";
|
import { FailoverQueueManager } from "@/components/proxy/FailoverQueueManager";
|
||||||
import { UsageDashboard } from "@/components/usage/UsageDashboard";
|
import { UsageDashboard } from "@/components/usage/UsageDashboard";
|
||||||
import { RectifierConfigPanel } from "@/components/settings/RectifierConfigPanel";
|
import { RectifierConfigPanel } from "@/components/settings/RectifierConfigPanel";
|
||||||
|
import { LogConfigPanel } from "@/components/settings/LogConfigPanel";
|
||||||
import { useSettings } from "@/hooks/useSettings";
|
import { useSettings } from "@/hooks/useSettings";
|
||||||
import { useImportExport } from "@/hooks/useImportExport";
|
import { useImportExport } from "@/hooks/useImportExport";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
@@ -574,6 +576,28 @@ export function SettingsPage({
|
|||||||
<RectifierConfigPanel />
|
<RectifierConfigPanel />
|
||||||
</AccordionContent>
|
</AccordionContent>
|
||||||
</AccordionItem>
|
</AccordionItem>
|
||||||
|
|
||||||
|
<AccordionItem
|
||||||
|
value="logConfig"
|
||||||
|
className="rounded-xl glass-card overflow-hidden"
|
||||||
|
>
|
||||||
|
<AccordionTrigger className="px-6 py-4 hover:no-underline hover:bg-muted/50 data-[state=open]:bg-muted/50">
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<ScrollText className="h-5 w-5 text-cyan-500" />
|
||||||
|
<div className="text-left">
|
||||||
|
<h3 className="text-base font-semibold">
|
||||||
|
{t("settings.advanced.logConfig.title")}
|
||||||
|
</h3>
|
||||||
|
<p className="text-sm text-muted-foreground font-normal">
|
||||||
|
{t("settings.advanced.logConfig.description")}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</AccordionTrigger>
|
||||||
|
<AccordionContent className="px-6 pb-6 pt-4 border-t border-border/50">
|
||||||
|
<LogConfigPanel />
|
||||||
|
</AccordionContent>
|
||||||
|
</AccordionItem>
|
||||||
</Accordion>
|
</Accordion>
|
||||||
|
|
||||||
<div className="pt-4">
|
<div className="pt-4">
|
||||||
|
|||||||
@@ -1,11 +1,18 @@
|
|||||||
import { Toaster as SonnerToaster } from "sonner";
|
import { Toaster as SonnerToaster } from "sonner";
|
||||||
|
import { useTheme } from "@/components/theme-provider";
|
||||||
|
|
||||||
export function Toaster() {
|
export function Toaster() {
|
||||||
|
const { theme } = useTheme();
|
||||||
|
|
||||||
|
// 将应用主题映射到 Sonner 的主题
|
||||||
|
// 如果是 "system",Sonner 会自己处理
|
||||||
|
const sonnerTheme = theme === "system" ? "system" : theme;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SonnerToaster
|
<SonnerToaster
|
||||||
position="top-center"
|
position="top-center"
|
||||||
richColors
|
richColors
|
||||||
theme="system"
|
theme={sonnerTheme}
|
||||||
toastOptions={{
|
toastOptions={{
|
||||||
duration: 2000,
|
duration: 2000,
|
||||||
classNames: {
|
classNames: {
|
||||||
|
|||||||
@@ -208,6 +208,29 @@
|
|||||||
"responseGroup": "Response Rectification",
|
"responseGroup": "Response Rectification",
|
||||||
"thinkingSignature": "Thinking Signature Rectification",
|
"thinkingSignature": "Thinking Signature Rectification",
|
||||||
"thinkingSignatureDescription": "Automatically fix Claude API errors caused by thinking signature validation failures"
|
"thinkingSignatureDescription": "Automatically fix Claude API errors caused by thinking signature validation failures"
|
||||||
|
},
|
||||||
|
"logConfig": {
|
||||||
|
"title": "Log Management",
|
||||||
|
"description": "Control log output level",
|
||||||
|
"enabled": "Enable Logging",
|
||||||
|
"enabledDescription": "Master switch, all logging will be disabled when turned off",
|
||||||
|
"level": "Log Level",
|
||||||
|
"levelDescription": "Set the minimum log level to output",
|
||||||
|
"levels": {
|
||||||
|
"error": "Error",
|
||||||
|
"warn": "Warning",
|
||||||
|
"info": "Info",
|
||||||
|
"debug": "Debug",
|
||||||
|
"trace": "Trace"
|
||||||
|
},
|
||||||
|
"levelHint": "Log level descriptions:",
|
||||||
|
"levelDesc": {
|
||||||
|
"error": "Critical errors only",
|
||||||
|
"warn": "Errors + warnings",
|
||||||
|
"info": "General operation info (default)",
|
||||||
|
"debug": "Detailed info including SSE stream and request/response",
|
||||||
|
"trace": "All logs, most verbose"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"language": "Language",
|
"language": "Language",
|
||||||
@@ -427,6 +450,22 @@
|
|||||||
"testFailed": "Speed test failed: {{error}}",
|
"testFailed": "Speed test failed: {{error}}",
|
||||||
"status": "Status: {{code}}"
|
"status": "Status: {{code}}"
|
||||||
},
|
},
|
||||||
|
"providerAdvanced": {
|
||||||
|
"testConfig": "Model Test Config",
|
||||||
|
"useCustomConfig": "Use separate config",
|
||||||
|
"testConfigDesc": "Configure separate model testing parameters for this provider. Uses global settings when disabled.",
|
||||||
|
"testModel": "Test Model",
|
||||||
|
"testModelPlaceholder": "Leave empty to use global config",
|
||||||
|
"timeoutSecs": "Timeout (seconds)",
|
||||||
|
"testPrompt": "Test Prompt",
|
||||||
|
"degradedThreshold": "Degraded Threshold (ms)",
|
||||||
|
"maxRetries": "Max Retries",
|
||||||
|
"proxyConfig": "Proxy Config",
|
||||||
|
"useCustomProxy": "Use separate proxy",
|
||||||
|
"proxyConfigDesc": "Configure separate network proxy for this provider. Uses system proxy or global settings when disabled.",
|
||||||
|
"proxyUsername": "Username (optional)",
|
||||||
|
"proxyPassword": "Password (optional)"
|
||||||
|
},
|
||||||
"codexConfig": {
|
"codexConfig": {
|
||||||
"authJson": "auth.json (JSON) *",
|
"authJson": "auth.json (JSON) *",
|
||||||
"authJsonPlaceholder": "{\n \"OPENAI_API_KEY\": \"sk-your-api-key-here\"\n}",
|
"authJsonPlaceholder": "{\n \"OPENAI_API_KEY\": \"sk-your-api-key-here\"\n}",
|
||||||
@@ -1088,6 +1127,20 @@
|
|||||||
"circuitOpen": "Circuit Open",
|
"circuitOpen": "Circuit Open",
|
||||||
"consecutiveFailures": "{{count}} consecutive failures"
|
"consecutiveFailures": "{{count}} consecutive failures"
|
||||||
},
|
},
|
||||||
|
"failover": {
|
||||||
|
"enabled": "{{app}} failover enabled",
|
||||||
|
"disabled": "{{app}} failover disabled",
|
||||||
|
"toggleFailed": "Operation failed: {{detail}}",
|
||||||
|
"inQueue": "In queue",
|
||||||
|
"addQueue": "Add",
|
||||||
|
"priority": {
|
||||||
|
"tooltip": "Failover priority {{priority}}"
|
||||||
|
},
|
||||||
|
"tooltip": {
|
||||||
|
"enabled": "{{app}} failover enabled\nAutomatically switch to next available provider",
|
||||||
|
"disabled": "Enable {{app}} failover\nAutomatically switch when current provider fails"
|
||||||
|
}
|
||||||
|
},
|
||||||
"proxy": {
|
"proxy": {
|
||||||
"panel": {
|
"panel": {
|
||||||
"serviceAddress": "Service Address",
|
"serviceAddress": "Service Address",
|
||||||
|
|||||||
@@ -208,6 +208,29 @@
|
|||||||
"responseGroup": "レスポンス整流",
|
"responseGroup": "レスポンス整流",
|
||||||
"thinkingSignature": "Thinking 署名整流",
|
"thinkingSignature": "Thinking 署名整流",
|
||||||
"thinkingSignatureDescription": "Claude API の thinking 署名検証エラーを自動修正"
|
"thinkingSignatureDescription": "Claude API の thinking 署名検証エラーを自動修正"
|
||||||
|
},
|
||||||
|
"logConfig": {
|
||||||
|
"title": "ログ管理",
|
||||||
|
"description": "ログ出力レベルを制御",
|
||||||
|
"enabled": "ログを有効化",
|
||||||
|
"enabledDescription": "マスタースイッチ、オフにするとすべてのログが無効になります",
|
||||||
|
"level": "ログレベル",
|
||||||
|
"levelDescription": "出力する最小ログレベルを設定",
|
||||||
|
"levels": {
|
||||||
|
"error": "エラー",
|
||||||
|
"warn": "警告",
|
||||||
|
"info": "情報",
|
||||||
|
"debug": "デバッグ",
|
||||||
|
"trace": "トレース"
|
||||||
|
},
|
||||||
|
"levelHint": "ログレベルの説明:",
|
||||||
|
"levelDesc": {
|
||||||
|
"error": "重大なエラーのみ",
|
||||||
|
"warn": "エラー + 警告",
|
||||||
|
"info": "一般的な操作情報(デフォルト)",
|
||||||
|
"debug": "SSE ストリームとリクエスト/レスポンスを含む詳細情報",
|
||||||
|
"trace": "すべてのログ、最も詳細"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"language": "言語",
|
"language": "言語",
|
||||||
@@ -427,6 +450,22 @@
|
|||||||
"testFailed": "速度テストに失敗しました: {{error}}",
|
"testFailed": "速度テストに失敗しました: {{error}}",
|
||||||
"status": "ステータス: {{code}}"
|
"status": "ステータス: {{code}}"
|
||||||
},
|
},
|
||||||
|
"providerAdvanced": {
|
||||||
|
"testConfig": "モデルテスト設定",
|
||||||
|
"useCustomConfig": "個別設定を使用",
|
||||||
|
"testConfigDesc": "このプロバイダーに個別のモデルテストパラメータを設定します。無効の場合はグローバル設定を使用します。",
|
||||||
|
"testModel": "テストモデル",
|
||||||
|
"testModelPlaceholder": "空白の場合はグローバル設定を使用",
|
||||||
|
"timeoutSecs": "タイムアウト(秒)",
|
||||||
|
"testPrompt": "テストプロンプト",
|
||||||
|
"degradedThreshold": "低下閾値(ミリ秒)",
|
||||||
|
"maxRetries": "最大リトライ回数",
|
||||||
|
"proxyConfig": "プロキシ設定",
|
||||||
|
"useCustomProxy": "個別プロキシを使用",
|
||||||
|
"proxyConfigDesc": "このプロバイダーに個別のネットワークプロキシを設定します。無効の場合はシステムプロキシまたはグローバル設定を使用します。",
|
||||||
|
"proxyUsername": "ユーザー名(任意)",
|
||||||
|
"proxyPassword": "パスワード(任意)"
|
||||||
|
},
|
||||||
"codexConfig": {
|
"codexConfig": {
|
||||||
"authJson": "auth.json (JSON) *",
|
"authJson": "auth.json (JSON) *",
|
||||||
"authJsonPlaceholder": "{\n \"OPENAI_API_KEY\": \"sk-your-api-key-here\"\n}",
|
"authJsonPlaceholder": "{\n \"OPENAI_API_KEY\": \"sk-your-api-key-here\"\n}",
|
||||||
@@ -1088,6 +1127,20 @@
|
|||||||
"circuitOpen": "サーキットオープン",
|
"circuitOpen": "サーキットオープン",
|
||||||
"consecutiveFailures": "{{count}} 回連続失敗"
|
"consecutiveFailures": "{{count}} 回連続失敗"
|
||||||
},
|
},
|
||||||
|
"failover": {
|
||||||
|
"enabled": "{{app}} フェイルオーバーが有効になりました",
|
||||||
|
"disabled": "{{app}} フェイルオーバーが無効になりました",
|
||||||
|
"toggleFailed": "操作に失敗しました: {{detail}}",
|
||||||
|
"inQueue": "キュー内",
|
||||||
|
"addQueue": "追加",
|
||||||
|
"priority": {
|
||||||
|
"tooltip": "フェイルオーバー優先度 {{priority}}"
|
||||||
|
},
|
||||||
|
"tooltip": {
|
||||||
|
"enabled": "{{app}} フェイルオーバーが有効\n次の利用可能なプロバイダーに自動切り替え",
|
||||||
|
"disabled": "{{app}} フェイルオーバーを有効にする\n現在のプロバイダーが失敗した場合に自動切り替え"
|
||||||
|
}
|
||||||
|
},
|
||||||
"proxy": {
|
"proxy": {
|
||||||
"panel": {
|
"panel": {
|
||||||
"serviceAddress": "サービスアドレス",
|
"serviceAddress": "サービスアドレス",
|
||||||
|
|||||||
@@ -208,6 +208,29 @@
|
|||||||
"responseGroup": "响应整流",
|
"responseGroup": "响应整流",
|
||||||
"thinkingSignature": "Thinking 签名整流",
|
"thinkingSignature": "Thinking 签名整流",
|
||||||
"thinkingSignatureDescription": "自动修复 Claude API 中因 thinking 签名校验失败导致的请求错误"
|
"thinkingSignatureDescription": "自动修复 Claude API 中因 thinking 签名校验失败导致的请求错误"
|
||||||
|
},
|
||||||
|
"logConfig": {
|
||||||
|
"title": "日志管理",
|
||||||
|
"description": "控制日志输出级别",
|
||||||
|
"enabled": "启用日志",
|
||||||
|
"enabledDescription": "总开关,关闭后所有日志将被禁用",
|
||||||
|
"level": "日志级别",
|
||||||
|
"levelDescription": "设置输出的最低日志级别",
|
||||||
|
"levels": {
|
||||||
|
"error": "错误",
|
||||||
|
"warn": "警告",
|
||||||
|
"info": "信息",
|
||||||
|
"debug": "调试",
|
||||||
|
"trace": "跟踪"
|
||||||
|
},
|
||||||
|
"levelHint": "日志级别说明:",
|
||||||
|
"levelDesc": {
|
||||||
|
"error": "仅严重错误",
|
||||||
|
"warn": "错误 + 警告信息",
|
||||||
|
"info": "一般操作信息(默认)",
|
||||||
|
"debug": "详细信息,包含 SSE 流和请求/响应详情",
|
||||||
|
"trace": "全部日志,最详细"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"language": "界面语言",
|
"language": "界面语言",
|
||||||
@@ -427,6 +450,22 @@
|
|||||||
"testFailed": "测速失败: {{error}}",
|
"testFailed": "测速失败: {{error}}",
|
||||||
"status": "状态码:{{code}}"
|
"status": "状态码:{{code}}"
|
||||||
},
|
},
|
||||||
|
"providerAdvanced": {
|
||||||
|
"testConfig": "模型测试配置",
|
||||||
|
"useCustomConfig": "使用单独配置",
|
||||||
|
"testConfigDesc": "为此供应商配置单独的模型测试参数,不启用时使用全局配置。",
|
||||||
|
"testModel": "测试模型",
|
||||||
|
"testModelPlaceholder": "留空使用全局配置",
|
||||||
|
"timeoutSecs": "超时时间(秒)",
|
||||||
|
"testPrompt": "测试提示词",
|
||||||
|
"degradedThreshold": "降级阈值(毫秒)",
|
||||||
|
"maxRetries": "最大重试次数",
|
||||||
|
"proxyConfig": "代理配置",
|
||||||
|
"useCustomProxy": "使用单独代理",
|
||||||
|
"proxyConfigDesc": "为此供应商配置单独的网络代理,不启用时使用系统代理或全局设置。",
|
||||||
|
"proxyUsername": "用户名(可选)",
|
||||||
|
"proxyPassword": "密码(可选)"
|
||||||
|
},
|
||||||
"codexConfig": {
|
"codexConfig": {
|
||||||
"authJson": "auth.json (JSON) *",
|
"authJson": "auth.json (JSON) *",
|
||||||
"authJsonPlaceholder": "{\n \"OPENAI_API_KEY\": \"sk-your-api-key-here\"\n}",
|
"authJsonPlaceholder": "{\n \"OPENAI_API_KEY\": \"sk-your-api-key-here\"\n}",
|
||||||
@@ -1088,6 +1127,20 @@
|
|||||||
"circuitOpen": "熔断",
|
"circuitOpen": "熔断",
|
||||||
"consecutiveFailures": "连续失败 {{count}} 次"
|
"consecutiveFailures": "连续失败 {{count}} 次"
|
||||||
},
|
},
|
||||||
|
"failover": {
|
||||||
|
"enabled": "{{app}} 故障转移已启用",
|
||||||
|
"disabled": "{{app}} 故障转移已关闭",
|
||||||
|
"toggleFailed": "操作失败: {{detail}}",
|
||||||
|
"inQueue": "已加入",
|
||||||
|
"addQueue": "加入",
|
||||||
|
"priority": {
|
||||||
|
"tooltip": "故障转移优先级 {{priority}}"
|
||||||
|
},
|
||||||
|
"tooltip": {
|
||||||
|
"enabled": "{{app}} 故障转移已启用\n自动切换到下一个可用供应商",
|
||||||
|
"disabled": "启用 {{app}} 故障转移\n当当前供应商失败时自动切换"
|
||||||
|
}
|
||||||
|
},
|
||||||
"proxy": {
|
"proxy": {
|
||||||
"panel": {
|
"panel": {
|
||||||
"serviceAddress": "服务地址",
|
"serviceAddress": "服务地址",
|
||||||
|
|||||||
@@ -142,9 +142,22 @@ export const settingsApi = {
|
|||||||
async setRectifierConfig(config: RectifierConfig): Promise<boolean> {
|
async setRectifierConfig(config: RectifierConfig): Promise<boolean> {
|
||||||
return await invoke("set_rectifier_config", { config });
|
return await invoke("set_rectifier_config", { config });
|
||||||
},
|
},
|
||||||
|
|
||||||
|
async getLogConfig(): Promise<LogConfig> {
|
||||||
|
return await invoke("get_log_config");
|
||||||
|
},
|
||||||
|
|
||||||
|
async setLogConfig(config: LogConfig): Promise<boolean> {
|
||||||
|
return await invoke("set_log_config", { config });
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
export interface RectifierConfig {
|
export interface RectifierConfig {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
requestThinkingSignature: boolean;
|
requestThinkingSignature: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface LogConfig {
|
||||||
|
enabled: boolean;
|
||||||
|
level: "error" | "warn" | "info" | "debug" | "trace";
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
|
import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
|
||||||
import { failoverApi } from "@/lib/api/failover";
|
import { failoverApi } from "@/lib/api/failover";
|
||||||
|
import { toast } from "sonner";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { extractErrorMessage } from "@/utils/errorUtils";
|
||||||
|
|
||||||
// ========== 熔断器 Hooks ==========
|
// ========== 熔断器 Hooks ==========
|
||||||
|
|
||||||
@@ -197,6 +200,7 @@ export function useAutoFailoverEnabled(appType: string) {
|
|||||||
*/
|
*/
|
||||||
export function useSetAutoFailoverEnabled() {
|
export function useSetAutoFailoverEnabled() {
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
return useMutation({
|
return useMutation({
|
||||||
mutationFn: ({ appType, enabled }: { appType: string; enabled: boolean }) =>
|
mutationFn: ({ appType, enabled }: { appType: string; enabled: boolean }) =>
|
||||||
@@ -217,14 +221,46 @@ export function useSetAutoFailoverEnabled() {
|
|||||||
return { previousValue, appType };
|
return { previousValue, appType };
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onSuccess: (_data, variables) => {
|
||||||
|
const appLabel =
|
||||||
|
variables.appType === "claude"
|
||||||
|
? "Claude"
|
||||||
|
: variables.appType === "codex"
|
||||||
|
? "Codex"
|
||||||
|
: "Gemini";
|
||||||
|
|
||||||
|
toast.success(
|
||||||
|
variables.enabled
|
||||||
|
? t("failover.enabled", {
|
||||||
|
app: appLabel,
|
||||||
|
defaultValue: `${appLabel} 故障转移已启用`,
|
||||||
|
})
|
||||||
|
: t("failover.disabled", {
|
||||||
|
app: appLabel,
|
||||||
|
defaultValue: `${appLabel} 故障转移已关闭`,
|
||||||
|
}),
|
||||||
|
{ closeButton: true },
|
||||||
|
);
|
||||||
|
},
|
||||||
|
|
||||||
// 错误时回滚
|
// 错误时回滚
|
||||||
onError: (_error, _variables, context) => {
|
onError: (error: Error, _variables, context) => {
|
||||||
if (context?.previousValue !== undefined) {
|
if (context?.previousValue !== undefined) {
|
||||||
queryClient.setQueryData(
|
queryClient.setQueryData(
|
||||||
["autoFailoverEnabled", context.appType],
|
["autoFailoverEnabled", context.appType],
|
||||||
context.previousValue,
|
context.previousValue,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const detail =
|
||||||
|
extractErrorMessage(error) ||
|
||||||
|
t("common.unknown", { defaultValue: "未知错误" });
|
||||||
|
toast.error(
|
||||||
|
t("failover.toggleFailed", {
|
||||||
|
detail,
|
||||||
|
defaultValue: `操作失败: ${detail}`,
|
||||||
|
}),
|
||||||
|
);
|
||||||
},
|
},
|
||||||
|
|
||||||
// 无论成功失败,都重新获取
|
// 无论成功失败,都重新获取
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ export const useAddProviderMutation = (appId: AppId) => {
|
|||||||
|
|
||||||
return useMutation({
|
return useMutation({
|
||||||
mutationFn: async (
|
mutationFn: async (
|
||||||
providerInput: Omit<Provider, "id"> & { providerKey?: string }
|
providerInput: Omit<Provider, "id"> & { providerKey?: string },
|
||||||
) => {
|
) => {
|
||||||
let id: string;
|
let id: string;
|
||||||
|
|
||||||
|
|||||||
+36
-1
@@ -87,6 +87,38 @@ export interface UsageResult {
|
|||||||
error?: string;
|
error?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 供应商单独的模型测试配置
|
||||||
|
export interface ProviderTestConfig {
|
||||||
|
// 是否启用单独配置(false 时使用全局配置)
|
||||||
|
enabled: boolean;
|
||||||
|
// 测试用的模型名称(覆盖全局配置)
|
||||||
|
testModel?: string;
|
||||||
|
// 超时时间(秒)
|
||||||
|
timeoutSecs?: number;
|
||||||
|
// 测试提示词
|
||||||
|
testPrompt?: string;
|
||||||
|
// 降级阈值(毫秒)
|
||||||
|
degradedThresholdMs?: number;
|
||||||
|
// 最大重试次数
|
||||||
|
maxRetries?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 供应商单独的代理配置
|
||||||
|
export interface ProviderProxyConfig {
|
||||||
|
// 是否启用单独配置(false 时使用全局/系统代理)
|
||||||
|
enabled: boolean;
|
||||||
|
// 代理类型:http, https, socks5
|
||||||
|
proxyType?: "http" | "https" | "socks5";
|
||||||
|
// 代理主机
|
||||||
|
proxyHost?: string;
|
||||||
|
// 代理端口
|
||||||
|
proxyPort?: number;
|
||||||
|
// 代理用户名(可选)
|
||||||
|
proxyUsername?: string;
|
||||||
|
// 代理密码(可选)
|
||||||
|
proxyPassword?: string;
|
||||||
|
}
|
||||||
|
|
||||||
// 供应商元数据(字段名与后端一致,保持 snake_case)
|
// 供应商元数据(字段名与后端一致,保持 snake_case)
|
||||||
export interface ProviderMeta {
|
export interface ProviderMeta {
|
||||||
// 自定义端点:以 URL 为键,值为端点信息
|
// 自定义端点:以 URL 为键,值为端点信息
|
||||||
@@ -99,6 +131,10 @@ export interface ProviderMeta {
|
|||||||
isPartner?: boolean;
|
isPartner?: boolean;
|
||||||
// 合作伙伴促销 key(用于后端识别 PackyCode 等)
|
// 合作伙伴促销 key(用于后端识别 PackyCode 等)
|
||||||
partnerPromotionKey?: string;
|
partnerPromotionKey?: string;
|
||||||
|
// 供应商单独的模型测试配置
|
||||||
|
testConfig?: ProviderTestConfig;
|
||||||
|
// 供应商单独的代理配置
|
||||||
|
proxyConfig?: ProviderProxyConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 应用设置类型(用于设置对话框与 Tauri API)
|
// 应用设置类型(用于设置对话框与 Tauri API)
|
||||||
@@ -294,4 +330,3 @@ export interface OpenCodeMcpServerSpec {
|
|||||||
// 通用字段
|
// 通用字段
|
||||||
enabled?: boolean;
|
enabled?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user