Performance: RCON pooling, route caching, parallel status probe

Server:
- lib/cache.ts: tiny TTL memo for hot paths.
- lib/rcon.ts: pooled connection with 30s idle close and one-shot retry;
  was opening a fresh TCP per RCON call.
- /api/status: race protocol-ping + RCON with Promise.any (was sequential
  with 5s timeouts) and memo 3s; adds Cache-Control.
- /api/players: memo 10s, invalidated on mutations.
- /api/mods: getModDetails memo 10s (invalidated on install/remove) —
  eliminates per-request readdirSync/statSync/AdmZip parse.
- /api/analytics: reverse-scan JSONL to window cutoff (O(window) vs O(file))
  and memo 30s.
- /api/logs: memo 2s to throttle journalctl spawns during Live mode.

Client:
- StatusCard + ServerControls: staleTime 5s, both poll every 10s, dedup
  via shared query key.
- Analytics: staleTime 30s; memoize sparkline SVG paths.
- Modrinth search icons + mc-heads avatars: width/height + loading=lazy +
  decoding=async.
- next.config.ts: images.remotePatterns for future next/image migration,
  explicit compress=true.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
hurkicorgi 2026-04-13 00:59:10 -06:00
parent b6b10159ad
commit b6cf8c7cdc
14 changed files with 220 additions and 82 deletions

View file

