Replace IW4MAdmin with direct RCON for player counts
IW4M kept hitting a network wall (container -> host LAN IP -> IW4M loopback bind) that we couldn't cleanly punch through, and the two-minute !rt token added enough operational friction that the pause-all-deployments gate never got a fair test. RCON gives us the same fact — how many players are on a server right now — direct from each game server over UDP, with no session, no token, no proxy. - Add integrations/rcon.ts: dgram UDP client. rconGetPlayerCount() and rconGetStatus() parse both `status` (print + scoreboard) and `statusResponse` (info line + rows) dialects. Timeout via RCON_TIMEOUT_MS. - Add komodoResolveGamePort() + extractUdpPort(). Reads Komodo's read API for a server, walks both docker-compose-style port objects and docker-run-style "host:container/udp" strings, caches into servers.game_port on first success. - Replace pipelineReady() guard in sweep with a simple integrations-configured check. Same held/failed/manual outcomes, but keyed on RCON+Komodo instead of IW4M+auth-state. - Worker's status refresh fans out per-server over RCON at concurrency=4 so a 15-server fleet doesn't spike UDP. - Schema: drop iw4m_match/iw4m_value, add game_port + rcon_host. - Delete every auth artifact: TokenModal, auth store, auth-state module, /api/auth/token, /api/events/auth, iw4m.test.ts. Layout no longer mounts the modal, pipeline store no longer tracks a frozen state. - README + .env.example + docker-compose.yml + komodo/stack.toml swap IW4M_* env for RCON_PASSWORD / RCON_HOST / RCON_TIMEOUT_MS. Same host.docker.internal:host-gateway extra_hosts entry, repurposed for RCON reach. - Tests: add rcon.test.ts and komodo.test.ts, update sweep.test.ts to drop the auth-freeze case. 23/23 passing.
This commit is contained in:
@@ -1,51 +0,0 @@
|
||||
import { writable, derived } from 'svelte/store';
|
||||
import { browser } from '$app/environment';
|
||||
|
||||
export type AuthState =
|
||||
| { kind: 'ready'; token: string; expiresAt: number }
|
||||
| { kind: 'stale'; reason: 'expired' | 'rejected' | 'unreachable' }
|
||||
| { kind: 'missing' };
|
||||
|
||||
interface AuthPayload {
|
||||
type: 'auth-state';
|
||||
state: AuthState;
|
||||
msRemaining?: number;
|
||||
}
|
||||
|
||||
export const authState = writable<AuthState>({ kind: 'missing' });
|
||||
export const msRemaining = writable<number>(0);
|
||||
|
||||
export const isReady = derived(authState, ($s) => $s.kind === 'ready');
|
||||
export const shouldBlock = derived(authState, ($s) => $s.kind !== 'ready');
|
||||
|
||||
let source: EventSource | null = null;
|
||||
|
||||
export function startAuthStream(): void {
|
||||
if (!browser || source) return;
|
||||
source = new EventSource('/api/events/auth');
|
||||
source.addEventListener('auth-state', (evt) => {
|
||||
try {
|
||||
const payload = JSON.parse((evt as MessageEvent).data) as AuthPayload;
|
||||
authState.set(payload.state);
|
||||
if (payload.msRemaining !== undefined) msRemaining.set(payload.msRemaining);
|
||||
} catch {
|
||||
/* ignore malformed */
|
||||
}
|
||||
});
|
||||
source.addEventListener('error', () => {
|
||||
// Browser will auto-reconnect. If the stream stays down long enough,
|
||||
// the token will expire on the server anyway and the next reconnect
|
||||
// will surface the transition.
|
||||
});
|
||||
}
|
||||
|
||||
export async function submitToken(token: string): Promise<{ ok: true } | { ok: false; error: string }> {
|
||||
const res = await fetch('/api/auth/token', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ token })
|
||||
});
|
||||
const body = (await res.json()) as { ok: boolean; error?: string };
|
||||
if (!res.ok || !body.ok) return { ok: false, error: body.error ?? `HTTP ${res.status}` };
|
||||
return { ok: true };
|
||||
}
|
||||
@@ -11,8 +11,6 @@ export interface PipelineDeployment {
|
||||
}
|
||||
|
||||
export const deployments = writable<Map<string, PipelineDeployment>>(new Map());
|
||||
export const frozen = writable<boolean>(false);
|
||||
export const frozenReason = writable<string | null>(null);
|
||||
|
||||
let source: EventSource | null = null;
|
||||
|
||||
@@ -51,10 +49,4 @@ export function startPipelineStream(): void {
|
||||
d.servers.set(data.server, { state: data.state, players: data.players, error: data.error });
|
||||
});
|
||||
});
|
||||
|
||||
source.addEventListener('sweep-tick', (evt) => {
|
||||
const data = JSON.parse((evt as MessageEvent).data) as { frozen: boolean; reason?: string };
|
||||
frozen.set(data.frozen);
|
||||
frozenReason.set(data.reason ?? null);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user