mirror of
https://gitee.com/wanwujie/sub2api
synced 2026-04-02 22:42:14 +08:00
Introduce OAuthRefreshAPI as the single entry point for all OAuth token refresh operations, eliminating the race condition where background refresh and inline refresh could simultaneously use the same refresh_token (fixes #1035). Key changes: - Add OAuthRefreshExecutor interface extending TokenRefresher with CacheKey - Add OAuthRefreshAPI.RefreshIfNeeded with lock → DB re-read → double-check flow - Add ProviderRefreshPolicy / BackgroundRefreshPolicy strategy types - Simplify all 4 TokenProviders to delegate to OAuthRefreshAPI - Rewrite TokenRefreshService.refreshWithRetry to use unified API path - Add MergeCredentials and BuildClaudeAccountCredentials helpers - Add 40 unit tests covering all new and modified code paths
160 lines
5.1 KiB
Go
160 lines
5.1 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"log/slog"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
const (
|
|
claudeTokenRefreshSkew = 3 * time.Minute
|
|
claudeTokenCacheSkew = 5 * time.Minute
|
|
claudeLockWaitTime = 200 * time.Millisecond
|
|
)
|
|
|
|
// ClaudeTokenCache token cache interface.
|
|
type ClaudeTokenCache = GeminiTokenCache
|
|
|
|
// ClaudeTokenProvider manages access_token for Claude OAuth accounts.
|
|
type ClaudeTokenProvider struct {
|
|
accountRepo AccountRepository
|
|
tokenCache ClaudeTokenCache
|
|
oauthService *OAuthService
|
|
refreshAPI *OAuthRefreshAPI
|
|
executor OAuthRefreshExecutor
|
|
refreshPolicy ProviderRefreshPolicy
|
|
}
|
|
|
|
func NewClaudeTokenProvider(
|
|
accountRepo AccountRepository,
|
|
tokenCache ClaudeTokenCache,
|
|
oauthService *OAuthService,
|
|
) *ClaudeTokenProvider {
|
|
return &ClaudeTokenProvider{
|
|
accountRepo: accountRepo,
|
|
tokenCache: tokenCache,
|
|
oauthService: oauthService,
|
|
refreshPolicy: ClaudeProviderRefreshPolicy(),
|
|
}
|
|
}
|
|
|
|
// SetRefreshAPI injects unified OAuth refresh API and executor.
|
|
func (p *ClaudeTokenProvider) SetRefreshAPI(api *OAuthRefreshAPI, executor OAuthRefreshExecutor) {
|
|
p.refreshAPI = api
|
|
p.executor = executor
|
|
}
|
|
|
|
// SetRefreshPolicy injects caller-side refresh policy.
|
|
func (p *ClaudeTokenProvider) SetRefreshPolicy(policy ProviderRefreshPolicy) {
|
|
p.refreshPolicy = policy
|
|
}
|
|
|
|
// GetAccessToken returns a valid access_token.
|
|
func (p *ClaudeTokenProvider) GetAccessToken(ctx context.Context, account *Account) (string, error) {
|
|
if account == nil {
|
|
return "", errors.New("account is nil")
|
|
}
|
|
if account.Platform != PlatformAnthropic || account.Type != AccountTypeOAuth {
|
|
return "", errors.New("not an anthropic oauth account")
|
|
}
|
|
|
|
cacheKey := ClaudeTokenCacheKey(account)
|
|
|
|
// 1) Try cache first.
|
|
if p.tokenCache != nil {
|
|
if token, err := p.tokenCache.GetAccessToken(ctx, cacheKey); err == nil && strings.TrimSpace(token) != "" {
|
|
slog.Debug("claude_token_cache_hit", "account_id", account.ID)
|
|
return token, nil
|
|
} else if err != nil {
|
|
slog.Warn("claude_token_cache_get_failed", "account_id", account.ID, "error", err)
|
|
}
|
|
}
|
|
|
|
slog.Debug("claude_token_cache_miss", "account_id", account.ID)
|
|
|
|
// 2) Refresh if needed (pre-expiry skew).
|
|
expiresAt := account.GetCredentialAsTime("expires_at")
|
|
needsRefresh := expiresAt == nil || time.Until(*expiresAt) <= claudeTokenRefreshSkew
|
|
refreshFailed := false
|
|
|
|
if needsRefresh && p.refreshAPI != nil && p.executor != nil {
|
|
result, err := p.refreshAPI.RefreshIfNeeded(ctx, account, p.executor, claudeTokenRefreshSkew)
|
|
if err != nil {
|
|
if p.refreshPolicy.OnRefreshError == ProviderRefreshErrorReturn {
|
|
return "", err
|
|
}
|
|
slog.Warn("claude_token_refresh_failed", "account_id", account.ID, "error", err)
|
|
refreshFailed = true
|
|
} else if result.LockHeld {
|
|
if p.refreshPolicy.OnLockHeld == ProviderLockHeldWaitForCache && p.tokenCache != nil {
|
|
time.Sleep(claudeLockWaitTime)
|
|
if token, cacheErr := p.tokenCache.GetAccessToken(ctx, cacheKey); cacheErr == nil && strings.TrimSpace(token) != "" {
|
|
slog.Debug("claude_token_cache_hit_after_wait", "account_id", account.ID)
|
|
return token, nil
|
|
}
|
|
}
|
|
} else {
|
|
account = result.Account
|
|
expiresAt = account.GetCredentialAsTime("expires_at")
|
|
}
|
|
} else if needsRefresh && p.tokenCache != nil {
|
|
// Backward-compatible test path when refreshAPI is not injected.
|
|
locked, lockErr := p.tokenCache.AcquireRefreshLock(ctx, cacheKey, 30*time.Second)
|
|
if lockErr == nil && locked {
|
|
defer func() { _ = p.tokenCache.ReleaseRefreshLock(ctx, cacheKey) }()
|
|
} else if lockErr != nil {
|
|
slog.Warn("claude_token_lock_failed", "account_id", account.ID, "error", lockErr)
|
|
} else {
|
|
time.Sleep(claudeLockWaitTime)
|
|
if token, err := p.tokenCache.GetAccessToken(ctx, cacheKey); err == nil && strings.TrimSpace(token) != "" {
|
|
slog.Debug("claude_token_cache_hit_after_wait", "account_id", account.ID)
|
|
return token, nil
|
|
}
|
|
}
|
|
}
|
|
|
|
accessToken := account.GetCredential("access_token")
|
|
if strings.TrimSpace(accessToken) == "" {
|
|
return "", errors.New("access_token not found in credentials")
|
|
}
|
|
|
|
// 3) Populate cache with TTL.
|
|
if p.tokenCache != nil {
|
|
latestAccount, isStale := CheckTokenVersion(ctx, account, p.accountRepo)
|
|
if isStale && latestAccount != nil {
|
|
slog.Debug("claude_token_version_stale_use_latest", "account_id", account.ID)
|
|
accessToken = latestAccount.GetCredential("access_token")
|
|
if strings.TrimSpace(accessToken) == "" {
|
|
return "", errors.New("access_token not found after version check")
|
|
}
|
|
} else {
|
|
ttl := 30 * time.Minute
|
|
if refreshFailed {
|
|
if p.refreshPolicy.FailureTTL > 0 {
|
|
ttl = p.refreshPolicy.FailureTTL
|
|
} else {
|
|
ttl = time.Minute
|
|
}
|
|
slog.Debug("claude_token_cache_short_ttl", "account_id", account.ID, "reason", "refresh_failed")
|
|
} else if expiresAt != nil {
|
|
until := time.Until(*expiresAt)
|
|
switch {
|
|
case until > claudeTokenCacheSkew:
|
|
ttl = until - claudeTokenCacheSkew
|
|
case until > 0:
|
|
ttl = until
|
|
default:
|
|
ttl = time.Minute
|
|
}
|
|
}
|
|
if err := p.tokenCache.SetAccessToken(ctx, cacheKey, accessToken, ttl); err != nil {
|
|
slog.Warn("claude_token_cache_set_failed", "account_id", account.ID, "error", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
return accessToken, nil
|
|
}
|