opensource/sub2api
3
0
Fork 0
mirror of https://github.com/Wei-Shaw/sub2api.git synced 2026-09-24 16:05:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,926 Commits 38 Branches 54 Tags
151ea48b8704eb9d697dd4e4678bf8cfbd9f2a64
Commit Graph
2926 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
erio 151ea48b87 Merge remote-tracking branch 'origin/feature/channel' into release/custom-0.1.105 
# Conflicts:
#	backend/internal/handler/admin/channel_handler.go
 2026-03-30 02:38:18 +08:00
erio e2f0df78ce feat(channel): 模型映射 + 分组搜索 + 卡片折叠 + 冲突校验 
- 渠道模型映射：新增 model_mapping JSONB 字段，在账号映射之前执行
- 分组选择：添加搜索过滤 + 平台图标
- 定价卡片：支持折叠/展开，已有数据默认折叠
- 模型冲突校验：前后端均禁止同一渠道内重复模型
- 迁移 083: channels 表添加 model_mapping 列
 2026-03-30 02:36:04 +08:00
erio 6fa385255d chore: bump version to 0.1.105.4 2026-03-30 02:25:23 +08:00
erio 755bf44e4d Merge remote-tracking branch 'origin/feature/channel' into release/custom-0.1.105 2026-03-30 02:25:12 +08:00
erio e4814e4c77 feat(channel): 模型标签输入 + $/MTok 价格单位 + 左开右闭区间 + i18n 
- 模型输入改为标签列表（输入回车添加，支持粘贴批量导入）
- 价格显示单位改为 $/MTok（每百万 token），提交时自动转换
- Token 模式增加图片输出价格字段（适配 Gemini 图片模型按 token 计费）
- 区间边界改为左开右闭 (min, max]，右边界包含
- 默认价格作为未命中区间时的回退价格
- 添加完整中英文 i18n 翻译
 2026-03-30 02:24:54 +08:00
erio e87ed88090 chore: bump version to 0.1.105.3 2026-03-30 02:14:30 +08:00
erio 4b48dd02be fix: CI lint/test fixes — gofmt, errcheck, handler test args 2026-03-30 02:14:30 +08:00
erio 3fd0361542 chore: bump version to 0.1.105.2 2026-03-30 02:06:07 +08:00
erio 9e9285c25a Merge remote-tracking branch 'origin/feature/channel' into release/custom-0.1.105 
# Conflicts:
#	backend/cmd/server/wire_gen.go
#	backend/internal/handler/handler.go
#	backend/internal/handler/wire.go
 2026-03-30 02:05:59 +08:00
erio a9117600a5 feat(channel): 渠道管理系统 — 多模式定价 + 统一计费解析 
新增渠道管理功能，支持三种计费模式（Token 区间/按次/图片），
统一定价解析链（Channel → LiteLLM → Fallback），
无渠道配置时保持原有计费逻辑不变。

Backend:
- 新增 channels/channel_groups/channel_model_pricing/channel_pricing_intervals 表
- ChannelService: atomic.Value + singleflight 缓存，通配符模型匹配
- ModelPricingResolver: 统一定价解析器
- BillingService: CalculateCostUnified 统一计费入口
- 完整输入验证（BillingMode/价格非负/名称长度）
- 33 个单元测试覆盖核心路径

Frontend:
- ChannelsView.vue: 渠道 CRUD 列表页
- PricingEntryCard.vue + IntervalRow.vue: 定价编辑组件
- 支持三种计费模式切换 + 区间编辑
 2026-03-30 02:03:06 +08:00
erio 0393981397 merge: integrate upstream v0.1.105 into release/custom-0.1.105 
Merge upstream v0.1.105 (94 commits) with our customizations from
release/custom-0.1.104. Key upstream additions:
- TLS fingerprint profile management
- OpenAI→Anthropic endpoint compatibility routing
- Privacy mode for OpenAI/Antigravity accounts
- Requested model tracking in usage logs
- Error observability enhancements
- Various bug fixes

Conflict resolutions (all "keep both sides"):
- handler.go/wire.go: added both TLSFingerprintProfile and GDriveOAuth
- wire_gen.go: combined internal500CounterCache with TLS fingerprint objects
- accounts.ts: kept setPrivacy + affinity functions
- BulkEditAccountModal.vue: kept OpenAI WS mode + Allow Overages sections

Additional fixes:
- gateway_handler_chat_completions.go, gateway_handler_responses.go:
  added missing sub2apiUserID parameter to SelectAccountWithLoadAwareness
- antigravity_internal500_penalty.go: gofmt fix
 2026-03-27 18:23:39 +08:00
