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

Revert "feat: 将费用优先调度逻辑集成到 UnifiedClaudeScheduler"

Browse Source 
This reverts commit 1a5b3b614961e889a0700809e3e86b08eccb5e19.
This commit is contained in:
Edric Li
2025-09-08 15:39:14 +08:00
parent bed7b7f000
commit f51d345ad9
1 changed files with 15 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/services/unifiedClaudeScheduler.js
View File

@@ -206,8 +206,8 @@ class UnifiedClaudeScheduler {
} }
} }
// 基于日费用排序账户（费用最少的优先） // 按优先级和最后使用时间排序
const sortedAccounts = await this._sortAccountsByCost(availableAccounts) const sortedAccounts = this._sortAccountsByPriority(availableAccounts)
// 选择第一个账户 // 选择第一个账户
const selectedAccount = sortedAccounts[0] const selectedAccount = sortedAccounts[0]
@@ -482,104 +482,19 @@ class UnifiedClaudeScheduler {
return availableAccounts return availableAccounts
} }
// 💰 基于日费用排序账户（费用最少的优先，支持多种账户类型） // 🔢 按优先级和最后使用时间排序账户
async _sortAccountsByCost(accounts) { _sortAccountsByPriority(accounts) {
try { return accounts.sort((a, b) => {
// 并行获取所有账号的日费用 // 首先按优先级排序（数字越小优先级越高）
const accountsWithCost = await Promise.all( if (a.priority !== b.priority) {
accounts.map(async (account) => { return a.priority - b.priority
try {
let dailyCost = 0
// 根据账户类型获取日费用
if (account.accountType === 'claude-official') {
dailyCost = await redis.getAccountDailyCost(account.accountId || account.id)
} else if (account.accountType === 'claude-console') {
// Claude Console 账户也使用相同的费用存储机制
dailyCost = await redis.getAccountDailyCost(account.accountId || account.id)
} else if (account.accountType === 'bedrock') {
// Bedrock 账户也使用相同的费用存储机制
dailyCost = await redis.getAccountDailyCost(account.accountId || account.id)
}
return {
...account,
_dailyCost: dailyCost
}
} catch (error) {
logger.warn(
`Failed to get daily cost for account ${account.accountId || account.id}: ${error.message}`
)
return {
...account,
_dailyCost: Number.MAX_SAFE_INTEGER, // 获取费用失败时，设为最高值（最低优先级）
_costError: true
}
}
})
)
// 按日费用排序（费用最少的优先）
const sortedAccounts = accountsWithCost.sort((a, b) => {
// 如果费用相同，按优先级排序
if (Math.abs(a._dailyCost - b._dailyCost) < 0.000001) {
// 优先级相同时，按最后使用时间排序（最久未使用的优先）
if (a.priority === b.priority) {
const aLastUsed = new Date(a.lastUsedAt || 0).getTime()
const bLastUsed = new Date(b.lastUsedAt || 0).getTime()
return aLastUsed - bLastUsed
}
return a.priority - b.priority
}
return a._dailyCost - b._dailyCost
})
// 检查是否所有账号的费用获取都失败了
const allAccountsHaveErrors = sortedAccounts.every((account) => account._costError)
if (allAccountsHaveErrors) {
logger.warn(
'⚠️ All accounts failed to get daily cost, falling back to priority-based sorting'
)
return accounts.sort((a, b) => {
// 首先按优先级排序
if (a.priority !== b.priority) {
return a.priority - b.priority
}
// 优先级相同时，按最后使用时间排序
const aLastUsed = new Date(a.lastUsedAt || 0).getTime()
const bLastUsed = new Date(b.lastUsedAt || 0).getTime()
return aLastUsed - bLastUsed
})
} }
logger.debug('💰 Account cost ranking:') // 优先级相同时，按最后使用时间排序（最久未使用的优先）
sortedAccounts.forEach((account, index) => { const aLastUsed = new Date(a.lastUsedAt || 0).getTime()
const costDisplay = account._costError ? 'ERROR' : `$${account._dailyCost.toFixed(4)}` const bLastUsed = new Date(b.lastUsedAt || 0).getTime()
const accountDisplayName = account.name || account.accountId || account.id return aLastUsed - bLastUsed
logger.debug( })
` ${index + 1}. ${accountDisplayName} (${account.accountType}): ${costDisplay}`
)
})
return sortedAccounts
} catch (error) {
logger.error(
'❌ Failed to sort accounts by cost, falling back to priority-based sorting:',
error
)
// 回退到原有的按优先级排序策略
return accounts.sort((a, b) => {
// 首先按优先级排序
if (a.priority !== b.priority) {
return a.priority - b.priority
}
// 优先级相同时，按最后使用时间排序
const aLastUsed = new Date(a.lastUsedAt || 0).getTime()
const bLastUsed = new Date(b.lastUsedAt || 0).getTime()
return aLastUsed - bLastUsed
})
}
} }
// 🔍 检查账户是否可用 // 🔍 检查账户是否可用
@@ -961,8 +876,8 @@ class UnifiedClaudeScheduler {
throw new Error(`No available accounts in group ${group.name}`) throw new Error(`No available accounts in group ${group.name}`)
} }
// 使用基于费用的排序逻辑 // 使用现有的优先级排序逻辑
const sortedAccounts = await this._sortAccountsByCost(availableAccounts) const sortedAccounts = this._sortAccountsByPriority(availableAccounts)
// 选择第一个账户 // 选择第一个账户
const selectedAccount = sortedAccounts[0] const selectedAccount = sortedAccounts[0]