mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-09 20:50:20 +08:00
Extract active usage elapsed clock
This commit is contained in:
+101
@@ -0,0 +1,101 @@
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
import { nextTick, ref } from 'vue'
|
||||
import { useActiveElapsedDisplayClock } from '../useActiveElapsedDisplayClock'
|
||||
|
||||
type TestRecord = {
|
||||
status: string
|
||||
}
|
||||
|
||||
afterEach(() => {
|
||||
vi.useRealTimers()
|
||||
})
|
||||
|
||||
describe('useActiveElapsedDisplayClock', () => {
|
||||
it('ticks only while visible active records exist', async () => {
|
||||
vi.useFakeTimers()
|
||||
let nowMs = 1_000
|
||||
|
||||
const records = ref<TestRecord[]>([])
|
||||
const isPageVisible = ref(true)
|
||||
const serverClockOffsetMs = ref(0)
|
||||
const hasServerClockOffset = ref(false)
|
||||
const clock = useActiveElapsedDisplayClock({
|
||||
records,
|
||||
isPageVisible,
|
||||
serverClockOffsetMs,
|
||||
hasServerClockOffset,
|
||||
resolveStatus: record => record.status,
|
||||
intervalMs: 250,
|
||||
now: () => nowMs,
|
||||
})
|
||||
|
||||
expect(clock.hasVisibleActiveRecords.value).toBe(false)
|
||||
expect(clock.displayNowMs.value).toBe(1_000)
|
||||
|
||||
nowMs = 1_250
|
||||
vi.advanceTimersByTime(250)
|
||||
expect(clock.displayNowMs.value).toBe(1_000)
|
||||
|
||||
records.value = [{ status: 'streaming' }]
|
||||
await nextTick()
|
||||
expect(clock.hasVisibleActiveRecords.value).toBe(true)
|
||||
expect(clock.displayNowMs.value).toBe(1_250)
|
||||
|
||||
nowMs = 1_500
|
||||
vi.advanceTimersByTime(250)
|
||||
expect(clock.displayNowMs.value).toBe(1_500)
|
||||
|
||||
isPageVisible.value = false
|
||||
await nextTick()
|
||||
nowMs = 1_750
|
||||
vi.advanceTimersByTime(250)
|
||||
expect(clock.displayNowMs.value).toBe(1_500)
|
||||
|
||||
clock.stopActiveElapsedDisplayClock()
|
||||
})
|
||||
|
||||
it('applies server clock offset to the display time', () => {
|
||||
vi.useFakeTimers()
|
||||
|
||||
const clock = useActiveElapsedDisplayClock({
|
||||
records: ref<TestRecord[]>([{ status: 'pending' }]),
|
||||
isPageVisible: ref(true),
|
||||
serverClockOffsetMs: ref(-11_000),
|
||||
hasServerClockOffset: ref(true),
|
||||
resolveStatus: record => record.status,
|
||||
intervalMs: 250,
|
||||
now: () => 2_000,
|
||||
})
|
||||
|
||||
expect(clock.calibratedDisplayNowMs.value).toBe(-9_000)
|
||||
clock.stopActiveElapsedDisplayClock()
|
||||
})
|
||||
|
||||
it('stops when active records disappear', async () => {
|
||||
vi.useFakeTimers()
|
||||
let nowMs = 3_000
|
||||
|
||||
const records = ref<TestRecord[]>([{ status: 'pending' }])
|
||||
const clock = useActiveElapsedDisplayClock({
|
||||
records,
|
||||
isPageVisible: ref(true),
|
||||
serverClockOffsetMs: ref(0),
|
||||
hasServerClockOffset: ref(false),
|
||||
resolveStatus: record => record.status,
|
||||
intervalMs: 250,
|
||||
now: () => nowMs,
|
||||
})
|
||||
|
||||
nowMs = 3_250
|
||||
vi.advanceTimersByTime(250)
|
||||
expect(clock.displayNowMs.value).toBe(3_250)
|
||||
|
||||
records.value = [{ status: 'completed' }]
|
||||
await nextTick()
|
||||
nowMs = 3_500
|
||||
vi.advanceTimersByTime(250)
|
||||
expect(clock.displayNowMs.value).toBe(3_250)
|
||||
|
||||
clock.stopActiveElapsedDisplayClock()
|
||||
})
|
||||
})
|
||||
@@ -1,4 +1,5 @@
|
||||
export { useUsageData } from './useUsageData'
|
||||
export { useActiveElapsedDisplayClock } from './useActiveElapsedDisplayClock'
|
||||
export { useUsageFilters } from './useUsageFilters'
|
||||
export { useUsagePagination } from './useUsagePagination'
|
||||
export { getDateRangeFromPeriod, formatDateTime, getSuccessRateColor } from './useDateRange'
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
import { computed, ref, watch, type ComputedRef, type Ref } from 'vue'
|
||||
|
||||
type ActiveElapsedStatus = string | null | undefined
|
||||
|
||||
export interface UseActiveElapsedDisplayClockOptions<TRecord> {
|
||||
records: Ref<TRecord[]> | ComputedRef<TRecord[]>
|
||||
isPageVisible: Ref<boolean> | ComputedRef<boolean>
|
||||
serverClockOffsetMs: Ref<number> | ComputedRef<number>
|
||||
hasServerClockOffset: Ref<boolean> | ComputedRef<boolean>
|
||||
resolveStatus: (record: TRecord) => ActiveElapsedStatus
|
||||
intervalMs?: number
|
||||
now?: () => number
|
||||
}
|
||||
|
||||
export function useActiveElapsedDisplayClock<TRecord>(
|
||||
options: UseActiveElapsedDisplayClockOptions<TRecord>
|
||||
) {
|
||||
const intervalMs = options.intervalMs ?? 250
|
||||
const now = options.now ?? Date.now
|
||||
const displayNowMs = ref(now())
|
||||
|
||||
let activeElapsedDisplayTimer: ReturnType<typeof setInterval> | null = null
|
||||
|
||||
const hasVisibleActiveRecords = computed(() => {
|
||||
return options.records.value.some((record) => {
|
||||
const displayStatus = options.resolveStatus(record)
|
||||
return displayStatus === 'pending' || displayStatus === 'streaming'
|
||||
})
|
||||
})
|
||||
|
||||
const calibratedDisplayNowMs = computed(() => {
|
||||
return options.hasServerClockOffset.value
|
||||
? displayNowMs.value + options.serverClockOffsetMs.value
|
||||
: displayNowMs.value
|
||||
})
|
||||
|
||||
function tickActiveElapsedDisplay() {
|
||||
displayNowMs.value = now()
|
||||
}
|
||||
|
||||
function startActiveElapsedDisplayTimer() {
|
||||
if (activeElapsedDisplayTimer) return
|
||||
if (!options.isPageVisible.value || !hasVisibleActiveRecords.value) return
|
||||
tickActiveElapsedDisplay()
|
||||
activeElapsedDisplayTimer = setInterval(tickActiveElapsedDisplay, intervalMs)
|
||||
}
|
||||
|
||||
function stopActiveElapsedDisplayTimer() {
|
||||
if (activeElapsedDisplayTimer) {
|
||||
clearInterval(activeElapsedDisplayTimer)
|
||||
activeElapsedDisplayTimer = null
|
||||
}
|
||||
}
|
||||
|
||||
function syncActiveElapsedDisplayTimer() {
|
||||
if (options.isPageVisible.value && hasVisibleActiveRecords.value) {
|
||||
startActiveElapsedDisplayTimer()
|
||||
} else {
|
||||
stopActiveElapsedDisplayTimer()
|
||||
}
|
||||
}
|
||||
|
||||
const stopActiveElapsedDisplayWatch = watch(
|
||||
[hasVisibleActiveRecords, options.isPageVisible],
|
||||
syncActiveElapsedDisplayTimer,
|
||||
{ immediate: true }
|
||||
)
|
||||
|
||||
function stopActiveElapsedDisplayClock() {
|
||||
stopActiveElapsedDisplayWatch()
|
||||
stopActiveElapsedDisplayTimer()
|
||||
}
|
||||
|
||||
return {
|
||||
displayNowMs,
|
||||
calibratedDisplayNowMs,
|
||||
hasVisibleActiveRecords,
|
||||
tickActiveElapsedDisplay,
|
||||
startActiveElapsedDisplayTimer,
|
||||
stopActiveElapsedDisplayTimer,
|
||||
syncActiveElapsedDisplayTimer,
|
||||
stopActiveElapsedDisplayClock,
|
||||
}
|
||||
}
|
||||
@@ -149,6 +149,7 @@ import {
|
||||
IntervalTimelineCard
|
||||
} from '@/features/usage/components'
|
||||
import {
|
||||
useActiveElapsedDisplayClock,
|
||||
useUsageData,
|
||||
getDateRangeFromPeriod
|
||||
} from '@/features/usage/composables'
|
||||
@@ -441,7 +442,6 @@ const GLOBAL_AUTO_REFRESH_INTERVAL = 3000 // 3秒刷新一次(全局自动刷
|
||||
const ACTIVE_ELAPSED_DISPLAY_INTERVAL = 250 // 共享显示时钟,避免每行单独动画
|
||||
const globalAutoRefresh = ref(false) // 全局自动刷新开关(默认关闭)
|
||||
const isPageVisible = ref(typeof document === 'undefined' ? true : !document.hidden)
|
||||
const displayNowMs = ref(Date.now())
|
||||
|
||||
// 轮询活跃请求状态(轻量级,只更新状态变化的记录)
|
||||
|
||||
@@ -744,7 +744,7 @@ onUnmounted(() => {
|
||||
stopAutoRefresh()
|
||||
stopActiveDiscovery()
|
||||
stopGlobalAutoRefresh()
|
||||
stopActiveElapsedDisplayTimer()
|
||||
stopActiveElapsedDisplayClock()
|
||||
})
|
||||
|
||||
// 用户页面的前端分页(后端一次性返回所有记录,前端分页+筛选)
|
||||
@@ -768,51 +768,20 @@ const effectiveTotalRecords = computed(() => {
|
||||
// 显示的记录
|
||||
const displayRecords = computed(() => paginatedRecords.value)
|
||||
|
||||
const hasVisibleActiveRecords = computed(() => {
|
||||
return displayRecords.value.some((record) => {
|
||||
const displayStatus = resolveDisplayRequestStatus(record)
|
||||
return displayStatus === 'pending' || displayStatus === 'streaming'
|
||||
})
|
||||
const {
|
||||
calibratedDisplayNowMs,
|
||||
stopActiveElapsedDisplayTimer,
|
||||
syncActiveElapsedDisplayTimer,
|
||||
stopActiveElapsedDisplayClock,
|
||||
} = useActiveElapsedDisplayClock({
|
||||
records: displayRecords,
|
||||
isPageVisible,
|
||||
serverClockOffsetMs,
|
||||
hasServerClockOffset,
|
||||
resolveStatus: resolveDisplayRequestStatus,
|
||||
intervalMs: ACTIVE_ELAPSED_DISPLAY_INTERVAL,
|
||||
})
|
||||
|
||||
const calibratedDisplayNowMs = computed(() => {
|
||||
return hasServerClockOffset.value
|
||||
? displayNowMs.value + serverClockOffsetMs.value
|
||||
: displayNowMs.value
|
||||
})
|
||||
|
||||
let activeElapsedDisplayTimer: ReturnType<typeof setInterval> | null = null
|
||||
|
||||
function tickActiveElapsedDisplay() {
|
||||
displayNowMs.value = Date.now()
|
||||
}
|
||||
|
||||
function startActiveElapsedDisplayTimer() {
|
||||
if (activeElapsedDisplayTimer) return
|
||||
if (!isPageVisible.value || !hasVisibleActiveRecords.value) return
|
||||
tickActiveElapsedDisplay()
|
||||
activeElapsedDisplayTimer = setInterval(tickActiveElapsedDisplay, ACTIVE_ELAPSED_DISPLAY_INTERVAL)
|
||||
}
|
||||
|
||||
function stopActiveElapsedDisplayTimer() {
|
||||
if (activeElapsedDisplayTimer) {
|
||||
clearInterval(activeElapsedDisplayTimer)
|
||||
activeElapsedDisplayTimer = null
|
||||
}
|
||||
}
|
||||
|
||||
function syncActiveElapsedDisplayTimer() {
|
||||
if (isPageVisible.value && hasVisibleActiveRecords.value) {
|
||||
startActiveElapsedDisplayTimer()
|
||||
} else {
|
||||
stopActiveElapsedDisplayTimer()
|
||||
}
|
||||
}
|
||||
|
||||
watch(hasVisibleActiveRecords, () => {
|
||||
syncActiveElapsedDisplayTimer()
|
||||
}, { immediate: true })
|
||||
|
||||
const availableClientFamilies = computed(() => {
|
||||
const families = new Set<string>()
|
||||
currentRecords.value.forEach((record) => {
|
||||
|
||||
Reference in New Issue
Block a user