Wesley Liddick 9398ea7af5 Merge pull request #1340 from DaydreamCoding/fix/privacy-and-system-prompt 
fix(openai): OpenAI 隐私模式全场景覆盖 & 修复转发路径 system prompt 丢失
 2026-03-27 15:03:57 +08:00
Wesley Liddick 29dce1a59c Merge pull request #1266 from eltociear/add-ja-doc 
docs: add Japanese README
 2026-03-27 14:51:37 +08:00
QTomandClaude Opus 4.6 c729ee425f fix(gateway): 修复 OpenAI→Anthropic 转换路径 system prompt 被静默丢弃的 bug 
injectClaudeCodePrompt 和 systemIncludesClaudeCodePrompt 的 type switch
无法匹配 json.RawMessage 类型（Go typed nil 陷阱），导致 ForwardAsResponses
和 ForwardAsChatCompletions 路径中用户 system prompt 被替换为仅 Claude Code
banner。新增 normalizeSystemParam 将 json.RawMessage 转为标准 Go 类型。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 14:51:36 +08:00
QTomandClaude Opus 4.6 c489f23810 feat(privacy): 创建/批量创建 OpenAI OAuth 账号时异步设置隐私模式 
参照 Antigravity 的模式，单个创建时同步调用 ForceOpenAIPrivacy，
批量创建时收集 OpenAI OAuth 账号后异步 goroutine 设置，避免阻塞请求。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 14:51:36 +08:00
QTomandClaude Opus 4.6 47a544230a fix(privacy): 刷新令牌失败时也尝试设置 OpenAI 隐私模式 
刷新失败不代表 access_token 无效，在后台定时刷新（不可重试错误 +
重试耗尽）和前端批量/单次刷新的失败路径中，均利用可能仍有效的
access_token 调用隐私设置。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 14:51:36 +08:00
QTomandClaude Opus 4.6 c13c81f09d feat(privacy): 为 OpenAI OAuth 账号添加前端手动设置隐私按钮 
复用已有的 set-privacy API 端点，Handler 通过 platform 分发到
ForceOpenAIPrivacy / ForceAntigravityPrivacy，前端 AccountActionMenu
扩展隐私按钮支持 OpenAI OAuth 账号。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-27 14:51:36 +08:00
Wesley Liddick 20544a4447 Merge pull request #1300 from xilu0/fix/forward-failed-log-missing-account-proxy-info 
fix: add account and proxy details to forward_failed log
 2026-03-27 14:47:51 +08:00
Wesley Liddick b688ebeefa Merge pull request #1215 from weak-fox/fix/privacy-retry-failed-mode 
fix: 允许 OpenAI privacy_mode修改失败后能在 token 刷新时重试
 2026-03-27 14:46:38 +08:00
shaw 1854050df3 feat(tls-fingerprint): 新增 TLS 指纹 Profile 数据库管理及代码质量优化 
新增功能：
- 新增 TLS 指纹 Profile CRUD 管理（Ent schema + 迁移 + Admin API + 前端管理界面）
- 支持账号绑定数据库中的自定义 TLS Profile，或随机选择（profile_id=-1）
- HTTPUpstream.DoWithTLS 接口从 bool 改为 *tlsfingerprint.Profile，支持按账号指定 Profile
- AccountUsageService 注入 TLSFingerprintProfileService，统一 usage 场景与网关的 Profile 解析逻辑

代码优化：
- 删除已被 TLSFingerprintProfileService 完全取代的 registry.go 死代码（418 行）
- 提取 3 个 dialer 的重复 TLS 握手逻辑为 performTLSHandshake() 共用函数
- 修复 GetTLSFingerprintProfileID 缺少 json.Number 处理的 bug
- gateway_service.Forward 中 ResolveTLSProfile 从重试循环内重复调用改为预解析局部变量
- 删除冗余的 buildClientHelloSpec() 单行 wrapper 和 int64(e.ID) 无效转换
- tls_fingerprint_profile_cache.go 日志从 log.Printf 改为 slog 结构化日志
- dialer_capture_test.go 添加 //go:build integration 标签，防止 CI 失败
- 去重 TestProfileExpectation 类型至共享 test_types_test.go
- 修复 9 个测试文件缺少 tlsfingerprint import 的编译错误
- 修复 error_policy_integration_test.go 中 handleError 回调签名被错误替换的问题
 2026-03-27 14:33:05 +08:00
Wesley Liddick ef5c8e6839 Merge pull request #1231 from LvyuanW/bulk-openai-passthrough-worktree 
Support bulk editing for OpenAI passthrough
 2026-03-26 16:47:49 +08:00
