ffaa6c4a17
问题描述： 在网络波动环境下，LoadCodeAssist 临时失败会被错误地标记为 "missing_project_id" 不可重试错误，导致账户被禁用。但实际上 账户配置正确，手动刷新后即可恢复。 解决方案： 1. 为 LoadCodeAssist 增加重试机制（最多4次，指数退避） 2. 区分真正的配置缺失和临时网络故障： - 如果之前有 project_id，本次获取失败只保留旧值，不报错 - 只有从未获取过 project_id 且本次也失败时，才标记为缺失 3. 优化错误判断逻辑，避免误报 改进效果： - 提高在复杂网络环境（如家宽代理）下的鲁棒性 - 减少因临时网络波动导致的服务中断 - 保持真正配置错误的检测能力 Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
80 lines
2.6 KiB
Go
80 lines
2.6 KiB
Go
package service
|
||
|
||
import (
|
||
"context"
|
||
"fmt"
|
||
"log"
|
||
"time"
|
||
)
|
||
|
||
const (
|
||
// antigravityRefreshWindow Antigravity token 提前刷新窗口：15分钟
|
||
// Google OAuth token 有效期55分钟，提前15分钟刷新
|
||
antigravityRefreshWindow = 15 * time.Minute
|
||
)
|
||
|
||
// AntigravityTokenRefresher 实现 TokenRefresher 接口
|
||
type AntigravityTokenRefresher struct {
|
||
antigravityOAuthService *AntigravityOAuthService
|
||
}
|
||
|
||
func NewAntigravityTokenRefresher(antigravityOAuthService *AntigravityOAuthService) *AntigravityTokenRefresher {
|
||
return &AntigravityTokenRefresher{
|
||
antigravityOAuthService: antigravityOAuthService,
|
||
}
|
||
}
|
||
|
||
// CanRefresh 检查是否可以刷新此账户
|
||
func (r *AntigravityTokenRefresher) CanRefresh(account *Account) bool {
|
||
return account.Platform == PlatformAntigravity && account.Type == AccountTypeOAuth
|
||
}
|
||
|
||
// NeedsRefresh 检查账户是否需要刷新
|
||
// Antigravity 使用固定的15分钟刷新窗口，忽略全局配置
|
||
func (r *AntigravityTokenRefresher) NeedsRefresh(account *Account, _ time.Duration) bool {
|
||
if !r.CanRefresh(account) {
|
||
return false
|
||
}
|
||
expiresAt := account.GetCredentialAsTime("expires_at")
|
||
if expiresAt == nil {
|
||
return false
|
||
}
|
||
timeUntilExpiry := time.Until(*expiresAt)
|
||
needsRefresh := timeUntilExpiry < antigravityRefreshWindow
|
||
if needsRefresh {
|
||
fmt.Printf("[AntigravityTokenRefresher] Account %d needs refresh: expires_at=%s, time_until_expiry=%v, window=%v\n",
|
||
account.ID, expiresAt.Format("2006-01-02 15:04:05"), timeUntilExpiry, antigravityRefreshWindow)
|
||
}
|
||
return needsRefresh
|
||
}
|
||
|
||
// Refresh 执行 token 刷新
|
||
func (r *AntigravityTokenRefresher) Refresh(ctx context.Context, account *Account) (map[string]any, error) {
|
||
tokenInfo, err := r.antigravityOAuthService.RefreshAccountToken(ctx, account)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
|
||
newCredentials := r.antigravityOAuthService.BuildAccountCredentials(tokenInfo)
|
||
for k, v := range account.Credentials {
|
||
if _, exists := newCredentials[k]; !exists {
|
||
newCredentials[k] = v
|
||
}
|
||
}
|
||
|
||
// 如果 project_id 获取失败但之前有 project_id，不返回错误（只是临时网络故障）
|
||
// 只有真正缺失 project_id（从未获取过）时才返回错误
|
||
if tokenInfo.ProjectIDMissing {
|
||
// 检查是否保留了旧的 project_id
|
||
if tokenInfo.ProjectID != "" {
|
||
// 有旧的 project_id，只是本次获取失败，记录警告但不返回错误
|
||
log.Printf("[AntigravityTokenRefresher] Account %d: LoadCodeAssist 临时失败，保留旧 project_id", account.ID)
|
||
} else {
|
||
// 真正缺失 project_id，返回错误
|
||
return newCredentials, fmt.Errorf("missing_project_id: 账户缺少project id，可能无法使用Antigravity")
|
||
}
|
||
}
|
||
|
||
return newCredentials, nil
|
||
}
|