Show resetting state after game end

src/lib/ui/stores/fleet.ts

@@ -1,6 +1,6 @@
 import { derived, get, writable } from 'svelte/store';
 import { browser } from '$app/environment';
-import { statusByServer, statusReceivedAt, serverTimeNow, syncServerTime } from './servers.js';
+import { statusByServer, statusReceivedAt, serverTimeNow, syncServerTime, matchEventsByServer } from './servers.js';
 import { watchSatisfied, type FleetServer, type FleetOperation, type LobbyWatch } from '$lib/fleet-overview.js';
 import { serverTitle } from '../server-labels.js';
 import { toast } from '../toast.js';
@@ -13,14 +13,22 @@ export const fleetRefreshing = writable(false);
 export const fleetIntegrations = writable<{ rcon: boolean; komodo: boolean; rconTimeoutMs: number; defaultRconHost: string } | null>(null);
 export const lobbyWatches = writable<LobbyWatch[]>([]);
 
-export const fleetServers = derived([fleet, statusByServer, statusReceivedAt], ([snapshot, live, received]) =>
+export const fleetServers = derived([fleet, statusByServer, statusReceivedAt, matchEventsByServer], ([snapshot, live, received, matches]) =>
     snapshot.servers.map(server => {
         const status = received > snapshot.receivedAt ? live.get(server.name) : undefined;
-        return status ? { ...server, last_players: status.players, last_map: status.map,
+        const current = status ? { ...server, last_players: status.players, last_map: status.map,
             last_gametype: status.gametype, last_seen_at: status.lastSeenAt, last_error: status.lastError,
             roster: status.roster, health: status.health, endpoint: status.endpoint, replySnippet: status.replySnippet, active_since: status.activeSince,
             inactive_since: status.inactiveSince, game_started_at: status.gameStartedAt,
             game_ended_at: status.gameEndedAt } : server;
+        const match = matches.get(server.name);
+        // Apply lifecycle events immediately, until a newer status observes them
+        // or confirms that the lobby has emptied.
+        if (!match || Date.parse(match.receivedAt) <= Date.parse(current.last_seen_at ?? '')
+            || match.receivedAt < (current.game_started_at ?? '')
+            || match.receivedAt < (current.game_ended_at ?? '')) return current;
+        return { ...current, game_started_at: match.event === 'game_start' ? match.receivedAt : current.game_started_at,
+            game_ended_at: match.event === 'game_end' ? match.receivedAt : null };
     }));
 
 let inFlight: Promise<void> | null = null;

src/lib/ui/stores/servers.ts

@@ -3,6 +3,7 @@ import { browser } from '$app/environment';
 import type { GameTelemetry } from '$lib/telemetry.js';
 
 export const telemetryByServer = writable<Map<string, GameTelemetry>>(new Map());
+export const matchEventsByServer = writable<Map<string, GameTelemetry>>(new Map());
 
 export interface RosterPlayer {
     num: number | null;
@@ -76,6 +77,13 @@ export function startServerStream(): (() => void) | undefined {
     source.addEventListener('server-telemetry', (evt) => {
         const data = JSON.parse((evt as MessageEvent).data) as { entries: GameTelemetry[]; snapshot?: boolean; serverNow?: number };
         syncServerTime(data.serverNow);
+        matchEventsByServer.update((previous) => {
+            const next = data.snapshot ? new Map<string, GameTelemetry>() : new Map(previous);
+            for (const entry of data.entries) {
+                if (entry.event === 'game_start' || entry.event === 'game_end') next.set(entry.server, entry);
+            }
+            return next;
+        });
         telemetryByServer.update((previous) => {
             const next = data.snapshot ? new Map<string, GameTelemetry>() : new Map(previous);
             for (const entry of data.entries) next.set(entry.server, entry);