Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
e76f0fefb4 | |||
e3e35ff3b3 | |||
2d5d230ff8 | |||
564c9d77f6 |
192
.github/workflows/README.md
vendored
Normal file
192
.github/workflows/README.md
vendored
Normal file
@@ -0,0 +1,192 @@
|
|||||||
|
# GitHub Actions 工作流说明
|
||||||
|
|
||||||
|
本项目包含多个 GitHub Actions 工作流,适用于不同的使用场景。
|
||||||
|
|
||||||
|
## 📋 工作流列表
|
||||||
|
|
||||||
|
### 1. `build-opensource.yml` - 开源发布(推荐)
|
||||||
|
**用途**:正式版本发布,适合开源项目分发
|
||||||
|
|
||||||
|
**触发条件**:
|
||||||
|
- 创建版本标签 (`v*`)
|
||||||
|
- 手动触发
|
||||||
|
|
||||||
|
**特点**:
|
||||||
|
- ✅ 无需代码签名
|
||||||
|
- ✅ 自动创建 GitHub Release
|
||||||
|
- ✅ 支持所有平台
|
||||||
|
- ✅ 生成用户友好的安装包
|
||||||
|
|
||||||
|
**使用方法**:
|
||||||
|
```bash
|
||||||
|
# 创建版本发布
|
||||||
|
git tag v1.0.0
|
||||||
|
git push origin v1.0.0
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 2. `dev-ci.yml` - 开发测试
|
||||||
|
**用途**:PR 和开发分支的自动化测试
|
||||||
|
|
||||||
|
**触发条件**:
|
||||||
|
- Push 到 `dev`, `develop`, `feature/*` 分支
|
||||||
|
- 创建 PR 到 `main` 或 `dev`
|
||||||
|
|
||||||
|
**特点**:
|
||||||
|
- ✅ 代码格式检查
|
||||||
|
- ✅ Clippy 静态分析
|
||||||
|
- ✅ TypeScript 类型检查
|
||||||
|
- ✅ 单元测试
|
||||||
|
- ✅ 构建验证
|
||||||
|
|
||||||
|
**检查项目**:
|
||||||
|
- Rust 格式化 (`cargo fmt`)
|
||||||
|
- Rust 代码质量 (`cargo clippy`)
|
||||||
|
- TypeScript 类型 (`tsc`)
|
||||||
|
- 测试运行 (`cargo test`)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 3. `quick-build.yml` - 快速构建
|
||||||
|
**用途**:快速测试构建,不创建发布
|
||||||
|
|
||||||
|
**触发条件**:
|
||||||
|
- 仅手动触发
|
||||||
|
|
||||||
|
**特点**:
|
||||||
|
- ✅ 可选择特定平台
|
||||||
|
- ✅ 最小化配置
|
||||||
|
- ✅ 快速构建
|
||||||
|
- ✅ 保存构建产物 7 天
|
||||||
|
|
||||||
|
**使用方法**:
|
||||||
|
1. GitHub → Actions → Quick Build
|
||||||
|
2. 选择目标平台
|
||||||
|
3. 点击 Run workflow
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 4. `build.yml` - 完整构建(需要签名)
|
||||||
|
**用途**:需要代码签名的正式发布
|
||||||
|
|
||||||
|
**要求**:
|
||||||
|
- ❗ 需要配置 Apple 证书
|
||||||
|
- ❗ 需要 GitHub Secrets
|
||||||
|
|
||||||
|
**不推荐用于**:
|
||||||
|
- 开源项目
|
||||||
|
- 个人开发
|
||||||
|
- 没有 Apple 开发者账号的情况
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 5. `build-unsigned.yml` - 未签名构建
|
||||||
|
**用途**:不需要签名的完整构建
|
||||||
|
|
||||||
|
**特点**:
|
||||||
|
- ✅ 支持所有平台
|
||||||
|
- ✅ 无需证书配置
|
||||||
|
- ⚠️ macOS 用户需要手动信任
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🎯 推荐使用方案
|
||||||
|
|
||||||
|
### 开源项目
|
||||||
|
使用 **`build-opensource.yml`**:
|
||||||
|
- 简单配置
|
||||||
|
- 自动发布
|
||||||
|
- 用户友好
|
||||||
|
|
||||||
|
### 日常开发
|
||||||
|
使用 **`dev-ci.yml`**:
|
||||||
|
- 自动化测试
|
||||||
|
- 代码质量保证
|
||||||
|
- PR 检查
|
||||||
|
|
||||||
|
### 快速测试
|
||||||
|
使用 **`quick-build.yml`**:
|
||||||
|
- 手动触发
|
||||||
|
- 选择平台
|
||||||
|
- 快速验证
|
||||||
|
|
||||||
|
## 🚀 快速开始
|
||||||
|
|
||||||
|
### 1. 首次设置
|
||||||
|
```bash
|
||||||
|
# 确保工作流文件存在
|
||||||
|
ls -la .github/workflows/
|
||||||
|
|
||||||
|
# 推送到 GitHub
|
||||||
|
git add .github/
|
||||||
|
git commit -m "添加 GitHub Actions 工作流"
|
||||||
|
git push origin main
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. 创建发布
|
||||||
|
```bash
|
||||||
|
# 更新版本号
|
||||||
|
# 编辑 src-tauri/Cargo.toml, src-tauri/tauri.conf.json, package.json
|
||||||
|
|
||||||
|
# 提交更改
|
||||||
|
git add .
|
||||||
|
git commit -m "chore: bump version to v1.0.0"
|
||||||
|
|
||||||
|
# 创建标签并推送
|
||||||
|
git tag v1.0.0
|
||||||
|
git push origin v1.0.0
|
||||||
|
|
||||||
|
# 工作流会自动运行并创建 Release Draft
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. 开发测试
|
||||||
|
```bash
|
||||||
|
# 创建功能分支
|
||||||
|
git checkout -b feature/new-feature
|
||||||
|
|
||||||
|
# 推送会自动触发测试
|
||||||
|
git push origin feature/new-feature
|
||||||
|
```
|
||||||
|
|
||||||
|
## 📝 注意事项
|
||||||
|
|
||||||
|
1. **开源项目不需要代码签名**
|
||||||
|
- 用户需要手动信任应用是正常的
|
||||||
|
- 这不影响应用的功能
|
||||||
|
|
||||||
|
2. **构建产物保留时间**
|
||||||
|
- Release: 永久保存
|
||||||
|
- Artifacts: 7 天后自动删除
|
||||||
|
|
||||||
|
3. **并行构建**
|
||||||
|
- 所有平台同时构建
|
||||||
|
- 一个平台失败不影响其他平台
|
||||||
|
|
||||||
|
## 🔧 故障排除
|
||||||
|
|
||||||
|
### 构建失败
|
||||||
|
1. 检查 Actions 日志
|
||||||
|
2. 确认依赖版本正确
|
||||||
|
3. 本地测试构建:`bun run tauri build`
|
||||||
|
|
||||||
|
### Linux 构建问题
|
||||||
|
确保安装所有依赖:
|
||||||
|
```bash
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y \
|
||||||
|
libwebkit2gtk-4.1-dev \
|
||||||
|
libgtk-3-dev \
|
||||||
|
libayatana-appindicator3-dev \
|
||||||
|
librsvg2-dev
|
||||||
|
```
|
||||||
|
|
||||||
|
### Windows 构建问题
|
||||||
|
- 确保使用 Windows Server 2019 或更高版本
|
||||||
|
- 检查 Visual Studio Build Tools
|
||||||
|
|
||||||
|
## 📚 相关文档
|
||||||
|
|
||||||
|
- [Tauri 构建文档](https://tauri.app/v1/guides/building/)
|
||||||
|
- [GitHub Actions 文档](https://docs.github.com/en/actions)
|
||||||
|
- [项目 README](../../README.md)
|
22
.github/workflows/claude-code-review.yml
vendored
22
.github/workflows/claude-code-review.yml
vendored
@@ -17,14 +17,14 @@ jobs:
|
|||||||
# github.event.pull_request.user.login == 'external-contributor' ||
|
# github.event.pull_request.user.login == 'external-contributor' ||
|
||||||
# github.event.pull_request.user.login == 'new-developer' ||
|
# github.event.pull_request.user.login == 'new-developer' ||
|
||||||
# github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR'
|
# github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR'
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
pull-requests: read
|
pull-requests: read
|
||||||
issues: read
|
issues: read
|
||||||
id-token: write
|
id-token: write
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -36,10 +36,10 @@ jobs:
|
|||||||
uses: anthropics/claude-code-action@beta
|
uses: anthropics/claude-code-action@beta
|
||||||
with:
|
with:
|
||||||
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
|
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
|
||||||
|
|
||||||
# Optional: Specify model (defaults to Claude Sonnet 4, uncomment for Claude Opus 4)
|
# Optional: Specify model (defaults to Claude Sonnet 4, uncomment for Claude Opus 4)
|
||||||
# model: "claude-opus-4-20250514"
|
# model: "claude-opus-4-20250514"
|
||||||
|
|
||||||
# Direct prompt for automated review (no @claude mention needed)
|
# Direct prompt for automated review (no @claude mention needed)
|
||||||
direct_prompt: |
|
direct_prompt: |
|
||||||
Please review this pull request and provide feedback on:
|
Please review this pull request and provide feedback on:
|
||||||
@@ -50,24 +50,24 @@ jobs:
|
|||||||
- Test coverage
|
- Test coverage
|
||||||
|
|
||||||
Be constructive and helpful in your feedback.
|
Be constructive and helpful in your feedback.
|
||||||
|
|
||||||
# Optional: Customize review based on file types
|
# Optional: Customize review based on file types
|
||||||
# direct_prompt: |
|
# direct_prompt: |
|
||||||
# Review this PR focusing on:
|
# Review this PR focusing on:
|
||||||
# - For TypeScript files: Type safety and proper interface usage
|
# - For TypeScript files: Type safety and proper interface usage
|
||||||
# - For API endpoints: Security, input validation, and error handling
|
# - For API endpoints: Security, input validation, and error handling
|
||||||
# - For React components: Performance, accessibility, and best practices
|
# - For React components: Performance, accessibility, and best practices
|
||||||
# - For tests: Coverage, edge cases, and test quality
|
# - For tests: Coverage, edge cases, and test.md quality
|
||||||
|
|
||||||
# Optional: Different prompts for different authors
|
# Optional: Different prompts for different authors
|
||||||
# direct_prompt: |
|
# direct_prompt: |
|
||||||
# ${{ github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR' &&
|
# ${{ github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR' &&
|
||||||
# 'Welcome! Please review this PR from a first-time contributor. Be encouraging and provide detailed explanations for any suggestions.' ||
|
# 'Welcome! Please review this PR from a first-time contributor. Be encouraging and provide detailed explanations for any suggestions.' ||
|
||||||
# 'Please provide a thorough code review focusing on our coding standards and best practices.' }}
|
# 'Please provide a thorough code review focusing on our coding standards and best practices.' }}
|
||||||
|
|
||||||
# Optional: Add specific tools for running tests or linting
|
# Optional: Add specific tools for running tests or linting
|
||||||
# allowed_tools: "Bash(npm run test),Bash(npm run lint),Bash(npm run typecheck)"
|
# allowed_tools: "Bash(npm run test.md),Bash(npm run lint),Bash(npm run typecheck)"
|
||||||
|
|
||||||
# Optional: Skip review for certain conditions
|
# Optional: Skip review for certain conditions
|
||||||
# if: |
|
# if: |
|
||||||
# !contains(github.event.pull_request.title, '[skip-review]') &&
|
# !contains(github.event.pull_request.title, '[skip-review]') &&
|
||||||
|
16
.github/workflows/claude.yml
vendored
16
.github/workflows/claude.yml
vendored
@@ -34,26 +34,26 @@ jobs:
|
|||||||
uses: anthropics/claude-code-action@beta
|
uses: anthropics/claude-code-action@beta
|
||||||
with:
|
with:
|
||||||
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
|
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
|
||||||
|
|
||||||
# Optional: Specify model (defaults to Claude Sonnet 4, uncomment for Claude Opus 4)
|
# Optional: Specify model (defaults to Claude Sonnet 4, uncomment for Claude Opus 4)
|
||||||
model: "claude-opus-4-20250514"
|
model: "claude-opus-4-20250514"
|
||||||
|
|
||||||
# Optional: Customize the trigger phrase (default: @claude)
|
# Optional: Customize the trigger phrase (default: @claude)
|
||||||
# trigger_phrase: "/claude"
|
# trigger_phrase: "/claude"
|
||||||
|
|
||||||
# Optional: Trigger when specific user is assigned to an issue
|
# Optional: Trigger when specific user is assigned to an issue
|
||||||
# assignee_trigger: "claude-bot"
|
# assignee_trigger: "claude-bot"
|
||||||
|
|
||||||
# Optional: Allow Claude to run specific commands
|
# Optional: Allow Claude to run specific commands
|
||||||
# allowed_tools: "Bash(npm install),Bash(npm run build),Bash(npm run test:*),Bash(npm run lint:*)"
|
# allowed_tools: "Bash(npm install),Bash(npm run build),Bash(npm run test.md:*),Bash(npm run lint:*)"
|
||||||
|
|
||||||
# Optional: Add custom instructions for Claude to customize its behavior for your project
|
# Optional: Add custom instructions for Claude to customize its behavior for your project
|
||||||
# custom_instructions: |
|
# custom_instructions: |
|
||||||
# Follow our coding standards
|
# Follow our coding standards
|
||||||
# Ensure all new code has tests
|
# Ensure all new code has tests
|
||||||
# Use TypeScript for new files
|
# Use TypeScript for new files
|
||||||
|
|
||||||
# Optional: Custom environment variables for Claude
|
# Optional: Custom environment variables for Claude
|
||||||
# claude_env: |
|
# claude_env: |
|
||||||
# NODE_ENV: test
|
# NODE_ENV: test.md
|
||||||
|
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "claudia",
|
"name": "claudia",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.2.0",
|
"version": "1.2.2",
|
||||||
"license": "AGPL-3.0",
|
"license": "AGPL-3.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "claudia"
|
name = "claudia"
|
||||||
version = "1.2.0"
|
version = "1.2.2"
|
||||||
description = "GUI app and Toolkit for Claude Code"
|
description = "GUI app and Toolkit for Claude Code"
|
||||||
authors = ["mufeedvh", "123vviekr"]
|
authors = ["mufeedvh", "123vviekr"]
|
||||||
license = "AGPL-3.0"
|
license = "AGPL-3.0"
|
||||||
|
@@ -202,7 +202,16 @@ fn find_which_installations() -> Vec<ClaudeInstallation> {
|
|||||||
|
|
||||||
let mut installations = Vec::new();
|
let mut installations = Vec::new();
|
||||||
|
|
||||||
match Command::new(command_name).arg("claude").output() {
|
// Create command with enhanced PATH for production environments
|
||||||
|
let mut cmd = Command::new(command_name);
|
||||||
|
cmd.arg("claude");
|
||||||
|
|
||||||
|
// In production (DMG), we need to ensure proper PATH is set
|
||||||
|
let enhanced_path = build_enhanced_path();
|
||||||
|
debug!("Using enhanced PATH for {}: {}", command_name, enhanced_path);
|
||||||
|
cmd.env("PATH", enhanced_path);
|
||||||
|
|
||||||
|
match cmd.output() {
|
||||||
Ok(output) if output.status.success() => {
|
Ok(output) if output.status.success() => {
|
||||||
let output_str = String::from_utf8_lossy(&output.stdout).trim().to_string();
|
let output_str = String::from_utf8_lossy(&output.stdout).trim().to_string();
|
||||||
|
|
||||||
@@ -401,7 +410,11 @@ fn find_standard_installations() -> Vec<ClaudeInstallation> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Also check if claude is available in PATH (without full path)
|
// Also check if claude is available in PATH (without full path)
|
||||||
if let Ok(output) = Command::new("claude").arg("--version").output() {
|
let mut path_cmd = Command::new("claude");
|
||||||
|
path_cmd.arg("--version");
|
||||||
|
path_cmd.env("PATH", build_enhanced_path());
|
||||||
|
|
||||||
|
if let Ok(output) = path_cmd.output() {
|
||||||
if output.status.success() {
|
if output.status.success() {
|
||||||
debug!("claude is available in PATH");
|
debug!("claude is available in PATH");
|
||||||
// Combine stdout and stderr for robust version extraction
|
// Combine stdout and stderr for robust version extraction
|
||||||
@@ -427,7 +440,11 @@ fn find_standard_installations() -> Vec<ClaudeInstallation> {
|
|||||||
|
|
||||||
/// Get Claude version by running --version command
|
/// Get Claude version by running --version command
|
||||||
fn get_claude_version(path: &str) -> Result<Option<String>, String> {
|
fn get_claude_version(path: &str) -> Result<Option<String>, String> {
|
||||||
match Command::new(path).arg("--version").output() {
|
// Use the helper function to create command with proper environment
|
||||||
|
let mut cmd = create_command_with_env(path);
|
||||||
|
cmd.arg("--version");
|
||||||
|
|
||||||
|
match cmd.output() {
|
||||||
Ok(output) => {
|
Ok(output) => {
|
||||||
if output.status.success() {
|
if output.status.success() {
|
||||||
// Combine stdout and stderr for robust version extraction
|
// Combine stdout and stderr for robust version extraction
|
||||||
@@ -556,11 +573,15 @@ pub fn create_command_with_env(program: &str) -> Command {
|
|||||||
|
|
||||||
info!("Creating command for: {}", program);
|
info!("Creating command for: {}", program);
|
||||||
|
|
||||||
|
// Build enhanced PATH for production environments (DMG/App Bundle)
|
||||||
|
let enhanced_path = build_enhanced_path();
|
||||||
|
debug!("Enhanced PATH: {}", enhanced_path);
|
||||||
|
cmd.env("PATH", enhanced_path.clone());
|
||||||
|
|
||||||
// Inherit essential environment variables from parent process
|
// Inherit essential environment variables from parent process
|
||||||
for (key, value) in std::env::vars() {
|
for (key, value) in std::env::vars() {
|
||||||
// Pass through PATH and other essential environment variables
|
// Pass through essential environment variables (excluding PATH which we set above)
|
||||||
if key == "PATH"
|
if key == "HOME"
|
||||||
|| key == "HOME"
|
|
||||||
|| key == "USER"
|
|| key == "USER"
|
||||||
|| key == "SHELL"
|
|| key == "SHELL"
|
||||||
|| key == "LANG"
|
|| key == "LANG"
|
||||||
@@ -595,7 +616,12 @@ pub fn create_command_with_env(program: &str) -> Command {
|
|||||||
if program.contains("/.nvm/versions/node/") {
|
if program.contains("/.nvm/versions/node/") {
|
||||||
if let Some(node_bin_dir) = std::path::Path::new(program).parent() {
|
if let Some(node_bin_dir) = std::path::Path::new(program).parent() {
|
||||||
// Ensure the Node.js bin directory is in PATH
|
// Ensure the Node.js bin directory is in PATH
|
||||||
let current_path = std::env::var("PATH").unwrap_or_default();
|
let current_path = cmd.get_envs()
|
||||||
|
.find(|(k, _)| k.to_str() == Some("PATH"))
|
||||||
|
.and_then(|(_, v)| v)
|
||||||
|
.and_then(|v| v.to_str())
|
||||||
|
.unwrap_or(&enhanced_path)
|
||||||
|
.to_string();
|
||||||
let node_bin_str = node_bin_dir.to_string_lossy();
|
let node_bin_str = node_bin_dir.to_string_lossy();
|
||||||
if !current_path.contains(&node_bin_str.as_ref()) {
|
if !current_path.contains(&node_bin_str.as_ref()) {
|
||||||
let new_path = format!("{}:{}", node_bin_str, current_path);
|
let new_path = format!("{}:{}", node_bin_str, current_path);
|
||||||
@@ -607,3 +633,73 @@ pub fn create_command_with_env(program: &str) -> Command {
|
|||||||
|
|
||||||
cmd
|
cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Build an enhanced PATH that includes all possible Claude installation locations
|
||||||
|
/// This is especially important for DMG/packaged applications where PATH may be limited
|
||||||
|
fn build_enhanced_path() -> String {
|
||||||
|
let mut paths = Vec::new();
|
||||||
|
|
||||||
|
// Start with current PATH
|
||||||
|
if let Ok(current_path) = std::env::var("PATH") {
|
||||||
|
paths.push(current_path);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add standard system paths that might be missing in packaged apps
|
||||||
|
let system_paths = vec![
|
||||||
|
"/usr/local/bin",
|
||||||
|
"/usr/bin",
|
||||||
|
"/bin",
|
||||||
|
"/opt/homebrew/bin",
|
||||||
|
"/opt/homebrew/sbin",
|
||||||
|
];
|
||||||
|
|
||||||
|
for path in system_paths {
|
||||||
|
if PathBuf::from(path).exists() {
|
||||||
|
paths.push(path.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add user-specific paths
|
||||||
|
if let Ok(home) = std::env::var("HOME") {
|
||||||
|
let user_paths = vec![
|
||||||
|
format!("{}/.local/bin", home),
|
||||||
|
format!("{}/.claude/local", home),
|
||||||
|
format!("{}/.npm-global/bin", home),
|
||||||
|
format!("{}/.yarn/bin", home),
|
||||||
|
format!("{}/.bun/bin", home),
|
||||||
|
format!("{}/bin", home),
|
||||||
|
format!("{}/.config/yarn/global/node_modules/.bin", home),
|
||||||
|
format!("{}/node_modules/.bin", home),
|
||||||
|
];
|
||||||
|
|
||||||
|
for path in user_paths {
|
||||||
|
if PathBuf::from(&path).exists() {
|
||||||
|
paths.push(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add all NVM node versions
|
||||||
|
let nvm_dir = PathBuf::from(&home).join(".nvm/versions/node");
|
||||||
|
if nvm_dir.exists() {
|
||||||
|
if let Ok(entries) = std::fs::read_dir(&nvm_dir) {
|
||||||
|
for entry in entries.flatten() {
|
||||||
|
if entry.file_type().map(|t| t.is_dir()).unwrap_or(false) {
|
||||||
|
let bin_path = entry.path().join("bin");
|
||||||
|
if bin_path.exists() {
|
||||||
|
paths.push(bin_path.to_string_lossy().to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove duplicates while preserving order
|
||||||
|
let mut seen = std::collections::HashSet::new();
|
||||||
|
let unique_paths: Vec<String> = paths
|
||||||
|
.into_iter()
|
||||||
|
.filter(|path| seen.insert(path.clone()))
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
unique_paths.join(":")
|
||||||
|
}
|
||||||
|
@@ -623,102 +623,40 @@ pub async fn get_system_prompt() -> Result<String, String> {
|
|||||||
|
|
||||||
/// Checks if Claude Code is installed and gets its version
|
/// Checks if Claude Code is installed and gets its version
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn check_claude_version(app: AppHandle) -> Result<ClaudeVersionStatus, String> {
|
pub async fn check_claude_version(_app: AppHandle) -> Result<ClaudeVersionStatus, String> {
|
||||||
log::info!("Checking Claude Code version");
|
log::info!("Checking Claude Code version");
|
||||||
|
|
||||||
let claude_path = match find_claude_binary(&app) {
|
// Try to find Claude installations with versions
|
||||||
Ok(path) => path,
|
let installations = crate::claude_binary::discover_claude_installations();
|
||||||
Err(e) => {
|
|
||||||
return Ok(ClaudeVersionStatus {
|
if installations.is_empty() {
|
||||||
is_installed: false,
|
return Ok(ClaudeVersionStatus {
|
||||||
version: None,
|
is_installed: false,
|
||||||
output: e,
|
version: None,
|
||||||
});
|
output: "Claude Code not found. Please ensure it's installed.".to_string(),
|
||||||
}
|
});
|
||||||
};
|
|
||||||
|
|
||||||
use log::debug;debug!("Claude path: {}", claude_path);
|
|
||||||
|
|
||||||
// In production builds, we can't check the version directly
|
|
||||||
#[cfg(not(debug_assertions))]
|
|
||||||
{
|
|
||||||
log::warn!("Cannot check claude version in production build");
|
|
||||||
// If we found a path (either stored or in common locations), assume it's installed
|
|
||||||
if claude_path != "claude" && PathBuf::from(&claude_path).exists() {
|
|
||||||
return Ok(ClaudeVersionStatus {
|
|
||||||
is_installed: true,
|
|
||||||
version: None,
|
|
||||||
output: "Claude binary found at: ".to_string() + &claude_path,
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
return Ok(ClaudeVersionStatus {
|
|
||||||
is_installed: false,
|
|
||||||
version: None,
|
|
||||||
output: "Cannot verify Claude installation in production build. Please ensure Claude Code is installed.".to_string(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(debug_assertions)]
|
// Find the best installation (highest version or first found)
|
||||||
{
|
let best_installation = installations
|
||||||
let output = std::process::Command::new(claude_path)
|
.into_iter()
|
||||||
.arg("--version")
|
.max_by(|a, b| {
|
||||||
.output();
|
match (&a.version, &b.version) {
|
||||||
|
(Some(v1), Some(v2)) => v1.cmp(v2),
|
||||||
match output {
|
(Some(_), None) => std::cmp::Ordering::Greater,
|
||||||
Ok(output) => {
|
(None, Some(_)) => std::cmp::Ordering::Less,
|
||||||
let stdout = String::from_utf8_lossy(&output.stdout).to_string();
|
(None, None) => std::cmp::Ordering::Equal,
|
||||||
let stderr = String::from_utf8_lossy(&output.stderr).to_string();
|
|
||||||
|
|
||||||
// Use regex to directly extract version pattern (e.g., "1.0.41")
|
|
||||||
let version_regex = regex::Regex::new(r"(\d+\.\d+\.\d+(?:-[a-zA-Z0-9.-]+)?(?:\+[a-zA-Z0-9.-]+)?)").ok();
|
|
||||||
|
|
||||||
// Combine stdout and stderr for version extraction (some tools write version to stderr)
|
|
||||||
let mut version_src = stdout.clone();
|
|
||||||
if !stderr.is_empty() {
|
|
||||||
version_src.push('\n');
|
|
||||||
version_src.push_str(&stderr);
|
|
||||||
}
|
|
||||||
|
|
||||||
let version = if let Some(regex) = version_regex {
|
|
||||||
regex
|
|
||||||
.captures(&version_src)
|
|
||||||
.and_then(|captures| captures.get(1))
|
|
||||||
.map(|m| m.as_str().to_string())
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
};
|
|
||||||
|
|
||||||
let full_output = if stderr.is_empty() {
|
|
||||||
stdout.clone()
|
|
||||||
} else {
|
|
||||||
format!("{}\n{}", stdout, stderr)
|
|
||||||
};
|
|
||||||
|
|
||||||
// Check if the output matches the expected format
|
|
||||||
// Expected format: "1.0.17 (Claude Code)" or similar
|
|
||||||
let is_valid =
|
|
||||||
stdout.contains("(Claude Code)")
|
|
||||||
|| stdout.contains("Claude Code")
|
|
||||||
|| stderr.contains("(Claude Code)")
|
|
||||||
|| stderr.contains("Claude Code");
|
|
||||||
|
|
||||||
Ok(ClaudeVersionStatus {
|
|
||||||
is_installed: is_valid && output.status.success(),
|
|
||||||
version,
|
|
||||||
output: full_output.trim().to_string(),
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
Err(e) => {
|
})
|
||||||
log::error!("Failed to run claude command: {}", e);
|
.unwrap(); // Safe because we checked is_empty() above
|
||||||
Ok(ClaudeVersionStatus {
|
|
||||||
is_installed: false,
|
log::info!("Found Claude installation: {:?}", best_installation);
|
||||||
version: None,
|
|
||||||
output: format!("Command not found: {}", e),
|
Ok(ClaudeVersionStatus {
|
||||||
})
|
is_installed: true,
|
||||||
}
|
version: best_installation.version,
|
||||||
}
|
output: format!("Claude binary found at: {}", best_installation.path),
|
||||||
}
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Saves the CLAUDE.md system prompt file
|
/// Saves the CLAUDE.md system prompt file
|
||||||
|
@@ -36,78 +36,69 @@ pub struct NodeSpeedTestResult {
|
|||||||
/// 获取所有 PackyCode 节点
|
/// 获取所有 PackyCode 节点
|
||||||
pub fn get_all_nodes() -> Vec<PackycodeNode> {
|
pub fn get_all_nodes() -> Vec<PackycodeNode> {
|
||||||
vec![
|
vec![
|
||||||
// 直连节点
|
// 公交车节点 (Bus Service)
|
||||||
PackycodeNode {
|
PackycodeNode {
|
||||||
name: "直连1".to_string(),
|
name: "公交车默认节点".to_string(),
|
||||||
url: "https://api.packycode.com".to_string(),
|
url: "https://api.packycode.com".to_string(),
|
||||||
node_type: NodeType::Direct,
|
node_type: NodeType::Direct,
|
||||||
description: "默认直连节点".to_string(),
|
description: "默认公交车直连节点".to_string(),
|
||||||
response_time: None,
|
response_time: None,
|
||||||
available: None,
|
available: None,
|
||||||
},
|
},
|
||||||
PackycodeNode {
|
PackycodeNode {
|
||||||
name: "直连2 (HK-CN2)".to_string(),
|
name: "公交车 HK-CN2".to_string(),
|
||||||
url: "https://api-hk-cn2.packycode.com".to_string(),
|
url: "https://api-hk-cn2.packycode.com".to_string(),
|
||||||
node_type: NodeType::Direct,
|
node_type: NodeType::Direct,
|
||||||
description: "香港 CN2 线路".to_string(),
|
description: "香港 CN2 线路(公交车)".to_string(),
|
||||||
response_time: None,
|
response_time: None,
|
||||||
available: None,
|
available: None,
|
||||||
},
|
},
|
||||||
PackycodeNode {
|
PackycodeNode {
|
||||||
name: "直连3 (US-CMIN2)".to_string(),
|
name: "公交车 HK-G".to_string(),
|
||||||
url: "https://api-us-cmin2.packycode.com".to_string(),
|
url: "https://api-hk-g.packycode.com".to_string(),
|
||||||
node_type: NodeType::Direct,
|
node_type: NodeType::Direct,
|
||||||
description: "美国 CMIN2 线路".to_string(),
|
description: "香港 G 线路(公交车)".to_string(),
|
||||||
response_time: None,
|
response_time: None,
|
||||||
available: None,
|
available: None,
|
||||||
},
|
},
|
||||||
PackycodeNode {
|
PackycodeNode {
|
||||||
name: "直连4 (US-4837)".to_string(),
|
name: "公交车 CF-Pro".to_string(),
|
||||||
url: "https://api-us-4837.packycode.com".to_string(),
|
|
||||||
node_type: NodeType::Direct,
|
|
||||||
description: "美国 4837 线路".to_string(),
|
|
||||||
response_time: None,
|
|
||||||
available: None,
|
|
||||||
},
|
|
||||||
// 备用节点
|
|
||||||
PackycodeNode {
|
|
||||||
name: "备用1 (US-CN2)".to_string(),
|
|
||||||
url: "https://api-us-cn2.packycode.com".to_string(),
|
|
||||||
node_type: NodeType::Backup,
|
|
||||||
description: "美国 CN2 备用线路".to_string(),
|
|
||||||
response_time: None,
|
|
||||||
available: None,
|
|
||||||
},
|
|
||||||
PackycodeNode {
|
|
||||||
name: "备用2 (CF-Pro)".to_string(),
|
|
||||||
url: "https://api-cf-pro.packycode.com".to_string(),
|
url: "https://api-cf-pro.packycode.com".to_string(),
|
||||||
node_type: NodeType::Backup,
|
node_type: NodeType::Direct,
|
||||||
description: "CloudFlare Pro 备用线路".to_string(),
|
description: "CloudFlare Pro 线路(公交车)".to_string(),
|
||||||
response_time: None,
|
response_time: None,
|
||||||
available: None,
|
available: None,
|
||||||
},
|
},
|
||||||
// 紧急节点
|
// 滴滴车节点 (Taxi Service)
|
||||||
PackycodeNode {
|
PackycodeNode {
|
||||||
name: "测试节点1".to_string(),
|
name: "滴滴车默认节点".to_string(),
|
||||||
url: "https://api-test.packyme.com".to_string(),
|
url: "https://share-api.packycode.com".to_string(),
|
||||||
node_type: NodeType::Emergency,
|
node_type: NodeType::Direct,
|
||||||
description: "测试节点(非紧急情况勿用)".to_string(),
|
description: "默认滴滴车直连节点".to_string(),
|
||||||
response_time: None,
|
response_time: None,
|
||||||
available: None,
|
available: None,
|
||||||
},
|
},
|
||||||
PackycodeNode {
|
PackycodeNode {
|
||||||
name: "测试节点2".to_string(),
|
name: "滴滴车 HK-CN2".to_string(),
|
||||||
url: "https://api-test-custom.packycode.com".to_string(),
|
url: "https://share-api-hk-cn2.packycode.com".to_string(),
|
||||||
node_type: NodeType::Emergency,
|
node_type: NodeType::Direct,
|
||||||
description: "自定义测试节点(非紧急情况勿用)".to_string(),
|
description: "香港 CN2 线路(滴滴车)".to_string(),
|
||||||
response_time: None,
|
response_time: None,
|
||||||
available: None,
|
available: None,
|
||||||
},
|
},
|
||||||
PackycodeNode {
|
PackycodeNode {
|
||||||
name: "测试节点3".to_string(),
|
name: "滴滴车 HK-G".to_string(),
|
||||||
url: "https://api-tmp-test.dzz.ai".to_string(),
|
url: "https://share-api-hk-g.packycode.com".to_string(),
|
||||||
node_type: NodeType::Emergency,
|
node_type: NodeType::Direct,
|
||||||
description: "临时测试节点(非紧急情况勿用)".to_string(),
|
description: "香港 G 线路(滴滴车)".to_string(),
|
||||||
|
response_time: None,
|
||||||
|
available: None,
|
||||||
|
},
|
||||||
|
PackycodeNode {
|
||||||
|
name: "滴滴车 CF-Pro".to_string(),
|
||||||
|
url: "https://share-api-cf-pro.packycode.com".to_string(),
|
||||||
|
node_type: NodeType::Direct,
|
||||||
|
description: "CloudFlare Pro 线路(滴滴车)".to_string(),
|
||||||
response_time: None,
|
response_time: None,
|
||||||
available: None,
|
available: None,
|
||||||
},
|
},
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "Claudia",
|
"productName": "Claudia",
|
||||||
"version": "1.2.0",
|
"version": "1.2.2",
|
||||||
"identifier": "claudia.asterisk.so",
|
"identifier": "claudia.asterisk.so",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "bun run dev",
|
"beforeDevCommand": "bun run dev",
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"security": {
|
"security": {
|
||||||
"csp": "default-src 'self'; img-src 'self' asset: https://asset.localhost blob: data:; style-src 'self' 'unsafe-inline' blob: data: asset: https://asset.localhost; style-src-elem 'self' 'unsafe-inline' blob: data: asset: https://asset.localhost; style-src-attr 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval' https://app.posthog.com https://*.posthog.com https://*.i.posthog.com https://*.assets.i.posthog.com; worker-src 'self' blob: asset: https://asset.localhost; font-src 'self' data: blob: asset: https://asset.localhost; connect-src 'self' ipc: http://ipc.localhost https://ipc.localhost https://app.posthog.com https://*.posthog.com https://*.i.posthog.com https://api.packycode.com https://api-hk-cn2.packycode.com https://api-us-cmin2.packycode.com https://api-us-4837.packycode.com https://api-us-cn2.packycode.com https://api-cf-pro.packycode.com https://share-api.packycode.com https://share-api-cf-pro.packycode.com https://share-api-hk-cn2.packycode.com",
|
"csp": "default-src 'self'; img-src 'self' asset: https://asset.localhost blob: data:; style-src 'self' 'unsafe-inline' blob: data: asset: https://asset.localhost; style-src-elem 'self' 'unsafe-inline' blob: data: asset: https://asset.localhost; style-src-attr 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval' https://app.posthog.com https://*.posthog.com https://*.i.posthog.com https://*.assets.i.posthog.com; worker-src 'self' blob: asset: https://asset.localhost; font-src 'self' data: blob: asset: https://asset.localhost; connect-src 'self' ipc: http://ipc.localhost https://ipc.localhost https://app.posthog.com https://*.posthog.com https://*.i.posthog.com https://api.packycode.com https://api-hk-cn2.packycode.com https://api-hk-g.packycode.com https://api-cf-pro.packycode.com https://share-api.packycode.com https://share-api-hk-cn2.packycode.com https://share-api-hk-g.packycode.com https://share-api-cf-pro.packycode.com",
|
||||||
"assetProtocol": {
|
"assetProtocol": {
|
||||||
"enable": true,
|
"enable": true,
|
||||||
"scope": [
|
"scope": [
|
||||||
|
28
src/App.tsx
28
src/App.tsx
@@ -1,4 +1,4 @@
|
|||||||
import { useState, useEffect } from "react";
|
import { useState, useEffect, lazy, Suspense } from "react";
|
||||||
import { motion, AnimatePresence } from "framer-motion";
|
import { motion, AnimatePresence } from "framer-motion";
|
||||||
import { Plus, Loader2, ArrowLeft } from "lucide-react";
|
import { Plus, Loader2, ArrowLeft } from "lucide-react";
|
||||||
import { api, type Project, type Session, type ClaudeMdFile } from "@/lib/api";
|
import { api, type Project, type Session, type ClaudeMdFile } from "@/lib/api";
|
||||||
@@ -10,12 +10,8 @@ import { ProjectList } from "@/components/ProjectList";
|
|||||||
import { SessionList } from "@/components/SessionList";
|
import { SessionList } from "@/components/SessionList";
|
||||||
import { RunningClaudeSessions } from "@/components/RunningClaudeSessions";
|
import { RunningClaudeSessions } from "@/components/RunningClaudeSessions";
|
||||||
import { Topbar } from "@/components/Topbar";
|
import { Topbar } from "@/components/Topbar";
|
||||||
import { MarkdownEditor } from "@/components/MarkdownEditor";
|
|
||||||
import { ClaudeFileEditor } from "@/components/ClaudeFileEditor";
|
import { ClaudeFileEditor } from "@/components/ClaudeFileEditor";
|
||||||
import { Settings } from "@/components/Settings";
|
|
||||||
import { CCAgents } from "@/components/CCAgents";
|
import { CCAgents } from "@/components/CCAgents";
|
||||||
import { UsageDashboard } from "@/components/UsageDashboard";
|
|
||||||
import { MCPManager } from "@/components/MCPManager";
|
|
||||||
import { NFOCredits } from "@/components/NFOCredits";
|
import { NFOCredits } from "@/components/NFOCredits";
|
||||||
import { ClaudeBinaryDialog } from "@/components/ClaudeBinaryDialog";
|
import { ClaudeBinaryDialog } from "@/components/ClaudeBinaryDialog";
|
||||||
import { Toast, ToastContainer } from "@/components/ui/toast";
|
import { Toast, ToastContainer } from "@/components/ui/toast";
|
||||||
@@ -32,6 +28,12 @@ import RelayStationManager from "@/components/RelayStationManager";
|
|||||||
import { CcrRouterManager } from "@/components/CcrRouterManager";
|
import { CcrRouterManager } from "@/components/CcrRouterManager";
|
||||||
import i18n from "@/lib/i18n";
|
import i18n from "@/lib/i18n";
|
||||||
|
|
||||||
|
// Lazy load these components to match TabContent's dynamic imports
|
||||||
|
const MarkdownEditor = lazy(() => import('@/components/MarkdownEditor').then(m => ({ default: m.MarkdownEditor })));
|
||||||
|
const Settings = lazy(() => import('@/components/Settings').then(m => ({ default: m.Settings })));
|
||||||
|
const UsageDashboard = lazy(() => import('@/components/UsageDashboard').then(m => ({ default: m.UsageDashboard })));
|
||||||
|
const MCPManager = lazy(() => import('@/components/MCPManager').then(m => ({ default: m.MCPManager })));
|
||||||
|
|
||||||
type View =
|
type View =
|
||||||
| "welcome"
|
| "welcome"
|
||||||
| "projects"
|
| "projects"
|
||||||
@@ -299,14 +301,18 @@ function AppContent() {
|
|||||||
case "editor":
|
case "editor":
|
||||||
return (
|
return (
|
||||||
<div className="flex-1 overflow-hidden">
|
<div className="flex-1 overflow-hidden">
|
||||||
<MarkdownEditor onBack={() => handleViewChange("welcome")} />
|
<Suspense fallback={<div className="flex items-center justify-center h-full"><Loader2 className="h-6 w-6 animate-spin" /></div>}>
|
||||||
|
<MarkdownEditor onBack={() => handleViewChange("welcome")} />
|
||||||
|
</Suspense>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
||||||
case "settings":
|
case "settings":
|
||||||
return (
|
return (
|
||||||
<div className="flex-1 flex flex-col" style={{ minHeight: 0 }}>
|
<div className="flex-1 flex flex-col" style={{ minHeight: 0 }}>
|
||||||
<Settings onBack={() => handleViewChange("welcome")} />
|
<Suspense fallback={<div className="flex items-center justify-center h-full"><Loader2 className="h-6 w-6 animate-spin" /></div>}>
|
||||||
|
<Settings onBack={() => handleViewChange("welcome")} />
|
||||||
|
</Suspense>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -459,12 +465,16 @@ function AppContent() {
|
|||||||
|
|
||||||
case "usage-dashboard":
|
case "usage-dashboard":
|
||||||
return (
|
return (
|
||||||
<UsageDashboard onBack={() => handleViewChange("welcome")} />
|
<Suspense fallback={<div className="flex items-center justify-center h-full"><Loader2 className="h-6 w-6 animate-spin" /></div>}>
|
||||||
|
<UsageDashboard onBack={() => handleViewChange("welcome")} />
|
||||||
|
</Suspense>
|
||||||
);
|
);
|
||||||
|
|
||||||
case "mcp":
|
case "mcp":
|
||||||
return (
|
return (
|
||||||
<MCPManager onBack={() => handleViewChange("welcome")} />
|
<Suspense fallback={<div className="flex items-center justify-center h-full"><Loader2 className="h-6 w-6 animate-spin" /></div>}>
|
||||||
|
<MCPManager onBack={() => handleViewChange("welcome")} />
|
||||||
|
</Suspense>
|
||||||
);
|
);
|
||||||
|
|
||||||
case "project-settings":
|
case "project-settings":
|
||||||
|
@@ -1140,12 +1140,10 @@ const CreateStationDialog: React.FC<{
|
|||||||
if (packycodeService === 'bus') {
|
if (packycodeService === 'bus') {
|
||||||
// 公交车自动选择
|
// 公交车自动选择
|
||||||
const busNodes = [
|
const busNodes = [
|
||||||
{ url: "https://api.packycode.com", name: "🚌 直连1(默认公交车)" },
|
{ url: "https://api.packycode.com", name: "🚌 公交车默认节点" },
|
||||||
{ url: "https://api-hk-cn2.packycode.com", name: "🇭🇰 直连2 (HK-CN2)" },
|
{ url: "https://api-hk-cn2.packycode.com", name: "🇭🇰 公交车 HK-CN2" },
|
||||||
{ url: "https://api-us-cmin2.packycode.com", name: "🇺🇸 直连3 (US-CMIN2)" },
|
{ url: "https://api-hk-g.packycode.com", name: "🇭🇰 公交车 HK-G" },
|
||||||
{ url: "https://api-us-4837.packycode.com", name: "🇺🇸 直连4 (US-4837)" },
|
{ url: "https://api-cf-pro.packycode.com", name: "☁️ 公交车 CF-Pro" }
|
||||||
{ url: "https://api-us-cn2.packycode.com", name: "🔄 备用1 (US-CN2)" },
|
|
||||||
{ url: "https://api-cf-pro.packycode.com", name: "☁️ 备用2 (CF-Pro)" }
|
|
||||||
];
|
];
|
||||||
|
|
||||||
await performSpeedTest(busNodes, (bestNode) => {
|
await performSpeedTest(busNodes, (bestNode) => {
|
||||||
@@ -1155,9 +1153,10 @@ const CreateStationDialog: React.FC<{
|
|||||||
} else if (packycodeService === 'taxi') {
|
} else if (packycodeService === 'taxi') {
|
||||||
// 滴滴车自动选择
|
// 滴滴车自动选择
|
||||||
const taxiNodes = [
|
const taxiNodes = [
|
||||||
{ url: "https://share-api.packycode.com", name: "🚗 直连1(默认滴滴车)" },
|
{ url: "https://share-api.packycode.com", name: "🚗 滴滴车默认节点" },
|
||||||
{ url: "https://share-api-cf-pro.packycode.com", name: "☁️ 备用1 (CF-Pro)" },
|
{ url: "https://share-api-hk-cn2.packycode.com", name: "🇭🇰 滴滴车 HK-CN2" },
|
||||||
{ url: "https://share-api-hk-cn2.packycode.com", name: "🇭🇰 备用2 (HK-CN2)" }
|
{ url: "https://share-api-hk-g.packycode.com", name: "🇭🇰 滴滴车 HK-G" },
|
||||||
|
{ url: "https://share-api-cf-pro.packycode.com", name: "☁️ 滴滴车 CF-Pro" }
|
||||||
];
|
];
|
||||||
|
|
||||||
await performSpeedTest(taxiNodes, (bestNode) => {
|
await performSpeedTest(taxiNodes, (bestNode) => {
|
||||||
@@ -1421,31 +1420,16 @@ const CreateStationDialog: React.FC<{
|
|||||||
</SelectTrigger>
|
</SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
<SelectItem value="https://api.packycode.com">
|
<SelectItem value="https://api.packycode.com">
|
||||||
🚌 直连1(默认公交车)
|
🚌 公交车默认节点
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
<SelectItem value="https://api-hk-cn2.packycode.com">
|
<SelectItem value="https://api-hk-cn2.packycode.com">
|
||||||
🇭🇰 直连2 (HK-CN2)
|
🇭🇰 公交车 HK-CN2
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
<SelectItem value="https://api-us-cmin2.packycode.com">
|
<SelectItem value="https://api-hk-g.packycode.com">
|
||||||
🇺🇸 直连3 (US-CMIN2)
|
🇭🇰 公交车 HK-G
|
||||||
</SelectItem>
|
|
||||||
<SelectItem value="https://api-us-4837.packycode.com">
|
|
||||||
🇺🇸 直连4 (US-4837)
|
|
||||||
</SelectItem>
|
|
||||||
<SelectItem value="https://api-us-cn2.packycode.com">
|
|
||||||
🔄 备用1 (US-CN2)
|
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
<SelectItem value="https://api-cf-pro.packycode.com">
|
<SelectItem value="https://api-cf-pro.packycode.com">
|
||||||
☁️ 备用2 (CF-Pro)
|
☁️ 公交车 CF-Pro
|
||||||
</SelectItem>
|
|
||||||
<SelectItem value="https://api-test.packyme.com" disabled>
|
|
||||||
⚠️ 测试1(非紧急勿用)
|
|
||||||
</SelectItem>
|
|
||||||
<SelectItem value="https://api-test-custom.packycode.com" disabled>
|
|
||||||
⚠️ 测试2(非紧急勿用)
|
|
||||||
</SelectItem>
|
|
||||||
<SelectItem value="https://api-tmp-test.dzz.ai" disabled>
|
|
||||||
⚠️ 测试3(非紧急勿用)
|
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
@@ -1455,12 +1439,10 @@ const CreateStationDialog: React.FC<{
|
|||||||
variant="outline"
|
variant="outline"
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
const busNodes = [
|
const busNodes = [
|
||||||
{ url: "https://api.packycode.com", name: "🚌 直连1(默认公交车)" },
|
{ url: "https://api.packycode.com", name: "🚌 公交车默认节点" },
|
||||||
{ url: "https://api-hk-cn2.packycode.com", name: "🇭🇰 直连2 (HK-CN2)" },
|
{ url: "https://api-hk-cn2.packycode.com", name: "🇭🇰 公交车 HK-CN2" },
|
||||||
{ url: "https://api-us-cmin2.packycode.com", name: "🇺🇸 直连3 (US-CMIN2)" },
|
{ url: "https://api-hk-g.packycode.com", name: "🇭🇰 公交车 HK-G" },
|
||||||
{ url: "https://api-us-4837.packycode.com", name: "🇺🇸 直连4 (US-4837)" },
|
{ url: "https://api-cf-pro.packycode.com", name: "☁️ 公交车 CF-Pro" }
|
||||||
{ url: "https://api-us-cn2.packycode.com", name: "🔄 备用1 (US-CN2)" },
|
|
||||||
{ url: "https://api-cf-pro.packycode.com", name: "☁️ 备用2 (CF-Pro)" }
|
|
||||||
];
|
];
|
||||||
|
|
||||||
await performSpeedTest(busNodes, (bestNode) => {
|
await performSpeedTest(busNodes, (bestNode) => {
|
||||||
@@ -1497,13 +1479,16 @@ const CreateStationDialog: React.FC<{
|
|||||||
</SelectTrigger>
|
</SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
<SelectItem value="https://share-api.packycode.com">
|
<SelectItem value="https://share-api.packycode.com">
|
||||||
🚗 直连1(默认滴滴车)
|
🚗 滴滴车默认节点
|
||||||
</SelectItem>
|
|
||||||
<SelectItem value="https://share-api-cf-pro.packycode.com">
|
|
||||||
☁️ 备用1 (CF-Pro)
|
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
<SelectItem value="https://share-api-hk-cn2.packycode.com">
|
<SelectItem value="https://share-api-hk-cn2.packycode.com">
|
||||||
🇭🇰 备用2 (HK-CN2)
|
🇭🇰 滴滴车 HK-CN2
|
||||||
|
</SelectItem>
|
||||||
|
<SelectItem value="https://share-api-hk-g.packycode.com">
|
||||||
|
🇭🇰 滴滴车 HK-G
|
||||||
|
</SelectItem>
|
||||||
|
<SelectItem value="https://share-api-cf-pro.packycode.com">
|
||||||
|
☁️ 滴滴车 CF-Pro
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
@@ -1513,9 +1498,10 @@ const CreateStationDialog: React.FC<{
|
|||||||
variant="outline"
|
variant="outline"
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
const taxiNodes = [
|
const taxiNodes = [
|
||||||
{ url: "https://share-api.packycode.com", name: "🚗 直连1(默认滴滴车)" },
|
{ url: "https://share-api.packycode.com", name: "🚗 滴滴车默认节点" },
|
||||||
{ url: "https://share-api-cf-pro.packycode.com", name: "☁️ 备用1 (CF-Pro)" },
|
{ url: "https://share-api-hk-cn2.packycode.com", name: "🇭🇰 滴滴车 HK-CN2" },
|
||||||
{ url: "https://share-api-hk-cn2.packycode.com", name: "🇭🇰 备用2 (HK-CN2)" }
|
{ url: "https://share-api-hk-g.packycode.com", name: "🇭🇰 滴滴车 HK-G" },
|
||||||
|
{ url: "https://share-api-cf-pro.packycode.com", name: "☁️ 滴滴车 CF-Pro" }
|
||||||
];
|
];
|
||||||
|
|
||||||
await performSpeedTest(taxiNodes, (bestNode) => {
|
await performSpeedTest(taxiNodes, (bestNode) => {
|
||||||
@@ -1924,12 +1910,10 @@ const EditStationDialog: React.FC<{
|
|||||||
if (packycodeService === 'bus') {
|
if (packycodeService === 'bus') {
|
||||||
// 公交车自动选择
|
// 公交车自动选择
|
||||||
const busNodes = [
|
const busNodes = [
|
||||||
{ url: "https://api.packycode.com", name: "🚌 直连1(默认公交车)" },
|
{ url: "https://api.packycode.com", name: "🚌 公交车默认节点" },
|
||||||
{ url: "https://api-hk-cn2.packycode.com", name: "🇭🇰 直连2 (HK-CN2)" },
|
{ url: "https://api-hk-cn2.packycode.com", name: "🇭🇰 公交车 HK-CN2" },
|
||||||
{ url: "https://api-us-cmin2.packycode.com", name: "🇺🇸 直连3 (US-CMIN2)" },
|
{ url: "https://api-hk-g.packycode.com", name: "🇭🇰 公交车 HK-G" },
|
||||||
{ url: "https://api-us-4837.packycode.com", name: "🇺🇸 直连4 (US-4837)" },
|
{ url: "https://api-cf-pro.packycode.com", name: "☁️ 公交车 CF-Pro" }
|
||||||
{ url: "https://api-us-cn2.packycode.com", name: "🔄 备用1 (US-CN2)" },
|
|
||||||
{ url: "https://api-cf-pro.packycode.com", name: "☁️ 备用2 (CF-Pro)" }
|
|
||||||
];
|
];
|
||||||
|
|
||||||
await new Promise<void>((resolve) => {
|
await new Promise<void>((resolve) => {
|
||||||
@@ -1991,9 +1975,10 @@ const EditStationDialog: React.FC<{
|
|||||||
} else if (packycodeService === 'taxi') {
|
} else if (packycodeService === 'taxi') {
|
||||||
// 滴滴车自动选择
|
// 滴滴车自动选择
|
||||||
const taxiNodes = [
|
const taxiNodes = [
|
||||||
{ url: "https://share-api.packycode.com", name: "🚗 直连1(默认滴滴车)" },
|
{ url: "https://share-api.packycode.com", name: "🚗 滴滴车默认节点" },
|
||||||
{ url: "https://share-api-cf-pro.packycode.com", name: "☁️ 备用1 (CF-Pro)" },
|
{ url: "https://share-api-hk-cn2.packycode.com", name: "🇭🇰 滴滴车 HK-CN2" },
|
||||||
{ url: "https://share-api-hk-cn2.packycode.com", name: "🇭🇰 备用2 (HK-CN2)" }
|
{ url: "https://share-api-hk-g.packycode.com", name: "🇭🇰 滴滴车 HK-G" },
|
||||||
|
{ url: "https://share-api-cf-pro.packycode.com", name: "☁️ 滴滴车 CF-Pro" }
|
||||||
];
|
];
|
||||||
|
|
||||||
await new Promise<void>((resolve) => {
|
await new Promise<void>((resolve) => {
|
||||||
@@ -2335,12 +2320,10 @@ const EditStationDialog: React.FC<{
|
|||||||
variant="outline"
|
variant="outline"
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
const busNodes = [
|
const busNodes = [
|
||||||
{ url: "https://api.packycode.com", name: "🚌 直连1(默认公交车)" },
|
{ url: "https://api.packycode.com", name: "🚌 公交车默认节点" },
|
||||||
{ url: "https://api-hk-cn2.packycode.com", name: "🇭🇰 直连2 (HK-CN2)" },
|
{ url: "https://api-hk-cn2.packycode.com", name: "🇭🇰 公交车 HK-CN2" },
|
||||||
{ url: "https://api-us-cmin2.packycode.com", name: "🇺🇸 直连3 (US-CMIN2)" },
|
{ url: "https://api-hk-g.packycode.com", name: "🇭🇰 公交车 HK-G" },
|
||||||
{ url: "https://api-us-4837.packycode.com", name: "🇺🇸 直连4 (US-4837)" },
|
{ url: "https://api-cf-pro.packycode.com", name: "☁️ 公交车 CF-Pro" }
|
||||||
{ url: "https://api-us-cn2.packycode.com", name: "🔄 备用1 (US-CN2)" },
|
|
||||||
{ url: "https://api-cf-pro.packycode.com", name: "☁️ 备用2 (CF-Pro)" }
|
|
||||||
];
|
];
|
||||||
|
|
||||||
await performSpeedTest(busNodes, (bestNode) => {
|
await performSpeedTest(busNodes, (bestNode) => {
|
||||||
@@ -2377,13 +2360,16 @@ const EditStationDialog: React.FC<{
|
|||||||
</SelectTrigger>
|
</SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
<SelectItem value="https://share-api.packycode.com">
|
<SelectItem value="https://share-api.packycode.com">
|
||||||
🚗 直连1(默认滴滴车)
|
🚗 滴滴车默认节点
|
||||||
</SelectItem>
|
|
||||||
<SelectItem value="https://share-api-cf-pro.packycode.com">
|
|
||||||
☁️ 备用1 (CF-Pro)
|
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
<SelectItem value="https://share-api-hk-cn2.packycode.com">
|
<SelectItem value="https://share-api-hk-cn2.packycode.com">
|
||||||
🇭🇰 备用2 (HK-CN2)
|
🇭🇰 滴滴车 HK-CN2
|
||||||
|
</SelectItem>
|
||||||
|
<SelectItem value="https://share-api-hk-g.packycode.com">
|
||||||
|
🇭🇰 滴滴车 HK-G
|
||||||
|
</SelectItem>
|
||||||
|
<SelectItem value="https://share-api-cf-pro.packycode.com">
|
||||||
|
☁️ 滴滴车 CF-Pro
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
@@ -2393,9 +2379,10 @@ const EditStationDialog: React.FC<{
|
|||||||
variant="outline"
|
variant="outline"
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
const taxiNodes = [
|
const taxiNodes = [
|
||||||
{ url: "https://share-api.packycode.com", name: "🚗 直连1(默认滴滴车)" },
|
{ url: "https://share-api.packycode.com", name: "🚗 滴滴车默认节点" },
|
||||||
{ url: "https://share-api-cf-pro.packycode.com", name: "☁️ 备用1 (CF-Pro)" },
|
{ url: "https://share-api-hk-cn2.packycode.com", name: "🇭🇰 滴滴车 HK-CN2" },
|
||||||
{ url: "https://share-api-hk-cn2.packycode.com", name: "🇭🇰 备用2 (HK-CN2)" }
|
{ url: "https://share-api-hk-g.packycode.com", name: "🇭🇰 滴滴车 HK-G" },
|
||||||
|
{ url: "https://share-api-cf-pro.packycode.com", name: "☁️ 滴滴车 CF-Pro" }
|
||||||
];
|
];
|
||||||
|
|
||||||
// 复制 performSpeedTest 逻辑,因为它在这个作用域中不可用
|
// 复制 performSpeedTest 逻辑,因为它在这个作用域中不可用
|
||||||
|
Reference in New Issue
Block a user