shaw d571f300e5 feat(rectifier): 请求整流器增加 API Key 账号签名整流支持 
新增独立开关控制 API Key 账号的签名整流功能，支持配置自定义
匹配关键词以捕获不同格式的上游错误响应。

- 新增 apikey_signature_enabled 开关（默认关闭）
- 新增 apikey_signature_patterns 自定义关键词配置
- 内置签名检测规则对 API Key 账号同样生效
- 自定义关键词对完整响应体做不区分大小写匹配
- 重试二阶段检测仅做模式匹配，不重复校验开关
- Handler 层校验关键词数量（≤50）和长度（≤500）
- API 响应 nil patterns 统一序列化为空数组
- OAuth/SetupToken/Upstream/Bedrock 账号行为不变
 2026-03-26 16:43:38 +08:00
Wesley Liddick ce96527dd9 Merge pull request #1302 from DaydreamCoding/fix/openai-error-handling 
fix(ratelimit): OpenAI 401 token_invalidated/token_revoked 及 402 deac…
 2026-03-26 11:30:52 +08:00
Wesley Liddick f8b8b53985 Merge pull request #1299 from DaydreamCoding/feat/antigravity-privacy-and-subscription 
feat(antigravity): 自动隐私设置 + 订阅状态检测
 2026-03-26 11:30:24 +08:00
shaw b20e142249 feat: 网关请求头 wire casing 保持、转发行为开关、调试日志增强及 accept-encoding 恢复 
- 新增 header_util.go，通过 setHeaderRaw/getHeaderRaw/addHeaderRaw 绕过
  Go 的 canonical-case 规范化，保持真实 Claude CLI 抓包的请求头大小写
  （如 "x-app" 而非 "X-App"，"X-Stainless-OS" 而非 "X-Stainless-Os"）
- 新增管理后台开关：指纹统一化（默认开启）和 metadata 透传（默认关闭），
  使用 atomic.Value + singleflight 缓存模式，60s TTL
- 调试日志从控制台 body 打印升级为文件级完整快照
  （按真实 wire 顺序输出 headers + 格式化 JSON body + 上下文元数据）
- 恢复 accept-encoding 到白名单，在 http_upstream.go 新增 decompressResponseBody
  处理 gzip/brotli/deflate 解压（Go 显式设置 Accept-Encoding 时不会自动解压）
- OAuth 服务 axios UA 从 1.8.4 更新至 1.13.6
- 测试断言改用 getHeaderRaw 适配 raw header 存储方式
 2026-03-26 11:17:25 +08:00
Dave KingandClaude Opus 4.6 7c6dc9dda8 fix: add account and proxy details to gateway.forward_failed log 
The forward_failed error log only included account_id, making it
difficult to identify which account and proxy caused the failure
without querying the database. Add account_name, account_platform,
and proxy details (id, name, host, port) to the log fields.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-25 12:19:17 +00:00
QTomandClaude Opus 4.6 5875571215 fix(ratelimit): OpenAI 401 token_invalidated/token_revoked 及 402 deactivated_workspace 标记账号异常 
- 401 token_invalidated / token_revoked: OAuth token 被永久作废，跳过临时不可调度逻辑，直接 SetError
- 402 deactivated_workspace: 解析 detail.code 字段，标记工作区已停用

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-25 19:46:17 +08:00
QTom 975e6b1563 fix: 修复 golangci-lint 报告的 5 个问题 
- gofmt: 修复 admin_service/antigravity_oauth_service/token_refresh_service 格式
- staticcheck S1009: 移除 SetUserSettingsResponse.IsSuccess 中冗余的 nil 检查
- unused: 将仅测试使用的 applyAntigravitySubscriptionResult 移至测试文件

Made-with: Cursor
 2026-03-25 19:03:12 +08:00
QTom f6fd7c83e3 feat(antigravity): 从 LoadCodeAssist 复用 TierInfo 提取 plan_type 
复用已有 GetTier() 返回的 tier ID（free-tier / g1-pro-tier /
g1-ultra-tier），通过 TierIDToPlanType 映射为 Free / Pro / Ultra，
在 loadProjectIDWithRetry 中顺带提取并写入 credentials.plan_type；
前端增加 Abnormal 异常套餐红色标记。

Made-with: Cursor
 2026-03-25 17:38:41 +08:00
QTom c2965c0fb0 feat(antigravity): 自动设置隐私并支持后台手动重试 
新增 Antigravity OAuth 隐私设置能力，在账号创建、刷新、导入和后台
Token 刷新路径自动调用 setUserSettings + fetchUserInfo 关闭遥测；
持久化后同步内存 Extra，错误处理改为日志记录。