@ -1,6 +1,7 @@
import { NextRequest, NextResponse } from "next/server"; import { NextRequest, NextResponse } from "next/server";
import { readFileSync, existsSync } from "fs"; import { readFileSync, existsSync } from "fs";
import { auth } from "@/lib/auth"; import { auth } from "@/lib/auth";
import { memo } from "@/lib/cache";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
@ -16,6 +17,27 @@ type MetricEntry = {
players: string[]; players: string[];
}; };
function readWindow(hours: number): MetricEntry[] {
const cutoff = new Date(Date.now() - hours * 60 * 60 * 1000).toISOString();
const raw = readFileSync(ANALYTICS_FILE, "utf8");
// Reverse scan: walk from the end, collect until we pass cutoff.
const out: MetricEntry[] = [];
let end = raw.length;
while (end > 0) {
const start = raw.lastIndexOf("\n", end - 1);
const line = raw.slice(start + 1, end).trim();
end = start;
if (!line) continue;
try {
const entry = JSON.parse(line) as MetricEntry;
if (entry.ts < cutoff) break; // file is append-ordered by time
out.push(entry);
} catch {}
}
return out.reverse();
}
export async function GET(req: NextRequest) { export async function GET(req: NextRequest) {
const session = await auth(); const session = await auth();
if (!session) { if (!session) {
@ -32,21 +54,10 @@ export async function GET(req: NextRequest) {
} }
try { try {
const lines = readFileSync(ANALYTICS_FILE, "utf8") const entries = memo(`analytics:${hours}`, 30_000, () => readWindow(hours));
.split("\n") return NextResponse.json(entries, {
.filter(Boolean); headers: { "Cache-Control": "private, max-age=30" },
});
const cutoff = new Date(Date.now() - hours * 60 * 60 * 1000).toISOString();
const entries: MetricEntry[] = [];
for (const line of lines) {
try {
const entry = JSON.parse(line) as MetricEntry;
if (entry.ts >= cutoff) entries.push(entry);
} catch {}
}
return NextResponse.json(entries);
} catch (e) { } catch (e) {
return NextResponse.json( return NextResponse.json(
{ error: (e as Error).message }, { error: (e as Error).message },

View file

@ -1,6 +1,7 @@
import { NextRequest, NextResponse } from "next/server"; import { NextRequest, NextResponse } from "next/server";
import { execSync } from "child_process"; import { execSync } from "child_process";
import { auth } from "@/lib/auth"; import { auth } from "@/lib/auth";
import { memo } from "@/lib/cache";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
@ -16,9 +17,11 @@ export async function GET(req: NextRequest) {
); );
try { try {
const logs = execSync( const logs = memo(`logs:${lines}`, 2000, () =>
`sudo journalctl -u minecraft.service --no-pager -n ${lines}`, execSync(`sudo journalctl -u minecraft.service --no-pager -n ${lines}`, {
{ encoding: "utf8", timeout: 5000 } encoding: "utf8",
timeout: 5000,
})
); );
return NextResponse.json({ logs }); return NextResponse.json({ logs });
} catch (e) { } catch (e) {

View file

@ -6,7 +6,9 @@ export const dynamic = "force-dynamic";
export async function GET() { export async function GET() {
try { try {
const mods = getModDetails(); const mods = getModDetails();
return NextResponse.json(mods); return NextResponse.json(mods, {
headers: { "Cache-Control": "public, max-age=10" },
});
} catch (e) { } catch (e) {
return NextResponse.json( return NextResponse.json(
{ error: (e as Error).message }, { error: (e as Error).message },

View file

@ -2,6 +2,7 @@ import { NextRequest, NextResponse } from "next/server";
import { readFileSync } from "fs"; import { readFileSync } from "fs";
import { auth } from "@/lib/auth"; import { auth } from "@/lib/auth";
import { sendCommand } from "@/lib/rcon"; import { sendCommand } from "@/lib/rcon";
import { memo, invalidate } from "@/lib/cache";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
@ -28,24 +29,27 @@ export async function GET() {
return NextResponse.json({ error: "Unauthorized" }, { status: 403 }); return NextResponse.json({ error: "Unauthorized" }, { status: 403 });
} }
const data = memo("players", 10_000, () => {
const ops = readJson<OpsEntry>(OPS_FILE).map((e) => ({ const ops = readJson<OpsEntry>(OPS_FILE).map((e) => ({
name: e.name, name: e.name,
uuid: e.uuid, uuid: e.uuid,
level: e.level, level: e.level,
})); }));
const whitelist = readJson<WhitelistEntry>(WHITELIST_FILE).map((e) => ({ const whitelist = readJson<WhitelistEntry>(WHITELIST_FILE).map((e) => ({
name: e.name, name: e.name,
uuid: e.uuid, uuid: e.uuid,
})); }));
const banned = readJson<BannedEntry>(BANNED_FILE).map((e) => ({ const banned = readJson<BannedEntry>(BANNED_FILE).map((e) => ({
name: e.name, name: e.name,
uuid: e.uuid, uuid: e.uuid,
reason: e.reason, reason: e.reason,
})); }));
return { ops, whitelist, banned };
});
return NextResponse.json({ ops, whitelist, banned }); return NextResponse.json(data, {
headers: { "Cache-Control": "private, max-age=5" },
});
} }
// POST — execute a player management command // POST — execute a player management command
@ -87,6 +91,7 @@ export async function POST(req: NextRequest) {
// Wait for server to write JSON files to disk // Wait for server to write JSON files to disk
await new Promise((r) => setTimeout(r, 500)); await new Promise((r) => setTimeout(r, 500));
invalidate("players");
return NextResponse.json({ ok: true, response }); return NextResponse.json({ ok: true, response });
} catch (e) { } catch (e) {

View file

@ -3,37 +3,44 @@ import { status } from "minecraft-server-util";
import { execSync } from "child_process"; import { execSync } from "child_process";
import { MC_SERVER_IP, MC_SERVER_PORT } from "@/lib/constants"; import { MC_SERVER_IP, MC_SERVER_PORT } from "@/lib/constants";
import { sendCommand } from "@/lib/rcon"; import { sendCommand } from "@/lib/rcon";
import { memoAsync } from "@/lib/cache";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
export async function GET() { type StatusResult = {
// Tier 1: MC protocol ping (fastest, gives player/version info) online: boolean;
try { starting?: boolean;
const result = await status(MC_SERVER_IP, MC_SERVER_PORT, { players: { online: number; max: number };
timeout: 5000, version?: string;
}); motd?: string;
return NextResponse.json({ };
online: true,
players: { online: result.players.online, max: result.players.max },
version: result.version.name,
motd: result.motd.clean,
});
} catch {}
// Tier 2: RCON (server is online but protocol ping failed) async function probeStatus(): Promise<StatusResult> {
try { // Race protocol ping + RCON in parallel — whichever wins first signals "online"
const response = await sendCommand("list"); const ping = status(MC_SERVER_IP, MC_SERVER_PORT, { timeout: 3000 }).then(
(r): StatusResult => ({
online: true,
players: { online: r.players.online, max: r.players.max },
version: r.version.name,
motd: r.motd.clean,
})
);
const rcon = sendCommand("list").then((response): StatusResult => {
const match = response.match(/There are (\d+) of a max of (\d+) players/); const match = response.match(/There are (\d+) of a max of (\d+) players/);
return NextResponse.json({ return {
online: true, online: true,
players: { players: {
online: match ? parseInt(match[1], 10) : 0, online: match ? parseInt(match[1], 10) : 0,
max: match ? parseInt(match[2], 10) : 20, max: match ? parseInt(match[2], 10) : 20,
}, },
};
}); });
} catch {}
// Tier 3: systemctl (process alive but not yet accepting connections) try {
return await Promise.any([ping, rcon]);
} catch {
// Both failed — check if process is up
let starting = false; let starting = false;
try { try {
const out = execSync("systemctl is-active minecraft.service", { const out = execSync("systemctl is-active minecraft.service", {
@ -41,10 +48,13 @@ export async function GET() {
}).trim(); }).trim();
starting = out === "active" || out === "activating"; starting = out === "active" || out === "activating";
} catch {} } catch {}
return { online: false, starting, players: { online: 0, max: 0 } };
}
}
return NextResponse.json({ export async function GET() {
online: false, const result = await memoAsync("status", 3000, probeStatus);
starting, return NextResponse.json(result, {
players: { online: 0, max: 0 }, headers: { "Cache-Control": "public, max-age=3" },
}); });
} }

View file

@ -1,7 +1,7 @@
"use client"; "use client";
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import { useState } from "react"; import { useMemo, useState } from "react";
import { Skeleton } from "@/components/ui/skeleton"; import { Skeleton } from "@/components/ui/skeleton";
import { import {
Card, Card,
@ -55,16 +55,17 @@ function Sparkline({
); );
} }
const { pathD, areaD, w } = useMemo(() => {
const dataMax = max || Math.max(...data, 1); const dataMax = max || Math.max(...data, 1);
const w = 300; const width = 300;
const points = data.map((v, i) => { const pts = data.map((v, i) => {
const x = (i / (data.length - 1)) * w; const x = (i / (data.length - 1)) * width;
const y = height - (v / dataMax) * (height - 10) - 5; const y = height - (v / dataMax) * (height - 10) - 5;
return `${x},${y}`; return `${x},${y}`;
}); });
const p = `M${pts.join(" L")}`;
const pathD = `M${points.join(" L")}`; return { pathD: p, areaD: `${p} L${width},${height} L0,${height} Z`, w: width };
const areaD = `${pathD} L${w},${height} L0,${height} Z`; }, [data, max, height]);
return ( return (
<div className="rounded-lg bg-muted p-4"> <div className="rounded-lg bg-muted p-4">
@ -99,6 +100,7 @@ export function Analytics() {
queryFn: () => queryFn: () =>
fetch(`/api/analytics?hours=${hours}`).then((r) => r.json()), fetch(`/api/analytics?hours=${hours}`).then((r) => r.json()),
refetchInterval: 60_000, refetchInterval: 60_000,
staleTime: 30_000,
}); });
const latest = metrics.length > 0 ? metrics[metrics.length - 1] : null; const latest = metrics.length > 0 ? metrics[metrics.length - 1] : null;

View file

@ -489,7 +489,11 @@ export function ModManager() {
<img <img
src={result.icon_url} src={result.icon_url}
alt="" alt=""
className="w-10 h-10 rounded-md shrink-0" width={40}
height={40}
loading="lazy"
decoding="async"
className="w-10 h-10 rounded-md shrink-0 bg-muted"
/> />
) : ( ) : (
<div className="w-10 h-10 rounded-md bg-muted shrink-0" /> <div className="w-10 h-10 rounded-md bg-muted shrink-0" />

View file

@ -33,6 +33,8 @@ export function PlayerAvatar({
alt="" alt=""
width={size} width={size}
height={size} height={size}
loading="lazy"
decoding="async"
onError={() => setFailed(true)} onError={() => setFailed(true)}
className={`rounded shrink-0 bg-muted ${className}`} className={`rounded shrink-0 bg-muted ${className}`}
/> />

View file

@ -39,6 +39,7 @@ export function ServerControls() {
queryKey: ["status"], queryKey: ["status"],
queryFn: () => fetch("/api/status").then((r) => r.json()), queryFn: () => fetch("/api/status").then((r) => r.json()),
refetchInterval: 10000, refetchInterval: 10000,
staleTime: 5000,
}); });
const action = useMutation({ const action = useMutation({

View file

@ -20,7 +20,8 @@ export function StatusCard() {
const { data, isLoading } = useQuery<ServerStatus>({ const { data, isLoading } = useQuery<ServerStatus>({
queryKey: ["status"], queryKey: ["status"],
queryFn: () => fetch("/api/status").then((r) => r.json()), queryFn: () => fetch("/api/status").then((r) => r.json()),
refetchInterval: 15000, refetchInterval: 10000,
staleTime: 5000,
}); });
const copyIP = () => { const copyIP = () => {

29
lib/cache.ts Normal file
View file

@ -0,0 +1,29 @@
type Entry<T> = { value: T; expires: number };
const store = new Map<string, Entry<unknown>>();
export function memo<T>(key: string, ttlMs: number, fn: () => T): T {
const now = Date.now();
const hit = store.get(key) as Entry<T> | undefined;
if (hit && hit.expires > now) return hit.value;
const value = fn();
store.set(key, { value, expires: now + ttlMs });
return value;
}
export async function memoAsync<T>(
key: string,
ttlMs: number,
fn: () => Promise<T>
): Promise<T> {
const now = Date.now();
const hit = store.get(key) as Entry<T> | undefined;
if (hit && hit.expires > now) return hit.value;
const value = await fn();
store.set(key, { value, expires: now + ttlMs });
return value;
}
export function invalidate(prefix: string): void {
for (const k of store.keys()) if (k.startsWith(prefix)) store.delete(k);
}

View file

@ -18,8 +18,16 @@ import {
MC_SERVER_PORT, MC_SERVER_PORT,
} from "./constants"; } from "./constants";
import { sendCommand } from "./rcon"; import { sendCommand } from "./rcon";
import { memo, invalidate } from "./cache";
import type { ModSide } from "./modrinth"; import type { ModSide } from "./modrinth";
const MODS_CACHE_KEY = "mods:details";
const MODS_CACHE_TTL = 10_000;
export function invalidateModsCache(): void {
invalidate("mods:");
}
const MODPACK_ZIP = "/var/www/minecraft/modpack.zip"; const MODPACK_ZIP = "/var/www/minecraft/modpack.zip";
const MODPACK_MODS = "/var/www/minecraft/mods"; const MODPACK_MODS = "/var/www/minecraft/mods";
@ -56,6 +64,7 @@ export function addModMetadata(
const metadata = loadModMetadata(); const metadata = loadModMetadata();
metadata[filename] = entry; metadata[filename] = entry;
saveModMetadata(metadata); saveModMetadata(metadata);
invalidateModsCache();
} }
export function removeModMetadata(filename: string): void { export function removeModMetadata(filename: string): void {
@ -108,6 +117,10 @@ function extractModMeta(
} }
export function getModDetails(): ModMeta[] { export function getModDetails(): ModMeta[] {
return memo(MODS_CACHE_KEY, MODS_CACHE_TTL, computeModDetails);
}
function computeModDetails(): ModMeta[] {
const metadata = loadModMetadata(); const metadata = loadModMetadata();
// Server mods // Server mods
@ -149,6 +162,7 @@ export function removeMod(filename: string): void {
} }
removeModMetadata(filename); removeModMetadata(filename);
invalidateModsCache();
} }
export function isClientOnlyMod(filename: string): boolean { export function isClientOnlyMod(filename: string): boolean {

View file

@ -1,18 +1,65 @@
import { Rcon } from "rcon-client"; import { Rcon } from "rcon-client";
import { MC_SERVER_IP, RCON_PORT, RCON_PASSWORD } from "./constants"; import { MC_SERVER_IP, RCON_PORT, RCON_PASSWORD } from "./constants";
export async function sendCommand(command: string): Promise<string> { let pooled: Rcon | null = null;
let connecting: Promise<Rcon> | null = null;
let idleTimer: NodeJS.Timeout | null = null;
const IDLE_MS = 30_000;
async function open(): Promise<Rcon> {
const rcon = await Rcon.connect({ const rcon = await Rcon.connect({
host: MC_SERVER_IP, host: MC_SERVER_IP,
port: RCON_PORT, port: RCON_PORT,
password: RCON_PASSWORD, password: RCON_PASSWORD,
timeout: 5000, timeout: 5000,
}); });
rcon.on("end", () => {
if (pooled === rcon) pooled = null;
});
rcon.on("error", () => {
if (pooled === rcon) pooled = null;
});
return rcon;
}
function scheduleIdleClose() {
if (idleTimer) clearTimeout(idleTimer);
idleTimer = setTimeout(() => {
const r = pooled;
pooled = null;
idleTimer = null;
r?.end().catch(() => {});
}, IDLE_MS);
}
async function getConnection(): Promise<Rcon> {
if (pooled) return pooled;
if (connecting) return connecting;
connecting = open()
.then((r) => {
pooled = r;
return r;
})
.finally(() => {
connecting = null;
});
return connecting;
}
export async function sendCommand(command: string): Promise<string> {
try { try {
const rcon = await getConnection();
const response = await rcon.send(command); const response = await rcon.send(command);
scheduleIdleClose();
return response;
} catch (e) {
// Drop the pooled connection on any error, retry once with fresh
const bad = pooled;
pooled = null;
bad?.end().catch(() => {});
const rcon = await getConnection();
const response = await rcon.send(command);
scheduleIdleClose();
return response; return response;
} finally {
rcon.end();
} }
} }

View file

@ -2,6 +2,13 @@ import type { NextConfig } from "next";
const nextConfig: NextConfig = { const nextConfig: NextConfig = {
serverExternalPackages: ["adm-zip"], serverExternalPackages: ["adm-zip"],
compress: true,
images: {
remotePatterns: [
{ protocol: "https", hostname: "mc-heads.net" },
{ protocol: "https", hostname: "cdn.modrinth.com" },
],
},
experimental: { experimental: {
serverActions: { serverActions: {
bodySizeLimit: "100mb", bodySizeLimit: "100mb",