Commit Graph

1571 Commits

Author SHA1 Message Date
shaw
aa66d89021 fix: 修复gemini转发的部分bug 2025-10-17 20:15:50 +08:00
shaw
05f4454c10 feat: apikey显示最后调度的账号 2025-10-17 19:44:40 +08:00
shaw
e3a2d33428 chore: 移除codex-pr-review 2025-10-17 16:32:47 +08:00
shaw
484689e479 Merge branch 'dev' of github.com:Wei-Shaw/claude-relay-service into dev 2025-10-17 16:32:11 +08:00
Wesley Liddick
3e381ea211 Merge pull request #589 from sususu98/dev
feat: 新增Claude Console账户错误消息清理和临时封禁
2025-10-17 16:31:51 +08:00
shaw
5cff6fdd6d Merge branch 'new' into dev 2025-10-17 16:26:37 +08:00
shaw
ad9a65d3c9 chore: 移除codex-pr-review 2025-10-17 16:20:33 +08:00
shaw
9ed4a344be fix: 修复gemini转发问题 2025-10-17 16:11:12 +08:00
sususu
77bca73094 fix: 优化验证器代码格式,提升可读性 2025-10-17 15:30:05 +08:00
sususu
b0917b75a4 feat: 新增Claude Console账户临时封禁处理和错误消息清理
- 新增 CLAUDE_CONSOLE_BLOCKED_HANDLING_MINUTES 配置项,自动处理账户临时禁用的 400 错误(如 "organization has been disabled"、"too many active sessions" 等)。
  - 添加 errorSanitizer 工具模块,自动清理上游错误响应中的供应商特定信息(URL、供应商名称等),避免泄露中转服务商信息。
  - 统一调度器现在会主动检查并恢复已过期的封禁账户,确保账户在临时封禁时长结束后可以立即重新使用。
2025-10-17 15:27:47 +08:00
AAEE86
8f58fe6264 feat: 账号使用趋势增加对Droid账户的支持 2025-10-16 23:01:06 +08:00
shaw
28b709d30b fix: 改为pull_request_target 2025-10-16 21:20:14 +08:00
shaw
cad285e8af fix: 修复codex-pr-review.yml格式 2025-10-16 20:27:30 +08:00
shaw
b5efb23a5e fix: codex-pr-review增加秘钥校验 2025-10-16 19:32:50 +08:00
shaw
c3e9082367 Merge branch 'main' of github.com:Wei-Shaw/claude-relay-service 2025-10-16 15:56:59 +08:00
shaw
be67af6340 fix: 调整为Wei-Shaw/codex-action@crs 2025-10-16 15:56:17 +08:00
github-actions[bot]
c9d4ee1cf5 chore: sync VERSION file with release v1.1.179 [skip ci] 2025-10-16 07:36:19 +00:00
shaw
f6eb077d82 fix: 优化pricing服务关停逻辑,确保定时器在清理阶段正确释放 2025-10-16 15:35:40 +08:00
shaw
83f7353284 fix: 修复console脏数据问题 2025-10-16 15:29:45 +08:00
shaw
86cecaa356 chore: PR review增加reopened、synchronize 2025-10-16 15:09:09 +08:00
github-actions[bot]
2ac088fd3a chore: sync VERSION file with release v1.1.178 [skip ci] 2025-10-16 06:48:54 +00:00
shaw
994e474155 fix: 修复批量编辑apikey模式无法选择oai账号 2025-10-16 14:48:15 +08:00
shaw
4b011fe8b1 chore: 添加 Codex PR 审计工作流 2025-10-16 14:32:27 +08:00
shaw
2f0839c7da feat: 合并 PR #578 并接入统一定价服务 2025-10-16 14:12:25 +08:00
AAEE86
d3cf66e2c0 Update AccountsView.vue
移除 overflow-x: auto
2025-10-16 11:13:23 +08:00
github-actions[bot]
6c0f38f5e8 chore: sync VERSION file with release v1.1.177 [skip ci] 2025-10-16 02:47:50 +00:00
shaw
d606cb2e38 fix: 优化模型价格文件更新策略 2025-10-16 10:46:45 +08:00
liangjie.wanglj
b9d2e855f3 claude console类型中增加claude-haiku-4-5-20251001、GLM、Kimi、Qwen模型支持;增加计费消息通知;Claude console 及 ccr模型匹配大小写不敏感 2025-10-16 09:53:42 +08:00
shaw
d275b0d4b6 Merge branch 'new' into dev 2025-10-16 09:41:14 +08:00
shaw
0092c92196 Merge branch 'docs/update-claude-md-comprehensive' into dev 2025-10-16 09:40:24 +08:00
AAEE86
914c1b6120 Merge branch 'main' into new 2025-10-15 23:38:18 +08:00
github-actions[bot]
3cb674279a chore: sync VERSION file with release v1.1.176 [skip ci] 2025-10-15 12:49:09 +00:00
shaw
472fb535cf Merge branch 'bottotl/main' into dev 2025-10-15 19:27:13 +08:00
shaw
77124aa501 fix: droid去掉count_tokens端点 2025-10-15 15:50:04 +08:00
AAEE86
8ab3c76c6f feat: 新增 API Key 筛选和搜索功能
- 筛选key,新增支持筛选正常和异常状态的key
- 搜索key,新增支持模糊/精确搜索key
- 删除key,新增支持一键删除所有异常状态的key或者删除所有key
- 导出key,新增支持一键导出所有异常状态的key或者导出所有key
2025-10-15 15:35:59 +08:00
shaw
c2669da4b3 fix: 更新factory user-agent 2025-10-15 15:26:58 +08:00
shaw
d72897f835 fix: droid转发增加runtimeAddon调试插件 2025-10-15 15:17:20 +08:00
litongtongxue
1bd9002af9 docs: 全面更新 CLAUDE.md 文档以反映最新代码实现
## 更新概要

