mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-05 00:47:48 +08:00
Merge pull request #681 from zhefox/main
Codex 重置功能和显示缓存修复以及批量key的导入和管理功能
This commit is contained in:
@@ -337,9 +337,39 @@ export interface PoolBatchAction {
|
||||
| 'delete'
|
||||
| 'clear_proxy'
|
||||
| 'set_proxy'
|
||||
| 'update_settings'
|
||||
payload?: Record<string, unknown> | null
|
||||
}
|
||||
|
||||
export interface PoolKeySettingsPatch {
|
||||
internal_priority?: number
|
||||
rpm_limit?: number | null
|
||||
concurrent_limit?: number | null
|
||||
cache_ttl_minutes?: number
|
||||
max_probe_interval_minutes?: number
|
||||
is_active?: boolean
|
||||
note?: string | null
|
||||
proxy_node_id?: string | null
|
||||
}
|
||||
|
||||
export interface PoolBatchImportRequest {
|
||||
keys: Array<{
|
||||
name: string
|
||||
api_key: string
|
||||
auth_type: 'api_key' | 'bearer'
|
||||
api_formats?: string[]
|
||||
settings?: PoolKeySettingsPatch
|
||||
}>
|
||||
api_formats?: string[]
|
||||
settings?: PoolKeySettingsPatch
|
||||
}
|
||||
|
||||
export interface PoolBatchImportResult {
|
||||
imported: number
|
||||
skipped: number
|
||||
errors: Array<{ index: number; reason: string }>
|
||||
}
|
||||
|
||||
interface PoolReadOptions {
|
||||
cacheTtlMs?: number
|
||||
}
|
||||
@@ -442,6 +472,18 @@ export async function batchActionPoolKeys(
|
||||
return response.data
|
||||
}
|
||||
|
||||
export async function batchImportPoolKeys(
|
||||
providerId: string,
|
||||
body: PoolBatchImportRequest,
|
||||
): Promise<PoolBatchImportResult> {
|
||||
const response = await client.post<PoolBatchImportResult>(
|
||||
`/api/admin/pool/${providerId}/keys/batch-import`,
|
||||
body,
|
||||
{ timeout: POOL_BATCH_ACTION_TIMEOUT_MS },
|
||||
)
|
||||
return response.data
|
||||
}
|
||||
|
||||
export interface BatchDeleteTaskStatus {
|
||||
task_id: string
|
||||
status: 'pending' | 'running' | 'completed' | 'failed'
|
||||
|
||||
@@ -210,30 +210,228 @@
|
||||
<div class="text-xs font-medium text-foreground">
|
||||
执行动作
|
||||
</div>
|
||||
<div class="text-[11px] text-muted-foreground">
|
||||
代理节点(仅“配置代理”动作生效)
|
||||
</div>
|
||||
<ProxyNodeSelect
|
||||
:model-value="proxyNodeIdForAction"
|
||||
trigger-class="h-8"
|
||||
@update:model-value="(v: string) => proxyNodeIdForAction = v"
|
||||
/>
|
||||
<div class="grid gap-2 sm:grid-cols-2 lg:grid-cols-1">
|
||||
<Button
|
||||
v-for="item in ACTION_OPTIONS"
|
||||
:key="item.value"
|
||||
class="h-8 w-full px-3 text-xs"
|
||||
class="h-9 w-full px-3 text-xs"
|
||||
:variant="getActionButtonVariant(item)"
|
||||
:disabled="!canExecuteSpecifiedAction(item.value)"
|
||||
@click="confirmAndExecuteAction(item.value)"
|
||||
:disabled="!canSelectAction(item.value)"
|
||||
@click="handleActionButtonClick(item.value)"
|
||||
>
|
||||
{{ item.label }}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="selectedAction === 'set_proxy'"
|
||||
class="space-y-2 border-t border-border/60 pt-3"
|
||||
>
|
||||
<div class="text-[11px] text-muted-foreground">选择要绑定的代理节点</div>
|
||||
<ProxyNodeSelect
|
||||
:model-value="proxyNodeIdForAction"
|
||||
trigger-class="h-9"
|
||||
@update:model-value="(v: string) => proxyNodeIdForAction = v"
|
||||
/>
|
||||
<Button
|
||||
class="h-9 w-full text-xs"
|
||||
:disabled="!canExecuteSpecifiedAction('set_proxy')"
|
||||
@click="confirmAndExecuteAction('set_proxy')"
|
||||
>
|
||||
应用代理设置
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<section
|
||||
v-if="selectedAction === 'update_settings'"
|
||||
class="space-y-3 rounded-lg border border-primary/25 bg-primary/5 p-3 sm:p-4"
|
||||
>
|
||||
<div class="flex flex-wrap items-start justify-between gap-2">
|
||||
<div>
|
||||
<h3 class="text-sm font-semibold">更多设置</h3>
|
||||
<p class="text-[11px] text-muted-foreground">仅更新已勾选字段,未勾选配置保持不变</p>
|
||||
</div>
|
||||
<Badge variant="outline" class="tabular-nums">已选 {{ selectedSettingsCount }} 项</Badge>
|
||||
</div>
|
||||
|
||||
<div class="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
|
||||
<div class="space-y-2 rounded-md border bg-background p-3">
|
||||
<div class="flex min-h-6 items-center gap-2">
|
||||
<Checkbox
|
||||
:checked="settingsSelection.internal_priority"
|
||||
@update:checked="settingsSelection.internal_priority = $event === true"
|
||||
/>
|
||||
<Label class="text-xs">优先级</Label>
|
||||
</div>
|
||||
<Input
|
||||
v-model.number="settingsDraft.internal_priority"
|
||||
type="number"
|
||||
min="0"
|
||||
class="h-9"
|
||||
:disabled="!settingsSelection.internal_priority"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="space-y-2 rounded-md border bg-background p-3">
|
||||
<div class="flex min-h-6 items-center gap-2">
|
||||
<Checkbox
|
||||
:checked="settingsSelection.rpm_limit"
|
||||
@update:checked="settingsSelection.rpm_limit = $event === true"
|
||||
/>
|
||||
<Label class="text-xs">RPM 限制</Label>
|
||||
</div>
|
||||
<Input
|
||||
:model-value="settingsDraft.rpm_limit ?? ''"
|
||||
type="number"
|
||||
min="1"
|
||||
max="10000"
|
||||
class="h-9"
|
||||
placeholder="留空为自适应"
|
||||
:disabled="!settingsSelection.rpm_limit"
|
||||
@update:model-value="settingsDraft.rpm_limit = parseNullableNumberInput($event, { min: 1, max: 10000 })"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="space-y-2 rounded-md border bg-background p-3">
|
||||
<div class="flex min-h-6 items-center gap-2">
|
||||
<Checkbox
|
||||
:checked="settingsSelection.concurrent_limit"
|
||||
@update:checked="settingsSelection.concurrent_limit = $event === true"
|
||||
/>
|
||||
<Label class="text-xs">并发请求上限</Label>
|
||||
</div>
|
||||
<Input
|
||||
:model-value="settingsDraft.concurrent_limit ?? ''"
|
||||
type="number"
|
||||
min="0"
|
||||
class="h-9"
|
||||
placeholder="留空为不限制"
|
||||
:disabled="!settingsSelection.concurrent_limit"
|
||||
@update:model-value="settingsDraft.concurrent_limit = parseNullableNumberInput($event, { min: 0 })"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="space-y-2 rounded-md border bg-background p-3">
|
||||
<div class="flex min-h-6 items-center gap-2">
|
||||
<Checkbox
|
||||
:checked="settingsSelection.cache_ttl_minutes"
|
||||
@update:checked="settingsSelection.cache_ttl_minutes = $event === true"
|
||||
/>
|
||||
<Label class="text-xs">缓存 TTL(分钟)</Label>
|
||||
</div>
|
||||
<Input
|
||||
:model-value="settingsDraft.cache_ttl_minutes"
|
||||
type="number"
|
||||
min="0"
|
||||
max="60"
|
||||
class="h-9"
|
||||
:disabled="!settingsSelection.cache_ttl_minutes"
|
||||
@update:model-value="settingsDraft.cache_ttl_minutes = parseNumberInput($event, { min: 0, max: 60 }) ?? 5"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="space-y-2 rounded-md border bg-background p-3">
|
||||
<div class="flex min-h-6 items-center gap-2">
|
||||
<Checkbox
|
||||
:checked="settingsSelection.max_probe_interval_minutes"
|
||||
@update:checked="settingsSelection.max_probe_interval_minutes = $event === true"
|
||||
/>
|
||||
<Label class="text-xs">熔断探测(分钟)</Label>
|
||||
</div>
|
||||
<Input
|
||||
:model-value="settingsDraft.max_probe_interval_minutes"
|
||||
type="number"
|
||||
min="0"
|
||||
max="32"
|
||||
class="h-9"
|
||||
:disabled="!settingsSelection.max_probe_interval_minutes"
|
||||
@update:model-value="settingsDraft.max_probe_interval_minutes = parseNumberInput($event, { min: 0, max: 32 }) ?? 32"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="space-y-2 rounded-md border bg-background p-3">
|
||||
<div class="flex min-h-6 items-center gap-2">
|
||||
<Checkbox
|
||||
:checked="settingsSelection.is_active"
|
||||
@update:checked="settingsSelection.is_active = $event === true"
|
||||
/>
|
||||
<Label class="text-xs">启用状态</Label>
|
||||
</div>
|
||||
<Select v-model="settingsStatus" :disabled="!settingsSelection.is_active">
|
||||
<SelectTrigger class="h-9"><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="enabled">启用</SelectItem>
|
||||
<SelectItem value="disabled">停用</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
|
||||
<div class="space-y-2 rounded-md border bg-background p-3 sm:col-span-2">
|
||||
<div class="flex min-h-6 items-center gap-2">
|
||||
<Checkbox
|
||||
:checked="settingsSelection.proxy_node_id"
|
||||
@update:checked="settingsSelection.proxy_node_id = $event === true"
|
||||
/>
|
||||
<Label class="text-xs">账号代理</Label>
|
||||
</div>
|
||||
<div class="grid gap-2 sm:grid-cols-[9rem_minmax(0,1fr)]">
|
||||
<Select v-model="settingsDraft.proxy_mode" :disabled="!settingsSelection.proxy_node_id">
|
||||
<SelectTrigger class="h-9"><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="set">设置节点</SelectItem>
|
||||
<SelectItem value="clear">清除代理</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<ProxyNodeSelect
|
||||
v-if="settingsDraft.proxy_mode === 'set'"
|
||||
:model-value="settingsDraft.proxy_node_id"
|
||||
trigger-class="h-9"
|
||||
:class="!settingsSelection.proxy_node_id ? 'pointer-events-none opacity-50' : ''"
|
||||
@update:model-value="(value: string) => settingsDraft.proxy_node_id = value"
|
||||
/>
|
||||
<div
|
||||
v-else
|
||||
class="flex h-9 items-center rounded-md border bg-muted/30 px-3 text-xs text-muted-foreground"
|
||||
>
|
||||
回退到 Provider 默认代理
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="space-y-2 rounded-md border bg-background p-3">
|
||||
<div class="flex min-h-6 items-center gap-2">
|
||||
<Checkbox
|
||||
:checked="settingsSelection.note"
|
||||
@update:checked="settingsSelection.note = $event === true"
|
||||
/>
|
||||
<Label class="text-xs">备注</Label>
|
||||
</div>
|
||||
<Input
|
||||
v-model="settingsDraft.note"
|
||||
class="h-9"
|
||||
placeholder="留空清除备注"
|
||||
:disabled="!settingsSelection.note"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
|
||||
<p class="min-h-5 text-xs text-destructive">
|
||||
{{ settingsErrors[0] || '' }}
|
||||
</p>
|
||||
<Button
|
||||
class="min-h-10 sm:min-w-36"
|
||||
:disabled="!canExecuteSpecifiedAction('update_settings')"
|
||||
@click="confirmAndExecuteAction('update_settings')"
|
||||
>
|
||||
应用更多设置
|
||||
</Button>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<div
|
||||
v-if="executing && progressTotal > 0"
|
||||
class="space-y-1"
|
||||
@@ -270,8 +468,20 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, onBeforeUnmount, ref, watch } from 'vue'
|
||||
import { Dialog, Button, Input, Checkbox, Badge } from '@/components/ui'
|
||||
import { computed, onBeforeUnmount, reactive, ref, watch } from 'vue'
|
||||
import {
|
||||
Badge,
|
||||
Button,
|
||||
Checkbox,
|
||||
Dialog,
|
||||
Input,
|
||||
Label,
|
||||
Select,
|
||||
SelectContent,
|
||||
SelectItem,
|
||||
SelectTrigger,
|
||||
SelectValue,
|
||||
} from '@/components/ui'
|
||||
import ProxyNodeSelect from '@/features/providers/components/ProxyNodeSelect.vue'
|
||||
import { RefreshCw, ChevronLeft, ChevronRight, ChevronsLeft, ChevronsRight } from 'lucide-vue-next'
|
||||
import { useToast } from '@/composables/useToast'
|
||||
@@ -302,6 +512,13 @@ import {
|
||||
} from '@/utils/providerKeyStatus'
|
||||
import { getQuotaDisplayText } from '@/utils/providerKeyQuota'
|
||||
import { runChunkedBatchAction } from '@/utils/batchAction'
|
||||
import { parseNullableNumberInput, parseNumberInput } from '@/utils/form'
|
||||
import {
|
||||
buildPoolKeySettingsPatch,
|
||||
createPoolKeyBatchSettingSelection,
|
||||
createPoolKeyBatchSettingsDraft,
|
||||
validatePoolKeyBatchSettings,
|
||||
} from '@/features/pool/utils/poolKeyBatchSettings'
|
||||
|
||||
type QuickSelectorValue =
|
||||
| 'banned'
|
||||
@@ -322,6 +539,7 @@ type BatchActionValue =
|
||||
| 'refresh_quota'
|
||||
| 'clear_proxy'
|
||||
| 'set_proxy'
|
||||
| 'update_settings'
|
||||
| 'enable'
|
||||
| 'disable'
|
||||
|
||||
@@ -373,6 +591,7 @@ const ACTION_OPTIONS: BatchActionOption[] = [
|
||||
{ value: 'refresh_quota', label: '刷新额度', hint: '调用额度刷新接口,适合核对最新配额状态。' },
|
||||
{ value: 'refresh_oauth', label: '刷新 OAuth', hint: '仅对 OAuth 账号有效,非 OAuth 账号会自动跳过。' },
|
||||
{ value: 'set_proxy', label: '配置代理', hint: '为选中账号绑定独立代理节点。' },
|
||||
{ value: 'update_settings', label: '更多设置', hint: '选择性修改 RPM、并发、熔断、备注和代理等配置。' },
|
||||
{ value: 'clear_proxy', label: '清除代理', hint: '移除账号独立代理,回退到提供商默认代理。' },
|
||||
{ value: 'enable', label: '启用', hint: '批量启用账号,恢复可调度状态。' },
|
||||
{ value: 'disable', label: '禁用', hint: '批量禁用账号,保留数据但停止调度。' },
|
||||
@@ -394,6 +613,12 @@ const selectAllFiltered = ref(false)
|
||||
const searchText = ref('')
|
||||
const selectedAction = ref<BatchActionValue>('refresh_quota')
|
||||
const proxyNodeIdForAction = ref('')
|
||||
const settingsSelection = reactive(createPoolKeyBatchSettingSelection())
|
||||
const settingsDraft = reactive(createPoolKeyBatchSettingsDraft())
|
||||
const settingsStatus = computed({
|
||||
get: () => settingsDraft.is_active ? 'enabled' : 'disabled',
|
||||
set: (value: string) => { settingsDraft.is_active = value === 'enabled' },
|
||||
})
|
||||
const lastResultMessage = ref('')
|
||||
const progressTotal = ref(0)
|
||||
const progressDone = ref(0)
|
||||
@@ -448,6 +673,8 @@ const isCurrentPageFullySelected = computed(() => {
|
||||
})
|
||||
const canClearSelection = computed(() => selectAllFiltered.value || selectedKeyIds.value.length > 0)
|
||||
const activeQuickSelectorSet = computed(() => new Set(activeQuickSelectors.value))
|
||||
const settingsErrors = computed(() => validatePoolKeyBatchSettings(settingsSelection, settingsDraft))
|
||||
const selectedSettingsCount = computed(() => Object.values(settingsSelection).filter(Boolean).length)
|
||||
|
||||
function sanitizeFileNamePart(value: unknown, fallback: string): string {
|
||||
const sanitized = String(value || '')
|
||||
@@ -706,14 +933,33 @@ function toggleQuickSelector(selector: QuickSelectorValue): void {
|
||||
function canExecuteSpecifiedAction(action: BatchActionValue): boolean {
|
||||
if (executing.value || loading.value || selectedCount.value === 0) return false
|
||||
if (action === 'set_proxy') return Boolean(proxyNodeIdForAction.value)
|
||||
if (action === 'update_settings') return settingsErrors.value.length === 0
|
||||
return true
|
||||
}
|
||||
|
||||
function canSelectAction(action: BatchActionValue): boolean {
|
||||
if (executing.value || loading.value) return false
|
||||
if (action === 'set_proxy' || action === 'update_settings') return true
|
||||
return selectedCount.value > 0
|
||||
}
|
||||
|
||||
function getActionButtonVariant(option: BatchActionOption): 'default' | 'destructive' | 'outline' {
|
||||
if (option.destructive) return 'destructive'
|
||||
if (
|
||||
option.value === selectedAction.value
|
||||
&& (option.value === 'set_proxy' || option.value === 'update_settings')
|
||||
) return 'default'
|
||||
return 'outline'
|
||||
}
|
||||
|
||||
function handleActionButtonClick(action: BatchActionValue): void {
|
||||
if (action === 'set_proxy' || action === 'update_settings') {
|
||||
selectedAction.value = action
|
||||
return
|
||||
}
|
||||
void confirmAndExecuteAction(action)
|
||||
}
|
||||
|
||||
async function confirmAndExecuteAction(action: BatchActionValue): Promise<void> {
|
||||
selectedAction.value = action
|
||||
if (selectedCount.value === 0) {
|
||||
@@ -724,6 +970,10 @@ async function confirmAndExecuteAction(action: BatchActionValue): Promise<void>
|
||||
warning('请先选择代理节点')
|
||||
return
|
||||
}
|
||||
if (action === 'update_settings' && settingsErrors.value.length > 0) {
|
||||
warning(settingsErrors.value[0])
|
||||
return
|
||||
}
|
||||
if (!canExecuteSpecifiedAction(action)) return
|
||||
|
||||
const actionOption = ACTION_OPTIONS.find((item) => item.value === action)
|
||||
@@ -809,6 +1059,10 @@ async function executeAction(actionOverride?: BatchActionValue): Promise<void> {
|
||||
warning('请先选择代理节点')
|
||||
return
|
||||
}
|
||||
if (selectedAction.value === 'update_settings' && settingsErrors.value.length > 0) {
|
||||
warning(settingsErrors.value[0])
|
||||
return
|
||||
}
|
||||
|
||||
executing.value = true
|
||||
let successCount = 0
|
||||
@@ -930,7 +1184,7 @@ async function executeAction(actionOverride?: BatchActionValue): Promise<void> {
|
||||
|
||||
progressDone.value = Math.min(i + BATCH_SIZE, targetIds.length)
|
||||
}
|
||||
} else if (['enable', 'disable', 'clear_proxy', 'set_proxy'].includes(selectedAction.value)) {
|
||||
} else if (['enable', 'disable', 'clear_proxy', 'set_proxy', 'update_settings'].includes(selectedAction.value)) {
|
||||
const targetIds = selectedKeys.map((key) => key.key_id)
|
||||
const BATCH_SIZE = 2000
|
||||
const totalBatches = Math.ceil(targetIds.length / BATCH_SIZE)
|
||||
@@ -944,12 +1198,14 @@ async function executeAction(actionOverride?: BatchActionValue): Promise<void> {
|
||||
|
||||
const payload = selectedAction.value === 'set_proxy'
|
||||
? { node_id: proxyNodeIdForAction.value, enabled: true }
|
||||
: undefined
|
||||
: selectedAction.value === 'update_settings'
|
||||
? buildPoolKeySettingsPatch(settingsSelection, settingsDraft)
|
||||
: undefined
|
||||
|
||||
try {
|
||||
const result = await batchActionPoolKeys(props.providerId, {
|
||||
key_ids: batch,
|
||||
action: selectedAction.value as 'enable' | 'disable' | 'clear_proxy' | 'set_proxy',
|
||||
action: selectedAction.value as 'enable' | 'disable' | 'clear_proxy' | 'set_proxy' | 'update_settings',
|
||||
...(payload ? { payload } : {}),
|
||||
})
|
||||
successCount += result.affected
|
||||
@@ -1049,6 +1305,8 @@ watch(
|
||||
activeQuickSelectors.value = []
|
||||
selectedAction.value = 'refresh_quota'
|
||||
proxyNodeIdForAction.value = ''
|
||||
Object.assign(settingsSelection, createPoolKeyBatchSettingSelection())
|
||||
Object.assign(settingsDraft, createPoolKeyBatchSettingsDraft())
|
||||
resetSelection(true)
|
||||
filteredTotal.value = 0
|
||||
pageKeys.value = []
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
import { describe, expect, it } from 'vitest'
|
||||
|
||||
import {
|
||||
buildPoolKeySettingsPatch,
|
||||
createPoolKeyBatchSettingSelection,
|
||||
createPoolKeyBatchSettingsDraft,
|
||||
validatePoolKeyBatchSettings,
|
||||
} from '../poolKeyBatchSettings'
|
||||
|
||||
describe('pool key batch settings', () => {
|
||||
it('only includes explicitly selected fields', () => {
|
||||
const selection = createPoolKeyBatchSettingSelection()
|
||||
const draft = createPoolKeyBatchSettingsDraft()
|
||||
selection.rpm_limit = true
|
||||
selection.proxy_node_id = true
|
||||
draft.rpm_limit = 800
|
||||
draft.proxy_mode = 'clear'
|
||||
|
||||
expect(buildPoolKeySettingsPatch(selection, draft)).toEqual({
|
||||
rpm_limit: 800,
|
||||
proxy_node_id: null,
|
||||
})
|
||||
})
|
||||
|
||||
it('supports adaptive RPM and unlimited concurrency', () => {
|
||||
const selection = createPoolKeyBatchSettingSelection()
|
||||
const draft = createPoolKeyBatchSettingsDraft()
|
||||
selection.rpm_limit = true
|
||||
selection.concurrent_limit = true
|
||||
|
||||
expect(validatePoolKeyBatchSettings(selection, draft)).toEqual([])
|
||||
expect(buildPoolKeySettingsPatch(selection, draft)).toEqual({
|
||||
rpm_limit: null,
|
||||
concurrent_limit: null,
|
||||
})
|
||||
})
|
||||
|
||||
it('requires a selected field and a proxy node for set mode', () => {
|
||||
const selection = createPoolKeyBatchSettingSelection()
|
||||
const draft = createPoolKeyBatchSettingsDraft()
|
||||
|
||||
expect(validatePoolKeyBatchSettings(selection, draft)).toEqual(['请至少选择一个要修改的设置'])
|
||||
|
||||
selection.proxy_node_id = true
|
||||
expect(validatePoolKeyBatchSettings(selection, draft)).toEqual(['请选择要设置的代理节点'])
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,109 @@
|
||||
import type { PoolKeySettingsPatch } from '@/api/endpoints/pool'
|
||||
|
||||
export type PoolKeyBatchSettingField =
|
||||
| 'internal_priority'
|
||||
| 'rpm_limit'
|
||||
| 'concurrent_limit'
|
||||
| 'cache_ttl_minutes'
|
||||
| 'max_probe_interval_minutes'
|
||||
| 'is_active'
|
||||
| 'note'
|
||||
| 'proxy_node_id'
|
||||
|
||||
export type PoolKeyBatchSettingSelection = Record<PoolKeyBatchSettingField, boolean>
|
||||
|
||||
export interface PoolKeyBatchSettingsDraft {
|
||||
internal_priority: number
|
||||
rpm_limit: number | null
|
||||
concurrent_limit: number | null
|
||||
cache_ttl_minutes: number
|
||||
max_probe_interval_minutes: number
|
||||
is_active: boolean
|
||||
note: string
|
||||
proxy_mode: 'set' | 'clear'
|
||||
proxy_node_id: string
|
||||
}
|
||||
|
||||
export function createPoolKeyBatchSettingSelection(): PoolKeyBatchSettingSelection {
|
||||
return {
|
||||
internal_priority: false,
|
||||
rpm_limit: false,
|
||||
concurrent_limit: false,
|
||||
cache_ttl_minutes: false,
|
||||
max_probe_interval_minutes: false,
|
||||
is_active: false,
|
||||
note: false,
|
||||
proxy_node_id: false,
|
||||
}
|
||||
}
|
||||
|
||||
export function createPoolKeyBatchSettingsDraft(): PoolKeyBatchSettingsDraft {
|
||||
return {
|
||||
internal_priority: 50,
|
||||
rpm_limit: null,
|
||||
concurrent_limit: null,
|
||||
cache_ttl_minutes: 5,
|
||||
max_probe_interval_minutes: 32,
|
||||
is_active: true,
|
||||
note: '',
|
||||
proxy_mode: 'set',
|
||||
proxy_node_id: '',
|
||||
}
|
||||
}
|
||||
|
||||
export function validatePoolKeyBatchSettings(
|
||||
selection: PoolKeyBatchSettingSelection,
|
||||
draft: PoolKeyBatchSettingsDraft,
|
||||
): string[] {
|
||||
const errors: string[] = []
|
||||
if (!Object.values(selection).some(Boolean)) errors.push('请至少选择一个要修改的设置')
|
||||
if (selection.internal_priority && (!Number.isInteger(draft.internal_priority) || draft.internal_priority < 0)) {
|
||||
errors.push('优先级必须是大于等于 0 的整数')
|
||||
}
|
||||
if (selection.rpm_limit && draft.rpm_limit !== null && (
|
||||
!Number.isInteger(draft.rpm_limit) || draft.rpm_limit < 1 || draft.rpm_limit > 10_000
|
||||
)) {
|
||||
errors.push('RPM 必须在 1 到 10000 之间,留空表示自适应')
|
||||
}
|
||||
if (selection.concurrent_limit && draft.concurrent_limit !== null && (
|
||||
!Number.isInteger(draft.concurrent_limit) || draft.concurrent_limit < 0
|
||||
)) {
|
||||
errors.push('并发上限必须是大于等于 0 的整数')
|
||||
}
|
||||
if (selection.cache_ttl_minutes && (
|
||||
!Number.isInteger(draft.cache_ttl_minutes) || draft.cache_ttl_minutes < 0 || draft.cache_ttl_minutes > 60
|
||||
)) {
|
||||
errors.push('缓存 TTL 必须在 0 到 60 分钟之间')
|
||||
}
|
||||
if (selection.max_probe_interval_minutes && (
|
||||
!Number.isInteger(draft.max_probe_interval_minutes)
|
||||
|| draft.max_probe_interval_minutes < 0
|
||||
|| draft.max_probe_interval_minutes > 32
|
||||
)) {
|
||||
errors.push('熔断探测必须在 0 到 32 分钟之间')
|
||||
}
|
||||
if (selection.proxy_node_id && draft.proxy_mode === 'set' && !draft.proxy_node_id.trim()) {
|
||||
errors.push('请选择要设置的代理节点')
|
||||
}
|
||||
return errors
|
||||
}
|
||||
|
||||
export function buildPoolKeySettingsPatch(
|
||||
selection: PoolKeyBatchSettingSelection,
|
||||
draft: PoolKeyBatchSettingsDraft,
|
||||
): PoolKeySettingsPatch {
|
||||
const patch: PoolKeySettingsPatch = {}
|
||||
if (selection.internal_priority) patch.internal_priority = draft.internal_priority
|
||||
if (selection.rpm_limit) patch.rpm_limit = draft.rpm_limit
|
||||
if (selection.concurrent_limit) patch.concurrent_limit = draft.concurrent_limit
|
||||
if (selection.cache_ttl_minutes) patch.cache_ttl_minutes = draft.cache_ttl_minutes
|
||||
if (selection.max_probe_interval_minutes) {
|
||||
patch.max_probe_interval_minutes = draft.max_probe_interval_minutes
|
||||
}
|
||||
if (selection.is_active) patch.is_active = draft.is_active
|
||||
if (selection.note) patch.note = draft.note.trim() || null
|
||||
if (selection.proxy_node_id) {
|
||||
patch.proxy_node_id = draft.proxy_mode === 'clear' ? null : draft.proxy_node_id.trim()
|
||||
}
|
||||
return patch
|
||||
}
|
||||
@@ -60,12 +60,22 @@
|
||||
<h3 class="text-sm font-semibold">
|
||||
{{ legacyT(isKeyManagedProviderType(provider.provider_type) ? '密钥管理' : '账号管理') }}
|
||||
</h3>
|
||||
<div class="flex items-center gap-2">
|
||||
<div class="flex flex-wrap items-center justify-end gap-2">
|
||||
<Button
|
||||
v-if="endpoints.length > 0 && provider.provider_type === 'custom'"
|
||||
variant="outline"
|
||||
size="sm"
|
||||
class="h-9"
|
||||
@click="keyBatchImportDialogOpen = true"
|
||||
>
|
||||
<ListPlus class="mr-1.5 h-3.5 w-3.5" />
|
||||
批量导入
|
||||
</Button>
|
||||
<Button
|
||||
v-if="endpoints.length > 0"
|
||||
variant="outline"
|
||||
size="sm"
|
||||
class="h-8"
|
||||
class="h-9"
|
||||
@click="handleAddKeyToFirstEndpoint"
|
||||
>
|
||||
<Plus class="w-3.5 h-3.5 mr-1.5" />
|
||||
@@ -279,7 +289,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
v-if="getCodexResetCreditsDisplay(key)"
|
||||
v-if="getCodexResetCreditAvailableCount(key) !== null"
|
||||
class="mt-3 border-t border-border/60 pt-2"
|
||||
>
|
||||
<div class="flex flex-wrap items-center gap-x-1 gap-y-1 text-[10px] leading-4 text-muted-foreground">
|
||||
@@ -823,6 +833,16 @@
|
||||
@saved="handleKeyChanged"
|
||||
/>
|
||||
|
||||
<ProviderKeyBatchImportDialog
|
||||
v-if="open && provider?.provider_type === 'custom'"
|
||||
:open="keyBatchImportDialogOpen"
|
||||
:provider-id="provider.id"
|
||||
:provider-name="provider.name"
|
||||
:available-api-formats="availableKeyApiFormats"
|
||||
@close="keyBatchImportDialogOpen = false"
|
||||
@saved="handleKeyChanged"
|
||||
/>
|
||||
|
||||
<!-- OAuth 账号对话框 -->
|
||||
<OAuthAccountDialog
|
||||
v-if="open && provider"
|
||||
@@ -913,6 +933,7 @@ import { ref, watch, computed, nextTick } from 'vue'
|
||||
import {
|
||||
Plus,
|
||||
Key,
|
||||
ListPlus,
|
||||
Loader2,
|
||||
GripVertical,
|
||||
ShieldX,
|
||||
@@ -951,6 +972,7 @@ import AlertDialog from '@/components/common/AlertDialog.vue'
|
||||
import AntigravityQuotaDialog from '@/features/providers/components/AntigravityQuotaDialog.vue'
|
||||
import FailoverRulesDialog from '@/features/providers/components/FailoverRulesDialog.vue'
|
||||
import ProviderDetailHeader from '@/features/providers/components/ProviderDetailHeader.vue'
|
||||
import ProviderKeyBatchImportDialog from '@/features/providers/components/ProviderKeyBatchImportDialog.vue'
|
||||
import ProviderKeyActionCluster from '@/features/providers/components/ProviderKeyActionCluster.vue'
|
||||
import ProviderKeyIdentityBlock from '@/features/providers/components/ProviderKeyIdentityBlock.vue'
|
||||
import ProviderMonthlyQuotaCard from '@/features/providers/components/ProviderMonthlyQuotaCard.vue'
|
||||
@@ -1014,6 +1036,7 @@ import {
|
||||
} from '@/utils/providerKeyStatus'
|
||||
import { getGeminiCliAccountCreditsText } from '@/utils/providerKeyQuota'
|
||||
import {
|
||||
createCodexResetCreditIdempotencyKey,
|
||||
formatCodexResetCreditCount as formatCodexResetCreditCountLabel,
|
||||
formatCodexResetCreditDays,
|
||||
getCodexResetCreditAvailableCount as getCodexResetCreditAvailableCountFromSnapshot,
|
||||
@@ -1082,6 +1105,7 @@ const endpointDialogOpen = ref(false)
|
||||
|
||||
// 密钥相关状态
|
||||
const keyFormDialogOpen = ref(false)
|
||||
const keyBatchImportDialogOpen = ref(false)
|
||||
const keyPermissionsDialogOpen = ref(false)
|
||||
const oauthAccountDialogOpen = ref(false)
|
||||
const oauthKeyEditDialogOpen = ref(false)
|
||||
@@ -1170,6 +1194,7 @@ const multiplierSaving = ref(false)
|
||||
const hasBlockingDialogOpen = computed(() =>
|
||||
endpointDialogOpen.value ||
|
||||
keyFormDialogOpen.value ||
|
||||
keyBatchImportDialogOpen.value ||
|
||||
keyPermissionsDialogOpen.value ||
|
||||
oauthAccountDialogOpen.value ||
|
||||
oauthKeyEditDialogOpen.value ||
|
||||
@@ -1316,6 +1341,7 @@ watch(
|
||||
// 重置所有对话框状态
|
||||
endpointDialogOpen.value = false
|
||||
keyFormDialogOpen.value = false
|
||||
keyBatchImportDialogOpen.value = false
|
||||
keyPermissionsDialogOpen.value = false
|
||||
oauthAccountDialogOpen.value = false
|
||||
oauthKeyEditDialogOpen.value = false
|
||||
@@ -1670,13 +1696,6 @@ async function handleClearOAuthInvalid(key: EndpointAPIKey) {
|
||||
}
|
||||
}
|
||||
|
||||
function createCodexResetCreditIdempotencyKey(): string {
|
||||
if (typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function') {
|
||||
return crypto.randomUUID()
|
||||
}
|
||||
throw new Error('浏览器不支持 crypto.randomUUID,无法生成安全幂等 ID')
|
||||
}
|
||||
|
||||
function codexResetCreditOutcomeFeedback(
|
||||
result: Awaited<ReturnType<typeof consumeCodexResetCredit>>,
|
||||
): { tone: 'success' | 'warning'; message: string } {
|
||||
@@ -2449,7 +2468,7 @@ function shouldAutoRefreshCodexQuota(): boolean {
|
||||
|
||||
if (isTokenExpiringSoon(key, now)) return true
|
||||
|
||||
// 只要有一个活跃 key 没有配额数据,就刷新一次
|
||||
// reset-credit 独立于 Token 刷新;这里只按账号配额缓存决定是否后台更新
|
||||
if (!hasCodexQuotaDisplayData(key)) {
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -0,0 +1,585 @@
|
||||
<template>
|
||||
<Dialog
|
||||
:model-value="open"
|
||||
title="批量导入 Key"
|
||||
:description="providerName ? `${providerName} · 名称和 Key 均为必填` : '名称和 Key 均为必填'"
|
||||
:icon="ListPlus"
|
||||
size="4xl"
|
||||
persistent
|
||||
@update:model-value="handleDialogUpdate"
|
||||
>
|
||||
<div class="space-y-3.5">
|
||||
<nav class="grid grid-cols-3 gap-1.5 rounded-xl bg-muted/40 p-1.5" aria-label="批量导入步骤">
|
||||
<button
|
||||
v-for="step in steps"
|
||||
:key="step.id"
|
||||
type="button"
|
||||
class="flex min-h-10 items-center justify-center gap-2 rounded-lg px-2 text-xs font-medium transition-[background-color,box-shadow,color,scale] active:scale-[0.96] disabled:cursor-default disabled:opacity-50 sm:text-sm"
|
||||
:class="currentStep === step.id
|
||||
? 'bg-background text-foreground shadow-[0_0_0_1px_rgb(0_0_0/0.06),0_1px_2px_rgb(0_0_0/0.06)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.08)]'
|
||||
: 'text-muted-foreground hover:bg-background/60 hover:text-foreground'"
|
||||
:disabled="!canNavigateToStep(step.id)"
|
||||
@click="goToStep(step.id)"
|
||||
>
|
||||
<span
|
||||
class="flex h-5 w-5 shrink-0 items-center justify-center rounded-md text-[10px] tabular-nums"
|
||||
:class="currentStep === step.id ? 'bg-foreground text-background' : 'bg-muted text-muted-foreground'"
|
||||
>{{ step.id }}</span>
|
||||
<span class="truncate">{{ step.label }}</span>
|
||||
</button>
|
||||
</nav>
|
||||
|
||||
<section
|
||||
v-if="currentStep === 1"
|
||||
class="overflow-hidden rounded-xl bg-background shadow-[0_0_0_1px_rgb(0_0_0/0.07),0_1px_2px_-1px_rgb(0_0_0/0.08),0_3px_8px_-3px_rgb(0_0_0/0.08)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.09)]"
|
||||
>
|
||||
<header class="flex min-h-14 items-center justify-between gap-3 border-b border-border/60 bg-muted/15 px-4 py-3">
|
||||
<div class="flex min-w-0 items-center gap-3">
|
||||
<span class="flex h-7 w-7 shrink-0 items-center justify-center rounded-md bg-foreground text-xs font-semibold text-background">1</span>
|
||||
<div class="min-w-0">
|
||||
<h3 class="text-balance text-sm font-semibold text-foreground">粘贴名称与 Key</h3>
|
||||
<p class="text-pretty text-[11px] leading-4 text-muted-foreground">每行一条,仅接受四个短横线分隔</p>
|
||||
</div>
|
||||
</div>
|
||||
<Badge
|
||||
:variant="parsed.errors.length > 0 ? 'destructive' : parsed.items.length > 0 ? 'success' : 'secondary'"
|
||||
class="shrink-0 tabular-nums"
|
||||
>
|
||||
{{ inputStatusText }}
|
||||
</Badge>
|
||||
</header>
|
||||
|
||||
<div class="min-w-0">
|
||||
<Label for="provider-key-batch-input" class="sr-only">Key 列表</Label>
|
||||
<Textarea
|
||||
id="provider-key-batch-input"
|
||||
v-model="inputText"
|
||||
class="h-[280px] min-h-[220px] max-h-[520px] !resize-y !rounded-none !border-0 !bg-transparent !px-4 !py-4 font-mono text-[13px] leading-6 !shadow-none !ring-0 focus-visible:!ring-0"
|
||||
spellcheck="false"
|
||||
placeholder="主账号----sk-xxxx 备用账号----sk-yyyy"
|
||||
/>
|
||||
<div
|
||||
v-if="parsed.errors.length > 0"
|
||||
class="mx-4 mb-3 space-y-1 rounded-lg bg-destructive/5 px-3 py-2 text-[11px] text-destructive ring-1 ring-destructive/20"
|
||||
>
|
||||
<div
|
||||
v-for="(item, index) in parsed.errors.slice(0, 6)"
|
||||
:key="`${item.lineNumber}-${index}`"
|
||||
>
|
||||
{{ item.lineNumber ? `第 ${item.lineNumber} 行:` : '' }}{{ item.message }}
|
||||
</div>
|
||||
<div v-if="parsed.errors.length > 6" class="font-medium">
|
||||
另有 {{ parsed.errors.length - 6 }} 个问题
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex flex-wrap items-center gap-2 border-t border-border/50 bg-muted/10 px-4 py-2.5 text-[11px] text-muted-foreground">
|
||||
<span class="rounded-md bg-muted px-2 py-1 font-mono text-foreground/80">名称----Key</span>
|
||||
<span>名称和 Key 都不能为空</span>
|
||||
<span class="ml-auto hidden tabular-nums sm:inline">已识别 {{ parsed.items.length }} 条</span>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section
|
||||
v-else-if="currentStep === 2"
|
||||
class="overflow-hidden rounded-xl bg-background shadow-[0_0_0_1px_rgb(0_0_0/0.07),0_1px_2px_-1px_rgb(0_0_0/0.08),0_3px_8px_-3px_rgb(0_0_0/0.08)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.09)]"
|
||||
>
|
||||
<header class="flex min-h-[72px] items-center gap-3 px-4 py-3">
|
||||
<span class="flex h-7 w-7 shrink-0 items-center justify-center rounded-md bg-foreground text-xs font-semibold text-background">
|
||||
2
|
||||
</span>
|
||||
<span class="min-w-0 flex-1">
|
||||
<span class="block text-sm font-semibold">统一配置</span>
|
||||
<span class="mt-1 flex flex-wrap gap-1.5">
|
||||
<span
|
||||
v-for="item in settingsSummaryItems"
|
||||
:key="item"
|
||||
class="rounded-md bg-muted px-2 py-0.5 text-[10px] leading-4 text-muted-foreground"
|
||||
>{{ item }}</span>
|
||||
</span>
|
||||
</span>
|
||||
<Badge :variant="selectedApiFormats.length > 0 ? 'success' : 'destructive'" class="ml-auto shrink-0 tabular-nums">
|
||||
{{ selectedApiFormats.length }} 种格式
|
||||
</Badge>
|
||||
</header>
|
||||
|
||||
<div class="border-t border-border/60 bg-muted/10 p-3 sm:p-4">
|
||||
<ProviderKeyImportSettingsFields
|
||||
:auth-type="authType"
|
||||
:api-formats="selectedApiFormats"
|
||||
:settings="settings"
|
||||
:available-api-formats="availableApiFormats"
|
||||
@update:auth-type="authType = $event"
|
||||
@update:api-formats="selectedApiFormats = $event"
|
||||
@update:settings="updateGlobalSettings"
|
||||
/>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section
|
||||
v-else
|
||||
class="overflow-hidden rounded-xl bg-background shadow-[0_0_0_1px_rgb(0_0_0/0.07),0_1px_2px_-1px_rgb(0_0_0/0.08),0_3px_8px_-3px_rgb(0_0_0/0.08)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.09)]"
|
||||
>
|
||||
<header class="flex min-h-[72px] items-center gap-3 border-b border-border/60 bg-muted/15 px-4 py-3">
|
||||
<span class="flex h-7 w-7 shrink-0 items-center justify-center rounded-md bg-foreground text-xs font-semibold text-background">3</span>
|
||||
<div class="min-w-0 flex-1">
|
||||
<h3 class="text-balance text-sm font-semibold">逐项确认</h3>
|
||||
<p class="text-pretty text-[11px] leading-4 text-muted-foreground">展开任意 Key 可修改内容或设置单独配置</p>
|
||||
</div>
|
||||
<div class="shrink-0 text-right text-[11px] text-muted-foreground">
|
||||
<div><span class="font-semibold tabular-nums text-foreground">{{ reviewItems.length }}</span> 个 Key</div>
|
||||
<div v-if="customizedItemCount > 0"><span class="tabular-nums">{{ customizedItemCount }}</span> 个单独配置</div>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<div
|
||||
v-if="reviewErrorItemCount > 0"
|
||||
class="border-b border-destructive/15 bg-destructive/5 px-4 py-2 text-xs text-destructive"
|
||||
>
|
||||
{{ reviewErrorItemCount }} 个 Key 需要修正后才能导入
|
||||
</div>
|
||||
|
||||
<div class="max-h-[min(52vh,520px)] divide-y divide-border/50 overflow-y-auto overscroll-contain">
|
||||
<article
|
||||
v-for="entry in pagedReviewItems"
|
||||
:key="entry.item.lineNumber"
|
||||
class="bg-background"
|
||||
>
|
||||
<div class="flex min-h-14 items-center gap-3 px-3 py-2 sm:px-4">
|
||||
<span class="flex h-7 w-7 shrink-0 items-center justify-center rounded-md bg-muted text-[10px] tabular-nums text-muted-foreground">
|
||||
{{ entry.index + 1 }}
|
||||
</span>
|
||||
<div class="min-w-0 flex-1">
|
||||
<div class="flex min-w-0 items-center gap-2">
|
||||
<span class="truncate text-xs font-semibold">{{ entry.item.name || '未填写名称' }}</span>
|
||||
<Badge
|
||||
v-if="reviewErrorsByIndex.has(entry.index)"
|
||||
variant="destructive"
|
||||
class="shrink-0 text-[10px]"
|
||||
>需修正</Badge>
|
||||
</div>
|
||||
<div class="mt-0.5 truncate font-mono text-[10px] text-muted-foreground">{{ maskSecret(entry.item.apiKey) }}</div>
|
||||
</div>
|
||||
<div class="hidden shrink-0 items-center gap-1.5 sm:flex">
|
||||
<span class="rounded-md bg-muted px-2 py-0.5 text-[10px] text-muted-foreground">{{ effectiveAuthLabel(entry.item) }}</span>
|
||||
<span class="rounded-md bg-muted px-2 py-0.5 text-[10px] text-muted-foreground">{{ effectiveFormatCount(entry.item) }} 种格式</span>
|
||||
<span
|
||||
class="rounded-md px-2 py-0.5 text-[10px]"
|
||||
:class="entry.item.customized ? 'bg-primary/10 text-primary' : 'bg-muted text-muted-foreground'"
|
||||
>{{ entry.item.customized ? '单独配置' : '统一配置' }}</span>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
class="flex h-10 w-10 shrink-0 items-center justify-center rounded-lg text-muted-foreground transition-[background-color,color,scale] hover:bg-muted hover:text-foreground active:scale-[0.96]"
|
||||
:aria-label="`编辑 ${entry.item.name || `第 ${entry.index + 1} 项`}`"
|
||||
:title="editingItemIndex === entry.index ? '收起编辑' : '编辑此 Key'"
|
||||
@click="toggleItemEditor(entry.index)"
|
||||
>
|
||||
<Pencil class="h-4 w-4" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="editingItemIndex === entry.index"
|
||||
class="space-y-4 border-t border-border/50 bg-muted/10 p-3 sm:p-4"
|
||||
>
|
||||
<div class="grid gap-3 sm:grid-cols-2">
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">名称</Label>
|
||||
<Input v-model="entry.item.name" class="h-10" placeholder="必填" />
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">Key</Label>
|
||||
<Input v-model="entry.item.apiKey" class="h-10 font-mono text-xs" placeholder="必填" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex min-h-12 items-center justify-between gap-3 rounded-lg bg-background px-3 shadow-[0_0_0_1px_rgb(0_0_0/0.06)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.08)]">
|
||||
<div>
|
||||
<div class="text-xs font-medium">单独配置此 Key</div>
|
||||
<div class="text-[11px] text-muted-foreground">开启后覆盖第二步中的统一配置</div>
|
||||
</div>
|
||||
<Switch
|
||||
:model-value="entry.item.customized"
|
||||
@update:model-value="setItemCustomized(entry.item, $event)"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<ProviderKeyImportSettingsFields
|
||||
v-if="entry.item.customized"
|
||||
:auth-type="entry.item.authType"
|
||||
:api-formats="entry.item.apiFormats"
|
||||
:settings="entry.item.settings"
|
||||
:available-api-formats="availableApiFormats"
|
||||
@update:auth-type="entry.item.authType = $event"
|
||||
@update:api-formats="entry.item.apiFormats = $event"
|
||||
@update:settings="entry.item.settings = $event"
|
||||
/>
|
||||
|
||||
<div
|
||||
v-if="reviewErrorsByIndex.has(entry.index)"
|
||||
class="space-y-1 rounded-lg bg-destructive/5 px-3 py-2 text-[11px] text-destructive"
|
||||
>
|
||||
<div v-for="message in reviewErrorsByIndex.get(entry.index)" :key="message">{{ message }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="reviewPageCount > 1"
|
||||
class="flex min-h-12 items-center justify-between gap-3 border-t border-border/60 bg-muted/10 px-3 sm:px-4"
|
||||
>
|
||||
<Button variant="ghost" size="sm" class="h-9" :disabled="reviewPage === 1" @click="changeReviewPage(reviewPage - 1)">
|
||||
<ChevronLeft class="mr-1 h-4 w-4" />
|
||||
上一页
|
||||
</Button>
|
||||
<span class="text-[11px] tabular-nums text-muted-foreground">{{ reviewPage }} / {{ reviewPageCount }}</span>
|
||||
<Button variant="ghost" size="sm" class="h-9" :disabled="reviewPage === reviewPageCount" @click="changeReviewPage(reviewPage + 1)">
|
||||
下一页
|
||||
<ChevronRight class="ml-1 h-4 w-4" />
|
||||
</Button>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<div class="flex w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">
|
||||
<Button class="w-full sm:w-auto" variant="outline" :disabled="importing" @click="handleBack">
|
||||
<ArrowLeft v-if="currentStep > 1" class="mr-2 h-4 w-4" />
|
||||
{{ currentStep === 1 ? '取消' : '上一步' }}
|
||||
</Button>
|
||||
<Button class="w-full sm:w-auto" :disabled="primaryActionDisabled" @click="handlePrimaryAction">
|
||||
<Loader2 v-if="importing" class="mr-2 h-4 w-4 animate-spin" />
|
||||
<ListPlus v-else-if="currentStep === 3" class="mr-2 h-4 w-4" />
|
||||
<ArrowRight v-else class="mr-2 h-4 w-4" />
|
||||
{{ primaryActionLabel }}
|
||||
</Button>
|
||||
</div>
|
||||
</template>
|
||||
</Dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, reactive, ref, watch } from 'vue'
|
||||
import {
|
||||
ArrowLeft,
|
||||
ArrowRight,
|
||||
ChevronLeft,
|
||||
ChevronRight,
|
||||
ListPlus,
|
||||
Loader2,
|
||||
Pencil,
|
||||
} from 'lucide-vue-next'
|
||||
import {
|
||||
Badge,
|
||||
Button,
|
||||
Dialog,
|
||||
Input,
|
||||
Label,
|
||||
Switch,
|
||||
Textarea,
|
||||
} from '@/components/ui'
|
||||
import ProviderKeyImportSettingsFields from './ProviderKeyImportSettingsFields.vue'
|
||||
import { batchImportPoolKeys, type PoolKeySettingsPatch } from '@/api/endpoints/pool'
|
||||
import { useToast } from '@/composables/useToast'
|
||||
import { parseApiError } from '@/utils/errorParser'
|
||||
import { parseProviderKeyBatchImport } from '@/features/providers/utils/providerKeyBatchImport'
|
||||
|
||||
type WizardStep = 1 | 2 | 3
|
||||
type AuthType = 'api_key' | 'bearer'
|
||||
type ImportSettings = Required<Pick<PoolKeySettingsPatch,
|
||||
'internal_priority' | 'rpm_limit' | 'concurrent_limit' | 'cache_ttl_minutes'
|
||||
| 'max_probe_interval_minutes' | 'is_active' | 'note' | 'proxy_node_id'
|
||||
>>
|
||||
|
||||
interface ReviewImportItem {
|
||||
lineNumber: number
|
||||
name: string
|
||||
apiKey: string
|
||||
customized: boolean
|
||||
authType: AuthType
|
||||
apiFormats: string[]
|
||||
settings: ImportSettings
|
||||
}
|
||||
|
||||
const REVIEW_PAGE_SIZE = 50
|
||||
const steps: ReadonlyArray<{ id: WizardStep; label: string }> = [
|
||||
{ id: 1, label: '导入内容' },
|
||||
{ id: 2, label: '统一配置' },
|
||||
{ id: 3, label: '逐项确认' },
|
||||
]
|
||||
|
||||
const props = defineProps<{
|
||||
open: boolean
|
||||
providerId: string
|
||||
providerName?: string
|
||||
availableApiFormats: string[]
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
close: []
|
||||
saved: []
|
||||
}>()
|
||||
|
||||
const { success, warning, error: showError } = useToast()
|
||||
const currentStep = ref<WizardStep>(1)
|
||||
const inputText = ref('')
|
||||
const importing = ref(false)
|
||||
const authType = ref<AuthType>('api_key')
|
||||
const selectedApiFormats = ref<string[]>([])
|
||||
const settings = reactive<ImportSettings>(createDefaultSettings())
|
||||
const reviewItems = ref<ReviewImportItem[]>([])
|
||||
const reviewPage = ref(1)
|
||||
const editingItemIndex = ref<number | null>(null)
|
||||
|
||||
const parsed = computed(() => parseProviderKeyBatchImport(inputText.value))
|
||||
const canContinueInput = computed(() => (
|
||||
parsed.value.items.length > 0 && parsed.value.errors.length === 0
|
||||
))
|
||||
const canContinueSettings = computed(() => selectedApiFormats.value.length > 0)
|
||||
const inputStatusText = computed(() => {
|
||||
if (parsed.value.errors.length > 0) return `${parsed.value.errors.length} 个问题`
|
||||
if (parsed.value.items.length > 0) return `${parsed.value.items.length} 条有效`
|
||||
return '等待输入'
|
||||
})
|
||||
const reviewErrorsByIndex = computed(() => {
|
||||
const errors = new Map<number, string[]>()
|
||||
const seenNames = new Set<string>()
|
||||
const seenKeys = new Set<string>()
|
||||
|
||||
reviewItems.value.forEach((item, index) => {
|
||||
const messages: string[] = []
|
||||
const name = item.name.trim()
|
||||
const apiKey = item.apiKey.trim()
|
||||
if (!name) messages.push('名称不能为空')
|
||||
else if (name.length > 100) messages.push('名称不能超过 100 个字符')
|
||||
else if (seenNames.has(name)) messages.push('名称与前面的 Key 重复')
|
||||
else seenNames.add(name)
|
||||
|
||||
if (!apiKey) messages.push('Key 不能为空')
|
||||
else if (seenKeys.has(apiKey)) messages.push('Key 与前面的 Key 重复')
|
||||
else seenKeys.add(apiKey)
|
||||
|
||||
if (item.customized && item.apiFormats.length === 0) {
|
||||
messages.push('单独配置时至少选择一种 API 格式')
|
||||
}
|
||||
if (messages.length > 0) errors.set(index, messages)
|
||||
})
|
||||
return errors
|
||||
})
|
||||
const reviewErrorItemCount = computed(() => reviewErrorsByIndex.value.size)
|
||||
const customizedItemCount = computed(() => (
|
||||
reviewItems.value.filter(item => item.customized).length
|
||||
))
|
||||
const reviewPageCount = computed(() => (
|
||||
Math.max(1, Math.ceil(reviewItems.value.length / REVIEW_PAGE_SIZE))
|
||||
))
|
||||
const pagedReviewItems = computed(() => {
|
||||
const start = (reviewPage.value - 1) * REVIEW_PAGE_SIZE
|
||||
return reviewItems.value
|
||||
.slice(start, start + REVIEW_PAGE_SIZE)
|
||||
.map((item, offset) => ({ item, index: start + offset }))
|
||||
})
|
||||
const canImport = computed(() => (
|
||||
!importing.value
|
||||
&& reviewItems.value.length > 0
|
||||
&& reviewErrorsByIndex.value.size === 0
|
||||
&& canContinueSettings.value
|
||||
))
|
||||
const primaryActionDisabled = computed(() => {
|
||||
if (importing.value) return true
|
||||
if (currentStep.value === 1) return !canContinueInput.value
|
||||
if (currentStep.value === 2) return !canContinueSettings.value
|
||||
return !canImport.value
|
||||
})
|
||||
const primaryActionLabel = computed(() => {
|
||||
if (importing.value) return '正在导入...'
|
||||
if (currentStep.value === 1) return '下一步:统一配置'
|
||||
if (currentStep.value === 2) return '下一步:逐项确认'
|
||||
return `导入 ${reviewItems.value.length} 个 Key`
|
||||
})
|
||||
const settingsSummaryItems = computed(() => {
|
||||
const rpm = settings.rpm_limit == null ? 'RPM 自适应' : `RPM ${settings.rpm_limit}`
|
||||
const concurrent = settings.concurrent_limit == null || settings.concurrent_limit === 0
|
||||
? '不限并发'
|
||||
: `并发 ${settings.concurrent_limit}`
|
||||
const proxy = settings.proxy_node_id ? '独立代理' : '沿用 Provider 代理'
|
||||
return [authType.value === 'bearer' ? 'Bearer' : 'API Key', rpm, concurrent, proxy]
|
||||
})
|
||||
|
||||
watch(
|
||||
() => props.open,
|
||||
(open) => {
|
||||
if (!open) return
|
||||
currentStep.value = 1
|
||||
inputText.value = ''
|
||||
importing.value = false
|
||||
authType.value = 'api_key'
|
||||
selectedApiFormats.value = [...props.availableApiFormats]
|
||||
Object.assign(settings, createDefaultSettings())
|
||||
reviewItems.value = []
|
||||
reviewPage.value = 1
|
||||
editingItemIndex.value = null
|
||||
},
|
||||
{ immediate: true },
|
||||
)
|
||||
|
||||
watch(inputText, () => {
|
||||
reviewItems.value = []
|
||||
reviewPage.value = 1
|
||||
editingItemIndex.value = null
|
||||
})
|
||||
|
||||
function createDefaultSettings(): ImportSettings {
|
||||
return {
|
||||
internal_priority: 50,
|
||||
rpm_limit: null,
|
||||
concurrent_limit: null,
|
||||
cache_ttl_minutes: 5,
|
||||
max_probe_interval_minutes: 32,
|
||||
is_active: true,
|
||||
note: '',
|
||||
proxy_node_id: '',
|
||||
}
|
||||
}
|
||||
|
||||
function copySettings(source: ImportSettings): ImportSettings {
|
||||
return { ...source }
|
||||
}
|
||||
|
||||
function buildSettingsPayload(
|
||||
source: ImportSettings,
|
||||
includeEmptyProxy = false,
|
||||
): PoolKeySettingsPatch {
|
||||
return {
|
||||
internal_priority: source.internal_priority,
|
||||
rpm_limit: source.rpm_limit,
|
||||
concurrent_limit: source.concurrent_limit,
|
||||
cache_ttl_minutes: source.cache_ttl_minutes,
|
||||
max_probe_interval_minutes: source.max_probe_interval_minutes,
|
||||
is_active: source.is_active,
|
||||
note: source.note.trim() || null,
|
||||
...((source.proxy_node_id || includeEmptyProxy)
|
||||
? { proxy_node_id: source.proxy_node_id || null }
|
||||
: {}),
|
||||
}
|
||||
}
|
||||
|
||||
function handleDialogUpdate(value: boolean): void {
|
||||
if (!value) emit('close')
|
||||
}
|
||||
|
||||
function canNavigateToStep(step: WizardStep): boolean {
|
||||
return step <= currentStep.value
|
||||
}
|
||||
|
||||
function goToStep(step: WizardStep): void {
|
||||
if (canNavigateToStep(step)) currentStep.value = step
|
||||
}
|
||||
|
||||
function handleBack(): void {
|
||||
if (currentStep.value === 1) {
|
||||
emit('close')
|
||||
return
|
||||
}
|
||||
currentStep.value = (currentStep.value - 1) as WizardStep
|
||||
}
|
||||
|
||||
function handlePrimaryAction(): void {
|
||||
if (primaryActionDisabled.value) return
|
||||
if (currentStep.value === 1) {
|
||||
currentStep.value = 2
|
||||
return
|
||||
}
|
||||
if (currentStep.value === 2) {
|
||||
prepareReviewItems()
|
||||
currentStep.value = 3
|
||||
return
|
||||
}
|
||||
void submitImport()
|
||||
}
|
||||
|
||||
function prepareReviewItems(): void {
|
||||
if (reviewItems.value.length > 0) return
|
||||
reviewItems.value = parsed.value.items.map(item => ({
|
||||
lineNumber: item.lineNumber,
|
||||
name: item.name,
|
||||
apiKey: item.apiKey,
|
||||
customized: false,
|
||||
authType: authType.value,
|
||||
apiFormats: [...selectedApiFormats.value],
|
||||
settings: copySettings(settings),
|
||||
}))
|
||||
reviewPage.value = 1
|
||||
editingItemIndex.value = null
|
||||
}
|
||||
|
||||
function toggleItemEditor(index: number): void {
|
||||
editingItemIndex.value = editingItemIndex.value === index ? null : index
|
||||
}
|
||||
|
||||
function setItemCustomized(item: ReviewImportItem, customized: boolean): void {
|
||||
item.customized = customized
|
||||
if (!customized) return
|
||||
item.authType = authType.value
|
||||
item.apiFormats = [...selectedApiFormats.value]
|
||||
item.settings = copySettings(settings)
|
||||
}
|
||||
|
||||
function changeReviewPage(page: number): void {
|
||||
reviewPage.value = Math.min(Math.max(page, 1), reviewPageCount.value)
|
||||
editingItemIndex.value = null
|
||||
}
|
||||
|
||||
function effectiveAuthLabel(item: ReviewImportItem): string {
|
||||
const resolved = item.customized ? item.authType : authType.value
|
||||
return resolved === 'bearer' ? 'Bearer' : 'API Key'
|
||||
}
|
||||
|
||||
function effectiveFormatCount(item: ReviewImportItem): number {
|
||||
return item.customized ? item.apiFormats.length : selectedApiFormats.value.length
|
||||
}
|
||||
|
||||
function updateGlobalSettings(nextSettings: ImportSettings): void {
|
||||
Object.assign(settings, nextSettings)
|
||||
}
|
||||
|
||||
function maskSecret(secret: string): string {
|
||||
if (secret.length <= 10) return `${secret.slice(0, 3)}•••`
|
||||
return `${secret.slice(0, 6)}••••${secret.slice(-4)}`
|
||||
}
|
||||
|
||||
async function submitImport(): Promise<void> {
|
||||
if (!canImport.value) return
|
||||
importing.value = true
|
||||
try {
|
||||
const result = await batchImportPoolKeys(props.providerId, {
|
||||
keys: reviewItems.value.map(item => ({
|
||||
name: item.name.trim(),
|
||||
api_key: item.apiKey.trim(),
|
||||
auth_type: item.customized ? item.authType : authType.value,
|
||||
...(item.customized
|
||||
? {
|
||||
api_formats: item.apiFormats,
|
||||
settings: buildSettingsPayload(item.settings, true),
|
||||
}
|
||||
: {}),
|
||||
})),
|
||||
api_formats: selectedApiFormats.value,
|
||||
settings: buildSettingsPayload(settings),
|
||||
})
|
||||
if (result.imported > 0) emit('saved')
|
||||
if (result.errors.length > 0) {
|
||||
warning(`已导入 ${result.imported} 个,${result.errors.length} 个失败`)
|
||||
return
|
||||
}
|
||||
success(`已导入 ${result.imported} 个 Key`)
|
||||
emit('close')
|
||||
} catch (error) {
|
||||
showError(parseApiError(error, '批量导入 Key 失败'))
|
||||
} finally {
|
||||
importing.value = false
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,181 @@
|
||||
<template>
|
||||
<div class="space-y-4">
|
||||
<div class="space-y-2">
|
||||
<Label class="text-xs font-medium">支持的 API 格式</Label>
|
||||
<div class="grid gap-2 sm:grid-cols-2 lg:grid-cols-3">
|
||||
<label
|
||||
v-for="format in availableApiFormats"
|
||||
:key="format"
|
||||
class="flex min-h-10 cursor-pointer items-center gap-2 rounded-lg bg-background px-3 text-xs transition-[box-shadow,background-color]"
|
||||
:class="apiFormats.includes(format)
|
||||
? 'bg-primary/5 shadow-[0_0_0_1px_rgb(0_0_0/0.10),0_1px_2px_rgb(0_0_0/0.04)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.12)]'
|
||||
: 'shadow-[0_0_0_1px_rgb(0_0_0/0.06)] hover:bg-muted/30 hover:shadow-[0_0_0_1px_rgb(0_0_0/0.10)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.08)]'"
|
||||
>
|
||||
<Checkbox
|
||||
:checked="apiFormats.includes(format)"
|
||||
@update:checked="(checked) => toggleApiFormat(format, checked === true)"
|
||||
/>
|
||||
<span class="truncate">{{ formatApiFormat(format) }}</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">认证类型</Label>
|
||||
<Select v-model="authTypeModel">
|
||||
<SelectTrigger class="h-10">
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="api_key">API Key</SelectItem>
|
||||
<SelectItem value="bearer">Bearer Token</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">优先级</Label>
|
||||
<Input
|
||||
:model-value="settings.internal_priority"
|
||||
type="number"
|
||||
min="0"
|
||||
class="h-10"
|
||||
@update:model-value="updateSetting('internal_priority', parseNumberInput($event, { min: 0 }) ?? 50)"
|
||||
/>
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">RPM 限制</Label>
|
||||
<Input
|
||||
:model-value="settings.rpm_limit ?? ''"
|
||||
type="number"
|
||||
min="1"
|
||||
max="10000"
|
||||
class="h-10"
|
||||
placeholder="自适应"
|
||||
@update:model-value="updateSetting('rpm_limit', parseNullableNumberInput($event, { min: 1, max: 10000 }))"
|
||||
/>
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">并发请求上限</Label>
|
||||
<Input
|
||||
:model-value="settings.concurrent_limit ?? ''"
|
||||
type="number"
|
||||
min="0"
|
||||
class="h-10"
|
||||
placeholder="不限制"
|
||||
@update:model-value="updateSetting('concurrent_limit', parseNullableNumberInput($event, { min: 0 }))"
|
||||
/>
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">缓存 TTL(分钟)</Label>
|
||||
<Input
|
||||
:model-value="settings.cache_ttl_minutes"
|
||||
type="number"
|
||||
min="0"
|
||||
max="60"
|
||||
class="h-10"
|
||||
@update:model-value="updateSetting('cache_ttl_minutes', parseNumberInput($event, { min: 0, max: 60 }) ?? 5)"
|
||||
/>
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">熔断探测(分钟)</Label>
|
||||
<Input
|
||||
:model-value="settings.max_probe_interval_minutes"
|
||||
type="number"
|
||||
min="0"
|
||||
max="32"
|
||||
class="h-10"
|
||||
@update:model-value="updateSetting('max_probe_interval_minutes', parseNumberInput($event, { min: 0, max: 32 }) ?? 32)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="grid gap-3 sm:grid-cols-2">
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">代理节点</Label>
|
||||
<ProxyNodeSelect
|
||||
:model-value="settings.proxy_node_id"
|
||||
trigger-class="h-10"
|
||||
@update:model-value="updateSetting('proxy_node_id', $event)"
|
||||
/>
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label class="text-xs">备注</Label>
|
||||
<Input
|
||||
:model-value="settings.note"
|
||||
class="h-10"
|
||||
placeholder="可选"
|
||||
@update:model-value="updateSetting('note', String($event))"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex min-h-12 items-center justify-between gap-3 rounded-lg bg-background px-3 shadow-[0_0_0_1px_rgb(0_0_0/0.06),0_1px_2px_rgb(0_0_0/0.04)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.08)]">
|
||||
<div>
|
||||
<div class="text-xs font-medium">导入后立即启用</div>
|
||||
<div class="text-[11px] text-muted-foreground">关闭后仍会创建,但不会进入调度</div>
|
||||
</div>
|
||||
<Switch
|
||||
:model-value="settings.is_active"
|
||||
@update:model-value="updateSetting('is_active', $event)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue'
|
||||
import {
|
||||
Checkbox,
|
||||
Input,
|
||||
Label,
|
||||
Select,
|
||||
SelectContent,
|
||||
SelectItem,
|
||||
SelectTrigger,
|
||||
SelectValue,
|
||||
Switch,
|
||||
} from '@/components/ui'
|
||||
import type { PoolKeySettingsPatch } from '@/api/endpoints/pool'
|
||||
import { formatApiFormat } from '@/api/endpoints/types/api-format'
|
||||
import { parseNullableNumberInput, parseNumberInput } from '@/utils/form'
|
||||
import ProxyNodeSelect from './ProxyNodeSelect.vue'
|
||||
|
||||
type AuthType = 'api_key' | 'bearer'
|
||||
type ImportSettings = Required<Pick<PoolKeySettingsPatch,
|
||||
'internal_priority' | 'rpm_limit' | 'concurrent_limit' | 'cache_ttl_minutes'
|
||||
| 'max_probe_interval_minutes' | 'is_active' | 'note' | 'proxy_node_id'
|
||||
>>
|
||||
|
||||
const props = defineProps<{
|
||||
authType: AuthType
|
||||
apiFormats: string[]
|
||||
settings: ImportSettings
|
||||
availableApiFormats: string[]
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
'update:authType': [value: AuthType]
|
||||
'update:apiFormats': [value: string[]]
|
||||
'update:settings': [value: ImportSettings]
|
||||
}>()
|
||||
|
||||
const authTypeModel = computed<AuthType>({
|
||||
get: () => props.authType,
|
||||
set: value => emit('update:authType', value),
|
||||
})
|
||||
|
||||
function toggleApiFormat(format: string, checked: boolean): void {
|
||||
const selected = new Set(props.apiFormats)
|
||||
if (checked) selected.add(format)
|
||||
else selected.delete(format)
|
||||
emit('update:apiFormats', props.availableApiFormats.filter(item => selected.has(item)))
|
||||
}
|
||||
|
||||
function updateSetting<Key extends keyof ImportSettings>(
|
||||
key: Key,
|
||||
value: ImportSettings[Key],
|
||||
): void {
|
||||
emit('update:settings', { ...props.settings, [key]: value })
|
||||
}
|
||||
</script>
|
||||
+19
@@ -1,6 +1,7 @@
|
||||
import { describe, expect, it } from 'vitest'
|
||||
|
||||
import {
|
||||
createCodexResetCreditIdempotencyKey,
|
||||
formatCodexResetCreditCount,
|
||||
formatCodexResetCreditDays,
|
||||
getCodexResetCreditAvailableCount,
|
||||
@@ -108,4 +109,22 @@ describe('codex reset credit display helpers', () => {
|
||||
expect(formatCodexResetCreditDays(1)).toBe('1天')
|
||||
expect(formatCodexResetCreditDays(86_401)).toBe('2天')
|
||||
})
|
||||
|
||||
it('generates a UUID v4 with secure random bytes when randomUUID is unavailable', () => {
|
||||
const idempotencyKey = createCodexResetCreditIdempotencyKey({
|
||||
getRandomValues(array) {
|
||||
array.set(Array.from({ length: 16 }, (_, index) => index))
|
||||
return array
|
||||
},
|
||||
})
|
||||
|
||||
expect(idempotencyKey).toBe('00010203-0405-4607-8809-0a0b0c0d0e0f')
|
||||
})
|
||||
|
||||
it('prefers the browser randomUUID implementation when available', () => {
|
||||
expect(createCodexResetCreditIdempotencyKey({
|
||||
randomUUID: () => 'existing-random-uuid',
|
||||
getRandomValues: array => array,
|
||||
})).toBe('existing-random-uuid')
|
||||
})
|
||||
})
|
||||
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
import { readFileSync } from 'node:fs'
|
||||
import { resolve } from 'node:path'
|
||||
import { describe, expect, it } from 'vitest'
|
||||
|
||||
function readSource(path: string): string {
|
||||
return readFileSync(resolve(process.cwd(), path), 'utf8')
|
||||
}
|
||||
|
||||
describe('provider key batch import UI contract', () => {
|
||||
it('shows the entry only for custom providers', () => {
|
||||
const source = readSource('src/features/providers/components/ProviderDetailDrawer.vue')
|
||||
|
||||
expect(source).toContain("provider.provider_type === 'custom'")
|
||||
expect(source).toContain('<ProviderKeyBatchImportDialog')
|
||||
expect(source).toContain('keyBatchImportDialogOpen')
|
||||
})
|
||||
|
||||
it('uses a three-step flow with per-key review overrides', () => {
|
||||
const source = readSource('src/features/providers/components/ProviderKeyBatchImportDialog.vue')
|
||||
|
||||
expect(source).toContain('parseProviderKeyBatchImport')
|
||||
expect(source).toContain("{ id: 3, label: '逐项确认' }")
|
||||
expect(source).toContain('ProviderKeyImportSettingsFields')
|
||||
expect(source).toContain('REVIEW_PAGE_SIZE')
|
||||
expect(source).toContain('item.customized')
|
||||
expect(source).toContain('api_formats: item.apiFormats')
|
||||
expect(source).toContain('batchImportPoolKeys')
|
||||
expect(source).not.toContain('MAX_BATCH_IMPORT_KEYS')
|
||||
|
||||
const fieldsSource = readSource('src/features/providers/components/ProviderKeyImportSettingsFields.vue')
|
||||
expect(fieldsSource).toContain('settings.max_probe_interval_minutes')
|
||||
expect(fieldsSource).toContain('settings.proxy_node_id')
|
||||
})
|
||||
|
||||
it('uses selective update_settings in pool batch management', () => {
|
||||
const source = readSource('src/features/pool/components/PoolAccountBatchDialog.vue')
|
||||
|
||||
expect(source).toContain("selectedAction === 'update_settings'")
|
||||
expect(source).toContain('buildPoolKeySettingsPatch')
|
||||
expect(source).toContain("confirmAndExecuteAction('update_settings')")
|
||||
expect(source).toContain('仅更新已勾选字段')
|
||||
})
|
||||
})
|
||||
@@ -61,6 +61,27 @@ export function formatCodexResetCreditCount(count: number | null | undefined): s
|
||||
return `共 ${count ?? 0} 次机会`
|
||||
}
|
||||
|
||||
interface CodexResetCreditCrypto {
|
||||
randomUUID?: () => string
|
||||
getRandomValues: (array: Uint8Array) => Uint8Array
|
||||
}
|
||||
|
||||
export function createCodexResetCreditIdempotencyKey(
|
||||
cryptoSource: CodexResetCreditCrypto | undefined = globalThis.crypto,
|
||||
): string {
|
||||
const randomUUID = cryptoSource?.randomUUID?.bind(cryptoSource)
|
||||
if (randomUUID) return randomUUID()
|
||||
if (!cryptoSource) {
|
||||
throw new Error('浏览器不支持安全随机数,无法生成幂等 ID')
|
||||
}
|
||||
|
||||
const bytes = cryptoSource.getRandomValues(new Uint8Array(16))
|
||||
bytes[6] = (bytes[6] & 0x0f) | 0x40
|
||||
bytes[8] = (bytes[8] & 0x3f) | 0x80
|
||||
const hex = Array.from(bytes, byte => byte.toString(16).padStart(2, '0')).join('')
|
||||
return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`
|
||||
}
|
||||
|
||||
function codexResetCreditRemainingSeconds(
|
||||
item: QuotaResetCreditSnapshot,
|
||||
snapshot: QuotaResetCreditsSnapshot,
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
import { describe, expect, it } from 'vitest'
|
||||
|
||||
import { parseProviderKeyBatchImport } from '../providerKeyBatchImport'
|
||||
|
||||
describe('provider key batch import parser', () => {
|
||||
it('parses required names and keys separated by four hyphens', () => {
|
||||
const result = parseProviderKeyBatchImport([
|
||||
'primary----sk-primary',
|
||||
'backup----sk-backup',
|
||||
'night----sk-night----suffix',
|
||||
'# ignored comment',
|
||||
].join('\n'))
|
||||
|
||||
expect(result.errors).toEqual([])
|
||||
expect(result.items).toEqual([
|
||||
{ lineNumber: 1, name: 'primary', apiKey: 'sk-primary' },
|
||||
{ lineNumber: 2, name: 'backup', apiKey: 'sk-backup' },
|
||||
{ lineNumber: 3, name: 'night', apiKey: 'sk-night----suffix' },
|
||||
])
|
||||
})
|
||||
|
||||
it('reports invalid format, missing fields and duplicates', () => {
|
||||
const result = parseProviderKeyBatchImport([
|
||||
'one----sk-1',
|
||||
'two----sk-1',
|
||||
'one----sk-2',
|
||||
'----sk-3',
|
||||
'three----',
|
||||
'sk-without-name',
|
||||
].join('\n'))
|
||||
|
||||
expect(result.items).toHaveLength(1)
|
||||
expect(result.errors.map(error => error.message)).toEqual([
|
||||
'Key 与前面行重复',
|
||||
'名称与前面行重复',
|
||||
'名称不能为空',
|
||||
'Key 不能为空',
|
||||
'格式应为 名称----Key',
|
||||
])
|
||||
})
|
||||
|
||||
it('does not impose a client-side item limit', () => {
|
||||
const input = Array.from({ length: 750 }, (_, index) => `key-${index}----sk-${index}`).join('\n')
|
||||
const result = parseProviderKeyBatchImport(input)
|
||||
|
||||
expect(result.items).toHaveLength(750)
|
||||
expect(result.errors).toEqual([])
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,73 @@
|
||||
export interface ProviderKeyBatchImportItem {
|
||||
lineNumber: number
|
||||
name: string
|
||||
apiKey: string
|
||||
}
|
||||
|
||||
export interface ProviderKeyBatchImportError {
|
||||
lineNumber: number | null
|
||||
message: string
|
||||
}
|
||||
|
||||
export interface ProviderKeyBatchImportParseResult {
|
||||
items: ProviderKeyBatchImportItem[]
|
||||
errors: ProviderKeyBatchImportError[]
|
||||
}
|
||||
|
||||
export const PROVIDER_KEY_BATCH_SEPARATOR = '----'
|
||||
|
||||
function splitNamedKey(line: string): { name: string; apiKey: string } | null {
|
||||
const separatorIndex = line.indexOf(PROVIDER_KEY_BATCH_SEPARATOR)
|
||||
if (separatorIndex < 0) return null
|
||||
return {
|
||||
name: line.slice(0, separatorIndex),
|
||||
apiKey: line.slice(separatorIndex + PROVIDER_KEY_BATCH_SEPARATOR.length),
|
||||
}
|
||||
}
|
||||
|
||||
export function parseProviderKeyBatchImport(input: string): ProviderKeyBatchImportParseResult {
|
||||
const items: ProviderKeyBatchImportItem[] = []
|
||||
const errors: ProviderKeyBatchImportError[] = []
|
||||
const seenKeys = new Set<string>()
|
||||
const seenNames = new Set<string>()
|
||||
|
||||
for (const [index, rawLine] of input.split(/\r?\n/).entries()) {
|
||||
const lineNumber = index + 1
|
||||
const line = rawLine.trim()
|
||||
if (!line || line.startsWith('#')) continue
|
||||
|
||||
const named = splitNamedKey(line)
|
||||
if (!named) {
|
||||
errors.push({ lineNumber, message: `格式应为 名称${PROVIDER_KEY_BATCH_SEPARATOR}Key` })
|
||||
continue
|
||||
}
|
||||
const name = named.name.trim()
|
||||
const apiKey = named.apiKey.trim()
|
||||
if (!name) {
|
||||
errors.push({ lineNumber, message: '名称不能为空' })
|
||||
continue
|
||||
}
|
||||
if (!apiKey) {
|
||||
errors.push({ lineNumber, message: 'Key 不能为空' })
|
||||
continue
|
||||
}
|
||||
if (name.length > 100) {
|
||||
errors.push({ lineNumber, message: '名称不能超过 100 个字符' })
|
||||
continue
|
||||
}
|
||||
if (seenKeys.has(apiKey)) {
|
||||
errors.push({ lineNumber, message: 'Key 与前面行重复' })
|
||||
continue
|
||||
}
|
||||
if (seenNames.has(name)) {
|
||||
errors.push({ lineNumber, message: '名称与前面行重复' })
|
||||
continue
|
||||
}
|
||||
|
||||
seenKeys.add(apiKey)
|
||||
seenNames.add(name)
|
||||
items.push({ lineNumber, name, apiKey })
|
||||
}
|
||||
|
||||
return { items, errors }
|
||||
}
|
||||
Reference in New Issue
Block a user