revert: remove usage elapsed clock calibration

This commit is contained in:
elky
2026-05-31 20:30:51 +08:00
parent 40eb3cf6e1
commit 905453d62b
24 changed files with 91 additions and 1151 deletions
+7 -28
View File
@@ -2,11 +2,6 @@ import apiClient from './client'
import { cachedRequest, dedupedRequest, buildCacheKey } from '@/utils/cache'
import type { ActivityHeatmap } from '@/types/activity'
import type { ImageProgress } from './requestTrace'
import {
beginServerTimingSample,
withServerTiming,
type ServerTimedPayload,
} from './serverTiming'
const ACTIVITY_HEATMAP_CACHE_TTL_MS = 30 * 60 * 1000
const USAGE_ANALYTICS_CACHE_TTL_MS = 30 * 1000
@@ -132,7 +127,7 @@ export interface UsageRequestOptions {
skipCache?: boolean
}
type UsageListResponse = ServerTimedPayload & {
type UsageListResponse = {
records?: unknown
pagination?: {
total?: unknown
@@ -204,7 +199,6 @@ function normalizeUsageRecordPage(
total: number
page: number
page_size: number
server_timing?: ServerTimedPayload['server_timing']
} {
const records = assertUsageRecords(payload.records)
const pagination = payload.pagination
@@ -226,7 +220,6 @@ function normalizeUsageRecordPage(
total,
page: resolvedPage,
page_size: limit,
...(payload.server_timing ? { server_timing: payload.server_timing } : {}),
}
}
@@ -373,12 +366,10 @@ export const usageApi = {
total: number
page: number
page_size: number
server_timing?: ServerTimedPayload['server_timing']
}> {
const { params, pagination } = buildCurrentUserUsageParams(filters)
const clientSendUnixMs = beginServerTimingSample()
const response = await apiClient.get<UsageListResponse>('/api/users/me/usage', { params })
return normalizeUsageRecordPage(withServerTiming(response, clientSendUnixMs), pagination)
return normalizeUsageRecordPage(response.data, pagination)
},
async getUsageStats(filters?: UsageFilters, options?: UsageRequestOptions): Promise<UsageStats> {
@@ -453,25 +444,17 @@ export const usageApi = {
async getUserUsage(userId: string, filters?: UsageFilters): Promise<{
records: UsageRecord[]
stats: UsageStats
server_timing?: ServerTimedPayload['server_timing']
}> {
const statsParams = buildAdminUsageStatsParams(userId, filters)
const { params: recordParams } = buildAdminUsageRecordParams(userId, filters)
const statsRequest = apiClient.get<UsageStats>('/api/admin/usage/stats', { params: statsParams })
const recordsClientSendUnixMs = beginServerTimingSample()
const recordsRequest = apiClient
.get<UsageListResponse>('/api/admin/usage/records', { params: recordParams })
.then(response => withServerTiming(response, recordsClientSendUnixMs))
const [statsResponse, recordsResponse] = await Promise.all([
statsRequest,
recordsRequest,
apiClient.get<UsageStats>('/api/admin/usage/stats', { params: statsParams }),
apiClient.get<UsageListResponse>('/api/admin/usage/records', { params: recordParams }),
])
return {
records: assertUsageRecords(recordsResponse.records),
records: assertUsageRecords(recordsResponse.data.records),
stats: statsResponse.data,
...(recordsResponse.server_timing ? { server_timing: recordsResponse.server_timing } : {}),
}
},
@@ -497,13 +480,11 @@ export const usageApi = {
total: number
limit: number
offset: number
server_timing?: ServerTimedPayload['server_timing']
}> {
const key = buildCacheKey('usage:records', params as Record<string, unknown> | undefined)
return dedupedRequest(key, async () => {
const clientSendUnixMs = beginServerTimingSample()
const response = await apiClient.get('/api/admin/usage/records', { params })
return withServerTiming(response, clientSendUnixMs)
return response.data
})
},
@@ -515,7 +496,6 @@ export const usageApi = {
ids?: string[],
timeRange?: Pick<UsageFilters, 'start_date' | 'end_date' | 'preset' | 'timezone' | 'tz_offset_minutes'>
): Promise<{
server_timing?: ServerTimedPayload['server_timing']
requests: Array<{
id: string
status: 'pending' | 'streaming' | 'completed' | 'failed' | 'cancelled'
@@ -569,9 +549,8 @@ export const usageApi = {
if (typeof timeRange?.tz_offset_minutes === 'number') {
params.tz_offset_minutes = timeRange.tz_offset_minutes
}
const clientSendUnixMs = beginServerTimingSample()
const response = await apiClient.get('/api/admin/usage/active', { params })
return withServerTiming(response, clientSendUnixMs)
return response.data
},
/**