本次更新全面审查了代码库,将严重过期的 CLAUDE.md 文档更新到与当前实现一致。

## 主要更新内容

### 1. 项目概述和架构
- 更新为多平台支持(8种账户类型)
- 添加统一调度系统说明
- 补充权限控制、客户端限制、模型黑名单等新功能

### 2. 服务组件
- 从5个服务扩展到30+个服务的完整列表
- 新增核心转发服务(8个)
- 新增账户管理服务(10个)
- 新增统一调度器(4个)
- 新增核心功能服务(用户管理、定价、Webhook、LDAP等)

### 3. 环境变量配置
- 新增20+个重要环境变量说明
- 添加AWS Bedrock配置
- 添加用户管理、LDAP、Webhook配置说明

### 4. API端点
- 更新为多路由支持(Claude、Gemini、OpenAI、Droid、Azure)
- 新增用户管理端点
- 新增Webhook管理端点
- 新增系统指标端点

### 5. Redis数据结构
- 扩展为8种账户类型的数据结构
- 添加用户管理、粘性会话、并发控制相关键
- 添加成本统计、Webhook配置相关键

### 6. 故障排除
- 从4个问题扩展到13个常见问题
- 新增粘性会话、LDAP、Webhook、调度器等问题解决方案

### 7. CLI工具
- 添加数据导入导出命令
- 添加数据迁移和修复命令
- 添加成本初始化和定价更新命令

### 8. 新增功能概览章节
- 列出相比旧版本的所有新增功能
- 包括多平台支持、用户权限系统、统一调度、成本监控等

## 技术细节

- 保持所有现有章节结构
- 使用 Prettier 格式化确保代码风格一致
- 基于实际代码审查(src/services/、src/routes/、config/等)
- 确保所有端点、配置项、数据结构与代码实现一致

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-15 01:03:57 +08:00
jft0m
6bb74376ca fix: add /openai/v1/chat/completions route support
- Register unifiedRoutes under /openai prefix to enable /openai/v1/chat/completions
- Reuse existing intelligent routing logic from unified.js (no code duplication)
- Keep existing Codex API routes (/openai/responses, /openai/v1/responses) unchanged

Benefits:
- Fixes 404 error for /openai/v1/chat/completions endpoint
- Provides consistent API experience across /api and /openai prefixes
- Automatically routes to correct backend (Claude/OpenAI/Gemini) based on model

Tested:
-  /openai/v1/chat/completions now returns authentication error (route works)
-  /api/v1/chat/completions continues to work
-  Existing Codex routes remain functional

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-14 16:17:12 +00:00
jft0m
b886012f97 Merge branch 'Wei-Shaw:main' into main 2025-10-14 22:39:30 +08:00
jft0m
344599f318 refactor: extract intelligent routing to unified.js
- Created new src/routes/unified.js (225 lines)
  - detectBackendFromModel(): Detects backend from model name
  - routeToBackend(): Routes to Claude/OpenAI/Gemini with permission checks
  - POST /v1/chat/completions: OpenAI-compatible endpoint with intelligent routing
  - POST /v1/completions: Legacy completions endpoint with intelligent routing

- Updated src/routes/api.js (reduced from 1185 to 968 lines)
  - Removed ~217 lines of routing logic
  - Kept Claude-specific endpoints (/api/v1/messages)
  - Maintained all other Claude API functionality

- Updated src/app.js
  - Added unifiedRoutes registration at /api prefix

Benefits:
- Single responsibility: api.js focuses on Claude API routes
- Better organization: routing logic isolated in unified.js
- Easier maintenance: changes to routing won't affect Claude code
- File size reduction: api.js reduced by 18%

Tested:
-  Claude model routing via /v1/chat/completions
-  OpenAI model routing (correct backend detection)
-  Gemini model routing (correct backend detection)
-  Legacy /v1/completions endpoint
-  All tests pass, no regressions

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-14 14:30:23 +00:00
jft0m
e540ec3a52 feat: add intelligent backend routing and model service
- Add modelService for centralized model management
  - Support dynamic model list from config file (data/supported_models.json)
  - Include 2025 latest models: GPT-4.1, o3, o4-mini, Gemini 2.5, etc.
  - File watcher for hot-reload configuration changes

