* fix: 修复 OpenAI 账号 5h/7d 使用限制显示错误的问题 问题描述: - 账号管理页面中,OpenAI OAuth 账号的 5h 列显示 7 天的剩余时间 - 7d 列却显示几小时的剩余时间 - 根本原因: OpenAI 响应头中 primary/secondary 的实际含义与代码假设相反 修复方案: 1. 后端归一化 (openai_gateway_service.go): - 根据 window_minutes 动态判断哪个是 5h/7d 限制 - 新增规范字段 codex_5h_* 和 codex_7d_* - 保留旧字段以兼容性 2. 前端适配 (AccountUsageCell.vue): - 优先使用新的规范字段 - Fallback 到旧字段时基于 window_minutes 动态判断 - 更新 computed 属性命名 3. 类型定义更新 (types/index.ts): - 添加新的规范字段定义 - 更新注释说明实际语义由 window_minutes 决定 🤖 Generated with Claude Code and Codex collaboration Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> Co-Authored-By: OpenAI Codex <noreply@openai.com> * fix: 改进窗口判断逻辑,修复两个窗口都小于阈值时的bug 问题: 当两个窗口都小于360分钟时(如 primary=180分钟,secondary=300分钟), 之前的逻辑会导致: - primary5h = true, secondary5h = true - 5h 字段会使用 primary(错误) - 7d 字段没有数据(bug) 修复方案: 改用比较策略: 1. 当两个窗口都存在时:较小的分配给5h,较大的分配给7d 2. 当只有一个窗口时:根据大小(<=360分钟)判断是5h还是7d 3. 确保数据不会丢失,逻辑更健壮 示例: - Primary: 180分钟, Secondary: 300分钟 → 5h 使用 Primary(180分钟), 7d 使用 Secondary(300分钟) ✓ 🤖 Generated with Claude Code Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> * fix: 修正窗口大小判断逻辑 - 不能用剩余时间判断窗口类型 **严重bug修复:** 之前的 fallback 逻辑错误地使用 reset_after_seconds 来判断窗口大小。 问题示例: - 周限制(7d)剩余 2h → reset_after_seconds = 7200秒 - 5h限制 剩余 4h → reset_after_seconds = 14400秒 - 错误逻辑:7200/60 < 14400/60,把周限制当成5h ❌ 根本问题: - window_minutes = 窗口的总大小(300 or 10080) - reset_after_seconds = 距离重置的剩余时间(变化的) - 不能用剩余时间来判断窗口类型! 修复方案: 1. **只使用 window_minutes** 来判断窗口大小 2. 移除错误的 reset_after_seconds fallback 3. 如果 window_minutes 都不存在,使用传统假设 4. 添加详细注释说明这个陷阱 🤖 Generated with Claude Code Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> * fix: 修复 lint 问题 - 改进 fallback 逻辑的变量赋值 问题: 第882-883行的简单布尔赋值可能触发 ineffassign 或 staticcheck 警告: use5hFromSecondary = snapshot.SecondaryUsedPercent != nil use7dFromPrimary = snapshot.PrimaryUsedPercent != nil 修复: 改用明确的 if 语句检查任意字段是否存在,更符合代码意图: - 如果 secondary 的任意字段存在,将其视为 5h - 如果 primary 的任意字段存在,将其视为 7d 这样逻辑更清晰,也避免了 lint 警告。 --------- Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com> Co-authored-by: OpenAI Codex <noreply@openai.com>
270 lines
9.2 KiB
Vue
270 lines
9.2 KiB
Vue
<template>
|
|
<div v-if="showUsageWindows">
|
|
<!-- Anthropic OAuth and Setup Token accounts: fetch real usage data -->
|
|
<template v-if="account.platform === 'anthropic' && (account.type === 'oauth' || account.type === 'setup-token')">
|
|
<!-- Loading state -->
|
|
<div v-if="loading" class="space-y-1.5">
|
|
<!-- OAuth: 3 rows, Setup Token: 1 row -->
|
|
<div class="flex items-center gap-1">
|
|
<div class="w-[32px] h-3 bg-gray-200 dark:bg-gray-700 rounded animate-pulse"></div>
|
|
<div class="w-8 h-1.5 bg-gray-200 dark:bg-gray-700 rounded-full animate-pulse"></div>
|
|
<div class="w-[32px] h-3 bg-gray-200 dark:bg-gray-700 rounded animate-pulse"></div>
|
|
</div>
|
|
<template v-if="account.type === 'oauth'">
|
|
<div class="flex items-center gap-1">
|
|
<div class="w-[32px] h-3 bg-gray-200 dark:bg-gray-700 rounded animate-pulse"></div>
|
|
<div class="w-8 h-1.5 bg-gray-200 dark:bg-gray-700 rounded-full animate-pulse"></div>
|
|
<div class="w-[32px] h-3 bg-gray-200 dark:bg-gray-700 rounded animate-pulse"></div>
|
|
</div>
|
|
<div class="flex items-center gap-1">
|
|
<div class="w-[32px] h-3 bg-gray-200 dark:bg-gray-700 rounded animate-pulse"></div>
|
|
<div class="w-8 h-1.5 bg-gray-200 dark:bg-gray-700 rounded-full animate-pulse"></div>
|
|
<div class="w-[32px] h-3 bg-gray-200 dark:bg-gray-700 rounded animate-pulse"></div>
|
|
</div>
|
|
</template>
|
|
</div>
|
|
|
|
<!-- Error state -->
|
|
<div v-else-if="error" class="text-xs text-red-500">
|
|
{{ error }}
|
|
</div>
|
|
|
|
<!-- Usage data -->
|
|
<div v-else-if="usageInfo" class="space-y-1">
|
|
<!-- 5h Window -->
|
|
<UsageProgressBar
|
|
v-if="usageInfo.five_hour"
|
|
label="5h"
|
|
:utilization="usageInfo.five_hour.utilization"
|
|
:resets-at="usageInfo.five_hour.resets_at"
|
|
:window-stats="usageInfo.five_hour.window_stats"
|
|
color="indigo"
|
|
/>
|
|
|
|
<!-- 7d Window (OAuth only) -->
|
|
<UsageProgressBar
|
|
v-if="usageInfo.seven_day"
|
|
label="7d"
|
|
:utilization="usageInfo.seven_day.utilization"
|
|
:resets-at="usageInfo.seven_day.resets_at"
|
|
color="emerald"
|
|
/>
|
|
|
|
<!-- 7d Sonnet Window (OAuth only) -->
|
|
<UsageProgressBar
|
|
v-if="usageInfo.seven_day_sonnet"
|
|
label="7d S"
|
|
:utilization="usageInfo.seven_day_sonnet.utilization"
|
|
:resets-at="usageInfo.seven_day_sonnet.resets_at"
|
|
color="purple"
|
|
/>
|
|
</div>
|
|
|
|
<!-- No data yet -->
|
|
<div v-else class="text-xs text-gray-400">
|
|
-
|
|
</div>
|
|
</template>
|
|
|
|
<!-- OpenAI OAuth accounts: show Codex usage from extra field -->
|
|
<template v-else-if="account.platform === 'openai' && account.type === 'oauth'">
|
|
<div v-if="hasCodexUsage" class="space-y-1">
|
|
<!-- 5h Window -->
|
|
<UsageProgressBar
|
|
v-if="codex5hUsedPercent !== null"
|
|
label="5h"
|
|
:utilization="codex5hUsedPercent"
|
|
:resets-at="codex5hResetAt"
|
|
color="indigo"
|
|
/>
|
|
|
|
<!-- 7d Window -->
|
|
<UsageProgressBar
|
|
v-if="codex7dUsedPercent !== null"
|
|
label="7d"
|
|
:utilization="codex7dUsedPercent"
|
|
:resets-at="codex7dResetAt"
|
|
color="emerald"
|
|
/>
|
|
</div>
|
|
<div v-else class="text-xs text-gray-400">-</div>
|
|
</template>
|
|
|
|
<!-- Other accounts: no usage window -->
|
|
<template v-else>
|
|
<div class="text-xs text-gray-400">-</div>
|
|
</template>
|
|
</div>
|
|
|
|
<!-- Non-OAuth/Setup-Token accounts -->
|
|
<div v-else class="text-xs text-gray-400">
|
|
-
|
|
</div>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import { ref, computed, onMounted } from 'vue'
|
|
import { adminAPI } from '@/api/admin'
|
|
import type { Account, AccountUsageInfo } from '@/types'
|
|
import UsageProgressBar from './UsageProgressBar.vue'
|
|
|
|
const props = defineProps<{
|
|
account: Account
|
|
}>()
|
|
|
|
const loading = ref(false)
|
|
const error = ref<string | null>(null)
|
|
const usageInfo = ref<AccountUsageInfo | null>(null)
|
|
|
|
// Show usage windows for OAuth and Setup Token accounts
|
|
const showUsageWindows = computed(() =>
|
|
props.account.type === 'oauth' || props.account.type === 'setup-token'
|
|
)
|
|
|
|
// OpenAI Codex usage computed properties
|
|
const hasCodexUsage = computed(() => {
|
|
const extra = props.account.extra
|
|
return extra && (
|
|
// Check for new canonical fields first
|
|
extra.codex_5h_used_percent !== undefined ||
|
|
extra.codex_7d_used_percent !== undefined ||
|
|
// Fallback to legacy fields
|
|
extra.codex_primary_used_percent !== undefined ||
|
|
extra.codex_secondary_used_percent !== undefined
|
|
)
|
|
})
|
|
|
|
// 5h window usage (prefer canonical field)
|
|
const codex5hUsedPercent = computed(() => {
|
|
const extra = props.account.extra
|
|
if (!extra) return null
|
|
|
|
// Prefer canonical field
|
|
if (extra.codex_5h_used_percent !== undefined) {
|
|
return extra.codex_5h_used_percent
|
|
}
|
|
|
|
// Fallback: detect from legacy fields using window_minutes
|
|
if (extra.codex_primary_window_minutes !== undefined && extra.codex_primary_window_minutes <= 360) {
|
|
return extra.codex_primary_used_percent ?? null
|
|
}
|
|
if (extra.codex_secondary_window_minutes !== undefined && extra.codex_secondary_window_minutes <= 360) {
|
|
return extra.codex_secondary_used_percent ?? null
|
|
}
|
|
|
|
// Legacy assumption: secondary = 5h (may be incorrect)
|
|
return extra.codex_secondary_used_percent ?? null
|
|
})
|
|
|
|
const codex5hResetAt = computed(() => {
|
|
const extra = props.account.extra
|
|
if (!extra) return null
|
|
|
|
// Prefer canonical field
|
|
if (extra.codex_5h_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_5h_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
|
|
// Fallback: detect from legacy fields using window_minutes
|
|
if (extra.codex_primary_window_minutes !== undefined && extra.codex_primary_window_minutes <= 360) {
|
|
if (extra.codex_primary_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_primary_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
}
|
|
if (extra.codex_secondary_window_minutes !== undefined && extra.codex_secondary_window_minutes <= 360) {
|
|
if (extra.codex_secondary_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_secondary_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
}
|
|
|
|
// Legacy assumption: secondary = 5h
|
|
if (extra.codex_secondary_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_secondary_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
|
|
return null
|
|
})
|
|
|
|
// 7d window usage (prefer canonical field)
|
|
const codex7dUsedPercent = computed(() => {
|
|
const extra = props.account.extra
|
|
if (!extra) return null
|
|
|
|
// Prefer canonical field
|
|
if (extra.codex_7d_used_percent !== undefined) {
|
|
return extra.codex_7d_used_percent
|
|
}
|
|
|
|
// Fallback: detect from legacy fields using window_minutes
|
|
if (extra.codex_primary_window_minutes !== undefined && extra.codex_primary_window_minutes >= 10000) {
|
|
return extra.codex_primary_used_percent ?? null
|
|
}
|
|
if (extra.codex_secondary_window_minutes !== undefined && extra.codex_secondary_window_minutes >= 10000) {
|
|
return extra.codex_secondary_used_percent ?? null
|
|
}
|
|
|
|
// Legacy assumption: primary = 7d (may be incorrect)
|
|
return extra.codex_primary_used_percent ?? null
|
|
})
|
|
|
|
const codex7dResetAt = computed(() => {
|
|
const extra = props.account.extra
|
|
if (!extra) return null
|
|
|
|
// Prefer canonical field
|
|
if (extra.codex_7d_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_7d_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
|
|
// Fallback: detect from legacy fields using window_minutes
|
|
if (extra.codex_primary_window_minutes !== undefined && extra.codex_primary_window_minutes >= 10000) {
|
|
if (extra.codex_primary_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_primary_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
}
|
|
if (extra.codex_secondary_window_minutes !== undefined && extra.codex_secondary_window_minutes >= 10000) {
|
|
if (extra.codex_secondary_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_secondary_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
}
|
|
|
|
// Legacy assumption: primary = 7d
|
|
if (extra.codex_primary_reset_after_seconds !== undefined) {
|
|
const resetTime = new Date(Date.now() + extra.codex_primary_reset_after_seconds * 1000)
|
|
return resetTime.toISOString()
|
|
}
|
|
|
|
return null
|
|
})
|
|
|
|
const loadUsage = async () => {
|
|
// Fetch usage for Anthropic OAuth and Setup Token accounts
|
|
// OpenAI usage comes from account.extra field (updated during forwarding)
|
|
if (props.account.platform !== 'anthropic') return
|
|
if (props.account.type !== 'oauth' && props.account.type !== 'setup-token') return
|
|
|
|
loading.value = true
|
|
error.value = null
|
|
|
|
try {
|
|
usageInfo.value = await adminAPI.accounts.getUsage(props.account.id)
|
|
} catch (e: any) {
|
|
error.value = 'Failed'
|
|
console.error('Failed to load usage:', e)
|
|
} finally {
|
|
loading.value = false
|
|
}
|
|
}
|
|
|
|
onMounted(() => {
|
|
loadUsage()
|
|
})
|
|
</script>
|