SSE events bridge, PWA service worker, offline banner, lazy admin tabs

- New /api/events SSE endpoint (authed): pushes status every 5s and chat
  on log-file mtime change (~1.5s poll). Heartbeat every 15s, hard-caps
  each stream at 10min so the browser gets a clean auth refresh on
  reconnect. Auto-aborts on client disconnect.
- Factored shared helpers out of the existing routes:
  - lib/server-status.ts (probeStatus, reused by /api/status + SSE)
  - lib/chat-log.ts (parseLogLine, readChatMessages, logMtime, reused by
    /api/chat + SSE)
- EventsBridge client (mounted in Providers) opens one EventSource per
  authed session and writes live data into the TanStack Query cache for
  ["status"] and ["chat"] — no refactor needed in consuming components,
  they keep reading their usual query keys.
- Now that SSE pushes updates, polling intervals bumped: StatusCard and
  ServerControls 10s -> 60s, ChatBridge 5s -> 30s. SSE handles realtime,
  polling is safety fallback.
- OfflineBanner: sticky amber bar when navigator.onLine flips false.
- PWA: minimal public/sw.js with shell + asset cache (network-first for
  HTML, stale-while-revalidate for static assets, never touches /api/*
  or text/event-stream). ServiceWorkerRegister client registers it in
  production only.
- AdminTabs now uses next/dynamic with skeleton fallbacks for Players /
  Chat / Mods / Backups / Logs, keeping initial /admin bundle smaller.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
hurkicorgi 2026-04-13 05:48:00 -06:00
parent 19d66c2de6
commit 359a12ef9d
14 changed files with 460 additions and 132 deletions

View file

@ -1,92 +1,20 @@
import { NextRequest, NextResponse } from "next/server";
import { readFileSync, existsSync } from "fs";
import { auth } from "@/lib/auth";
import { sendCommand } from "@/lib/rcon";
import { readChatMessages } from "@/lib/chat-log";
export const dynamic = "force-dynamic";
const LOG_FILE = "/home/minecraft/server/logs/latest.log";
type ChatMessage = {
time: string;
type: "chat" | "join" | "leave" | "death" | "server";
player: string;
message: string;
};
function parseLogLine(line: string): ChatMessage | null {
// [HH:MM:SS] [Server thread/INFO] [minecraft/DedicatedServer]: <Player> message
const chatMatch = line.match(
/\[(\d{2}:\d{2}:\d{2})\].*\[minecraft\/(?:DedicatedServer|MinecraftServer)\]:\s*<(\w+)>\s*(.*)/
);
if (chatMatch) {
return { time: chatMatch[1], type: "chat", player: chatMatch[2], message: chatMatch[3] };
}
// Player joins
const joinMatch = line.match(
/\[(\d{2}:\d{2}:\d{2})\].*\[minecraft\/(?:PlayerList|ServerPlayer)\]:\s*(\w+)\s+joined the game/
);
if (joinMatch) {
return { time: joinMatch[1], type: "join", player: joinMatch[2], message: "joined the game" };
}
// Player leaves
const leaveMatch = line.match(
/\[(\d{2}:\d{2}:\d{2})\].*\[minecraft\/(?:PlayerList|ServerPlayer)\]:\s*(\w+)\s+left the game/
);
if (leaveMatch) {
return { time: leaveMatch[1], type: "leave", player: leaveMatch[2], message: "left the game" };
}
// Deaths
const deathMatch = line.match(
/\[(\d{2}:\d{2}:\d{2})\].*\[minecraft\/(?:DedicatedServer|MinecraftServer)\]:\s*(\w+)\s+(was |died|drowned|burned|fell|starved|suffocated|hit|blew|withered|tried|experienced|went|walked|froze|was prick|was stung|was impaled|was squashed|was skewered|was squished|was pummeled|discovered)(.*)/
);
if (deathMatch) {
return {
time: deathMatch[1],
type: "death",
player: deathMatch[2],
message: deathMatch[3] + (deathMatch[4] || ""),
};
}
// Server say command
const sayMatch = line.match(
/\[(\d{2}:\d{2}:\d{2})\].*\[minecraft\/(?:DedicatedServer|MinecraftServer)\]:\s*\[Server\]\s*(.*)/
);
if (sayMatch) {
return { time: sayMatch[1], type: "server", player: "Server", message: sayMatch[2] };
}
return null;
}
export async function GET(req: NextRequest) {
const session = await auth();
if (!session) {
return NextResponse.json({ error: "Unauthorized" }, { status: 403 });
}
if (!existsSync(LOG_FILE)) {
return NextResponse.json([]);
}
const maxLines = parseInt(req.nextUrl.searchParams.get("lines") || "100");
try {
const content = readFileSync(LOG_FILE, "utf8");
const lines = content.split("\n");
const messages: ChatMessage[] = [];
// Parse from the end, collect up to maxLines relevant messages
for (let i = lines.length - 1; i >= 0 && messages.length < maxLines; i--) {
const msg = parseLogLine(lines[i]);
if (msg) messages.unshift(msg);
}
return NextResponse.json(messages);
return NextResponse.json(readChatMessages(maxLines));
} catch (e) {
return NextResponse.json(
{ error: (e as Error).message },
@ -106,7 +34,6 @@ export async function POST(req: NextRequest) {
return NextResponse.json({ error: "Invalid message" }, { status: 400 });
}
// Sanitize: strip newlines/carriage returns to prevent RCON command injection
const sanitized = message.replace(/[\r\n]/g, "").trim();
if (!sanitized) {
return NextResponse.json({ error: "Empty message" }, { status: 400 });

106
app/api/events/route.ts Normal file
View file

@ -0,0 +1,106 @@
import { NextRequest } from "next/server";
import { auth } from "@/lib/auth";
import { probeStatus } from "@/lib/server-status";
import { readChatMessages, logMtime } from "@/lib/chat-log";
export const dynamic = "force-dynamic";
export const runtime = "nodejs";
const STATUS_INTERVAL_MS = 5000;
const LOG_POLL_MS = 1500;
const HEARTBEAT_MS = 15_000;
const MAX_LIFETIME_MS = 10 * 60 * 1000;
export async function GET(req: NextRequest) {
const session = await auth();
if (!session) {
return new Response(JSON.stringify({ error: "Unauthorized" }), {
status: 403,
headers: { "Content-Type": "application/json" },
});
}
const encoder = new TextEncoder();
const stream = new ReadableStream({
async start(controller) {
let closed = false;
const timers: ReturnType<typeof setTimeout>[] = [];
const safeSend = (data: string) => {
if (closed) return;
try {
controller.enqueue(encoder.encode(data));
} catch {
closed = true;
}
};
const send = (event: string, payload: unknown) =>
safeSend(`event: ${event}\ndata: ${JSON.stringify(payload)}\n\n`);
const heartbeat = () => safeSend(`: hb ${Date.now()}\n\n`);
const cleanup = () => {
if (closed) return;
closed = true;
for (const t of timers) clearTimeout(t);
try {
controller.close();
} catch {}
};
req.signal.addEventListener("abort", cleanup);
// Initial payload
try {
const status = await probeStatus();
send("status", status);
const chat = readChatMessages(50);
send("chat", chat);
} catch {}
let lastLogMtime = logMtime();
const pollStatus = async () => {
if (closed) return;
try {
const status = await probeStatus();
send("status", status);
} catch {}
if (!closed) timers.push(setTimeout(pollStatus, STATUS_INTERVAL_MS));
};
const pollLog = () => {
if (closed) return;
try {
const mt = logMtime();
if (mt && mt !== lastLogMtime) {
lastLogMtime = mt;
const chat = readChatMessages(50);
send("chat", chat);
}
} catch {}
if (!closed) timers.push(setTimeout(pollLog, LOG_POLL_MS));
};
const beat = () => {
if (closed) return;
heartbeat();
if (!closed) timers.push(setTimeout(beat, HEARTBEAT_MS));
};
timers.push(setTimeout(pollStatus, STATUS_INTERVAL_MS));
timers.push(setTimeout(pollLog, LOG_POLL_MS));
timers.push(setTimeout(beat, HEARTBEAT_MS));
// Hard cap stream lifetime so auth/session stays fresh on reconnect
timers.push(setTimeout(cleanup, MAX_LIFETIME_MS));
},
});
return new Response(stream, {
headers: {
"Content-Type": "text/event-stream; charset=utf-8",
"Cache-Control": "no-cache, no-transform",
Connection: "keep-alive",
"X-Accel-Buffering": "no",
},
});
}

View file

@ -1,57 +1,9 @@
import { NextResponse } from "next/server";
import { status } from "minecraft-server-util";
import { execSync } from "child_process";
import { MC_SERVER_IP, MC_SERVER_PORT } from "@/lib/constants";
import { sendCommand } from "@/lib/rcon";
import { probeStatus } from "@/lib/server-status";
import { memoAsync } from "@/lib/cache";
export const dynamic = "force-dynamic";
type StatusResult = {
online: boolean;
starting?: boolean;
players: { online: number; max: number };
version?: string;
motd?: string;
};
async function probeStatus(): Promise<StatusResult> {
// Race protocol ping + RCON in parallel — whichever wins first signals "online"
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/);
return {
online: true,
players: {
online: match ? parseInt(match[1], 10) : 0,
max: match ? parseInt(match[2], 10) : 20,
},
};
});
try {
return await Promise.any([ping, rcon]);
} catch {
// Both failed — check if process is up
let starting = false;
try {
const out = execSync("systemctl is-active minecraft.service", {
encoding: "utf8",
}).trim();
starting = out === "active" || out === "activating";
} catch {}
return { online: false, starting, players: { online: 0, max: 0 } };
}
}
export async function GET() {
const result = await memoAsync("status", 3000, probeStatus);
return NextResponse.json(result, {

View file

@ -6,6 +6,9 @@ import { Toaster } from "sonner";
import { useEffect, useState } from "react";
import { CommandPalette } from "@/components/CommandPalette";
import { PlayerDrawer } from "@/components/PlayerDrawer";
import { EventsBridge } from "@/components/EventsBridge";
import { OfflineBanner } from "@/components/OfflineBanner";
import { ServiceWorkerRegister } from "@/components/ServiceWorkerRegister";
export function Providers({ children }: { children: React.ReactNode }) {
const [queryClient] = useState(
@ -33,6 +36,9 @@ export function Providers({ children }: { children: React.ReactNode }) {
return (
<SessionProvider>
<QueryClientProvider client={queryClient}>
<EventsBridge />
<ServiceWorkerRegister />
<OfflineBanner />
{children}
<CommandPalette />
<PlayerDrawer />

View file

@ -1,14 +1,39 @@
"use client";
import { useEffect, useState } from "react";
import dynamic from "next/dynamic";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { ServerControls } from "@/components/ServerControls";
import { Analytics } from "@/components/Analytics";
import { PlayerManager } from "@/components/PlayerManager";
import { ChatBridge } from "@/components/ChatBridge";
import { ModManager } from "@/components/ModManager";
import { BackupManager } from "@/components/BackupManager";
import { LogViewer } from "@/components/LogViewer";
import { Skeleton } from "@/components/ui/skeleton";
const TabFallback = () => (
<div className="space-y-3">
<Skeleton className="h-24 w-full" />
<Skeleton className="h-48 w-full" />
</div>
);
const PlayerManager = dynamic(
() => import("@/components/PlayerManager").then((m) => ({ default: m.PlayerManager })),
{ loading: TabFallback, ssr: false }
);
const ChatBridge = dynamic(
() => import("@/components/ChatBridge").then((m) => ({ default: m.ChatBridge })),
{ loading: TabFallback, ssr: false }
);
const ModManager = dynamic(
() => import("@/components/ModManager").then((m) => ({ default: m.ModManager })),
{ loading: TabFallback, ssr: false }
);
const BackupManager = dynamic(
() => import("@/components/BackupManager").then((m) => ({ default: m.BackupManager })),
{ loading: TabFallback, ssr: false }
);
const LogViewer = dynamic(
() => import("@/components/LogViewer").then((m) => ({ default: m.LogViewer })),
{ loading: TabFallback, ssr: false }
);
const TABS = [
{ value: "server", label: "Server" },

View file

@ -29,7 +29,7 @@ export function ChatBridge() {
const { data: messages = [] } = useQuery<ChatMessage[]>({
queryKey: ["chat"],
queryFn: () => fetch("/api/chat?lines=50").then((r) => r.json()),
refetchInterval: 5000,
refetchInterval: 30_000,
staleTime: 2000,
});

View file

@ -0,0 +1,51 @@
"use client";
import { useQueryClient } from "@tanstack/react-query";
import { useSession } from "next-auth/react";
import { useEffect } from "react";
export function EventsBridge() {
const { data: session, status } = useSession();
const queryClient = useQueryClient();
useEffect(() => {
if (status !== "authenticated" || !session) return;
if (typeof window === "undefined" || !("EventSource" in window)) return;
let closed = false;
let es: EventSource | null = null;
const connect = () => {
if (closed) return;
es = new EventSource("/api/events");
es.addEventListener("status", (e: MessageEvent) => {
try {
queryClient.setQueryData(["status"], JSON.parse(e.data));
} catch {}
});
es.addEventListener("chat", (e: MessageEvent) => {
try {
queryClient.setQueryData(["chat"], JSON.parse(e.data));
} catch {}
});
es.onerror = () => {
// Browser auto-retries, but if the server closed after the 10m cap
// we want a clean reconnect rather than tight reconnect loops.
if (closed) return;
es?.close();
es = null;
setTimeout(connect, 3000);
};
};
connect();
return () => {
closed = true;
es?.close();
};
}, [status, session, queryClient]);
return null;
}

View file

@ -0,0 +1,32 @@
"use client";
import { useEffect, useState } from "react";
export function OfflineBanner() {
const [online, setOnline] = useState(true);
useEffect(() => {
if (typeof navigator === "undefined") return;
setOnline(navigator.onLine);
const on = () => setOnline(true);
const off = () => setOnline(false);
window.addEventListener("online", on);
window.addEventListener("offline", off);
return () => {
window.removeEventListener("online", on);
window.removeEventListener("offline", off);
};
}, []);
if (online) return null;
return (
<div
role="status"
aria-live="polite"
className="sticky top-0 z-30 w-full bg-amber-500/20 border-b border-amber-500/30 text-amber-200 text-xs sm:text-sm px-3 py-1.5 text-center backdrop-blur"
>
You&apos;re offline showing cached data. Live updates will resume automatically.
</div>
);
}

View file

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

View file

@ -0,0 +1,22 @@
"use client";
import { useEffect } from "react";
export function ServiceWorkerRegister() {
useEffect(() => {
if (typeof navigator === "undefined") return;
if (!("serviceWorker" in navigator)) return;
if (process.env.NODE_ENV !== "production") return;
const register = () => {
navigator.serviceWorker
.register("/sw.js", { scope: "/" })
.catch(() => {});
};
if (document.readyState === "complete") register();
else window.addEventListener("load", register, { once: true });
}, []);
return null;
}

View file

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

74
lib/chat-log.ts Normal file
View file

@ -0,0 +1,74 @@
import { readFileSync, existsSync, statSync } from "fs";
export const LOG_FILE = "/home/minecraft/server/logs/latest.log";
export type ChatMessage = {
time: string;
type: "chat" | "join" | "leave" | "death" | "server";
player: string;
message: string;
};
export function parseLogLine(line: string): ChatMessage | null {
const chatMatch = line.match(
/\[(\d{2}:\d{2}:\d{2})\].*\[minecraft\/(?:DedicatedServer|MinecraftServer)\]:\s*<(\w+)>\s*(.*)/
);
if (chatMatch) {
return { time: chatMatch[1], type: "chat", player: chatMatch[2], message: chatMatch[3] };
}
const joinMatch = line.match(
/\[(\d{2}:\d{2}:\d{2})\].*\[minecraft\/(?:PlayerList|ServerPlayer)\]:\s*(\w+)\s+joined the game/
);
if (joinMatch) {
return { time: joinMatch[1], type: "join", player: joinMatch[2], message: "joined the game" };
}
const leaveMatch = line.match(
/\[(\d{2}:\d{2}:\d{2})\].*\[minecraft\/(?:PlayerList|ServerPlayer)\]:\s*(\w+)\s+left the game/
);
if (leaveMatch) {
return { time: leaveMatch[1], type: "leave", player: leaveMatch[2], message: "left the game" };
}
const deathMatch = line.match(
/\[(\d{2}:\d{2}:\d{2})\].*\[minecraft\/(?:DedicatedServer|MinecraftServer)\]:\s*(\w+)\s+(was |died|drowned|burned|fell|starved|suffocated|hit|blew|withered|tried|experienced|went|walked|froze|was prick|was stung|was impaled|was squashed|was skewered|was squished|was pummeled|discovered)(.*)/
);
if (deathMatch) {
return {
time: deathMatch[1],
type: "death",
player: deathMatch[2],
message: deathMatch[3] + (deathMatch[4] || ""),
};
}
const sayMatch = line.match(
/\[(\d{2}:\d{2}:\d{2})\].*\[minecraft\/(?:DedicatedServer|MinecraftServer)\]:\s*\[Server\]\s*(.*)/
);
if (sayMatch) {
return { time: sayMatch[1], type: "server", player: "Server", message: sayMatch[2] };
}
return null;
}
export function readChatMessages(maxLines = 50): ChatMessage[] {
if (!existsSync(LOG_FILE)) return [];
const content = readFileSync(LOG_FILE, "utf8");
const lines = content.split("\n");
const messages: ChatMessage[] = [];
for (let i = lines.length - 1; i >= 0 && messages.length < maxLines; i--) {
const msg = parseLogLine(lines[i]);
if (msg) messages.unshift(msg);
}
return messages;
}
export function logMtime(): number {
try {
return statSync(LOG_FILE).mtimeMs;
} catch {
return 0;
}
}

47
lib/server-status.ts Normal file
View file

@ -0,0 +1,47 @@
import { status } from "minecraft-server-util";
import { execSync } from "child_process";
import { MC_SERVER_IP, MC_SERVER_PORT } from "./constants";
import { sendCommand } from "./rcon";
export type StatusResult = {
online: boolean;
starting?: boolean;
players: { online: number; max: number };
version?: string;
motd?: string;
};
export async function probeStatus(): Promise<StatusResult> {
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/);
return {
online: true,
players: {
online: match ? parseInt(match[1], 10) : 0,
max: match ? parseInt(match[2], 10) : 20,
},
};
});
try {
return await Promise.any([ping, rcon]);
} catch {
let starting = false;
try {
const out = execSync("systemctl is-active minecraft.service", {
encoding: "utf8",
}).trim();
starting = out === "active" || out === "activating";
} catch {}
return { online: false, starting, players: { online: 0, max: 0 } };
}
}

86
public/sw.js Normal file
View file

@ -0,0 +1,86 @@
// HurkiCorgi MC — minimal service worker
// Strategy: network-first for HTML/data, stale-while-revalidate for assets,
// offline fallback to the cached shell.
const VERSION = "v1";
const SHELL_CACHE = `shell-${VERSION}`;
const ASSET_CACHE = `assets-${VERSION}`;
const SHELL_URLS = ["/", "/icon.svg", "/manifest.json"];
self.addEventListener("install", (event) => {
event.waitUntil(
caches.open(SHELL_CACHE).then((c) => c.addAll(SHELL_URLS)).catch(() => {})
);
self.skipWaiting();
});
self.addEventListener("activate", (event) => {
event.waitUntil(
(async () => {
const keys = await caches.keys();
await Promise.all(
keys
.filter((k) => k !== SHELL_CACHE && k !== ASSET_CACHE)
.map((k) => caches.delete(k))
);
await self.clients.claim();
})()
);
});
function isAsset(url) {
return (
url.pathname.startsWith("/_next/static/") ||
url.pathname.endsWith(".svg") ||
url.pathname.endsWith(".woff2") ||
url.pathname.endsWith(".png") ||
url.pathname.endsWith(".ico")
);
}
self.addEventListener("fetch", (event) => {
const req = event.request;
if (req.method !== "GET") return;
const url = new URL(req.url);
if (url.origin !== self.location.origin) return;
// Never intercept API, auth, SSE, or anything under /api
if (url.pathname.startsWith("/api/")) return;
if (req.headers.get("accept")?.includes("text/event-stream")) return;
// Assets: stale-while-revalidate
if (isAsset(url)) {
event.respondWith(
caches.open(ASSET_CACHE).then(async (cache) => {
const cached = await cache.match(req);
const fetchPromise = fetch(req)
.then((res) => {
if (res.ok) cache.put(req, res.clone());
return res;
})
.catch(() => cached || Response.error());
return cached || fetchPromise;
})
);
return;
}
// HTML / navigations: network-first with cache fallback
if (req.mode === "navigate" || req.headers.get("accept")?.includes("text/html")) {
event.respondWith(
fetch(req)
.then((res) => {
if (res.ok) {
const clone = res.clone();
caches.open(SHELL_CACHE).then((c) => c.put(req, clone));
}
return res;
})
.catch(async () => {
const cached = await caches.match(req);
return cached || caches.match("/");
})
);
}
});