- Improve model detection logic in api.js
  - Priority: modelService lookup → prefix matching fallback
  - Smart backend routing based on model provider

- Add intelligent routing endpoints
  - /v1/chat/completions: unified OpenAI-compatible endpoint
  - /v1/completions: legacy format support
  - Auto-route to Claude/OpenAI/Gemini based on requested model

- Add Xcode system prompt support in openaiToClaude
  - Detect and preserve Xcode-specific system messages

- Export handler functions for reuse
  - openaiClaudeRoutes: export handleChatCompletion
  - openaiRoutes: export handleResponses

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-14 14:12:44 +00:00
shaw
92712277db feat: droid的apikey页面增加一键复制全部 2025-10-14 20:44:14 +08:00
shaw
62aea5a4a8 fix: 修复tokenExpiresAt混淆问题 2025-10-14 19:19:33 +08:00
shaw
6c60478777 Merge branch 'feature/account-subscription-expiry-check' into dev 2025-10-14 17:47:37 +08:00
mrlitong
aaa2bda407 fix: 修复账户过期时间字段映射问题
## 问题描述
移除 formatSubscriptionExpiry 函数后,API返回的 expiresAt 字段变成了OAuth token过期时间(通常1小时)
而不是订阅过期时间,导致前端显示错误的过期时间,并可能将短期token过期时间错误保存为订阅过期时间。

## 修复方案
1. 添加 formatAccountExpiry 函数,正确映射字段:
   - expiresAt: 映射为 subscriptionExpiresAt(订阅过期时间)供前端使用
   - tokenExpiresAt: 保留OAuth token过期时间供内部使用

2. 在所有账户端点应用格式化:
   - 所有账户类型的GET端点(Claude, Claude Console, CCR, Bedrock, Gemini, OpenAI等)
   - 所有账户类型的POST创建端点
   - 错误处理分支也正确格式化

## 影响范围
- 修复了9种账户类型的所有相关端点
- 共应用了28处格式化调用
- 确保前端获取正确的订阅过期时间,而非token过期时间

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-14 09:26:56 +00:00
mrlitong
82433c3b8d chore: 移除代码评审报告文件
移除项目中的代码评审报告文件,此类文档不应纳入代码库管理。

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-14 08:58:33 +00:00
mrlitong
1f61478fbc refactor: 优化账户过期检查逻辑和代码一致性
## 主要改进

### 1. 添加缺失的过期检查方法
- 在 `claudeConsoleAccountService` 中添加 `isSubscriptionExpired()` 方法
- 在 `ccrAccountService` 中添加 `isSubscriptionExpired()` 方法
- 与其他 7 个账户服务保持一致的实现方式

### 2. 统一过期检查逻辑
- 重构 `unifiedClaudeScheduler` 中的 5 处手动日期检查代码
- 统一调用服务层的 `isSubscriptionExpired()` 方法
- 消除重复代码,提升可维护性

### 3. 统一字段映射顺序
- 调整 Claude 账户更新端点的 `mapExpiryField()` 调用时机
- 与其他账户类型保持一致的处理顺序
- 提升代码可读性和一致性

## 技术细节

**修改文件**:
- `src/services/claudeConsoleAccountService.js`: 添加 `isSubscriptionExpired()`
- `src/services/ccrAccountService.js`: 添加 `isSubscriptionExpired()`
- `src/services/unifiedClaudeScheduler.js`: 5 处调用统一为服务方法
- `src/routes/admin.js`: 统一字段映射顺序

**改进效果**:
-  代码一致性提升:所有账户服务统一实现
-  可维护性提升:过期逻辑集中管理
-  减少重复代码:消除 4 处重复实现

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-14 08:35:13 +00:00
mrlitong
cd5df4f76b Merge remote-tracking branch 'upstream/main' into feature/account-subscription-expiry-check 2025-10-14 08:04:12 +00:00
mrlitong
cbc3a83f11 refactor: 统一账户过期时间字段映射和检查逻辑
主要改进:
1. 创建 mapExpiryField() 工具函数统一处理前后端字段映射(expiresAt -> subscriptionExpiresAt)
2. 统一 subscriptionExpiresAt 初始值为 null(替代空字符串)
3. 规范过期检查方法名为 isSubscriptionExpired(),返回 true 表示已过期
4. 优化过期检查条件判断,只检查 null 而非空字符串
5. 补充 OpenAI-Responses 和调度器中缺失的过期检查逻辑
6. 添加代码评审文档记录未修复问题

影响范围:
- 所有 9 种账户服务的过期字段处理
- admin.js 中所有账户更新路由
- 统一调度器的过期账户过滤逻辑

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-14 08:04:05 +00:00