github/claude-relay-service
1
0
Fork 0
mirror of https://github.com/Wei-Shaw/claude-relay-service.git synced 2026-01-23 09:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 使用API响应头中的准确时间戳修正会话窗口和限流时间

Browse Source 
- 从429响应中提取 anthropic-ratelimit-unified-reset 响应头
- 使用准确的重置时间戳设置限流结束时间和会话窗口
- 会话窗口开始时间 = 重置时间戳 - 5小时
- 兼容旧逻辑：无响应头时使用预估的会话窗口时间

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

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
shaw
2025-07-31 16:29:07 +08:00
parent 2612611795
commit 8e89311dac
3 changed files with 67 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/services/claudeRelayService.js
View File

@@ -142,23 +142,37 @@ class ClaudeRelayService {
// 检查响应是否为限流错误
if (response.statusCode !== 200 && response.statusCode !== 201) {
let isRateLimited = false;
try {
const responseBody = typeof response.body === 'string' ? JSON.parse(response.body) : response.body;
if (responseBody && responseBody.error && responseBody.error.message &&
responseBody.error.message.toLowerCase().includes('exceed your account\'s rate limit')) {
isRateLimited = true;
let rateLimitResetTimestamp = null;
// 检查是否为429状态码
if (response.statusCode === 429) {
isRateLimited = true;
// 提取限流重置时间戳
if (response.headers && response.headers['anthropic-ratelimit-unified-reset']) {
rateLimitResetTimestamp = parseInt(response.headers['anthropic-ratelimit-unified-reset']);
logger.info(`🕐 Extracted rate limit reset timestamp: ${rateLimitResetTimestamp} (${new Date(rateLimitResetTimestamp * 1000).toISOString()})`);
}
} catch (e) {
// 如果解析失败，检查原始字符串
if (response.body && response.body.toLowerCase().includes('exceed your account\'s rate limit')) {
isRateLimited = true;
} else {
// 检查响应体中的错误信息
try {
const responseBody = typeof response.body === 'string' ? JSON.parse(response.body) : response.body;
if (responseBody && responseBody.error && responseBody.error.message &&
responseBody.error.message.toLowerCase().includes('exceed your account\'s rate limit')) {
isRateLimited = true;
}
} catch (e) {
// 如果解析失败，检查原始字符串
if (response.body && response.body.toLowerCase().includes('exceed your account\'s rate limit')) {
isRateLimited = true;
}
}
}
if (isRateLimited) {
logger.warn(`🚫 Rate limit detected for account ${accountId}, status: ${response.statusCode}`);
// 标记账号为限流状态并删除粘性会话映射
await claudeAccountService.markAccountRateLimited(accountId, sessionHash);
// 标记账号为限流状态并删除粘性会话映射，传递准确的重置时间戳
await claudeAccountService.markAccountRateLimited(accountId, sessionHash, rateLimitResetTimestamp);
}
} else if (response.statusCode === 200 || response.statusCode === 201) {
// 如果请求成功，检查并移除限流状态
@@ -832,8 +846,15 @@ class ClaudeRelayService {
// 处理限流状态
if (rateLimitDetected || res.statusCode === 429) {
// 提取限流重置时间戳
let rateLimitResetTimestamp = null;
if (res.headers && res.headers['anthropic-ratelimit-unified-reset']) {
rateLimitResetTimestamp = parseInt(res.headers['anthropic-ratelimit-unified-reset']);
logger.info(`🕐 Extracted rate limit reset timestamp from stream: ${rateLimitResetTimestamp} (${new Date(rateLimitResetTimestamp * 1000).toISOString()})`);
}
// 标记账号为限流状态并删除粘性会话映射
await claudeAccountService.markAccountRateLimited(accountId, sessionHash);
await claudeAccountService.markAccountRateLimited(accountId, sessionHash, rateLimitResetTimestamp);
} else if (res.statusCode === 200) {
// 如果请求成功，检查并移除限流状态
const isRateLimited = await claudeAccountService.isAccountRateLimited(accountId);