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:
parent
19d66c2de6
commit
359a12ef9d
14 changed files with 460 additions and 132 deletions
74
lib/chat-log.ts
Normal file
74
lib/chat-log.ts
Normal 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
47
lib/server-status.ts
Normal 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 } };
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue