mirror of
https://github.com/farion1231/cc-switch.git
synced 2026-07-26 14:35:22 +08:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 saladday
|
de5c4996cf |
@@ -407,43 +407,3 @@ pub async fn get_circuit_breaker_stats(
|
||||
let _ = (state, provider_id, app_type);
|
||||
Ok(None)
|
||||
}
|
||||
|
||||
// ==================== URL 预览相关命令 ====================
|
||||
|
||||
use crate::app_config::AppType;
|
||||
use crate::proxy::url_builder::{self, UrlPreview};
|
||||
|
||||
/// 构建 URL 预览
|
||||
///
|
||||
/// 根据 app_type、base_url 和 api_format 计算直连和代理模式的请求地址。
|
||||
/// 这个命令与后端代理的 URL 构建逻辑保持一致。
|
||||
#[tauri::command]
|
||||
pub fn build_url_preview(
|
||||
app_type: String,
|
||||
base_url: String,
|
||||
api_format: Option<String>,
|
||||
) -> Result<UrlPreview, String> {
|
||||
let app = app_type.parse::<AppType>().map_err(|e| e.to_string())?;
|
||||
Ok(url_builder::build_url_preview(
|
||||
&app,
|
||||
&base_url,
|
||||
api_format.as_deref(),
|
||||
))
|
||||
}
|
||||
|
||||
/// 检查是否需要代理
|
||||
///
|
||||
/// 返回需要代理的原因（openai_chat_format, full_url, url_mismatch），
|
||||
/// 或 null 表示不需要代理。
|
||||
#[tauri::command]
|
||||
pub fn check_proxy_requirement(
|
||||
app_type: String,
|
||||
base_url: String,
|
||||
api_format: Option<String>,
|
||||
) -> Result<Option<String>, String> {
|
||||
let app = app_type.parse::<AppType>().map_err(|e| e.to_string())?;
|
||||
Ok(
|
||||
url_builder::check_proxy_requirement(&app, &base_url, api_format.as_deref())
|
||||
.map(|s| s.to_string()),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -971,9 +971,6 @@ pub fn run() {
|
||||
commands::get_circuit_breaker_config,
|
||||
commands::update_circuit_breaker_config,
|
||||
commands::get_circuit_breaker_stats,
|
||||
// URL preview (for endpoint field)
|
||||
commands::build_url_preview,
|
||||
commands::check_proxy_requirement,
|
||||
// Failover queue management
|
||||
commands::get_failover_queue,
|
||||
commands::get_available_providers_for_failover,
|
||||
|
||||
@@ -749,17 +749,15 @@ impl RequestForwarder {
|
||||
// 检查是否需要格式转换
|
||||
let needs_transform = adapter.needs_transform(provider);
|
||||
|
||||
let effective_endpoint = if needs_transform
|
||||
&& adapter.name() == "Claude"
|
||||
&& endpoint.starts_with("/v1/messages")
|
||||
{
|
||||
transform_claude_messages_endpoint(endpoint)
|
||||
} else {
|
||||
endpoint.to_string()
|
||||
};
|
||||
let effective_endpoint =
|
||||
if needs_transform && adapter.name() == "Claude" && endpoint == "/v1/messages" {
|
||||
"/v1/chat/completions"
|
||||
} else {
|
||||
endpoint
|
||||
};
|
||||
|
||||
// 使用适配器构建 URL
|
||||
let url = adapter.build_url(&base_url, &effective_endpoint);
|
||||
let url = adapter.build_url(&base_url, effective_endpoint);
|
||||
|
||||
// 应用模型映射（独立于格式转换）
|
||||
let (mapped_body, _original_model, _mapped_model) =
|
||||
@@ -929,57 +927,3 @@ fn extract_error_message(error: &ProxyError) -> Option<String> {
|
||||
_ => Some(error.to_string()),
|
||||
}
|
||||
}
|
||||
|
||||
fn transform_claude_messages_endpoint(endpoint: &str) -> String {
|
||||
let transformed = endpoint.replacen("/v1/messages", "/v1/chat/completions", 1);
|
||||
|
||||
let Some((path, query)) = transformed.split_once('?') else {
|
||||
return transformed;
|
||||
};
|
||||
|
||||
// 转换到 chat/completions 时，显式移除 beta=true，避免把旧接口参数带到新接口。
|
||||
let filtered_params: Vec<&str> = query
|
||||
.split('&')
|
||||
.filter(|segment| !segment.is_empty())
|
||||
.filter(|segment| !is_beta_true_query_pair(segment))
|
||||
.collect();
|
||||
|
||||
if filtered_params.is_empty() {
|
||||
path.to_string()
|
||||
} else {
|
||||
format!("{path}?{}", filtered_params.join("&"))
|
||||
}
|
||||
}
|
||||
|
||||
fn is_beta_true_query_pair(segment: &str) -> bool {
|
||||
let Some((key, value)) = segment.split_once('=') else {
|
||||
return false;
|
||||
};
|
||||
key.eq_ignore_ascii_case("beta") && value.eq_ignore_ascii_case("true")
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::transform_claude_messages_endpoint;
|
||||
|
||||
#[test]
|
||||
fn transform_claude_messages_endpoint_strips_beta_true_only() {
|
||||
let endpoint = "/v1/messages?beta=true&foo=1";
|
||||
let transformed = transform_claude_messages_endpoint(endpoint);
|
||||
assert_eq!(transformed, "/v1/chat/completions?foo=1");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn transform_claude_messages_endpoint_drops_empty_query_after_strip() {
|
||||
let endpoint = "/v1/messages?beta=true";
|
||||
let transformed = transform_claude_messages_endpoint(endpoint);
|
||||
assert_eq!(transformed, "/v1/chat/completions");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn transform_claude_messages_endpoint_keeps_other_query_values() {
|
||||
let endpoint = "/v1/messages?beta=false&foo=1";
|
||||
let transformed = transform_claude_messages_endpoint(endpoint);
|
||||
assert_eq!(transformed, "/v1/chat/completions?beta=false&foo=1");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,6 +42,22 @@ fn claude_model_extractor(events: &[Value], request_model: &str) -> String {
|
||||
request_model.to_string()
|
||||
}
|
||||
|
||||
/// OpenAI Chat Completions 流式响应模型提取（优先使用 usage.model）
|
||||
fn openai_model_extractor(events: &[Value], request_model: &str) -> String {
|
||||
// 首先尝试从解析的 usage 中获取模型
|
||||
if let Some(usage) = TokenUsage::from_openai_stream_events(events) {
|
||||
if let Some(model) = usage.model {
|
||||
return model;
|
||||
}
|
||||
}
|
||||
// 回退：从事件中直接提取
|
||||
events
|
||||
.iter()
|
||||
.find_map(|e| e.get("model")?.as_str())
|
||||
.unwrap_or(request_model)
|
||||
.to_string()
|
||||
}
|
||||
|
||||
/// Codex 智能流式响应模型提取（自动检测格式）
|
||||
fn codex_auto_model_extractor(events: &[Value], request_model: &str) -> String {
|
||||
// 首先尝试从解析的 usage 中获取模型
|
||||
@@ -91,6 +107,14 @@ pub const CLAUDE_PARSER_CONFIG: UsageParserConfig = UsageParserConfig {
|
||||
app_type_str: "claude",
|
||||
};
|
||||
|
||||
/// OpenAI Chat Completions API 解析配置（用于 Codex /v1/chat/completions）
|
||||
pub const OPENAI_PARSER_CONFIG: UsageParserConfig = UsageParserConfig {
|
||||
stream_parser: TokenUsage::from_openai_stream_events,
|
||||
response_parser: TokenUsage::from_openai_response,
|
||||
model_extractor: openai_model_extractor,
|
||||
app_type_str: "codex",
|
||||
};
|
||||
|
||||
/// Codex 智能解析配置（自动检测 OpenAI 或 Codex 格式）
|
||||
pub const CODEX_PARSER_CONFIG: UsageParserConfig = UsageParserConfig {
|
||||
stream_parser: TokenUsage::from_codex_stream_events_auto,
|
||||
@@ -136,6 +160,15 @@ pub const CLAUDE_HANDLER_CONFIG: HandlerConfig = HandlerConfig {
|
||||
parser_config: &CLAUDE_PARSER_CONFIG,
|
||||
};
|
||||
|
||||
/// Codex Chat Completions Handler 配置
|
||||
#[allow(dead_code)]
|
||||
pub const CODEX_CHAT_HANDLER_CONFIG: HandlerConfig = HandlerConfig {
|
||||
app_type: AppType::Codex,
|
||||
tag: "Codex",
|
||||
app_type_str: "codex",
|
||||
parser_config: &OPENAI_PARSER_CONFIG,
|
||||
};
|
||||
|
||||
/// Codex Responses Handler 配置
|
||||
#[allow(dead_code)]
|
||||
pub const CODEX_RESPONSES_HANDLER_CONFIG: HandlerConfig = HandlerConfig {
|
||||
|
||||
@@ -9,7 +9,9 @@
|
||||
|
||||
use super::{
|
||||
error_mapper::{get_error_message, map_proxy_error_to_status},
|
||||
handler_config::{CLAUDE_PARSER_CONFIG, CODEX_PARSER_CONFIG, GEMINI_PARSER_CONFIG},
|
||||
handler_config::{
|
||||
CLAUDE_PARSER_CONFIG, CODEX_PARSER_CONFIG, GEMINI_PARSER_CONFIG, OPENAI_PARSER_CONFIG,
|
||||
},
|
||||
handler_context::RequestContext,
|
||||
providers::{get_adapter, streaming::create_anthropic_sse_stream, transform},
|
||||
response_processor::{create_logged_passthrough_stream, process_response, SseUsageCollector},
|
||||
@@ -54,7 +56,6 @@ pub async fn get_status(State(state): State<ProxyState>) -> Result<Json<ProxySta
|
||||
/// - 现在 OpenRouter 已推出 Claude Code 兼容接口，默认不再启用该转换（逻辑保留以备回退）
|
||||
pub async fn handle_messages(
|
||||
State(state): State<ProxyState>,
|
||||
uri: axum::http::Uri,
|
||||
headers: axum::http::HeaderMap,
|
||||
Json(body): Json<Value>,
|
||||
) -> Result<axum::response::Response, ProxyError> {
|
||||
@@ -66,18 +67,12 @@ pub async fn handle_messages(
|
||||
.and_then(|s| s.as_bool())
|
||||
.unwrap_or(false);
|
||||
|
||||
// 透传客户端 query 参数（例如 ?beta=true），路径统一为 /v1/messages
|
||||
let endpoint = uri
|
||||
.query()
|
||||
.map(|q| format!("/v1/messages?{q}"))
|
||||
.unwrap_or_else(|| "/v1/messages".to_string());
|
||||
|
||||
// 转发请求
|
||||
let forwarder = ctx.create_forwarder(&state);
|
||||
let result = match forwarder
|
||||
.forward_with_retry(
|
||||
&AppType::Claude,
|
||||
&endpoint,
|
||||
"/v1/messages",
|
||||
body.clone(),
|
||||
headers,
|
||||
ctx.get_providers(),
|
||||
@@ -271,6 +266,47 @@ async fn handle_claude_transform(
|
||||
// Codex API 处理器
|
||||
// ============================================================================
|
||||
|
||||
/// 处理 /v1/chat/completions 请求（OpenAI Chat Completions API - Codex CLI）
|
||||
pub async fn handle_chat_completions(
|
||||
State(state): State<ProxyState>,
|
||||
headers: axum::http::HeaderMap,
|
||||
Json(body): Json<Value>,
|
||||
) -> Result<axum::response::Response, ProxyError> {
|
||||
let mut ctx =
|
||||
RequestContext::new(&state, &body, &headers, AppType::Codex, "Codex", "codex").await?;
|
||||
|
||||
let is_stream = body
|
||||
.get("stream")
|
||||
.and_then(|v| v.as_bool())
|
||||
.unwrap_or(false);
|
||||
|
||||
let forwarder = ctx.create_forwarder(&state);
|
||||
let result = match forwarder
|
||||
.forward_with_retry(
|
||||
&AppType::Codex,
|
||||
"/chat/completions",
|
||||
body,
|
||||
headers,
|
||||
ctx.get_providers(),
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(result) => result,
|
||||
Err(mut err) => {
|
||||
if let Some(provider) = err.provider.take() {
|
||||
ctx.provider = provider;
|
||||
}
|
||||
log_forward_error(&state, &ctx, is_stream, &err.error);
|
||||
return Err(err.error);
|
||||
}
|
||||
};
|
||||
|
||||
ctx.provider = result.provider;
|
||||
let response = result.response;
|
||||
|
||||
process_response(response, &ctx, &state, &OPENAI_PARSER_CONFIG).await
|
||||
}
|
||||
|
||||
/// 处理 /v1/responses 请求（OpenAI Responses API - Codex CLI 透传）
|
||||
pub async fn handle_responses(
|
||||
State(state): State<ProxyState>,
|
||||
|
||||
@@ -24,8 +24,6 @@ pub mod session;
|
||||
pub mod thinking_budget_rectifier;
|
||||
pub mod thinking_rectifier;
|
||||
pub(crate) mod types;
|
||||
pub mod url_builder;
|
||||
pub(crate) mod url_utils;
|
||||
pub mod usage;
|
||||
|
||||
// 公开导出给外部使用（commands, services等模块需要）
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
use super::{AuthInfo, AuthStrategy, ProviderAdapter, ProviderType};
|
||||
use crate::provider::Provider;
|
||||
use crate::proxy::error::ProxyError;
|
||||
use crate::proxy::url_utils::{dedup_v1_v1_boundary_safe, split_url_suffix};
|
||||
use reqwest::RequestBuilder;
|
||||
|
||||
/// Claude 适配器
|
||||
@@ -253,34 +252,16 @@ impl ProviderAdapter for ClaudeAdapter {
|
||||
// 现在 OpenRouter 已推出 Claude Code 兼容接口，因此默认直接透传 endpoint。
|
||||
// 如需回退旧逻辑，可在 forwarder 中根据 needs_transform 改写 endpoint。
|
||||
|
||||
let (base, suffix) = split_url_suffix(base_url);
|
||||
let base_trimmed = base.trim_end_matches('/');
|
||||
let endpoint_trimmed = endpoint.trim_start_matches('/');
|
||||
|
||||
// 检测 base_url 是否已经以 API 路径结尾（用户填写了完整路径）
|
||||
// 支持的 API 路径模式：/v1/messages, /messages, /v1/chat/completions, /chat/completions
|
||||
let api_path_patterns = [
|
||||
"/v1/messages",
|
||||
"/messages",
|
||||
"/v1/chat/completions",
|
||||
"/chat/completions",
|
||||
];
|
||||
|
||||
let base_ends_with_api_path = api_path_patterns
|
||||
.iter()
|
||||
.any(|pattern| base_trimmed.to_lowercase().ends_with(pattern));
|
||||
|
||||
// 如果 base_url 已经以 API 路径结尾，直接使用 base_url，不再追加 endpoint
|
||||
let base = if base_ends_with_api_path {
|
||||
base_trimmed.to_string()
|
||||
} else {
|
||||
format!("{base_trimmed}/{endpoint_trimmed}")
|
||||
};
|
||||
let mut base = format!(
|
||||
"{}/{}",
|
||||
base_url.trim_end_matches('/'),
|
||||
endpoint.trim_start_matches('/')
|
||||
);
|
||||
|
||||
// 去除重复的 /v1/v1（可能由 base_url 与 endpoint 都带版本导致）
|
||||
let base = dedup_v1_v1_boundary_safe(base);
|
||||
|
||||
let url = format!("{base}{suffix}");
|
||||
while base.contains("/v1/v1") {
|
||||
base = base.replace("/v1/v1", "/v1");
|
||||
}
|
||||
|
||||
// 为 Claude 原生 /v1/messages 端点添加 ?beta=true 参数
|
||||
// 这是某些上游服务（如 DuckCoding）验证请求来源的关键参数
|
||||
@@ -290,11 +271,10 @@ impl ProviderAdapter for ClaudeAdapter {
|
||||
if endpoint.contains("/v1/messages")
|
||||
&& !endpoint.contains("/v1/chat/completions")
|
||||
&& !endpoint.contains('?')
|
||||
&& !url.contains('?')
|
||||
{
|
||||
format!("{url}?beta=true")
|
||||
format!("{base}?beta=true")
|
||||
} else {
|
||||
url
|
||||
base
|
||||
}
|
||||
}
|
||||
|
||||
@@ -507,6 +487,7 @@ mod tests {
|
||||
#[test]
|
||||
fn test_build_url_anthropic() {
|
||||
let adapter = ClaudeAdapter::new();
|
||||
// /v1/messages 端点会自动添加 ?beta=true 参数
|
||||
let url = adapter.build_url("https://api.anthropic.com", "/v1/messages");
|
||||
assert_eq!(url, "https://api.anthropic.com/v1/messages?beta=true");
|
||||
}
|
||||
@@ -514,6 +495,7 @@ mod tests {
|
||||
#[test]
|
||||
fn test_build_url_openrouter() {
|
||||
let adapter = ClaudeAdapter::new();
|
||||
// /v1/messages 端点会自动添加 ?beta=true 参数
|
||||
let url = adapter.build_url("https://openrouter.ai/api", "/v1/messages");
|
||||
assert_eq!(url, "https://openrouter.ai/api/v1/messages?beta=true");
|
||||
}
|
||||
@@ -521,7 +503,7 @@ mod tests {
|
||||
#[test]
|
||||
fn test_build_url_no_beta_for_other_endpoints() {
|
||||
let adapter = ClaudeAdapter::new();
|
||||
// 非 /v1/messages 端点保持原样
|
||||
// 非 /v1/messages 端点不添加 ?beta=true
|
||||
let url = adapter.build_url("https://api.anthropic.com", "/v1/complete");
|
||||
assert_eq!(url, "https://api.anthropic.com/v1/complete");
|
||||
}
|
||||
@@ -534,56 +516,6 @@ mod tests {
|
||||
assert_eq!(url, "https://api.anthropic.com/v1/messages?foo=bar");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_url_full_path_messages() {
|
||||
let adapter = ClaudeAdapter::new();
|
||||
// base_url 已包含完整路径 /v1/messages，不再追加
|
||||
let url = adapter.build_url("https://example.com/api/v1/messages", "/v1/messages");
|
||||
assert_eq!(url, "https://example.com/api/v1/messages?beta=true");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_url_full_path_chat_completions() {
|
||||
let adapter = ClaudeAdapter::new();
|
||||
// base_url 已包含完整路径 /v1/chat/completions，不再追加
|
||||
let url = adapter.build_url(
|
||||
"https://opencode.ai/zen/v1/chat/completions",
|
||||
"/v1/chat/completions",
|
||||
);
|
||||
assert_eq!(url, "https://opencode.ai/zen/v1/chat/completions");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_url_full_path_short_suffix() {
|
||||
let adapter = ClaudeAdapter::new();
|
||||
// base_url 以 /messages 结尾（无 /v1 前缀）
|
||||
let url = adapter.build_url("https://example.com/api/messages", "/v1/messages");
|
||||
assert_eq!(url, "https://example.com/api/messages?beta=true");
|
||||
|
||||
// base_url 以 /chat/completions 结尾（无 /v1 前缀）
|
||||
let url2 = adapter.build_url(
|
||||
"https://example.com/api/chat/completions",
|
||||
"/v1/chat/completions",
|
||||
);
|
||||
assert_eq!(url2, "https://example.com/api/chat/completions");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_url_v1_base_dedup() {
|
||||
let adapter = ClaudeAdapter::new();
|
||||
// base_url 以 /v1 结尾，endpoint 也以 /v1 开头，应该去重
|
||||
// 场景：https://integrate.api.nvidia.com/v1 + /v1/chat/completions
|
||||
let url = adapter.build_url(
|
||||
"https://integrate.api.nvidia.com/v1",
|
||||
"/v1/chat/completions",
|
||||
);
|
||||
assert_eq!(url, "https://integrate.api.nvidia.com/v1/chat/completions");
|
||||
|
||||
// 另一个场景：/v1 + /v1/messages
|
||||
let url2 = adapter.build_url("https://api.example.com/v1", "/v1/messages");
|
||||
assert_eq!(url2, "https://api.example.com/v1/messages?beta=true");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_url_no_beta_for_openai_chat_completions() {
|
||||
let adapter = ClaudeAdapter::new();
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
use super::{AuthInfo, AuthStrategy, ProviderAdapter};
|
||||
use crate::provider::Provider;
|
||||
use crate::proxy::error::ProxyError;
|
||||
use crate::proxy::url_utils::{dedup_v1_v1_boundary_safe, split_url_suffix};
|
||||
use regex::Regex;
|
||||
use reqwest::RequestBuilder;
|
||||
use std::sync::LazyLock;
|
||||
@@ -139,23 +138,9 @@ impl ProviderAdapter for CodexAdapter {
|
||||
}
|
||||
|
||||
fn build_url(&self, base_url: &str, endpoint: &str) -> String {
|
||||
let (base, suffix) = split_url_suffix(base_url);
|
||||
let base_trimmed = base.trim_end_matches('/');
|
||||
let base_trimmed = base_url.trim_end_matches('/');
|
||||
let endpoint_trimmed = endpoint.trim_start_matches('/');
|
||||
|
||||
// 检测 base_url 是否已经以 API 路径结尾（用户填写了完整路径）
|
||||
// 仅支持 Responses API 路径模式：/v1/responses, /responses
|
||||
let api_path_patterns = ["/v1/responses", "/responses"];
|
||||
|
||||
let base_ends_with_api_path = api_path_patterns
|
||||
.iter()
|
||||
.any(|pattern| base_trimmed.to_lowercase().ends_with(pattern));
|
||||
|
||||
// 如果 base_url 已经以 API 路径结尾，直接使用 base_url，不再追加 endpoint
|
||||
if base_ends_with_api_path {
|
||||
return format!("{base_trimmed}{suffix}");
|
||||
}
|
||||
|
||||
// OpenAI/Codex 的 base_url 可能是：
|
||||
// - 纯 origin: https://api.openai.com (需要自动补 /v1)
|
||||
// - 已含 /v1: https://api.openai.com/v1 (直接拼接)
|
||||
@@ -182,8 +167,11 @@ impl ProviderAdapter for CodexAdapter {
|
||||
};
|
||||
|
||||
// 去除重复的 /v1/v1（可能由 base_url 与 endpoint 都带版本导致）
|
||||
url = dedup_v1_v1_boundary_safe(url);
|
||||
format!("{url}{suffix}")
|
||||
while url.contains("/v1/v1") {
|
||||
url = url.replace("/v1/v1", "/v1");
|
||||
}
|
||||
|
||||
url
|
||||
}
|
||||
|
||||
fn add_auth_headers(&self, request: RequestBuilder, auth: &AuthInfo) -> RequestBuilder {
|
||||
@@ -280,31 +268,6 @@ mod tests {
|
||||
assert_eq!(url, "https://www.packyapi.com/v1/responses");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_url_full_path_responses() {
|
||||
let adapter = CodexAdapter::new();
|
||||
// base_url 已包含完整路径 /v1/responses，不再追加
|
||||
let url = adapter.build_url("https://example.com/v1/responses", "/responses");
|
||||
assert_eq!(url, "https://example.com/v1/responses");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_url_full_path_short_suffix() {
|
||||
let adapter = CodexAdapter::new();
|
||||
// base_url 以 /responses 结尾（无 /v1 前缀）
|
||||
let url = adapter.build_url("https://example.com/api/responses", "/responses");
|
||||
assert_eq!(url, "https://example.com/api/responses");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_url_v1_base_dedup() {
|
||||
let adapter = CodexAdapter::new();
|
||||
// base_url 以 /v1 结尾，endpoint 也以 /v1 开头，应该去重
|
||||
// 场景：https://integrate.api.nvidia.com/v1 + /v1/responses
|
||||
let url = adapter.build_url("https://integrate.api.nvidia.com/v1", "/v1/responses");
|
||||
assert_eq!(url, "https://integrate.api.nvidia.com/v1/responses");
|
||||
}
|
||||
|
||||
// 官方客户端检测测试
|
||||
#[test]
|
||||
fn test_is_official_client_vscode() {
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
use super::{AuthInfo, AuthStrategy, ProviderAdapter, ProviderType};
|
||||
use crate::provider::Provider;
|
||||
use crate::proxy::error::ProxyError;
|
||||
use crate::proxy::url_utils::split_url_suffix;
|
||||
use reqwest::RequestBuilder;
|
||||
|
||||
/// Gemini 适配器
|
||||
@@ -201,8 +200,7 @@ impl ProviderAdapter for GeminiAdapter {
|
||||
}
|
||||
|
||||
fn build_url(&self, base_url: &str, endpoint: &str) -> String {
|
||||
let (base, suffix) = split_url_suffix(base_url);
|
||||
let base_trimmed = base.trim_end_matches('/');
|
||||
let base_trimmed = base_url.trim_end_matches('/');
|
||||
let endpoint_trimmed = endpoint.trim_start_matches('/');
|
||||
|
||||
let mut url = format!("{base_trimmed}/{endpoint_trimmed}");
|
||||
@@ -216,7 +214,7 @@ impl ProviderAdapter for GeminiAdapter {
|
||||
}
|
||||
}
|
||||
|
||||
format!("{url}{suffix}")
|
||||
url
|
||||
}
|
||||
|
||||
fn add_auth_headers(&self, request: RequestBuilder, auth: &AuthInfo) -> RequestBuilder {
|
||||
|
||||
@@ -218,6 +218,20 @@ impl ProxyServer {
|
||||
// Claude API (支持带前缀和不带前缀两种格式)
|
||||
.route("/v1/messages", post(handlers::handle_messages))
|
||||
.route("/claude/v1/messages", post(handlers::handle_messages))
|
||||
// OpenAI Chat Completions API (Codex CLI，支持带前缀和不带前缀)
|
||||
.route("/chat/completions", post(handlers::handle_chat_completions))
|
||||
.route(
|
||||
"/v1/chat/completions",
|
||||
post(handlers::handle_chat_completions),
|
||||
)
|
||||
.route(
|
||||
"/v1/v1/chat/completions",
|
||||
post(handlers::handle_chat_completions),
|
||||
)
|
||||
.route(
|
||||
"/codex/v1/chat/completions",
|
||||
post(handlers::handle_chat_completions),
|
||||
)
|
||||
// OpenAI Responses API (Codex CLI，支持带前缀和不带前缀)
|
||||
.route("/responses", post(handlers::handle_responses))
|
||||
.route("/v1/responses", post(handlers::handle_responses))
|
||||
|
||||
@@ -1,437 +0,0 @@
|
||||
//! URL 构建工具模块
|
||||
//!
|
||||
//! 提供统一的 URL 构建逻辑，供前端预览和后端代理使用。
|
||||
|
||||
use crate::app_config::AppType;
|
||||
use crate::proxy::providers::{ClaudeAdapter, CodexAdapter, ProviderAdapter};
|
||||
use crate::proxy::url_utils::{dedup_v1_v1_boundary_safe, split_url_suffix};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
/// URL 预览结果
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct UrlPreview {
|
||||
/// 直连模式请求地址
|
||||
pub direct_url: String,
|
||||
/// 代理模式请求地址
|
||||
pub proxy_url: String,
|
||||
/// 是否为全链接（base_url 已包含 API 路径）
|
||||
pub is_full_url: bool,
|
||||
}
|
||||
|
||||
/// API 路径模式
|
||||
struct ApiPathPatterns {
|
||||
/// 直连模式默认端点
|
||||
direct_endpoint: &'static str,
|
||||
/// 代理模式端点（根据 api_format 可能不同）
|
||||
proxy_endpoint: &'static str,
|
||||
/// 识别为全链接的路径后缀
|
||||
full_url_patterns: &'static [&'static str],
|
||||
}
|
||||
|
||||
impl ApiPathPatterns {
|
||||
fn for_claude(api_format: Option<&str>) -> Self {
|
||||
// 根据 API 格式决定端点和全链接检测模式
|
||||
if api_format == Some("openai_chat") {
|
||||
Self {
|
||||
direct_endpoint: "/v1/messages",
|
||||
proxy_endpoint: "/v1/chat/completions",
|
||||
// 与运行时 ClaudeAdapter 保持一致：同时识别 messages/chat 两类完整路径
|
||||
full_url_patterns: &[
|
||||
"/v1/messages",
|
||||
"/messages",
|
||||
"/v1/chat/completions",
|
||||
"/chat/completions",
|
||||
],
|
||||
}
|
||||
} else {
|
||||
Self {
|
||||
direct_endpoint: "/v1/messages",
|
||||
proxy_endpoint: "/v1/messages",
|
||||
// 与运行时 ClaudeAdapter 保持一致：同时识别 messages/chat 两类完整路径
|
||||
full_url_patterns: &[
|
||||
"/v1/messages",
|
||||
"/messages",
|
||||
"/v1/chat/completions",
|
||||
"/chat/completions",
|
||||
],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn for_codex(api_format: Option<&str>) -> Self {
|
||||
let _ = api_format;
|
||||
Self {
|
||||
direct_endpoint: "/responses",
|
||||
proxy_endpoint: "/responses",
|
||||
full_url_patterns: &["/v1/responses", "/responses"],
|
||||
}
|
||||
}
|
||||
|
||||
fn for_gemini() -> Self {
|
||||
Self {
|
||||
direct_endpoint: "/v1beta/models",
|
||||
proxy_endpoint: "/v1beta/models",
|
||||
full_url_patterns: &["/v1beta/models"],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 检测 URL 是否以指定的 API 路径结尾
|
||||
fn url_ends_with_api_path(url: &str, patterns: &[&str]) -> bool {
|
||||
let (base, _) = split_url_suffix(url);
|
||||
let path_part = base.trim_end_matches('/').to_lowercase();
|
||||
patterns
|
||||
.iter()
|
||||
.any(|pattern| path_part.ends_with(&pattern.to_lowercase()))
|
||||
}
|
||||
|
||||
/// 硬拼接 URL（用于直连地址）
|
||||
///
|
||||
/// 始终将 endpoint 拼接到 base_url 后面，不做任何智能检测或去重。
|
||||
fn build_direct_url(base_url: &str, endpoint: &str) -> String {
|
||||
let (base, suffix) = split_url_suffix(base_url);
|
||||
let base_trimmed = base.trim_end_matches('/');
|
||||
let endpoint_trimmed = endpoint.trim_start_matches('/');
|
||||
|
||||
// 直接拼接，不做任何去重
|
||||
format!("{base_trimmed}/{endpoint_trimmed}{suffix}")
|
||||
}
|
||||
|
||||
/// 智能构建 URL（用于代理地址）
|
||||
///
|
||||
/// 如果 base_url 已经以 API 路径结尾，直接返回；否则追加 endpoint。
|
||||
pub fn build_smart_url(base_url: &str, endpoint: &str, full_url_patterns: &[&str]) -> String {
|
||||
let (base, suffix) = split_url_suffix(base_url);
|
||||
let base_trimmed = base.trim_end_matches('/');
|
||||
let endpoint_trimmed = endpoint.trim_start_matches('/');
|
||||
|
||||
// 检测 base_url 是否已经以 API 路径结尾
|
||||
if url_ends_with_api_path(base_trimmed, full_url_patterns) {
|
||||
return format!("{base_trimmed}{suffix}");
|
||||
}
|
||||
|
||||
// 拼接 URL
|
||||
let url = format!("{base_trimmed}/{endpoint_trimmed}");
|
||||
let url = dedup_v1_v1_boundary_safe(url);
|
||||
format!("{url}{suffix}")
|
||||
}
|
||||
|
||||
fn build_runtime_like_url(
|
||||
app_type: &AppType,
|
||||
base_url: &str,
|
||||
endpoint: &str,
|
||||
is_proxy: bool,
|
||||
) -> String {
|
||||
match app_type {
|
||||
// Claude 代理预览需要展示与运行时一致的 URL 归一化结果
|
||||
AppType::Claude if is_proxy => ClaudeAdapter::new().build_url(base_url, endpoint),
|
||||
// Codex/OpenCode 预览复用运行时 /v1 归一化规则
|
||||
AppType::Codex | AppType::OpenCode | AppType::OpenClaw => {
|
||||
CodexAdapter::new().build_url(base_url, endpoint)
|
||||
}
|
||||
_ => build_direct_url(base_url, endpoint),
|
||||
}
|
||||
}
|
||||
|
||||
/// 构建 URL 预览
|
||||
///
|
||||
/// 根据 app_type、base_url 和 api_format 计算直连和代理模式的请求地址。
|
||||
/// - 直连地址：始终硬拼接默认后缀
|
||||
/// - 代理地址：智能检测，如果已包含 API 路径则不重复拼接
|
||||
pub fn build_url_preview(
|
||||
app_type: &AppType,
|
||||
base_url: &str,
|
||||
api_format: Option<&str>,
|
||||
) -> UrlPreview {
|
||||
let patterns = match app_type {
|
||||
AppType::Claude => ApiPathPatterns::for_claude(api_format),
|
||||
AppType::Codex => ApiPathPatterns::for_codex(api_format),
|
||||
AppType::Gemini => ApiPathPatterns::for_gemini(),
|
||||
AppType::OpenCode => ApiPathPatterns::for_codex(api_format), // OpenCode 使用 Codex 逻辑
|
||||
AppType::OpenClaw => ApiPathPatterns::for_codex(api_format), // OpenClaw 使用 Codex 逻辑
|
||||
};
|
||||
|
||||
let is_full_url = url_ends_with_api_path(base_url, patterns.full_url_patterns);
|
||||
|
||||
// 直连地址：默认硬拼接；Codex/OpenCode 复用运行时规则（含 origin-only /v1 归一化）
|
||||
let direct_url = build_runtime_like_url(app_type, base_url, patterns.direct_endpoint, false);
|
||||
// 代理地址：Claude/Codex/OpenCode 复用运行时规则；Gemini 继续使用通用智能拼接
|
||||
let proxy_url = match app_type {
|
||||
AppType::Claude | AppType::Codex | AppType::OpenCode | AppType::OpenClaw => {
|
||||
build_runtime_like_url(app_type, base_url, patterns.proxy_endpoint, true)
|
||||
}
|
||||
_ => build_smart_url(
|
||||
base_url,
|
||||
patterns.proxy_endpoint,
|
||||
patterns.full_url_patterns,
|
||||
),
|
||||
};
|
||||
|
||||
UrlPreview {
|
||||
direct_url,
|
||||
proxy_url,
|
||||
is_full_url,
|
||||
}
|
||||
}
|
||||
|
||||
/// 检查是否需要代理
|
||||
///
|
||||
/// 返回需要代理的原因，None 表示不需要代理
|
||||
pub fn check_proxy_requirement(
|
||||
app_type: &AppType,
|
||||
base_url: &str,
|
||||
api_format: Option<&str>,
|
||||
) -> Option<&'static str> {
|
||||
// Claude OpenAI Chat 格式必须开启代理（需要格式转换）
|
||||
if matches!(app_type, AppType::Claude) && api_format == Some("openai_chat") {
|
||||
return Some("openai_chat_format");
|
||||
}
|
||||
|
||||
// base_url 缺失时无法做 full_url / url_mismatch 判断，避免误判
|
||||
if base_url.trim().is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
let preview = build_url_preview(app_type, base_url, api_format);
|
||||
|
||||
// 如果是全链接且以直连后缀结尾，需要代理
|
||||
if preview.is_full_url {
|
||||
// 检查是否以直连后缀结尾
|
||||
let direct_suffixes: &[&str] = match app_type {
|
||||
AppType::Claude => &[
|
||||
"/v1/messages",
|
||||
"/messages",
|
||||
"/v1/chat/completions",
|
||||
"/chat/completions",
|
||||
],
|
||||
AppType::Codex | AppType::OpenCode | AppType::OpenClaw => &["/v1/responses", "/responses"],
|
||||
_ => return None,
|
||||
};
|
||||
|
||||
if url_ends_with_api_path(base_url, direct_suffixes) {
|
||||
return Some("full_url");
|
||||
}
|
||||
}
|
||||
|
||||
// 如果直连地址和代理地址路径不同，需要代理（忽略查询参数差异）
|
||||
let (direct_base, _) = split_url_suffix(&preview.direct_url);
|
||||
let (proxy_base, _) = split_url_suffix(&preview.proxy_url);
|
||||
if direct_base != proxy_base {
|
||||
return Some("url_mismatch");
|
||||
}
|
||||
|
||||
None
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_build_url_preview_claude_anthropic() {
|
||||
let preview = build_url_preview(
|
||||
&AppType::Claude,
|
||||
"https://api.example.com",
|
||||
Some("anthropic"),
|
||||
);
|
||||
assert_eq!(preview.direct_url, "https://api.example.com/v1/messages");
|
||||
assert_eq!(preview.proxy_url, "https://api.example.com/v1/messages");
|
||||
assert!(!preview.is_full_url);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_url_preview_claude_openai_chat() {
|
||||
let preview = build_url_preview(
|
||||
&AppType::Claude,
|
||||
"https://api.example.com",
|
||||
Some("openai_chat"),
|
||||
);
|
||||
assert_eq!(preview.direct_url, "https://api.example.com/v1/messages");
|
||||
assert_eq!(
|
||||
preview.proxy_url,
|
||||
"https://api.example.com/v1/chat/completions"
|
||||
);
|
||||
assert!(!preview.is_full_url);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_url_preview_claude_full_url() {
|
||||
// 全链接时：直连会硬拼接后缀，代理保持原地址
|
||||
let preview = build_url_preview(
|
||||
&AppType::Claude,
|
||||
"https://api.example.com/v1/messages",
|
||||
Some("anthropic"),
|
||||
);
|
||||
assert_eq!(
|
||||
preview.direct_url,
|
||||
"https://api.example.com/v1/messages/v1/messages"
|
||||
);
|
||||
assert_eq!(preview.proxy_url, "https://api.example.com/v1/messages");
|
||||
assert!(preview.is_full_url);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_url_preview_codex_responses() {
|
||||
let preview = build_url_preview(
|
||||
&AppType::Codex,
|
||||
"https://api.openai.com/v1",
|
||||
Some("responses"),
|
||||
);
|
||||
assert_eq!(preview.direct_url, "https://api.openai.com/v1/responses");
|
||||
assert_eq!(preview.proxy_url, "https://api.openai.com/v1/responses");
|
||||
assert!(!preview.is_full_url);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_url_preview_codex_origin_normalizes_v1() {
|
||||
let preview =
|
||||
build_url_preview(&AppType::Codex, "https://api.openai.com", Some("responses"));
|
||||
assert_eq!(preview.direct_url, "https://api.openai.com/v1/responses");
|
||||
assert_eq!(preview.proxy_url, "https://api.openai.com/v1/responses");
|
||||
assert!(!preview.is_full_url);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_url_preview_codex_full_url() {
|
||||
// 全链接时：直连/代理均保持原地址（运行时适配器规则）
|
||||
let preview = build_url_preview(
|
||||
&AppType::Codex,
|
||||
"https://api.example.com/v1/responses",
|
||||
Some("responses"),
|
||||
);
|
||||
assert_eq!(preview.direct_url, "https://api.example.com/v1/responses");
|
||||
assert_eq!(preview.proxy_url, "https://api.example.com/v1/responses");
|
||||
assert!(preview.is_full_url);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_check_proxy_requirement_claude_openai_chat() {
|
||||
let result = check_proxy_requirement(
|
||||
&AppType::Claude,
|
||||
"https://api.example.com",
|
||||
Some("openai_chat"),
|
||||
);
|
||||
assert_eq!(result, Some("openai_chat_format"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_check_proxy_requirement_claude_full_url() {
|
||||
let result = check_proxy_requirement(
|
||||
&AppType::Claude,
|
||||
"https://api.example.com/v1/messages",
|
||||
Some("anthropic"),
|
||||
);
|
||||
assert_eq!(result, Some("full_url"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_check_proxy_requirement_codex_full_url() {
|
||||
let result = check_proxy_requirement(
|
||||
&AppType::Codex,
|
||||
"https://api.example.com/v1/responses",
|
||||
Some("responses"),
|
||||
);
|
||||
assert_eq!(result, Some("full_url"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_check_proxy_requirement_codex_origin_none() {
|
||||
let result =
|
||||
check_proxy_requirement(&AppType::Codex, "https://api.openai.com", Some("responses"));
|
||||
assert_eq!(result, None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_check_proxy_requirement_none() {
|
||||
let result = check_proxy_requirement(
|
||||
&AppType::Claude,
|
||||
"https://api.example.com",
|
||||
Some("anthropic"),
|
||||
);
|
||||
assert_eq!(result, None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_v1_dedup() {
|
||||
// 代理地址使用 build_smart_url，会去重 /v1/v1
|
||||
let url = build_smart_url("https://api.example.com/v1", "/v1/messages", &[]);
|
||||
assert_eq!(url, "https://api.example.com/v1/messages");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_direct_url_no_dedup() {
|
||||
// 直连地址硬拼接，不做任何去重
|
||||
let preview = build_url_preview(
|
||||
&AppType::Claude,
|
||||
"https://api.example.com/v1",
|
||||
Some("anthropic"),
|
||||
);
|
||||
assert_eq!(preview.direct_url, "https://api.example.com/v1/v1/messages");
|
||||
// 代理地址按运行时规则构建，会进行路径去重
|
||||
assert_eq!(preview.proxy_url, "https://api.example.com/v1/messages");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_query_suffix_preserved_in_preview() {
|
||||
let preview = build_url_preview(
|
||||
&AppType::Claude,
|
||||
"https://api.example.com?beta=true",
|
||||
Some("anthropic"),
|
||||
);
|
||||
assert_eq!(
|
||||
preview.direct_url,
|
||||
"https://api.example.com/v1/messages?beta=true"
|
||||
);
|
||||
assert_eq!(
|
||||
preview.proxy_url,
|
||||
"https://api.example.com/v1/messages?beta=true"
|
||||
);
|
||||
assert!(!preview.is_full_url);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_fragment_suffix_preserved_and_full_url_detected() {
|
||||
let preview = build_url_preview(
|
||||
&AppType::Claude,
|
||||
"https://api.example.com/v1/messages#frag",
|
||||
Some("anthropic"),
|
||||
);
|
||||
assert_eq!(
|
||||
preview.proxy_url,
|
||||
"https://api.example.com/v1/messages#frag"
|
||||
);
|
||||
assert!(preview.is_full_url);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_claude_full_url_detection_is_api_format_agnostic() {
|
||||
// 与运行时 ClaudeAdapter 一致：/messages 与 /chat/completions 都视为全链接
|
||||
let preview = build_url_preview(
|
||||
&AppType::Claude,
|
||||
"https://api.example.com/v1/messages",
|
||||
Some("anthropic"),
|
||||
);
|
||||
assert!(preview.is_full_url);
|
||||
|
||||
let preview = build_url_preview(
|
||||
&AppType::Claude,
|
||||
"https://api.example.com/v1/chat/completions",
|
||||
Some("anthropic"),
|
||||
);
|
||||
assert!(preview.is_full_url);
|
||||
|
||||
let preview = build_url_preview(
|
||||
&AppType::Claude,
|
||||
"https://api.example.com/v1/chat/completions",
|
||||
Some("openai_chat"),
|
||||
);
|
||||
assert!(preview.is_full_url);
|
||||
|
||||
let preview = build_url_preview(
|
||||
&AppType::Claude,
|
||||
"https://api.example.com/v1/messages",
|
||||
Some("openai_chat"),
|
||||
);
|
||||
assert!(preview.is_full_url);
|
||||
}
|
||||
}
|
||||
@@ -1,96 +0,0 @@
|
||||
//! URL utilities shared across proxy modules.
|
||||
//!
|
||||
//! This module intentionally avoids full URL parsing to keep behavior aligned with
|
||||
//! existing "stringly-typed" base_url configurations while fixing common edge cases
|
||||
//! (query/fragment handling and safe path de-duplication).
|
||||
|
||||
/// Split a URL-like string into `(base, suffix)` where suffix starts with `?` or `#`.
|
||||
///
|
||||
/// Example:
|
||||
/// - `https://x/v1?token=1` => (`https://x/v1`, `?token=1`)
|
||||
/// - `https://x/v1#frag` => (`https://x/v1`, `#frag`)
|
||||
pub(crate) fn split_url_suffix(input: &str) -> (&str, &str) {
|
||||
match input.find(['?', '#']) {
|
||||
Some(idx) => (&input[..idx], &input[idx..]),
|
||||
None => (input, ""),
|
||||
}
|
||||
}
|
||||
|
||||
/// De-duplicate repeated `/v1/v1` only when it occurs on a segment boundary.
|
||||
///
|
||||
/// This avoids corrupting valid paths such as `/v1/v1beta/...`.
|
||||
pub(crate) fn dedup_v1_v1_boundary_safe(mut url: String) -> String {
|
||||
const NEEDLE: &str = "/v1/v1";
|
||||
let mut search_start = 0usize;
|
||||
|
||||
loop {
|
||||
let Some(rel_pos) = url[search_start..].find(NEEDLE) else {
|
||||
break;
|
||||
};
|
||||
let pos = search_start + rel_pos;
|
||||
let after = pos + NEEDLE.len();
|
||||
|
||||
let boundary_ok = after == url.len()
|
||||
|| matches!(
|
||||
url.as_bytes().get(after),
|
||||
Some(b'/') | Some(b'?') | Some(b'#')
|
||||
);
|
||||
|
||||
if boundary_ok {
|
||||
url.replace_range(pos..after, "/v1");
|
||||
// Continue searching from the same position in case we created a new boundary match.
|
||||
search_start = pos;
|
||||
} else {
|
||||
// Skip forward to find later occurrences that might be valid boundary matches.
|
||||
search_start = pos + 1;
|
||||
}
|
||||
}
|
||||
|
||||
url
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn split_url_suffix_handles_query() {
|
||||
let (base, suffix) = split_url_suffix("https://example.com/v1?token=1");
|
||||
assert_eq!(base, "https://example.com/v1");
|
||||
assert_eq!(suffix, "?token=1");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn split_url_suffix_handles_fragment() {
|
||||
let (base, suffix) = split_url_suffix("https://example.com/v1#frag");
|
||||
assert_eq!(base, "https://example.com/v1");
|
||||
assert_eq!(suffix, "#frag");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn dedup_v1_v1_only_on_boundary() {
|
||||
let url = "https://example.com/v1/v1/messages".to_string();
|
||||
assert_eq!(
|
||||
dedup_v1_v1_boundary_safe(url),
|
||||
"https://example.com/v1/messages"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn dedup_v1_v1_does_not_corrupt_v1beta() {
|
||||
let url = "https://example.com/v1/v1beta/models".to_string();
|
||||
assert_eq!(
|
||||
dedup_v1_v1_boundary_safe(url.clone()),
|
||||
"https://example.com/v1/v1beta/models"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn dedup_v1_v1_skips_v1beta_but_dedups_later_occurrence() {
|
||||
let url = "https://example.com/v1/v1beta/v1/v1/messages".to_string();
|
||||
assert_eq!(
|
||||
dedup_v1_v1_boundary_safe(url),
|
||||
"https://example.com/v1/v1beta/v1/messages"
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -830,7 +830,7 @@ impl ProxyService {
|
||||
///
|
||||
/// 代理服务器的路由已经根据 API 端点自动区分应用类型：
|
||||
/// - `/v1/messages` → Claude
|
||||
/// - `/v1/responses` → Codex
|
||||
/// - `/v1/chat/completions`, `/v1/responses` → Codex
|
||||
/// - `/v1beta/*` → Gemini
|
||||
///
|
||||
/// 因此不需要在 URL 中添加应用前缀。
|
||||
|
||||
@@ -293,11 +293,11 @@ impl StreamCheckService {
|
||||
timeout: std::time::Duration,
|
||||
) -> Result<(u16, String), AppError> {
|
||||
let base = base_url.trim_end_matches('/');
|
||||
// 健康检查不强制附加查询参数，保持与默认 Claude 路径一致
|
||||
// URL 必须包含 ?beta=true 参数（某些中转服务依赖此参数验证请求来源）
|
||||
let url = if base.ends_with("/v1") {
|
||||
format!("{base}/messages")
|
||||
format!("{base}/messages?beta=true")
|
||||
} else {
|
||||
format!("{base}/v1/messages")
|
||||
format!("{base}/v1/messages?beta=true")
|
||||
};
|
||||
|
||||
let body = json!({
|
||||
|
||||
+2
-8
@@ -229,10 +229,7 @@ function App() {
|
||||
deleteProvider,
|
||||
saveUsageScript,
|
||||
setAsDefaultModel,
|
||||
} = useProviderActions(activeApp, {
|
||||
isProxyRunning,
|
||||
isTakeoverActive: isCurrentAppTakeoverActive,
|
||||
});
|
||||
} = useProviderActions(activeApp);
|
||||
|
||||
const disableOmoMutation = useDisableCurrentOmo();
|
||||
const handleDisableOmo = () => {
|
||||
@@ -1025,10 +1022,7 @@ function App() {
|
||||
<>
|
||||
{activeApp !== "opencode" && activeApp !== "openclaw" && (
|
||||
<>
|
||||
<ProxyToggle
|
||||
activeApp={activeApp}
|
||||
currentProvider={providers[currentProviderId] || null}
|
||||
/>
|
||||
<ProxyToggle activeApp={activeApp} />
|
||||
<div
|
||||
className={cn(
|
||||
"transition-all duration-300 ease-in-out overflow-hidden",
|
||||
|
||||
@@ -169,8 +169,6 @@ export function ClaudeFormFields({
|
||||
: t("providerForm.apiHint")
|
||||
}
|
||||
onManageClick={() => onEndpointModalToggle(true)}
|
||||
appType="claude"
|
||||
apiFormat={apiFormat}
|
||||
/>
|
||||
)}
|
||||
|
||||
|
||||
@@ -94,8 +94,6 @@ export function CodexFormFields({
|
||||
placeholder={t("providerForm.codexApiEndpointPlaceholder")}
|
||||
hint={t("providerForm.codexApiHint")}
|
||||
onManageClick={() => onEndpointModalToggle(true)}
|
||||
appType="codex"
|
||||
apiFormat="responses"
|
||||
/>
|
||||
)}
|
||||
|
||||
|
||||
@@ -43,10 +43,7 @@ import {
|
||||
import { OpenCodeFormFields } from "./OpenCodeFormFields";
|
||||
import { OpenClawFormFields } from "./OpenClawFormFields";
|
||||
import type { UniversalProviderPreset } from "@/config/universalProviderPresets";
|
||||
import {
|
||||
applyTemplateValues,
|
||||
setCodexWireApi,
|
||||
} from "@/utils/providerConfigUtils";
|
||||
import { applyTemplateValues } from "@/utils/providerConfigUtils";
|
||||
import { mergeProviderMeta } from "@/utils/providerMetaUtils";
|
||||
import { getCodexCustomTemplate } from "@/config/codexTemplates";
|
||||
import CodexConfigEditor from "./CodexConfigEditor";
|
||||
@@ -408,13 +405,14 @@ export function ProviderForm({
|
||||
onConfigChange: (config) => form.setValue("settingsConfig", config),
|
||||
});
|
||||
|
||||
const [localClaudeApiFormat, setLocalClaudeApiFormat] =
|
||||
useState<ClaudeApiFormat>(() => {
|
||||
if (appId !== "claude") return "anthropic";
|
||||
return initialData?.meta?.apiFormat === "openai_chat"
|
||||
? "openai_chat"
|
||||
: "anthropic";
|
||||
});
|
||||
const [localApiFormat, setLocalApiFormat] = useState<ClaudeApiFormat>(() => {
|
||||
if (appId !== "claude") return "anthropic";
|
||||
return initialData?.meta?.apiFormat ?? "anthropic";
|
||||
});
|
||||
|
||||
const handleApiFormatChange = useCallback((format: ClaudeApiFormat) => {
|
||||
setLocalApiFormat(format);
|
||||
}, []);
|
||||
|
||||
const {
|
||||
codexAuth,
|
||||
@@ -442,10 +440,6 @@ export function ProviderForm({
|
||||
[originalHandleCodexConfigChange, debouncedValidate],
|
||||
);
|
||||
|
||||
const handleClaudeApiFormatChange = useCallback((format: ClaudeApiFormat) => {
|
||||
setLocalClaudeApiFormat(format);
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (appId === "codex" && !initialData && selectedPresetId === "custom") {
|
||||
const template = getCodexCustomTemplate();
|
||||
@@ -1367,7 +1361,7 @@ export function ProviderForm({
|
||||
const authJson = JSON.parse(codexAuth);
|
||||
const configObj = {
|
||||
auth: authJson,
|
||||
config: setCodexWireApi(codexConfig ?? "", "responses"),
|
||||
config: codexConfig ?? "",
|
||||
};
|
||||
settingsConfig = JSON.stringify(configObj);
|
||||
} catch (err) {
|
||||
@@ -1502,11 +1496,6 @@ export function ProviderForm({
|
||||
}
|
||||
}
|
||||
|
||||
const providerApiFormat =
|
||||
appId === "claude" && category !== "official"
|
||||
? localClaudeApiFormat
|
||||
: undefined;
|
||||
|
||||
const baseMeta: ProviderMeta | undefined =
|
||||
payload.meta ?? (initialData?.meta ? { ...initialData.meta } : undefined);
|
||||
payload.meta = {
|
||||
@@ -1521,7 +1510,10 @@ export function ProviderForm({
|
||||
pricingConfig.enabled && pricingConfig.pricingModelSource !== "inherit"
|
||||
? pricingConfig.pricingModelSource
|
||||
: undefined,
|
||||
apiFormat: providerApiFormat,
|
||||
apiFormat:
|
||||
appId === "claude" && category !== "official"
|
||||
? localApiFormat
|
||||
: undefined,
|
||||
};
|
||||
|
||||
onSubmit(payload);
|
||||
@@ -1776,9 +1768,9 @@ export function ProviderForm({
|
||||
);
|
||||
|
||||
if (preset.apiFormat) {
|
||||
setLocalClaudeApiFormat(preset.apiFormat);
|
||||
setLocalApiFormat(preset.apiFormat);
|
||||
} else {
|
||||
setLocalClaudeApiFormat("anthropic");
|
||||
setLocalApiFormat("anthropic");
|
||||
}
|
||||
|
||||
form.reset({
|
||||
@@ -1961,8 +1953,8 @@ export function ProviderForm({
|
||||
defaultOpusModel={defaultOpusModel}
|
||||
onModelChange={handleModelChange}
|
||||
speedTestEndpoints={speedTestEndpoints}
|
||||
apiFormat={localClaudeApiFormat}
|
||||
onApiFormatChange={handleClaudeApiFormatChange}
|
||||
apiFormat={localApiFormat}
|
||||
onApiFormatChange={handleApiFormatChange}
|
||||
/>
|
||||
)}
|
||||
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
import { useState, useEffect, useRef } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { FormLabel } from "@/components/ui/form";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Zap, AlertTriangle, Server, Unplug } from "lucide-react";
|
||||
import { proxyApi, type UrlPreview } from "@/lib/api/proxy";
|
||||
|
||||
type AppType = "claude" | "codex" | "gemini";
|
||||
import { Zap } from "lucide-react";
|
||||
|
||||
interface EndpointFieldProps {
|
||||
id: string;
|
||||
@@ -17,11 +13,6 @@ interface EndpointFieldProps {
|
||||
showManageButton?: boolean;
|
||||
onManageClick?: () => void;
|
||||
manageButtonLabel?: string;
|
||||
// 应用类型和 API 格式
|
||||
appType?: AppType;
|
||||
apiFormat?: string;
|
||||
// 是否显示请求地址预览
|
||||
showUrlPreview?: boolean;
|
||||
}
|
||||
|
||||
export function EndpointField({
|
||||
@@ -34,48 +25,13 @@ export function EndpointField({
|
||||
showManageButton = true,
|
||||
onManageClick,
|
||||
manageButtonLabel,
|
||||
appType,
|
||||
apiFormat,
|
||||
showUrlPreview = true,
|
||||
}: EndpointFieldProps) {
|
||||
const { t } = useTranslation();
|
||||
const [urlPreview, setUrlPreview] = useState<UrlPreview | null>(null);
|
||||
const lastRequestIdRef = useRef(0);
|
||||
|
||||
const defaultManageLabel = t("providerForm.manageAndTest", {
|
||||
defaultValue: "管理和测速",
|
||||
});
|
||||
|
||||
// 调用后端 API 获取 URL 预览
|
||||
useEffect(() => {
|
||||
if (!value || !appType || !showUrlPreview) {
|
||||
// 标记当前所有已发出的请求为过期，避免旧请求回写
|
||||
lastRequestIdRef.current += 1;
|
||||
setUrlPreview(null);
|
||||
return;
|
||||
}
|
||||
|
||||
// 防抖：延迟 300ms 后请求
|
||||
const timer = setTimeout(async () => {
|
||||
const requestId = ++lastRequestIdRef.current;
|
||||
try {
|
||||
const preview = await proxyApi.buildUrlPreview(
|
||||
appType,
|
||||
value,
|
||||
apiFormat,
|
||||
);
|
||||
if (requestId !== lastRequestIdRef.current) return;
|
||||
setUrlPreview(preview);
|
||||
} catch (error) {
|
||||
console.error("Failed to build URL preview:", error);
|
||||
if (requestId !== lastRequestIdRef.current) return;
|
||||
setUrlPreview(null);
|
||||
}
|
||||
}, 300);
|
||||
|
||||
return () => clearTimeout(timer);
|
||||
}, [value, appType, apiFormat, showUrlPreview]);
|
||||
|
||||
return (
|
||||
<div className="space-y-2">
|
||||
<div className="flex items-center justify-between">
|
||||
@@ -99,68 +55,6 @@ export function EndpointField({
|
||||
placeholder={placeholder}
|
||||
autoComplete="off"
|
||||
/>
|
||||
|
||||
{/* 请求地址预览 */}
|
||||
{showUrlPreview && urlPreview && (
|
||||
<div className="p-2 bg-muted/50 border border-border rounded-md space-y-2">
|
||||
{/* CLI 直连请求地址 */}
|
||||
<div>
|
||||
<p className="text-xs text-muted-foreground mb-0.5 flex items-center gap-1">
|
||||
<Unplug className="h-3 w-3" />
|
||||
{t("providerForm.directRequestUrl", {
|
||||
defaultValue: "CLI 直连请求地址：",
|
||||
})}
|
||||
</p>
|
||||
<p className="text-xs font-mono text-foreground break-all pl-4">
|
||||
{urlPreview.direct_url}
|
||||
</p>
|
||||
<p className="text-xs text-muted-foreground/70 mt-0.5 pl-4">
|
||||
{t("providerForm.directRequestUrlDesc", {
|
||||
defaultValue: "CLI 直连模式下的实际请求地址",
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{/* CCS 代理请求地址 */}
|
||||
<div className="pt-1.5 border-t border-border/50">
|
||||
<p className="text-xs text-muted-foreground mb-0.5 flex items-center gap-1">
|
||||
<Server className="h-3 w-3" />
|
||||
{t("providerForm.proxyRequestUrl", {
|
||||
defaultValue: "CCS 代理请求地址：",
|
||||
})}
|
||||
</p>
|
||||
<p className="text-xs font-mono text-foreground break-all pl-4">
|
||||
{urlPreview.proxy_url}
|
||||
</p>
|
||||
<p className="text-xs text-muted-foreground/70 mt-0.5 pl-4">
|
||||
{t("providerForm.proxyRequestUrlDesc", {
|
||||
defaultValue: "CCS 智能拼接后转发到上游的地址",
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 全链接警告 */}
|
||||
{urlPreview?.is_full_url && (
|
||||
<div className="flex items-start gap-2 p-2 bg-orange-50 dark:bg-orange-950/30 border border-orange-200 dark:border-orange-800 rounded-md">
|
||||
<AlertTriangle className="h-4 w-4 text-orange-500 mt-0.5 flex-shrink-0" />
|
||||
<div className="flex-1">
|
||||
<p className="text-xs text-orange-600 dark:text-orange-400 font-medium">
|
||||
{t("providerForm.fullUrlWarningTitle", {
|
||||
defaultValue: "检测到完整 API 路径",
|
||||
})}
|
||||
</p>
|
||||
<p className="text-xs text-orange-600/80 dark:text-orange-400/80 mt-0.5">
|
||||
{t("providerForm.fullUrlWarning", {
|
||||
defaultValue:
|
||||
"填写了包含 API 路径的完整地址，此配置仅在代理模式下生效。直连模式下请只填写基础地址。",
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{hint ? (
|
||||
<div className="p-3 bg-amber-50 dark:bg-amber-900/20 border border-amber-200 dark:border-amber-700 rounded-lg">
|
||||
<p className="text-xs text-amber-600 dark:text-amber-400">{hint}</p>
|
||||
|
||||
@@ -6,91 +6,27 @@
|
||||
*/
|
||||
|
||||
import { Radio, Loader2 } from "lucide-react";
|
||||
import { useState } from "react";
|
||||
import { Switch } from "@/components/ui/switch";
|
||||
import { useProxyStatus } from "@/hooks/useProxyStatus";
|
||||
import { cn } from "@/lib/utils";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { toast } from "sonner";
|
||||
import type { AppId } from "@/lib/api";
|
||||
import { proxyApi } from "@/lib/api/proxy";
|
||||
import type { Provider } from "@/types";
|
||||
import { extractProviderBaseUrl } from "@/utils/providerBaseUrl";
|
||||
|
||||
interface ProxyToggleProps {
|
||||
className?: string;
|
||||
activeApp: AppId;
|
||||
currentProvider?: Provider | null;
|
||||
}
|
||||
|
||||
export function ProxyToggle({
|
||||
className,
|
||||
activeApp,
|
||||
currentProvider,
|
||||
}: ProxyToggleProps) {
|
||||
export function ProxyToggle({ className, activeApp }: ProxyToggleProps) {
|
||||
const { t } = useTranslation();
|
||||
const [isCheckingRequirement, setIsCheckingRequirement] = useState(false);
|
||||
const { isRunning, takeoverStatus, setTakeoverForApp, isPending, status } =
|
||||
useProxyStatus();
|
||||
|
||||
const handleToggle = async (checked: boolean) => {
|
||||
// 关闭代理时，检查当前供应商是否是全链接配置
|
||||
if (
|
||||
!checked &&
|
||||
currentProvider &&
|
||||
currentProvider.category !== "official"
|
||||
) {
|
||||
const baseUrl = extractProviderBaseUrl(currentProvider, activeApp);
|
||||
const apiFormat = currentProvider.meta?.apiFormat;
|
||||
setIsCheckingRequirement(true);
|
||||
try {
|
||||
let proxyRequirement: string | null = null;
|
||||
if (baseUrl || apiFormat) {
|
||||
proxyRequirement = await proxyApi.checkProxyRequirement(
|
||||
activeApp,
|
||||
baseUrl || "",
|
||||
apiFormat,
|
||||
);
|
||||
}
|
||||
|
||||
if (proxyRequirement) {
|
||||
const warningKey =
|
||||
proxyRequirement === "openai_chat_format"
|
||||
? "notifications.openAIChatFormatWarningOnDisable"
|
||||
: proxyRequirement === "url_mismatch"
|
||||
? "notifications.urlMismatchWarningOnDisable"
|
||||
: "notifications.fullUrlWarningOnDisable";
|
||||
|
||||
toast.warning(
|
||||
t(warningKey, {
|
||||
defaultValue:
|
||||
"当前供应商配置可能依赖代理模式，关闭代理后可能无法正常工作。建议更换为基础地址配置或保持代理开启。",
|
||||
}),
|
||||
{ duration: 6000, closeButton: true },
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Failed to check proxy requirement:", error);
|
||||
} finally {
|
||||
setIsCheckingRequirement(false);
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
await setTakeoverForApp({ appType: activeApp, enabled: checked });
|
||||
} catch (error) {
|
||||
console.error("[ProxyToggle] Toggle takeover failed:", error);
|
||||
toast.error(
|
||||
t("proxy.takeover.toggleFailed", {
|
||||
defaultValue: "切换接管状态失败",
|
||||
}),
|
||||
{
|
||||
description: t("proxy.takeover.toggleFailedDesc", {
|
||||
defaultValue: "请检查代理服务状态与权限，然后重试。",
|
||||
}),
|
||||
closeButton: true,
|
||||
},
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -125,7 +61,7 @@ export function ProxyToggle({
|
||||
)}
|
||||
title={tooltipText}
|
||||
>
|
||||
{isPending || isCheckingRequirement ? (
|
||||
{isPending ? (
|
||||
<Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
|
||||
) : (
|
||||
<Radio
|
||||
@@ -140,7 +76,7 @@ export function ProxyToggle({
|
||||
<Switch
|
||||
checked={takeoverEnabled}
|
||||
onCheckedChange={handleToggle}
|
||||
disabled={isPending || isCheckingRequirement}
|
||||
disabled={isPending}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
|
||||
+26
-114
@@ -3,7 +3,6 @@ import { useQueryClient } from "@tanstack/react-query";
|
||||
import { toast } from "sonner";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { providersApi, settingsApi, openclawApi, type AppId } from "@/lib/api";
|
||||
import { proxyApi } from "@/lib/api/proxy";
|
||||
import type {
|
||||
Provider,
|
||||
UsageScript,
|
||||
@@ -18,25 +17,13 @@ import {
|
||||
useSwitchProviderMutation,
|
||||
} from "@/lib/query";
|
||||
import { extractErrorMessage } from "@/utils/errorUtils";
|
||||
import { extractProviderBaseUrl } from "@/utils/providerBaseUrl";
|
||||
import { openclawKeys } from "@/hooks/useOpenClaw";
|
||||
|
||||
interface UseProviderActionsOptions {
|
||||
/** 代理服务是否正在运行 */
|
||||
isProxyRunning?: boolean;
|
||||
/** 当前应用的代理接管是否激活 */
|
||||
isTakeoverActive?: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* Hook for managing provider actions (add, update, delete, switch)
|
||||
* Extracts business logic from App.tsx
|
||||
*/
|
||||
export function useProviderActions(
|
||||
activeApp: AppId,
|
||||
options: UseProviderActionsOptions = {},
|
||||
) {
|
||||
const { isProxyRunning = false, isTakeoverActive = false } = options;
|
||||
export function useProviderActions(activeApp: AppId) {
|
||||
const { t } = useTranslation();
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
@@ -146,11 +133,30 @@ export function useProviderActions(
|
||||
// 切换供应商
|
||||
const switchProvider = useCallback(
|
||||
async (provider: Provider) => {
|
||||
// 官方供应商不需要检查
|
||||
if (provider.category === "official") {
|
||||
try {
|
||||
await switchProviderMutation.mutateAsync(provider.id);
|
||||
await syncClaudePlugin(provider);
|
||||
try {
|
||||
await switchProviderMutation.mutateAsync(provider.id);
|
||||
await syncClaudePlugin(provider);
|
||||
|
||||
// 根据供应商类型显示不同的成功提示
|
||||
if (
|
||||
activeApp === "claude" &&
|
||||
provider.category !== "official" &&
|
||||
provider.meta?.apiFormat === "openai_chat"
|
||||
) {
|
||||
// OpenAI Chat 格式供应商：显示代理提示
|
||||
toast.info(
|
||||
t("notifications.openAIChatFormatHint", {
|
||||
defaultValue:
|
||||
"此供应商使用 OpenAI Chat 格式，需要开启代理服务才能正常使用",
|
||||
}),
|
||||
{
|
||||
duration: 5000,
|
||||
closeButton: true,
|
||||
},
|
||||
);
|
||||
} else {
|
||||
// 普通供应商：显示切换成功
|
||||
// OpenCode/OpenClaw: show "added to config" message instead of "switched"
|
||||
const isMultiProviderApp =
|
||||
activeApp === "opencode" || activeApp === "openclaw";
|
||||
const messageKey = isMultiProviderApp
|
||||
@@ -159,94 +165,7 @@ export function useProviderActions(
|
||||
const defaultMessage = isMultiProviderApp
|
||||
? "已添加到配置"
|
||||
: "切换成功！";
|
||||
toast.success(
|
||||
t(messageKey, { defaultValue: defaultMessage }),
|
||||
{
|
||||
closeButton: true,
|
||||
},
|
||||
);
|
||||
} catch {
|
||||
// 错误提示由 mutation 处理
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// 提取 base URL 和 API 格式
|
||||
const baseUrl = extractProviderBaseUrl(provider, activeApp);
|
||||
const apiFormat = provider.meta?.apiFormat;
|
||||
|
||||
// 调用后端 API 检查是否需要代理（统一由后端控制）
|
||||
let proxyRequirement: string | null = null;
|
||||
let proxyRequirementCheckFailed = false;
|
||||
if (baseUrl || apiFormat) {
|
||||
try {
|
||||
proxyRequirement = await proxyApi.checkProxyRequirement(
|
||||
activeApp,
|
||||
baseUrl || "",
|
||||
apiFormat,
|
||||
);
|
||||
} catch (error) {
|
||||
console.error("Failed to check proxy requirement:", error);
|
||||
proxyRequirementCheckFailed = true;
|
||||
}
|
||||
}
|
||||
|
||||
// 如果需要代理但代理未激活，阻止切换并提示
|
||||
if (proxyRequirement && !(isProxyRunning && isTakeoverActive)) {
|
||||
let message: string;
|
||||
|
||||
if (proxyRequirement === "openai_chat_format") {
|
||||
message = t("notifications.openAIChatFormatRequiresProxy", {
|
||||
defaultValue:
|
||||
"此供应商使用 OpenAI Chat 格式，需要开启代理服务进行格式转换才能正常使用。请先开启代理并接管当前应用。",
|
||||
});
|
||||
} else if (proxyRequirement === "full_url") {
|
||||
// 用户填了全链接（如 /v1/messages 结尾）
|
||||
message = t("notifications.fullUrlRequiresProxy", {
|
||||
defaultValue:
|
||||
"此供应商配置了完整 API 路径，直连模式下客户端可能会重复追加路径。请先开启代理并接管当前应用。",
|
||||
});
|
||||
} else {
|
||||
// url_mismatch: 直连地址和代理地址不匹配
|
||||
message = t("notifications.urlMismatchRequiresProxy", {
|
||||
defaultValue:
|
||||
"此供应商的请求地址配置与 API 格式不匹配，直连模式下无法正常工作。请先开启代理并接管当前应用。",
|
||||
});
|
||||
}
|
||||
|
||||
toast.warning(message, {
|
||||
duration: 6000,
|
||||
closeButton: true,
|
||||
});
|
||||
return; // 阻止切换
|
||||
}
|
||||
|
||||
try {
|
||||
await switchProviderMutation.mutateAsync(provider.id);
|
||||
await syncClaudePlugin(provider);
|
||||
|
||||
const isMultiProviderApp =
|
||||
activeApp === "opencode" || activeApp === "openclaw";
|
||||
const messageKey = isMultiProviderApp
|
||||
? "notifications.addToConfigSuccess"
|
||||
: "notifications.switchSuccess";
|
||||
const defaultMessage = isMultiProviderApp ? "已添加到配置" : "切换成功！";
|
||||
|
||||
if (proxyRequirementCheckFailed && baseUrl) {
|
||||
toast.success(
|
||||
t("notifications.switchAppliedUnverified", {
|
||||
defaultValue: "切换已应用（未验证直连兼容性）",
|
||||
}),
|
||||
{
|
||||
description: t("notifications.switchAppliedUnverifiedDesc", {
|
||||
defaultValue:
|
||||
"未能验证该端点是否需要代理。如果切换后无法正常使用，请开启代理并接管当前应用。",
|
||||
}),
|
||||
closeButton: true,
|
||||
duration: 6000,
|
||||
},
|
||||
);
|
||||
} else {
|
||||
toast.success(t(messageKey, { defaultValue: defaultMessage }), {
|
||||
closeButton: true,
|
||||
});
|
||||
@@ -255,14 +174,7 @@ export function useProviderActions(
|
||||
// 错误提示由 mutation 处理
|
||||
}
|
||||
},
|
||||
[
|
||||
switchProviderMutation,
|
||||
syncClaudePlugin,
|
||||
activeApp,
|
||||
t,
|
||||
isProxyRunning,
|
||||
isTakeoverActive,
|
||||
],
|
||||
[switchProviderMutation, syncClaudePlugin, activeApp, t],
|
||||
);
|
||||
|
||||
// 删除供应商
|
||||
|
||||
@@ -167,14 +167,6 @@
|
||||
"settingsSaved": "Settings saved",
|
||||
"settingsSaveFailed": "Failed to save settings: {{error}}",
|
||||
"openAIChatFormatHint": "This provider uses OpenAI Chat format and requires the proxy service to be enabled",
|
||||
"openAIChatFormatRequiresProxy": "This provider uses OpenAI Chat format and requires the proxy service for format conversion. Please enable the proxy and takeover the current app first.",
|
||||
"fullUrlRequiresProxy": "This provider is configured with a full API path. The client may append duplicate paths in direct connection mode. Please enable the proxy and takeover the current app first.",
|
||||
"urlMismatchRequiresProxy": "This provider's request URL configuration does not match the API format. It cannot work properly in direct connection mode. Please enable the proxy and takeover the current app first.",
|
||||
"fullUrlWarningOnDisable": "The current provider is configured with a full API path or special format. It may not work properly after disabling the proxy. Consider switching to a base URL configuration or keep the proxy enabled.",
|
||||
"openAIChatFormatWarningOnDisable": "The current provider uses OpenAI Chat format. It may not work properly after disabling the proxy. Consider keeping the proxy enabled.",
|
||||
"urlMismatchWarningOnDisable": "The current provider's request URL configuration may rely on the proxy. It may not work properly after disabling the proxy. Consider switching to a base URL configuration or keep the proxy enabled.",
|
||||
"switchAppliedUnverified": "Switch applied (direct mode not verified)",
|
||||
"switchAppliedUnverifiedDesc": "Unable to verify whether this endpoint requires the proxy. If it doesn't work after switching, enable the proxy and takeover the current app.",
|
||||
"openLinkFailed": "Failed to open link",
|
||||
"openclawModelsRegistered": "Models have been registered to /model list",
|
||||
"openclawDefaultModelSet": "Set as default model",
|
||||
@@ -602,12 +594,6 @@
|
||||
"apiHint": "💡 Fill in Claude API compatible service endpoint, avoid trailing slash",
|
||||
"apiHintOAI": "💡 Fill in OpenAI Chat Completions compatible service endpoint, avoid trailing slash",
|
||||
"codexApiHint": "💡 Fill in service endpoint compatible with OpenAI Response format",
|
||||
"directRequestUrl": "CLI Direct Request URL:",
|
||||
"directRequestUrlDesc": "Actual request URL after CLI appends default suffix",
|
||||
"proxyRequestUrl": "CCS Proxy Request URL:",
|
||||
"proxyRequestUrlDesc": "URL forwarded to upstream after CCS smart path detection",
|
||||
"fullUrlWarningTitle": "Full API path detected",
|
||||
"fullUrlWarning": "The URL contains a full API path. This configuration only works in proxy mode. For direct connection mode, please enter only the base URL.",
|
||||
"fillSupplierName": "Please fill in provider name",
|
||||
"fillConfigContent": "Please fill in configuration content",
|
||||
"fillParameter": "Please fill in {{label}}",
|
||||
@@ -1502,10 +1488,6 @@
|
||||
}
|
||||
},
|
||||
"proxy": {
|
||||
"takeover": {
|
||||
"toggleFailed": "Failed to toggle takeover",
|
||||
"toggleFailedDesc": "Check proxy service status and permissions, then try again."
|
||||
},
|
||||
"panel": {
|
||||
"serviceAddress": "Service Address",
|
||||
"addressCopied": "Address copied",
|
||||
|
||||
@@ -167,14 +167,6 @@
|
||||
"settingsSaved": "設定を保存しました",
|
||||
"settingsSaveFailed": "設定の保存に失敗しました: {{error}}",
|
||||
"openAIChatFormatHint": "このプロバイダーは OpenAI Chat フォーマットを使用しており、プロキシサービスの有効化が必要です",
|
||||
"openAIChatFormatRequiresProxy": "このプロバイダーは OpenAI Chat フォーマットを使用しており、フォーマット変換のためにプロキシサービスが必要です。先にプロキシを有効にして、現在のアプリをテイクオーバーしてください。",
|
||||
"fullUrlRequiresProxy": "このプロバイダーは完全な API パスで構成されています。直接接続モードではクライアントがパスを重複追加する可能性があります。先にプロキシを有効にして、現在のアプリをテイクオーバーしてください。",
|
||||
"urlMismatchRequiresProxy": "このプロバイダーのリクエスト URL 設定が API フォーマットと一致しません。直接接続モードでは正常に動作しません。先にプロキシを有効にして、現在のアプリをテイクオーバーしてください。",
|
||||
"fullUrlWarningOnDisable": "現在のプロバイダーは完全な API パスまたは特殊なフォーマットで構成されています。プロキシを無効にすると正常に動作しない可能性があります。ベース URL 設定に変更するか、プロキシを有効のままにすることをお勧めします。",
|
||||
"openAIChatFormatWarningOnDisable": "現在のプロバイダーは OpenAI Chat フォーマットを使用しています。プロキシを無効にすると正常に動作しない可能性があります。プロキシを有効のままにすることをお勧めします。",
|
||||
"urlMismatchWarningOnDisable": "現在のプロバイダーのリクエスト URL 設定はプロキシに依存している可能性があります。プロキシを無効にすると正常に動作しない可能性があります。ベース URL 設定に変更するか、プロキシを有効のままにすることをお勧めします。",
|
||||
"switchAppliedUnverified": "切り替えを適用しました（直接接続は未検証）",
|
||||
"switchAppliedUnverifiedDesc": "このエンドポイントがプロキシを必要とするか検証できませんでした。切り替え後に動作しない場合は、プロキシを有効にして現在のアプリをテイクオーバーしてください。",
|
||||
"openLinkFailed": "リンクを開けませんでした",
|
||||
"openclawModelsRegistered": "モデルが /model リストに登録されました",
|
||||
"openclawDefaultModelSet": "デフォルトモデルに設定しました",
|
||||
@@ -602,12 +594,6 @@
|
||||
"apiHint": "💡 Claude API 互換サービスのエンドポイントを入力してください。末尾にスラッシュを付けないでください",
|
||||
"apiHintOAI": "💡 OpenAI Chat Completions 互換サービスのエンドポイントを入力してください。末尾にスラッシュを付けないでください",
|
||||
"codexApiHint": "💡 OpenAI Response 互換のサービスエンドポイントを入力してください",
|
||||
"directRequestUrl": "CLI 直接リクエスト URL：",
|
||||
"directRequestUrlDesc": "CLI がデフォルトサフィックスを追加した後の実際のリクエスト URL",
|
||||
"proxyRequestUrl": "CCS プロキシリクエスト URL：",
|
||||
"proxyRequestUrlDesc": "CCS がスマートパス検出後にアップストリームへ転送する URL",
|
||||
"fullUrlWarningTitle": "完全な API パスを検出",
|
||||
"fullUrlWarning": "URL には完全な API パスが含まれています。この設定はプロキシモードでのみ有効です。直接接続モードではベース URL のみを入力してください。",
|
||||
"fillSupplierName": "プロバイダー名を入力してください",
|
||||
"fillConfigContent": "設定内容を入力してください",
|
||||
"fillParameter": "{{label}} を入力してください",
|
||||
@@ -1500,10 +1486,6 @@
|
||||
}
|
||||
},
|
||||
"proxy": {
|
||||
"takeover": {
|
||||
"toggleFailed": "テイクオーバーの切り替えに失敗しました",
|
||||
"toggleFailedDesc": "プロキシサービスの状態と権限を確認して、もう一度お試しください。"
|
||||
},
|
||||
"panel": {
|
||||
"serviceAddress": "サービスアドレス",
|
||||
"addressCopied": "アドレスをコピーしました",
|
||||
|
||||
@@ -167,14 +167,6 @@
|
||||
"settingsSaved": "设置已保存",
|
||||
"settingsSaveFailed": "保存设置失败：{{error}}",
|
||||
"openAIChatFormatHint": "此供应商使用 OpenAI Chat 格式，需要开启代理服务才能正常使用",
|
||||
"openAIChatFormatRequiresProxy": "此供应商使用 OpenAI Chat 格式，需要开启代理服务进行格式转换才能正常使用。请先开启代理并接管当前应用。",
|
||||
"fullUrlRequiresProxy": "此供应商配置了完整 API 路径，直连模式下客户端可能会重复追加路径。请先开启代理并接管当前应用。",
|
||||
"urlMismatchRequiresProxy": "此供应商的请求地址配置与 API 格式不匹配，直连模式下无法正常工作。请先开启代理并接管当前应用。",
|
||||
"fullUrlWarningOnDisable": "当前供应商配置了完整 API 路径或特殊格式，关闭代理后可能无法正常工作。建议更换为基础地址配置或保持代理开启。",
|
||||
"openAIChatFormatWarningOnDisable": "当前供应商使用 OpenAI Chat 格式，关闭代理后可能无法正常工作。建议保持代理开启。",
|
||||
"urlMismatchWarningOnDisable": "当前供应商的请求地址配置可能依赖代理模式，关闭代理后可能无法正常工作。建议更换为基础地址配置或保持代理开启。",
|
||||
"switchAppliedUnverified": "切换已应用（未验证直连兼容性）",
|
||||
"switchAppliedUnverifiedDesc": "未能验证该端点是否需要代理。如果切换后无法正常使用，请开启代理并接管当前应用。",
|
||||
"openLinkFailed": "链接打开失败",
|
||||
"openclawModelsRegistered": "模型已注册到 /model 列表",
|
||||
"openclawDefaultModelSet": "已设为默认模型",
|
||||
@@ -602,12 +594,6 @@
|
||||
"apiHint": "💡 填写兼容 Claude API 的服务端点地址，不要以斜杠结尾",
|
||||
"apiHintOAI": "💡 填写兼容 OpenAI Chat Completions 的服务端点地址，不要以斜杠结尾",
|
||||
"codexApiHint": "💡 填写兼容 OpenAI Response 格式的服务端点地址",
|
||||
"directRequestUrl": "CLI 直连请求地址：",
|
||||
"directRequestUrlDesc": "CLI 硬拼接默认后缀后的实际请求地址",
|
||||
"proxyRequestUrl": "CCS 代理请求地址：",
|
||||
"proxyRequestUrlDesc": "CCS 智能拼接后转发到上游的地址",
|
||||
"fullUrlWarningTitle": "检测到完整 API 路径",
|
||||
"fullUrlWarning": "填写了包含 API 路径的完整地址，此配置仅在代理模式下生效。直连模式下请只填写基础地址。",
|
||||
"fillSupplierName": "请填写供应商名称",
|
||||
"fillConfigContent": "请填写配置内容",
|
||||
"fillParameter": "请填写 {{label}}",
|
||||
@@ -1502,10 +1488,6 @@
|
||||
}
|
||||
},
|
||||
"proxy": {
|
||||
"takeover": {
|
||||
"toggleFailed": "切换接管状态失败",
|
||||
"toggleFailedDesc": "请检查代理服务状态与权限，然后重试。"
|
||||
},
|
||||
"panel": {
|
||||
"serviceAddress": "服务地址",
|
||||
"addressCopied": "地址已复制",
|
||||
|
||||
@@ -117,40 +117,4 @@ export const proxyApi = {
|
||||
async setPricingModelSource(appType: string, value: string): Promise<void> {
|
||||
return invoke("set_pricing_model_source", { appType, value });
|
||||
},
|
||||
|
||||
// ========== URL 预览 API ==========
|
||||
|
||||
/**
|
||||
* 构建 URL 预览
|
||||
* 根据 app_type、base_url 和 api_format 计算直连和代理模式的请求地址
|
||||
*/
|
||||
async buildUrlPreview(
|
||||
appType: string,
|
||||
baseUrl: string,
|
||||
apiFormat?: string,
|
||||
): Promise<UrlPreview> {
|
||||
return invoke("build_url_preview", { appType, baseUrl, apiFormat });
|
||||
},
|
||||
|
||||
/**
|
||||
* 检查是否需要代理
|
||||
* 返回需要代理的原因，null 表示不需要代理
|
||||
*/
|
||||
async checkProxyRequirement(
|
||||
appType: string,
|
||||
baseUrl: string,
|
||||
apiFormat?: string,
|
||||
): Promise<string | null> {
|
||||
return invoke("check_proxy_requirement", { appType, baseUrl, apiFormat });
|
||||
},
|
||||
};
|
||||
|
||||
/** URL 预览结果 */
|
||||
export interface UrlPreview {
|
||||
/** 直连模式请求地址 */
|
||||
direct_url: string;
|
||||
/** 代理模式请求地址 */
|
||||
proxy_url: string;
|
||||
/** 是否为全链接（base_url 已包含 API 路径） */
|
||||
is_full_url: boolean;
|
||||
}
|
||||
|
||||
+2
-5
@@ -140,13 +140,10 @@ export interface ProviderMeta {
|
||||
costMultiplier?: string;
|
||||
// 供应商计费模式来源
|
||||
pricingModelSource?: string;
|
||||
// 供应商 API 格式
|
||||
// Claude:
|
||||
// Claude API 格式（仅 Claude 供应商使用）
|
||||
// - "anthropic": 原生 Anthropic Messages API 格式，直接透传
|
||||
// - "openai_chat": OpenAI Chat Completions 格式，需要格式转换
|
||||
// Codex:
|
||||
// - "responses": OpenAI Responses API
|
||||
apiFormat?: "anthropic" | "openai_chat" | "responses";
|
||||
apiFormat?: "anthropic" | "openai_chat";
|
||||
}
|
||||
|
||||
// Skill 同步方式
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
import type { AppId } from "@/lib/api";
|
||||
import type { Provider } from "@/types";
|
||||
import { extractCodexBaseUrl } from "@/utils/providerConfigUtils";
|
||||
|
||||
/**
|
||||
* 从 provider 配置中提取 base URL（用于代理检查/预览）
|
||||
*/
|
||||
export function extractProviderBaseUrl(
|
||||
provider: Provider,
|
||||
appId: AppId,
|
||||
): string | null {
|
||||
try {
|
||||
const config = provider.settingsConfig;
|
||||
if (!config) return null;
|
||||
|
||||
if (appId === "claude") {
|
||||
const envUrl = config?.env?.ANTHROPIC_BASE_URL;
|
||||
return typeof envUrl === "string" ? envUrl.trim() : null;
|
||||
}
|
||||
|
||||
if (appId === "codex" || appId === "opencode") {
|
||||
const tomlConfig = config?.config;
|
||||
if (typeof tomlConfig === "string") {
|
||||
return extractCodexBaseUrl(tomlConfig) ?? null;
|
||||
}
|
||||
|
||||
const baseUrl = config?.base_url;
|
||||
return typeof baseUrl === "string" ? baseUrl.trim() : null;
|
||||
}
|
||||
|
||||
if (appId === "gemini") {
|
||||
const envUrl = config?.env?.GOOGLE_GEMINI_BASE_URL;
|
||||
if (typeof envUrl === "string") return envUrl.trim();
|
||||
|
||||
const baseUrl = config?.GEMINI_API_BASE || config?.base_url;
|
||||
return typeof baseUrl === "string" ? baseUrl.trim() : null;
|
||||
}
|
||||
|
||||
return null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -468,41 +468,6 @@ export const setCodexBaseUrl = (
|
||||
return `${prefix}${replacementLine}\n`;
|
||||
};
|
||||
|
||||
// 在 Codex 的 TOML 配置文本中写入或更新 wire_api 字段（仅保留 responses）
|
||||
export const setCodexWireApi = (
|
||||
configText: string,
|
||||
wireApi: "responses" = "responses",
|
||||
): string => {
|
||||
const normalizedText = normalizeQuotes(configText);
|
||||
const replacementLine = `wire_api = "${wireApi}"`;
|
||||
const pattern = /^wire_api\s*=\s*(["'])(responses|chat)\1/m;
|
||||
|
||||
if (pattern.test(normalizedText)) {
|
||||
return normalizedText.replace(pattern, replacementLine);
|
||||
}
|
||||
|
||||
// 优先插入到 base_url 后，提升可读性
|
||||
const baseUrlPattern = /^base_url\s*=\s*["'][^"']+["']/m;
|
||||
const match = normalizedText.match(baseUrlPattern);
|
||||
if (match && match.index !== undefined) {
|
||||
const endOfLine = normalizedText.indexOf("\n", match.index);
|
||||
if (endOfLine !== -1) {
|
||||
return (
|
||||
normalizedText.slice(0, endOfLine + 1) +
|
||||
replacementLine +
|
||||
"\n" +
|
||||
normalizedText.slice(endOfLine + 1)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
const prefix =
|
||||
normalizedText && !normalizedText.endsWith("\n")
|
||||
? `${normalizedText}\n`
|
||||
: normalizedText;
|
||||
return `${prefix}${replacementLine}\n`;
|
||||
};
|
||||
|
||||
// ========== Codex model name utils ==========
|
||||
|
||||
// 从 Codex 的 TOML 配置文本中提取 model 字段（支持单/双引号）
|
||||
|
||||
Reference in New Issue
Block a user