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

fix: 修复claude SSE捕获usage问题

Browse Source
This commit is contained in:
shaw
2025-10-12 23:05:48 +08:00
parent 6f6c274877
commit a67c34bee1
9 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/routes/admin.js
View File

@@ -7614,7 +7614,10 @@ router.put('/openai-accounts/:id', authenticateAdmin, async (req, res) => {
updateData.subscriptionExpiresAt = updates.expiresAt updateData.subscriptionExpiresAt = updates.expiresAt
} }
if (!hasOauthExpiry && Object.prototype.hasOwnProperty.call(updateData, 'subscriptionExpiresAt')) { if (
!hasOauthExpiry &&
Object.prototype.hasOwnProperty.call(updateData, 'subscriptionExpiresAt')
) {
delete updateData.expiresAt delete updateData.expiresAt
} }

8
src/services/azureOpenaiAccountService.js
View File

@@ -146,9 +146,7 @@ async function createAccount(accountData) {
isActive: accountData.isActive !== false ? 'true' : 'false', isActive: accountData.isActive !== false ? 'true' : 'false',
status: 'active', status: 'active',
schedulable: accountData.schedulable !== false ? 'true' : 'false', schedulable: accountData.schedulable !== false ? 'true' : 'false',
subscriptionExpiresAt: normalizeSubscriptionExpiresAt( subscriptionExpiresAt: normalizeSubscriptionExpiresAt(accountData.subscriptionExpiresAt || ''),
accountData.subscriptionExpiresAt || ''
),
createdAt: now, createdAt: now,
updatedAt: now updatedAt: now
} }
@@ -243,9 +241,7 @@ async function updateAccount(accountId, updates) {
} }
if (Object.prototype.hasOwnProperty.call(updates, 'subscriptionExpiresAt')) { if (Object.prototype.hasOwnProperty.call(updates, 'subscriptionExpiresAt')) {
updates.subscriptionExpiresAt = normalizeSubscriptionExpiresAt( updates.subscriptionExpiresAt = normalizeSubscriptionExpiresAt(updates.subscriptionExpiresAt)
updates.subscriptionExpiresAt
)
} else if (Object.prototype.hasOwnProperty.call(updates, 'expiresAt')) { } else if (Object.prototype.hasOwnProperty.call(updates, 'expiresAt')) {
updates.subscriptionExpiresAt = normalizeSubscriptionExpiresAt(updates.expiresAt) updates.subscriptionExpiresAt = normalizeSubscriptionExpiresAt(updates.expiresAt)
delete updates.expiresAt delete updates.expiresAt

7
src/services/claudeConsoleRelayService.js
View File

@@ -487,9 +487,12 @@ class ClaudeConsoleRelayService {
// 解析SSE数据寻找usage信息 // 解析SSE数据寻找usage信息
for (const line of lines) { for (const line of lines) {
if (line.startsWith('data: ') && line.length > 6) { if (line.startsWith('data:')) {
const jsonStr = line.slice(5).trimStart()
if (!jsonStr || jsonStr === '[DONE]') {
continue
}
try { try {
const jsonStr = line.slice(6)
const data = JSON.parse(jsonStr) const data = JSON.parse(jsonStr)
// 收集usage数据 // 收集usage数据

7
src/services/claudeRelayService.js
View File

@@ -1487,9 +1487,12 @@ class ClaudeRelayService {
for (const line of lines) { for (const line of lines) {
// 解析SSE数据寻找usage信息 // 解析SSE数据寻找usage信息
if (line.startsWith('data: ') && line.length > 6) { if (line.startsWith('data:')) {
const jsonStr = line.slice(5).trimStart()
if (!jsonStr || jsonStr === '[DONE]') {
continue
}
try { try {
const jsonStr = line.slice(6)
const data = JSON.parse(jsonStr) const data = JSON.parse(jsonStr)
// 收集来自不同事件的usage数据 // 收集来自不同事件的usage数据

4
src/services/geminiAccountService.js
View File

@@ -504,9 +504,7 @@ async function updateAccount(accountId, updates) {
updates.updatedAt = now updates.updatedAt = now
if (Object.prototype.hasOwnProperty.call(updates, 'subscriptionExpiresAt')) { if (Object.prototype.hasOwnProperty.call(updates, 'subscriptionExpiresAt')) {
updates.subscriptionExpiresAt = normalizeSubscriptionExpiresAt( updates.subscriptionExpiresAt = normalizeSubscriptionExpiresAt(updates.subscriptionExpiresAt)
updates.subscriptionExpiresAt
)
} }
// 检查是否新增了 refresh token // 检查是否新增了 refresh token

4
src/services/openaiResponsesAccountService.js
View File

@@ -173,9 +173,7 @@ class OpenAIResponsesAccountService {
} }
if (Object.prototype.hasOwnProperty.call(updates, 'subscriptionExpiresAt')) { if (Object.prototype.hasOwnProperty.call(updates, 'subscriptionExpiresAt')) {
updates.subscriptionExpiresAt = normalizeSubscriptionExpiresAt( updates.subscriptionExpiresAt = normalizeSubscriptionExpiresAt(updates.subscriptionExpiresAt)
updates.subscriptionExpiresAt
)
} else if (Object.prototype.hasOwnProperty.call(updates, 'expiresAt')) { } else if (Object.prototype.hasOwnProperty.call(updates, 'expiresAt')) {
updates.subscriptionExpiresAt = normalizeSubscriptionExpiresAt(updates.expiresAt) updates.subscriptionExpiresAt = normalizeSubscriptionExpiresAt(updates.expiresAt)
delete updates.expiresAt delete updates.expiresAt