Made-with: Cursor
 2026-03-25 17:38:41 +08:00
Ikko Ashimine fdad55956e docs: add Japanese README 2026-03-25 00:34:56 +09:00
erio ed98145154 chore: bump version to 0.1.104.5 2026-03-24 20:41:04 +08:00
erio 2667f781da chore: adjust internal500 penalty durations to 30m / 2h 2026-03-24 20:39:21 +08:00
erio 2d22b80244 test: add unit tests for INTERNAL 500 progressive penalty 
Cover isAntigravityInternalServerError body matching,
applyInternal500Penalty tier escalation, handleInternal500RetryExhausted
nil-safety and error handling, and resetInternal500Counter paths.
 2026-03-24 20:37:21 +08:00
erio 4b64df2071 refactor: extract internal500 penalty logic to dedicated file 
Move constants, detection, and penalty functions from
antigravity_gateway_service.go to antigravity_internal500_penalty.go.
Fix gofmt alignment and replace hardcoded duration strings with
constant references.
 2026-03-24 20:33:11 +08:00
erio a80844558c fix: move internal500 counter reset to cover all success paths 
Move the reset logic after urlFallbackLoop so it covers both direct
success and smart retry (429/503) success paths.
 2026-03-24 20:24:06 +08:00
erio c668b96e15 feat(antigravity): progressive penalty for consecutive INTERNAL 500 errors 
When an antigravity account returns 500 "Internal error encountered."
on all 3 retry attempts, increment a Redis counter and apply escalating
penalties:
- 1st round: temp unschedulable 10 minutes
- 2nd round: temp unschedulable 10 hours
- 3rd round: permanently mark as error

Counter resets on any successful response (< 400).
 2026-03-24 20:18:49 +08:00
erio 7c0de8b1a1 fix: sync remaining test expectations for Sonnet 4.5 → 4.6 migration 
Update model mapping tests, rate limit pre-check tests, thinking suffix
tests, and whitelist tests to reflect the new default mapping and
simplified applyThinkingModelSuffix behavior.
 2026-03-24 19:45:03 +08:00
erio 8b31e00a14 fix: sync test rate limit keys and fix gofmt alignment 
Update rate limit keys in credits overages tests from claude-sonnet-4-5
to claude-sonnet-4-6 to match the new default mapping. Fix gofmt
alignment in constants.go.
 2026-03-24 19:44:50 +08:00
Wang Lvyuan bb399e56b0 merge: resolve upstream main conflicts for bulk OpenAI passthrough 2026-03-24 19:27:51 +08:00
Wesley Liddick 0f03393010 Merge pull request #1234 from Zqysl/qingyu/fix-ops-runtime-log-controls-layout 
fix(ops): prevent runtime log controls UI overflow
 2026-03-24 19:13:47 +08:00
Wesley Liddick 4b1ffc23f5 Merge pull request #1240 from Zqysl/qingyu/fix-openai-passthrough-429-rate-limits 
fix(openai): persist passthrough 429 rate limits
 2026-03-24 19:02:40 +08:00
erio 21fd129dcc chore: bump version to 0.1.104.4 2026-03-24 17:53:08 +08:00
erio d27d6c1b24 fix: restore original 077 migration and create 078 for Sonnet 4.5→4.6 
077 was modified after being applied to the production database,
causing a checksum mismatch and container restart loop.
Restore 077 to its original content and move the Sonnet 4.5→4.6
migration to a new 078 file.
 2026-03-24 17:50:55 +08:00
erio 986d2bc8b8 feat: migrate Sonnet 4.5 → Sonnet 4.6 in default mapping and DB 2026-03-24 17:38:21 +08:00
erio c7168c1abc chore: bump version to 0.1.104.3 2026-03-24 16:47:20 +08:00
erio d6af2f8739 revert: rollback Sonnet→Opus migration, restore Sonnet→Sonnet mapping 2026-03-24 16:46:16 +08:00
erio be0c9fec9e Revert "feat: migrate all Sonnet targets to Opus 4.6-thinking" 
This reverts commit 36d99d6399.
 2026-03-24 16:42:54 +08:00
Wesley Liddick c7137dffa8 Merge pull request #1218 from LvyuanW/openai-runtime-recheck 
fix(openai): prevent rescheduling rate-limited accounts
 2026-03-24 15:21:18 +08:00
Wesley Liddick 5a3375ce52 Merge pull request #1227 from liruiluo/codex/dockerignore-deploy-data 
Ignore deploy runtime data in Docker context
 2026-03-24 15:20:10 +08:00