feat: 优化接口速度
This commit is contained in:
parent
fd20a4411b
commit
d1c5b818d9
@ -12,6 +12,30 @@ import { ScreenRecord, TimeDistributionPoint, Segment, Marker } from '../types';
|
||||
import { formatMemory, formatDate } from '../utils';
|
||||
import { useStarToggle } from '../hooks/useStarToggle';
|
||||
|
||||
const inFlightJsonRequests = new Map<string, Promise<unknown>>();
|
||||
|
||||
const fetchJsonOnce = async <T,>(url: string): Promise<T> => {
|
||||
const existingRequest = inFlightJsonRequests.get(url);
|
||||
if (existingRequest) {
|
||||
return existingRequest as Promise<T>;
|
||||
}
|
||||
|
||||
const request = fetch(url, { cache: 'no-store' })
|
||||
.then(async (response) => {
|
||||
if (!response.ok) {
|
||||
throw new Error(`Request failed with status ${response.status}`);
|
||||
}
|
||||
|
||||
return response.json() as Promise<T>;
|
||||
})
|
||||
.finally(() => {
|
||||
inFlightJsonRequests.delete(url);
|
||||
});
|
||||
|
||||
inFlightJsonRequests.set(url, request);
|
||||
return request as Promise<T>;
|
||||
};
|
||||
|
||||
interface ScreenshotsTabProps {
|
||||
hostname: string;
|
||||
selectedDate: string | null;
|
||||
@ -27,6 +51,9 @@ export default function ScreenshotsTab({
|
||||
jumpRequest,
|
||||
onLastUpdateChange
|
||||
}: ScreenshotsTabProps) {
|
||||
const timeDistributionRequestIdRef = useRef(0);
|
||||
const hourlyRecordsRequestIdRef = useRef(0);
|
||||
|
||||
// 状态管理
|
||||
const [timeDistribution, setTimeDistribution] = useState<TimeDistributionPoint[]>([]);
|
||||
const [records, setRecords] = useState<ScreenRecord[]>([]);
|
||||
@ -58,30 +85,50 @@ export default function ScreenshotsTab({
|
||||
|
||||
// 获取时间分布数据
|
||||
const fetchTimeDistribution = async () => {
|
||||
const requestId = ++timeDistributionRequestIdRef.current;
|
||||
|
||||
try {
|
||||
setLoadingDistribution(true);
|
||||
const response = await fetch(`/hosts/${hostname}/time-distribution`);
|
||||
if (!response.ok) throw new Error('获取时间分布数据失败');
|
||||
const data = await response.json();
|
||||
|
||||
const data = await fetchJsonOnce<{ distribution: TimeDistributionPoint[] }>(
|
||||
`/hosts/${hostname}/time-distribution`
|
||||
);
|
||||
|
||||
if (requestId !== timeDistributionRequestIdRef.current) {
|
||||
return;
|
||||
}
|
||||
|
||||
setTimeDistribution(data.distribution);
|
||||
} catch (error) {
|
||||
console.error('获取时间分布数据失败:', error);
|
||||
if (requestId === timeDistributionRequestIdRef.current) {
|
||||
console.error('获取时间分布数据失败:', error);
|
||||
}
|
||||
} finally {
|
||||
setLoadingDistribution(false);
|
||||
if (requestId === timeDistributionRequestIdRef.current) {
|
||||
setLoadingDistribution(false);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// 获取小时记录
|
||||
const fetchHourlyRecords = async (startTime: number, endTime: number, options?: { targetRecordId?: string, keepSelection?: boolean }) => {
|
||||
const requestId = ++hourlyRecordsRequestIdRef.current;
|
||||
const requestUrl = `/hosts/${hostname}/screenshots?startTime=${startTime}&endTime=${endTime}`;
|
||||
|
||||
try {
|
||||
setLoadingRecords(true);
|
||||
setShowDetailTimeline(true);
|
||||
const response = await fetch(
|
||||
`/hosts/${hostname}/screenshots?startTime=${startTime}&endTime=${endTime}`
|
||||
);
|
||||
if (!response.ok) throw new Error('获取记录数据失败');
|
||||
const data = await response.json();
|
||||
const newRecords = data.records.reverse();
|
||||
|
||||
const data = await fetchJsonOnce<{
|
||||
lastUpdate: string | null;
|
||||
records: ScreenRecord[];
|
||||
}>(requestUrl);
|
||||
|
||||
if (requestId !== hourlyRecordsRequestIdRef.current) {
|
||||
return;
|
||||
}
|
||||
|
||||
const newRecords = data.records;
|
||||
setRecords(newRecords);
|
||||
onLastUpdateChange(data.lastUpdate);
|
||||
setTimeRange({ min: startTime * 1000, max: endTime * 1000 });
|
||||
@ -104,9 +151,13 @@ export default function ScreenshotsTab({
|
||||
}
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('获取记录数据失败:', error);
|
||||
if (requestId === hourlyRecordsRequestIdRef.current) {
|
||||
console.error('获取记录数据失败:', error);
|
||||
}
|
||||
} finally {
|
||||
setLoadingRecords(false);
|
||||
if (requestId === hourlyRecordsRequestIdRef.current) {
|
||||
setLoadingRecords(false);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@ import { NextRequest, NextResponse } from 'next/server'
|
||||
import { win32 } from 'path'
|
||||
import { prisma } from '@/lib/prisma'
|
||||
import { withCors } from '@/lib/middleware'
|
||||
import { Prisma } from '@prisma/client'
|
||||
|
||||
const MAX_GAP_MS = 5 * 60 * 1000
|
||||
const DEFAULT_SAMPLE_MS = 30 * 1000
|
||||
@ -36,6 +37,12 @@ interface HourBucket {
|
||||
appDurations: Map<string, number>
|
||||
}
|
||||
|
||||
interface ScreenTimeRecordRow {
|
||||
timestamp: Date
|
||||
title: string | null
|
||||
path: string | null
|
||||
}
|
||||
|
||||
const cleanTitle = (title: string) => title.replace(/\s+/g, ' ').trim()
|
||||
|
||||
const trimLabelSeparators = (label: string) => label
|
||||
@ -304,27 +311,36 @@ async function handleScreenTime(req: NextRequest) {
|
||||
const aggregateEndMs = unit === 'week' ? weekEndMs : selectedDayEndMs
|
||||
const aggregateEndDate = addDays(aggregateStartDate, unit === 'week' ? 7 : 1)
|
||||
|
||||
const records = await prisma.record.findMany({
|
||||
where: {
|
||||
hostname,
|
||||
timestamp: {
|
||||
gte: new Date(weekStartMs - MAX_GAP_MS),
|
||||
lte: new Date(weekEndMs + MAX_GAP_MS)
|
||||
}
|
||||
},
|
||||
select: {
|
||||
timestamp: true,
|
||||
windows: {
|
||||
select: {
|
||||
title: true,
|
||||
path: true
|
||||
}
|
||||
}
|
||||
},
|
||||
orderBy: {
|
||||
timestamp: 'asc'
|
||||
}
|
||||
})
|
||||
const rangeStart = new Date(weekStartMs - MAX_GAP_MS)
|
||||
const rangeEnd = new Date(weekEndMs + MAX_GAP_MS)
|
||||
|
||||
const records = await prisma.$queryRaw<ScreenTimeRecordRow[]>(Prisma.sql`
|
||||
WITH scoped_records AS (
|
||||
SELECT "id", "timestamp"
|
||||
FROM "records"
|
||||
WHERE "hostname" = ${hostname}
|
||||
AND "timestamp" >= ${rangeStart}
|
||||
AND "timestamp" <= ${rangeEnd}
|
||||
),
|
||||
ranked_windows AS (
|
||||
SELECT
|
||||
w."recordId",
|
||||
w."title",
|
||||
w."path",
|
||||
ROW_NUMBER() OVER (PARTITION BY w."recordId" ORDER BY w."id") AS row_number
|
||||
FROM "windows" w
|
||||
INNER JOIN scoped_records r ON r."id" = w."recordId"
|
||||
)
|
||||
SELECT
|
||||
r."timestamp",
|
||||
w."title",
|
||||
w."path"
|
||||
FROM scoped_records r
|
||||
LEFT JOIN ranked_windows w
|
||||
ON w."recordId" = r."id"
|
||||
AND w.row_number = 1
|
||||
ORDER BY r."timestamp" ASC
|
||||
`)
|
||||
|
||||
const validDiffs = records
|
||||
.slice(0, -1)
|
||||
@ -346,8 +362,7 @@ async function handleScreenTime(req: NextRequest) {
|
||||
}))
|
||||
|
||||
records.forEach((record, index) => {
|
||||
const activeWindow = record.windows[0]
|
||||
if (!activeWindow) return
|
||||
if (record.title === null && record.path === null) return
|
||||
|
||||
const currentMs = record.timestamp.getTime()
|
||||
const nextMs = records[index + 1]?.timestamp.getTime()
|
||||
@ -359,10 +374,10 @@ async function handleScreenTime(req: NextRequest) {
|
||||
|
||||
const intervalStartMs = currentMs
|
||||
const intervalEndMs = currentMs + intervalMs
|
||||
const title = cleanTitle(activeWindow.title)
|
||||
|| stripExtension(win32.basename(activeWindow.path || ''))
|
||||
const title = cleanTitle(record.title ?? '')
|
||||
|| stripExtension(win32.basename(record.path ?? ''))
|
||||
|| '未知窗口'
|
||||
const process = normalizeProcess(activeWindow.path, title)
|
||||
const process = normalizeProcess(record.path ?? '', title)
|
||||
|
||||
const aggregateContributionMs = Math.max(0, Math.min(intervalEndMs, aggregateEndMs) - Math.max(intervalStartMs, aggregateStartMs))
|
||||
addDurationToUsageMap(
|
||||
|
||||
@ -218,26 +218,40 @@ async function handleGetScreenshots(req: NextRequest) {
|
||||
if (endTime) whereClause.timestamp.lte = endTime
|
||||
}
|
||||
|
||||
// Get records
|
||||
const records = await prisma.record.findMany({
|
||||
where: whereClause,
|
||||
include: {
|
||||
windows: true,
|
||||
screenshots: true
|
||||
},
|
||||
orderBy: {
|
||||
timestamp: 'desc'
|
||||
}
|
||||
})
|
||||
|
||||
// Get host info
|
||||
const host = await prisma.host.findUnique({
|
||||
where: { hostname },
|
||||
select: {
|
||||
hostname: true,
|
||||
lastUpdate: true
|
||||
}
|
||||
})
|
||||
const [records, host] = await Promise.all([
|
||||
prisma.record.findMany({
|
||||
where: whereClause,
|
||||
select: {
|
||||
id: true,
|
||||
timestamp: true,
|
||||
isStarred: true,
|
||||
windows: {
|
||||
select: {
|
||||
title: true,
|
||||
path: true,
|
||||
memory: true
|
||||
}
|
||||
},
|
||||
screenshots: {
|
||||
select: {
|
||||
fileId: true,
|
||||
filename: true,
|
||||
monitorName: true
|
||||
}
|
||||
}
|
||||
},
|
||||
orderBy: {
|
||||
timestamp: 'asc'
|
||||
}
|
||||
}),
|
||||
prisma.host.findUnique({
|
||||
where: { hostname },
|
||||
select: {
|
||||
hostname: true,
|
||||
lastUpdate: true
|
||||
}
|
||||
})
|
||||
])
|
||||
|
||||
if (!host) {
|
||||
return NextResponse.json({ error: '未找到主机记录' }, { status: 404 })
|
||||
|
||||
@ -0,0 +1,5 @@
|
||||
-- CreateIndex
|
||||
CREATE INDEX "windows_recordId_idx" ON "windows"("recordId");
|
||||
|
||||
-- CreateIndex
|
||||
CREATE INDEX "screenshots_recordId_idx" ON "screenshots"("recordId");
|
||||
@ -55,6 +55,8 @@ model Window {
|
||||
|
||||
// Relations
|
||||
record Record @relation(fields: [recordId], references: [id], onDelete: Cascade)
|
||||
|
||||
@@index([recordId])
|
||||
|
||||
@@map("windows")
|
||||
}
|
||||
@ -71,7 +73,8 @@ model Screenshot {
|
||||
|
||||
// Relations
|
||||
record Record @relation(fields: [recordId], references: [id], onDelete: Cascade)
|
||||
|
||||
|
||||
@@index([recordId])
|
||||
@@index([objectName])
|
||||
@@map("screenshots")
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user