github/claude-relay-service
1
0
Fork 0
mirror of https://github.com/Wei-Shaw/claude-relay-service.git synced 2026-01-22 16:43:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #146 from kevinconan/main

Browse Source 
fix: 修复session窗口计算问题
This commit is contained in:
Wesley Liddick
2025-07-31 09:31:11 +08:00
committed by GitHub
parent 0d98467688 d93ce8713d
commit 7f48934c85
2 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
scripts/manage-session-windows.js
View File

@@ -110,11 +110,43 @@ const commands = {
const windowStart = new Date(account.sessionWindowStart); const windowStart = new Date(account.sessionWindowStart);
const windowEnd = new Date(account.sessionWindowEnd); const windowEnd = new Date(account.sessionWindowEnd);
const now = new Date(); const now = new Date();
const isActive = now < windowEnd;
console.log(` 会话窗口: ${windowStart.toLocaleString()} - ${windowEnd.toLocaleString()}`); console.log(` 会话窗口: ${windowStart.toLocaleString()} - ${windowEnd.toLocaleString()}`);
console.log(` 窗口状态: ${now < windowEnd ? '✅ 活跃' : '❌ 已过期'}`); console.log(` 窗口状态: ${isActive ? '✅ 活跃' : '❌ 已过期'}`);
// 只有在窗口已过期时才显示可恢复窗口
if (!isActive && account.lastUsedAt) {
const lastUsed = new Date(account.lastUsedAt);
const recoveredWindowStart = claudeAccountService._calculateSessionWindowStart(lastUsed);
const recoveredWindowEnd = claudeAccountService._calculateSessionWindowEnd(recoveredWindowStart);
if (now < recoveredWindowEnd) {
stats.canRecover++;
console.log(` 可恢复窗口: ✅ ${recoveredWindowStart.toLocaleString()} - ${recoveredWindowEnd.toLocaleString()}`);
} else {
stats.expired++;
console.log(` 可恢复窗口: ❌ 已过期 (${recoveredWindowStart.toLocaleString()} - ${recoveredWindowEnd.toLocaleString()})`);
}
}
} else { } else {
console.log(` 会话窗口: ❌ 无`); console.log(` 会话窗口: ❌ 无`);
// 没有会话窗口时，检查是否有可恢复的窗口
if (account.lastUsedAt) {
const lastUsed = new Date(account.lastUsedAt);
const now = new Date();
const windowStart = claudeAccountService._calculateSessionWindowStart(lastUsed);
const windowEnd = claudeAccountService._calculateSessionWindowEnd(windowStart);
if (now < windowEnd) {
stats.canRecover++;
console.log(` 可恢复窗口: ✅ ${windowStart.toLocaleString()} - ${windowEnd.toLocaleString()}`);
} else {
stats.expired++;
console.log(` 可恢复窗口: ❌ 已过期 (${windowStart.toLocaleString()} - ${windowEnd.toLocaleString()})`);
}
}
} }
if (account.lastUsedAt) { if (account.lastUsedAt) {
@@ -124,18 +156,6 @@ const commands = {
const minutesAgo = Math.round((now - lastUsed) / (1000 * 60)); const minutesAgo = Math.round((now - lastUsed) / (1000 * 60));
console.log(` 最后使用: ${lastUsed.toLocaleString()} (${minutesAgo}分钟前)`); console.log(` 最后使用: ${lastUsed.toLocaleString()} (${minutesAgo}分钟前)`);
// 计算基于lastUsedAt的窗口
const windowStart = claudeAccountService._calculateSessionWindowStart(lastUsed);
const windowEnd = claudeAccountService._calculateSessionWindowEnd(windowStart);
if (now < windowEnd) {
stats.canRecover++;
console.log(` 可恢复窗口: ✅ ${windowStart.toLocaleString()} - ${windowEnd.toLocaleString()}`);
} else {
stats.expired++;
console.log(` 可恢复窗口: ❌ 已过期 (${windowStart.toLocaleString()} - ${windowEnd.toLocaleString()})`);
}
} else { } else {
console.log(` 最后使用: ❌ 无记录`); console.log(` 最后使用: ❌ 无记录`);
} }

10
src/services/claudeAccountService.js
View File

@@ -861,14 +861,18 @@ class ClaudeAccountService {
if (accountData.sessionWindowStart && accountData.sessionWindowEnd) { if (accountData.sessionWindowStart && accountData.sessionWindowEnd) {
const windowEnd = new Date(accountData.sessionWindowEnd).getTime(); const windowEnd = new Date(accountData.sessionWindowEnd).getTime();
// 如果当前时间在窗口内，不需要更新 // 如果当前时间在窗口内，只更新最后请求时间
if (currentTime < windowEnd) { if (currentTime < windowEnd) {
accountData.lastRequestTime = now.toISOString(); accountData.lastRequestTime = now.toISOString();
return accountData; return accountData;
} }
// 窗口已过期，记录日志
const windowStart = new Date(accountData.sessionWindowStart);
logger.info(`⏰ Session window expired for account ${accountData.name} (${accountId}): ${windowStart.toISOString()} - ${new Date(windowEnd).toISOString()}`);
} }
// 计算新的会话窗口 // 基于当前时间计算新的会话窗口
const windowStart = this._calculateSessionWindowStart(now); const windowStart = this._calculateSessionWindowStart(now);
const windowEnd = this._calculateSessionWindowEnd(windowStart); const windowEnd = this._calculateSessionWindowEnd(windowStart);
@@ -877,7 +881,7 @@ class ClaudeAccountService {
accountData.sessionWindowEnd = windowEnd.toISOString(); accountData.sessionWindowEnd = windowEnd.toISOString();
accountData.lastRequestTime = now.toISOString(); accountData.lastRequestTime = now.toISOString();
logger.info(`🕐 Updated session window for account ${accountData.name} (${accountId}): ${windowStart.toISOString()} - ${windowEnd.toISOString()}`); logger.info(`🕐 Created new session window for account ${accountData.name} (${accountId}): ${windowStart.toISOString()} - ${windowEnd.toISOString()}`);
return accountData; return accountData;
} catch (error) { } catch (error) {