Per-player playtime tracking + sparkline hover tooltips
- New GET /api/players/playtime (authed): reads each vanilla stats file
under /home/minecraft/server/world/stats and maps uuid→name via
usercache.json. Returns playtime in ticks and hours, plus file mtime
as "last seen". Memoized 60s via lib/cache#memoAsync.
- New PlaytimeLeaderboard card in the Players tab:
- Rank, avatar (click → PlayerDrawer), relative last-seen, hours.
- Top 10 by default with toggle to show all; combined hours badge.
- PlayerDrawer surfaces the player's total hours + last-seen using the
same cached playtime query, plus fills in UUID if the player is not
in ops/whitelist/banned.
- lib/time.ts: formatHours() — minutes under 1h, "H.Hh" under a day,
"Dd Hh" above.
- Analytics sparklines gain hover/touch tooltips:
- Timestamps threaded through from each MetricEntry.
- SVG overlay captures onMouseMove/onTouchMove, computes nearest
index by x, draws a dashed guide line + focus dot.
- Floating tooltip shows HH:MM + formatted value with unit; edge
clamping keeps it in-frame at the extremes.
- Per-chart formatValue so RAM shows GB, CPU 0 decimals, Players
integer, TPS 1 decimal. Keeps the peak-player marker intact.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
7ada9ec7d9
commit
9ccd4ca772
6 changed files with 413 additions and 38 deletions
|
|
@ -1,7 +1,7 @@
|
|||
"use client";
|
||||
|
||||
import { useQuery } from "@tanstack/react-query";
|
||||
import { useMemo, useState } from "react";
|
||||
import { useMemo, useRef, useState } from "react";
|
||||
import { Skeleton } from "@/components/ui/skeleton";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import { PlayerAvatar } from "@/components/PlayerAvatar";
|
||||
|
|
@ -67,6 +67,14 @@ function UptimeRing({ percent, size = 64 }: { percent: number; size?: number })
|
|||
);
|
||||
}
|
||||
|
||||
function formatTime(iso: string): string {
|
||||
const d = new Date(iso);
|
||||
if (isNaN(d.getTime())) return "";
|
||||
const hh = String(d.getHours()).padStart(2, "0");
|
||||
const mm = String(d.getMinutes()).padStart(2, "0");
|
||||
return `${hh}:${mm}`;
|
||||
}
|
||||
|
||||
function Sparkline({
|
||||
data,
|
||||
color,
|
||||
|
|
@ -77,6 +85,8 @@ function Sparkline({
|
|||
currentValue,
|
||||
peakIndex,
|
||||
peakLabel,
|
||||
timestamps,
|
||||
formatValue,
|
||||
}: {
|
||||
data: number[];
|
||||
color: string;
|
||||
|
|
@ -87,7 +97,52 @@ function Sparkline({
|
|||
currentValue: string;
|
||||
peakIndex?: number;
|
||||
peakLabel?: string;
|
||||
timestamps?: string[];
|
||||
formatValue?: (v: number) => string;
|
||||
}) {
|
||||
const svgRef = useRef<SVGSVGElement>(null);
|
||||
const [hoverIdx, setHoverIdx] = useState<number | null>(null);
|
||||
|
||||
const coords = useMemo(() => {
|
||||
if (data.length < 2) return [] as { x: number; y: number }[];
|
||||
const dataMax = max || Math.max(...data, 1);
|
||||
const width = 300;
|
||||
return data.map((v, i) => {
|
||||
const x = (i / (data.length - 1)) * width;
|
||||
const y = height - (v / dataMax) * (height - 10) - 5;
|
||||
return { x, y };
|
||||
});
|
||||
}, [data, max, height]);
|
||||
|
||||
const { pathD, areaD, w, peakXY } = useMemo(() => {
|
||||
const width = 300;
|
||||
const pts = coords.map((c) => `${c.x},${c.y}`);
|
||||
const p = pts.length ? `M${pts.join(" L")}` : "";
|
||||
const peak =
|
||||
typeof peakIndex === "number" && peakIndex >= 0 && peakIndex < coords.length
|
||||
? coords[peakIndex]
|
||||
: null;
|
||||
return {
|
||||
pathD: p,
|
||||
areaD: p ? `${p} L${width},${height} L0,${height} Z` : "",
|
||||
w: width,
|
||||
peakXY: peak,
|
||||
};
|
||||
}, [coords, height, peakIndex]);
|
||||
|
||||
const locate = (clientX: number) => {
|
||||
const svg = svgRef.current;
|
||||
if (!svg || data.length < 2) return;
|
||||
const rect = svg.getBoundingClientRect();
|
||||
if (rect.width <= 0) return;
|
||||
const ratio = Math.max(0, Math.min(1, (clientX - rect.left) / rect.width));
|
||||
setHoverIdx(Math.round(ratio * (data.length - 1)));
|
||||
};
|
||||
|
||||
const defaultFormat = (v: number) =>
|
||||
Number.isInteger(v) ? String(v) : v.toFixed(1);
|
||||
const fmt = formatValue || defaultFormat;
|
||||
|
||||
if (data.length < 2) {
|
||||
return (
|
||||
<div className="rounded-lg bg-muted p-4">
|
||||
|
|
@ -106,27 +161,14 @@ function Sparkline({
|
|||
);
|
||||
}
|
||||
|
||||
const { pathD, areaD, w, peakXY } = useMemo(() => {
|
||||
const dataMax = max || Math.max(...data, 1);
|
||||
const width = 300;
|
||||
const coords = data.map((v, i) => {
|
||||
const x = (i / (data.length - 1)) * width;
|
||||
const y = height - (v / dataMax) * (height - 10) - 5;
|
||||
return { x, y };
|
||||
});
|
||||
const pts = coords.map((c) => `${c.x},${c.y}`);
|
||||
const p = `M${pts.join(" L")}`;
|
||||
const peak =
|
||||
typeof peakIndex === "number" && peakIndex >= 0 && peakIndex < coords.length
|
||||
? coords[peakIndex]
|
||||
: null;
|
||||
return {
|
||||
pathD: p,
|
||||
areaD: `${p} L${width},${height} L0,${height} Z`,
|
||||
w: width,
|
||||
peakXY: peak,
|
||||
};
|
||||
}, [data, max, height, peakIndex]);
|
||||
const hovered = hoverIdx !== null ? coords[hoverIdx] : null;
|
||||
const hoverRatio = hoverIdx !== null ? hoverIdx / (data.length - 1) : 0;
|
||||
const hoverTime =
|
||||
hoverIdx !== null && timestamps?.[hoverIdx]
|
||||
? formatTime(timestamps[hoverIdx])
|
||||
: "";
|
||||
const hoverValue =
|
||||
hoverIdx !== null ? `${fmt(data[hoverIdx])}${unit ? ` ${unit}` : ""}` : "";
|
||||
|
||||
return (
|
||||
<div className="rounded-lg bg-muted p-4">
|
||||
|
|
@ -139,22 +181,82 @@ function Sparkline({
|
|||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<svg viewBox={`0 0 ${w} ${height}`} className="w-full" preserveAspectRatio="none">
|
||||
<defs>
|
||||
<linearGradient id={`grad-${label}`} x1="0" y1="0" x2="0" y2="1">
|
||||
<stop offset="0%" stopColor={color} stopOpacity="0.3" />
|
||||
<stop offset="100%" stopColor={color} stopOpacity="0" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<path d={areaD} fill={`url(#grad-${label})`} />
|
||||
<path d={pathD} fill="none" stroke={color} strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" />
|
||||
{peakXY && (
|
||||
<>
|
||||
<circle cx={peakXY.x} cy={peakXY.y} r={3.5} fill={color} />
|
||||
<circle cx={peakXY.x} cy={peakXY.y} r={6} fill={color} fillOpacity="0.25" />
|
||||
</>
|
||||
<div className="relative">
|
||||
<svg
|
||||
ref={svgRef}
|
||||
viewBox={`0 0 ${w} ${height}`}
|
||||
className="w-full touch-none"
|
||||
preserveAspectRatio="none"
|
||||
onMouseMove={(e) => locate(e.clientX)}
|
||||
onMouseLeave={() => setHoverIdx(null)}
|
||||
onTouchMove={(e) => {
|
||||
const t = e.touches[0];
|
||||
if (t) locate(t.clientX);
|
||||
}}
|
||||
onTouchEnd={() => setHoverIdx(null)}
|
||||
role="img"
|
||||
aria-label={`${label} over time`}
|
||||
>
|
||||
<defs>
|
||||
<linearGradient id={`grad-${label}`} x1="0" y1="0" x2="0" y2="1">
|
||||
<stop offset="0%" stopColor={color} stopOpacity="0.3" />
|
||||
<stop offset="100%" stopColor={color} stopOpacity="0" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<path d={areaD} fill={`url(#grad-${label})`} />
|
||||
<path
|
||||
d={pathD}
|
||||
fill="none"
|
||||
stroke={color}
|
||||
strokeWidth="2"
|
||||
strokeLinecap="round"
|
||||
strokeLinejoin="round"
|
||||
/>
|
||||
{peakXY && (
|
||||
<>
|
||||
<circle cx={peakXY.x} cy={peakXY.y} r={3.5} fill={color} />
|
||||
<circle cx={peakXY.x} cy={peakXY.y} r={6} fill={color} fillOpacity="0.25" />
|
||||
</>
|
||||
)}
|
||||
{hovered && (
|
||||
<>
|
||||
<line
|
||||
x1={hovered.x}
|
||||
x2={hovered.x}
|
||||
y1={0}
|
||||
y2={height}
|
||||
stroke={color}
|
||||
strokeOpacity="0.4"
|
||||
strokeWidth="1"
|
||||
strokeDasharray="3 3"
|
||||
vectorEffect="non-scaling-stroke"
|
||||
/>
|
||||
<circle cx={hovered.x} cy={hovered.y} r={4} fill={color} />
|
||||
<circle cx={hovered.x} cy={hovered.y} r={7} fill={color} fillOpacity="0.25" />
|
||||
</>
|
||||
)}
|
||||
</svg>
|
||||
{hovered && (
|
||||
<div
|
||||
role="status"
|
||||
aria-live="polite"
|
||||
className="pointer-events-none absolute -top-1 -translate-y-full rounded-md border border-border bg-popover text-popover-foreground px-2 py-1 text-[11px] shadow-md tabular-nums whitespace-nowrap"
|
||||
style={{
|
||||
left: `${hoverRatio * 100}%`,
|
||||
transform: `translate(${
|
||||
hoverRatio > 0.85 ? "-100%" : hoverRatio < 0.15 ? "0%" : "-50%"
|
||||
}, -100%)`,
|
||||
}}
|
||||
>
|
||||
{hoverTime && (
|
||||
<span className="text-muted-foreground mr-1.5">{hoverTime}</span>
|
||||
)}
|
||||
<span className="font-semibold" style={{ color }}>
|
||||
{hoverValue}
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
</svg>
|
||||
</div>
|
||||
{peakLabel && (
|
||||
<p className="text-[10px] text-muted-foreground mt-1 tabular-nums">
|
||||
peak {peakLabel}
|
||||
|
|
@ -283,37 +385,45 @@ export function Analytics() {
|
|||
<div className="grid grid-cols-1 md:grid-cols-2 gap-3">
|
||||
<Sparkline
|
||||
data={metrics.map((m) => m.tps)}
|
||||
timestamps={metrics.map((m) => m.ts)}
|
||||
color="#4ade80"
|
||||
max={22}
|
||||
label="TPS"
|
||||
unit=""
|
||||
currentValue={latest ? latest.tps.toFixed(1) : "-"}
|
||||
formatValue={(v) => v.toFixed(1)}
|
||||
/>
|
||||
<Sparkline
|
||||
data={metrics.map((m) => m.ramUsedMB)}
|
||||
timestamps={metrics.map((m) => m.ts)}
|
||||
color="#60a5fa"
|
||||
label="RAM"
|
||||
unit="MB"
|
||||
unit="GB"
|
||||
currentValue={
|
||||
latest ? `${(latest.ramUsedMB / 1024).toFixed(1)} GB` : "-"
|
||||
}
|
||||
formatValue={(v) => (v / 1024).toFixed(1)}
|
||||
/>
|
||||
<Sparkline
|
||||
data={metrics.map((m) => m.cpuPercent)}
|
||||
timestamps={metrics.map((m) => m.ts)}
|
||||
color="#f59e0b"
|
||||
max={100}
|
||||
label="CPU"
|
||||
unit="%"
|
||||
currentValue={latest ? latest.cpuPercent.toFixed(0) : "-"}
|
||||
formatValue={(v) => v.toFixed(0)}
|
||||
/>
|
||||
<Sparkline
|
||||
data={metrics.map((m) => m.playersOnline)}
|
||||
timestamps={metrics.map((m) => m.ts)}
|
||||
color="#a78bfa"
|
||||
label="Players"
|
||||
unit=""
|
||||
currentValue={latest ? latest.playersOnline.toString() : "0"}
|
||||
peakIndex={peakPlayers > 0 ? peakIndex : undefined}
|
||||
peakLabel={peakPlayers > 0 ? peakPlayers.toString() : undefined}
|
||||
formatValue={(v) => String(Math.round(v))}
|
||||
/>
|
||||
</div>
|
||||
</CardContent>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue