mirror of
https://github.com/farion1231/cc-switch.git
synced 2026-07-26 23:56:02 +08:00
Compare commits
52 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 68e07b350d | |||
| 26486d543c | |||
| fe49a0c189 | |||
| 813d6adb06 | |||
| 99c910e58e | |||
| 8f7423f011 | |||
| d745ab58c4 | |||
| c2adb1af46 | |||
| fdd539759e | |||
| 054a5e9e3b | |||
| c56523c9c0 | |||
| cba8e8fdb3 | |||
| b18be24384 | |||
| 6aef472fd2 | |||
| 4a8883ecc3 | |||
| 6dd809701b | |||
| 86288ee77e | |||
| c1e27d3cf2 | |||
| c5d3732b9f | |||
| 76fa830688 | |||
| c9a4938866 | |||
| 95ed6d6903 | |||
| 83db457b10 | |||
| d33f99aca4 | |||
| 42d1d23618 | |||
| 392756e373 | |||
| 7bc9dbbbb0 | |||
| e002bdba25 | |||
| 5694353798 | |||
| 17c3dffe8c | |||
| 07ba3df0f4 | |||
| 1fe16aa388 | |||
| f738871ad1 | |||
| 753190a879 | |||
| 6021274b82 | |||
| b7fd70075c | |||
| eeb6afef01 | |||
| d3074eadb5 | |||
| 31d34a4512 | |||
| 3ef86bdb99 | |||
| df3f8a05c4 | |||
| 8e6fad7af2 | |||
| f22000a4df | |||
| 412906fb09 | |||
| a268127f1f | |||
| f363bb1dd0 | |||
| a2becf0917 | |||
| debe4232bc | |||
| 49a2e52b20 | |||
| ed9d9b5436 | |||
| 390839a8d5 | |||
| 3dcbe313be |
@@ -56,7 +56,8 @@ jobs:
|
|||||||
libssl-dev \
|
libssl-dev \
|
||||||
rpm \
|
rpm \
|
||||||
flatpak \
|
flatpak \
|
||||||
flatpak-builder
|
flatpak-builder \
|
||||||
|
elfutils
|
||||||
# GTK/GLib stack for gdk-3.0, glib-2.0, gio-2.0
|
# GTK/GLib stack for gdk-3.0, glib-2.0, gio-2.0
|
||||||
sudo apt-get install -y --no-install-recommends \
|
sudo apt-get install -y --no-install-recommends \
|
||||||
libgtk-3-dev \
|
libgtk-3-dev \
|
||||||
@@ -283,19 +284,6 @@ jobs:
|
|||||||
else
|
else
|
||||||
echo "No .rpm found (optional)"
|
echo "No .rpm found (optional)"
|
||||||
fi
|
fi
|
||||||
# 额外上传 .flatpak(跨发行版;不参与 Updater)
|
|
||||||
if [ -n "$DEB" ]; then
|
|
||||||
echo "Building Flatpak bundle from .deb..."
|
|
||||||
cp "$DEB" flatpak/cc-switch.deb
|
|
||||||
flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
|
|
||||||
flatpak install -y --user flathub org.gnome.Platform//46 org.gnome.Sdk//46
|
|
||||||
flatpak-builder --force-clean --user --disable-cache --repo flatpak-repo flatpak-build flatpak/com.ccswitch.desktop.yml
|
|
||||||
NEW_FLATPAK="CC-Switch-${VERSION}-Linux.flatpak"
|
|
||||||
flatpak build-bundle --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo flatpak-repo "release-assets/$NEW_FLATPAK" com.ccswitch.desktop
|
|
||||||
echo "Flatpak bundle created: $NEW_FLATPAK"
|
|
||||||
else
|
|
||||||
echo "Skip Flatpak build: no .deb found"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: List prepared assets
|
- name: List prepared assets
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -324,7 +312,7 @@ jobs:
|
|||||||
|
|
||||||
- **macOS**: `CC-Switch-${{ github.ref_name }}-macOS.zip`(解压即用)或 `CC-Switch-${{ github.ref_name }}-macOS.tar.gz`(Homebrew)
|
- **macOS**: `CC-Switch-${{ github.ref_name }}-macOS.zip`(解压即用)或 `CC-Switch-${{ github.ref_name }}-macOS.tar.gz`(Homebrew)
|
||||||
- **Windows**: `CC-Switch-${{ github.ref_name }}-Windows.msi`(安装版)或 `CC-Switch-${{ github.ref_name }}-Windows-Portable.zip`(绿色版)
|
- **Windows**: `CC-Switch-${{ github.ref_name }}-Windows.msi`(安装版)或 `CC-Switch-${{ github.ref_name }}-Windows-Portable.zip`(绿色版)
|
||||||
- **Linux**: `CC-Switch-${{ github.ref_name }}-Linux.AppImage`(AppImage)或 `CC-Switch-${{ github.ref_name }}-Linux.deb`(Debian/Ubuntu)或 `CC-Switch-${{ github.ref_name }}-Linux.rpm`(Fedora/RHEL/openSUSE)或 `CC-Switch-${{ github.ref_name }}-Linux.flatpak`(Flatpak)
|
- **Linux**: `CC-Switch-${{ github.ref_name }}-Linux.AppImage`(AppImage)或 `CC-Switch-${{ github.ref_name }}-Linux.deb`(Debian/Ubuntu)或 `CC-Switch-${{ github.ref_name }}-Linux.rpm`(Fedora/RHEL/openSUSE)
|
||||||
|
|
||||||
---
|
---
|
||||||
提示:macOS 如遇"已损坏"提示,可在终端执行:`xattr -cr "/Applications/CC Switch.app"`
|
提示:macOS 如遇"已损坏"提示,可在终端执行:`xattr -cr "/Applications/CC Switch.app"`
|
||||||
|
|||||||
@@ -9,6 +9,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## [3.9.1] - 2026-01-09
|
||||||
|
|
||||||
|
### Bug Fix Release
|
||||||
|
|
||||||
|
This release focuses on stability improvements and crash prevention.
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- **Crash Logging** - Panic hook captures crash info to `~/.cc-switch/crash.log` with full stack traces (#562)
|
||||||
|
- **Release Logging** - Enable logging for release builds with automatic rotation (keeps 2 most recent files)
|
||||||
|
- **AIGoCode Icon** - Added colored icon for AIGoCode provider preset
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- **Proxy Panic Prevention** - Graceful degradation when HTTP client initialization fails due to invalid proxy settings; falls back to no_proxy mode (#560)
|
||||||
|
- **UTF-8 Safety** - Fix potential panic when masking API keys or truncating logs containing multi-byte characters (Chinese, emoji, etc.) (#560)
|
||||||
|
- **Default Proxy Port** - Change default port from 5000 to 15721 to avoid conflict with macOS AirPlay Receiver (#560)
|
||||||
|
- **Windows Title** - Display "CC Switch" instead of default "Tauri app" in window title
|
||||||
|
- **Windows/Linux Spacing** - Remove extra 28px blank space below native titlebar introduced in v3.9.0
|
||||||
|
- **Flatpak Tray Icon** - Bundle libayatana-appindicator for tray icon support on Flatpak (#556)
|
||||||
|
- **Provider Preset** - Correct casing from "AiGoCode" to "AIGoCode" to match official branding
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## [3.9.0] - 2026-01-07
|
## [3.9.0] - 2026-01-07
|
||||||
|
|
||||||
### Stable Release
|
### Stable Release
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# All-in-One Assistant for Claude Code, Codex & Gemini CLI
|
# All-in-One Assistant for Claude Code, Codex & Gemini CLI
|
||||||
|
|
||||||
[](https://github.com/farion1231/cc-switch/releases)
|
[](https://github.com/farion1231/cc-switch/releases)
|
||||||
[](https://github.com/farion1231/cc-switch/releases)
|
[](https://github.com/farion1231/cc-switch/releases)
|
||||||
[](https://tauri.app/)
|
[](https://tauri.app/)
|
||||||
[](https://github.com/farion1231/cc-switch/releases/latest)
|
[](https://github.com/farion1231/cc-switch/releases/latest)
|
||||||
@@ -52,7 +52,7 @@ This project is sponsored by Z.ai, supporting us with their GLM CODING PLAN.GLM
|
|||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
### Current Version: v3.9.0 | [Full Changelog](CHANGELOG.md) | [Release Notes](docs/release-note-v3.9.0-en.md)
|
### Current Version: v3.9.1 | [Full Changelog](CHANGELOG.md) | [Release Notes](docs/release-note-v3.9.0-en.md)
|
||||||
|
|
||||||
**v3.8.0 Major Update (2025-11-28)**
|
**v3.8.0 Major Update (2025-11-28)**
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# Claude Code / Codex / Gemini CLI オールインワン・アシスタント
|
# Claude Code / Codex / Gemini CLI オールインワン・アシスタント
|
||||||
|
|
||||||
[](https://github.com/farion1231/cc-switch/releases)
|
[](https://github.com/farion1231/cc-switch/releases)
|
||||||
[](https://github.com/farion1231/cc-switch/releases)
|
[](https://github.com/farion1231/cc-switch/releases)
|
||||||
[](https://tauri.app/)
|
[](https://tauri.app/)
|
||||||
[](https://github.com/farion1231/cc-switch/releases/latest)
|
[](https://github.com/farion1231/cc-switch/releases/latest)
|
||||||
@@ -52,7 +52,7 @@
|
|||||||
|
|
||||||
## 特長
|
## 特長
|
||||||
|
|
||||||
### 現在のバージョン:v3.9.0 | [完全な更新履歴](CHANGELOG.md) | [リリースノート](docs/release-note-v3.9.0-ja.md)
|
### 現在のバージョン:v3.9.1 | [完全な更新履歴](CHANGELOG.md) | [リリースノート](docs/release-note-v3.9.0-ja.md)
|
||||||
|
|
||||||
**v3.8.0 メジャーアップデート (2025-11-28)**
|
**v3.8.0 メジャーアップデート (2025-11-28)**
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# Claude Code / Codex / Gemini CLI 全方位辅助工具
|
# Claude Code / Codex / Gemini CLI 全方位辅助工具
|
||||||
|
|
||||||
[](https://github.com/farion1231/cc-switch/releases)
|
[](https://github.com/farion1231/cc-switch/releases)
|
||||||
[](https://github.com/farion1231/cc-switch/releases)
|
[](https://github.com/farion1231/cc-switch/releases)
|
||||||
[](https://tauri.app/)
|
[](https://tauri.app/)
|
||||||
[](https://github.com/farion1231/cc-switch/releases/latest)
|
[](https://github.com/farion1231/cc-switch/releases/latest)
|
||||||
@@ -52,7 +52,7 @@
|
|||||||
|
|
||||||
## 功能特性
|
## 功能特性
|
||||||
|
|
||||||
### 当前版本:v3.9.0 | [完整更新日志](CHANGELOG.md) | [发布说明](docs/release-note-v3.9.0-zh.md)
|
### 当前版本:v3.9.1 | [完整更新日志](CHANGELOG.md) | [发布说明](docs/release-note-v3.9.0-zh.md)
|
||||||
|
|
||||||
**v3.8.0 重大更新(2025-11-28)**
|
**v3.8.0 重大更新(2025-11-28)**
|
||||||
|
|
||||||
|
|||||||
+239
-776
File diff suppressed because it is too large
Load Diff
@@ -22,6 +22,15 @@ finish-args:
|
|||||||
- --filesystem=home
|
- --filesystem=home
|
||||||
|
|
||||||
modules:
|
modules:
|
||||||
|
# Required for libdbusmenu build (intltool was removed from GNOME SDK since 2019)
|
||||||
|
- name: intltool
|
||||||
|
cleanup:
|
||||||
|
- "*"
|
||||||
|
sources:
|
||||||
|
- type: archive
|
||||||
|
url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
|
||||||
|
sha256: 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd
|
||||||
|
|
||||||
# Required for tray icon support
|
# Required for tray icon support
|
||||||
- name: libayatana-ido
|
- name: libayatana-ido
|
||||||
buildsystem: cmake-ninja
|
buildsystem: cmake-ninja
|
||||||
@@ -40,7 +49,7 @@ modules:
|
|||||||
- --with-gtk=3
|
- --with-gtk=3
|
||||||
- --disable-dumper
|
- --disable-dumper
|
||||||
- --disable-static
|
- --disable-static
|
||||||
- --enable-tests=no
|
- --disable-nls
|
||||||
sources:
|
sources:
|
||||||
- type: archive
|
- type: archive
|
||||||
url: https://launchpad.net/libdbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz
|
url: https://launchpad.net/libdbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "cc-switch",
|
"name": "cc-switch",
|
||||||
"version": "3.9.0",
|
"version": "3.9.1",
|
||||||
"description": "All-in-One Assistant for Claude Code, Codex & Gemini CLI",
|
"description": "All-in-One Assistant for Claude Code, Codex & Gemini CLI",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
Generated
+1
-1
@@ -701,7 +701,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cc-switch"
|
name = "cc-switch"
|
||||||
version = "3.9.0"
|
version = "3.9.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-stream",
|
"async-stream",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cc-switch"
|
name = "cc-switch"
|
||||||
version = "3.9.0"
|
version = "3.9.1"
|
||||||
description = "All-in-One Assistant for Claude Code, Codex & Gemini CLI"
|
description = "All-in-One Assistant for Claude Code, Codex & Gemini CLI"
|
||||||
authors = ["Jason Young"]
|
authors = ["Jason Young"]
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
@@ -77,7 +77,8 @@ objc2-app-kit = { version = "0.2", features = ["NSColor"] }
|
|||||||
codegen-units = 1
|
codegen-units = 1
|
||||||
lto = "thin"
|
lto = "thin"
|
||||||
opt-level = "s"
|
opt-level = "s"
|
||||||
panic = "abort"
|
# 使用 unwind 以便 panic hook 能捕获 backtrace(abort 会直接终止无法捕获)
|
||||||
|
panic = "unwind"
|
||||||
strip = "symbols"
|
strip = "symbols"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
|||||||
@@ -65,6 +65,30 @@ fn wrap_command_for_windows(_obj: &mut Map<String, Value>) {
|
|||||||
// 非 Windows 平台不做任何处理
|
// 非 Windows 平台不做任何处理
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 检测路径是否为 WSL 网络路径(如 \\wsl$\Ubuntu\... 或 \\wsl.localhost\Ubuntu\...)
|
||||||
|
/// WSL 环境运行的是 Linux,不需要 cmd /c 包装
|
||||||
|
/// 注意:仅检测直接 UNC 路径,映射磁盘符(如 Z: -> \\wsl$\...)无法检测
|
||||||
|
#[cfg(windows)]
|
||||||
|
fn is_wsl_path(path: &Path) -> bool {
|
||||||
|
use std::path::{Component, Prefix};
|
||||||
|
if let Some(Component::Prefix(prefix)) = path.components().next() {
|
||||||
|
match prefix.kind() {
|
||||||
|
Prefix::UNC(server, _) | Prefix::VerbatimUNC(server, _) => {
|
||||||
|
let s = server.to_string_lossy();
|
||||||
|
s.eq_ignore_ascii_case("wsl$") || s.eq_ignore_ascii_case("wsl.localhost")
|
||||||
|
}
|
||||||
|
_ => false,
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
fn is_wsl_path(_path: &Path) -> bool {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct McpStatus {
|
pub struct McpStatus {
|
||||||
@@ -371,6 +395,11 @@ pub fn set_mcp_servers_map(
|
|||||||
};
|
};
|
||||||
|
|
||||||
// 构建 mcpServers 对象:移除 UI 辅助字段(enabled/source),仅保留实际 MCP 规范
|
// 构建 mcpServers 对象:移除 UI 辅助字段(enabled/source),仅保留实际 MCP 规范
|
||||||
|
// 检测目标路径是否为 WSL,若是则跳过 cmd /c 包装
|
||||||
|
let is_wsl_target = is_wsl_path(&path);
|
||||||
|
if is_wsl_target {
|
||||||
|
log::info!("检测到 WSL 路径,跳过 cmd /c 包装: {}", path.display());
|
||||||
|
}
|
||||||
let mut out: Map<String, Value> = Map::new();
|
let mut out: Map<String, Value> = Map::new();
|
||||||
for (id, spec) in servers.iter() {
|
for (id, spec) in servers.iter() {
|
||||||
let mut obj = if let Some(map) = spec.as_object() {
|
let mut obj = if let Some(map) = spec.as_object() {
|
||||||
@@ -397,8 +426,10 @@ pub fn set_mcp_servers_map(
|
|||||||
obj.remove("homepage");
|
obj.remove("homepage");
|
||||||
obj.remove("docs");
|
obj.remove("docs");
|
||||||
|
|
||||||
// Windows 平台自动包装 npx/npm 等命令为 cmd /c 格式
|
// Windows 平台自动包装 npx/npm 等命令为 cmd /c 格式(WSL 路径除外)
|
||||||
wrap_command_for_windows(&mut obj);
|
if !is_wsl_target {
|
||||||
|
wrap_command_for_windows(&mut obj);
|
||||||
|
}
|
||||||
|
|
||||||
out.insert(id.clone(), Value::Object(obj));
|
out.insert(id.clone(), Value::Object(obj));
|
||||||
}
|
}
|
||||||
@@ -545,4 +576,68 @@ mod tests {
|
|||||||
assert_eq!(obj["args"], json!(["/c", "NPX", "-y", "foo"]));
|
assert_eq!(obj["args"], json!(["/c", "NPX", "-y", "foo"]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 测试 WSL 路径检测功能
|
||||||
|
#[test]
|
||||||
|
fn test_is_wsl_path_wsl_dollar() {
|
||||||
|
// wsl$ 格式 - 各种发行版
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
assert!(is_wsl_path(Path::new(r"\\wsl$\Ubuntu\home\user\.claude")));
|
||||||
|
assert!(is_wsl_path(Path::new(r"\\wsl$\Debian\home\user\.claude")));
|
||||||
|
assert!(is_wsl_path(Path::new(
|
||||||
|
r"\\wsl$\openSUSE-Leap-15.2\home\user"
|
||||||
|
)));
|
||||||
|
assert!(is_wsl_path(Path::new(r"\\wsl$\kali-linux\home\user")));
|
||||||
|
assert!(is_wsl_path(Path::new(r"\\wsl$\Arch\home\user")));
|
||||||
|
assert!(is_wsl_path(Path::new(r"\\wsl$\Alpine\home\user")));
|
||||||
|
assert!(is_wsl_path(Path::new(r"\\wsl$\Fedora\home\user")));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
// 非 Windows 平台始终返回 false
|
||||||
|
assert!(!is_wsl_path(Path::new(r"\\wsl$\Ubuntu\home\user\.claude")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_is_wsl_path_wsl_localhost() {
|
||||||
|
// wsl.localhost 格式
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
assert!(is_wsl_path(Path::new(
|
||||||
|
r"\\wsl.localhost\Ubuntu\home\user\.claude"
|
||||||
|
)));
|
||||||
|
assert!(is_wsl_path(Path::new(r"\\wsl.localhost\Debian\home\user")));
|
||||||
|
assert!(is_wsl_path(Path::new(
|
||||||
|
r"\\wsl.localhost\openSUSE-Leap-15.2\home\user"
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_is_wsl_path_case_insensitive() {
|
||||||
|
// 大小写不敏感
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
assert!(is_wsl_path(Path::new(r"\\WSL$\Ubuntu\home\user")));
|
||||||
|
assert!(is_wsl_path(Path::new(r"\\Wsl$\Ubuntu\home\user")));
|
||||||
|
assert!(is_wsl_path(Path::new(r"\\WSL.LOCALHOST\Ubuntu\home\user")));
|
||||||
|
assert!(is_wsl_path(Path::new(r"\\Wsl.Localhost\Ubuntu\home\user")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_is_wsl_path_non_wsl() {
|
||||||
|
// 非 WSL 路径
|
||||||
|
assert!(!is_wsl_path(Path::new(r"C:\Users\user\.claude")));
|
||||||
|
assert!(!is_wsl_path(Path::new(r"D:\Workspace\project")));
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
assert!(!is_wsl_path(Path::new(r"\\server\share\path")));
|
||||||
|
assert!(!is_wsl_path(Path::new(r"\\localhost\c$\Users")));
|
||||||
|
assert!(!is_wsl_path(Path::new(r"\\192.168.1.1\share")));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,13 +9,21 @@ use serde_json::Value;
|
|||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
|
||||||
|
/// 获取用户主目录,带回退和日志
|
||||||
|
fn get_home_dir() -> PathBuf {
|
||||||
|
dirs::home_dir().unwrap_or_else(|| {
|
||||||
|
log::warn!("无法获取用户主目录,回退到当前目录");
|
||||||
|
PathBuf::from(".")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/// 获取 Codex 配置目录路径
|
/// 获取 Codex 配置目录路径
|
||||||
pub fn get_codex_config_dir() -> PathBuf {
|
pub fn get_codex_config_dir() -> PathBuf {
|
||||||
if let Some(custom) = crate::settings::get_codex_override_dir() {
|
if let Some(custom) = crate::settings::get_codex_override_dir() {
|
||||||
return custom;
|
return custom;
|
||||||
}
|
}
|
||||||
|
|
||||||
dirs::home_dir().expect("无法获取用户主目录").join(".codex")
|
get_home_dir().join(".codex")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 获取 Codex auth.json 路径
|
/// 获取 Codex auth.json 路径
|
||||||
|
|||||||
@@ -0,0 +1,247 @@
|
|||||||
|
//! 全局出站代理相关命令
|
||||||
|
//!
|
||||||
|
//! 提供获取、设置和测试全局代理的 Tauri 命令。
|
||||||
|
|
||||||
|
use crate::proxy::http_client;
|
||||||
|
use crate::store::AppState;
|
||||||
|
use serde::Serialize;
|
||||||
|
use std::net::{Ipv4Addr, SocketAddrV4, TcpStream};
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
|
/// 获取全局代理 URL
|
||||||
|
///
|
||||||
|
/// 返回当前配置的代理 URL,null 表示直连。
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn get_global_proxy_url(state: tauri::State<'_, AppState>) -> Result<Option<String>, String> {
|
||||||
|
let result = state.db.get_global_proxy_url().map_err(|e| e.to_string())?;
|
||||||
|
log::debug!(
|
||||||
|
"[GlobalProxy] [GP-010] Read from database: {}",
|
||||||
|
result
|
||||||
|
.as_ref()
|
||||||
|
.map(|u| http_client::mask_url(u))
|
||||||
|
.unwrap_or_else(|| "None".to_string())
|
||||||
|
);
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 设置全局代理 URL
|
||||||
|
///
|
||||||
|
/// - 传入非空字符串:启用代理
|
||||||
|
/// - 传入空字符串:清除代理(直连)
|
||||||
|
///
|
||||||
|
/// 执行顺序:先验证 → 写 DB → 再应用
|
||||||
|
/// 这样确保 DB 写失败时不会出现运行态与持久化不一致的问题
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn set_global_proxy_url(state: tauri::State<'_, AppState>, url: String) -> Result<(), String> {
|
||||||
|
// 调试:显示接收到的 URL 信息(不包含敏感内容)
|
||||||
|
let has_auth = url.contains('@') && (url.starts_with("http://") || url.starts_with("socks"));
|
||||||
|
log::debug!(
|
||||||
|
"[GlobalProxy] [GP-011] Received URL: length={}, has_auth={}",
|
||||||
|
url.len(),
|
||||||
|
has_auth
|
||||||
|
);
|
||||||
|
|
||||||
|
let url_opt = if url.trim().is_empty() {
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
Some(url.as_str())
|
||||||
|
};
|
||||||
|
|
||||||
|
// 1. 先验证代理配置是否有效(不应用)
|
||||||
|
http_client::validate_proxy(url_opt)?;
|
||||||
|
|
||||||
|
// 2. 验证成功后保存到数据库
|
||||||
|
state
|
||||||
|
.db
|
||||||
|
.set_global_proxy_url(url_opt)
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
|
// 3. DB 写入成功后再应用到运行态
|
||||||
|
http_client::apply_proxy(url_opt)?;
|
||||||
|
|
||||||
|
log::info!(
|
||||||
|
"[GlobalProxy] [GP-009] Configuration updated: {}",
|
||||||
|
url_opt
|
||||||
|
.map(http_client::mask_url)
|
||||||
|
.unwrap_or_else(|| "direct connection".to_string())
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 代理测试结果
|
||||||
|
#[derive(Debug, Clone, Serialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ProxyTestResult {
|
||||||
|
/// 是否连接成功
|
||||||
|
pub success: bool,
|
||||||
|
/// 延迟(毫秒)
|
||||||
|
pub latency_ms: u64,
|
||||||
|
/// 错误信息
|
||||||
|
pub error: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 测试代理连接
|
||||||
|
///
|
||||||
|
/// 通过指定的代理 URL 发送测试请求,返回连接结果和延迟。
|
||||||
|
/// 使用多个测试目标,任一成功即认为代理可用。
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn test_proxy_url(url: String) -> Result<ProxyTestResult, String> {
|
||||||
|
if url.trim().is_empty() {
|
||||||
|
return Err("Proxy URL is empty".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
let start = Instant::now();
|
||||||
|
|
||||||
|
// 构建带代理的临时客户端
|
||||||
|
let proxy = reqwest::Proxy::all(&url).map_err(|e| format!("Invalid proxy URL: {e}"))?;
|
||||||
|
|
||||||
|
let client = reqwest::Client::builder()
|
||||||
|
.proxy(proxy)
|
||||||
|
.timeout(std::time::Duration::from_secs(10))
|
||||||
|
.connect_timeout(std::time::Duration::from_secs(10))
|
||||||
|
.build()
|
||||||
|
.map_err(|e| format!("Failed to build client: {e}"))?;
|
||||||
|
|
||||||
|
// 使用多个测试目标,提高兼容性
|
||||||
|
// 优先使用 httpbin(专门用于 HTTP 测试),回退到其他公共端点
|
||||||
|
let test_urls = [
|
||||||
|
"https://httpbin.org/get",
|
||||||
|
"https://www.google.com",
|
||||||
|
"https://api.anthropic.com",
|
||||||
|
];
|
||||||
|
|
||||||
|
let mut last_error = None;
|
||||||
|
|
||||||
|
for test_url in test_urls {
|
||||||
|
match client.head(test_url).send().await {
|
||||||
|
Ok(resp) => {
|
||||||
|
let latency = start.elapsed().as_millis() as u64;
|
||||||
|
log::debug!(
|
||||||
|
"[GlobalProxy] Test successful: {} -> {} via {} ({}ms)",
|
||||||
|
http_client::mask_url(&url),
|
||||||
|
test_url,
|
||||||
|
resp.status(),
|
||||||
|
latency
|
||||||
|
);
|
||||||
|
return Ok(ProxyTestResult {
|
||||||
|
success: true,
|
||||||
|
latency_ms: latency,
|
||||||
|
error: None,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
log::debug!("[GlobalProxy] Test to {test_url} failed: {e}");
|
||||||
|
last_error = Some(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 所有测试目标都失败
|
||||||
|
let latency = start.elapsed().as_millis() as u64;
|
||||||
|
let error_msg = last_error
|
||||||
|
.map(|e| e.to_string())
|
||||||
|
.unwrap_or_else(|| "All test targets failed".to_string());
|
||||||
|
|
||||||
|
log::debug!(
|
||||||
|
"[GlobalProxy] Test failed: {} -> {} ({}ms)",
|
||||||
|
http_client::mask_url(&url),
|
||||||
|
error_msg,
|
||||||
|
latency
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(ProxyTestResult {
|
||||||
|
success: false,
|
||||||
|
latency_ms: latency,
|
||||||
|
error: Some(error_msg),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取当前出站代理状态
|
||||||
|
///
|
||||||
|
/// 返回当前是否启用了出站代理以及代理 URL。
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn get_upstream_proxy_status() -> UpstreamProxyStatus {
|
||||||
|
let url = http_client::get_current_proxy_url();
|
||||||
|
UpstreamProxyStatus {
|
||||||
|
enabled: url.is_some(),
|
||||||
|
proxy_url: url,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 出站代理状态信息
|
||||||
|
#[derive(Debug, Clone, Serialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct UpstreamProxyStatus {
|
||||||
|
/// 是否启用代理
|
||||||
|
pub enabled: bool,
|
||||||
|
/// 代理 URL
|
||||||
|
pub proxy_url: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 检测到的代理信息
|
||||||
|
#[derive(Debug, Clone, Serialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct DetectedProxy {
|
||||||
|
/// 代理 URL
|
||||||
|
pub url: String,
|
||||||
|
/// 代理类型 (http/socks5)
|
||||||
|
pub proxy_type: String,
|
||||||
|
/// 端口
|
||||||
|
pub port: u16,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 常见代理端口配置
|
||||||
|
/// 格式:(端口, 主要类型, 是否同时支持 http 和 socks5)
|
||||||
|
/// 对于 mixed 端口,会同时返回两种协议供用户选择
|
||||||
|
const PROXY_PORTS: &[(u16, &str, bool)] = &[
|
||||||
|
(7890, "http", true), // Clash (mixed mode)
|
||||||
|
(7891, "socks5", false), // Clash SOCKS only
|
||||||
|
(1080, "socks5", false), // 通用 SOCKS5
|
||||||
|
(8080, "http", false), // 通用 HTTP
|
||||||
|
(8888, "http", false), // Charles/Fiddler
|
||||||
|
(3128, "http", false), // Squid
|
||||||
|
(10808, "socks5", false), // V2Ray SOCKS
|
||||||
|
(10809, "http", false), // V2Ray HTTP
|
||||||
|
];
|
||||||
|
|
||||||
|
/// 扫描本地代理
|
||||||
|
///
|
||||||
|
/// 检测常见端口是否有代理服务在运行。
|
||||||
|
/// 使用异步任务避免阻塞 UI 线程。
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn scan_local_proxies() -> Vec<DetectedProxy> {
|
||||||
|
// 使用 spawn_blocking 避免阻塞主线程
|
||||||
|
tokio::task::spawn_blocking(|| {
|
||||||
|
let mut found = Vec::new();
|
||||||
|
|
||||||
|
for &(port, primary_type, is_mixed) in PROXY_PORTS {
|
||||||
|
let addr = SocketAddrV4::new(Ipv4Addr::LOCALHOST, port);
|
||||||
|
if TcpStream::connect_timeout(&addr.into(), Duration::from_millis(100)).is_ok() {
|
||||||
|
// 添加主要类型
|
||||||
|
found.push(DetectedProxy {
|
||||||
|
url: format!("{primary_type}://127.0.0.1:{port}"),
|
||||||
|
proxy_type: primary_type.to_string(),
|
||||||
|
port,
|
||||||
|
});
|
||||||
|
// 对于 mixed 端口,同时添加另一种协议
|
||||||
|
if is_mixed {
|
||||||
|
let alt_type = if primary_type == "http" {
|
||||||
|
"socks5"
|
||||||
|
} else {
|
||||||
|
"http"
|
||||||
|
};
|
||||||
|
found.push(DetectedProxy {
|
||||||
|
url: format!("{alt_type}://127.0.0.1:{port}"),
|
||||||
|
proxy_type: alt_type.to_string(),
|
||||||
|
port,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
found
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.unwrap_or_default()
|
||||||
|
}
|
||||||
@@ -1,7 +1,13 @@
|
|||||||
#![allow(non_snake_case)]
|
#![allow(non_snake_case)]
|
||||||
|
|
||||||
|
use crate::app_config::AppType;
|
||||||
use crate::init_status::{InitErrorPayload, SkillsMigrationPayload};
|
use crate::init_status::{InitErrorPayload, SkillsMigrationPayload};
|
||||||
|
use crate::services::ProviderService;
|
||||||
|
use once_cell::sync::Lazy;
|
||||||
|
use regex::Regex;
|
||||||
|
use std::str::FromStr;
|
||||||
use tauri::AppHandle;
|
use tauri::AppHandle;
|
||||||
|
use tauri::State;
|
||||||
use tauri_plugin_opener::OpenerExt;
|
use tauri_plugin_opener::OpenerExt;
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
@@ -85,11 +91,8 @@ pub async fn get_tool_versions() -> Result<Vec<ToolVersion>, String> {
|
|||||||
let tools = vec!["claude", "codex", "gemini"];
|
let tools = vec!["claude", "codex", "gemini"];
|
||||||
let mut results = Vec::new();
|
let mut results = Vec::new();
|
||||||
|
|
||||||
// 用于获取远程版本的 client
|
// 使用全局 HTTP 客户端(已包含代理配置)
|
||||||
let client = reqwest::Client::builder()
|
let client = crate::proxy::http_client::get();
|
||||||
.user_agent("cc-switch/1.0")
|
|
||||||
.build()
|
|
||||||
.map_err(|e| e.to_string())?;
|
|
||||||
|
|
||||||
for tool in tools {
|
for tool in tools {
|
||||||
// 1. 获取本地版本 - 先尝试直接执行,失败则扫描常见路径
|
// 1. 获取本地版本 - 先尝试直接执行,失败则扫描常见路径
|
||||||
@@ -142,11 +145,14 @@ async fn fetch_npm_latest_version(client: &reqwest::Client, package: &str) -> Op
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 预编译的版本号正则表达式
|
||||||
|
static VERSION_RE: Lazy<Regex> =
|
||||||
|
Lazy::new(|| Regex::new(r"\d+\.\d+\.\d+(-[\w.]+)?").expect("Invalid version regex"));
|
||||||
|
|
||||||
/// 从版本输出中提取纯版本号
|
/// 从版本输出中提取纯版本号
|
||||||
fn extract_version(raw: &str) -> String {
|
fn extract_version(raw: &str) -> String {
|
||||||
// 匹配 semver 格式: x.y.z 或 x.y.z-xxx
|
VERSION_RE
|
||||||
let re = regex::Regex::new(r"\d+\.\d+\.\d+(-[\w.]+)?").unwrap();
|
.find(raw)
|
||||||
re.find(raw)
|
|
||||||
.map(|m| m.as_str().to_string())
|
.map(|m| m.as_str().to_string())
|
||||||
.unwrap_or_else(|| raw.to_string())
|
.unwrap_or_else(|| raw.to_string())
|
||||||
}
|
}
|
||||||
@@ -295,3 +301,285 @@ fn scan_cli_version(tool: &str) -> (Option<String>, Option<String>) {
|
|||||||
|
|
||||||
(None, Some("未安装或无法执行".to_string()))
|
(None, Some("未安装或无法执行".to_string()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 打开指定提供商的终端
|
||||||
|
///
|
||||||
|
/// 根据提供商配置的环境变量启动一个带有该提供商特定设置的终端
|
||||||
|
/// 无需检查是否为当前激活的提供商,任何提供商都可以打开终端
|
||||||
|
#[allow(non_snake_case)]
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn open_provider_terminal(
|
||||||
|
state: State<'_, crate::store::AppState>,
|
||||||
|
app: String,
|
||||||
|
#[allow(non_snake_case)] providerId: String,
|
||||||
|
) -> Result<bool, String> {
|
||||||
|
let app_type = AppType::from_str(&app).map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
|
// 获取提供商配置
|
||||||
|
let providers = ProviderService::list(state.inner(), app_type.clone())
|
||||||
|
.map_err(|e| format!("获取提供商列表失败: {e}"))?;
|
||||||
|
|
||||||
|
let provider = providers
|
||||||
|
.get(&providerId)
|
||||||
|
.ok_or_else(|| format!("提供商 {providerId} 不存在"))?;
|
||||||
|
|
||||||
|
// 从提供商配置中提取环境变量
|
||||||
|
let config = &provider.settings_config;
|
||||||
|
let env_vars = extract_env_vars_from_config(config, &app_type);
|
||||||
|
|
||||||
|
// 根据平台启动终端,传入提供商ID用于生成唯一的配置文件名
|
||||||
|
launch_terminal_with_env(env_vars, &providerId).map_err(|e| format!("启动终端失败: {e}"))?;
|
||||||
|
|
||||||
|
Ok(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 从提供商配置中提取环境变量
|
||||||
|
fn extract_env_vars_from_config(
|
||||||
|
config: &serde_json::Value,
|
||||||
|
app_type: &AppType,
|
||||||
|
) -> Vec<(String, String)> {
|
||||||
|
let mut env_vars = Vec::new();
|
||||||
|
|
||||||
|
let Some(obj) = config.as_object() else {
|
||||||
|
return env_vars;
|
||||||
|
};
|
||||||
|
|
||||||
|
// 处理 env 字段(Claude/Gemini 通用)
|
||||||
|
if let Some(env) = obj.get("env").and_then(|v| v.as_object()) {
|
||||||
|
for (key, value) in env {
|
||||||
|
if let Some(str_val) = value.as_str() {
|
||||||
|
env_vars.push((key.clone(), str_val.to_string()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理 base_url: 根据应用类型添加对应的环境变量
|
||||||
|
let base_url_key = match app_type {
|
||||||
|
AppType::Claude => Some("ANTHROPIC_BASE_URL"),
|
||||||
|
AppType::Gemini => Some("GOOGLE_GEMINI_BASE_URL"),
|
||||||
|
_ => None,
|
||||||
|
};
|
||||||
|
|
||||||
|
if let Some(key) = base_url_key {
|
||||||
|
if let Some(url_str) = env.get(key).and_then(|v| v.as_str()) {
|
||||||
|
env_vars.push((key.to_string(), url_str.to_string()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Codex 使用 auth 字段转换为 OPENAI_API_KEY
|
||||||
|
if *app_type == AppType::Codex {
|
||||||
|
if let Some(auth) = obj.get("auth").and_then(|v| v.as_str()) {
|
||||||
|
env_vars.push(("OPENAI_API_KEY".to_string(), auth.to_string()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gemini 使用 api_key 字段转换为 GEMINI_API_KEY
|
||||||
|
if *app_type == AppType::Gemini {
|
||||||
|
if let Some(api_key) = obj.get("api_key").and_then(|v| v.as_str()) {
|
||||||
|
env_vars.push(("GEMINI_API_KEY".to_string(), api_key.to_string()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
env_vars
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 创建临时配置文件并启动 claude 终端
|
||||||
|
/// 使用 --settings 参数传入提供商特定的 API 配置
|
||||||
|
fn launch_terminal_with_env(
|
||||||
|
env_vars: Vec<(String, String)>,
|
||||||
|
provider_id: &str,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let temp_dir = std::env::temp_dir();
|
||||||
|
let config_file = temp_dir.join(format!(
|
||||||
|
"claude_{}_{}.json",
|
||||||
|
provider_id,
|
||||||
|
std::process::id()
|
||||||
|
));
|
||||||
|
|
||||||
|
// 创建并写入配置文件
|
||||||
|
write_claude_config(&config_file, &env_vars)?;
|
||||||
|
|
||||||
|
// 转义配置文件路径用于 shell
|
||||||
|
let config_path_escaped = escape_shell_path(&config_file);
|
||||||
|
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
{
|
||||||
|
launch_macos_terminal(&config_file, &config_path_escaped)?;
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
{
|
||||||
|
launch_linux_terminal(&config_file, &config_path_escaped)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
{
|
||||||
|
launch_windows_terminal(&temp_dir, &config_file)?;
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))]
|
||||||
|
Err("不支持的操作系统".to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 写入 claude 配置文件
|
||||||
|
fn write_claude_config(
|
||||||
|
config_file: &std::path::Path,
|
||||||
|
env_vars: &[(String, String)],
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let mut config_obj = serde_json::Map::new();
|
||||||
|
let mut env_obj = serde_json::Map::new();
|
||||||
|
|
||||||
|
for (key, value) in env_vars {
|
||||||
|
env_obj.insert(key.clone(), serde_json::Value::String(value.clone()));
|
||||||
|
}
|
||||||
|
|
||||||
|
config_obj.insert("env".to_string(), serde_json::Value::Object(env_obj));
|
||||||
|
|
||||||
|
let config_json =
|
||||||
|
serde_json::to_string_pretty(&config_obj).map_err(|e| format!("序列化配置失败: {e}"))?;
|
||||||
|
|
||||||
|
std::fs::write(config_file, config_json).map_err(|e| format!("写入配置文件失败: {e}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 转义 shell 路径
|
||||||
|
fn escape_shell_path(path: &std::path::Path) -> String {
|
||||||
|
path.to_string_lossy()
|
||||||
|
.replace('\\', "\\\\")
|
||||||
|
.replace('"', "\\\"")
|
||||||
|
.replace('$', "\\$")
|
||||||
|
.replace(' ', "\\ ")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 生成 bash 包装脚本,用于清理临时文件
|
||||||
|
fn generate_wrapper_script(config_path: &str, escaped_path: &str) -> String {
|
||||||
|
format!(
|
||||||
|
"bash -c 'trap \"rm -f \\\"{}\\\"\" EXIT; echo \"Using provider-specific claude config:\"; echo \"{}\"; claude --settings \"{}\"; exec bash --norc --noprofile'",
|
||||||
|
config_path, escaped_path, escaped_path
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// macOS: 使用 Terminal.app 启动
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
fn launch_macos_terminal(
|
||||||
|
config_file: &std::path::Path,
|
||||||
|
config_path_escaped: &str,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
let config_path_for_script = config_file.to_string_lossy().replace('\"', "\\\"");
|
||||||
|
|
||||||
|
let shell_script = generate_wrapper_script(&config_path_for_script, config_path_escaped);
|
||||||
|
|
||||||
|
let script = format!(
|
||||||
|
r#"tell application "Terminal"
|
||||||
|
activate
|
||||||
|
do script "{}"
|
||||||
|
end tell"#,
|
||||||
|
shell_script.replace('\"', "\\\"")
|
||||||
|
);
|
||||||
|
|
||||||
|
Command::new("osascript")
|
||||||
|
.arg("-e")
|
||||||
|
.arg(&script)
|
||||||
|
.spawn()
|
||||||
|
.map_err(|e| format!("启动 macOS 终端失败: {e}"))?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Linux: 尝试使用常见终端启动
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
fn launch_linux_terminal(
|
||||||
|
config_file: &std::path::Path,
|
||||||
|
config_path_escaped: &str,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
let terminals = [
|
||||||
|
"gnome-terminal",
|
||||||
|
"konsole",
|
||||||
|
"xfce4-terminal",
|
||||||
|
"mate-terminal",
|
||||||
|
"lxterminal",
|
||||||
|
"alacritty",
|
||||||
|
"kitty",
|
||||||
|
];
|
||||||
|
|
||||||
|
let config_path_for_bash = config_file.to_string_lossy();
|
||||||
|
let shell_cmd = generate_wrapper_script(&config_path_for_bash, config_path_escaped);
|
||||||
|
|
||||||
|
let mut last_error = String::from("未找到可用的终端");
|
||||||
|
|
||||||
|
for terminal in terminals {
|
||||||
|
// 检查终端是否存在
|
||||||
|
if std::path::Path::new(&format!("/usr/bin/{}", terminal)).exists()
|
||||||
|
|| std::path::Path::new(&format!("/bin/{}", terminal)).exists()
|
||||||
|
{
|
||||||
|
let result = match terminal {
|
||||||
|
"gnome-terminal" | "mate-terminal" => Command::new(terminal)
|
||||||
|
.arg("--")
|
||||||
|
.arg("bash")
|
||||||
|
.arg("-c")
|
||||||
|
.arg(&shell_cmd)
|
||||||
|
.spawn(),
|
||||||
|
_ => Command::new(terminal)
|
||||||
|
.arg("-e")
|
||||||
|
.arg("bash")
|
||||||
|
.arg("-c")
|
||||||
|
.arg(&shell_cmd)
|
||||||
|
.spawn(),
|
||||||
|
};
|
||||||
|
|
||||||
|
match result {
|
||||||
|
Ok(_) => return Ok(()),
|
||||||
|
Err(e) => {
|
||||||
|
last_error = format!("启动 {} 失败: {}", terminal, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 清理配置文件
|
||||||
|
let _ = std::fs::remove_file(config_file);
|
||||||
|
Err(last_error)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Windows: 创建临时批处理文件启动
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
fn launch_windows_terminal(
|
||||||
|
temp_dir: &std::path::Path,
|
||||||
|
config_file: &std::path::Path,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
let bat_file = temp_dir.join(format!("cc_switch_claude_{}.bat", std::process::id()));
|
||||||
|
let config_path_for_batch = config_file.to_string_lossy().replace('&', "^&");
|
||||||
|
|
||||||
|
let content = format!(
|
||||||
|
"@echo off
|
||||||
|
echo Using provider-specific claude config:
|
||||||
|
echo {}
|
||||||
|
claude --settings \"{}\"
|
||||||
|
del \"{}\" >nul 2>&1
|
||||||
|
del \"%~f0\" >nul 2>&1
|
||||||
|
if errorlevel 1 (
|
||||||
|
echo.
|
||||||
|
echo Press any key to close...
|
||||||
|
pause >nul
|
||||||
|
)",
|
||||||
|
config_path_for_batch, config_path_for_batch, config_path_for_batch
|
||||||
|
);
|
||||||
|
|
||||||
|
std::fs::write(&bat_file, content).map_err(|e| format!("写入批处理文件失败: {e}"))?;
|
||||||
|
|
||||||
|
Command::new("cmd")
|
||||||
|
.args(["/C", "start", "cmd", "/C", &bat_file.to_string_lossy()])
|
||||||
|
.creation_flags(CREATE_NO_WINDOW)
|
||||||
|
.spawn()
|
||||||
|
.map_err(|e| format!("启动 Windows 终端失败: {e}"))?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ mod config;
|
|||||||
mod deeplink;
|
mod deeplink;
|
||||||
mod env;
|
mod env;
|
||||||
mod failover;
|
mod failover;
|
||||||
|
mod global_proxy;
|
||||||
mod import_export;
|
mod import_export;
|
||||||
mod mcp;
|
mod mcp;
|
||||||
mod misc;
|
mod misc;
|
||||||
@@ -20,6 +21,7 @@ pub use config::*;
|
|||||||
pub use deeplink::*;
|
pub use deeplink::*;
|
||||||
pub use env::*;
|
pub use env::*;
|
||||||
pub use failover::*;
|
pub use failover::*;
|
||||||
|
pub use global_proxy::*;
|
||||||
pub use import_export::*;
|
pub use import_export::*;
|
||||||
pub use mcp::*;
|
pub use mcp::*;
|
||||||
pub use misc::*;
|
pub use misc::*;
|
||||||
|
|||||||
+10
-6
@@ -5,22 +5,26 @@ use std::path::{Path, PathBuf};
|
|||||||
|
|
||||||
use crate::error::AppError;
|
use crate::error::AppError;
|
||||||
|
|
||||||
|
/// 获取用户主目录,带回退和日志
|
||||||
|
fn get_home_dir() -> PathBuf {
|
||||||
|
dirs::home_dir().unwrap_or_else(|| {
|
||||||
|
log::warn!("无法获取用户主目录,回退到当前目录");
|
||||||
|
PathBuf::from(".")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/// 获取 Claude Code 配置目录路径
|
/// 获取 Claude Code 配置目录路径
|
||||||
pub fn get_claude_config_dir() -> PathBuf {
|
pub fn get_claude_config_dir() -> PathBuf {
|
||||||
if let Some(custom) = crate::settings::get_claude_override_dir() {
|
if let Some(custom) = crate::settings::get_claude_override_dir() {
|
||||||
return custom;
|
return custom;
|
||||||
}
|
}
|
||||||
|
|
||||||
dirs::home_dir()
|
get_home_dir().join(".claude")
|
||||||
.expect("无法获取用户主目录")
|
|
||||||
.join(".claude")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 默认 Claude MCP 配置文件路径 (~/.claude.json)
|
/// 默认 Claude MCP 配置文件路径 (~/.claude.json)
|
||||||
pub fn get_default_claude_mcp_path() -> PathBuf {
|
pub fn get_default_claude_mcp_path() -> PathBuf {
|
||||||
dirs::home_dir()
|
get_home_dir().join(".claude.json")
|
||||||
.expect("无法获取用户主目录")
|
|
||||||
.join(".claude.json")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn derive_mcp_path_from_override(dir: &Path) -> Option<PathBuf> {
|
fn derive_mcp_path_from_override(dir: &Path) -> Option<PathBuf> {
|
||||||
|
|||||||
@@ -73,11 +73,14 @@ impl Database {
|
|||||||
params![
|
params![
|
||||||
server.id,
|
server.id,
|
||||||
server.name,
|
server.name,
|
||||||
serde_json::to_string(&server.server).unwrap(),
|
serde_json::to_string(&server.server).map_err(|e| AppError::Database(format!(
|
||||||
|
"Failed to serialize server config: {e}"
|
||||||
|
)))?,
|
||||||
server.description,
|
server.description,
|
||||||
server.homepage,
|
server.homepage,
|
||||||
server.docs,
|
server.docs,
|
||||||
serde_json::to_string(&server.tags).unwrap(),
|
serde_json::to_string(&server.tags)
|
||||||
|
.map_err(|e| AppError::Database(format!("Failed to serialize tags: {e}")))?,
|
||||||
server.apps.claude,
|
server.apps.claude,
|
||||||
server.apps.codex,
|
server.apps.codex,
|
||||||
server.apps.gemini,
|
server.apps.gemini,
|
||||||
|
|||||||
@@ -220,7 +220,9 @@ impl Database {
|
|||||||
WHERE id = ?13 AND app_type = ?14",
|
WHERE id = ?13 AND app_type = ?14",
|
||||||
params![
|
params![
|
||||||
provider.name,
|
provider.name,
|
||||||
serde_json::to_string(&provider.settings_config).unwrap(),
|
serde_json::to_string(&provider.settings_config).map_err(|e| {
|
||||||
|
AppError::Database(format!("Failed to serialize settings_config: {e}"))
|
||||||
|
})?,
|
||||||
provider.website_url,
|
provider.website_url,
|
||||||
provider.category,
|
provider.category,
|
||||||
provider.created_at,
|
provider.created_at,
|
||||||
@@ -228,7 +230,9 @@ impl Database {
|
|||||||
provider.notes,
|
provider.notes,
|
||||||
provider.icon,
|
provider.icon,
|
||||||
provider.icon_color,
|
provider.icon_color,
|
||||||
serde_json::to_string(&meta_clone).unwrap(),
|
serde_json::to_string(&meta_clone).map_err(|e| AppError::Database(format!(
|
||||||
|
"Failed to serialize meta: {e}"
|
||||||
|
)))?,
|
||||||
is_current,
|
is_current,
|
||||||
in_failover_queue,
|
in_failover_queue,
|
||||||
provider.id,
|
provider.id,
|
||||||
@@ -247,7 +251,8 @@ impl Database {
|
|||||||
provider.id,
|
provider.id,
|
||||||
app_type,
|
app_type,
|
||||||
provider.name,
|
provider.name,
|
||||||
serde_json::to_string(&provider.settings_config).unwrap(),
|
serde_json::to_string(&provider.settings_config)
|
||||||
|
.map_err(|e| AppError::Database(format!("Failed to serialize settings_config: {e}")))?,
|
||||||
provider.website_url,
|
provider.website_url,
|
||||||
provider.category,
|
provider.category,
|
||||||
provider.created_at,
|
provider.created_at,
|
||||||
@@ -255,7 +260,8 @@ impl Database {
|
|||||||
provider.notes,
|
provider.notes,
|
||||||
provider.icon,
|
provider.icon,
|
||||||
provider.icon_color,
|
provider.icon_color,
|
||||||
serde_json::to_string(&meta_clone).unwrap(),
|
serde_json::to_string(&meta_clone)
|
||||||
|
.map_err(|e| AppError::Database(format!("Failed to serialize meta: {e}")))?,
|
||||||
is_current,
|
is_current,
|
||||||
in_failover_queue,
|
in_failover_queue,
|
||||||
],
|
],
|
||||||
@@ -324,7 +330,9 @@ impl Database {
|
|||||||
conn.execute(
|
conn.execute(
|
||||||
"UPDATE providers SET settings_config = ?1 WHERE id = ?2 AND app_type = ?3",
|
"UPDATE providers SET settings_config = ?1 WHERE id = ?2 AND app_type = ?3",
|
||||||
params![
|
params![
|
||||||
serde_json::to_string(settings_config).unwrap(),
|
serde_json::to_string(settings_config).map_err(|e| AppError::Database(format!(
|
||||||
|
"Failed to serialize settings_config: {e}"
|
||||||
|
)))?,
|
||||||
provider_id,
|
provider_id,
|
||||||
app_type
|
app_type
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -63,6 +63,41 @@ impl Database {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- 全局出站代理 ---
|
||||||
|
|
||||||
|
/// 全局代理 URL 的存储键名
|
||||||
|
const GLOBAL_PROXY_URL_KEY: &'static str = "global_proxy_url";
|
||||||
|
|
||||||
|
/// 获取全局出站代理 URL
|
||||||
|
///
|
||||||
|
/// 返回 None 表示未配置或已清除代理(直连)
|
||||||
|
/// 返回 Some(url) 表示已配置代理
|
||||||
|
pub fn get_global_proxy_url(&self) -> Result<Option<String>, AppError> {
|
||||||
|
self.get_setting(Self::GLOBAL_PROXY_URL_KEY)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 设置全局出站代理 URL
|
||||||
|
///
|
||||||
|
/// - 传入非空字符串:启用代理
|
||||||
|
/// - 传入空字符串或 None:清除代理设置(直连)
|
||||||
|
pub fn set_global_proxy_url(&self, url: Option<&str>) -> Result<(), AppError> {
|
||||||
|
match url {
|
||||||
|
Some(u) if !u.trim().is_empty() => {
|
||||||
|
self.set_setting(Self::GLOBAL_PROXY_URL_KEY, u.trim())
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
// 清除代理设置
|
||||||
|
let conn = lock_conn!(self.conn);
|
||||||
|
conn.execute(
|
||||||
|
"DELETE FROM settings WHERE key = ?1",
|
||||||
|
params![Self::GLOBAL_PROXY_URL_KEY],
|
||||||
|
)
|
||||||
|
.map_err(|e| AppError::Database(e.to_string()))?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// --- 代理接管状态管理(已废弃,使用 proxy_config.enabled 替代)---
|
// --- 代理接管状态管理(已废弃,使用 proxy_config.enabled 替代)---
|
||||||
|
|
||||||
/// 获取指定应用的代理接管状态
|
/// 获取指定应用的代理接管状态
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ pub struct DeepLinkImportRequest {
|
|||||||
/// Provider homepage URL
|
/// Provider homepage URL
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
pub homepage: Option<String>,
|
pub homepage: Option<String>,
|
||||||
/// API endpoint/base URL
|
/// API endpoint/base URL (supports comma-separated multiple URLs)
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
pub endpoint: Option<String>,
|
pub endpoint: Option<String>,
|
||||||
/// API key
|
/// API key
|
||||||
|
|||||||
@@ -101,9 +101,13 @@ fn parse_provider_deeplink(
|
|||||||
validate_url(hp, "homepage")?;
|
validate_url(hp, "homepage")?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Validate each endpoint (supports comma-separated multiple URLs)
|
||||||
if let Some(ref ep) = endpoint {
|
if let Some(ref ep) = endpoint {
|
||||||
if !ep.is_empty() {
|
for (i, url) in ep.split(',').enumerate() {
|
||||||
validate_url(ep, "endpoint")?;
|
let trimmed = url.trim();
|
||||||
|
if !trimmed.is_empty() {
|
||||||
|
validate_url(trimmed, &format!("endpoint[{i}]"))?;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,12 +33,12 @@ pub fn import_provider_from_deeplink(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Step 1: Merge config file if provided (v3.8+)
|
// Step 1: Merge config file if provided (v3.8+)
|
||||||
let merged_request = parse_and_merge_config(&request)?;
|
let mut merged_request = parse_and_merge_config(&request)?;
|
||||||
|
|
||||||
// Extract required fields (now as Option)
|
// Extract required fields (now as Option)
|
||||||
let app_str = merged_request
|
let app_str = merged_request
|
||||||
.app
|
.app
|
||||||
.as_ref()
|
.clone()
|
||||||
.ok_or_else(|| AppError::InvalidInput("Missing 'app' field for provider".to_string()))?;
|
.ok_or_else(|| AppError::InvalidInput("Missing 'app' field for provider".to_string()))?;
|
||||||
|
|
||||||
let api_key = merged_request.api_key.as_ref().ok_or_else(|| {
|
let api_key = merged_request.api_key.as_ref().ok_or_else(|| {
|
||||||
@@ -51,14 +51,29 @@ pub fn import_provider_from_deeplink(
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
let endpoint = merged_request.endpoint.as_ref().ok_or_else(|| {
|
// Get endpoint: supports comma-separated multiple URLs (first is primary)
|
||||||
|
let endpoint_str = merged_request.endpoint.as_ref().ok_or_else(|| {
|
||||||
AppError::InvalidInput("Endpoint is required (either in URL or config file)".to_string())
|
AppError::InvalidInput("Endpoint is required (either in URL or config file)".to_string())
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
if endpoint.is_empty() {
|
// Parse endpoints: split by comma, first is primary
|
||||||
return Err(AppError::InvalidInput(
|
let all_endpoints: Vec<String> = endpoint_str
|
||||||
"Endpoint cannot be empty".to_string(),
|
.split(',')
|
||||||
));
|
.map(|e| e.trim().to_string())
|
||||||
|
.filter(|e| !e.is_empty())
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
let primary_endpoint = all_endpoints
|
||||||
|
.first()
|
||||||
|
.ok_or_else(|| AppError::InvalidInput("Endpoint cannot be empty".to_string()))?;
|
||||||
|
|
||||||
|
// Auto-infer homepage from endpoint if not provided
|
||||||
|
if merged_request
|
||||||
|
.homepage
|
||||||
|
.as_ref()
|
||||||
|
.is_none_or(|s| s.is_empty())
|
||||||
|
{
|
||||||
|
merged_request.homepage = infer_homepage_from_endpoint(primary_endpoint);
|
||||||
}
|
}
|
||||||
|
|
||||||
let homepage = merged_request.homepage.as_ref().ok_or_else(|| {
|
let homepage = merged_request.homepage.as_ref().ok_or_else(|| {
|
||||||
@@ -73,11 +88,11 @@ pub fn import_provider_from_deeplink(
|
|||||||
|
|
||||||
let name = merged_request
|
let name = merged_request
|
||||||
.name
|
.name
|
||||||
.as_ref()
|
.clone()
|
||||||
.ok_or_else(|| AppError::InvalidInput("Missing 'name' field for provider".to_string()))?;
|
.ok_or_else(|| AppError::InvalidInput("Missing 'name' field for provider".to_string()))?;
|
||||||
|
|
||||||
// Parse app type
|
// Parse app type
|
||||||
let app_type = AppType::from_str(app_str)
|
let app_type = AppType::from_str(&app_str)
|
||||||
.map_err(|_| AppError::InvalidInput(format!("Invalid app type: {app_str}")))?;
|
.map_err(|_| AppError::InvalidInput(format!("Invalid app type: {app_str}")))?;
|
||||||
|
|
||||||
// Build provider configuration based on app type
|
// Build provider configuration based on app type
|
||||||
@@ -97,6 +112,21 @@ pub fn import_provider_from_deeplink(
|
|||||||
// Use ProviderService to add the provider
|
// Use ProviderService to add the provider
|
||||||
ProviderService::add(state, app_type.clone(), provider)?;
|
ProviderService::add(state, app_type.clone(), provider)?;
|
||||||
|
|
||||||
|
// Add extra endpoints as custom endpoints (skip first one as it's the primary)
|
||||||
|
for ep in all_endpoints.iter().skip(1) {
|
||||||
|
let normalized = ep.trim().trim_end_matches('/').to_string();
|
||||||
|
if !normalized.is_empty() {
|
||||||
|
if let Err(e) = ProviderService::add_custom_endpoint(
|
||||||
|
state,
|
||||||
|
app_type.clone(),
|
||||||
|
&provider_id,
|
||||||
|
normalized.clone(),
|
||||||
|
) {
|
||||||
|
log::warn!("Failed to add custom endpoint '{normalized}': {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// If enabled=true, set as current provider
|
// If enabled=true, set as current provider
|
||||||
if merged_request.enabled.unwrap_or(false) {
|
if merged_request.enabled.unwrap_or(false) {
|
||||||
ProviderService::switch(state, app_type.clone(), &provider_id)?;
|
ProviderService::switch(state, app_type.clone(), &provider_id)?;
|
||||||
@@ -138,6 +168,16 @@ pub(crate) fn build_provider_from_request(
|
|||||||
Ok(provider)
|
Ok(provider)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Get primary endpoint from request (first one if comma-separated)
|
||||||
|
fn get_primary_endpoint(request: &DeepLinkImportRequest) -> String {
|
||||||
|
request
|
||||||
|
.endpoint
|
||||||
|
.as_ref()
|
||||||
|
.and_then(|ep| ep.split(',').next())
|
||||||
|
.map(|s| s.trim().to_string())
|
||||||
|
.unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
/// Build provider meta with usage script configuration
|
/// Build provider meta with usage script configuration
|
||||||
fn build_provider_meta(request: &DeepLinkImportRequest) -> Result<Option<ProviderMeta>, AppError> {
|
fn build_provider_meta(request: &DeepLinkImportRequest) -> Result<Option<ProviderMeta>, AppError> {
|
||||||
// Check if any usage script fields are provided
|
// Check if any usage script fields are provided
|
||||||
@@ -165,6 +205,7 @@ fn build_provider_meta(request: &DeepLinkImportRequest) -> Result<Option<Provide
|
|||||||
let enabled = request.usage_enabled.unwrap_or(!code.is_empty());
|
let enabled = request.usage_enabled.unwrap_or(!code.is_empty());
|
||||||
|
|
||||||
// Build UsageScript - use provider's API key and endpoint as defaults
|
// Build UsageScript - use provider's API key and endpoint as defaults
|
||||||
|
// Note: use primary endpoint only (first one if comma-separated)
|
||||||
let usage_script = UsageScript {
|
let usage_script = UsageScript {
|
||||||
enabled,
|
enabled,
|
||||||
language: "javascript".to_string(),
|
language: "javascript".to_string(),
|
||||||
@@ -174,10 +215,14 @@ fn build_provider_meta(request: &DeepLinkImportRequest) -> Result<Option<Provide
|
|||||||
.usage_api_key
|
.usage_api_key
|
||||||
.clone()
|
.clone()
|
||||||
.or_else(|| request.api_key.clone()),
|
.or_else(|| request.api_key.clone()),
|
||||||
base_url: request
|
base_url: request.usage_base_url.clone().or_else(|| {
|
||||||
.usage_base_url
|
let primary = get_primary_endpoint(request);
|
||||||
.clone()
|
if primary.is_empty() {
|
||||||
.or_else(|| request.endpoint.clone()),
|
None
|
||||||
|
} else {
|
||||||
|
Some(primary)
|
||||||
|
}
|
||||||
|
}),
|
||||||
access_token: request.usage_access_token.clone(),
|
access_token: request.usage_access_token.clone(),
|
||||||
user_id: request.usage_user_id.clone(),
|
user_id: request.usage_user_id.clone(),
|
||||||
auto_query_interval: request.usage_auto_interval,
|
auto_query_interval: request.usage_auto_interval,
|
||||||
@@ -198,7 +243,7 @@ fn build_claude_settings(request: &DeepLinkImportRequest) -> serde_json::Value {
|
|||||||
);
|
);
|
||||||
env.insert(
|
env.insert(
|
||||||
"ANTHROPIC_BASE_URL".to_string(),
|
"ANTHROPIC_BASE_URL".to_string(),
|
||||||
json!(request.endpoint.clone().unwrap_or_default()),
|
json!(get_primary_endpoint(request)),
|
||||||
);
|
);
|
||||||
|
|
||||||
// Add default model if provided
|
// Add default model if provided
|
||||||
@@ -271,11 +316,8 @@ fn build_codex_settings(request: &DeepLinkImportRequest) -> serde_json::Value {
|
|||||||
.unwrap_or("gpt-5-codex")
|
.unwrap_or("gpt-5-codex")
|
||||||
.to_string();
|
.to_string();
|
||||||
|
|
||||||
// Endpoint: normalize trailing slashes
|
// Endpoint: normalize trailing slashes (use primary endpoint only)
|
||||||
let endpoint = request
|
let endpoint = get_primary_endpoint(request)
|
||||||
.endpoint
|
|
||||||
.as_deref()
|
|
||||||
.unwrap_or("")
|
|
||||||
.trim()
|
.trim()
|
||||||
.trim_end_matches('/')
|
.trim_end_matches('/')
|
||||||
.to_string();
|
.to_string();
|
||||||
@@ -309,7 +351,7 @@ fn build_gemini_settings(request: &DeepLinkImportRequest) -> serde_json::Value {
|
|||||||
env.insert("GEMINI_API_KEY".to_string(), json!(request.api_key));
|
env.insert("GEMINI_API_KEY".to_string(), json!(request.api_key));
|
||||||
env.insert(
|
env.insert(
|
||||||
"GOOGLE_GEMINI_BASE_URL".to_string(),
|
"GOOGLE_GEMINI_BASE_URL".to_string(),
|
||||||
json!(request.endpoint),
|
json!(get_primary_endpoint(request)),
|
||||||
);
|
);
|
||||||
|
|
||||||
// Add model if provided
|
// Add model if provided
|
||||||
@@ -409,27 +451,26 @@ fn merge_claude_config(
|
|||||||
})?;
|
})?;
|
||||||
|
|
||||||
// Auto-fill API key if not provided in URL
|
// Auto-fill API key if not provided in URL
|
||||||
if request.api_key.is_none() || request.api_key.as_ref().unwrap().is_empty() {
|
if request.api_key.as_ref().is_none_or(|s| s.is_empty()) {
|
||||||
if let Some(token) = env.get("ANTHROPIC_AUTH_TOKEN").and_then(|v| v.as_str()) {
|
if let Some(token) = env.get("ANTHROPIC_AUTH_TOKEN").and_then(|v| v.as_str()) {
|
||||||
request.api_key = Some(token.to_string());
|
request.api_key = Some(token.to_string());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Auto-fill endpoint if not provided in URL
|
// Auto-fill endpoint if not provided in URL
|
||||||
if request.endpoint.is_none() || request.endpoint.as_ref().unwrap().is_empty() {
|
if request.endpoint.as_ref().is_none_or(|s| s.is_empty()) {
|
||||||
if let Some(base_url) = env.get("ANTHROPIC_BASE_URL").and_then(|v| v.as_str()) {
|
if let Some(base_url) = env.get("ANTHROPIC_BASE_URL").and_then(|v| v.as_str()) {
|
||||||
request.endpoint = Some(base_url.to_string());
|
request.endpoint = Some(base_url.to_string());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Auto-fill homepage from endpoint if not provided
|
// Auto-fill homepage from endpoint if not provided
|
||||||
if (request.homepage.is_none() || request.homepage.as_ref().unwrap().is_empty())
|
if request.homepage.as_ref().is_none_or(|s| s.is_empty()) {
|
||||||
&& request.endpoint.is_some()
|
if let Some(endpoint) = request.endpoint.as_ref().filter(|s| !s.is_empty()) {
|
||||||
&& !request.endpoint.as_ref().unwrap().is_empty()
|
request.homepage = infer_homepage_from_endpoint(endpoint);
|
||||||
{
|
if request.homepage.is_none() {
|
||||||
request.homepage = infer_homepage_from_endpoint(request.endpoint.as_ref().unwrap());
|
request.homepage = Some("https://anthropic.com".to_string());
|
||||||
if request.homepage.is_none() {
|
}
|
||||||
request.homepage = Some("https://anthropic.com".to_string());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -468,7 +509,7 @@ fn merge_codex_config(
|
|||||||
config: &serde_json::Value,
|
config: &serde_json::Value,
|
||||||
) -> Result<(), AppError> {
|
) -> Result<(), AppError> {
|
||||||
// Auto-fill API key from auth.OPENAI_API_KEY
|
// Auto-fill API key from auth.OPENAI_API_KEY
|
||||||
if request.api_key.is_none() || request.api_key.as_ref().unwrap().is_empty() {
|
if request.api_key.as_ref().is_none_or(|s| s.is_empty()) {
|
||||||
if let Some(api_key) = config
|
if let Some(api_key) = config
|
||||||
.get("auth")
|
.get("auth")
|
||||||
.and_then(|v| v.get("OPENAI_API_KEY"))
|
.and_then(|v| v.get("OPENAI_API_KEY"))
|
||||||
@@ -483,7 +524,7 @@ fn merge_codex_config(
|
|||||||
// Parse TOML config string to extract base_url and model
|
// Parse TOML config string to extract base_url and model
|
||||||
if let Ok(toml_value) = toml::from_str::<toml::Value>(config_str) {
|
if let Ok(toml_value) = toml::from_str::<toml::Value>(config_str) {
|
||||||
// Extract base_url from model_providers section
|
// Extract base_url from model_providers section
|
||||||
if request.endpoint.is_none() || request.endpoint.as_ref().unwrap().is_empty() {
|
if request.endpoint.as_ref().is_none_or(|s| s.is_empty()) {
|
||||||
if let Some(base_url) = extract_codex_base_url(&toml_value) {
|
if let Some(base_url) = extract_codex_base_url(&toml_value) {
|
||||||
request.endpoint = Some(base_url);
|
request.endpoint = Some(base_url);
|
||||||
}
|
}
|
||||||
@@ -499,13 +540,12 @@ fn merge_codex_config(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Auto-fill homepage from endpoint
|
// Auto-fill homepage from endpoint
|
||||||
if (request.homepage.is_none() || request.homepage.as_ref().unwrap().is_empty())
|
if request.homepage.as_ref().is_none_or(|s| s.is_empty()) {
|
||||||
&& request.endpoint.is_some()
|
if let Some(endpoint) = request.endpoint.as_ref().filter(|s| !s.is_empty()) {
|
||||||
&& !request.endpoint.as_ref().unwrap().is_empty()
|
request.homepage = infer_homepage_from_endpoint(endpoint);
|
||||||
{
|
if request.homepage.is_none() {
|
||||||
request.homepage = infer_homepage_from_endpoint(request.endpoint.as_ref().unwrap());
|
request.homepage = Some("https://openai.com".to_string());
|
||||||
if request.homepage.is_none() {
|
}
|
||||||
request.homepage = Some("https://openai.com".to_string());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -518,14 +558,18 @@ fn merge_gemini_config(
|
|||||||
config: &serde_json::Value,
|
config: &serde_json::Value,
|
||||||
) -> Result<(), AppError> {
|
) -> Result<(), AppError> {
|
||||||
// Gemini uses flat env structure
|
// Gemini uses flat env structure
|
||||||
if request.api_key.is_none() || request.api_key.as_ref().unwrap().is_empty() {
|
if request.api_key.as_ref().is_none_or(|s| s.is_empty()) {
|
||||||
if let Some(api_key) = config.get("GEMINI_API_KEY").and_then(|v| v.as_str()) {
|
if let Some(api_key) = config.get("GEMINI_API_KEY").and_then(|v| v.as_str()) {
|
||||||
request.api_key = Some(api_key.to_string());
|
request.api_key = Some(api_key.to_string());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if request.endpoint.is_none() || request.endpoint.as_ref().unwrap().is_empty() {
|
if request.endpoint.as_ref().is_none_or(|s| s.is_empty()) {
|
||||||
if let Some(base_url) = config.get("GEMINI_BASE_URL").and_then(|v| v.as_str()) {
|
if let Some(base_url) = config
|
||||||
|
.get("GOOGLE_GEMINI_BASE_URL")
|
||||||
|
.or_else(|| config.get("GEMINI_BASE_URL"))
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
{
|
||||||
request.endpoint = Some(base_url.to_string());
|
request.endpoint = Some(base_url.to_string());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -538,13 +582,12 @@ fn merge_gemini_config(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Auto-fill homepage from endpoint
|
// Auto-fill homepage from endpoint
|
||||||
if (request.homepage.is_none() || request.homepage.as_ref().unwrap().is_empty())
|
if request.homepage.as_ref().is_none_or(|s| s.is_empty()) {
|
||||||
&& request.endpoint.is_some()
|
if let Some(endpoint) = request.endpoint.as_ref().filter(|s| !s.is_empty()) {
|
||||||
&& !request.endpoint.as_ref().unwrap().is_empty()
|
request.homepage = infer_homepage_from_endpoint(endpoint);
|
||||||
{
|
if request.homepage.is_none() {
|
||||||
request.homepage = infer_homepage_from_endpoint(request.endpoint.as_ref().unwrap());
|
request.homepage = Some("https://ai.google.dev".to_string());
|
||||||
if request.homepage.is_none() {
|
}
|
||||||
request.homepage = Some("https://ai.google.dev".to_string());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -404,3 +404,57 @@ fn test_parse_skill_deeplink() {
|
|||||||
assert_eq!(request.directory.unwrap(), "skills");
|
assert_eq!(request.directory.unwrap(), "skills");
|
||||||
assert_eq!(request.branch.unwrap(), "dev");
|
assert_eq!(request.branch.unwrap(), "dev");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// =============================================================================
|
||||||
|
// Multiple Endpoints Tests
|
||||||
|
// =============================================================================
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_parse_multiple_endpoints_comma_separated() {
|
||||||
|
let url = "ccswitch://v1/import?resource=provider&app=claude&name=Test&endpoint=https%3A%2F%2Fapi1.example.com,https%3A%2F%2Fapi2.example.com,https%3A%2F%2Fapi3.example.com&apiKey=sk-test";
|
||||||
|
|
||||||
|
let request = parse_deeplink_url(url).unwrap();
|
||||||
|
|
||||||
|
assert!(request.endpoint.is_some());
|
||||||
|
let endpoint = request.endpoint.unwrap();
|
||||||
|
// Should contain all endpoints comma-separated
|
||||||
|
assert!(endpoint.contains("https://api1.example.com"));
|
||||||
|
assert!(endpoint.contains("https://api2.example.com"));
|
||||||
|
assert!(endpoint.contains("https://api3.example.com"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_parse_single_endpoint_backward_compatible() {
|
||||||
|
// Old format with single endpoint should still work
|
||||||
|
let url = "ccswitch://v1/import?resource=provider&app=claude&name=Test&endpoint=https%3A%2F%2Fapi.example.com&apiKey=sk-test";
|
||||||
|
|
||||||
|
let request = parse_deeplink_url(url).unwrap();
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
request.endpoint,
|
||||||
|
Some("https://api.example.com".to_string())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_parse_endpoints_with_spaces_trimmed() {
|
||||||
|
let url = "ccswitch://v1/import?resource=provider&app=claude&name=Test&endpoint=https%3A%2F%2Fapi1.example.com%20,%20https%3A%2F%2Fapi2.example.com&apiKey=sk-test";
|
||||||
|
|
||||||
|
let request = parse_deeplink_url(url).unwrap();
|
||||||
|
|
||||||
|
// Validation should pass (spaces are trimmed during validation)
|
||||||
|
assert!(request.endpoint.is_some());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_infer_homepage_from_endpoint_without_homepage() {
|
||||||
|
// Test that homepage is auto-inferred from endpoint when not provided
|
||||||
|
assert_eq!(
|
||||||
|
infer_homepage_from_endpoint("https://api.cubence.com/v1"),
|
||||||
|
Some("https://cubence.com".to_string())
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
infer_homepage_from_endpoint("https://cubence.com"),
|
||||||
|
Some("https://cubence.com".to_string())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|||||||
@@ -5,15 +5,21 @@ use std::collections::HashMap;
|
|||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
/// 获取用户主目录,带回退和日志
|
||||||
|
fn get_home_dir() -> PathBuf {
|
||||||
|
dirs::home_dir().unwrap_or_else(|| {
|
||||||
|
log::warn!("无法获取用户主目录,回退到当前目录");
|
||||||
|
PathBuf::from(".")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/// 获取 Gemini 配置目录路径(支持设置覆盖)
|
/// 获取 Gemini 配置目录路径(支持设置覆盖)
|
||||||
pub fn get_gemini_dir() -> PathBuf {
|
pub fn get_gemini_dir() -> PathBuf {
|
||||||
if let Some(custom) = crate::settings::get_gemini_override_dir() {
|
if let Some(custom) = crate::settings::get_gemini_override_dir() {
|
||||||
return custom;
|
return custom;
|
||||||
}
|
}
|
||||||
|
|
||||||
dirs::home_dir()
|
get_home_dir().join(".gemini")
|
||||||
.expect("无法获取用户主目录")
|
|
||||||
.join(".gemini")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 获取 Gemini .env 文件路径
|
/// 获取 Gemini .env 文件路径
|
||||||
|
|||||||
@@ -134,6 +134,33 @@ pub fn set_mcp_servers_map(
|
|||||||
obj.remove("homepage");
|
obj.remove("homepage");
|
||||||
obj.remove("docs");
|
obj.remove("docs");
|
||||||
|
|
||||||
|
// Timeout 转换:Claude/Codex 使用 startup_timeout_sec/tool_timeout_sec
|
||||||
|
// Gemini CLI 只支持 timeout(单位 ms)
|
||||||
|
// 默认值:startup=10s, tool=60s
|
||||||
|
const DEFAULT_STARTUP_MS: u64 = 10_000;
|
||||||
|
const DEFAULT_TOOL_MS: u64 = 60_000;
|
||||||
|
|
||||||
|
let extract_timeout =
|
||||||
|
|obj: &mut Map<String, Value>, key: &str, multiplier: u64| -> Option<u64> {
|
||||||
|
obj.remove(key).and_then(|val| {
|
||||||
|
val.as_u64()
|
||||||
|
.map(|n| n * multiplier)
|
||||||
|
.or_else(|| val.as_f64().map(|f| (f * multiplier as f64) as u64))
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
// 分别收集 startup 和 tool timeout,未设置时使用默认值
|
||||||
|
let startup_ms = extract_timeout(&mut obj, "startup_timeout_sec", 1000)
|
||||||
|
.or_else(|| extract_timeout(&mut obj, "startup_timeout_ms", 1))
|
||||||
|
.unwrap_or(DEFAULT_STARTUP_MS);
|
||||||
|
let tool_ms = extract_timeout(&mut obj, "tool_timeout_sec", 1000)
|
||||||
|
.or_else(|| extract_timeout(&mut obj, "tool_timeout_ms", 1))
|
||||||
|
.unwrap_or(DEFAULT_TOOL_MS);
|
||||||
|
|
||||||
|
// 取最大值作为 Gemini timeout
|
||||||
|
let final_timeout = startup_ms.max(tool_ms);
|
||||||
|
obj.insert("timeout".to_string(), Value::Number(final_timeout.into()));
|
||||||
|
|
||||||
out.insert(id.clone(), Value::Object(obj));
|
out.insert(id.clone(), Value::Object(obj));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+107
-9
@@ -13,6 +13,7 @@ mod gemini_config;
|
|||||||
mod gemini_mcp;
|
mod gemini_mcp;
|
||||||
mod init_status;
|
mod init_status;
|
||||||
mod mcp;
|
mod mcp;
|
||||||
|
mod panic_hook;
|
||||||
mod prompt;
|
mod prompt;
|
||||||
mod prompt_files;
|
mod prompt_files;
|
||||||
mod provider;
|
mod provider;
|
||||||
@@ -26,6 +27,7 @@ mod usage_script;
|
|||||||
|
|
||||||
pub use app_config::{AppType, McpApps, McpServer, MultiAppConfig};
|
pub use app_config::{AppType, McpApps, McpServer, MultiAppConfig};
|
||||||
pub use codex_config::{get_codex_auth_path, get_codex_config_path, write_codex_live_atomic};
|
pub use codex_config::{get_codex_auth_path, get_codex_config_path, write_codex_live_atomic};
|
||||||
|
pub use commands::open_provider_terminal;
|
||||||
pub use commands::*;
|
pub use commands::*;
|
||||||
pub use config::{get_claude_mcp_path, get_claude_settings_path, read_json_file};
|
pub use config::{get_claude_mcp_path, get_claude_settings_path, read_json_file};
|
||||||
pub use database::Database;
|
pub use database::Database;
|
||||||
@@ -54,6 +56,37 @@ use tauri::tray::{TrayIconBuilder, TrayIconEvent};
|
|||||||
use tauri::RunEvent;
|
use tauri::RunEvent;
|
||||||
use tauri::{Emitter, Manager};
|
use tauri::{Emitter, Manager};
|
||||||
|
|
||||||
|
fn redact_url_for_log(url_str: &str) -> String {
|
||||||
|
match url::Url::parse(url_str) {
|
||||||
|
Ok(url) => {
|
||||||
|
let mut output = format!("{}://", url.scheme());
|
||||||
|
if let Some(host) = url.host_str() {
|
||||||
|
output.push_str(host);
|
||||||
|
}
|
||||||
|
output.push_str(url.path());
|
||||||
|
|
||||||
|
let mut keys: Vec<String> = url.query_pairs().map(|(k, _)| k.to_string()).collect();
|
||||||
|
keys.sort();
|
||||||
|
keys.dedup();
|
||||||
|
|
||||||
|
if !keys.is_empty() {
|
||||||
|
output.push_str("?[keys:");
|
||||||
|
output.push_str(&keys.join(","));
|
||||||
|
output.push(']');
|
||||||
|
}
|
||||||
|
|
||||||
|
output
|
||||||
|
}
|
||||||
|
Err(_) => {
|
||||||
|
let base = url_str.split('#').next().unwrap_or(url_str);
|
||||||
|
match base.split_once('?') {
|
||||||
|
Some((prefix, _)) => format!("{prefix}?[redacted]"),
|
||||||
|
None => base.to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// 统一处理 ccswitch:// 深链接 URL
|
/// 统一处理 ccswitch:// 深链接 URL
|
||||||
///
|
///
|
||||||
/// - 解析 URL
|
/// - 解析 URL
|
||||||
@@ -69,7 +102,9 @@ fn handle_deeplink_url(
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
log::info!("✓ Deep link URL detected from {source}: {url_str}");
|
let redacted_url = redact_url_for_log(url_str);
|
||||||
|
log::info!("✓ Deep link URL detected from {source}: {redacted_url}");
|
||||||
|
log::debug!("Deep link URL (raw) from {source}: {url_str}");
|
||||||
|
|
||||||
match crate::deeplink::parse_deeplink_url(url_str) {
|
match crate::deeplink::parse_deeplink_url(url_str) {
|
||||||
Ok(request) => {
|
Ok(request) => {
|
||||||
@@ -150,15 +185,18 @@ fn macos_tray_icon() -> Option<Image<'static>> {
|
|||||||
|
|
||||||
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
||||||
pub fn run() {
|
pub fn run() {
|
||||||
|
// 设置 panic hook,在应用崩溃时记录日志到 <app_config_dir>/crash.log(默认 ~/.cc-switch/crash.log)
|
||||||
|
panic_hook::setup_panic_hook();
|
||||||
|
|
||||||
let mut builder = tauri::Builder::default();
|
let mut builder = tauri::Builder::default();
|
||||||
|
|
||||||
#[cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))]
|
#[cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))]
|
||||||
{
|
{
|
||||||
builder = builder.plugin(tauri_plugin_single_instance::init(|app, args, _cwd| {
|
builder = builder.plugin(tauri_plugin_single_instance::init(|app, args, _cwd| {
|
||||||
log::info!("=== Single Instance Callback Triggered ===");
|
log::info!("=== Single Instance Callback Triggered ===");
|
||||||
log::info!("Args count: {}", args.len());
|
log::debug!("Args count: {}", args.len());
|
||||||
for (i, arg) in args.iter().enumerate() {
|
for (i, arg) in args.iter().enumerate() {
|
||||||
log::info!(" arg[{i}]: {arg}");
|
log::debug!(" arg[{i}]: {}", redact_url_for_log(arg));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for deep link URL in args (mainly for Windows/Linux command line)
|
// Check for deep link URL in args (mainly for Windows/Linux command line)
|
||||||
@@ -212,6 +250,10 @@ pub fn run() {
|
|||||||
.plugin(tauri_plugin_opener::init())
|
.plugin(tauri_plugin_opener::init())
|
||||||
.plugin(tauri_plugin_store::Builder::new().build())
|
.plugin(tauri_plugin_store::Builder::new().build())
|
||||||
.setup(|app| {
|
.setup(|app| {
|
||||||
|
// 预先刷新 Store 覆盖配置,确保后续路径读取正确(日志/数据库等)
|
||||||
|
app_store::refresh_app_config_dir_override(app.handle());
|
||||||
|
panic_hook::init_app_config_dir(crate::config::get_app_config_dir());
|
||||||
|
|
||||||
// 注册 Updater 插件(桌面端)
|
// 注册 Updater 插件(桌面端)
|
||||||
#[cfg(desktop)]
|
#[cfg(desktop)]
|
||||||
{
|
{
|
||||||
@@ -223,17 +265,34 @@ pub fn run() {
|
|||||||
log::warn!("初始化 Updater 插件失败,已跳过:{e}");
|
log::warn!("初始化 Updater 插件失败,已跳过:{e}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 初始化日志
|
// 初始化日志(Debug 和 Release 模式都启用 Info 级别)
|
||||||
if cfg!(debug_assertions) {
|
// 日志同时输出到控制台和文件(<app_config_dir>/logs/;若设置了覆盖则使用覆盖目录)
|
||||||
|
{
|
||||||
|
use tauri_plugin_log::{RotationStrategy, Target, TargetKind, TimezoneStrategy};
|
||||||
|
|
||||||
|
let log_dir = panic_hook::get_log_dir();
|
||||||
|
|
||||||
app.handle().plugin(
|
app.handle().plugin(
|
||||||
tauri_plugin_log::Builder::default()
|
tauri_plugin_log::Builder::default()
|
||||||
.level(log::LevelFilter::Info)
|
.level(log::LevelFilter::Info)
|
||||||
|
.targets([
|
||||||
|
// 输出到控制台
|
||||||
|
Target::new(TargetKind::Stdout),
|
||||||
|
// 输出到日志文件
|
||||||
|
Target::new(TargetKind::Folder {
|
||||||
|
path: log_dir,
|
||||||
|
file_name: Some("cc-switch".into()),
|
||||||
|
}),
|
||||||
|
])
|
||||||
|
.rotation_strategy(RotationStrategy::KeepAll)
|
||||||
|
.max_file_size(5_000_000) // 5MB 单文件上限
|
||||||
|
.timezone_strategy(TimezoneStrategy::UseLocal)
|
||||||
.build(),
|
.build(),
|
||||||
)?;
|
)?;
|
||||||
}
|
|
||||||
|
|
||||||
// 预先刷新 Store 覆盖配置,确保 AppState 初始化时可读取到最新路径
|
// 清理旧日志文件,只保留最近 2 个
|
||||||
app_store::refresh_app_config_dir_override(app.handle());
|
panic_hook::cleanup_old_logs();
|
||||||
|
}
|
||||||
|
|
||||||
// 初始化数据库
|
// 初始化数据库
|
||||||
let app_config_dir = crate::config::get_app_config_dir();
|
let app_config_dir = crate::config::get_app_config_dir();
|
||||||
@@ -529,7 +588,7 @@ pub fn run() {
|
|||||||
|
|
||||||
for (i, url) in urls.iter().enumerate() {
|
for (i, url) in urls.iter().enumerate() {
|
||||||
let url_str = url.as_str();
|
let url_str = url.as_str();
|
||||||
log::info!(" URL[{i}]: {url_str}");
|
log::debug!(" URL[{i}]: {}", redact_url_for_log(url_str));
|
||||||
|
|
||||||
if handle_deeplink_url(&app_handle, url_str, true, "on_open_url") {
|
if handle_deeplink_url(&app_handle, url_str, true, "on_open_url") {
|
||||||
break; // Process only first ccswitch:// URL
|
break; // Process only first ccswitch:// URL
|
||||||
@@ -585,6 +644,37 @@ pub fn run() {
|
|||||||
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)));
|
||||||
|
|
||||||
|
// 初始化全局出站代理 HTTP 客户端
|
||||||
|
{
|
||||||
|
let db = &app.state::<AppState>().db;
|
||||||
|
let proxy_url = db.get_global_proxy_url().ok().flatten();
|
||||||
|
|
||||||
|
if let Err(e) = crate::proxy::http_client::init(proxy_url.as_deref()) {
|
||||||
|
log::error!(
|
||||||
|
"[GlobalProxy] [GP-005] Failed to initialize with saved config: {e}"
|
||||||
|
);
|
||||||
|
|
||||||
|
// 清除无效的代理配置
|
||||||
|
if proxy_url.is_some() {
|
||||||
|
log::warn!(
|
||||||
|
"[GlobalProxy] [GP-006] Clearing invalid proxy config from database"
|
||||||
|
);
|
||||||
|
if let Err(clear_err) = db.set_global_proxy_url(None) {
|
||||||
|
log::error!(
|
||||||
|
"[GlobalProxy] [GP-007] Failed to clear invalid config: {clear_err}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用直连模式重新初始化
|
||||||
|
if let Err(fallback_err) = crate::proxy::http_client::init(None) {
|
||||||
|
log::error!(
|
||||||
|
"[GlobalProxy] [GP-008] Failed to initialize direct connection: {fallback_err}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 异常退出恢复 + 代理状态自动恢复
|
// 异常退出恢复 + 代理状态自动恢复
|
||||||
let app_handle = app.handle().clone();
|
let app_handle = app.handle().clone();
|
||||||
tauri::async_runtime::spawn(async move {
|
tauri::async_runtime::spawn(async move {
|
||||||
@@ -774,12 +864,20 @@ pub fn run() {
|
|||||||
commands::get_stream_check_config,
|
commands::get_stream_check_config,
|
||||||
commands::save_stream_check_config,
|
commands::save_stream_check_config,
|
||||||
commands::get_tool_versions,
|
commands::get_tool_versions,
|
||||||
|
// Provider terminal
|
||||||
|
commands::open_provider_terminal,
|
||||||
// Universal Provider management
|
// Universal Provider management
|
||||||
commands::get_universal_providers,
|
commands::get_universal_providers,
|
||||||
commands::get_universal_provider,
|
commands::get_universal_provider,
|
||||||
commands::upsert_universal_provider,
|
commands::upsert_universal_provider,
|
||||||
commands::delete_universal_provider,
|
commands::delete_universal_provider,
|
||||||
commands::sync_universal_provider,
|
commands::sync_universal_provider,
|
||||||
|
// Global upstream proxy
|
||||||
|
commands::get_global_proxy_url,
|
||||||
|
commands::set_global_proxy_url,
|
||||||
|
commands::test_proxy_url,
|
||||||
|
commands::get_upstream_proxy_status,
|
||||||
|
commands::scan_local_proxies,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
let app = builder
|
let app = builder
|
||||||
|
|||||||
@@ -0,0 +1,250 @@
|
|||||||
|
//! Panic Hook 模块
|
||||||
|
//!
|
||||||
|
//! 在应用崩溃时捕获 panic 信息并记录到 `<app_config_dir>/crash.log` 文件中(默认 `~/.cc-switch/crash.log`)。
|
||||||
|
//! 便于用户和开发者诊断闪退问题。
|
||||||
|
|
||||||
|
use std::fs::OpenOptions;
|
||||||
|
use std::io::Write;
|
||||||
|
use std::panic;
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::sync::OnceLock;
|
||||||
|
|
||||||
|
/// 应用版本号(从 Cargo.toml 读取)
|
||||||
|
const APP_VERSION: &str = env!("CARGO_PKG_VERSION");
|
||||||
|
|
||||||
|
/// 日志文件保留数量
|
||||||
|
const LOG_FILES_TO_KEEP: usize = 2;
|
||||||
|
|
||||||
|
static APP_CONFIG_DIR: OnceLock<PathBuf> = OnceLock::new();
|
||||||
|
|
||||||
|
pub fn init_app_config_dir(dir: PathBuf) {
|
||||||
|
let _ = APP_CONFIG_DIR.set(dir);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取默认应用配置目录(不会 panic)
|
||||||
|
fn default_app_config_dir() -> PathBuf {
|
||||||
|
dirs::home_dir()
|
||||||
|
.unwrap_or_else(|| PathBuf::from("."))
|
||||||
|
.join(".cc-switch")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取应用配置目录(优先使用初始化时写入的值;不会 panic)
|
||||||
|
fn get_app_config_dir() -> PathBuf {
|
||||||
|
APP_CONFIG_DIR
|
||||||
|
.get()
|
||||||
|
.cloned()
|
||||||
|
.unwrap_or_else(default_app_config_dir)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取崩溃日志文件路径
|
||||||
|
fn get_crash_log_path() -> PathBuf {
|
||||||
|
get_app_config_dir().join("crash.log")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取日志目录路径
|
||||||
|
pub fn get_log_dir() -> PathBuf {
|
||||||
|
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)
|
||||||
|
fn get_system_info() -> String {
|
||||||
|
let os = std::env::consts::OS;
|
||||||
|
let arch = std::env::consts::ARCH;
|
||||||
|
let family = std::env::consts::FAMILY;
|
||||||
|
|
||||||
|
// 安全获取当前工作目录
|
||||||
|
let cwd = std::env::current_dir()
|
||||||
|
.map(|p| p.display().to_string())
|
||||||
|
.unwrap_or_else(|_| "unknown".to_string());
|
||||||
|
|
||||||
|
// 安全获取当前线程信息
|
||||||
|
let thread = std::thread::current();
|
||||||
|
let thread_name = thread.name().unwrap_or("unnamed");
|
||||||
|
let thread_id = format!("{:?}", thread.id());
|
||||||
|
|
||||||
|
format!(
|
||||||
|
"OS: {os} ({family})\n\
|
||||||
|
Arch: {arch}\n\
|
||||||
|
App Version: {APP_VERSION}\n\
|
||||||
|
Working Dir: {cwd}\n\
|
||||||
|
Thread: {thread_name} (ID: {thread_id})"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 设置 panic hook,捕获崩溃信息并写入日志文件
|
||||||
|
///
|
||||||
|
/// 在应用启动时调用此函数,确保任何 panic 都会被记录。
|
||||||
|
/// 日志格式包含:
|
||||||
|
/// - 时间戳
|
||||||
|
/// - 应用版本和系统信息
|
||||||
|
/// - Panic 信息
|
||||||
|
/// - 发生位置(文件:行号)
|
||||||
|
/// - Backtrace(完整调用栈)
|
||||||
|
pub fn setup_panic_hook() {
|
||||||
|
// 启用 backtrace(确保 release 模式也能捕获)
|
||||||
|
if std::env::var("RUST_BACKTRACE").is_err() {
|
||||||
|
std::env::set_var("RUST_BACKTRACE", "1");
|
||||||
|
}
|
||||||
|
|
||||||
|
let default_hook = panic::take_hook();
|
||||||
|
|
||||||
|
panic::set_hook(Box::new(move |panic_info| {
|
||||||
|
let log_path = get_crash_log_path();
|
||||||
|
|
||||||
|
// 确保目录存在
|
||||||
|
if let Some(parent) = log_path.parent() {
|
||||||
|
let _ = std::fs::create_dir_all(parent);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 构建崩溃信息(使用 catch_unwind 保护时间格式化,避免嵌套 panic)
|
||||||
|
let timestamp = std::panic::catch_unwind(|| {
|
||||||
|
chrono::Local::now()
|
||||||
|
.format("%Y-%m-%d %H:%M:%S%.3f")
|
||||||
|
.to_string()
|
||||||
|
})
|
||||||
|
.unwrap_or_else(|_| {
|
||||||
|
// chrono panic 时回退到 unix timestamp
|
||||||
|
std::time::SystemTime::now()
|
||||||
|
.duration_since(std::time::UNIX_EPOCH)
|
||||||
|
.map(|d| format!("unix:{}.{:03}", d.as_secs(), d.subsec_millis()))
|
||||||
|
.unwrap_or_else(|_| "unknown".to_string())
|
||||||
|
});
|
||||||
|
|
||||||
|
// 获取系统信息
|
||||||
|
let system_info = std::panic::catch_unwind(get_system_info)
|
||||||
|
.unwrap_or_else(|_| "Failed to get system info".to_string());
|
||||||
|
|
||||||
|
// 获取 panic 消息(尝试多种方式提取)
|
||||||
|
let message = if let Some(s) = panic_info.payload().downcast_ref::<&str>() {
|
||||||
|
s.to_string()
|
||||||
|
} else if let Some(s) = panic_info.payload().downcast_ref::<String>() {
|
||||||
|
s.clone()
|
||||||
|
} else {
|
||||||
|
// 尝试使用 Display trait
|
||||||
|
format!("{panic_info}")
|
||||||
|
};
|
||||||
|
|
||||||
|
// 获取位置信息
|
||||||
|
let location = if let Some(loc) = panic_info.location() {
|
||||||
|
format!(
|
||||||
|
"File: {}\n Line: {}\n Column: {}",
|
||||||
|
loc.file(),
|
||||||
|
loc.line(),
|
||||||
|
loc.column()
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
"Unknown location".to_string()
|
||||||
|
};
|
||||||
|
|
||||||
|
// 捕获 backtrace(完整调用栈)
|
||||||
|
let backtrace = std::backtrace::Backtrace::force_capture();
|
||||||
|
let backtrace_str = format!("{backtrace}");
|
||||||
|
|
||||||
|
// 格式化日志条目
|
||||||
|
let separator = "=".repeat(80);
|
||||||
|
let sub_separator = "-".repeat(40);
|
||||||
|
let crash_entry = format!(
|
||||||
|
r#"
|
||||||
|
{separator}
|
||||||
|
[CRASH REPORT] {timestamp}
|
||||||
|
{separator}
|
||||||
|
|
||||||
|
{sub_separator}
|
||||||
|
System Information
|
||||||
|
{sub_separator}
|
||||||
|
{system_info}
|
||||||
|
|
||||||
|
{sub_separator}
|
||||||
|
Error Details
|
||||||
|
{sub_separator}
|
||||||
|
Message: {message}
|
||||||
|
|
||||||
|
Location: {location}
|
||||||
|
|
||||||
|
{sub_separator}
|
||||||
|
Stack Trace (Backtrace)
|
||||||
|
{sub_separator}
|
||||||
|
{backtrace_str}
|
||||||
|
|
||||||
|
{separator}
|
||||||
|
"#
|
||||||
|
);
|
||||||
|
|
||||||
|
// 写入文件(追加模式)
|
||||||
|
if let Ok(mut file) = OpenOptions::new().create(true).append(true).open(&log_path) {
|
||||||
|
let _ = file.write_all(crash_entry.as_bytes());
|
||||||
|
let _ = file.flush();
|
||||||
|
|
||||||
|
// 记录日志文件位置到 stderr
|
||||||
|
eprintln!("\n[CC-Switch] Crash log saved to: {}", log_path.display());
|
||||||
|
}
|
||||||
|
|
||||||
|
// 同时输出到 stderr(便于开发调试)
|
||||||
|
eprintln!("{crash_entry}");
|
||||||
|
|
||||||
|
// 调用默认 hook
|
||||||
|
default_hook(panic_info);
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_crash_log_path() {
|
||||||
|
let path = get_crash_log_path();
|
||||||
|
assert!(path.ends_with("crash.log"));
|
||||||
|
assert!(path.to_string_lossy().contains(".cc-switch"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_system_info() {
|
||||||
|
let info = get_system_info();
|
||||||
|
assert!(info.contains("OS:"));
|
||||||
|
assert!(info.contains("Arch:"));
|
||||||
|
assert!(info.contains("App Version:"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -147,6 +147,9 @@ pub struct ProviderMeta {
|
|||||||
/// 用量查询脚本配置
|
/// 用量查询脚本配置
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
pub usage_script: Option<UsageScript>,
|
pub usage_script: Option<UsageScript>,
|
||||||
|
/// 请求地址管理:测速后自动选择最佳端点
|
||||||
|
#[serde(rename = "endpointAutoSelect", skip_serializing_if = "Option::is_none")]
|
||||||
|
pub endpoint_auto_select: Option<bool>,
|
||||||
/// 合作伙伴标记(前端使用 isPartner,保持字段名一致)
|
/// 合作伙伴标记(前端使用 isPartner,保持字段名一致)
|
||||||
#[serde(rename = "isPartner", skip_serializing_if = "Option::is_none")]
|
#[serde(rename = "isPartner", skip_serializing_if = "Option::is_none")]
|
||||||
pub is_partner: Option<bool>,
|
pub is_partner: Option<bool>,
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
//!
|
//!
|
||||||
//! 实现熔断器模式,用于防止向不健康的供应商发送请求
|
//! 实现熔断器模式,用于防止向不健康的供应商发送请求
|
||||||
|
|
||||||
|
use super::log_codes::cb as log_cb;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::sync::atomic::{AtomicU32, Ordering};
|
use std::sync::atomic::{AtomicU32, Ordering};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
@@ -106,7 +107,6 @@ impl CircuitBreaker {
|
|||||||
/// 更新熔断器配置(热更新,不重置状态)
|
/// 更新熔断器配置(热更新,不重置状态)
|
||||||
pub async fn update_config(&self, new_config: CircuitBreakerConfig) {
|
pub async fn update_config(&self, new_config: CircuitBreakerConfig) {
|
||||||
*self.config.write().await = new_config;
|
*self.config.write().await = new_config;
|
||||||
log::debug!("Circuit breaker config updated");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 判断当前 Provider 是否“可被纳入候选链路”
|
/// 判断当前 Provider 是否“可被纳入候选链路”
|
||||||
@@ -128,7 +128,8 @@ impl CircuitBreaker {
|
|||||||
if opened_at.elapsed().as_secs() >= config.timeout_seconds {
|
if opened_at.elapsed().as_secs() >= config.timeout_seconds {
|
||||||
drop(config); // 释放读锁再转换状态
|
drop(config); // 释放读锁再转换状态
|
||||||
log::info!(
|
log::info!(
|
||||||
"Circuit breaker transitioning from Open to HalfOpen (timeout reached)"
|
"[{}] 熔断器 Open → HalfOpen (超时恢复)",
|
||||||
|
log_cb::OPEN_TO_HALF_OPEN
|
||||||
);
|
);
|
||||||
self.transition_to_half_open().await;
|
self.transition_to_half_open().await;
|
||||||
return true;
|
return true;
|
||||||
@@ -155,7 +156,8 @@ impl CircuitBreaker {
|
|||||||
if opened_at.elapsed().as_secs() >= config.timeout_seconds {
|
if opened_at.elapsed().as_secs() >= config.timeout_seconds {
|
||||||
drop(config); // 释放读锁再转换状态
|
drop(config); // 释放读锁再转换状态
|
||||||
log::info!(
|
log::info!(
|
||||||
"Circuit breaker transitioning from Open to HalfOpen (timeout reached)"
|
"[{}] 熔断器 Open → HalfOpen (超时恢复)",
|
||||||
|
log_cb::OPEN_TO_HALF_OPEN
|
||||||
);
|
);
|
||||||
self.transition_to_half_open().await;
|
self.transition_to_half_open().await;
|
||||||
|
|
||||||
@@ -197,25 +199,17 @@ impl CircuitBreaker {
|
|||||||
self.consecutive_failures.store(0, Ordering::SeqCst);
|
self.consecutive_failures.store(0, Ordering::SeqCst);
|
||||||
self.total_requests.fetch_add(1, Ordering::SeqCst);
|
self.total_requests.fetch_add(1, Ordering::SeqCst);
|
||||||
|
|
||||||
match state {
|
if state == CircuitState::HalfOpen {
|
||||||
CircuitState::HalfOpen => {
|
let successes = self.consecutive_successes.fetch_add(1, Ordering::SeqCst) + 1;
|
||||||
let successes = self.consecutive_successes.fetch_add(1, Ordering::SeqCst) + 1;
|
|
||||||
log::debug!(
|
|
||||||
"Circuit breaker HalfOpen: {} consecutive successes (threshold: {})",
|
|
||||||
successes,
|
|
||||||
config.success_threshold
|
|
||||||
);
|
|
||||||
|
|
||||||
if successes >= config.success_threshold {
|
if successes >= config.success_threshold {
|
||||||
drop(config); // 释放读锁再转换状态
|
drop(config); // 释放读锁再转换状态
|
||||||
log::info!("Circuit breaker transitioning from HalfOpen to Closed (success threshold reached)");
|
log::info!(
|
||||||
self.transition_to_closed().await;
|
"[{}] 熔断器 HalfOpen → Closed (恢复正常)",
|
||||||
}
|
log_cb::HALF_OPEN_TO_CLOSED
|
||||||
|
);
|
||||||
|
self.transition_to_closed().await;
|
||||||
}
|
}
|
||||||
CircuitState::Closed => {
|
|
||||||
log::debug!("Circuit breaker Closed: request succeeded");
|
|
||||||
}
|
|
||||||
_ => {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -236,18 +230,14 @@ impl CircuitBreaker {
|
|||||||
// 重置成功计数
|
// 重置成功计数
|
||||||
self.consecutive_successes.store(0, Ordering::SeqCst);
|
self.consecutive_successes.store(0, Ordering::SeqCst);
|
||||||
|
|
||||||
log::debug!(
|
|
||||||
"Circuit breaker {:?}: {} consecutive failures (threshold: {})",
|
|
||||||
state,
|
|
||||||
failures,
|
|
||||||
config.failure_threshold
|
|
||||||
);
|
|
||||||
|
|
||||||
// 检查是否应该打开熔断器
|
// 检查是否应该打开熔断器
|
||||||
match state {
|
match state {
|
||||||
CircuitState::HalfOpen => {
|
CircuitState::HalfOpen => {
|
||||||
// HalfOpen 状态下失败,立即转为 Open
|
// HalfOpen 状态下失败,立即转为 Open
|
||||||
log::warn!("Circuit breaker HalfOpen probe failed, transitioning to Open");
|
log::warn!(
|
||||||
|
"[{}] 熔断器 HalfOpen 探测失败 → Open",
|
||||||
|
log_cb::HALF_OPEN_PROBE_FAILED
|
||||||
|
);
|
||||||
drop(config);
|
drop(config);
|
||||||
self.transition_to_open().await;
|
self.transition_to_open().await;
|
||||||
}
|
}
|
||||||
@@ -255,9 +245,8 @@ impl CircuitBreaker {
|
|||||||
// 检查连续失败次数
|
// 检查连续失败次数
|
||||||
if failures >= config.failure_threshold {
|
if failures >= config.failure_threshold {
|
||||||
log::warn!(
|
log::warn!(
|
||||||
"Circuit breaker opening due to {} consecutive failures (threshold: {})",
|
"[{}] 熔断器触发: 连续失败 {failures} 次 → Open",
|
||||||
failures,
|
log_cb::TRIGGERED_FAILURES
|
||||||
config.failure_threshold
|
|
||||||
);
|
);
|
||||||
drop(config); // 释放读锁再转换状态
|
drop(config); // 释放读锁再转换状态
|
||||||
self.transition_to_open().await;
|
self.transition_to_open().await;
|
||||||
@@ -268,18 +257,12 @@ impl CircuitBreaker {
|
|||||||
|
|
||||||
if total >= config.min_requests {
|
if total >= config.min_requests {
|
||||||
let error_rate = failed as f64 / total as f64;
|
let error_rate = failed as f64 / total as f64;
|
||||||
log::debug!(
|
|
||||||
"Circuit breaker error rate: {:.2}% ({}/{} requests)",
|
|
||||||
error_rate * 100.0,
|
|
||||||
failed,
|
|
||||||
total
|
|
||||||
);
|
|
||||||
|
|
||||||
if error_rate >= config.error_rate_threshold {
|
if error_rate >= config.error_rate_threshold {
|
||||||
log::warn!(
|
log::warn!(
|
||||||
"Circuit breaker opening due to high error rate: {:.2}% (threshold: {:.2}%)",
|
"[{}] 熔断器触发: 错误率 {:.1}% → Open",
|
||||||
error_rate * 100.0,
|
log_cb::TRIGGERED_ERROR_RATE,
|
||||||
config.error_rate_threshold * 100.0
|
error_rate * 100.0
|
||||||
);
|
);
|
||||||
drop(config); // 释放读锁再转换状态
|
drop(config); // 释放读锁再转换状态
|
||||||
self.transition_to_open().await;
|
self.transition_to_open().await;
|
||||||
@@ -312,22 +295,16 @@ impl CircuitBreaker {
|
|||||||
/// 重置熔断器(手动恢复)
|
/// 重置熔断器(手动恢复)
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
pub async fn reset(&self) {
|
pub async fn reset(&self) {
|
||||||
log::info!("Circuit breaker manually reset to Closed state");
|
log::info!("[{}] 熔断器手动重置 → Closed", log_cb::MANUAL_RESET);
|
||||||
self.transition_to_closed().await;
|
self.transition_to_closed().await;
|
||||||
}
|
}
|
||||||
|
|
||||||
fn allow_half_open_probe(&self) -> AllowResult {
|
fn allow_half_open_probe(&self) -> AllowResult {
|
||||||
// 半开状态限流:只允许有限请求通过进行探测
|
// 半开状态限流:只允许有限请求通过进行探测
|
||||||
// 默认最多允许 1 个请求(可在配置中扩展)
|
|
||||||
let max_half_open_requests = 1u32;
|
let max_half_open_requests = 1u32;
|
||||||
let current = self.half_open_requests.fetch_add(1, Ordering::SeqCst);
|
let current = self.half_open_requests.fetch_add(1, Ordering::SeqCst);
|
||||||
|
|
||||||
if current < max_half_open_requests {
|
if current < max_half_open_requests {
|
||||||
log::debug!(
|
|
||||||
"Circuit breaker HalfOpen: allowing probe request ({}/{})",
|
|
||||||
current + 1,
|
|
||||||
max_half_open_requests
|
|
||||||
);
|
|
||||||
AllowResult {
|
AllowResult {
|
||||||
allowed: true,
|
allowed: true,
|
||||||
used_half_open_permit: true,
|
used_half_open_permit: true,
|
||||||
@@ -335,9 +312,6 @@ impl CircuitBreaker {
|
|||||||
} else {
|
} else {
|
||||||
// 超过限额,回退计数,拒绝请求
|
// 超过限额,回退计数,拒绝请求
|
||||||
self.half_open_requests.fetch_sub(1, Ordering::SeqCst);
|
self.half_open_requests.fetch_sub(1, Ordering::SeqCst);
|
||||||
log::debug!(
|
|
||||||
"Circuit breaker HalfOpen: rejecting request (limit reached: {max_half_open_requests})"
|
|
||||||
);
|
|
||||||
AllowResult {
|
AllowResult {
|
||||||
allowed: false,
|
allowed: false,
|
||||||
used_half_open_permit: false,
|
used_half_open_permit: false,
|
||||||
@@ -349,8 +323,6 @@ impl CircuitBreaker {
|
|||||||
let mut current = self.half_open_requests.load(Ordering::SeqCst);
|
let mut current = self.half_open_requests.load(Ordering::SeqCst);
|
||||||
loop {
|
loop {
|
||||||
if current == 0 {
|
if current == 0 {
|
||||||
// 理论上不应该发生:说明调用方传入的 used_half_open_permit 与实际占用不一致
|
|
||||||
log::debug!("Circuit breaker HalfOpen permit already released (counter=0)");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,12 @@ pub enum ProxyError {
|
|||||||
#[error("地址绑定失败: {0}")]
|
#[error("地址绑定失败: {0}")]
|
||||||
BindFailed(String),
|
BindFailed(String),
|
||||||
|
|
||||||
|
#[error("停止超时")]
|
||||||
|
StopTimeout,
|
||||||
|
|
||||||
|
#[error("停止失败: {0}")]
|
||||||
|
StopFailed(String),
|
||||||
|
|
||||||
#[error("请求转发失败: {0}")]
|
#[error("请求转发失败: {0}")]
|
||||||
ForwardFailed(String),
|
ForwardFailed(String),
|
||||||
|
|
||||||
@@ -113,6 +119,12 @@ impl IntoResponse for ProxyError {
|
|||||||
ProxyError::BindFailed(_) => {
|
ProxyError::BindFailed(_) => {
|
||||||
(StatusCode::INTERNAL_SERVER_ERROR, self.to_string())
|
(StatusCode::INTERNAL_SERVER_ERROR, self.to_string())
|
||||||
}
|
}
|
||||||
|
ProxyError::StopTimeout => {
|
||||||
|
(StatusCode::INTERNAL_SERVER_ERROR, self.to_string())
|
||||||
|
}
|
||||||
|
ProxyError::StopFailed(_) => {
|
||||||
|
(StatusCode::INTERNAL_SERVER_ERROR, self.to_string())
|
||||||
|
}
|
||||||
ProxyError::ForwardFailed(_) => (StatusCode::BAD_GATEWAY, self.to_string()),
|
ProxyError::ForwardFailed(_) => (StatusCode::BAD_GATEWAY, self.to_string()),
|
||||||
ProxyError::NoAvailableProvider => {
|
ProxyError::NoAvailableProvider => {
|
||||||
(StatusCode::SERVICE_UNAVAILABLE, self.to_string())
|
(StatusCode::SERVICE_UNAVAILABLE, self.to_string())
|
||||||
|
|||||||
@@ -86,17 +86,17 @@ impl FailoverSwitchManager {
|
|||||||
let app_enabled = match self.db.get_proxy_config_for_app(app_type).await {
|
let app_enabled = match self.db.get_proxy_config_for_app(app_type).await {
|
||||||
Ok(config) => config.enabled,
|
Ok(config) => config.enabled,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::warn!("[Failover] 无法读取 {app_type} 配置: {e},跳过切换");
|
log::warn!("[FO-002] 无法读取 {app_type} 配置: {e},跳过切换");
|
||||||
return Ok(false);
|
return Ok(false);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if !app_enabled {
|
if !app_enabled {
|
||||||
log::info!("[Failover] {app_type} 未被代理接管(enabled=false),跳过切换");
|
log::debug!("[Failover] {app_type} 未启用代理,跳过切换");
|
||||||
return Ok(false);
|
return Ok(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
log::info!("[Failover] 开始切换供应商: {app_type} -> {provider_name} ({provider_id})");
|
log::info!("[FO-001] 切换: {app_type} → {provider_name}");
|
||||||
|
|
||||||
// 1. 更新数据库 is_current
|
// 1. 更新数据库 is_current
|
||||||
self.db.set_current_provider(app_type, provider_id)?;
|
self.db.set_current_provider(app_type, provider_id)?;
|
||||||
@@ -117,7 +117,7 @@ impl FailoverSwitchManager {
|
|||||||
.update_live_backup_from_provider(app_type, &provider)
|
.update_live_backup_from_provider(app_type, &provider)
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
log::warn!("[Failover] 更新 Live 备份失败: {e}");
|
log::warn!("[FO-003] Live 备份更新失败: {e}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -138,12 +138,10 @@ impl FailoverSwitchManager {
|
|||||||
"source": "failover" // 标识来源是故障转移
|
"source": "failover" // 标识来源是故障转移
|
||||||
});
|
});
|
||||||
if let Err(e) = app.emit("provider-switched", event_data) {
|
if let Err(e) = app.emit("provider-switched", event_data) {
|
||||||
log::error!("[Failover] 发射供应商切换事件失败: {e}");
|
log::error!("[Failover] 发射事件失败: {e}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
log::info!("[Failover] 供应商切换完成: {app_type} -> {provider_name} ({provider_id})");
|
|
||||||
|
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,10 +12,9 @@ use super::{
|
|||||||
ProxyError,
|
ProxyError,
|
||||||
};
|
};
|
||||||
use crate::{app_config::AppType, provider::Provider};
|
use crate::{app_config::AppType, provider::Provider};
|
||||||
use reqwest::{Client, Response};
|
use reqwest::Response;
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::time::Duration;
|
|
||||||
use tokio::sync::RwLock;
|
use tokio::sync::RwLock;
|
||||||
|
|
||||||
/// Headers 黑名单 - 不透传到上游的 Headers
|
/// Headers 黑名单 - 不透传到上游的 Headers
|
||||||
@@ -81,8 +80,6 @@ pub struct ForwardError {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub struct RequestForwarder {
|
pub struct RequestForwarder {
|
||||||
client: Option<Client>,
|
|
||||||
client_init_error: Option<String>,
|
|
||||||
/// 共享的 ProviderRouter(持有熔断器状态)
|
/// 共享的 ProviderRouter(持有熔断器状态)
|
||||||
router: Arc<ProviderRouter>,
|
router: Arc<ProviderRouter>,
|
||||||
status: Arc<RwLock<ProxyStatus>>,
|
status: Arc<RwLock<ProxyStatus>>,
|
||||||
@@ -93,6 +90,8 @@ pub struct RequestForwarder {
|
|||||||
app_handle: Option<tauri::AppHandle>,
|
app_handle: Option<tauri::AppHandle>,
|
||||||
/// 请求开始时的"当前供应商 ID"(用于判断是否需要同步 UI/托盘)
|
/// 请求开始时的"当前供应商 ID"(用于判断是否需要同步 UI/托盘)
|
||||||
current_provider_id_at_start: String,
|
current_provider_id_at_start: String,
|
||||||
|
/// 非流式请求超时(秒)
|
||||||
|
non_streaming_timeout: std::time::Duration,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl RequestForwarder {
|
impl RequestForwarder {
|
||||||
@@ -108,51 +107,14 @@ impl RequestForwarder {
|
|||||||
_streaming_first_byte_timeout: u64,
|
_streaming_first_byte_timeout: u64,
|
||||||
_streaming_idle_timeout: u64,
|
_streaming_idle_timeout: u64,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
// 全局超时设置为 1800 秒(30 分钟),确保业务层超时配置能正常工作
|
|
||||||
// 参考 Claude Code Hub 的 undici 全局超时设计
|
|
||||||
const GLOBAL_TIMEOUT_SECS: u64 = 1800;
|
|
||||||
|
|
||||||
let timeout_secs = if non_streaming_timeout > 0 {
|
|
||||||
non_streaming_timeout
|
|
||||||
} else {
|
|
||||||
GLOBAL_TIMEOUT_SECS
|
|
||||||
};
|
|
||||||
|
|
||||||
// 注意:这里不能用 expect/unwrap。
|
|
||||||
// release 配置为 panic=abort,一旦 build 失败会导致整个应用闪退。
|
|
||||||
// 常见原因:用户环境变量里存在不合法/不支持的代理(HTTP(S)_PROXY/ALL_PROXY 等)。
|
|
||||||
let (client, client_init_error) = match Client::builder()
|
|
||||||
.timeout(Duration::from_secs(timeout_secs))
|
|
||||||
.build()
|
|
||||||
{
|
|
||||||
Ok(client) => (Some(client), None),
|
|
||||||
Err(e) => {
|
|
||||||
// 降级:忽略系统/环境代理,避免因代理配置问题导致整个应用崩溃
|
|
||||||
match Client::builder()
|
|
||||||
.timeout(Duration::from_secs(timeout_secs))
|
|
||||||
.no_proxy()
|
|
||||||
.build()
|
|
||||||
{
|
|
||||||
Ok(client) => (Some(client), Some(e.to_string())),
|
|
||||||
Err(fallback_err) => (
|
|
||||||
None,
|
|
||||||
Some(format!(
|
|
||||||
"Failed to create HTTP client: {e}; no_proxy fallback failed: {fallback_err}"
|
|
||||||
)),
|
|
||||||
),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
client,
|
|
||||||
client_init_error,
|
|
||||||
router,
|
router,
|
||||||
status,
|
status,
|
||||||
current_providers,
|
current_providers,
|
||||||
failover_manager,
|
failover_manager,
|
||||||
app_handle,
|
app_handle,
|
||||||
current_provider_id_at_start,
|
current_provider_id_at_start,
|
||||||
|
non_streaming_timeout: std::time::Duration::from_secs(non_streaming_timeout),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -305,6 +267,14 @@ impl RequestForwarder {
|
|||||||
Some(format!("Provider {} 失败: {}", provider.name, e));
|
Some(format!("Provider {} 失败: {}", provider.name, e));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
log::warn!(
|
||||||
|
"[{}] [FWD-001] Provider {} 失败,切换下一个 ({}/{})",
|
||||||
|
app_type_str,
|
||||||
|
provider.name,
|
||||||
|
attempted_providers,
|
||||||
|
providers.len()
|
||||||
|
);
|
||||||
|
|
||||||
last_error = Some(e);
|
last_error = Some(e);
|
||||||
last_provider = Some(provider.clone());
|
last_provider = Some(provider.clone());
|
||||||
// 继续尝试下一个供应商
|
// 继续尝试下一个供应商
|
||||||
@@ -360,6 +330,8 @@ impl RequestForwarder {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
log::warn!("[{app_type_str}] [FWD-002] 所有 Provider 均失败");
|
||||||
|
|
||||||
Err(ForwardError {
|
Err(ForwardError {
|
||||||
error: last_error.unwrap_or(ProxyError::MaxRetriesExceeded),
|
error: last_error.unwrap_or(ProxyError::MaxRetriesExceeded),
|
||||||
provider: last_provider,
|
provider: last_provider,
|
||||||
@@ -406,16 +378,17 @@ impl RequestForwarder {
|
|||||||
// 默认使用空白名单,过滤所有 _ 前缀字段
|
// 默认使用空白名单,过滤所有 _ 前缀字段
|
||||||
let filtered_body = filter_private_params_with_whitelist(request_body, &[]);
|
let filtered_body = filter_private_params_with_whitelist(request_body, &[]);
|
||||||
|
|
||||||
// 构建请求
|
// 每次请求时获取最新的全局 HTTP 客户端(支持热更新代理配置)
|
||||||
let client = self.client.as_ref().ok_or_else(|| {
|
let client = super::http_client::get();
|
||||||
ProxyError::ForwardFailed(
|
|
||||||
self.client_init_error
|
|
||||||
.clone()
|
|
||||||
.unwrap_or_else(|| "HTTP client is not initialized".to_string()),
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
let mut request = client.post(&url);
|
let mut request = client.post(&url);
|
||||||
|
|
||||||
|
// 只有当 timeout > 0 时才设置请求超时
|
||||||
|
// Duration::ZERO 在 reqwest 中表示"立刻超时"而不是"禁用超时"
|
||||||
|
// 故障转移关闭时会传入 0,此时应该使用 client 的默认超时(600秒)
|
||||||
|
if !self.non_streaming_timeout.is_zero() {
|
||||||
|
request = request.timeout(self.non_streaming_timeout);
|
||||||
|
}
|
||||||
|
|
||||||
// 过滤黑名单 Headers,保护隐私并避免冲突
|
// 过滤黑名单 Headers,保护隐私并避免冲突
|
||||||
for (key, value) in headers {
|
for (key, value) in headers {
|
||||||
if HEADER_BLACKLIST
|
if HEADER_BLACKLIST
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ impl RequestContext {
|
|||||||
.cloned()
|
.cloned()
|
||||||
.ok_or(ProxyError::NoAvailableProvider)?;
|
.ok_or(ProxyError::NoAvailableProvider)?;
|
||||||
|
|
||||||
log::info!(
|
log::debug!(
|
||||||
"[{}] Provider: {}, model: {}, failover chain: {} providers, session: {}",
|
"[{}] Provider: {}, model: {}, failover chain: {} providers, session: {}",
|
||||||
tag,
|
tag,
|
||||||
provider.name,
|
provider.name,
|
||||||
@@ -168,7 +168,6 @@ impl RequestContext {
|
|||||||
.unwrap_or("unknown")
|
.unwrap_or("unknown")
|
||||||
.to_string();
|
.to_string();
|
||||||
|
|
||||||
log::info!("[{}] 从 URI 提取模型: {}", self.tag, self.request_model);
|
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -190,7 +189,7 @@ impl RequestContext {
|
|||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
// 故障转移关闭:不启用超时配置
|
// 故障转移关闭:不启用超时配置
|
||||||
log::info!(
|
log::debug!(
|
||||||
"[{}] Failover disabled, timeout configs are bypassed",
|
"[{}] Failover disabled, timeout configs are bypassed",
|
||||||
self.tag
|
self.tag
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -98,16 +98,6 @@ pub async fn handle_messages(
|
|||||||
let adapter = get_adapter(&AppType::Claude);
|
let adapter = get_adapter(&AppType::Claude);
|
||||||
let needs_transform = adapter.needs_transform(&ctx.provider);
|
let needs_transform = adapter.needs_transform(&ctx.provider);
|
||||||
|
|
||||||
log::info!(
|
|
||||||
"[Claude] Provider: {}, needs_transform: {}, is_stream: {}",
|
|
||||||
ctx.provider.name,
|
|
||||||
needs_transform,
|
|
||||||
is_stream
|
|
||||||
);
|
|
||||||
|
|
||||||
let status = response.status();
|
|
||||||
log::info!("[Claude] 上游响应状态: {status}");
|
|
||||||
|
|
||||||
// Claude 特有:格式转换处理
|
// Claude 特有:格式转换处理
|
||||||
if needs_transform {
|
if needs_transform {
|
||||||
return handle_claude_transform(response, &ctx, &state, &body, is_stream).await;
|
return handle_claude_transform(response, &ctx, &state, &body, is_stream).await;
|
||||||
@@ -131,8 +121,6 @@ async fn handle_claude_transform(
|
|||||||
|
|
||||||
if is_stream {
|
if is_stream {
|
||||||
// 流式响应转换 (OpenAI SSE → Anthropic SSE)
|
// 流式响应转换 (OpenAI SSE → Anthropic SSE)
|
||||||
log::info!("[Claude] 开始流式响应转换 (OpenAI SSE → Anthropic SSE)");
|
|
||||||
|
|
||||||
let stream = response.bytes_stream();
|
let stream = response.bytes_stream();
|
||||||
let sse_stream = create_anthropic_sse_stream(stream);
|
let sse_stream = create_anthropic_sse_stream(stream);
|
||||||
|
|
||||||
@@ -196,13 +184,10 @@ async fn handle_claude_transform(
|
|||||||
);
|
);
|
||||||
|
|
||||||
let body = axum::body::Body::from_stream(logged_stream);
|
let body = axum::body::Body::from_stream(logged_stream);
|
||||||
log::info!("[Claude] ====== 请求结束 (流式转换) ======");
|
|
||||||
return Ok((headers, body).into_response());
|
return Ok((headers, body).into_response());
|
||||||
}
|
}
|
||||||
|
|
||||||
// 非流式响应转换 (OpenAI → Anthropic)
|
// 非流式响应转换 (OpenAI → Anthropic)
|
||||||
log::info!("[Claude] 开始转换响应 (OpenAI → Anthropic)");
|
|
||||||
|
|
||||||
let response_headers = response.headers().clone();
|
let response_headers = response.headers().clone();
|
||||||
|
|
||||||
let body_bytes = response.bytes().await.map_err(|e| {
|
let body_bytes = response.bytes().await.map_err(|e| {
|
||||||
@@ -211,31 +196,17 @@ async fn handle_claude_transform(
|
|||||||
})?;
|
})?;
|
||||||
|
|
||||||
let body_str = String::from_utf8_lossy(&body_bytes);
|
let body_str = String::from_utf8_lossy(&body_bytes);
|
||||||
log::info!("[Claude] OpenAI 响应长度: {} bytes", body_bytes.len());
|
|
||||||
log::debug!("[Claude] OpenAI 原始响应: {body_str}");
|
|
||||||
|
|
||||||
let openai_response: Value = serde_json::from_slice(&body_bytes).map_err(|e| {
|
let openai_response: Value = serde_json::from_slice(&body_bytes).map_err(|e| {
|
||||||
log::error!("[Claude] 解析 OpenAI 响应失败: {e}, body: {body_str}");
|
log::error!("[Claude] 解析 OpenAI 响应失败: {e}, body: {body_str}");
|
||||||
ProxyError::TransformError(format!("Failed to parse OpenAI response: {e}"))
|
ProxyError::TransformError(format!("Failed to parse OpenAI response: {e}"))
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
log::info!("[Claude] 解析 OpenAI 响应成功");
|
|
||||||
log::info!(
|
|
||||||
"[Claude] <<< OpenAI 响应 JSON:\n{}",
|
|
||||||
serde_json::to_string_pretty(&openai_response).unwrap_or_default()
|
|
||||||
);
|
|
||||||
|
|
||||||
let anthropic_response = transform::openai_to_anthropic(openai_response).map_err(|e| {
|
let anthropic_response = transform::openai_to_anthropic(openai_response).map_err(|e| {
|
||||||
log::error!("[Claude] 转换响应失败: {e}");
|
log::error!("[Claude] 转换响应失败: {e}");
|
||||||
e
|
e
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
log::info!("[Claude] 转换响应成功");
|
|
||||||
log::info!(
|
|
||||||
"[Claude] <<< Anthropic 响应 JSON:\n{}",
|
|
||||||
serde_json::to_string_pretty(&anthropic_response).unwrap_or_default()
|
|
||||||
);
|
|
||||||
|
|
||||||
// 记录使用量
|
// 记录使用量
|
||||||
if let Some(usage) = TokenUsage::from_claude_response(&anthropic_response) {
|
if let Some(usage) = TokenUsage::from_claude_response(&anthropic_response) {
|
||||||
let model = anthropic_response
|
let model = anthropic_response
|
||||||
@@ -265,8 +236,6 @@ async fn handle_claude_transform(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
log::info!("[Claude] ====== 请求结束 ======");
|
|
||||||
|
|
||||||
// 构建响应
|
// 构建响应
|
||||||
let mut builder = axum::response::Response::builder().status(status);
|
let mut builder = axum::response::Response::builder().status(status);
|
||||||
|
|
||||||
@@ -285,11 +254,6 @@ async fn handle_claude_transform(
|
|||||||
ProxyError::TransformError(format!("Failed to serialize response: {e}"))
|
ProxyError::TransformError(format!("Failed to serialize response: {e}"))
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
log::info!(
|
|
||||||
"[Claude] 返回转换后的响应, 长度: {} bytes",
|
|
||||||
response_body.len()
|
|
||||||
);
|
|
||||||
|
|
||||||
let body = axum::body::Body::from(response_body);
|
let body = axum::body::Body::from(response_body);
|
||||||
builder.body(body).map_err(|e| {
|
builder.body(body).map_err(|e| {
|
||||||
log::error!("[Claude] 构建响应失败: {e}");
|
log::error!("[Claude] 构建响应失败: {e}");
|
||||||
@@ -307,8 +271,6 @@ pub async fn handle_chat_completions(
|
|||||||
headers: axum::http::HeaderMap,
|
headers: axum::http::HeaderMap,
|
||||||
Json(body): Json<Value>,
|
Json(body): Json<Value>,
|
||||||
) -> Result<axum::response::Response, ProxyError> {
|
) -> Result<axum::response::Response, ProxyError> {
|
||||||
log::info!("[Codex] ====== /v1/chat/completions 请求开始 ======");
|
|
||||||
|
|
||||||
let mut ctx =
|
let mut ctx =
|
||||||
RequestContext::new(&state, &body, &headers, AppType::Codex, "Codex", "codex").await?;
|
RequestContext::new(&state, &body, &headers, AppType::Codex, "Codex", "codex").await?;
|
||||||
|
|
||||||
@@ -317,12 +279,6 @@ pub async fn handle_chat_completions(
|
|||||||
.and_then(|v| v.as_bool())
|
.and_then(|v| v.as_bool())
|
||||||
.unwrap_or(false);
|
.unwrap_or(false);
|
||||||
|
|
||||||
log::info!(
|
|
||||||
"[Codex] 请求模型: {}, 流式: {}",
|
|
||||||
ctx.request_model,
|
|
||||||
is_stream
|
|
||||||
);
|
|
||||||
|
|
||||||
let forwarder = ctx.create_forwarder(&state);
|
let forwarder = ctx.create_forwarder(&state);
|
||||||
let result = match forwarder
|
let result = match forwarder
|
||||||
.forward_with_retry(
|
.forward_with_retry(
|
||||||
@@ -347,8 +303,6 @@ pub async fn handle_chat_completions(
|
|||||||
ctx.provider = result.provider;
|
ctx.provider = result.provider;
|
||||||
let response = result.response;
|
let response = result.response;
|
||||||
|
|
||||||
log::info!("[Codex] 上游响应状态: {}", response.status());
|
|
||||||
|
|
||||||
process_response(response, &ctx, &state, &OPENAI_PARSER_CONFIG).await
|
process_response(response, &ctx, &state, &OPENAI_PARSER_CONFIG).await
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -390,8 +344,6 @@ pub async fn handle_responses(
|
|||||||
ctx.provider = result.provider;
|
ctx.provider = result.provider;
|
||||||
let response = result.response;
|
let response = result.response;
|
||||||
|
|
||||||
log::info!("[Codex] 上游响应状态: {}", response.status());
|
|
||||||
|
|
||||||
process_response(response, &ctx, &state, &CODEX_PARSER_CONFIG).await
|
process_response(response, &ctx, &state, &CODEX_PARSER_CONFIG).await
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -417,8 +369,6 @@ pub async fn handle_gemini(
|
|||||||
.map(|pq| pq.as_str())
|
.map(|pq| pq.as_str())
|
||||||
.unwrap_or(uri.path());
|
.unwrap_or(uri.path());
|
||||||
|
|
||||||
log::info!("[Gemini] 请求端点: {endpoint}");
|
|
||||||
|
|
||||||
let is_stream = body
|
let is_stream = body
|
||||||
.get("stream")
|
.get("stream")
|
||||||
.and_then(|v| v.as_bool())
|
.and_then(|v| v.as_bool())
|
||||||
@@ -448,8 +398,6 @@ pub async fn handle_gemini(
|
|||||||
ctx.provider = result.provider;
|
ctx.provider = result.provider;
|
||||||
let response = result.response;
|
let response = result.response;
|
||||||
|
|
||||||
log::info!("[Gemini] 上游响应状态: {}", response.status());
|
|
||||||
|
|
||||||
process_response(response, &ctx, &state, &GEMINI_PARSER_CONFIG).await
|
process_response(response, &ctx, &state, &GEMINI_PARSER_CONFIG).await
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -508,7 +456,12 @@ async fn log_usage(
|
|||||||
Ok(Some(p)) => {
|
Ok(Some(p)) => {
|
||||||
if let Some(meta) = p.meta {
|
if let Some(meta) = p.meta {
|
||||||
if let Some(cm) = meta.cost_multiplier {
|
if let Some(cm) = meta.cost_multiplier {
|
||||||
Decimal::from_str(&cm).unwrap_or(Decimal::from(1))
|
Decimal::from_str(&cm).unwrap_or_else(|e| {
|
||||||
|
log::warn!(
|
||||||
|
"cost_multiplier 解析失败 (provider_id={provider_id}): {cm} - {e}"
|
||||||
|
);
|
||||||
|
Decimal::from(1)
|
||||||
|
})
|
||||||
} else {
|
} else {
|
||||||
Decimal::from(1)
|
Decimal::from(1)
|
||||||
}
|
}
|
||||||
@@ -535,6 +488,6 @@ async fn log_usage(
|
|||||||
None, // provider_type
|
None, // provider_type
|
||||||
is_streaming,
|
is_streaming,
|
||||||
) {
|
) {
|
||||||
log::warn!("记录使用量失败: {e}");
|
log::warn!("[USG-001] 记录使用量失败: {e}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,301 @@
|
|||||||
|
//! 全局 HTTP 客户端模块
|
||||||
|
//!
|
||||||
|
//! 提供支持全局代理配置的 HTTP 客户端。
|
||||||
|
//! 所有需要发送 HTTP 请求的模块都应使用此模块提供的客户端。
|
||||||
|
|
||||||
|
use once_cell::sync::OnceCell;
|
||||||
|
use reqwest::Client;
|
||||||
|
use std::sync::RwLock;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
/// 全局 HTTP 客户端实例
|
||||||
|
static GLOBAL_CLIENT: OnceCell<RwLock<Client>> = OnceCell::new();
|
||||||
|
|
||||||
|
/// 当前代理 URL(用于日志和状态查询)
|
||||||
|
static CURRENT_PROXY_URL: OnceCell<RwLock<Option<String>>> = OnceCell::new();
|
||||||
|
|
||||||
|
/// 初始化全局 HTTP 客户端
|
||||||
|
///
|
||||||
|
/// 应在应用启动时调用一次。
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
/// * `proxy_url` - 代理 URL,如 `http://127.0.0.1:7890` 或 `socks5://127.0.0.1:1080`
|
||||||
|
/// 传入 None 或空字符串表示直连
|
||||||
|
pub fn init(proxy_url: Option<&str>) -> Result<(), String> {
|
||||||
|
let effective_url = proxy_url.filter(|s| !s.trim().is_empty());
|
||||||
|
let client = build_client(effective_url)?;
|
||||||
|
|
||||||
|
// 尝试初始化全局客户端,如果已存在则记录警告并使用 apply_proxy 更新
|
||||||
|
if GLOBAL_CLIENT.set(RwLock::new(client.clone())).is_err() {
|
||||||
|
log::warn!(
|
||||||
|
"[GlobalProxy] [GP-003] Already initialized, updating instead: {}",
|
||||||
|
effective_url
|
||||||
|
.map(mask_url)
|
||||||
|
.unwrap_or_else(|| "direct connection".to_string())
|
||||||
|
);
|
||||||
|
// 已初始化,改用 apply_proxy 更新
|
||||||
|
return apply_proxy(proxy_url);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 初始化代理 URL 记录
|
||||||
|
let _ = CURRENT_PROXY_URL.set(RwLock::new(effective_url.map(|s| s.to_string())));
|
||||||
|
|
||||||
|
log::info!(
|
||||||
|
"[GlobalProxy] Initialized: {}",
|
||||||
|
effective_url
|
||||||
|
.map(mask_url)
|
||||||
|
.unwrap_or_else(|| "direct connection".to_string())
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 验证代理配置(不应用)
|
||||||
|
///
|
||||||
|
/// 只验证代理 URL 是否有效,不实际更新全局客户端。
|
||||||
|
/// 用于在持久化之前验证配置的有效性。
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
/// * `proxy_url` - 代理 URL,None 或空字符串表示直连
|
||||||
|
///
|
||||||
|
/// # Returns
|
||||||
|
/// 验证成功返回 Ok(()),失败返回错误信息
|
||||||
|
pub fn validate_proxy(proxy_url: Option<&str>) -> Result<(), String> {
|
||||||
|
let effective_url = proxy_url.filter(|s| !s.trim().is_empty());
|
||||||
|
// 只调用 build_client 来验证,但不应用
|
||||||
|
build_client(effective_url)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 应用代理配置(假设已验证)
|
||||||
|
///
|
||||||
|
/// 直接应用代理配置到全局客户端,不做额外验证。
|
||||||
|
/// 应在 validate_proxy 成功后调用。
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
/// * `proxy_url` - 代理 URL,None 或空字符串表示直连
|
||||||
|
pub fn apply_proxy(proxy_url: Option<&str>) -> Result<(), String> {
|
||||||
|
let effective_url = proxy_url.filter(|s| !s.trim().is_empty());
|
||||||
|
let new_client = build_client(effective_url)?;
|
||||||
|
|
||||||
|
// 更新客户端
|
||||||
|
if let Some(lock) = GLOBAL_CLIENT.get() {
|
||||||
|
let mut client = lock.write().map_err(|e| {
|
||||||
|
log::error!("[GlobalProxy] [GP-001] Failed to acquire write lock: {e}");
|
||||||
|
"Failed to update proxy: lock poisoned".to_string()
|
||||||
|
})?;
|
||||||
|
*client = new_client;
|
||||||
|
} else {
|
||||||
|
// 如果还没初始化,则初始化
|
||||||
|
return init(proxy_url);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 更新代理 URL 记录
|
||||||
|
if let Some(lock) = CURRENT_PROXY_URL.get() {
|
||||||
|
let mut url = lock.write().map_err(|e| {
|
||||||
|
log::error!("[GlobalProxy] [GP-002] Failed to acquire URL write lock: {e}");
|
||||||
|
"Failed to update proxy URL record: lock poisoned".to_string()
|
||||||
|
})?;
|
||||||
|
*url = effective_url.map(|s| s.to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
log::info!(
|
||||||
|
"[GlobalProxy] Applied: {}",
|
||||||
|
effective_url
|
||||||
|
.map(mask_url)
|
||||||
|
.unwrap_or_else(|| "direct connection".to_string())
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 更新代理配置(热更新)
|
||||||
|
///
|
||||||
|
/// 可在运行时调用以更改代理设置,无需重启应用。
|
||||||
|
/// 注意:此函数同时验证和应用,如果需要先验证后持久化再应用,
|
||||||
|
/// 请使用 validate_proxy + apply_proxy 组合。
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
/// * `proxy_url` - 新的代理 URL,None 或空字符串表示直连
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub fn update_proxy(proxy_url: Option<&str>) -> Result<(), String> {
|
||||||
|
let effective_url = proxy_url.filter(|s| !s.trim().is_empty());
|
||||||
|
let new_client = build_client(effective_url)?;
|
||||||
|
|
||||||
|
// 更新客户端
|
||||||
|
if let Some(lock) = GLOBAL_CLIENT.get() {
|
||||||
|
let mut client = lock.write().map_err(|e| {
|
||||||
|
log::error!("[GlobalProxy] [GP-001] Failed to acquire write lock: {e}");
|
||||||
|
"Failed to update proxy: lock poisoned".to_string()
|
||||||
|
})?;
|
||||||
|
*client = new_client;
|
||||||
|
} else {
|
||||||
|
// 如果还没初始化,则初始化
|
||||||
|
return init(proxy_url);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 更新代理 URL 记录
|
||||||
|
if let Some(lock) = CURRENT_PROXY_URL.get() {
|
||||||
|
let mut url = lock.write().map_err(|e| {
|
||||||
|
log::error!("[GlobalProxy] [GP-002] Failed to acquire URL write lock: {e}");
|
||||||
|
"Failed to update proxy URL record: lock poisoned".to_string()
|
||||||
|
})?;
|
||||||
|
*url = effective_url.map(|s| s.to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
log::info!(
|
||||||
|
"[GlobalProxy] Updated: {}",
|
||||||
|
effective_url
|
||||||
|
.map(mask_url)
|
||||||
|
.unwrap_or_else(|| "direct connection".to_string())
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取全局 HTTP 客户端
|
||||||
|
///
|
||||||
|
/// 返回配置了代理的客户端(如果已配置代理),否则返回直连客户端。
|
||||||
|
pub fn get() -> Client {
|
||||||
|
GLOBAL_CLIENT
|
||||||
|
.get()
|
||||||
|
.and_then(|lock| lock.read().ok())
|
||||||
|
.map(|c| c.clone())
|
||||||
|
.unwrap_or_else(|| {
|
||||||
|
// 如果还没初始化,创建一个默认客户端(配置与 build_client 一致)
|
||||||
|
log::warn!("[GlobalProxy] [GP-004] Client not initialized, using fallback");
|
||||||
|
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))
|
||||||
|
.no_proxy()
|
||||||
|
.build()
|
||||||
|
.unwrap_or_default()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取当前代理 URL
|
||||||
|
///
|
||||||
|
/// 返回当前配置的代理 URL,None 表示直连。
|
||||||
|
pub fn get_current_proxy_url() -> Option<String> {
|
||||||
|
CURRENT_PROXY_URL
|
||||||
|
.get()
|
||||||
|
.and_then(|lock| lock.read().ok())
|
||||||
|
.and_then(|url| url.clone())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 检查是否正在使用代理
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub fn is_proxy_enabled() -> bool {
|
||||||
|
get_current_proxy_url().is_some()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 构建 HTTP 客户端
|
||||||
|
fn build_client(proxy_url: Option<&str>) -> Result<Client, String> {
|
||||||
|
let mut builder = 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));
|
||||||
|
|
||||||
|
// 有代理地址则使用代理,否则直连
|
||||||
|
if let Some(url) = proxy_url {
|
||||||
|
// 先验证 URL 格式和 scheme
|
||||||
|
let parsed = url::Url::parse(url)
|
||||||
|
.map_err(|e| format!("Invalid proxy URL '{}': {}", mask_url(url), e))?;
|
||||||
|
|
||||||
|
let scheme = parsed.scheme();
|
||||||
|
if !["http", "https", "socks5", "socks5h"].contains(&scheme) {
|
||||||
|
return Err(format!(
|
||||||
|
"Invalid proxy scheme '{}' in URL '{}'. Supported: http, https, socks5, socks5h",
|
||||||
|
scheme,
|
||||||
|
mask_url(url)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
let proxy = reqwest::Proxy::all(url)
|
||||||
|
.map_err(|e| format!("Invalid proxy URL '{}': {}", mask_url(url), e))?;
|
||||||
|
builder = builder.proxy(proxy);
|
||||||
|
log::debug!("[GlobalProxy] Proxy configured: {}", mask_url(url));
|
||||||
|
} else {
|
||||||
|
builder = builder.no_proxy();
|
||||||
|
log::debug!("[GlobalProxy] Direct connection (no proxy)");
|
||||||
|
}
|
||||||
|
|
||||||
|
builder
|
||||||
|
.build()
|
||||||
|
.map_err(|e| format!("Failed to build HTTP client: {e}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 隐藏 URL 中的敏感信息(用于日志)
|
||||||
|
pub fn mask_url(url: &str) -> String {
|
||||||
|
if let Ok(parsed) = url::Url::parse(url) {
|
||||||
|
// 隐藏用户名和密码,保留 scheme、host 和端口
|
||||||
|
let host = parsed.host_str().unwrap_or("?");
|
||||||
|
match parsed.port() {
|
||||||
|
Some(port) => format!("{}://{}:{}", parsed.scheme(), host, port),
|
||||||
|
None => format!("{}://{}", parsed.scheme(), host),
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// URL 解析失败,返回部分内容
|
||||||
|
if url.len() > 20 {
|
||||||
|
format!("{}...", &url[..20])
|
||||||
|
} else {
|
||||||
|
url.to_string()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_mask_url() {
|
||||||
|
assert_eq!(mask_url("http://127.0.0.1:7890"), "http://127.0.0.1:7890");
|
||||||
|
assert_eq!(
|
||||||
|
mask_url("http://user:pass@127.0.0.1:7890"),
|
||||||
|
"http://127.0.0.1:7890"
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
mask_url("socks5://admin:secret@proxy.example.com:1080"),
|
||||||
|
"socks5://proxy.example.com:1080"
|
||||||
|
);
|
||||||
|
// 无端口的 URL 不应显示 ":?"
|
||||||
|
assert_eq!(
|
||||||
|
mask_url("http://proxy.example.com"),
|
||||||
|
"http://proxy.example.com"
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
mask_url("https://user:pass@proxy.example.com"),
|
||||||
|
"https://proxy.example.com"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_build_client_direct() {
|
||||||
|
let result = build_client(None);
|
||||||
|
assert!(result.is_ok());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_build_client_with_http_proxy() {
|
||||||
|
let result = build_client(Some("http://127.0.0.1:7890"));
|
||||||
|
assert!(result.is_ok());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_build_client_with_socks5_proxy() {
|
||||||
|
let result = build_client(Some("socks5://127.0.0.1:1080"));
|
||||||
|
assert!(result.is_ok());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_build_client_invalid_url() {
|
||||||
|
// reqwest::Proxy::all 对某些无效 URL 不会立即报错
|
||||||
|
// 使用明确无效的 scheme 来触发错误
|
||||||
|
let result = build_client(Some("invalid-scheme://127.0.0.1:7890"));
|
||||||
|
assert!(result.is_err(), "Should reject invalid proxy scheme");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
//! 代理模块日志错误码定义
|
||||||
|
//!
|
||||||
|
//! 格式: [模块-编号] 消息
|
||||||
|
//! - CB: Circuit Breaker (熔断器)
|
||||||
|
//! - SRV: Server (服务器)
|
||||||
|
//! - FWD: Forwarder (转发器)
|
||||||
|
//! - FO: Failover (故障转移)
|
||||||
|
//! - RSP: Response (响应处理)
|
||||||
|
//! - USG: Usage (使用量)
|
||||||
|
|
||||||
|
#![allow(dead_code)]
|
||||||
|
|
||||||
|
/// 熔断器日志码
|
||||||
|
pub mod cb {
|
||||||
|
pub const OPEN_TO_HALF_OPEN: &str = "CB-001";
|
||||||
|
pub const HALF_OPEN_TO_CLOSED: &str = "CB-002";
|
||||||
|
pub const HALF_OPEN_PROBE_FAILED: &str = "CB-003";
|
||||||
|
pub const TRIGGERED_FAILURES: &str = "CB-004";
|
||||||
|
pub const TRIGGERED_ERROR_RATE: &str = "CB-005";
|
||||||
|
pub const MANUAL_RESET: &str = "CB-006";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 服务器日志码
|
||||||
|
pub mod srv {
|
||||||
|
pub const STARTED: &str = "SRV-001";
|
||||||
|
pub const STOPPED: &str = "SRV-002";
|
||||||
|
pub const STOP_TIMEOUT: &str = "SRV-003";
|
||||||
|
pub const TASK_ERROR: &str = "SRV-004";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 转发器日志码
|
||||||
|
pub mod fwd {
|
||||||
|
pub const PROVIDER_FAILED_RETRY: &str = "FWD-001";
|
||||||
|
pub const ALL_PROVIDERS_FAILED: &str = "FWD-002";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 故障转移日志码
|
||||||
|
pub mod fo {
|
||||||
|
pub const SWITCH_SUCCESS: &str = "FO-001";
|
||||||
|
pub const CONFIG_READ_ERROR: &str = "FO-002";
|
||||||
|
pub const LIVE_BACKUP_ERROR: &str = "FO-003";
|
||||||
|
pub const ALL_CIRCUIT_OPEN: &str = "FO-004";
|
||||||
|
pub const NO_PROVIDERS: &str = "FO-005";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 响应处理日志码
|
||||||
|
pub mod rsp {
|
||||||
|
pub const BUILD_STREAM_ERROR: &str = "RSP-001";
|
||||||
|
pub const READ_BODY_ERROR: &str = "RSP-002";
|
||||||
|
pub const BUILD_RESPONSE_ERROR: &str = "RSP-003";
|
||||||
|
pub const STREAM_TIMEOUT: &str = "RSP-004";
|
||||||
|
pub const STREAM_ERROR: &str = "RSP-005";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 使用量日志码
|
||||||
|
pub mod usg {
|
||||||
|
pub const LOG_FAILED: &str = "USG-001";
|
||||||
|
pub const PRICING_NOT_FOUND: &str = "USG-002";
|
||||||
|
}
|
||||||
@@ -12,6 +12,8 @@ pub mod handler_config;
|
|||||||
pub mod handler_context;
|
pub mod handler_context;
|
||||||
mod handlers;
|
mod handlers;
|
||||||
mod health;
|
mod health;
|
||||||
|
pub mod http_client;
|
||||||
|
pub mod log_codes;
|
||||||
pub mod model_mapper;
|
pub mod model_mapper;
|
||||||
pub mod provider_router;
|
pub mod provider_router;
|
||||||
pub mod providers;
|
pub mod providers;
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ pub fn apply_model_mapping(
|
|||||||
let mapped = mapping.map_model(original, has_thinking);
|
let mapped = mapping.map_model(original, has_thinking);
|
||||||
|
|
||||||
if mapped != *original {
|
if mapped != *original {
|
||||||
log::info!("[ModelMapper] 模型映射: {original} → {mapped}");
|
log::debug!("[ModelMapper] 模型映射: {original} → {mapped}");
|
||||||
body["model"] = serde_json::json!(mapped);
|
body["model"] = serde_json::json!(mapped);
|
||||||
return (body, Some(original.clone()), Some(mapped));
|
return (body, Some(original.clone()), Some(mapped));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,15 +39,9 @@ impl ProviderRouter {
|
|||||||
|
|
||||||
// 检查该应用的自动故障转移开关是否开启(从 proxy_config 表读取)
|
// 检查该应用的自动故障转移开关是否开启(从 proxy_config 表读取)
|
||||||
let auto_failover_enabled = match self.db.get_proxy_config_for_app(app_type).await {
|
let auto_failover_enabled = match self.db.get_proxy_config_for_app(app_type).await {
|
||||||
Ok(config) => {
|
Ok(config) => config.auto_failover_enabled,
|
||||||
let enabled = config.auto_failover_enabled;
|
|
||||||
log::info!("[{app_type}] Failover enabled from proxy_config: {enabled}");
|
|
||||||
enabled
|
|
||||||
}
|
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!(
|
log::error!("[{app_type}] 读取 proxy_config 失败: {e},默认禁用故障转移");
|
||||||
"[{app_type}] Failed to read proxy_config for auto_failover_enabled: {e}, defaulting to disabled"
|
|
||||||
);
|
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -56,85 +50,37 @@ impl ProviderRouter {
|
|||||||
// 故障转移开启:使用 in_failover_queue 标记的供应商,按 sort_index 排序
|
// 故障转移开启:使用 in_failover_queue 标记的供应商,按 sort_index 排序
|
||||||
let failover_providers = self.db.get_failover_providers(app_type)?;
|
let failover_providers = self.db.get_failover_providers(app_type)?;
|
||||||
total_providers = failover_providers.len();
|
total_providers = failover_providers.len();
|
||||||
log::debug!("[{app_type}] Found {total_providers} failover queue provider(s)");
|
|
||||||
log::info!(
|
|
||||||
"[{app_type}] Failover enabled, using queue order ({total_providers} items)"
|
|
||||||
);
|
|
||||||
|
|
||||||
for provider in failover_providers {
|
for provider in failover_providers {
|
||||||
// 检查熔断器状态
|
|
||||||
let circuit_key = format!("{}:{}", app_type, provider.id);
|
let circuit_key = format!("{}:{}", app_type, provider.id);
|
||||||
let breaker = self.get_or_create_circuit_breaker(&circuit_key).await;
|
let breaker = self.get_or_create_circuit_breaker(&circuit_key).await;
|
||||||
let state = breaker.get_state().await;
|
|
||||||
|
|
||||||
if breaker.is_available().await {
|
if breaker.is_available().await {
|
||||||
log::debug!(
|
|
||||||
"[{}] Queue provider available: {} ({}) (state: {:?})",
|
|
||||||
app_type,
|
|
||||||
provider.name,
|
|
||||||
provider.id,
|
|
||||||
state
|
|
||||||
);
|
|
||||||
log::info!(
|
|
||||||
"[{}] Queue provider available: {} ({}) at sort_index {:?}",
|
|
||||||
app_type,
|
|
||||||
provider.name,
|
|
||||||
provider.id,
|
|
||||||
provider.sort_index
|
|
||||||
);
|
|
||||||
result.push(provider);
|
result.push(provider);
|
||||||
} else {
|
} else {
|
||||||
circuit_open_count += 1;
|
circuit_open_count += 1;
|
||||||
log::debug!(
|
|
||||||
"[{}] Queue provider {} circuit breaker open (state: {:?}), skipping",
|
|
||||||
app_type,
|
|
||||||
provider.name,
|
|
||||||
state
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// 故障转移关闭:仅使用当前供应商,跳过熔断器检查
|
// 故障转移关闭:仅使用当前供应商,跳过熔断器检查
|
||||||
// 原因:单 Provider 场景下,熔断器打开会导致所有请求失败,用户体验差
|
|
||||||
log::info!("[{app_type}] Failover disabled, using current provider only (circuit breaker bypassed)");
|
|
||||||
|
|
||||||
if let Some(current_id) = self.db.get_current_provider(app_type)? {
|
if let Some(current_id) = self.db.get_current_provider(app_type)? {
|
||||||
if let Some(current) = self.db.get_provider_by_id(¤t_id, app_type)? {
|
if let Some(current) = self.db.get_provider_by_id(¤t_id, app_type)? {
|
||||||
log::info!(
|
|
||||||
"[{}] Current provider: {} ({})",
|
|
||||||
app_type,
|
|
||||||
current.name,
|
|
||||||
current.id
|
|
||||||
);
|
|
||||||
total_providers = 1;
|
total_providers = 1;
|
||||||
result.push(current);
|
result.push(current);
|
||||||
} else {
|
|
||||||
log::debug!(
|
|
||||||
"[{app_type}] Current provider id {current_id} not found in database"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
log::debug!("[{app_type}] No current provider configured");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if result.is_empty() {
|
if result.is_empty() {
|
||||||
// 区分两种情况:全部熔断 vs 未配置供应商
|
|
||||||
if total_providers > 0 && circuit_open_count == total_providers {
|
if total_providers > 0 && circuit_open_count == total_providers {
|
||||||
log::warn!("[{app_type}] 所有 {total_providers} 个供应商均已熔断,无可用渠道");
|
log::warn!("[{app_type}] [FO-004] 所有供应商均已熔断");
|
||||||
return Err(AppError::AllProvidersCircuitOpen);
|
return Err(AppError::AllProvidersCircuitOpen);
|
||||||
} else {
|
} else {
|
||||||
log::warn!("[{app_type}] 未配置供应商或故障转移队列为空");
|
log::warn!("[{app_type}] [FO-005] 未配置供应商");
|
||||||
return Err(AppError::NoProvidersConfigured);
|
return Err(AppError::NoProvidersConfigured);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
log::info!(
|
|
||||||
"[{}] Provider chain: {} provider(s) available",
|
|
||||||
app_type,
|
|
||||||
result.len()
|
|
||||||
);
|
|
||||||
|
|
||||||
Ok(result)
|
Ok(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -161,15 +107,10 @@ impl ProviderRouter {
|
|||||||
success: bool,
|
success: bool,
|
||||||
error_msg: Option<String>,
|
error_msg: Option<String>,
|
||||||
) -> Result<(), AppError> {
|
) -> Result<(), AppError> {
|
||||||
// 1. 按应用独立获取熔断器配置(用于更新健康状态和判断是否禁用)
|
// 1. 按应用独立获取熔断器配置
|
||||||
let failure_threshold = match self.db.get_proxy_config_for_app(app_type).await {
|
let failure_threshold = match self.db.get_proxy_config_for_app(app_type).await {
|
||||||
Ok(app_config) => app_config.circuit_failure_threshold,
|
Ok(app_config) => app_config.circuit_failure_threshold,
|
||||||
Err(e) => {
|
Err(_) => 5, // 默认值
|
||||||
log::warn!(
|
|
||||||
"Failed to load circuit config for {app_type}, using default threshold: {e}"
|
|
||||||
);
|
|
||||||
5 // 默认值
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// 2. 更新熔断器状态
|
// 2. 更新熔断器状态
|
||||||
@@ -178,14 +119,8 @@ impl ProviderRouter {
|
|||||||
|
|
||||||
if success {
|
if success {
|
||||||
breaker.record_success(used_half_open_permit).await;
|
breaker.record_success(used_half_open_permit).await;
|
||||||
log::debug!("Provider {provider_id} request succeeded");
|
|
||||||
} else {
|
} else {
|
||||||
breaker.record_failure(used_half_open_permit).await;
|
breaker.record_failure(used_half_open_permit).await;
|
||||||
log::warn!(
|
|
||||||
"Provider {} request failed: {}",
|
|
||||||
provider_id,
|
|
||||||
error_msg.as_deref().unwrap_or("Unknown error")
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. 更新数据库健康状态(使用配置的阈值)
|
// 3. 更新数据库健康状态(使用配置的阈值)
|
||||||
@@ -206,7 +141,6 @@ impl ProviderRouter {
|
|||||||
pub async fn reset_circuit_breaker(&self, circuit_key: &str) {
|
pub async fn reset_circuit_breaker(&self, circuit_key: &str) {
|
||||||
let breakers = self.circuit_breakers.read().await;
|
let breakers = self.circuit_breakers.read().await;
|
||||||
if let Some(breaker) = breakers.get(circuit_key) {
|
if let Some(breaker) = breakers.get(circuit_key) {
|
||||||
log::info!("Manually resetting circuit breaker for {circuit_key}");
|
|
||||||
breaker.reset().await;
|
breaker.reset().await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -218,18 +152,11 @@ impl ProviderRouter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 更新所有熔断器的配置(热更新)
|
/// 更新所有熔断器的配置(热更新)
|
||||||
///
|
|
||||||
/// 当用户在 UI 中修改熔断器配置后调用此方法,
|
|
||||||
/// 所有现有的熔断器会立即使用新配置
|
|
||||||
pub async fn update_all_configs(&self, config: CircuitBreakerConfig) {
|
pub async fn update_all_configs(&self, config: CircuitBreakerConfig) {
|
||||||
let breakers = self.circuit_breakers.read().await;
|
let breakers = self.circuit_breakers.read().await;
|
||||||
let count = breakers.len();
|
|
||||||
|
|
||||||
for breaker in breakers.values() {
|
for breaker in breakers.values() {
|
||||||
breaker.update_config(config.clone()).await;
|
breaker.update_config(config.clone()).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
log::info!("已更新 {count} 个熔断器的配置");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 获取熔断器状态
|
/// 获取熔断器状态
|
||||||
@@ -272,32 +199,16 @@ impl ProviderRouter {
|
|||||||
|
|
||||||
// 按应用独立读取熔断器配置
|
// 按应用独立读取熔断器配置
|
||||||
let config = match self.db.get_proxy_config_for_app(app_type).await {
|
let config = match self.db.get_proxy_config_for_app(app_type).await {
|
||||||
Ok(app_config) => {
|
Ok(app_config) => crate::proxy::circuit_breaker::CircuitBreakerConfig {
|
||||||
log::debug!(
|
failure_threshold: app_config.circuit_failure_threshold,
|
||||||
"Loading circuit breaker config for {key} (app={app_type}): \
|
success_threshold: app_config.circuit_success_threshold,
|
||||||
failure_threshold={}, success_threshold={}, timeout={}s",
|
timeout_seconds: app_config.circuit_timeout_seconds as u64,
|
||||||
app_config.circuit_failure_threshold,
|
error_rate_threshold: app_config.circuit_error_rate_threshold,
|
||||||
app_config.circuit_success_threshold,
|
min_requests: app_config.circuit_min_requests,
|
||||||
app_config.circuit_timeout_seconds
|
},
|
||||||
);
|
Err(_) => crate::proxy::circuit_breaker::CircuitBreakerConfig::default(),
|
||||||
crate::proxy::circuit_breaker::CircuitBreakerConfig {
|
|
||||||
failure_threshold: app_config.circuit_failure_threshold,
|
|
||||||
success_threshold: app_config.circuit_success_threshold,
|
|
||||||
timeout_seconds: app_config.circuit_timeout_seconds as u64,
|
|
||||||
error_rate_threshold: app_config.circuit_error_rate_threshold,
|
|
||||||
min_requests: app_config.circuit_min_requests,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
log::warn!(
|
|
||||||
"Failed to load circuit breaker config for {key} (app={app_type}): {e}, using default"
|
|
||||||
);
|
|
||||||
crate::proxy::circuit_breaker::CircuitBreakerConfig::default()
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
log::debug!("Creating new circuit breaker for {key} with config: {config:?}");
|
|
||||||
|
|
||||||
let breaker = Arc::new(CircuitBreaker::new(config));
|
let breaker = Arc::new(CircuitBreaker::new(config));
|
||||||
breakers.insert(key.to_string(), breaker.clone());
|
breakers.insert(key.to_string(), breaker.clone());
|
||||||
|
|
||||||
|
|||||||
@@ -62,7 +62,8 @@ impl ClaudeAdapter {
|
|||||||
let normalized = value.trim().to_lowercase();
|
let normalized = value.trim().to_lowercase();
|
||||||
normalized == "true" || normalized == "1"
|
normalized == "true" || normalized == "1"
|
||||||
}
|
}
|
||||||
_ => true,
|
// OpenRouter now supports Claude Code compatible API, default to passthrough
|
||||||
|
_ => false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -465,12 +466,22 @@ mod tests {
|
|||||||
}));
|
}));
|
||||||
assert!(!adapter.needs_transform(&anthropic_provider));
|
assert!(!adapter.needs_transform(&anthropic_provider));
|
||||||
|
|
||||||
|
// OpenRouter provider without explicit setting now defaults to passthrough (no transform)
|
||||||
let openrouter_provider = create_provider(json!({
|
let openrouter_provider = create_provider(json!({
|
||||||
"env": {
|
"env": {
|
||||||
"ANTHROPIC_BASE_URL": "https://openrouter.ai/api"
|
"ANTHROPIC_BASE_URL": "https://openrouter.ai/api"
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
assert!(adapter.needs_transform(&openrouter_provider));
|
assert!(!adapter.needs_transform(&openrouter_provider));
|
||||||
|
|
||||||
|
// OpenRouter provider with explicit compat mode enabled should transform
|
||||||
|
let openrouter_enabled = create_provider(json!({
|
||||||
|
"env": {
|
||||||
|
"ANTHROPIC_BASE_URL": "https://openrouter.ai/api"
|
||||||
|
},
|
||||||
|
"openrouter_compat_mode": true
|
||||||
|
}));
|
||||||
|
assert!(adapter.needs_transform(&openrouter_enabled));
|
||||||
|
|
||||||
let openrouter_disabled = create_provider(json!({
|
let openrouter_disabled = create_provider(json!({
|
||||||
"env": {
|
"env": {
|
||||||
|
|||||||
@@ -75,8 +75,6 @@ pub fn create_anthropic_sse_stream(
|
|||||||
let mut current_block_type: Option<String> = None;
|
let mut current_block_type: Option<String> = None;
|
||||||
let mut tool_call_id = None;
|
let mut tool_call_id = None;
|
||||||
|
|
||||||
log::info!("[Claude/OpenRouter] ====== 开始流式响应转换 ======");
|
|
||||||
|
|
||||||
tokio::pin!(stream);
|
tokio::pin!(stream);
|
||||||
|
|
||||||
while let Some(chunk) = stream.next().await {
|
while let Some(chunk) = stream.next().await {
|
||||||
@@ -96,25 +94,18 @@ pub fn create_anthropic_sse_stream(
|
|||||||
for l in line.lines() {
|
for l in line.lines() {
|
||||||
if let Some(data) = l.strip_prefix("data: ") {
|
if let Some(data) = l.strip_prefix("data: ") {
|
||||||
if data.trim() == "[DONE]" {
|
if data.trim() == "[DONE]" {
|
||||||
log::info!("[Claude/OpenRouter] <<< OpenAI SSE: [DONE]");
|
log::debug!("[Claude/OpenRouter] <<< OpenAI SSE: [DONE]");
|
||||||
let event = json!({"type": "message_stop"});
|
let event = json!({"type": "message_stop"});
|
||||||
let sse_data = format!("event: message_stop\ndata: {}\n\n",
|
let sse_data = format!("event: message_stop\ndata: {}\n\n",
|
||||||
serde_json::to_string(&event).unwrap_or_default());
|
serde_json::to_string(&event).unwrap_or_default());
|
||||||
log::info!("[Claude/OpenRouter] >>> Anthropic SSE: message_stop");
|
log::debug!("[Claude/OpenRouter] >>> Anthropic SSE: message_stop");
|
||||||
yield Ok(Bytes::from(sse_data));
|
yield Ok(Bytes::from(sse_data));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Ok(chunk) = serde_json::from_str::<OpenAIStreamChunk>(data) {
|
if let Ok(chunk) = serde_json::from_str::<OpenAIStreamChunk>(data) {
|
||||||
// 记录原始 OpenAI 事件(格式化显示)
|
// 仅在 DEBUG 级别简短记录 SSE 事件
|
||||||
if let Ok(json_value) = serde_json::from_str::<serde_json::Value>(data) {
|
log::debug!("[Claude/OpenRouter] <<< SSE chunk received");
|
||||||
log::info!(
|
|
||||||
"[Claude/OpenRouter] <<< OpenAI SSE 事件:\n{}",
|
|
||||||
serde_json::to_string_pretty(&json_value).unwrap_or_else(|_| data.to_string())
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
log::info!("[Claude/OpenRouter] <<< OpenAI SSE 数据: {data}");
|
|
||||||
}
|
|
||||||
|
|
||||||
if message_id.is_none() {
|
if message_id.is_none() {
|
||||||
message_id = Some(chunk.id.clone());
|
message_id = Some(chunk.id.clone());
|
||||||
|
|||||||
@@ -46,8 +46,6 @@ pub async fn handle_streaming(
|
|||||||
state: &ProxyState,
|
state: &ProxyState,
|
||||||
parser_config: &UsageParserConfig,
|
parser_config: &UsageParserConfig,
|
||||||
) -> Response {
|
) -> Response {
|
||||||
log::info!("[{}] 流式透传响应 (SSE)", ctx.tag);
|
|
||||||
|
|
||||||
let status = response.status();
|
let status = response.status();
|
||||||
let mut builder = axum::response::Response::builder().status(status);
|
let mut builder = axum::response::Response::builder().status(status);
|
||||||
|
|
||||||
@@ -99,12 +97,6 @@ pub async fn handle_non_streaming(
|
|||||||
|
|
||||||
// 解析并记录使用量
|
// 解析并记录使用量
|
||||||
if let Ok(json_value) = serde_json::from_slice::<Value>(&body_bytes) {
|
if let Ok(json_value) = serde_json::from_slice::<Value>(&body_bytes) {
|
||||||
log::info!(
|
|
||||||
"[{}] <<< 响应 JSON:\n{}",
|
|
||||||
ctx.tag,
|
|
||||||
serde_json::to_string_pretty(&json_value).unwrap_or_default()
|
|
||||||
);
|
|
||||||
|
|
||||||
// 解析使用量
|
// 解析使用量
|
||||||
if let Some(usage) = (parser_config.response_parser)(&json_value) {
|
if let Some(usage) = (parser_config.response_parser)(&json_value) {
|
||||||
// 优先使用 usage 中解析出的模型名称,其次使用响应中的 model 字段,最后回退到请求模型
|
// 优先使用 usage 中解析出的模型名称,其次使用响应中的 model 字段,最后回退到请求模型
|
||||||
@@ -137,7 +129,7 @@ pub async fn handle_non_streaming(
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
log::info!(
|
log::debug!(
|
||||||
"[{}] <<< 响应 (非 JSON): {} bytes",
|
"[{}] <<< 响应 (非 JSON): {} bytes",
|
||||||
ctx.tag,
|
ctx.tag,
|
||||||
body_bytes.len()
|
body_bytes.len()
|
||||||
@@ -152,8 +144,6 @@ pub async fn handle_non_streaming(
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
log::info!("[{}] ====== 请求结束 ======", ctx.tag);
|
|
||||||
|
|
||||||
// 构建响应
|
// 构建响应
|
||||||
let mut builder = axum::response::Response::builder().status(status);
|
let mut builder = axum::response::Response::builder().status(status);
|
||||||
for (key, value) in response_headers.iter() {
|
for (key, value) in response_headers.iter() {
|
||||||
@@ -382,7 +372,12 @@ async fn log_usage_internal(
|
|||||||
Ok(Some(p)) => {
|
Ok(Some(p)) => {
|
||||||
if let Some(meta) = p.meta {
|
if let Some(meta) = p.meta {
|
||||||
if let Some(cm) = meta.cost_multiplier {
|
if let Some(cm) = meta.cost_multiplier {
|
||||||
Decimal::from_str(&cm).unwrap_or(Decimal::from(1))
|
Decimal::from_str(&cm).unwrap_or_else(|e| {
|
||||||
|
log::warn!(
|
||||||
|
"cost_multiplier 解析失败 (provider_id={provider_id}): {cm} - {e}"
|
||||||
|
);
|
||||||
|
Decimal::from(1)
|
||||||
|
})
|
||||||
} else {
|
} else {
|
||||||
Decimal::from(1)
|
Decimal::from(1)
|
||||||
}
|
}
|
||||||
@@ -418,7 +413,7 @@ async fn log_usage_internal(
|
|||||||
None, // provider_type
|
None, // provider_type
|
||||||
is_streaming,
|
is_streaming,
|
||||||
) {
|
) {
|
||||||
log::warn!("记录使用量失败: {e}");
|
log::warn!("[USG-001] 记录使用量失败: {e}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -493,16 +488,16 @@ 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::info!(
|
log::debug!(
|
||||||
"[{}] <<< SSE 事件:\n{}",
|
"[{}] <<< SSE 事件: {}",
|
||||||
tag,
|
tag,
|
||||||
serde_json::to_string_pretty(&json_value).unwrap_or_else(|_| data.to_string())
|
data.chars().take(100).collect::<String>()
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
log::info!("[{tag}] <<< SSE 数据: {data}");
|
log::debug!("[{tag}] <<< SSE 数据: {}", data.chars().take(100).collect::<String>());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
log::info!("[{tag}] <<< SSE: [DONE]");
|
log::debug!("[{tag}] <<< SSE: [DONE]");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -523,8 +518,6 @@ pub fn create_logged_passthrough_stream(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
log::info!("[{}] ====== 流结束 ======", tag);
|
|
||||||
|
|
||||||
if let Some(c) = collector.take() {
|
if let Some(c) = collector.take() {
|
||||||
c.finish().await;
|
c.finish().await;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,8 +3,8 @@
|
|||||||
//! 基于Axum的HTTP服务器,处理代理请求
|
//! 基于Axum的HTTP服务器,处理代理请求
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
failover_switch::FailoverSwitchManager, handlers, provider_router::ProviderRouter, types::*,
|
failover_switch::FailoverSwitchManager, handlers, log_codes::srv as log_srv,
|
||||||
ProxyError,
|
provider_router::ProviderRouter, types::*, ProxyError,
|
||||||
};
|
};
|
||||||
use crate::database::Database;
|
use crate::database::Database;
|
||||||
use axum::{
|
use axum::{
|
||||||
@@ -95,7 +95,7 @@ impl ProxyServer {
|
|||||||
.await
|
.await
|
||||||
.map_err(|e| ProxyError::BindFailed(e.to_string()))?;
|
.map_err(|e| ProxyError::BindFailed(e.to_string()))?;
|
||||||
|
|
||||||
log::info!("代理服务器启动于 {addr}");
|
log::info!("[{}] 代理服务器启动于 {addr}", log_srv::STARTED);
|
||||||
|
|
||||||
// 保存关闭句柄
|
// 保存关闭句柄
|
||||||
*self.shutdown_tx.write().await = Some(shutdown_tx);
|
*self.shutdown_tx.write().await = Some(shutdown_tx);
|
||||||
@@ -146,13 +146,25 @@ impl ProxyServer {
|
|||||||
// 2. 等待服务器任务结束(带 5 秒超时保护)
|
// 2. 等待服务器任务结束(带 5 秒超时保护)
|
||||||
if let Some(handle) = self.server_handle.write().await.take() {
|
if let Some(handle) = self.server_handle.write().await.take() {
|
||||||
match tokio::time::timeout(std::time::Duration::from_secs(5), handle).await {
|
match tokio::time::timeout(std::time::Duration::from_secs(5), handle).await {
|
||||||
Ok(Ok(())) => log::info!("代理服务器已完全停止"),
|
Ok(Ok(())) => {
|
||||||
Ok(Err(e)) => log::warn!("代理服务器任务异常终止: {e}"),
|
log::info!("[{}] 代理服务器已完全停止", log_srv::STOPPED);
|
||||||
Err(_) => log::warn!("代理服务器停止超时(5秒),强制继续"),
|
Ok(())
|
||||||
|
}
|
||||||
|
Ok(Err(e)) => {
|
||||||
|
log::warn!("[{}] 代理服务器任务异常终止: {e}", log_srv::TASK_ERROR);
|
||||||
|
Err(ProxyError::StopFailed(e.to_string()))
|
||||||
|
}
|
||||||
|
Err(_) => {
|
||||||
|
log::warn!(
|
||||||
|
"[{}] 代理服务器停止超时(5秒),强制继续",
|
||||||
|
log_srv::STOP_TIMEOUT
|
||||||
|
);
|
||||||
|
Err(ProxyError::StopTimeout)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_status(&self) -> ProxyStatus {
|
pub async fn get_status(&self) -> ProxyStatus {
|
||||||
|
|||||||
@@ -214,7 +214,7 @@ impl<'a> UsageLogger<'a> {
|
|||||||
let pricing = self.get_model_pricing(&model)?;
|
let pricing = self.get_model_pricing(&model)?;
|
||||||
|
|
||||||
if pricing.is_none() {
|
if pricing.is_none() {
|
||||||
log::warn!("模型 {model} 的定价信息未找到,成本将记录为 0");
|
log::warn!("[USG-002] 模型定价未找到,成本将记录为 0");
|
||||||
}
|
}
|
||||||
|
|
||||||
let cost = CostCalculator::try_calculate(&usage, pricing.as_ref(), cost_multiplier);
|
let cost = CostCalculator::try_calculate(&usage, pricing.as_ref(), cost_multiplier);
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ impl PromptService {
|
|||||||
if !content_exists {
|
if !content_exists {
|
||||||
let timestamp = std::time::SystemTime::now()
|
let timestamp = std::time::SystemTime::now()
|
||||||
.duration_since(std::time::UNIX_EPOCH)
|
.duration_since(std::time::UNIX_EPOCH)
|
||||||
.unwrap()
|
.unwrap_or_default()
|
||||||
.as_secs() as i64;
|
.as_secs() as i64;
|
||||||
let backup_id = format!("backup-{timestamp}");
|
let backup_id = format!("backup-{timestamp}");
|
||||||
let backup_prompt = Prompt {
|
let backup_prompt = Prompt {
|
||||||
|
|||||||
@@ -148,6 +148,15 @@ pub fn sync_current_to_live(state: &AppState) -> Result<(), AppError> {
|
|||||||
|
|
||||||
// MCP sync
|
// MCP sync
|
||||||
McpService::sync_all_enabled(state)?;
|
McpService::sync_all_enabled(state)?;
|
||||||
|
|
||||||
|
// Skill sync
|
||||||
|
for app_type in [AppType::Claude, AppType::Codex, AppType::Gemini] {
|
||||||
|
if let Err(e) = crate::services::skill::SkillService::sync_to_app(&state.db, &app_type) {
|
||||||
|
log::warn!("同步 Skill 到 {app_type:?} 失败: {e}");
|
||||||
|
// Continue syncing other apps, don't abort
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
|
|
||||||
use anyhow::{anyhow, Context, Result};
|
use anyhow::{anyhow, Context, Result};
|
||||||
use chrono::{DateTime, Utc};
|
use chrono::{DateTime, Utc};
|
||||||
use reqwest::Client;
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::{HashMap, HashSet};
|
||||||
use std::fs;
|
use std::fs;
|
||||||
@@ -143,9 +142,7 @@ pub struct SkillMetadata {
|
|||||||
|
|
||||||
// ========== SkillService ==========
|
// ========== SkillService ==========
|
||||||
|
|
||||||
pub struct SkillService {
|
pub struct SkillService;
|
||||||
http_client: Client,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for SkillService {
|
impl Default for SkillService {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
@@ -155,13 +152,7 @@ impl Default for SkillService {
|
|||||||
|
|
||||||
impl SkillService {
|
impl SkillService {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
Self {
|
Self
|
||||||
http_client: Client::builder()
|
|
||||||
.user_agent("cc-switch")
|
|
||||||
.timeout(std::time::Duration::from_secs(10))
|
|
||||||
.build()
|
|
||||||
.expect("Failed to create HTTP client"),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ========== 路径管理 ==========
|
// ========== 路径管理 ==========
|
||||||
@@ -863,7 +854,8 @@ impl SkillService {
|
|||||||
|
|
||||||
/// 下载并解压 ZIP
|
/// 下载并解压 ZIP
|
||||||
async fn download_and_extract(&self, url: &str, dest: &Path) -> Result<()> {
|
async fn download_and_extract(&self, url: &str, dest: &Path) -> Result<()> {
|
||||||
let response = self.http_client.get(url).send().await?;
|
let client = crate::proxy::http_client::get();
|
||||||
|
let response = client.get(url).send().await?;
|
||||||
if !response.status().is_success() {
|
if !response.status().is_success() {
|
||||||
let status = response.status().as_u16().to_string();
|
let status = response.status().as_u16().to_string();
|
||||||
return Err(anyhow::anyhow!(format_skill_error(
|
return Err(anyhow::anyhow!(format_skill_error(
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use futures::future::join_all;
|
use futures::future::join_all;
|
||||||
use reqwest::{Client, Url};
|
use reqwest::{Client, Url};
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use std::time::{Duration, Instant};
|
use std::time::Instant;
|
||||||
|
|
||||||
use crate::error::AppError;
|
use crate::error::AppError;
|
||||||
|
|
||||||
@@ -65,17 +65,21 @@ impl SpeedtestService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let timeout = Self::sanitize_timeout(timeout_secs);
|
let timeout = Self::sanitize_timeout(timeout_secs);
|
||||||
let client = Self::build_client(timeout)?;
|
let (client, request_timeout) = Self::build_client(timeout)?;
|
||||||
|
|
||||||
let tasks = valid_targets.into_iter().map(|(idx, trimmed, parsed_url)| {
|
let tasks = valid_targets.into_iter().map(|(idx, trimmed, parsed_url)| {
|
||||||
let client = client.clone();
|
let client = client.clone();
|
||||||
async move {
|
async move {
|
||||||
// 先进行一次热身请求,忽略结果,仅用于复用连接/绕过首包惩罚。
|
// 先进行一次热身请求,忽略结果,仅用于复用连接/绕过首包惩罚。
|
||||||
let _ = client.get(parsed_url.clone()).send().await;
|
let _ = client
|
||||||
|
.get(parsed_url.clone())
|
||||||
|
.timeout(request_timeout)
|
||||||
|
.send()
|
||||||
|
.await;
|
||||||
|
|
||||||
// 第二次请求开始计时,并将其作为结果返回。
|
// 第二次请求开始计时,并将其作为结果返回。
|
||||||
let start = Instant::now();
|
let start = Instant::now();
|
||||||
let latency = match client.get(parsed_url).send().await {
|
let latency = match client.get(parsed_url).timeout(request_timeout).send().await {
|
||||||
Ok(resp) => EndpointLatency {
|
Ok(resp) => EndpointLatency {
|
||||||
url: trimmed,
|
url: trimmed,
|
||||||
latency: Some(start.elapsed().as_millis()),
|
latency: Some(start.elapsed().as_millis()),
|
||||||
@@ -112,19 +116,11 @@ impl SpeedtestService {
|
|||||||
Ok(results.into_iter().flatten().collect::<Vec<_>>())
|
Ok(results.into_iter().flatten().collect::<Vec<_>>())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn build_client(timeout_secs: u64) -> Result<Client, AppError> {
|
fn build_client(timeout_secs: u64) -> Result<(Client, std::time::Duration), AppError> {
|
||||||
Client::builder()
|
// 使用全局 HTTP 客户端(已包含代理配置)
|
||||||
.timeout(Duration::from_secs(timeout_secs))
|
// 返回 timeout Duration 供请求级别使用
|
||||||
.redirect(reqwest::redirect::Policy::limited(5))
|
let timeout = std::time::Duration::from_secs(timeout_secs);
|
||||||
.user_agent("cc-switch-speedtest/1.0")
|
Ok((crate::proxy::http_client::get(), timeout))
|
||||||
.build()
|
|
||||||
.map_err(|e| {
|
|
||||||
AppError::localized(
|
|
||||||
"speedtest.client_create_failed",
|
|
||||||
format!("创建 HTTP 客户端失败: {e}"),
|
|
||||||
format!("Failed to create HTTP client: {e}"),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn sanitize_timeout(timeout_secs: Option<u64>) -> u64 {
|
fn sanitize_timeout(timeout_secs: Option<u64>) -> u64 {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ use regex::Regex;
|
|||||||
use reqwest::Client;
|
use reqwest::Client;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_json::json;
|
use serde_json::json;
|
||||||
use std::time::{Duration, Instant};
|
use std::time::Instant;
|
||||||
|
|
||||||
use crate::app_config::AppType;
|
use crate::app_config::AppType;
|
||||||
use crate::error::AppError;
|
use crate::error::AppError;
|
||||||
@@ -136,23 +136,36 @@ impl StreamCheckService {
|
|||||||
.extract_auth(provider)
|
.extract_auth(provider)
|
||||||
.ok_or_else(|| AppError::Message("未找到 API Key".to_string()))?;
|
.ok_or_else(|| AppError::Message("未找到 API Key".to_string()))?;
|
||||||
|
|
||||||
let client = Client::builder()
|
// 使用全局 HTTP 客户端(已包含代理配置)
|
||||||
.timeout(Duration::from_secs(config.timeout_secs))
|
let client = crate::proxy::http_client::get();
|
||||||
.user_agent("cc-switch/1.0")
|
let request_timeout = std::time::Duration::from_secs(config.timeout_secs);
|
||||||
.build()
|
|
||||||
.map_err(|e| AppError::Message(format!("创建客户端失败: {e}")))?;
|
|
||||||
|
|
||||||
let model_to_test = Self::resolve_test_model(app_type, provider, config);
|
let model_to_test = Self::resolve_test_model(app_type, provider, config);
|
||||||
|
|
||||||
let result = match app_type {
|
let result = match app_type {
|
||||||
AppType::Claude => {
|
AppType::Claude => {
|
||||||
Self::check_claude_stream(&client, &base_url, &auth, &model_to_test).await
|
Self::check_claude_stream(
|
||||||
|
&client,
|
||||||
|
&base_url,
|
||||||
|
&auth,
|
||||||
|
&model_to_test,
|
||||||
|
request_timeout,
|
||||||
|
)
|
||||||
|
.await
|
||||||
}
|
}
|
||||||
AppType::Codex => {
|
AppType::Codex => {
|
||||||
Self::check_codex_stream(&client, &base_url, &auth, &model_to_test).await
|
Self::check_codex_stream(&client, &base_url, &auth, &model_to_test, request_timeout)
|
||||||
|
.await
|
||||||
}
|
}
|
||||||
AppType::Gemini => {
|
AppType::Gemini => {
|
||||||
Self::check_gemini_stream(&client, &base_url, &auth, &model_to_test).await
|
Self::check_gemini_stream(
|
||||||
|
&client,
|
||||||
|
&base_url,
|
||||||
|
&auth,
|
||||||
|
&model_to_test,
|
||||||
|
request_timeout,
|
||||||
|
)
|
||||||
|
.await
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -193,6 +206,7 @@ impl StreamCheckService {
|
|||||||
base_url: &str,
|
base_url: &str,
|
||||||
auth: &AuthInfo,
|
auth: &AuthInfo,
|
||||||
model: &str,
|
model: &str,
|
||||||
|
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 = if base.ends_with("/v1") {
|
let url = if base.ends_with("/v1") {
|
||||||
@@ -213,6 +227,7 @@ impl StreamCheckService {
|
|||||||
.header("x-api-key", &auth.api_key)
|
.header("x-api-key", &auth.api_key)
|
||||||
.header("anthropic-version", "2023-06-01")
|
.header("anthropic-version", "2023-06-01")
|
||||||
.header("Content-Type", "application/json")
|
.header("Content-Type", "application/json")
|
||||||
|
.timeout(timeout)
|
||||||
.json(&body)
|
.json(&body)
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
@@ -243,6 +258,7 @@ impl StreamCheckService {
|
|||||||
base_url: &str,
|
base_url: &str,
|
||||||
auth: &AuthInfo,
|
auth: &AuthInfo,
|
||||||
model: &str,
|
model: &str,
|
||||||
|
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 = if base.ends_with("/v1") {
|
let url = if base.ends_with("/v1") {
|
||||||
@@ -275,6 +291,7 @@ impl StreamCheckService {
|
|||||||
.post(&url)
|
.post(&url)
|
||||||
.header("Authorization", format!("Bearer {}", auth.api_key))
|
.header("Authorization", format!("Bearer {}", auth.api_key))
|
||||||
.header("Content-Type", "application/json")
|
.header("Content-Type", "application/json")
|
||||||
|
.timeout(timeout)
|
||||||
.json(&body)
|
.json(&body)
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
@@ -304,6 +321,7 @@ impl StreamCheckService {
|
|||||||
base_url: &str,
|
base_url: &str,
|
||||||
auth: &AuthInfo,
|
auth: &AuthInfo,
|
||||||
model: &str,
|
model: &str,
|
||||||
|
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");
|
let url = format!("{base}/v1/chat/completions");
|
||||||
@@ -320,6 +338,7 @@ impl StreamCheckService {
|
|||||||
.post(&url)
|
.post(&url)
|
||||||
.header("Authorization", format!("Bearer {}", auth.api_key))
|
.header("Authorization", format!("Bearer {}", auth.api_key))
|
||||||
.header("Content-Type", "application/json")
|
.header("Content-Type", "application/json")
|
||||||
|
.timeout(timeout)
|
||||||
.json(&body)
|
.json(&body)
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
|
|||||||
@@ -802,25 +802,25 @@ pub(crate) fn find_model_pricing_row(
|
|||||||
conn: &Connection,
|
conn: &Connection,
|
||||||
model_id: &str,
|
model_id: &str,
|
||||||
) -> Result<Option<(String, String, String, String)>, AppError> {
|
) -> Result<Option<(String, String, String, String)>, AppError> {
|
||||||
// 1) 去除供应商前缀(/ 之前)与冒号后缀(: 之后),例如 moonshotai/kimi-k2-0905:exa → kimi-k2-0905
|
// 清洗模型名称:去前缀(/)、去后缀(:)、@ 替换为 -
|
||||||
let without_prefix = model_id
|
// 例如 moonshotai/gpt-5.2-codex@low:v2 → gpt-5.2-codex-low
|
||||||
|
let cleaned = model_id
|
||||||
.rsplit_once('/')
|
.rsplit_once('/')
|
||||||
.map(|(_, rest)| rest)
|
.map_or(model_id, |(_, r)| r)
|
||||||
.unwrap_or(model_id);
|
|
||||||
let cleaned = without_prefix
|
|
||||||
.split(':')
|
.split(':')
|
||||||
.next()
|
.next()
|
||||||
.map(str::trim)
|
.unwrap_or(model_id)
|
||||||
.unwrap_or(without_prefix);
|
.trim()
|
||||||
|
.replace('@', "-");
|
||||||
|
|
||||||
// 2) 精确匹配清洗后的名称
|
// 精确匹配清洗后的名称
|
||||||
let exact = conn
|
let exact = conn
|
||||||
.query_row(
|
.query_row(
|
||||||
"SELECT input_cost_per_million, output_cost_per_million,
|
"SELECT input_cost_per_million, output_cost_per_million,
|
||||||
cache_read_cost_per_million, cache_creation_cost_per_million
|
cache_read_cost_per_million, cache_creation_cost_per_million
|
||||||
FROM model_pricing
|
FROM model_pricing
|
||||||
WHERE model_id = ?1",
|
WHERE model_id = ?1",
|
||||||
[cleaned],
|
[&cleaned],
|
||||||
|row| {
|
|row| {
|
||||||
Ok((
|
Ok((
|
||||||
row.get::<_, String>(0)?,
|
row.get::<_, String>(0)?,
|
||||||
@@ -952,6 +952,13 @@ mod tests {
|
|||||||
"带前缀+冒号后缀的模型应清洗后匹配到 kimi-k2-0905"
|
"带前缀+冒号后缀的模型应清洗后匹配到 kimi-k2-0905"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// 清洗:@ 替换为 -(seed_model_pricing 已预置 gpt-5.2-codex-low)
|
||||||
|
let result = find_model_pricing_row(&conn, "gpt-5.2-codex@low")?;
|
||||||
|
assert!(
|
||||||
|
result.is_some(),
|
||||||
|
"带 @ 分隔符的模型 gpt-5.2-codex@low 应能匹配到 gpt-5.2-codex-low"
|
||||||
|
);
|
||||||
|
|
||||||
// 测试不存在的模型
|
// 测试不存在的模型
|
||||||
let result = find_model_pricing_row(&conn, "unknown-model-123")?;
|
let result = find_model_pricing_row(&conn, "unknown-model-123")?;
|
||||||
assert!(result.is_none(), "不应该匹配不存在的模型");
|
assert!(result.is_none(), "不应该匹配不存在的模型");
|
||||||
|
|||||||
+23
-10
@@ -92,12 +92,9 @@ impl Default for AppSettings {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl AppSettings {
|
impl AppSettings {
|
||||||
fn settings_path() -> PathBuf {
|
fn settings_path() -> Option<PathBuf> {
|
||||||
// settings.json 保留用于旧版本迁移和无数据库场景
|
// settings.json 保留用于旧版本迁移和无数据库场景
|
||||||
dirs::home_dir()
|
dirs::home_dir().map(|h| h.join(".cc-switch").join("settings.json"))
|
||||||
.expect("无法获取用户主目录")
|
|
||||||
.join(".cc-switch")
|
|
||||||
.join("settings.json")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn normalize_paths(&mut self) {
|
fn normalize_paths(&mut self) {
|
||||||
@@ -131,7 +128,9 @@ impl AppSettings {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn load_from_file() -> Self {
|
fn load_from_file() -> Self {
|
||||||
let path = Self::settings_path();
|
let Some(path) = Self::settings_path() else {
|
||||||
|
return Self::default();
|
||||||
|
};
|
||||||
if let Ok(content) = fs::read_to_string(&path) {
|
if let Ok(content) = fs::read_to_string(&path) {
|
||||||
match serde_json::from_str::<AppSettings>(&content) {
|
match serde_json::from_str::<AppSettings>(&content) {
|
||||||
Ok(mut settings) => {
|
Ok(mut settings) => {
|
||||||
@@ -156,7 +155,9 @@ impl AppSettings {
|
|||||||
fn save_settings_file(settings: &AppSettings) -> Result<(), AppError> {
|
fn save_settings_file(settings: &AppSettings) -> Result<(), AppError> {
|
||||||
let mut normalized = settings.clone();
|
let mut normalized = settings.clone();
|
||||||
normalized.normalize_paths();
|
normalized.normalize_paths();
|
||||||
let path = AppSettings::settings_path();
|
let Some(path) = AppSettings::settings_path() else {
|
||||||
|
return Err(AppError::Config("无法获取用户主目录".to_string()));
|
||||||
|
};
|
||||||
|
|
||||||
if let Some(parent) = path.parent() {
|
if let Some(parent) = path.parent() {
|
||||||
fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
|
fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
|
||||||
@@ -193,14 +194,23 @@ fn resolve_override_path(raw: &str) -> PathBuf {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_settings() -> AppSettings {
|
pub fn get_settings() -> AppSettings {
|
||||||
settings_store().read().expect("读取设置锁失败").clone()
|
settings_store()
|
||||||
|
.read()
|
||||||
|
.unwrap_or_else(|e| {
|
||||||
|
log::warn!("设置锁已毒化,使用恢复值: {e}");
|
||||||
|
e.into_inner()
|
||||||
|
})
|
||||||
|
.clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update_settings(mut new_settings: AppSettings) -> Result<(), AppError> {
|
pub fn update_settings(mut new_settings: AppSettings) -> Result<(), AppError> {
|
||||||
new_settings.normalize_paths();
|
new_settings.normalize_paths();
|
||||||
save_settings_file(&new_settings)?;
|
save_settings_file(&new_settings)?;
|
||||||
|
|
||||||
let mut guard = settings_store().write().expect("写入设置锁失败");
|
let mut guard = settings_store().write().unwrap_or_else(|e| {
|
||||||
|
log::warn!("设置锁已毒化,使用恢复值: {e}");
|
||||||
|
e.into_inner()
|
||||||
|
});
|
||||||
*guard = new_settings;
|
*guard = new_settings;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -209,7 +219,10 @@ pub fn update_settings(mut new_settings: AppSettings) -> Result<(), AppError> {
|
|||||||
/// 用于导入配置等场景,确保内存缓存与文件同步
|
/// 用于导入配置等场景,确保内存缓存与文件同步
|
||||||
pub fn reload_settings() -> Result<(), AppError> {
|
pub fn reload_settings() -> Result<(), AppError> {
|
||||||
let fresh_settings = AppSettings::load_from_file();
|
let fresh_settings = AppSettings::load_from_file();
|
||||||
let mut guard = settings_store().write().expect("写入设置锁失败");
|
let mut guard = settings_store().write().unwrap_or_else(|e| {
|
||||||
|
log::warn!("设置锁已毒化,使用恢复值: {e}");
|
||||||
|
e.into_inner()
|
||||||
|
});
|
||||||
*guard = fresh_settings;
|
*guard = fresh_settings;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
use reqwest::Client;
|
|
||||||
use rquickjs::{Context, Function, Runtime};
|
use rquickjs::{Context, Function, Runtime};
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::time::Duration;
|
|
||||||
use url::{Host, Url};
|
use url::{Host, Url};
|
||||||
|
|
||||||
use crate::error::AppError;
|
use crate::error::AppError;
|
||||||
@@ -215,18 +213,10 @@ struct RequestConfig {
|
|||||||
|
|
||||||
/// 发送 HTTP 请求
|
/// 发送 HTTP 请求
|
||||||
async fn send_http_request(config: &RequestConfig, timeout_secs: u64) -> Result<String, AppError> {
|
async fn send_http_request(config: &RequestConfig, timeout_secs: u64) -> Result<String, AppError> {
|
||||||
// 约束超时范围,防止异常配置导致长时间阻塞
|
// 使用全局 HTTP 客户端(已包含代理配置)
|
||||||
let timeout = timeout_secs.clamp(2, 30);
|
let client = crate::proxy::http_client::get();
|
||||||
let client = Client::builder()
|
// 约束超时范围,防止异常配置导致长时间阻塞(最小 2 秒,最大 30 秒)
|
||||||
.timeout(Duration::from_secs(timeout))
|
let request_timeout = std::time::Duration::from_secs(timeout_secs.clamp(2, 30));
|
||||||
.build()
|
|
||||||
.map_err(|e| {
|
|
||||||
AppError::localized(
|
|
||||||
"usage_script.client_create_failed",
|
|
||||||
format!("创建客户端失败: {e}"),
|
|
||||||
format!("Failed to create client: {e}"),
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
|
|
||||||
// 严格校验 HTTP 方法,非法值不回退为 GET
|
// 严格校验 HTTP 方法,非法值不回退为 GET
|
||||||
let method: reqwest::Method = config.method.parse().map_err(|_| {
|
let method: reqwest::Method = config.method.parse().map_err(|_| {
|
||||||
@@ -237,7 +227,9 @@ async fn send_http_request(config: &RequestConfig, timeout_secs: u64) -> Result<
|
|||||||
)
|
)
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
let mut req = client.request(method.clone(), &config.url);
|
let mut req = client
|
||||||
|
.request(method.clone(), &config.url)
|
||||||
|
.timeout(request_timeout);
|
||||||
|
|
||||||
// 添加请求头
|
// 添加请求头
|
||||||
for (k, v) in &config.headers {
|
for (k, v) in &config.headers {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "CC Switch",
|
"productName": "CC Switch",
|
||||||
"version": "3.9.0",
|
"version": "3.9.1",
|
||||||
"identifier": "com.ccswitch.desktop",
|
"identifier": "com.ccswitch.desktop",
|
||||||
"build": {
|
"build": {
|
||||||
"frontendDist": "../dist",
|
"frontendDist": "../dist",
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
"windows": [
|
"windows": [
|
||||||
{
|
{
|
||||||
"label": "main",
|
"label": "main",
|
||||||
|
"title": "CC Switch",
|
||||||
"titleBarStyle": "Visible",
|
"titleBarStyle": "Visible",
|
||||||
"minWidth": 900,
|
"minWidth": 900,
|
||||||
"minHeight": 600
|
"minHeight": 600
|
||||||
|
|||||||
+33
-5
@@ -31,6 +31,7 @@ import { useProxyStatus } from "@/hooks/useProxyStatus";
|
|||||||
import { useLastValidValue } from "@/hooks/useLastValidValue";
|
import { useLastValidValue } from "@/hooks/useLastValidValue";
|
||||||
import { extractErrorMessage } from "@/utils/errorUtils";
|
import { extractErrorMessage } from "@/utils/errorUtils";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
import { isWindows, isLinux } from "@/lib/platform";
|
||||||
import { AppSwitcher } from "@/components/AppSwitcher";
|
import { AppSwitcher } from "@/components/AppSwitcher";
|
||||||
import { ProviderList } from "@/components/providers/ProviderList";
|
import { ProviderList } from "@/components/providers/ProviderList";
|
||||||
import { AddProviderDialog } from "@/components/providers/AddProviderDialog";
|
import { AddProviderDialog } from "@/components/providers/AddProviderDialog";
|
||||||
@@ -60,7 +61,8 @@ type View =
|
|||||||
| "agents"
|
| "agents"
|
||||||
| "universal";
|
| "universal";
|
||||||
|
|
||||||
const DRAG_BAR_HEIGHT = 28; // px
|
// macOS Overlay mode needs space for traffic light buttons, Windows/Linux use native titlebar
|
||||||
|
const DRAG_BAR_HEIGHT = isWindows() || isLinux() ? 0 : 28; // px
|
||||||
const HEADER_HEIGHT = 64; // px
|
const HEADER_HEIGHT = 64; // px
|
||||||
const CONTENT_TOP_OFFSET = DRAG_BAR_HEIGHT + HEADER_HEIGHT;
|
const CONTENT_TOP_OFFSET = DRAG_BAR_HEIGHT + HEADER_HEIGHT;
|
||||||
|
|
||||||
@@ -380,6 +382,26 @@ function App() {
|
|||||||
await addProvider(duplicatedProvider);
|
await addProvider(duplicatedProvider);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 打开提供商终端
|
||||||
|
const handleOpenTerminal = async (provider: Provider) => {
|
||||||
|
try {
|
||||||
|
await providersApi.openTerminal(provider.id, activeApp);
|
||||||
|
toast.success(
|
||||||
|
t("provider.terminalOpened", {
|
||||||
|
defaultValue: "终端已打开",
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
console.error("[App] Failed to open terminal", error);
|
||||||
|
const errorMessage = extractErrorMessage(error);
|
||||||
|
toast.error(
|
||||||
|
t("provider.terminalOpenFailed", {
|
||||||
|
defaultValue: "打开终端失败",
|
||||||
|
}) + (errorMessage ? `: ${errorMessage}` : ""),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// 导入配置成功后刷新
|
// 导入配置成功后刷新
|
||||||
const handleImportSuccess = async () => {
|
const handleImportSuccess = async () => {
|
||||||
try {
|
try {
|
||||||
@@ -480,6 +502,9 @@ function App() {
|
|||||||
onDuplicate={handleDuplicateProvider}
|
onDuplicate={handleDuplicateProvider}
|
||||||
onConfigureUsage={setUsageProvider}
|
onConfigureUsage={setUsageProvider}
|
||||||
onOpenWebsite={handleOpenWebsite}
|
onOpenWebsite={handleOpenWebsite}
|
||||||
|
onOpenTerminal={
|
||||||
|
activeApp === "claude" ? handleOpenTerminal : undefined
|
||||||
|
}
|
||||||
onCreate={() => setIsAddOpen(true)}
|
onCreate={() => setIsAddOpen(true)}
|
||||||
/>
|
/>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
@@ -622,10 +647,12 @@ function App() {
|
|||||||
<Settings className="w-4 h-4" />
|
<Settings className="w-4 h-4" />
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<UpdateBadge onClick={() => {
|
<UpdateBadge
|
||||||
setSettingsDefaultTab("about");
|
onClick={() => {
|
||||||
setCurrentView("settings");
|
setSettingsDefaultTab("about");
|
||||||
}} />
|
setCurrentView("settings");
|
||||||
|
}}
|
||||||
|
/>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@@ -804,6 +831,7 @@ function App() {
|
|||||||
|
|
||||||
{effectiveUsageProvider && (
|
{effectiveUsageProvider && (
|
||||||
<UsageScriptModal
|
<UsageScriptModal
|
||||||
|
key={effectiveUsageProvider.id}
|
||||||
provider={effectiveUsageProvider}
|
provider={effectiveUsageProvider}
|
||||||
appId={activeApp}
|
appId={activeApp}
|
||||||
isOpen={Boolean(usageProvider)}
|
isOpen={Boolean(usageProvider)}
|
||||||
|
|||||||
@@ -389,12 +389,27 @@ export function DeepLinkImportDialog() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* API Endpoint */}
|
{/* API Endpoint */}
|
||||||
<div className="grid grid-cols-3 items-center gap-4">
|
<div className="grid grid-cols-3 items-start gap-4">
|
||||||
<div className="font-medium text-sm text-muted-foreground">
|
<div className="font-medium text-sm text-muted-foreground pt-0.5">
|
||||||
{t("deeplink.endpoint")}
|
{t("deeplink.endpoint")}
|
||||||
</div>
|
</div>
|
||||||
<div className="col-span-2 text-sm break-all">
|
<div className="col-span-2 text-sm break-all space-y-1">
|
||||||
{request.endpoint}
|
{request.endpoint?.split(",").map((ep, idx) => (
|
||||||
|
<div
|
||||||
|
key={idx}
|
||||||
|
className={
|
||||||
|
idx === 0 ? "font-medium" : "text-muted-foreground"
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{idx === 0 ? "🔹 " : "└ "}
|
||||||
|
{ep.trim()}
|
||||||
|
{idx === 0 && request.endpoint?.includes(",") && (
|
||||||
|
<span className="text-xs text-muted-foreground ml-2">
|
||||||
|
({t("deeplink.primaryEndpoint")})
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { createPortal } from "react-dom";
|
|||||||
import { motion, AnimatePresence } from "framer-motion";
|
import { motion, AnimatePresence } from "framer-motion";
|
||||||
import { ArrowLeft } from "lucide-react";
|
import { ArrowLeft } from "lucide-react";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { isWindows, isLinux } from "@/lib/platform";
|
||||||
|
|
||||||
interface FullScreenPanelProps {
|
interface FullScreenPanelProps {
|
||||||
isOpen: boolean;
|
isOpen: boolean;
|
||||||
@@ -12,7 +13,7 @@ interface FullScreenPanelProps {
|
|||||||
footer?: React.ReactNode;
|
footer?: React.ReactNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
const DRAG_BAR_HEIGHT = 28; // px - match App.tsx
|
const DRAG_BAR_HEIGHT = isWindows() || isLinux() ? 0 : 28; // px - match App.tsx
|
||||||
const HEADER_HEIGHT = 64; // px - match App.tsx
|
const HEADER_HEIGHT = 64; // px - match App.tsx
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import {
|
|||||||
Loader2,
|
Loader2,
|
||||||
Play,
|
Play,
|
||||||
Plus,
|
Plus,
|
||||||
|
Terminal,
|
||||||
TestTube2,
|
TestTube2,
|
||||||
Trash2,
|
Trash2,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
@@ -23,6 +24,7 @@ interface ProviderActionsProps {
|
|||||||
onTest?: () => void;
|
onTest?: () => void;
|
||||||
onConfigureUsage: () => void;
|
onConfigureUsage: () => void;
|
||||||
onDelete: () => void;
|
onDelete: () => void;
|
||||||
|
onOpenTerminal?: () => void;
|
||||||
// 故障转移相关
|
// 故障转移相关
|
||||||
isAutoFailoverEnabled?: boolean;
|
isAutoFailoverEnabled?: boolean;
|
||||||
isInFailoverQueue?: boolean;
|
isInFailoverQueue?: boolean;
|
||||||
@@ -39,6 +41,7 @@ export function ProviderActions({
|
|||||||
onTest,
|
onTest,
|
||||||
onConfigureUsage,
|
onConfigureUsage,
|
||||||
onDelete,
|
onDelete,
|
||||||
|
onOpenTerminal,
|
||||||
// 故障转移相关
|
// 故障转移相关
|
||||||
isAutoFailoverEnabled = false,
|
isAutoFailoverEnabled = false,
|
||||||
isInFailoverQueue = false,
|
isInFailoverQueue = false,
|
||||||
@@ -171,6 +174,21 @@ export function ProviderActions({
|
|||||||
<BarChart3 className="h-4 w-4" />
|
<BarChart3 className="h-4 w-4" />
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
|
{onOpenTerminal && (
|
||||||
|
<Button
|
||||||
|
size="icon"
|
||||||
|
variant="ghost"
|
||||||
|
onClick={onOpenTerminal}
|
||||||
|
title={t("provider.openTerminal", "打开终端")}
|
||||||
|
className={cn(
|
||||||
|
iconButtonClass,
|
||||||
|
"hover:text-emerald-600 dark:hover:text-emerald-400",
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<Terminal className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
size="icon"
|
size="icon"
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ interface ProviderCardProps {
|
|||||||
onOpenWebsite: (url: string) => void;
|
onOpenWebsite: (url: string) => void;
|
||||||
onDuplicate: (provider: Provider) => void;
|
onDuplicate: (provider: Provider) => void;
|
||||||
onTest?: (provider: Provider) => void;
|
onTest?: (provider: Provider) => void;
|
||||||
|
onOpenTerminal?: (provider: Provider) => void;
|
||||||
isTesting?: boolean;
|
isTesting?: boolean;
|
||||||
isProxyRunning: boolean;
|
isProxyRunning: boolean;
|
||||||
isProxyTakeover?: boolean; // 代理接管模式(Live配置已被接管,切换为热切换)
|
isProxyTakeover?: boolean; // 代理接管模式(Live配置已被接管,切换为热切换)
|
||||||
@@ -91,6 +92,7 @@ export function ProviderCard({
|
|||||||
onOpenWebsite,
|
onOpenWebsite,
|
||||||
onDuplicate,
|
onDuplicate,
|
||||||
onTest,
|
onTest,
|
||||||
|
onOpenTerminal,
|
||||||
isTesting,
|
isTesting,
|
||||||
isProxyRunning,
|
isProxyRunning,
|
||||||
isProxyTakeover = false,
|
isProxyTakeover = false,
|
||||||
@@ -339,6 +341,9 @@ export function ProviderCard({
|
|||||||
onTest={onTest ? () => onTest(provider) : undefined}
|
onTest={onTest ? () => onTest(provider) : undefined}
|
||||||
onConfigureUsage={() => onConfigureUsage(provider)}
|
onConfigureUsage={() => onConfigureUsage(provider)}
|
||||||
onDelete={() => onDelete(provider)}
|
onDelete={() => onDelete(provider)}
|
||||||
|
onOpenTerminal={
|
||||||
|
onOpenTerminal ? () => onOpenTerminal(provider) : undefined
|
||||||
|
}
|
||||||
// 故障转移相关
|
// 故障转移相关
|
||||||
isAutoFailoverEnabled={isAutoFailoverEnabled}
|
isAutoFailoverEnabled={isAutoFailoverEnabled}
|
||||||
isInFailoverQueue={isInFailoverQueue}
|
isInFailoverQueue={isInFailoverQueue}
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ interface ProviderListProps {
|
|||||||
onDuplicate: (provider: Provider) => void;
|
onDuplicate: (provider: Provider) => void;
|
||||||
onConfigureUsage?: (provider: Provider) => void;
|
onConfigureUsage?: (provider: Provider) => void;
|
||||||
onOpenWebsite: (url: string) => void;
|
onOpenWebsite: (url: string) => void;
|
||||||
|
onOpenTerminal?: (provider: Provider) => void;
|
||||||
onCreate?: () => void;
|
onCreate?: () => void;
|
||||||
isLoading?: boolean;
|
isLoading?: boolean;
|
||||||
isProxyRunning?: boolean; // 代理服务运行状态
|
isProxyRunning?: boolean; // 代理服务运行状态
|
||||||
@@ -58,6 +59,7 @@ export function ProviderList({
|
|||||||
onDuplicate,
|
onDuplicate,
|
||||||
onConfigureUsage,
|
onConfigureUsage,
|
||||||
onOpenWebsite,
|
onOpenWebsite,
|
||||||
|
onOpenTerminal,
|
||||||
onCreate,
|
onCreate,
|
||||||
isLoading = false,
|
isLoading = false,
|
||||||
isProxyRunning = false,
|
isProxyRunning = false,
|
||||||
@@ -203,6 +205,7 @@ export function ProviderList({
|
|||||||
onDuplicate={onDuplicate}
|
onDuplicate={onDuplicate}
|
||||||
onConfigureUsage={onConfigureUsage}
|
onConfigureUsage={onConfigureUsage}
|
||||||
onOpenWebsite={onOpenWebsite}
|
onOpenWebsite={onOpenWebsite}
|
||||||
|
onOpenTerminal={onOpenTerminal}
|
||||||
onTest={handleTest}
|
onTest={handleTest}
|
||||||
isTesting={isChecking(provider.id)}
|
isTesting={isChecking(provider.id)}
|
||||||
isProxyRunning={isProxyRunning}
|
isProxyRunning={isProxyRunning}
|
||||||
@@ -311,6 +314,7 @@ interface SortableProviderCardProps {
|
|||||||
onDuplicate: (provider: Provider) => void;
|
onDuplicate: (provider: Provider) => void;
|
||||||
onConfigureUsage?: (provider: Provider) => void;
|
onConfigureUsage?: (provider: Provider) => void;
|
||||||
onOpenWebsite: (url: string) => void;
|
onOpenWebsite: (url: string) => void;
|
||||||
|
onOpenTerminal?: (provider: Provider) => void;
|
||||||
onTest: (provider: Provider) => void;
|
onTest: (provider: Provider) => void;
|
||||||
isTesting: boolean;
|
isTesting: boolean;
|
||||||
isProxyRunning: boolean;
|
isProxyRunning: boolean;
|
||||||
@@ -333,6 +337,7 @@ function SortableProviderCard({
|
|||||||
onDuplicate,
|
onDuplicate,
|
||||||
onConfigureUsage,
|
onConfigureUsage,
|
||||||
onOpenWebsite,
|
onOpenWebsite,
|
||||||
|
onOpenTerminal,
|
||||||
onTest,
|
onTest,
|
||||||
isTesting,
|
isTesting,
|
||||||
isProxyRunning,
|
isProxyRunning,
|
||||||
@@ -371,6 +376,7 @@ function SortableProviderCard({
|
|||||||
onConfigureUsage ? (item) => onConfigureUsage(item) : () => undefined
|
onConfigureUsage ? (item) => onConfigureUsage(item) : () => undefined
|
||||||
}
|
}
|
||||||
onOpenWebsite={onOpenWebsite}
|
onOpenWebsite={onOpenWebsite}
|
||||||
|
onOpenTerminal={onOpenTerminal}
|
||||||
onTest={onTest}
|
onTest={onTest}
|
||||||
isTesting={isTesting}
|
isTesting={isTesting}
|
||||||
isProxyRunning={isProxyRunning}
|
isProxyRunning={isProxyRunning}
|
||||||
|
|||||||
@@ -36,6 +36,8 @@ interface ClaudeFormFieldsProps {
|
|||||||
isEndpointModalOpen: boolean;
|
isEndpointModalOpen: boolean;
|
||||||
onEndpointModalToggle: (open: boolean) => void;
|
onEndpointModalToggle: (open: boolean) => void;
|
||||||
onCustomEndpointsChange?: (endpoints: string[]) => void;
|
onCustomEndpointsChange?: (endpoints: string[]) => void;
|
||||||
|
autoSelect: boolean;
|
||||||
|
onAutoSelectChange: (checked: boolean) => void;
|
||||||
|
|
||||||
// Model Selector
|
// Model Selector
|
||||||
shouldShowModelSelector: boolean;
|
shouldShowModelSelector: boolean;
|
||||||
@@ -83,6 +85,8 @@ export function ClaudeFormFields({
|
|||||||
isEndpointModalOpen,
|
isEndpointModalOpen,
|
||||||
onEndpointModalToggle,
|
onEndpointModalToggle,
|
||||||
onCustomEndpointsChange,
|
onCustomEndpointsChange,
|
||||||
|
autoSelect,
|
||||||
|
onAutoSelectChange,
|
||||||
shouldShowModelSelector,
|
shouldShowModelSelector,
|
||||||
claudeModel,
|
claudeModel,
|
||||||
reasoningModel,
|
reasoningModel,
|
||||||
@@ -170,6 +174,8 @@ export function ClaudeFormFields({
|
|||||||
initialEndpoints={speedTestEndpoints}
|
initialEndpoints={speedTestEndpoints}
|
||||||
visible={isEndpointModalOpen}
|
visible={isEndpointModalOpen}
|
||||||
onClose={() => onEndpointModalToggle(false)}
|
onClose={() => onEndpointModalToggle(false)}
|
||||||
|
autoSelect={autoSelect}
|
||||||
|
onAutoSelectChange={onAutoSelectChange}
|
||||||
onCustomEndpointsChange={onCustomEndpointsChange}
|
onCustomEndpointsChange={onCustomEndpointsChange}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ interface CodexFormFieldsProps {
|
|||||||
isEndpointModalOpen: boolean;
|
isEndpointModalOpen: boolean;
|
||||||
onEndpointModalToggle: (open: boolean) => void;
|
onEndpointModalToggle: (open: boolean) => void;
|
||||||
onCustomEndpointsChange?: (endpoints: string[]) => void;
|
onCustomEndpointsChange?: (endpoints: string[]) => void;
|
||||||
|
autoSelect: boolean;
|
||||||
|
onAutoSelectChange: (checked: boolean) => void;
|
||||||
|
|
||||||
// Model Name
|
// Model Name
|
||||||
shouldShowModelField?: boolean;
|
shouldShowModelField?: boolean;
|
||||||
@@ -50,6 +52,8 @@ export function CodexFormFields({
|
|||||||
isEndpointModalOpen,
|
isEndpointModalOpen,
|
||||||
onEndpointModalToggle,
|
onEndpointModalToggle,
|
||||||
onCustomEndpointsChange,
|
onCustomEndpointsChange,
|
||||||
|
autoSelect,
|
||||||
|
onAutoSelectChange,
|
||||||
shouldShowModelField = true,
|
shouldShowModelField = true,
|
||||||
modelName = "",
|
modelName = "",
|
||||||
onModelNameChange,
|
onModelNameChange,
|
||||||
@@ -130,6 +134,8 @@ export function CodexFormFields({
|
|||||||
initialEndpoints={speedTestEndpoints}
|
initialEndpoints={speedTestEndpoints}
|
||||||
visible={isEndpointModalOpen}
|
visible={isEndpointModalOpen}
|
||||||
onClose={() => onEndpointModalToggle(false)}
|
onClose={() => onEndpointModalToggle(false)}
|
||||||
|
autoSelect={autoSelect}
|
||||||
|
onAutoSelectChange={onAutoSelectChange}
|
||||||
onCustomEndpointsChange={onCustomEndpointsChange}
|
onCustomEndpointsChange={onCustomEndpointsChange}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ interface EndpointSpeedTestProps {
|
|||||||
initialEndpoints: EndpointCandidate[];
|
initialEndpoints: EndpointCandidate[];
|
||||||
visible?: boolean;
|
visible?: boolean;
|
||||||
onClose: () => void;
|
onClose: () => void;
|
||||||
|
autoSelect: boolean;
|
||||||
|
onAutoSelectChange: (checked: boolean) => void;
|
||||||
// 新建模式:当自定义端点列表变化时回传(仅包含 isCustom 的条目)
|
// 新建模式:当自定义端点列表变化时回传(仅包含 isCustom 的条目)
|
||||||
// 编辑模式:不使用此回调,端点直接保存到后端
|
// 编辑模式:不使用此回调,端点直接保存到后端
|
||||||
onCustomEndpointsChange?: (urls: string[]) => void;
|
onCustomEndpointsChange?: (urls: string[]) => void;
|
||||||
@@ -85,6 +87,8 @@ const EndpointSpeedTest: React.FC<EndpointSpeedTestProps> = ({
|
|||||||
initialEndpoints,
|
initialEndpoints,
|
||||||
visible = true,
|
visible = true,
|
||||||
onClose,
|
onClose,
|
||||||
|
autoSelect,
|
||||||
|
onAutoSelectChange,
|
||||||
onCustomEndpointsChange,
|
onCustomEndpointsChange,
|
||||||
}) => {
|
}) => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
@@ -93,7 +97,6 @@ const EndpointSpeedTest: React.FC<EndpointSpeedTestProps> = ({
|
|||||||
);
|
);
|
||||||
const [customUrl, setCustomUrl] = useState("");
|
const [customUrl, setCustomUrl] = useState("");
|
||||||
const [addError, setAddError] = useState<string | null>(null);
|
const [addError, setAddError] = useState<string | null>(null);
|
||||||
const [autoSelect, setAutoSelect] = useState(true);
|
|
||||||
const [isTesting, setIsTesting] = useState(false);
|
const [isTesting, setIsTesting] = useState(false);
|
||||||
const [lastError, setLastError] = useState<string | null>(null);
|
const [lastError, setLastError] = useState<string | null>(null);
|
||||||
const [isSaving, setIsSaving] = useState(false);
|
const [isSaving, setIsSaving] = useState(false);
|
||||||
@@ -488,7 +491,9 @@ const EndpointSpeedTest: React.FC<EndpointSpeedTestProps> = ({
|
|||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
checked={autoSelect}
|
checked={autoSelect}
|
||||||
onChange={(event) => setAutoSelect(event.target.checked)}
|
onChange={(event) => {
|
||||||
|
onAutoSelectChange(event.target.checked);
|
||||||
|
}}
|
||||||
className="h-3.5 w-3.5 rounded border-border-default bg-background text-primary focus:ring-2 focus:ring-primary/20"
|
className="h-3.5 w-3.5 rounded border-border-default bg-background text-primary focus:ring-2 focus:ring-primary/20"
|
||||||
/>
|
/>
|
||||||
{t("endpointTest.autoSelect")}
|
{t("endpointTest.autoSelect")}
|
||||||
|
|||||||
@@ -29,6 +29,8 @@ interface GeminiFormFieldsProps {
|
|||||||
isEndpointModalOpen: boolean;
|
isEndpointModalOpen: boolean;
|
||||||
onEndpointModalToggle: (open: boolean) => void;
|
onEndpointModalToggle: (open: boolean) => void;
|
||||||
onCustomEndpointsChange: (endpoints: string[]) => void;
|
onCustomEndpointsChange: (endpoints: string[]) => void;
|
||||||
|
autoSelect: boolean;
|
||||||
|
onAutoSelectChange: (checked: boolean) => void;
|
||||||
|
|
||||||
// Model
|
// Model
|
||||||
shouldShowModelField: boolean;
|
shouldShowModelField: boolean;
|
||||||
@@ -55,6 +57,8 @@ export function GeminiFormFields({
|
|||||||
isEndpointModalOpen,
|
isEndpointModalOpen,
|
||||||
onEndpointModalToggle,
|
onEndpointModalToggle,
|
||||||
onCustomEndpointsChange,
|
onCustomEndpointsChange,
|
||||||
|
autoSelect,
|
||||||
|
onAutoSelectChange,
|
||||||
shouldShowModelField,
|
shouldShowModelField,
|
||||||
model,
|
model,
|
||||||
onModelChange,
|
onModelChange,
|
||||||
@@ -142,6 +146,8 @@ export function GeminiFormFields({
|
|||||||
initialEndpoints={speedTestEndpoints}
|
initialEndpoints={speedTestEndpoints}
|
||||||
visible={isEndpointModalOpen}
|
visible={isEndpointModalOpen}
|
||||||
onClose={() => onEndpointModalToggle(false)}
|
onClose={() => onEndpointModalToggle(false)}
|
||||||
|
autoSelect={autoSelect}
|
||||||
|
onAutoSelectChange={onAutoSelectChange}
|
||||||
onCustomEndpointsChange={onCustomEndpointsChange}
|
onCustomEndpointsChange={onCustomEndpointsChange}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -124,6 +124,9 @@ export function ProviderForm({
|
|||||||
return [];
|
return [];
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
const [endpointAutoSelect, setEndpointAutoSelect] = useState<boolean>(
|
||||||
|
() => initialData?.meta?.endpointAutoSelect ?? true,
|
||||||
|
);
|
||||||
|
|
||||||
// 使用 category hook
|
// 使用 category hook
|
||||||
const { category } = useProviderCategory({
|
const { category } = useProviderCategory({
|
||||||
@@ -141,6 +144,7 @@ export function ProviderForm({
|
|||||||
if (!initialData) {
|
if (!initialData) {
|
||||||
setDraftCustomEndpoints([]);
|
setDraftCustomEndpoints([]);
|
||||||
}
|
}
|
||||||
|
setEndpointAutoSelect(initialData?.meta?.endpointAutoSelect ?? true);
|
||||||
}, [appId, initialData]);
|
}, [appId, initialData]);
|
||||||
|
|
||||||
const defaultValues: ProviderFormData = useMemo(
|
const defaultValues: ProviderFormData = useMemo(
|
||||||
@@ -236,7 +240,7 @@ export function ProviderForm({
|
|||||||
} catch {
|
} catch {
|
||||||
// ignore
|
// ignore
|
||||||
}
|
}
|
||||||
return true;
|
return false; // OpenRouter now supports Claude Code compatible API, no need for transform
|
||||||
}, [isOpenRouterProvider, settingsConfigValue]);
|
}, [isOpenRouterProvider, settingsConfigValue]);
|
||||||
|
|
||||||
const handleOpenRouterCompatChange = useCallback(
|
const handleOpenRouterCompatChange = useCallback(
|
||||||
@@ -647,6 +651,13 @@ export function ProviderForm({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const baseMeta: ProviderMeta | undefined =
|
||||||
|
payload.meta ?? (initialData?.meta ? { ...initialData.meta } : undefined);
|
||||||
|
payload.meta = {
|
||||||
|
...(baseMeta ?? {}),
|
||||||
|
endpointAutoSelect,
|
||||||
|
};
|
||||||
|
|
||||||
onSubmit(payload);
|
onSubmit(payload);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -856,6 +867,8 @@ export function ProviderForm({
|
|||||||
onCustomEndpointsChange={
|
onCustomEndpointsChange={
|
||||||
isEditMode ? undefined : setDraftCustomEndpoints
|
isEditMode ? undefined : setDraftCustomEndpoints
|
||||||
}
|
}
|
||||||
|
autoSelect={endpointAutoSelect}
|
||||||
|
onAutoSelectChange={setEndpointAutoSelect}
|
||||||
shouldShowModelSelector={category !== "official"}
|
shouldShowModelSelector={category !== "official"}
|
||||||
claudeModel={claudeModel}
|
claudeModel={claudeModel}
|
||||||
reasoningModel={reasoningModel}
|
reasoningModel={reasoningModel}
|
||||||
@@ -864,7 +877,7 @@ export function ProviderForm({
|
|||||||
defaultOpusModel={defaultOpusModel}
|
defaultOpusModel={defaultOpusModel}
|
||||||
onModelChange={handleModelChange}
|
onModelChange={handleModelChange}
|
||||||
speedTestEndpoints={speedTestEndpoints}
|
speedTestEndpoints={speedTestEndpoints}
|
||||||
showOpenRouterCompatToggle={isOpenRouterProvider}
|
showOpenRouterCompatToggle={false}
|
||||||
openRouterCompatEnabled={openRouterCompatEnabled}
|
openRouterCompatEnabled={openRouterCompatEnabled}
|
||||||
onOpenRouterCompatChange={handleOpenRouterCompatChange}
|
onOpenRouterCompatChange={handleOpenRouterCompatChange}
|
||||||
/>
|
/>
|
||||||
@@ -889,6 +902,8 @@ export function ProviderForm({
|
|||||||
onCustomEndpointsChange={
|
onCustomEndpointsChange={
|
||||||
isEditMode ? undefined : setDraftCustomEndpoints
|
isEditMode ? undefined : setDraftCustomEndpoints
|
||||||
}
|
}
|
||||||
|
autoSelect={endpointAutoSelect}
|
||||||
|
onAutoSelectChange={setEndpointAutoSelect}
|
||||||
shouldShowModelField={category !== "official"}
|
shouldShowModelField={category !== "official"}
|
||||||
modelName={codexModelName}
|
modelName={codexModelName}
|
||||||
onModelNameChange={handleCodexModelNameChange}
|
onModelNameChange={handleCodexModelNameChange}
|
||||||
@@ -917,6 +932,8 @@ export function ProviderForm({
|
|||||||
isEndpointModalOpen={isEndpointModalOpen}
|
isEndpointModalOpen={isEndpointModalOpen}
|
||||||
onEndpointModalToggle={setIsEndpointModalOpen}
|
onEndpointModalToggle={setIsEndpointModalOpen}
|
||||||
onCustomEndpointsChange={setDraftCustomEndpoints}
|
onCustomEndpointsChange={setDraftCustomEndpoints}
|
||||||
|
autoSelect={endpointAutoSelect}
|
||||||
|
onAutoSelectChange={setEndpointAutoSelect}
|
||||||
shouldShowModelField={true}
|
shouldShowModelField={true}
|
||||||
model={geminiModel}
|
model={geminiModel}
|
||||||
onModelChange={handleGeminiModelChange}
|
onModelChange={handleGeminiModelChange}
|
||||||
|
|||||||
@@ -43,11 +43,7 @@ export function useApiKeyState({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 仅当配置确实包含 API Key 字段时才同步(避免无意清空用户正在输入的 key)
|
// 从配置中提取 API Key(如果不存在则返回空字符串)
|
||||||
if (!hasApiKeyField(initialConfig, appType)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const extracted = getApiKeyFromConfig(initialConfig, appType);
|
const extracted = getApiKeyFromConfig(initialConfig, appType);
|
||||||
if (extracted !== apiKey) {
|
if (extracted !== apiKey) {
|
||||||
setApiKey(extracted);
|
setApiKey(extracted);
|
||||||
|
|||||||
@@ -41,8 +41,9 @@ export function useBaseUrlState({
|
|||||||
try {
|
try {
|
||||||
const config = JSON.parse(settingsConfig || "{}");
|
const config = JSON.parse(settingsConfig || "{}");
|
||||||
const envUrl: unknown = config?.env?.ANTHROPIC_BASE_URL;
|
const envUrl: unknown = config?.env?.ANTHROPIC_BASE_URL;
|
||||||
if (typeof envUrl === "string" && envUrl && envUrl.trim() !== baseUrl) {
|
const nextUrl = typeof envUrl === "string" ? envUrl.trim() : "";
|
||||||
setBaseUrl(envUrl.trim());
|
if (nextUrl !== baseUrl) {
|
||||||
|
setBaseUrl(nextUrl);
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
// ignore
|
// ignore
|
||||||
|
|||||||
@@ -21,52 +21,157 @@ export function AutoFailoverConfigPanel({
|
|||||||
const { data: config, isLoading, error } = useAppProxyConfig(appType);
|
const { data: config, isLoading, error } = useAppProxyConfig(appType);
|
||||||
const updateConfig = useUpdateAppProxyConfig();
|
const updateConfig = useUpdateAppProxyConfig();
|
||||||
|
|
||||||
|
// 使用字符串状态以支持完全清空数字输入框
|
||||||
const [formData, setFormData] = useState({
|
const [formData, setFormData] = useState({
|
||||||
autoFailoverEnabled: false,
|
autoFailoverEnabled: false,
|
||||||
maxRetries: 3,
|
maxRetries: "3",
|
||||||
streamingFirstByteTimeout: 30,
|
streamingFirstByteTimeout: "30",
|
||||||
streamingIdleTimeout: 60,
|
streamingIdleTimeout: "60",
|
||||||
nonStreamingTimeout: 300,
|
nonStreamingTimeout: "300",
|
||||||
circuitFailureThreshold: 5,
|
circuitFailureThreshold: "5",
|
||||||
circuitSuccessThreshold: 2,
|
circuitSuccessThreshold: "2",
|
||||||
circuitTimeoutSeconds: 60,
|
circuitTimeoutSeconds: "60",
|
||||||
circuitErrorRateThreshold: 0.5,
|
circuitErrorRateThreshold: "50", // 存储百分比值
|
||||||
circuitMinRequests: 10,
|
circuitMinRequests: "10",
|
||||||
});
|
});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (config) {
|
if (config) {
|
||||||
setFormData({
|
setFormData({
|
||||||
autoFailoverEnabled: config.autoFailoverEnabled,
|
autoFailoverEnabled: config.autoFailoverEnabled,
|
||||||
maxRetries: config.maxRetries,
|
maxRetries: String(config.maxRetries),
|
||||||
streamingFirstByteTimeout: config.streamingFirstByteTimeout,
|
streamingFirstByteTimeout: String(config.streamingFirstByteTimeout),
|
||||||
streamingIdleTimeout: config.streamingIdleTimeout,
|
streamingIdleTimeout: String(config.streamingIdleTimeout),
|
||||||
nonStreamingTimeout: config.nonStreamingTimeout,
|
nonStreamingTimeout: String(config.nonStreamingTimeout),
|
||||||
circuitFailureThreshold: config.circuitFailureThreshold,
|
circuitFailureThreshold: String(config.circuitFailureThreshold),
|
||||||
circuitSuccessThreshold: config.circuitSuccessThreshold,
|
circuitSuccessThreshold: String(config.circuitSuccessThreshold),
|
||||||
circuitTimeoutSeconds: config.circuitTimeoutSeconds,
|
circuitTimeoutSeconds: String(config.circuitTimeoutSeconds),
|
||||||
circuitErrorRateThreshold: config.circuitErrorRateThreshold,
|
circuitErrorRateThreshold: String(
|
||||||
circuitMinRequests: config.circuitMinRequests,
|
Math.round(config.circuitErrorRateThreshold * 100),
|
||||||
|
),
|
||||||
|
circuitMinRequests: String(config.circuitMinRequests),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}, [config]);
|
}, [config]);
|
||||||
|
|
||||||
const handleSave = async () => {
|
const handleSave = async () => {
|
||||||
if (!config) return;
|
if (!config) return;
|
||||||
|
// 解析数字,返回 NaN 表示无效输入
|
||||||
|
const parseNum = (val: string) => {
|
||||||
|
const trimmed = val.trim();
|
||||||
|
// 必须是纯数字
|
||||||
|
if (!/^-?\d+$/.test(trimmed)) return NaN;
|
||||||
|
return parseInt(trimmed);
|
||||||
|
};
|
||||||
|
|
||||||
|
// 定义各字段的有效范围
|
||||||
|
const ranges = {
|
||||||
|
maxRetries: { min: 0, max: 10 },
|
||||||
|
streamingFirstByteTimeout: { min: 0, max: 180 },
|
||||||
|
streamingIdleTimeout: { min: 0, max: 600 },
|
||||||
|
nonStreamingTimeout: { min: 0, max: 1800 },
|
||||||
|
circuitFailureThreshold: { min: 1, max: 20 },
|
||||||
|
circuitSuccessThreshold: { min: 1, max: 10 },
|
||||||
|
circuitTimeoutSeconds: { min: 0, max: 300 },
|
||||||
|
circuitErrorRateThreshold: { min: 0, max: 100 },
|
||||||
|
circuitMinRequests: { min: 5, max: 100 },
|
||||||
|
};
|
||||||
|
|
||||||
|
// 解析原始值
|
||||||
|
const raw = {
|
||||||
|
maxRetries: parseNum(formData.maxRetries),
|
||||||
|
streamingFirstByteTimeout: parseNum(formData.streamingFirstByteTimeout),
|
||||||
|
streamingIdleTimeout: parseNum(formData.streamingIdleTimeout),
|
||||||
|
nonStreamingTimeout: parseNum(formData.nonStreamingTimeout),
|
||||||
|
circuitFailureThreshold: parseNum(formData.circuitFailureThreshold),
|
||||||
|
circuitSuccessThreshold: parseNum(formData.circuitSuccessThreshold),
|
||||||
|
circuitTimeoutSeconds: parseNum(formData.circuitTimeoutSeconds),
|
||||||
|
circuitErrorRateThreshold: parseNum(formData.circuitErrorRateThreshold),
|
||||||
|
circuitMinRequests: parseNum(formData.circuitMinRequests),
|
||||||
|
};
|
||||||
|
|
||||||
|
// 校验是否超出范围(NaN 也视为无效)
|
||||||
|
const errors: string[] = [];
|
||||||
|
const checkRange = (
|
||||||
|
value: number,
|
||||||
|
range: { min: number; max: number },
|
||||||
|
label: string,
|
||||||
|
) => {
|
||||||
|
if (isNaN(value) || value < range.min || value > range.max) {
|
||||||
|
errors.push(`${label}: ${range.min}-${range.max}`);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
checkRange(
|
||||||
|
raw.maxRetries,
|
||||||
|
ranges.maxRetries,
|
||||||
|
t("proxy.autoFailover.maxRetries", "最大重试次数"),
|
||||||
|
);
|
||||||
|
checkRange(
|
||||||
|
raw.streamingFirstByteTimeout,
|
||||||
|
ranges.streamingFirstByteTimeout,
|
||||||
|
t("proxy.autoFailover.streamingFirstByte", "流式首字节超时"),
|
||||||
|
);
|
||||||
|
checkRange(
|
||||||
|
raw.streamingIdleTimeout,
|
||||||
|
ranges.streamingIdleTimeout,
|
||||||
|
t("proxy.autoFailover.streamingIdle", "流式静默超时"),
|
||||||
|
);
|
||||||
|
checkRange(
|
||||||
|
raw.nonStreamingTimeout,
|
||||||
|
ranges.nonStreamingTimeout,
|
||||||
|
t("proxy.autoFailover.nonStreaming", "非流式超时"),
|
||||||
|
);
|
||||||
|
checkRange(
|
||||||
|
raw.circuitFailureThreshold,
|
||||||
|
ranges.circuitFailureThreshold,
|
||||||
|
t("proxy.autoFailover.failureThreshold", "失败阈值"),
|
||||||
|
);
|
||||||
|
checkRange(
|
||||||
|
raw.circuitSuccessThreshold,
|
||||||
|
ranges.circuitSuccessThreshold,
|
||||||
|
t("proxy.autoFailover.successThreshold", "恢复成功阈值"),
|
||||||
|
);
|
||||||
|
checkRange(
|
||||||
|
raw.circuitTimeoutSeconds,
|
||||||
|
ranges.circuitTimeoutSeconds,
|
||||||
|
t("proxy.autoFailover.timeout", "恢复等待时间"),
|
||||||
|
);
|
||||||
|
checkRange(
|
||||||
|
raw.circuitErrorRateThreshold,
|
||||||
|
ranges.circuitErrorRateThreshold,
|
||||||
|
t("proxy.autoFailover.errorRate", "错误率阈值"),
|
||||||
|
);
|
||||||
|
checkRange(
|
||||||
|
raw.circuitMinRequests,
|
||||||
|
ranges.circuitMinRequests,
|
||||||
|
t("proxy.autoFailover.minRequests", "最小请求数"),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (errors.length > 0) {
|
||||||
|
toast.error(
|
||||||
|
t("proxy.autoFailover.validationFailed", {
|
||||||
|
fields: errors.join("; "),
|
||||||
|
defaultValue: `以下字段超出有效范围: ${errors.join("; ")}`,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await updateConfig.mutateAsync({
|
await updateConfig.mutateAsync({
|
||||||
appType,
|
appType,
|
||||||
enabled: config.enabled,
|
enabled: config.enabled,
|
||||||
autoFailoverEnabled: formData.autoFailoverEnabled,
|
autoFailoverEnabled: formData.autoFailoverEnabled,
|
||||||
maxRetries: formData.maxRetries,
|
maxRetries: raw.maxRetries,
|
||||||
streamingFirstByteTimeout: formData.streamingFirstByteTimeout,
|
streamingFirstByteTimeout: raw.streamingFirstByteTimeout,
|
||||||
streamingIdleTimeout: formData.streamingIdleTimeout,
|
streamingIdleTimeout: raw.streamingIdleTimeout,
|
||||||
nonStreamingTimeout: formData.nonStreamingTimeout,
|
nonStreamingTimeout: raw.nonStreamingTimeout,
|
||||||
circuitFailureThreshold: formData.circuitFailureThreshold,
|
circuitFailureThreshold: raw.circuitFailureThreshold,
|
||||||
circuitSuccessThreshold: formData.circuitSuccessThreshold,
|
circuitSuccessThreshold: raw.circuitSuccessThreshold,
|
||||||
circuitTimeoutSeconds: formData.circuitTimeoutSeconds,
|
circuitTimeoutSeconds: raw.circuitTimeoutSeconds,
|
||||||
circuitErrorRateThreshold: formData.circuitErrorRateThreshold,
|
circuitErrorRateThreshold: raw.circuitErrorRateThreshold / 100,
|
||||||
circuitMinRequests: formData.circuitMinRequests,
|
circuitMinRequests: raw.circuitMinRequests,
|
||||||
});
|
});
|
||||||
toast.success(
|
toast.success(
|
||||||
t("proxy.autoFailover.configSaved", "自动故障转移配置已保存"),
|
t("proxy.autoFailover.configSaved", "自动故障转移配置已保存"),
|
||||||
@@ -83,15 +188,17 @@ export function AutoFailoverConfigPanel({
|
|||||||
if (config) {
|
if (config) {
|
||||||
setFormData({
|
setFormData({
|
||||||
autoFailoverEnabled: config.autoFailoverEnabled,
|
autoFailoverEnabled: config.autoFailoverEnabled,
|
||||||
maxRetries: config.maxRetries,
|
maxRetries: String(config.maxRetries),
|
||||||
streamingFirstByteTimeout: config.streamingFirstByteTimeout,
|
streamingFirstByteTimeout: String(config.streamingFirstByteTimeout),
|
||||||
streamingIdleTimeout: config.streamingIdleTimeout,
|
streamingIdleTimeout: String(config.streamingIdleTimeout),
|
||||||
nonStreamingTimeout: config.nonStreamingTimeout,
|
nonStreamingTimeout: String(config.nonStreamingTimeout),
|
||||||
circuitFailureThreshold: config.circuitFailureThreshold,
|
circuitFailureThreshold: String(config.circuitFailureThreshold),
|
||||||
circuitSuccessThreshold: config.circuitSuccessThreshold,
|
circuitSuccessThreshold: String(config.circuitSuccessThreshold),
|
||||||
circuitTimeoutSeconds: config.circuitTimeoutSeconds,
|
circuitTimeoutSeconds: String(config.circuitTimeoutSeconds),
|
||||||
circuitErrorRateThreshold: config.circuitErrorRateThreshold,
|
circuitErrorRateThreshold: String(
|
||||||
circuitMinRequests: config.circuitMinRequests,
|
Math.round(config.circuitErrorRateThreshold * 100),
|
||||||
|
),
|
||||||
|
circuitMinRequests: String(config.circuitMinRequests),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -142,13 +249,9 @@ export function AutoFailoverConfigPanel({
|
|||||||
min="0"
|
min="0"
|
||||||
max="10"
|
max="10"
|
||||||
value={formData.maxRetries}
|
value={formData.maxRetries}
|
||||||
onChange={(e) => {
|
onChange={(e) =>
|
||||||
const val = parseInt(e.target.value);
|
setFormData({ ...formData, maxRetries: e.target.value })
|
||||||
setFormData({
|
}
|
||||||
...formData,
|
|
||||||
maxRetries: isNaN(val) ? 0 : val,
|
|
||||||
});
|
|
||||||
}}
|
|
||||||
disabled={isDisabled}
|
disabled={isDisabled}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
@@ -169,13 +272,12 @@ export function AutoFailoverConfigPanel({
|
|||||||
min="1"
|
min="1"
|
||||||
max="20"
|
max="20"
|
||||||
value={formData.circuitFailureThreshold}
|
value={formData.circuitFailureThreshold}
|
||||||
onChange={(e) => {
|
onChange={(e) =>
|
||||||
const val = parseInt(e.target.value);
|
|
||||||
setFormData({
|
setFormData({
|
||||||
...formData,
|
...formData,
|
||||||
circuitFailureThreshold: isNaN(val) ? 1 : Math.max(1, val),
|
circuitFailureThreshold: e.target.value,
|
||||||
});
|
})
|
||||||
}}
|
}
|
||||||
disabled={isDisabled}
|
disabled={isDisabled}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
@@ -208,13 +310,12 @@ export function AutoFailoverConfigPanel({
|
|||||||
min="0"
|
min="0"
|
||||||
max="180"
|
max="180"
|
||||||
value={formData.streamingFirstByteTimeout}
|
value={formData.streamingFirstByteTimeout}
|
||||||
onChange={(e) => {
|
onChange={(e) =>
|
||||||
const val = parseInt(e.target.value);
|
|
||||||
setFormData({
|
setFormData({
|
||||||
...formData,
|
...formData,
|
||||||
streamingFirstByteTimeout: isNaN(val) ? 0 : val,
|
streamingFirstByteTimeout: e.target.value,
|
||||||
});
|
})
|
||||||
}}
|
}
|
||||||
disabled={isDisabled}
|
disabled={isDisabled}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
@@ -235,13 +336,12 @@ export function AutoFailoverConfigPanel({
|
|||||||
min="0"
|
min="0"
|
||||||
max="600"
|
max="600"
|
||||||
value={formData.streamingIdleTimeout}
|
value={formData.streamingIdleTimeout}
|
||||||
onChange={(e) => {
|
onChange={(e) =>
|
||||||
const val = parseInt(e.target.value);
|
|
||||||
setFormData({
|
setFormData({
|
||||||
...formData,
|
...formData,
|
||||||
streamingIdleTimeout: isNaN(val) ? 0 : val,
|
streamingIdleTimeout: e.target.value,
|
||||||
});
|
})
|
||||||
}}
|
}
|
||||||
disabled={isDisabled}
|
disabled={isDisabled}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
@@ -262,13 +362,12 @@ export function AutoFailoverConfigPanel({
|
|||||||
min="0"
|
min="0"
|
||||||
max="1800"
|
max="1800"
|
||||||
value={formData.nonStreamingTimeout}
|
value={formData.nonStreamingTimeout}
|
||||||
onChange={(e) => {
|
onChange={(e) =>
|
||||||
const val = parseInt(e.target.value);
|
|
||||||
setFormData({
|
setFormData({
|
||||||
...formData,
|
...formData,
|
||||||
nonStreamingTimeout: isNaN(val) ? 0 : val,
|
nonStreamingTimeout: e.target.value,
|
||||||
});
|
})
|
||||||
}}
|
}
|
||||||
disabled={isDisabled}
|
disabled={isDisabled}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
@@ -298,13 +397,12 @@ export function AutoFailoverConfigPanel({
|
|||||||
min="1"
|
min="1"
|
||||||
max="10"
|
max="10"
|
||||||
value={formData.circuitSuccessThreshold}
|
value={formData.circuitSuccessThreshold}
|
||||||
onChange={(e) => {
|
onChange={(e) =>
|
||||||
const val = parseInt(e.target.value);
|
|
||||||
setFormData({
|
setFormData({
|
||||||
...formData,
|
...formData,
|
||||||
circuitSuccessThreshold: isNaN(val) ? 1 : Math.max(1, val),
|
circuitSuccessThreshold: e.target.value,
|
||||||
});
|
})
|
||||||
}}
|
}
|
||||||
disabled={isDisabled}
|
disabled={isDisabled}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
@@ -322,16 +420,15 @@ export function AutoFailoverConfigPanel({
|
|||||||
<Input
|
<Input
|
||||||
id={`timeoutSeconds-${appType}`}
|
id={`timeoutSeconds-${appType}`}
|
||||||
type="number"
|
type="number"
|
||||||
min="10"
|
min="0"
|
||||||
max="300"
|
max="300"
|
||||||
value={formData.circuitTimeoutSeconds}
|
value={formData.circuitTimeoutSeconds}
|
||||||
onChange={(e) => {
|
onChange={(e) =>
|
||||||
const val = parseInt(e.target.value);
|
|
||||||
setFormData({
|
setFormData({
|
||||||
...formData,
|
...formData,
|
||||||
circuitTimeoutSeconds: isNaN(val) ? 10 : Math.max(10, val),
|
circuitTimeoutSeconds: e.target.value,
|
||||||
});
|
})
|
||||||
}}
|
}
|
||||||
disabled={isDisabled}
|
disabled={isDisabled}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
@@ -352,14 +449,13 @@ export function AutoFailoverConfigPanel({
|
|||||||
min="0"
|
min="0"
|
||||||
max="100"
|
max="100"
|
||||||
step="5"
|
step="5"
|
||||||
value={Math.round(formData.circuitErrorRateThreshold * 100)}
|
value={formData.circuitErrorRateThreshold}
|
||||||
onChange={(e) => {
|
onChange={(e) =>
|
||||||
const val = parseInt(e.target.value);
|
|
||||||
setFormData({
|
setFormData({
|
||||||
...formData,
|
...formData,
|
||||||
circuitErrorRateThreshold: isNaN(val) ? 0.5 : val / 100,
|
circuitErrorRateThreshold: e.target.value,
|
||||||
});
|
})
|
||||||
}}
|
}
|
||||||
disabled={isDisabled}
|
disabled={isDisabled}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
@@ -380,13 +476,12 @@ export function AutoFailoverConfigPanel({
|
|||||||
min="5"
|
min="5"
|
||||||
max="100"
|
max="100"
|
||||||
value={formData.circuitMinRequests}
|
value={formData.circuitMinRequests}
|
||||||
onChange={(e) => {
|
onChange={(e) =>
|
||||||
const val = parseInt(e.target.value);
|
|
||||||
setFormData({
|
setFormData({
|
||||||
...formData,
|
...formData,
|
||||||
circuitMinRequests: isNaN(val) ? 5 : Math.max(5, val),
|
circuitMinRequests: e.target.value,
|
||||||
});
|
})
|
||||||
}}
|
}
|
||||||
disabled={isDisabled}
|
disabled={isDisabled}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
|
|||||||
@@ -7,42 +7,141 @@ import { Label } from "@/components/ui/label";
|
|||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { useState, useEffect } from "react";
|
import { useState, useEffect } from "react";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 熔断器配置面板
|
* 熔断器配置面板
|
||||||
* 允许用户调整熔断器参数
|
* 允许用户调整熔断器参数
|
||||||
*/
|
*/
|
||||||
export function CircuitBreakerConfigPanel() {
|
export function CircuitBreakerConfigPanel() {
|
||||||
|
const { t } = useTranslation();
|
||||||
const { data: config, isLoading } = useCircuitBreakerConfig();
|
const { data: config, isLoading } = useCircuitBreakerConfig();
|
||||||
const updateConfig = useUpdateCircuitBreakerConfig();
|
const updateConfig = useUpdateCircuitBreakerConfig();
|
||||||
|
|
||||||
|
// 使用字符串状态以支持完全清空输入框
|
||||||
const [formData, setFormData] = useState({
|
const [formData, setFormData] = useState({
|
||||||
failureThreshold: 5,
|
failureThreshold: "5",
|
||||||
successThreshold: 2,
|
successThreshold: "2",
|
||||||
timeoutSeconds: 60,
|
timeoutSeconds: "60",
|
||||||
errorRateThreshold: 0.5,
|
errorRateThreshold: "50", // 存储百分比值
|
||||||
minRequests: 10,
|
minRequests: "10",
|
||||||
});
|
});
|
||||||
|
|
||||||
// 当配置加载完成时更新表单数据
|
// 当配置加载完成时更新表单数据
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (config) {
|
if (config) {
|
||||||
setFormData(config);
|
setFormData({
|
||||||
|
failureThreshold: String(config.failureThreshold),
|
||||||
|
successThreshold: String(config.successThreshold),
|
||||||
|
timeoutSeconds: String(config.timeoutSeconds),
|
||||||
|
errorRateThreshold: String(Math.round(config.errorRateThreshold * 100)),
|
||||||
|
minRequests: String(config.minRequests),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}, [config]);
|
}, [config]);
|
||||||
|
|
||||||
const handleSave = async () => {
|
const handleSave = async () => {
|
||||||
|
// 解析数字,返回 NaN 表示无效输入
|
||||||
|
const parseNum = (val: string) => {
|
||||||
|
const trimmed = val.trim();
|
||||||
|
// 必须是纯数字
|
||||||
|
if (!/^-?\d+$/.test(trimmed)) return NaN;
|
||||||
|
return parseInt(trimmed);
|
||||||
|
};
|
||||||
|
|
||||||
|
// 定义各字段的有效范围
|
||||||
|
const ranges = {
|
||||||
|
failureThreshold: { min: 1, max: 20 },
|
||||||
|
successThreshold: { min: 1, max: 10 },
|
||||||
|
timeoutSeconds: { min: 0, max: 300 },
|
||||||
|
errorRateThreshold: { min: 0, max: 100 },
|
||||||
|
minRequests: { min: 5, max: 100 },
|
||||||
|
};
|
||||||
|
|
||||||
|
// 解析原始值
|
||||||
|
const raw = {
|
||||||
|
failureThreshold: parseNum(formData.failureThreshold),
|
||||||
|
successThreshold: parseNum(formData.successThreshold),
|
||||||
|
timeoutSeconds: parseNum(formData.timeoutSeconds),
|
||||||
|
errorRateThreshold: parseNum(formData.errorRateThreshold),
|
||||||
|
minRequests: parseNum(formData.minRequests),
|
||||||
|
};
|
||||||
|
|
||||||
|
// 校验是否超出范围(NaN 也视为无效)
|
||||||
|
const errors: string[] = [];
|
||||||
|
const checkRange = (
|
||||||
|
value: number,
|
||||||
|
range: { min: number; max: number },
|
||||||
|
label: string,
|
||||||
|
) => {
|
||||||
|
if (isNaN(value) || value < range.min || value > range.max) {
|
||||||
|
errors.push(`${label}: ${range.min}-${range.max}`);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
checkRange(
|
||||||
|
raw.failureThreshold,
|
||||||
|
ranges.failureThreshold,
|
||||||
|
t("circuitBreaker.failureThreshold", "失败阈值"),
|
||||||
|
);
|
||||||
|
checkRange(
|
||||||
|
raw.successThreshold,
|
||||||
|
ranges.successThreshold,
|
||||||
|
t("circuitBreaker.successThreshold", "成功阈值"),
|
||||||
|
);
|
||||||
|
checkRange(
|
||||||
|
raw.timeoutSeconds,
|
||||||
|
ranges.timeoutSeconds,
|
||||||
|
t("circuitBreaker.timeoutSeconds", "超时时间"),
|
||||||
|
);
|
||||||
|
checkRange(
|
||||||
|
raw.errorRateThreshold,
|
||||||
|
ranges.errorRateThreshold,
|
||||||
|
t("circuitBreaker.errorRateThreshold", "错误率阈值"),
|
||||||
|
);
|
||||||
|
checkRange(
|
||||||
|
raw.minRequests,
|
||||||
|
ranges.minRequests,
|
||||||
|
t("circuitBreaker.minRequests", "最小请求数"),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (errors.length > 0) {
|
||||||
|
toast.error(
|
||||||
|
t("circuitBreaker.validationFailed", {
|
||||||
|
fields: errors.join("; "),
|
||||||
|
defaultValue: `以下字段超出有效范围: ${errors.join("; ")}`,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await updateConfig.mutateAsync(formData);
|
await updateConfig.mutateAsync({
|
||||||
toast.success("熔断器配置已保存", { closeButton: true });
|
failureThreshold: raw.failureThreshold,
|
||||||
|
successThreshold: raw.successThreshold,
|
||||||
|
timeoutSeconds: raw.timeoutSeconds,
|
||||||
|
errorRateThreshold: raw.errorRateThreshold / 100,
|
||||||
|
minRequests: raw.minRequests,
|
||||||
|
});
|
||||||
|
toast.success(t("circuitBreaker.configSaved", "熔断器配置已保存"), {
|
||||||
|
closeButton: true,
|
||||||
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
toast.error("保存失败: " + String(error));
|
toast.error(
|
||||||
|
t("circuitBreaker.saveFailed", "保存失败") + ": " + String(error),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleReset = () => {
|
const handleReset = () => {
|
||||||
if (config) {
|
if (config) {
|
||||||
setFormData(config);
|
setFormData({
|
||||||
|
failureThreshold: String(config.failureThreshold),
|
||||||
|
successThreshold: String(config.successThreshold),
|
||||||
|
timeoutSeconds: String(config.timeoutSeconds),
|
||||||
|
errorRateThreshold: String(Math.round(config.errorRateThreshold * 100)),
|
||||||
|
minRequests: String(config.minRequests),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -72,10 +171,7 @@ export function CircuitBreakerConfigPanel() {
|
|||||||
max="20"
|
max="20"
|
||||||
value={formData.failureThreshold}
|
value={formData.failureThreshold}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
setFormData({
|
setFormData({ ...formData, failureThreshold: e.target.value })
|
||||||
...formData,
|
|
||||||
failureThreshold: parseInt(e.target.value) || 5,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
@@ -89,14 +185,11 @@ export function CircuitBreakerConfigPanel() {
|
|||||||
<Input
|
<Input
|
||||||
id="timeoutSeconds"
|
id="timeoutSeconds"
|
||||||
type="number"
|
type="number"
|
||||||
min="10"
|
min="0"
|
||||||
max="300"
|
max="300"
|
||||||
value={formData.timeoutSeconds}
|
value={formData.timeoutSeconds}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
setFormData({
|
setFormData({ ...formData, timeoutSeconds: e.target.value })
|
||||||
...formData,
|
|
||||||
timeoutSeconds: parseInt(e.target.value) || 60,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
@@ -114,10 +207,7 @@ export function CircuitBreakerConfigPanel() {
|
|||||||
max="10"
|
max="10"
|
||||||
value={formData.successThreshold}
|
value={formData.successThreshold}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
setFormData({
|
setFormData({ ...formData, successThreshold: e.target.value })
|
||||||
...formData,
|
|
||||||
successThreshold: parseInt(e.target.value) || 2,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
@@ -134,12 +224,9 @@ export function CircuitBreakerConfigPanel() {
|
|||||||
min="0"
|
min="0"
|
||||||
max="100"
|
max="100"
|
||||||
step="5"
|
step="5"
|
||||||
value={Math.round(formData.errorRateThreshold * 100)}
|
value={formData.errorRateThreshold}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
setFormData({
|
setFormData({ ...formData, errorRateThreshold: e.target.value })
|
||||||
...formData,
|
|
||||||
errorRateThreshold: (parseInt(e.target.value) || 50) / 100,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
@@ -157,10 +244,7 @@ export function CircuitBreakerConfigPanel() {
|
|||||||
max="100"
|
max="100"
|
||||||
value={formData.minRequests}
|
value={formData.minRequests}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
setFormData({
|
setFormData({ ...formData, minRequests: e.target.value })
|
||||||
...formData,
|
|
||||||
minRequests: parseInt(e.target.value) || 10,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
|
|||||||
@@ -38,15 +38,15 @@ export function ProxyPanel() {
|
|||||||
const { data: globalConfig } = useGlobalProxyConfig();
|
const { data: globalConfig } = useGlobalProxyConfig();
|
||||||
const updateGlobalConfig = useUpdateGlobalProxyConfig();
|
const updateGlobalConfig = useUpdateGlobalProxyConfig();
|
||||||
|
|
||||||
// 监听地址/端口的本地状态
|
// 监听地址/端口的本地状态(端口用字符串以支持完全清空)
|
||||||
const [listenAddress, setListenAddress] = useState("127.0.0.1");
|
const [listenAddress, setListenAddress] = useState("127.0.0.1");
|
||||||
const [listenPort, setListenPort] = useState(15721);
|
const [listenPort, setListenPort] = useState("15721");
|
||||||
|
|
||||||
// 同步全局配置到本地状态
|
// 同步全局配置到本地状态
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (globalConfig) {
|
if (globalConfig) {
|
||||||
setListenAddress(globalConfig.listenAddress);
|
setListenAddress(globalConfig.listenAddress);
|
||||||
setListenPort(globalConfig.listenPort);
|
setListenPort(String(globalConfig.listenPort));
|
||||||
}
|
}
|
||||||
}, [globalConfig]);
|
}, [globalConfig]);
|
||||||
|
|
||||||
@@ -102,11 +102,52 @@ export function ProxyPanel() {
|
|||||||
|
|
||||||
const handleSaveBasicConfig = async () => {
|
const handleSaveBasicConfig = async () => {
|
||||||
if (!globalConfig) return;
|
if (!globalConfig) return;
|
||||||
|
|
||||||
|
// 校验地址格式(简单的 IP 地址或 localhost 校验)
|
||||||
|
const addressTrimmed = listenAddress.trim();
|
||||||
|
const ipv4Regex = /^(\d{1,3}\.){3}\d{1,3}$/;
|
||||||
|
const isValidAddress =
|
||||||
|
addressTrimmed === "localhost" ||
|
||||||
|
addressTrimmed === "0.0.0.0" ||
|
||||||
|
(ipv4Regex.test(addressTrimmed) &&
|
||||||
|
addressTrimmed.split(".").every((n) => {
|
||||||
|
const num = parseInt(n);
|
||||||
|
return num >= 0 && num <= 255;
|
||||||
|
}));
|
||||||
|
if (!isValidAddress) {
|
||||||
|
toast.error(
|
||||||
|
t("proxy.settings.invalidAddress", {
|
||||||
|
defaultValue:
|
||||||
|
"地址无效,请输入有效的 IP 地址(如 127.0.0.1)或 localhost",
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 严格校验端口:必须是纯数字
|
||||||
|
const portTrimmed = listenPort.trim();
|
||||||
|
if (!/^\d+$/.test(portTrimmed)) {
|
||||||
|
toast.error(
|
||||||
|
t("proxy.settings.invalidPort", {
|
||||||
|
defaultValue: "端口无效,请输入 1024-65535 之间的数字",
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const port = parseInt(portTrimmed);
|
||||||
|
if (isNaN(port) || port < 1024 || port > 65535) {
|
||||||
|
toast.error(
|
||||||
|
t("proxy.settings.invalidPort", {
|
||||||
|
defaultValue: "端口无效,请输入 1024-65535 之间的数字",
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
await updateGlobalConfig.mutateAsync({
|
await updateGlobalConfig.mutateAsync({
|
||||||
...globalConfig,
|
...globalConfig,
|
||||||
listenAddress,
|
listenAddress: addressTrimmed,
|
||||||
listenPort,
|
listenPort: port,
|
||||||
});
|
});
|
||||||
toast.success(
|
toast.success(
|
||||||
t("proxy.settings.configSaved", { defaultValue: "代理配置已保存" }),
|
t("proxy.settings.configSaved", { defaultValue: "代理配置已保存" }),
|
||||||
@@ -133,6 +174,13 @@ export function ProxyPanel() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 格式化地址用于 URL(IPv6 需要方括号)
|
||||||
|
const formatAddressForUrl = (address: string, port: number): string => {
|
||||||
|
const isIPv6 = address.includes(":");
|
||||||
|
const host = isIPv6 ? `[${address}]` : address;
|
||||||
|
return `http://${host}:${port}`;
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<section className="space-y-6">
|
<section className="space-y-6">
|
||||||
@@ -147,14 +195,14 @@ export function ProxyPanel() {
|
|||||||
</p>
|
</p>
|
||||||
<div className="flex flex-col gap-2 sm:flex-row sm:items-center">
|
<div className="flex flex-col gap-2 sm:flex-row sm:items-center">
|
||||||
<code className="flex-1 text-sm bg-background px-3 py-2 rounded border border-border/60">
|
<code className="flex-1 text-sm bg-background px-3 py-2 rounded border border-border/60">
|
||||||
http://{status.address}:{status.port}
|
{formatAddressForUrl(status.address, status.port)}
|
||||||
</code>
|
</code>
|
||||||
<Button
|
<Button
|
||||||
size="sm"
|
size="sm"
|
||||||
variant="outline"
|
variant="outline"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
navigator.clipboard.writeText(
|
navigator.clipboard.writeText(
|
||||||
`http://${status.address}:${status.port}`,
|
formatAddressForUrl(status.address, status.port),
|
||||||
);
|
);
|
||||||
toast.success(
|
toast.success(
|
||||||
t("proxy.panel.addressCopied", {
|
t("proxy.panel.addressCopied", {
|
||||||
@@ -389,9 +437,12 @@ export function ProxyPanel() {
|
|||||||
id="listen-address"
|
id="listen-address"
|
||||||
value={listenAddress}
|
value={listenAddress}
|
||||||
onChange={(e) => setListenAddress(e.target.value)}
|
onChange={(e) => setListenAddress(e.target.value)}
|
||||||
placeholder={t("proxy.settings.fields.listenAddress.placeholder", {
|
placeholder={t(
|
||||||
defaultValue: "127.0.0.1",
|
"proxy.settings.fields.listenAddress.placeholder",
|
||||||
})}
|
{
|
||||||
|
defaultValue: "127.0.0.1",
|
||||||
|
},
|
||||||
|
)}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
{t("proxy.settings.fields.listenAddress.description", {
|
{t("proxy.settings.fields.listenAddress.description", {
|
||||||
@@ -411,12 +462,13 @@ export function ProxyPanel() {
|
|||||||
id="listen-port"
|
id="listen-port"
|
||||||
type="number"
|
type="number"
|
||||||
value={listenPort}
|
value={listenPort}
|
||||||
onChange={(e) =>
|
onChange={(e) => setListenPort(e.target.value)}
|
||||||
setListenPort(parseInt(e.target.value) || 15721)
|
placeholder={t(
|
||||||
}
|
"proxy.settings.fields.listenPort.placeholder",
|
||||||
placeholder={t("proxy.settings.fields.listenPort.placeholder", {
|
{
|
||||||
defaultValue: "15721",
|
defaultValue: "15721",
|
||||||
})}
|
},
|
||||||
|
)}
|
||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
{t("proxy.settings.fields.listenPort.description", {
|
{t("proxy.settings.fields.listenPort.description", {
|
||||||
|
|||||||
@@ -0,0 +1,275 @@
|
|||||||
|
/**
|
||||||
|
* 全局出站代理设置组件
|
||||||
|
*
|
||||||
|
* 提供配置全局代理的输入界面,支持用户名密码认证。
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { useState, useEffect, useMemo } from "react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { Input } from "@/components/ui/input";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { Loader2, TestTube2, Search, Eye, EyeOff, X } from "lucide-react";
|
||||||
|
import {
|
||||||
|
useGlobalProxyUrl,
|
||||||
|
useSetGlobalProxyUrl,
|
||||||
|
useTestProxy,
|
||||||
|
useScanProxies,
|
||||||
|
type DetectedProxy,
|
||||||
|
} from "@/hooks/useGlobalProxy";
|
||||||
|
|
||||||
|
/** 从完整 URL 提取认证信息 */
|
||||||
|
function extractAuth(url: string): {
|
||||||
|
baseUrl: string;
|
||||||
|
username: string;
|
||||||
|
password: string;
|
||||||
|
} {
|
||||||
|
if (!url.trim()) return { baseUrl: "", username: "", password: "" };
|
||||||
|
|
||||||
|
try {
|
||||||
|
const parsed = new URL(url);
|
||||||
|
const username = decodeURIComponent(parsed.username || "");
|
||||||
|
const password = decodeURIComponent(parsed.password || "");
|
||||||
|
// 移除认证信息,获取基础 URL
|
||||||
|
parsed.username = "";
|
||||||
|
parsed.password = "";
|
||||||
|
return { baseUrl: parsed.toString(), username, password };
|
||||||
|
} catch {
|
||||||
|
return { baseUrl: url, username: "", password: "" };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 将认证信息合并到 URL */
|
||||||
|
function mergeAuth(
|
||||||
|
baseUrl: string,
|
||||||
|
username: string,
|
||||||
|
password: string,
|
||||||
|
): string {
|
||||||
|
if (!baseUrl.trim()) return "";
|
||||||
|
if (!username.trim()) return baseUrl;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const parsed = new URL(baseUrl);
|
||||||
|
// URL 对象的 username/password setter 会自动进行 percent-encoding
|
||||||
|
// 不要使用 encodeURIComponent,否则会导致双重编码
|
||||||
|
parsed.username = username.trim();
|
||||||
|
if (password) {
|
||||||
|
parsed.password = password;
|
||||||
|
}
|
||||||
|
return parsed.toString();
|
||||||
|
} catch {
|
||||||
|
// URL 解析失败,尝试手动插入(此时需要手动编码)
|
||||||
|
const match = baseUrl.match(/^(\w+:\/\/)(.+)$/);
|
||||||
|
if (match) {
|
||||||
|
const auth = password
|
||||||
|
? `${encodeURIComponent(username.trim())}:${encodeURIComponent(password)}@`
|
||||||
|
: `${encodeURIComponent(username.trim())}@`;
|
||||||
|
return `${match[1]}${auth}${match[2]}`;
|
||||||
|
}
|
||||||
|
return baseUrl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GlobalProxySettings() {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const { data: savedUrl, isLoading } = useGlobalProxyUrl();
|
||||||
|
const setMutation = useSetGlobalProxyUrl();
|
||||||
|
const testMutation = useTestProxy();
|
||||||
|
const scanMutation = useScanProxies();
|
||||||
|
|
||||||
|
const [url, setUrl] = useState("");
|
||||||
|
const [username, setUsername] = useState("");
|
||||||
|
const [password, setPassword] = useState("");
|
||||||
|
const [showPassword, setShowPassword] = useState(false);
|
||||||
|
const [dirty, setDirty] = useState(false);
|
||||||
|
const [detected, setDetected] = useState<DetectedProxy[]>([]);
|
||||||
|
|
||||||
|
// 计算完整 URL(含认证信息)
|
||||||
|
const fullUrl = useMemo(
|
||||||
|
() => mergeAuth(url, username, password),
|
||||||
|
[url, username, password],
|
||||||
|
);
|
||||||
|
|
||||||
|
// 同步远程配置
|
||||||
|
useEffect(() => {
|
||||||
|
if (savedUrl !== undefined) {
|
||||||
|
const { baseUrl, username: u, password: p } = extractAuth(savedUrl || "");
|
||||||
|
setUrl(baseUrl);
|
||||||
|
setUsername(u);
|
||||||
|
setPassword(p);
|
||||||
|
setDirty(false);
|
||||||
|
}
|
||||||
|
}, [savedUrl]);
|
||||||
|
|
||||||
|
const handleSave = async () => {
|
||||||
|
await setMutation.mutateAsync(fullUrl);
|
||||||
|
setDirty(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleTest = async () => {
|
||||||
|
if (fullUrl) {
|
||||||
|
await testMutation.mutateAsync(fullUrl);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleScan = async () => {
|
||||||
|
const result = await scanMutation.mutateAsync();
|
||||||
|
setDetected(result);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleSelect = (proxyUrl: string) => {
|
||||||
|
const { baseUrl, username: u, password: p } = extractAuth(proxyUrl);
|
||||||
|
setUrl(baseUrl);
|
||||||
|
setUsername(u);
|
||||||
|
setPassword(p);
|
||||||
|
setDirty(true);
|
||||||
|
setDetected([]);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleClear = () => {
|
||||||
|
setUrl("");
|
||||||
|
setUsername("");
|
||||||
|
setPassword("");
|
||||||
|
setDirty(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleKeyDown = (e: React.KeyboardEvent) => {
|
||||||
|
if (e.key === "Enter" && dirty && !setMutation.isPending) {
|
||||||
|
handleSave();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 只在首次加载且无数据时显示加载状态
|
||||||
|
if (isLoading && savedUrl === undefined) {
|
||||||
|
return (
|
||||||
|
<div className="flex items-center justify-center p-4">
|
||||||
|
<Loader2 className="h-5 w-5 animate-spin text-muted-foreground" />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-3">
|
||||||
|
{/* 描述 */}
|
||||||
|
<p className="text-sm text-muted-foreground">
|
||||||
|
{t("settings.globalProxy.hint")}
|
||||||
|
</p>
|
||||||
|
|
||||||
|
{/* 代理地址输入框和按钮 */}
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<Input
|
||||||
|
placeholder="http://127.0.0.1:7890 / socks5://127.0.0.1:1080"
|
||||||
|
value={url}
|
||||||
|
onChange={(e) => {
|
||||||
|
setUrl(e.target.value);
|
||||||
|
setDirty(true);
|
||||||
|
}}
|
||||||
|
onKeyDown={handleKeyDown}
|
||||||
|
className="font-mono text-sm flex-1"
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="icon"
|
||||||
|
disabled={scanMutation.isPending}
|
||||||
|
onClick={handleScan}
|
||||||
|
title={t("settings.globalProxy.scan")}
|
||||||
|
>
|
||||||
|
{scanMutation.isPending ? (
|
||||||
|
<Loader2 className="h-4 w-4 animate-spin" />
|
||||||
|
) : (
|
||||||
|
<Search className="h-4 w-4" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="icon"
|
||||||
|
disabled={!fullUrl || testMutation.isPending}
|
||||||
|
onClick={handleTest}
|
||||||
|
title={t("settings.globalProxy.test")}
|
||||||
|
>
|
||||||
|
{testMutation.isPending ? (
|
||||||
|
<Loader2 className="h-4 w-4 animate-spin" />
|
||||||
|
) : (
|
||||||
|
<TestTube2 className="h-4 w-4" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="icon"
|
||||||
|
disabled={!url && !username && !password}
|
||||||
|
onClick={handleClear}
|
||||||
|
title={t("settings.globalProxy.clear")}
|
||||||
|
>
|
||||||
|
<X className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
onClick={handleSave}
|
||||||
|
disabled={!dirty || setMutation.isPending}
|
||||||
|
size="sm"
|
||||||
|
>
|
||||||
|
{setMutation.isPending && (
|
||||||
|
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
|
||||||
|
)}
|
||||||
|
{t("common.save")}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 认证信息:用户名 + 密码(可选) */}
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<Input
|
||||||
|
placeholder={t("settings.globalProxy.username")}
|
||||||
|
value={username}
|
||||||
|
onChange={(e) => {
|
||||||
|
setUsername(e.target.value);
|
||||||
|
setDirty(true);
|
||||||
|
}}
|
||||||
|
onKeyDown={handleKeyDown}
|
||||||
|
className="font-mono text-sm flex-1"
|
||||||
|
/>
|
||||||
|
<div className="relative flex-1">
|
||||||
|
<Input
|
||||||
|
type={showPassword ? "text" : "password"}
|
||||||
|
placeholder={t("settings.globalProxy.password")}
|
||||||
|
value={password}
|
||||||
|
onChange={(e) => {
|
||||||
|
setPassword(e.target.value);
|
||||||
|
setDirty(true);
|
||||||
|
}}
|
||||||
|
onKeyDown={handleKeyDown}
|
||||||
|
className="font-mono text-sm pr-10"
|
||||||
|
/>
|
||||||
|
<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}
|
||||||
|
>
|
||||||
|
{showPassword ? (
|
||||||
|
<EyeOff className="h-4 w-4 text-muted-foreground" />
|
||||||
|
) : (
|
||||||
|
<Eye className="h-4 w-4 text-muted-foreground" />
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 扫描结果 */}
|
||||||
|
{detected.length > 0 && (
|
||||||
|
<div className="flex flex-wrap gap-2">
|
||||||
|
{detected.map((p) => (
|
||||||
|
<Button
|
||||||
|
key={p.url}
|
||||||
|
variant="secondary"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => handleSelect(p.url)}
|
||||||
|
className="font-mono text-xs"
|
||||||
|
>
|
||||||
|
{p.url}
|
||||||
|
</Button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -9,6 +9,7 @@ import {
|
|||||||
Database,
|
Database,
|
||||||
Server,
|
Server,
|
||||||
ChevronDown,
|
ChevronDown,
|
||||||
|
Globe,
|
||||||
} 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";
|
||||||
@@ -34,6 +35,7 @@ import { WindowSettings } from "@/components/settings/WindowSettings";
|
|||||||
import { DirectorySettings } from "@/components/settings/DirectorySettings";
|
import { DirectorySettings } from "@/components/settings/DirectorySettings";
|
||||||
import { ImportExportSection } from "@/components/settings/ImportExportSection";
|
import { ImportExportSection } from "@/components/settings/ImportExportSection";
|
||||||
import { AboutSection } from "@/components/settings/AboutSection";
|
import { AboutSection } from "@/components/settings/AboutSection";
|
||||||
|
import { GlobalProxySettings } from "@/components/settings/GlobalProxySettings";
|
||||||
import { ProxyPanel } from "@/components/proxy";
|
import { ProxyPanel } from "@/components/proxy";
|
||||||
import { PricingConfigPanel } from "@/components/usage/PricingConfigPanel";
|
import { PricingConfigPanel } from "@/components/usage/PricingConfigPanel";
|
||||||
import { ModelTestConfigPanel } from "@/components/usage/ModelTestConfigPanel";
|
import { ModelTestConfigPanel } from "@/components/usage/ModelTestConfigPanel";
|
||||||
@@ -495,6 +497,28 @@ export function SettingsPage({
|
|||||||
</AccordionContent>
|
</AccordionContent>
|
||||||
</AccordionItem>
|
</AccordionItem>
|
||||||
|
|
||||||
|
<AccordionItem
|
||||||
|
value="globalProxy"
|
||||||
|
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">
|
||||||
|
<Globe className="h-5 w-5 text-cyan-500" />
|
||||||
|
<div className="text-left">
|
||||||
|
<h3 className="text-base font-semibold">
|
||||||
|
{t("settings.advanced.globalProxy.title")}
|
||||||
|
</h3>
|
||||||
|
<p className="text-sm text-muted-foreground font-normal">
|
||||||
|
{t("settings.advanced.globalProxy.description")}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</AccordionTrigger>
|
||||||
|
<AccordionContent className="px-6 pb-6 pt-4 border-t border-border/50">
|
||||||
|
<GlobalProxySettings />
|
||||||
|
</AccordionContent>
|
||||||
|
</AccordionItem>
|
||||||
|
|
||||||
<AccordionItem
|
<AccordionItem
|
||||||
value="data"
|
value="data"
|
||||||
className="rounded-xl glass-card overflow-hidden"
|
className="rounded-xl glass-card overflow-hidden"
|
||||||
|
|||||||
@@ -17,10 +17,11 @@ export function ModelTestConfigPanel() {
|
|||||||
const [isLoading, setIsLoading] = useState(true);
|
const [isLoading, setIsLoading] = useState(true);
|
||||||
const [isSaving, setIsSaving] = useState(false);
|
const [isSaving, setIsSaving] = useState(false);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
const [config, setConfig] = useState<StreamCheckConfig>({
|
// 使用字符串状态以支持完全清空数字输入框
|
||||||
timeoutSecs: 45,
|
const [config, setConfig] = useState({
|
||||||
maxRetries: 2,
|
timeoutSecs: "45",
|
||||||
degradedThresholdMs: 6000,
|
maxRetries: "2",
|
||||||
|
degradedThresholdMs: "6000",
|
||||||
claudeModel: "claude-haiku-4-5-20251001",
|
claudeModel: "claude-haiku-4-5-20251001",
|
||||||
codexModel: "gpt-5.1-codex@low",
|
codexModel: "gpt-5.1-codex@low",
|
||||||
geminiModel: "gemini-3-pro-preview",
|
geminiModel: "gemini-3-pro-preview",
|
||||||
@@ -35,7 +36,14 @@ export function ModelTestConfigPanel() {
|
|||||||
setIsLoading(true);
|
setIsLoading(true);
|
||||||
setError(null);
|
setError(null);
|
||||||
const data = await getStreamCheckConfig();
|
const data = await getStreamCheckConfig();
|
||||||
setConfig(data);
|
setConfig({
|
||||||
|
timeoutSecs: String(data.timeoutSecs),
|
||||||
|
maxRetries: String(data.maxRetries),
|
||||||
|
degradedThresholdMs: String(data.degradedThresholdMs),
|
||||||
|
claudeModel: data.claudeModel,
|
||||||
|
codexModel: data.codexModel,
|
||||||
|
geminiModel: data.geminiModel,
|
||||||
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError(String(e));
|
setError(String(e));
|
||||||
} finally {
|
} finally {
|
||||||
@@ -44,9 +52,22 @@ export function ModelTestConfigPanel() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function handleSave() {
|
async function handleSave() {
|
||||||
|
// 解析数字,空值使用默认值,0 是有效值
|
||||||
|
const parseNum = (val: string, defaultVal: number) => {
|
||||||
|
const n = parseInt(val);
|
||||||
|
return isNaN(n) ? defaultVal : n;
|
||||||
|
};
|
||||||
try {
|
try {
|
||||||
setIsSaving(true);
|
setIsSaving(true);
|
||||||
await saveStreamCheckConfig(config);
|
const parsed: StreamCheckConfig = {
|
||||||
|
timeoutSecs: parseNum(config.timeoutSecs, 45),
|
||||||
|
maxRetries: parseNum(config.maxRetries, 2),
|
||||||
|
degradedThresholdMs: parseNum(config.degradedThresholdMs, 6000),
|
||||||
|
claudeModel: config.claudeModel,
|
||||||
|
codexModel: config.codexModel,
|
||||||
|
geminiModel: config.geminiModel,
|
||||||
|
};
|
||||||
|
await saveStreamCheckConfig(parsed);
|
||||||
toast.success(t("streamCheck.configSaved"), {
|
toast.success(t("streamCheck.configSaved"), {
|
||||||
closeButton: true,
|
closeButton: true,
|
||||||
});
|
});
|
||||||
@@ -132,10 +153,7 @@ export function ModelTestConfigPanel() {
|
|||||||
max={120}
|
max={120}
|
||||||
value={config.timeoutSecs}
|
value={config.timeoutSecs}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
setConfig({
|
setConfig({ ...config, timeoutSecs: e.target.value })
|
||||||
...config,
|
|
||||||
timeoutSecs: parseInt(e.target.value) || 45,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -149,10 +167,7 @@ export function ModelTestConfigPanel() {
|
|||||||
max={5}
|
max={5}
|
||||||
value={config.maxRetries}
|
value={config.maxRetries}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
setConfig({
|
setConfig({ ...config, maxRetries: e.target.value })
|
||||||
...config,
|
|
||||||
maxRetries: parseInt(e.target.value) || 2,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -169,10 +184,7 @@ export function ModelTestConfigPanel() {
|
|||||||
step={1000}
|
step={1000}
|
||||||
value={config.degradedThresholdMs}
|
value={config.degradedThresholdMs}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
setConfig({
|
setConfig({ ...config, degradedThresholdMs: e.target.value })
|
||||||
...config,
|
|
||||||
degradedThresholdMs: parseInt(e.target.value) || 6000,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -394,6 +394,24 @@ export const providerPresets: ProviderPreset[] = [
|
|||||||
icon: "cubence",
|
icon: "cubence",
|
||||||
iconColor: "#000000",
|
iconColor: "#000000",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "AIGoCode",
|
||||||
|
websiteUrl: "https://aigocode.com",
|
||||||
|
apiKeyUrl: "https://aigocode.com/invite/CC-SWITCH",
|
||||||
|
settingsConfig: {
|
||||||
|
env: {
|
||||||
|
ANTHROPIC_BASE_URL: "https://api.aigocode.com/api",
|
||||||
|
ANTHROPIC_AUTH_TOKEN: "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
// 请求地址候选(用于地址管理/测速)
|
||||||
|
endpointCandidates: ["https://api.aigocode.com"],
|
||||||
|
category: "third_party",
|
||||||
|
isPartner: true, // 合作伙伴
|
||||||
|
partnerPromotionKey: "aigocode", // 促销信息 i18n key
|
||||||
|
icon: "aigocode",
|
||||||
|
iconColor: "#5B7FFF",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "OpenRouter",
|
name: "OpenRouter",
|
||||||
websiteUrl: "https://openrouter.ai",
|
websiteUrl: "https://openrouter.ai",
|
||||||
|
|||||||
@@ -171,10 +171,27 @@ requires_openai_auth = true`,
|
|||||||
],
|
],
|
||||||
category: "third_party",
|
category: "third_party",
|
||||||
isPartner: true, // 合作伙伴
|
isPartner: true, // 合作伙伴
|
||||||
partnerPromotionKey: "cubence", // 促销信息 i18n key
|
partnerPromotionKey: "cubence", // 促销信息 i18n key
|
||||||
icon: "cubence",
|
icon: "cubence",
|
||||||
iconColor: "#000000",
|
iconColor: "#000000",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "AIGoCode",
|
||||||
|
websiteUrl: "https://aigocode.com",
|
||||||
|
apiKeyUrl: "https://aigocode.com/invite/CC-SWITCH",
|
||||||
|
category: "third_party",
|
||||||
|
auth: generateThirdPartyAuth(""),
|
||||||
|
config: generateThirdPartyConfig(
|
||||||
|
"aigocode",
|
||||||
|
"https://api.aigocode.com/openai",
|
||||||
|
"gpt-5.2",
|
||||||
|
),
|
||||||
|
endpointCandidates: ["https://api.aigocode.com"],
|
||||||
|
isPartner: true, // 合作伙伴
|
||||||
|
partnerPromotionKey: "aigocode", // 促销信息 i18n key
|
||||||
|
icon: "aigocode",
|
||||||
|
iconColor: "#5B7FFF",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "OpenRouter",
|
name: "OpenRouter",
|
||||||
websiteUrl: "https://openrouter.ai",
|
websiteUrl: "https://openrouter.ai",
|
||||||
@@ -188,5 +205,5 @@ requires_openai_auth = true`,
|
|||||||
category: "aggregator",
|
category: "aggregator",
|
||||||
icon: "openrouter",
|
icon: "openrouter",
|
||||||
iconColor: "#6566F1",
|
iconColor: "#6566F1",
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -96,6 +96,26 @@ export const geminiProviderPresets: GeminiProviderPreset[] = [
|
|||||||
icon: "cubence",
|
icon: "cubence",
|
||||||
iconColor: "#000000",
|
iconColor: "#000000",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "AIGoCode",
|
||||||
|
websiteUrl: "https://aigocode.com",
|
||||||
|
apiKeyUrl: "https://aigocode.com/invite/CC-SWITCH",
|
||||||
|
settingsConfig: {
|
||||||
|
env: {
|
||||||
|
GOOGLE_GEMINI_BASE_URL: "https://api.aigocode.com/gemini",
|
||||||
|
GEMINI_MODEL: "gemini-3-pro",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
baseURL: "https://api.aigocode.com/gemini",
|
||||||
|
model: "gemini-3-pro",
|
||||||
|
description: "AIGoCode",
|
||||||
|
category: "third_party",
|
||||||
|
isPartner: true,
|
||||||
|
partnerPromotionKey: "aigocode",
|
||||||
|
endpointCandidates: ["https://api.aigocode.com/gemini"],
|
||||||
|
icon: "aigocode",
|
||||||
|
iconColor: "#5B7FFF",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "OpenRouter",
|
name: "OpenRouter",
|
||||||
websiteUrl: "https://openrouter.ai",
|
websiteUrl: "https://openrouter.ai",
|
||||||
@@ -105,7 +125,7 @@ export const geminiProviderPresets: GeminiProviderPreset[] = [
|
|||||||
GOOGLE_GEMINI_BASE_URL: "https://openrouter.ai/api",
|
GOOGLE_GEMINI_BASE_URL: "https://openrouter.ai/api",
|
||||||
GEMINI_MODEL: "gemini-3-pro-preview",
|
GEMINI_MODEL: "gemini-3-pro-preview",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
baseURL: "https://openrouter.ai/api",
|
baseURL: "https://openrouter.ai/api",
|
||||||
model: "gemini-3-pro",
|
model: "gemini-3-pro",
|
||||||
description: "OpenRouter",
|
description: "OpenRouter",
|
||||||
|
|||||||
@@ -0,0 +1,109 @@
|
|||||||
|
/**
|
||||||
|
* 全局出站代理 React Hooks
|
||||||
|
*
|
||||||
|
* 提供获取、设置和测试全局代理的 React Query hooks。
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
|
||||||
|
import { toast } from "sonner";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import {
|
||||||
|
getGlobalProxyUrl,
|
||||||
|
setGlobalProxyUrl,
|
||||||
|
testProxyUrl,
|
||||||
|
getUpstreamProxyStatus,
|
||||||
|
scanLocalProxies,
|
||||||
|
type ProxyTestResult,
|
||||||
|
type UpstreamProxyStatus,
|
||||||
|
type DetectedProxy,
|
||||||
|
} from "@/lib/api/globalProxy";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取全局代理 URL
|
||||||
|
*/
|
||||||
|
export function useGlobalProxyUrl() {
|
||||||
|
return useQuery({
|
||||||
|
queryKey: ["globalProxyUrl"],
|
||||||
|
queryFn: getGlobalProxyUrl,
|
||||||
|
staleTime: 30 * 1000, // 30秒内不重新获取,避免展开时闪烁
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 设置全局代理 URL
|
||||||
|
*/
|
||||||
|
export function useSetGlobalProxyUrl() {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: setGlobalProxyUrl,
|
||||||
|
onSuccess: () => {
|
||||||
|
toast.success(t("settings.globalProxy.saved"));
|
||||||
|
queryClient.invalidateQueries({ queryKey: ["globalProxyUrl"] });
|
||||||
|
queryClient.invalidateQueries({ queryKey: ["upstreamProxyStatus"] });
|
||||||
|
},
|
||||||
|
onError: (error: unknown) => {
|
||||||
|
const message =
|
||||||
|
error instanceof Error
|
||||||
|
? error.message
|
||||||
|
: typeof error === "string"
|
||||||
|
? error
|
||||||
|
: "Unknown error";
|
||||||
|
toast.error(t("settings.globalProxy.saveFailed", { error: message }));
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 测试代理连接
|
||||||
|
*/
|
||||||
|
export function useTestProxy() {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: testProxyUrl,
|
||||||
|
onSuccess: (result: ProxyTestResult) => {
|
||||||
|
if (result.success) {
|
||||||
|
toast.success(
|
||||||
|
t("settings.globalProxy.testSuccess", { latency: result.latencyMs }),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
toast.error(
|
||||||
|
t("settings.globalProxy.testFailed", { error: result.error }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onError: (error: Error) => {
|
||||||
|
toast.error(error.message);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取当前出站代理状态
|
||||||
|
*/
|
||||||
|
export function useUpstreamProxyStatus() {
|
||||||
|
return useQuery<UpstreamProxyStatus>({
|
||||||
|
queryKey: ["upstreamProxyStatus"],
|
||||||
|
queryFn: getUpstreamProxyStatus,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 扫描本地代理
|
||||||
|
*/
|
||||||
|
export function useScanProxies() {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: scanLocalProxies,
|
||||||
|
onError: (error: Error) => {
|
||||||
|
toast.error(
|
||||||
|
t("settings.globalProxy.scanFailed", { error: error.message }),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export type { DetectedProxy };
|
||||||
@@ -183,6 +183,10 @@
|
|||||||
"title": "Cost Pricing",
|
"title": "Cost Pricing",
|
||||||
"description": "Manage token pricing rules for each model"
|
"description": "Manage token pricing rules for each model"
|
||||||
},
|
},
|
||||||
|
"globalProxy": {
|
||||||
|
"title": "Global Outbound Proxy",
|
||||||
|
"description": "Configure proxy for CC Switch to access external APIs"
|
||||||
|
},
|
||||||
"data": {
|
"data": {
|
||||||
"title": "Data Management",
|
"title": "Data Management",
|
||||||
"description": "Import/export configurations and backup/restore"
|
"description": "Import/export configurations and backup/restore"
|
||||||
@@ -271,7 +275,21 @@
|
|||||||
"restartLater": "Restart Later",
|
"restartLater": "Restart Later",
|
||||||
"restartFailed": "Application restart failed, please manually close and reopen.",
|
"restartFailed": "Application restart failed, please manually close and reopen.",
|
||||||
"devModeRestartHint": "Dev Mode: Automatic restart not supported, please manually restart the application.",
|
"devModeRestartHint": "Dev Mode: Automatic restart not supported, please manually restart the application.",
|
||||||
"saving": "Saving..."
|
"saving": "Saving...",
|
||||||
|
"globalProxy": {
|
||||||
|
"label": "Global Proxy",
|
||||||
|
"hint": "Proxy all requests (API, Skills download, etc.). Leave empty for direct connection.",
|
||||||
|
"username": "Username (optional)",
|
||||||
|
"password": "Password (optional)",
|
||||||
|
"test": "Test Connection",
|
||||||
|
"scan": "Scan Local Proxies",
|
||||||
|
"clear": "Clear",
|
||||||
|
"scanFailed": "Scan failed: {{error}}",
|
||||||
|
"saved": "Proxy settings saved",
|
||||||
|
"saveFailed": "Save failed: {{error}}",
|
||||||
|
"testSuccess": "Connected! Latency {{latency}}ms",
|
||||||
|
"testFailed": "Connection failed: {{error}}"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"apps": {
|
"apps": {
|
||||||
"claude": "Claude Code",
|
"claude": "Claude Code",
|
||||||
@@ -324,7 +342,8 @@
|
|||||||
"minimax_cn": "MiniMax Coding Plan Special Offer, Starter from ¥9.9",
|
"minimax_cn": "MiniMax Coding Plan Special Offer, Starter from ¥9.9",
|
||||||
"minimax_en": "MiniMax Coding Plan Black Friday, Starter is now $2/mo (80% OFF!)",
|
"minimax_en": "MiniMax Coding Plan Black Friday, Starter is now $2/mo (80% OFF!)",
|
||||||
"dmxapi": "Claude Code exclusive model 66% OFF now!",
|
"dmxapi": "Claude Code exclusive model 66% OFF now!",
|
||||||
"cubence": "Cubence is an official partner of CC Switch. Register using this link and enter \"CCSWITCH\" promo code during recharge to get 10% off every top-up"
|
"cubence": "Cubence is an official partner of CC Switch. Register using this link and enter \"CCSWITCH\" promo code during recharge to get 10% off every top-up",
|
||||||
|
"aigocode": "AIGoCode is an official partner of CC Switch. Register using this link and get 10% bonus credit on your first top-up!"
|
||||||
},
|
},
|
||||||
"parameterConfig": "Parameter Config - {{name}} *",
|
"parameterConfig": "Parameter Config - {{name}} *",
|
||||||
"mainModel": "Main Model (optional)",
|
"mainModel": "Main Model (optional)",
|
||||||
@@ -957,6 +976,7 @@
|
|||||||
"configDetails": "Config Details",
|
"configDetails": "Config Details",
|
||||||
"configUrl": "Config File URL",
|
"configUrl": "Config File URL",
|
||||||
"configMergeError": "Failed to merge configuration file",
|
"configMergeError": "Failed to merge configuration file",
|
||||||
|
"primaryEndpoint": "Primary",
|
||||||
"mcp": {
|
"mcp": {
|
||||||
"title": "Batch Import MCP Servers",
|
"title": "Batch Import MCP Servers",
|
||||||
"targetApps": "Target Apps",
|
"targetApps": "Target Apps",
|
||||||
@@ -1106,7 +1126,12 @@
|
|||||||
"toast": {
|
"toast": {
|
||||||
"saved": "Proxy configuration saved",
|
"saved": "Proxy configuration saved",
|
||||||
"saveFailed": "Save failed: {{error}}"
|
"saveFailed": "Save failed: {{error}}"
|
||||||
}
|
},
|
||||||
|
"invalidPort": "Invalid port, please enter a number between 1024-65535",
|
||||||
|
"invalidAddress": "Invalid address, please enter a valid IP address (e.g. 127.0.0.1) or localhost",
|
||||||
|
"configSaved": "Proxy configuration saved",
|
||||||
|
"configSaveFailed": "Failed to save configuration",
|
||||||
|
"restartRequired": "Restart proxy service for address or port changes to take effect"
|
||||||
},
|
},
|
||||||
"switchFailed": "Switch failed: {{error}}",
|
"switchFailed": "Switch failed: {{error}}",
|
||||||
"failover": {
|
"failover": {
|
||||||
@@ -1133,6 +1158,7 @@
|
|||||||
"info": "When the failover queue has multiple providers, the system will try them in priority order when requests fail. When a provider reaches the consecutive failure threshold, the circuit breaker will open and skip it temporarily.",
|
"info": "When the failover queue has multiple providers, the system will try them in priority order when requests fail. When a provider reaches the consecutive failure threshold, the circuit breaker will open and skip it temporarily.",
|
||||||
"configSaved": "Auto failover config saved",
|
"configSaved": "Auto failover config saved",
|
||||||
"configSaveFailed": "Failed to save",
|
"configSaveFailed": "Failed to save",
|
||||||
|
"validationFailed": "The following fields are out of valid range: {{fields}}",
|
||||||
"retrySettings": "Retry & Timeout Settings",
|
"retrySettings": "Retry & Timeout Settings",
|
||||||
"failureThreshold": "Failure Threshold",
|
"failureThreshold": "Failure Threshold",
|
||||||
"failureThresholdHint": "Open circuit breaker after this many consecutive failures (recommended: 3-10)",
|
"failureThresholdHint": "Open circuit breaker after this many consecutive failures (recommended: 3-10)",
|
||||||
@@ -1184,6 +1210,16 @@
|
|||||||
"streamingIdle": "Streaming Idle Timeout",
|
"streamingIdle": "Streaming Idle Timeout",
|
||||||
"nonStreaming": "Non-Streaming Timeout"
|
"nonStreaming": "Non-Streaming Timeout"
|
||||||
},
|
},
|
||||||
|
"circuitBreaker": {
|
||||||
|
"failureThreshold": "Failure Threshold",
|
||||||
|
"successThreshold": "Success Threshold",
|
||||||
|
"timeoutSeconds": "Timeout (seconds)",
|
||||||
|
"errorRateThreshold": "Error Rate Threshold",
|
||||||
|
"minRequests": "Min Requests",
|
||||||
|
"validationFailed": "The following fields are out of valid range: {{fields}}",
|
||||||
|
"configSaved": "Circuit breaker config saved",
|
||||||
|
"saveFailed": "Failed to save"
|
||||||
|
},
|
||||||
"universalProvider": {
|
"universalProvider": {
|
||||||
"title": "Universal Provider",
|
"title": "Universal Provider",
|
||||||
"description": "Universal providers manage Claude, Codex, and Gemini configurations simultaneously. Changes are automatically synced to all enabled apps.",
|
"description": "Universal providers manage Claude, Codex, and Gemini configurations simultaneously. Changes are automatically synced to all enabled apps.",
|
||||||
|
|||||||
@@ -183,6 +183,10 @@
|
|||||||
"title": "コスト計算",
|
"title": "コスト計算",
|
||||||
"description": "各モデルのトークン料金ルールを管理"
|
"description": "各モデルのトークン料金ルールを管理"
|
||||||
},
|
},
|
||||||
|
"globalProxy": {
|
||||||
|
"title": "グローバル送信プロキシ",
|
||||||
|
"description": "CC Switch が外部 API にアクセスする際のプロキシを設定"
|
||||||
|
},
|
||||||
"data": {
|
"data": {
|
||||||
"title": "データ管理",
|
"title": "データ管理",
|
||||||
"description": "設定のインポート/エクスポートとバックアップ/復元"
|
"description": "設定のインポート/エクスポートとバックアップ/復元"
|
||||||
@@ -271,7 +275,21 @@
|
|||||||
"restartLater": "後で再起動",
|
"restartLater": "後で再起動",
|
||||||
"restartFailed": "アプリの再起動に失敗しました。手動で閉じて再度開いてください。",
|
"restartFailed": "アプリの再起動に失敗しました。手動で閉じて再度開いてください。",
|
||||||
"devModeRestartHint": "開発モードでは自動再起動をサポートしていません。手動で再起動してください。",
|
"devModeRestartHint": "開発モードでは自動再起動をサポートしていません。手動で再起動してください。",
|
||||||
"saving": "保存中..."
|
"saving": "保存中...",
|
||||||
|
"globalProxy": {
|
||||||
|
"label": "グローバルプロキシ",
|
||||||
|
"hint": "すべてのリクエスト(API、Skills ダウンロードなど)をプロキシ経由で送信します。空欄で直接接続。",
|
||||||
|
"username": "ユーザー名(任意)",
|
||||||
|
"password": "パスワード(任意)",
|
||||||
|
"test": "接続テスト",
|
||||||
|
"scan": "ローカルプロキシをスキャン",
|
||||||
|
"clear": "クリア",
|
||||||
|
"scanFailed": "スキャンに失敗しました: {{error}}",
|
||||||
|
"saved": "プロキシ設定を保存しました",
|
||||||
|
"saveFailed": "保存に失敗しました: {{error}}",
|
||||||
|
"testSuccess": "接続成功!遅延 {{latency}}ms",
|
||||||
|
"testFailed": "接続に失敗しました: {{error}}"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"apps": {
|
"apps": {
|
||||||
"claude": "Claude Code",
|
"claude": "Claude Code",
|
||||||
@@ -324,7 +342,8 @@
|
|||||||
"minimax_cn": "MiniMax Coding Plan 特別価格、Starter ¥9.9 から",
|
"minimax_cn": "MiniMax Coding Plan 特別価格、Starter ¥9.9 から",
|
||||||
"minimax_en": "MiniMax Coding Plan Black Friday、Starter が月額 $2(80% OFF)",
|
"minimax_en": "MiniMax Coding Plan Black Friday、Starter が月額 $2(80% OFF)",
|
||||||
"dmxapi": "Claude Code 専用モデル 66% OFF 実施中!",
|
"dmxapi": "Claude Code 専用モデル 66% OFF 実施中!",
|
||||||
"cubence": "Cubence は CC Switch の公式パートナーです。登録後チャージ時に \"CCSWITCH\" を入力すると、毎回 10% オフ"
|
"cubence": "Cubence は CC Switch の公式パートナーです。登録後チャージ時に \"CCSWITCH\" を入力すると、毎回 10% オフ",
|
||||||
|
"aigocode": "AIGoCode は CC Switch の公式パートナーです。このリンクから登録すると、初回チャージ時に 10% のボーナスクレジットがもらえます!"
|
||||||
},
|
},
|
||||||
"parameterConfig": "パラメーター設定 - {{name}} *",
|
"parameterConfig": "パラメーター設定 - {{name}} *",
|
||||||
"mainModel": "メインモデル(任意)",
|
"mainModel": "メインモデル(任意)",
|
||||||
@@ -957,6 +976,7 @@
|
|||||||
"configDetails": "設定の詳細",
|
"configDetails": "設定の詳細",
|
||||||
"configUrl": "設定ファイル URL",
|
"configUrl": "設定ファイル URL",
|
||||||
"configMergeError": "設定ファイルのマージに失敗しました",
|
"configMergeError": "設定ファイルのマージに失敗しました",
|
||||||
|
"primaryEndpoint": "メイン",
|
||||||
"mcp": {
|
"mcp": {
|
||||||
"title": "MCP サーバーを一括インポート",
|
"title": "MCP サーバーを一括インポート",
|
||||||
"targetApps": "ターゲットアプリ",
|
"targetApps": "ターゲットアプリ",
|
||||||
|
|||||||
@@ -183,6 +183,10 @@
|
|||||||
"title": "成本定价",
|
"title": "成本定价",
|
||||||
"description": "管理各模型 Token 计费规则"
|
"description": "管理各模型 Token 计费规则"
|
||||||
},
|
},
|
||||||
|
"globalProxy": {
|
||||||
|
"title": "全局出站代理",
|
||||||
|
"description": "配置 CC Switch 访问外部 API 时使用的代理"
|
||||||
|
},
|
||||||
"data": {
|
"data": {
|
||||||
"title": "数据管理",
|
"title": "数据管理",
|
||||||
"description": "导入导出配置与备份恢复"
|
"description": "导入导出配置与备份恢复"
|
||||||
@@ -271,7 +275,21 @@
|
|||||||
"restartLater": "稍后重启",
|
"restartLater": "稍后重启",
|
||||||
"restartFailed": "应用重启失败,请手动关闭后重新打开。",
|
"restartFailed": "应用重启失败,请手动关闭后重新打开。",
|
||||||
"devModeRestartHint": "开发模式下不支持自动重启,请手动重新启动应用。",
|
"devModeRestartHint": "开发模式下不支持自动重启,请手动重新启动应用。",
|
||||||
"saving": "正在保存..."
|
"saving": "正在保存...",
|
||||||
|
"globalProxy": {
|
||||||
|
"label": "全局代理",
|
||||||
|
"hint": "代理所有请求(API、Skills 下载等)。留空表示直连。",
|
||||||
|
"username": "用户名(可选)",
|
||||||
|
"password": "密码(可选)",
|
||||||
|
"test": "测试连接",
|
||||||
|
"scan": "扫描本地代理",
|
||||||
|
"clear": "清除",
|
||||||
|
"scanFailed": "扫描失败:{{error}}",
|
||||||
|
"saved": "代理设置已保存",
|
||||||
|
"saveFailed": "保存失败:{{error}}",
|
||||||
|
"testSuccess": "连接成功!延迟 {{latency}}ms",
|
||||||
|
"testFailed": "连接失败:{{error}}"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"apps": {
|
"apps": {
|
||||||
"claude": "Claude Code",
|
"claude": "Claude Code",
|
||||||
@@ -324,7 +342,8 @@
|
|||||||
"minimax_cn": "MiniMax Coding Plan 特惠,Starter 套餐 9.9 元起",
|
"minimax_cn": "MiniMax Coding Plan 特惠,Starter 套餐 9.9 元起",
|
||||||
"minimax_en": "MiniMax Coding Plan 黑五特惠,Starter 套餐现仅 $2/月(2折优惠!)",
|
"minimax_en": "MiniMax Coding Plan 黑五特惠,Starter 套餐现仅 $2/月(2折优惠!)",
|
||||||
"dmxapi": "Claude Code 专属模型 3.4 折优惠进行中!",
|
"dmxapi": "Claude Code 专属模型 3.4 折优惠进行中!",
|
||||||
"cubence": "Cubence 是 CC Switch 的官方合作伙伴,使用此链接注册并在充值时填写 \"CCSWITCH\" 优惠码,每次充值均可享受9折优惠"
|
"cubence": "Cubence 是 CC Switch 的官方合作伙伴,使用此链接注册并在充值时填写 \"CCSWITCH\" 优惠码,每次充值均可享受9折优惠",
|
||||||
|
"aigocode": "AIGoCode 是 CC Switch 的官方合作伙伴,使用此链接注册首次充值时可以获得10%额度奖励!"
|
||||||
},
|
},
|
||||||
"parameterConfig": "参数配置 - {{name}} *",
|
"parameterConfig": "参数配置 - {{name}} *",
|
||||||
"mainModel": "主模型 (可选)",
|
"mainModel": "主模型 (可选)",
|
||||||
@@ -957,6 +976,7 @@
|
|||||||
"configDetails": "配置详情",
|
"configDetails": "配置详情",
|
||||||
"configUrl": "配置文件 URL",
|
"configUrl": "配置文件 URL",
|
||||||
"configMergeError": "合并配置文件失败",
|
"configMergeError": "合并配置文件失败",
|
||||||
|
"primaryEndpoint": "主",
|
||||||
"mcp": {
|
"mcp": {
|
||||||
"title": "批量导入 MCP Servers",
|
"title": "批量导入 MCP Servers",
|
||||||
"targetApps": "目标应用",
|
"targetApps": "目标应用",
|
||||||
@@ -1106,7 +1126,12 @@
|
|||||||
"toast": {
|
"toast": {
|
||||||
"saved": "代理配置已保存",
|
"saved": "代理配置已保存",
|
||||||
"saveFailed": "保存失败: {{error}}"
|
"saveFailed": "保存失败: {{error}}"
|
||||||
}
|
},
|
||||||
|
"invalidPort": "端口无效,请输入 1024-65535 之间的数字",
|
||||||
|
"invalidAddress": "地址无效,请输入有效的 IP 地址(如 127.0.0.1)或 localhost",
|
||||||
|
"configSaved": "代理配置已保存",
|
||||||
|
"configSaveFailed": "保存配置失败",
|
||||||
|
"restartRequired": "修改地址或端口后需要重启代理服务才能生效"
|
||||||
},
|
},
|
||||||
"switchFailed": "切换失败: {{error}}",
|
"switchFailed": "切换失败: {{error}}",
|
||||||
"failover": {
|
"failover": {
|
||||||
@@ -1133,6 +1158,7 @@
|
|||||||
"info": "当故障转移队列中配置了多个供应商时,系统会在请求失败时按优先级顺序依次尝试。当某个供应商连续失败达到阈值时,熔断器会打开并在一段时间内跳过该供应商。",
|
"info": "当故障转移队列中配置了多个供应商时,系统会在请求失败时按优先级顺序依次尝试。当某个供应商连续失败达到阈值时,熔断器会打开并在一段时间内跳过该供应商。",
|
||||||
"configSaved": "自动故障转移配置已保存",
|
"configSaved": "自动故障转移配置已保存",
|
||||||
"configSaveFailed": "保存失败",
|
"configSaveFailed": "保存失败",
|
||||||
|
"validationFailed": "以下字段超出有效范围: {{fields}}",
|
||||||
"retrySettings": "重试与超时设置",
|
"retrySettings": "重试与超时设置",
|
||||||
"failureThreshold": "失败阈值",
|
"failureThreshold": "失败阈值",
|
||||||
"failureThresholdHint": "连续失败多少次后打开熔断器(建议: 3-10)",
|
"failureThresholdHint": "连续失败多少次后打开熔断器(建议: 3-10)",
|
||||||
@@ -1184,6 +1210,16 @@
|
|||||||
"streamingIdle": "流式静默超时",
|
"streamingIdle": "流式静默超时",
|
||||||
"nonStreaming": "非流式超时"
|
"nonStreaming": "非流式超时"
|
||||||
},
|
},
|
||||||
|
"circuitBreaker": {
|
||||||
|
"failureThreshold": "失败阈值",
|
||||||
|
"successThreshold": "成功阈值",
|
||||||
|
"timeoutSeconds": "超时时间",
|
||||||
|
"errorRateThreshold": "错误率阈值",
|
||||||
|
"minRequests": "最小请求数",
|
||||||
|
"validationFailed": "以下字段超出有效范围: {{fields}}",
|
||||||
|
"configSaved": "熔断器配置已保存",
|
||||||
|
"saveFailed": "保存失败"
|
||||||
|
},
|
||||||
"universalProvider": {
|
"universalProvider": {
|
||||||
"title": "统一供应商",
|
"title": "统一供应商",
|
||||||
"description": "统一供应商可以同时管理 Claude、Codex 和 Gemini 的配置。修改后会自动同步到所有启用的应用。",
|
"description": "统一供应商可以同时管理 Claude、Codex 和 Gemini 的配置。修改后会自动同步到所有启用的应用。",
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
<?xml version="1.0" standalone="no"?>
|
||||||
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
|
||||||
|
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
|
||||||
|
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
|
||||||
|
width="648.000000pt" height="564.000000pt" viewBox="0 0 648.000000 564.000000"
|
||||||
|
preserveAspectRatio="xMidYMid meet">
|
||||||
|
|
||||||
|
<g transform="translate(0.000000,564.000000) scale(0.100000,-0.100000)"
|
||||||
|
fill="#000000" stroke="none">
|
||||||
|
<path d="M5392 5379 c-26 -10 -36 -28 -56 -108 -24 -94 -47 -140 -101 -199
|
||||||
|
-56 -62 -117 -96 -219 -121 -101 -25 -116 -35 -116 -75 0 -45 21 -60 123 -89
|
||||||
|
190 -53 271 -147 336 -384 13 -46 38 -61 85 -49 25 6 36 28 56 111 7 28 23 72
|
||||||
|
36 99 13 28 21 54 18 58 -3 5 -2 7 3 6 4 -2 29 18 55 44 41 41 145 110 173
|
||||||
|
114 56 8 126 27 131 36 4 6 7 30 8 54 1 49 -5 54 -104 74 -164 33 -280 148
|
||||||
|
-320 320 -23 101 -52 129 -108 109z"/>
|
||||||
|
<path d="M1770 4814 c-138 -25 -301 -93 -425 -177 -80 -55 -227 -197 -280
|
||||||
|
-272 -98 -138 -161 -279 -201 -447 -16 -66 -18 -164 -21 -1098 -4 -1130 -4
|
||||||
|
-1144 57 -1331 80 -242 222 -434 444 -598 l56 -42 0 -337 c0 -309 2 -340 19
|
||||||
|
-379 31 -66 87 -93 158 -74 22 6 202 117 404 249 200 131 398 259 439 285 144
|
||||||
|
89 48 81 1095 88 912 5 932 6 1012 27 243 64 441 178 599 344 166 176 274 408
|
||||||
|
304 648 13 110 13 2016 0 2120 -25 190 -83 347 -183 498 -160 240 -384 400
|
||||||
|
-677 484 l-75 22 -1325 2 c-1086 2 -1339 0 -1400 -12z m1068 -1455 l-3 -751
|
||||||
|
-71 -18 c-71 -18 -154 -55 -205 -91 -14 -10 -29 -16 -33 -12 -3 3 -6 91 -6
|
||||||
|
195 l0 188 -306 0 -305 0 -21 -47 c-11 -27 -33 -75 -48 -108 -16 -33 -44 -96
|
||||||
|
-62 -140 l-34 -80 -172 -3 c-101 -1 -172 1 -172 7 0 5 14 40 31 78 31 68 101
|
||||||
|
227 254 578 335 769 358 814 434 874 94 74 122 79 449 80 l272 1 -2 -751z
|
||||||
|
m794 717 c41 -13 103 -42 139 -62 67 -40 202 -168 232 -221 l17 -31 -77 -65
|
||||||
|
c-43 -35 -101 -80 -129 -101 l-52 -36 -39 57 c-79 116 -204 177 -313 154 -66
|
||||||
|
-14 -105 -42 -130 -91 -19 -37 -20 -60 -20 -400 0 -339 1 -363 20 -399 26 -51
|
||||||
|
61 -78 128 -97 143 -42 327 52 366 186 l13 45 -163 3 -163 2 -3 157 c-2 111 0
|
||||||
|
157 9 160 6 2 263 3 570 1 487 -3 562 -5 593 -19 98 -45 125 -159 58 -244 -39
|
||||||
|
-50 -66 -55 -322 -55 l-236 0 -6 -27 c-18 -83 -29 -115 -62 -183 -69 -143
|
||||||
|
-230 -269 -402 -316 -81 -22 -271 -25 -350 -5 -173 43 -289 145 -341 298 -19
|
||||||
|
57 -20 81 -17 534 l3 474 33 67 c55 112 168 199 307 235 79 20 246 10 337 -21z
|
||||||
|
m828 -1515 c67 -71 67 -73 -62 -396 -45 -110 -102 -254 -128 -320 -254 -639
|
||||||
|
-272 -681 -298 -702 -74 -62 -192 -15 -192 77 0 12 39 116 86 233 48 117 97
|
||||||
|
239 110 272 119 311 336 833 354 852 36 37 85 32 130 -16z m-1574 -205 c16
|
||||||
|
-13 19 -29 22 -128 l3 -113 -195 -155 c-108 -85 -196 -158 -196 -161 0 -4 17
|
||||||
|
-19 38 -35 128 -96 327 -272 339 -301 16 -39 17 -143 2 -177 -15 -33 -34 -39
|
||||||
|
-67 -22 -48 26 -566 446 -584 474 -23 35 -23 89 1 128 16 27 150 143 376 326
|
||||||
|
39 31 79 65 90 75 44 41 128 103 139 103 7 0 21 -6 32 -14z m713 -25 c52 -37
|
||||||
|
53 -33 -92 -551 -36 -129 -80 -289 -98 -355 -39 -143 -62 -175 -129 -175 -47
|
||||||
|
0 -92 20 -114 52 -24 34 -19 90 18 217 19 64 78 271 131 461 53 190 98 353
|
||||||
|
101 364 6 16 14 18 79 14 54 -4 81 -11 104 -27z m1116 -351 c55 -45 117 -98
|
||||||
|
138 -120 61 -64 48 -115 -50 -192 -32 -25 -118 -94 -191 -152 -136 -108 -163
|
||||||
|
-120 -217 -100 -26 10 -47 62 -39 97 10 46 22 62 94 119 36 29 93 77 128 106
|
||||||
|
l62 55 -65 59 c-71 65 -77 84 -49 141 24 47 44 67 68 67 12 0 66 -36 121 -80z"/>
|
||||||
|
<path d="M2328 3755 c-37 -20 -54 -53 -153 -280 -48 -110 -96 -219 -106 -242
|
||||||
|
l-18 -43 234 0 235 0 0 290 0 290 -82 0 c-53 -1 -93 -6 -110 -15z"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 3.3 KiB |
@@ -2,6 +2,7 @@
|
|||||||
// Do not edit manually
|
// Do not edit manually
|
||||||
|
|
||||||
export const icons: Record<string, string> = {
|
export const icons: Record<string, string> = {
|
||||||
|
aigocode: `<svg height="1em" width="1em" style="flex:none;line-height:1" viewBox="0 0 648 564" xmlns="http://www.w3.org/2000/svg"><title>AiGoCode</title><g transform="translate(0,564) scale(0.1,-0.1)"><path fill="#7C6AEF" d="M5392 5379 c-26 -10 -36 -28 -56 -108 -24 -94 -47 -140 -101 -199 -56 -62 -117 -96 -219 -121 -101 -25 -116 -35 -116 -75 0 -45 21 -60 123 -89 190 -53 271 -147 336 -384 13 -46 38 -61 85 -49 25 6 36 28 56 111 7 28 23 72 36 99 13 28 21 54 18 58 -3 5 -2 7 3 6 4 -2 29 18 55 44 41 41 145 110 173 114 56 8 126 27 131 36 4 6 7 30 8 54 1 49 -5 54 -104 74 -164 33 -280 148 -320 320 -23 101 -52 129 -108 109z"/><path fill="#5B7FFF" d="M1770 4814 c-138 -25 -301 -93 -425 -177 -80 -55 -227 -197 -280 -272 -98 -138 -161 -279 -201 -447 -16 -66 -18 -164 -21 -1098 -4 -1130 -4 -1144 57 -1331 80 -242 222 -434 444 -598 l56 -42 0 -337 c0 -309 2 -340 19 -379 31 -66 87 -93 158 -74 22 6 202 117 404 249 200 131 398 259 439 285 144 89 48 81 1095 88 912 5 932 6 1012 27 243 64 441 178 599 344 166 176 274 408 304 648 13 110 13 2016 0 2120 -25 190 -83 347 -183 498 -160 240 -384 400 -677 484 l-75 22 -1325 2 c-1086 2 -1339 0 -1400 -12z m1068 -1455 l-3 -751 -71 -18 c-71 -18 -154 -55 -205 -91 -14 -10 -29 -16 -33 -12 -3 3 -6 91 -6 195 l0 188 -306 0 -305 0 -21 -47 c-11 -27 -33 -75 -48 -108 -16 -33 -44 -96 -62 -140 l-34 -80 -172 -3 c-101 -1 -172 1 -172 7 0 5 14 40 31 78 31 68 101 227 254 578 335 769 358 814 434 874 94 74 122 79 449 80 l272 1 -2 -751z m794 717 c41 -13 103 -42 139 -62 67 -40 202 -168 232 -221 l17 -31 -77 -65 c-43 -35 -101 -80 -129 -101 l-52 -36 -39 57 c-79 116 -204 177 -313 154 -66 -14 -105 -42 -130 -91 -19 -37 -20 -60 -20 -400 0 -339 1 -363 20 -399 26 -51 61 -78 128 -97 143 -42 327 52 366 186 l13 45 -163 3 -163 2 -3 157 c-2 111 0 157 9 160 6 2 263 3 570 1 487 -3 562 -5 593 -19 98 -45 125 -159 58 -244 -39 -50 -66 -55 -322 -55 l-236 0 -6 -27 c-18 -83 -29 -115 -62 -183 -69 -143 -230 -269 -402 -316 -81 -22 -271 -25 -350 -5 -173 43 -289 145 -341 298 -19 57 -20 81 -17 534 l3 474 33 67 c55 112 168 199 307 235 79 20 246 10 337 -21z m828 -1515 c67 -71 67 -73 -62 -396 -45 -110 -102 -254 -128 -320 -254 -639 -272 -681 -298 -702 -74 -62 -192 -15 -192 77 0 12 39 116 86 233 48 117 97 239 110 272 119 311 336 833 354 852 36 37 85 32 130 -16z m-1574 -205 c16 -13 19 -29 22 -128 l3 -113 -195 -155 c-108 -85 -196 -158 -196 -161 0 -4 17 -19 38 -35 128 -96 327 -272 339 -301 16 -39 17 -143 2 -177 -15 -33 -34 -39 -67 -22 -48 26 -566 446 -584 474 -23 35 -23 89 1 128 16 27 150 143 376 326 39 31 79 65 90 75 44 41 128 103 139 103 7 0 21 -6 32 -14z m713 -25 c52 -37 53 -33 -92 -551 -36 -129 -80 -289 -98 -355 -39 -143 -62 -175 -129 -175 -47 0 -92 20 -114 52 -24 34 -19 90 18 217 19 64 78 271 131 461 53 190 98 353 101 364 6 16 14 18 79 14 54 -4 81 -11 104 -27z m1116 -351 c55 -45 117 -98 138 -120 61 -64 48 -115 -50 -192 -32 -25 -118 -94 -191 -152 -136 -108 -163 -120 -217 -100 -26 10 -47 62 -39 97 10 46 22 62 94 119 36 29 93 77 128 106 l62 55 -65 59 c-71 65 -77 84 -49 141 24 47 44 67 68 67 12 0 66 -36 121 -80z"/><path fill="#5B7FFF" d="M2328 3755 c-37 -20 -54 -53 -153 -280 -48 -110 -96 -219 -106 -242 l-18 -43 234 0 235 0 0 290 0 290 -82 0 c-53 -1 -93 -6 -110 -15z"/></g></svg>`,
|
||||||
alibaba: `<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Alibaba</title><path d="M24 14.014c-2.8 1.512-5.62 2.896-8.759 3.524-.7.139-1.476.139-2.187.043-.678-.085-1.017-.682-.776-1.31.23-.585.536-1.181.93-1.671.852-1.065 1.814-2.034 2.678-3.088a15.75 15.75 0 001.422-2.054c.306-.511.164-1.129-.372-1.384-.897-.437-1.859-.745-2.81-1.075-.11-.043-.274.074-.492.149.273.244.47.425.743.67-2.821.48-5.49 1.16-8.08 2.098-.012.053-.033.095-.023.117.383.585.208 1.032-.35 1.394a2.365 2.365 0 00-.568.522c1.706.5 3.226.213 4.68-.735-.087-.127-.175-.244-.262-.372.546.096.874.394.918.862.011.107-.054.213-.087.32-.077-.086-.175-.17-.24-.267-.045-.064-.056-.138-.088-.245-1.728 1.15-3.587 1.438-5.632.842 0 .404-.022.745.011 1.075.022.287-.098.415-.36.564-.591.362-1.204.735-1.696 1.214-.59.585-.371 1.299.427 1.597.907.34 1.859.35 2.81.234 1.126-.139 2.23-.32 3.456-.49-1.433.67-2.844 1.14-4.33 1.33-1.04.14-2.078.214-3.106-.084-1.476-.415-2.133-1.501-1.75-2.96.361-1.363 1.236-2.449 2.176-3.45 3.139-3.332 7.108-5.024 11.7-5.365 1.072-.074 2.155.064 3.16.511 1.411.639 2.002 1.99 1.313 3.354-.448.905-1.072 1.735-1.695 2.555-.612.809-1.301 1.554-1.946 2.331-.186.234-.361.48-.503.745-.274.5-.088.83.492.778 1.213-.118 2.45-.213 3.62-.511 1.716-.437 3.389-1.054 5.084-1.597.175-.043.339-.107.492-.17z" fill="#FF6003" fill-rule="evenodd"></path></svg>`,
|
alibaba: `<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Alibaba</title><path d="M24 14.014c-2.8 1.512-5.62 2.896-8.759 3.524-.7.139-1.476.139-2.187.043-.678-.085-1.017-.682-.776-1.31.23-.585.536-1.181.93-1.671.852-1.065 1.814-2.034 2.678-3.088a15.75 15.75 0 001.422-2.054c.306-.511.164-1.129-.372-1.384-.897-.437-1.859-.745-2.81-1.075-.11-.043-.274.074-.492.149.273.244.47.425.743.67-2.821.48-5.49 1.16-8.08 2.098-.012.053-.033.095-.023.117.383.585.208 1.032-.35 1.394a2.365 2.365 0 00-.568.522c1.706.5 3.226.213 4.68-.735-.087-.127-.175-.244-.262-.372.546.096.874.394.918.862.011.107-.054.213-.087.32-.077-.086-.175-.17-.24-.267-.045-.064-.056-.138-.088-.245-1.728 1.15-3.587 1.438-5.632.842 0 .404-.022.745.011 1.075.022.287-.098.415-.36.564-.591.362-1.204.735-1.696 1.214-.59.585-.371 1.299.427 1.597.907.34 1.859.35 2.81.234 1.126-.139 2.23-.32 3.456-.49-1.433.67-2.844 1.14-4.33 1.33-1.04.14-2.078.214-3.106-.084-1.476-.415-2.133-1.501-1.75-2.96.361-1.363 1.236-2.449 2.176-3.45 3.139-3.332 7.108-5.024 11.7-5.365 1.072-.074 2.155.064 3.16.511 1.411.639 2.002 1.99 1.313 3.354-.448.905-1.072 1.735-1.695 2.555-.612.809-1.301 1.554-1.946 2.331-.186.234-.361.48-.503.745-.274.5-.088.83.492.778 1.213-.118 2.45-.213 3.62-.511 1.716-.437 3.389-1.054 5.084-1.597.175-.043.339-.107.492-.17z" fill="#FF6003" fill-rule="evenodd"></path></svg>`,
|
||||||
anthropic: `<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Anthropic</title><path d="M13.827 3.52h3.603L24 20h-3.603l-6.57-16.48zm-7.258 0h3.767L16.906 20h-3.674l-1.343-3.461H5.017l-1.344 3.46H0L6.57 3.522zm4.132 9.959L8.453 7.687 6.205 13.48H10.7z"></path></svg>`,
|
anthropic: `<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Anthropic</title><path d="M13.827 3.52h3.603L24 20h-3.603l-6.57-16.48zm-7.258 0h3.767L16.906 20h-3.674l-1.343-3.461H5.017l-1.344 3.46H0L6.57 3.522zm4.132 9.959L8.453 7.687 6.205 13.48H10.7z"></path></svg>`,
|
||||||
aws: `<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>AWS</title><path d="M6.763 11.212c0 .296.032.535.088.71.064.176.144.368.256.576.04.063.056.127.056.183 0 .08-.048.16-.152.24l-.503.335a.383.383 0 01-.208.072c-.08 0-.16-.04-.239-.112a2.47 2.47 0 01-.287-.375 6.18 6.18 0 01-.248-.471c-.622.734-1.405 1.101-2.347 1.101-.67 0-1.205-.191-1.596-.574-.39-.384-.59-.894-.59-1.533 0-.678.24-1.23.726-1.644.487-.415 1.133-.623 1.955-.623.272 0 .551.024.846.064.296.04.6.104.918.176v-.583c0-.607-.127-1.03-.375-1.277-.255-.248-.686-.367-1.3-.367-.28 0-.568.031-.863.103-.295.072-.583.16-.862.272a2.4 2.4 0 01-.28.104.488.488 0 01-.127.023c-.112 0-.168-.08-.168-.247v-.391c0-.128.016-.224.056-.28a.597.597 0 01.224-.167 4.577 4.577 0 011.005-.36 4.84 4.84 0 011.246-.151c.95 0 1.644.216 2.091.647.44.43.662 1.085.662 1.963v2.586h.016zm-3.24 1.214c.263 0 .534-.048.822-.144a1.78 1.78 0 00.758-.51 1.27 1.27 0 00.272-.512c.047-.191.08-.423.08-.694v-.335a6.66 6.66 0 00-.735-.136 6.02 6.02 0 00-.75-.048c-.535 0-.926.104-1.19.32-.263.215-.39.518-.39.917 0 .375.095.655.295.846.191.2.47.296.838.296zm6.41.862c-.144 0-.24-.024-.304-.08-.064-.048-.12-.16-.168-.311L7.586 6.726a1.398 1.398 0 01-.072-.32c0-.128.064-.2.191-.2h.783c.151 0 .255.025.31.08.065.048.113.16.16.312l1.342 5.284 1.245-5.284c.04-.16.088-.264.151-.312a.549.549 0 01.32-.08h.638c.152 0 .256.025.32.08.063.048.12.16.151.312l1.261 5.348 1.381-5.348c.048-.16.104-.264.16-.312a.52.52 0 01.311-.08h.743c.127 0 .2.065.2.2 0 .04-.009.08-.017.128a1.137 1.137 0 01-.056.2l-1.923 6.17c-.048.16-.104.263-.168.311a.51.51 0 01-.303.08h-.687c-.15 0-.255-.024-.32-.08-.063-.056-.119-.16-.15-.32L12.32 7.747l-1.23 5.14c-.04.16-.087.264-.15.32-.065.056-.177.08-.32.08l-.686.001zm10.256.215c-.415 0-.83-.048-1.229-.143-.399-.096-.71-.2-.918-.32-.128-.071-.215-.151-.247-.223a.563.563 0 01-.048-.224v-.407c0-.167.064-.247.183-.247.048 0 .096.008.144.024.048.016.12.048.2.08.271.12.566.215.878.279.32.064.63.096.95.096.502 0 .894-.088 1.165-.264a.86.86 0 00.415-.758.777.777 0 00-.215-.559c-.144-.151-.416-.287-.807-.415l-1.157-.36c-.583-.183-1.014-.454-1.277-.813a1.902 1.902 0 01-.4-1.158c0-.335.073-.63.216-.886.144-.255.335-.479.575-.654.24-.184.51-.32.83-.415.32-.096.655-.136 1.006-.136.175 0 .36.008.535.032.183.024.35.056.518.088.16.04.312.08.455.127.144.048.256.096.336.144a.69.69 0 01.24.2.43.43 0 01.071.263v.375c0 .168-.064.256-.184.256a.83.83 0 01-.303-.096 3.652 3.652 0 00-1.532-.311c-.455 0-.815.071-1.062.223-.248.152-.375.383-.375.71 0 .224.08.416.24.567.16.152.454.304.877.44l1.134.358c.574.184.99.44 1.237.767.247.327.367.702.367 1.117 0 .343-.072.655-.207.926a2.157 2.157 0 01-.583.703c-.248.2-.543.343-.886.447-.36.111-.734.167-1.142.167z"></path><path d="M.378 15.475c3.384 1.963 7.56 3.153 11.877 3.153 2.914 0 6.114-.607 9.06-1.852.44-.2.814.287.383.607-2.626 1.94-6.442 2.969-9.722 2.969-4.598 0-8.74-1.7-11.87-4.526-.247-.223-.024-.527.272-.351zm23.531-.2c.287.36-.08 2.826-1.485 4.007-.215.184-.423.088-.327-.151l.175-.439c.343-.88.802-2.198.52-2.555-.336-.43-2.22-.207-3.074-.103-.255.032-.295-.192-.063-.36 1.5-1.053 3.967-.75 4.254-.399z" fill="#F90"></path></svg>`,
|
aws: `<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>AWS</title><path d="M6.763 11.212c0 .296.032.535.088.71.064.176.144.368.256.576.04.063.056.127.056.183 0 .08-.048.16-.152.24l-.503.335a.383.383 0 01-.208.072c-.08 0-.16-.04-.239-.112a2.47 2.47 0 01-.287-.375 6.18 6.18 0 01-.248-.471c-.622.734-1.405 1.101-2.347 1.101-.67 0-1.205-.191-1.596-.574-.39-.384-.59-.894-.59-1.533 0-.678.24-1.23.726-1.644.487-.415 1.133-.623 1.955-.623.272 0 .551.024.846.064.296.04.6.104.918.176v-.583c0-.607-.127-1.03-.375-1.277-.255-.248-.686-.367-1.3-.367-.28 0-.568.031-.863.103-.295.072-.583.16-.862.272a2.4 2.4 0 01-.28.104.488.488 0 01-.127.023c-.112 0-.168-.08-.168-.247v-.391c0-.128.016-.224.056-.28a.597.597 0 01.224-.167 4.577 4.577 0 011.005-.36 4.84 4.84 0 011.246-.151c.95 0 1.644.216 2.091.647.44.43.662 1.085.662 1.963v2.586h.016zm-3.24 1.214c.263 0 .534-.048.822-.144a1.78 1.78 0 00.758-.51 1.27 1.27 0 00.272-.512c.047-.191.08-.423.08-.694v-.335a6.66 6.66 0 00-.735-.136 6.02 6.02 0 00-.75-.048c-.535 0-.926.104-1.19.32-.263.215-.39.518-.39.917 0 .375.095.655.295.846.191.2.47.296.838.296zm6.41.862c-.144 0-.24-.024-.304-.08-.064-.048-.12-.16-.168-.311L7.586 6.726a1.398 1.398 0 01-.072-.32c0-.128.064-.2.191-.2h.783c.151 0 .255.025.31.08.065.048.113.16.16.312l1.342 5.284 1.245-5.284c.04-.16.088-.264.151-.312a.549.549 0 01.32-.08h.638c.152 0 .256.025.32.08.063.048.12.16.151.312l1.261 5.348 1.381-5.348c.048-.16.104-.264.16-.312a.52.52 0 01.311-.08h.743c.127 0 .2.065.2.2 0 .04-.009.08-.017.128a1.137 1.137 0 01-.056.2l-1.923 6.17c-.048.16-.104.263-.168.311a.51.51 0 01-.303.08h-.687c-.15 0-.255-.024-.32-.08-.063-.056-.119-.16-.15-.32L12.32 7.747l-1.23 5.14c-.04.16-.087.264-.15.32-.065.056-.177.08-.32.08l-.686.001zm10.256.215c-.415 0-.83-.048-1.229-.143-.399-.096-.71-.2-.918-.32-.128-.071-.215-.151-.247-.223a.563.563 0 01-.048-.224v-.407c0-.167.064-.247.183-.247.048 0 .096.008.144.024.048.016.12.048.2.08.271.12.566.215.878.279.32.064.63.096.95.096.502 0 .894-.088 1.165-.264a.86.86 0 00.415-.758.777.777 0 00-.215-.559c-.144-.151-.416-.287-.807-.415l-1.157-.36c-.583-.183-1.014-.454-1.277-.813a1.902 1.902 0 01-.4-1.158c0-.335.073-.63.216-.886.144-.255.335-.479.575-.654.24-.184.51-.32.83-.415.32-.096.655-.136 1.006-.136.175 0 .36.008.535.032.183.024.35.056.518.088.16.04.312.08.455.127.144.048.256.096.336.144a.69.69 0 01.24.2.43.43 0 01.071.263v.375c0 .168-.064.256-.184.256a.83.83 0 01-.303-.096 3.652 3.652 0 00-1.532-.311c-.455 0-.815.071-1.062.223-.248.152-.375.383-.375.71 0 .224.08.416.24.567.16.152.454.304.877.44l1.134.358c.574.184.99.44 1.237.767.247.327.367.702.367 1.117 0 .343-.072.655-.207.926a2.157 2.157 0 01-.583.703c-.248.2-.543.343-.886.447-.36.111-.734.167-1.142.167z"></path><path d="M.378 15.475c3.384 1.963 7.56 3.153 11.877 3.153 2.914 0 6.114-.607 9.06-1.852.44-.2.814.287.383.607-2.626 1.94-6.442 2.969-9.722 2.969-4.598 0-8.74-1.7-11.87-4.526-.247-.223-.024-.527.272-.351zm23.531-.2c.287.36-.08 2.826-1.485 4.007-.215.184-.423.088-.327-.151l.175-.439c.343-.88.802-2.198.52-2.555-.336-.43-2.22-.207-3.074-.103-.255.032-.295-.192-.063-.36 1.5-1.053 3.967-.75 4.254-.399z" fill="#F90"></path></svg>`,
|
||||||
|
|||||||
@@ -2,6 +2,13 @@
|
|||||||
import { IconMetadata } from "@/types/icon";
|
import { IconMetadata } from "@/types/icon";
|
||||||
|
|
||||||
export const iconMetadata: Record<string, IconMetadata> = {
|
export const iconMetadata: Record<string, IconMetadata> = {
|
||||||
|
aigocode: {
|
||||||
|
name: "aigocode",
|
||||||
|
displayName: "AIGoCode",
|
||||||
|
category: "ai-provider",
|
||||||
|
keywords: ["aigocode", "aigo", "code", "third-party"],
|
||||||
|
defaultColor: "#5B7FFF",
|
||||||
|
},
|
||||||
alibaba: {
|
alibaba: {
|
||||||
name: "alibaba",
|
name: "alibaba",
|
||||||
displayName: "Alibaba",
|
displayName: "Alibaba",
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
/**
|
||||||
|
* 全局出站代理 API
|
||||||
|
*
|
||||||
|
* 提供获取、设置和测试全局代理的功能。
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { invoke } from "@tauri-apps/api/core";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 代理测试结果
|
||||||
|
*/
|
||||||
|
export interface ProxyTestResult {
|
||||||
|
success: boolean;
|
||||||
|
latencyMs: number;
|
||||||
|
error: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 出站代理状态
|
||||||
|
*/
|
||||||
|
export interface UpstreamProxyStatus {
|
||||||
|
enabled: boolean;
|
||||||
|
proxyUrl: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 检测到的代理
|
||||||
|
*/
|
||||||
|
export interface DetectedProxy {
|
||||||
|
url: string;
|
||||||
|
proxyType: string;
|
||||||
|
port: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取全局代理 URL
|
||||||
|
*
|
||||||
|
* @returns 代理 URL,null 表示未配置(直连)
|
||||||
|
*/
|
||||||
|
export async function getGlobalProxyUrl(): Promise<string | null> {
|
||||||
|
return invoke<string | null>("get_global_proxy_url");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 设置全局代理 URL
|
||||||
|
*
|
||||||
|
* @param url - 代理 URL(如 http://127.0.0.1:7890 或 socks5://127.0.0.1:1080)
|
||||||
|
* 空字符串表示清除代理(直连)
|
||||||
|
*/
|
||||||
|
export async function setGlobalProxyUrl(url: string): Promise<void> {
|
||||||
|
try {
|
||||||
|
return await invoke("set_global_proxy_url", { url });
|
||||||
|
} catch (error) {
|
||||||
|
// Tauri invoke 错误可能是字符串
|
||||||
|
throw new Error(typeof error === "string" ? error : String(error));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 测试代理连接
|
||||||
|
*
|
||||||
|
* @param url - 要测试的代理 URL
|
||||||
|
* @returns 测试结果,包含是否成功、延迟和错误信息
|
||||||
|
*/
|
||||||
|
export async function testProxyUrl(url: string): Promise<ProxyTestResult> {
|
||||||
|
return invoke<ProxyTestResult>("test_proxy_url", { url });
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取当前出站代理状态
|
||||||
|
*
|
||||||
|
* @returns 代理状态,包含是否启用和代理 URL
|
||||||
|
*/
|
||||||
|
export async function getUpstreamProxyStatus(): Promise<UpstreamProxyStatus> {
|
||||||
|
return invoke<UpstreamProxyStatus>("get_upstream_proxy_status");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 扫描本地代理
|
||||||
|
*
|
||||||
|
* @returns 检测到的代理列表
|
||||||
|
*/
|
||||||
|
export async function scanLocalProxies(): Promise<DetectedProxy[]> {
|
||||||
|
return invoke<DetectedProxy[]>("scan_local_proxies");
|
||||||
|
}
|
||||||
@@ -65,6 +65,15 @@ export const providersApi = {
|
|||||||
handler(payload);
|
handler(payload);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 打开指定提供商的终端
|
||||||
|
* 任何提供商都可以打开终端,不受是否为当前激活提供商的限制
|
||||||
|
* 终端会使用该提供商特定的 API 配置,不影响全局设置
|
||||||
|
*/
|
||||||
|
async openTerminal(providerId: string, appId: AppId): Promise<boolean> {
|
||||||
|
return await invoke("open_provider_terminal", { providerId, app: appId });
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|||||||
@@ -92,6 +92,8 @@ export interface ProviderMeta {
|
|||||||
custom_endpoints?: Record<string, CustomEndpoint>;
|
custom_endpoints?: Record<string, CustomEndpoint>;
|
||||||
// 用量查询脚本配置
|
// 用量查询脚本配置
|
||||||
usage_script?: UsageScript;
|
usage_script?: UsageScript;
|
||||||
|
// 请求地址管理:测速后自动选择最佳端点
|
||||||
|
endpointAutoSelect?: boolean;
|
||||||
// 是否为官方合作伙伴
|
// 是否为官方合作伙伴
|
||||||
isPartner?: boolean;
|
isPartner?: boolean;
|
||||||
// 合作伙伴促销 key(用于后端识别 PackyCode 等)
|
// 合作伙伴促销 key(用于后端识别 PackyCode 等)
|
||||||
|
|||||||
Reference in New Issue
Block a user