From ad0a0e10333581f969e73b47a7761f18266254cc Mon Sep 17 00:00:00 2001
From: Josh Wright <josh@thewrightserver.net>
Date: Mon, 5 Oct 2026 15:39:12 -0400
Subject: [PATCH] Reuse collator and precompute fleet sort keys

---
 src/routes/+page.svelte | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index ef7e2f1..d55b596 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,3 +1,7 @@
+<script module lang="ts">
+    const serverTitleCollator = new Intl.Collator(undefined, { numeric: true });
+</script>
+
 <script lang="ts">
     let { data }: { data: import('./$types').PageData } = $props();
     const snapshot = $derived($fleet.receivedAt ? $fleet : data.fleetSnapshot);
@@ -92,15 +96,21 @@
     let problems = $derived(servers.filter(server => server.health === 'offline' || server.health === 'stale'));
     let starting = $derived(servers.filter(server => server.health === 'starting').length);
     let provisioning = $derived(servers.filter(server => server.health === 'provisioning').length);
-    let filtered = $derived(servers.filter(server => matchesFleet(server, query, filter, game, pinned, activeOperations, observationNow()))
-        .sort((a, b) => {
-            const pinOrder = Number(pinned.includes(b.name)) - Number(pinned.includes(a.name));
-            if (pinOrder) return pinOrder;
-            const rank = (server: FleetServer) => sort === 'players' ? (freshServer(server, observationNow()) ? server.last_players ?? -1 : -1)
-                : sort === 'round' ? currentRound(server, $telemetryByServer.get(server.name), observationNow()) ?? -1
-                : sort === 'duration' ? matchDuration(server) : 0;
-            return rank(b) - rank(a) || serverTitle(a.name).localeCompare(serverTitle(b.name), undefined, { numeric: true });
-        }));
+    let filtered = $derived.by(() => {
+        const now = observationNow();
+        const pinnedNames = new Set(pinned);
+        return servers.filter(server => matchesFleet(server, query, filter, game, pinned, activeOperations, now))
+            .map(server => ({
+                server,
+                title: serverTitle(server.name),
+                pinned: Number(pinnedNames.has(server.name)),
+                rank: sort === 'players' ? (freshServer(server, now) ? server.last_players ?? -1 : -1)
+                    : sort === 'round' ? currentRound(server, $telemetryByServer.get(server.name), now) ?? -1
+                    : sort === 'duration' ? matchDuration(server, now) : 0
+            }))
+            .sort((a, b) => b.pinned - a.pinned || b.rank - a.rank || serverTitleCollator.compare(a.title, b.title))
+            .map(({ server }) => server);
+    });
     let groups = $derived.by(() => {
         const result = new Map<string, { title: string; game: string; servers: FleetServer[]; launch: ReturnType<typeof fleetIdentity>['launch'] }>();
         for (const server of filtered) {
@@ -116,9 +126,9 @@
     let spotlight = $derived(servers.filter(server => currentRound(server, $telemetryByServer.get(server.name), observationNow()) !== null)
         .sort((a, b) => matchDuration(b) - matchDuration(a))[0]);
 
-    function matchDuration(server: FleetServer): number {
-        return freshServer(server, observationNow()) && server.active_since && server.game_started_at && !server.game_ended_at
-            && (server.last_players ?? 0) > 0 ? Math.max(0, observationNow() - Date.parse(server.game_started_at)) : -1;
+    function matchDuration(server: FleetServer, now = observationNow()): number {
+        return freshServer(server, now) && server.active_since && server.game_started_at && !server.game_ended_at
+            && (server.last_players ?? 0) > 0 ? Math.max(0, now - Date.parse(server.game_started_at)) : -1;
     }
     function togglePin(name: string) { pinned = pinned.includes(name) ? pinned.filter(item => item !== name) : [...pinned, name]; }
     function launch(selection: { game: ZombieGame; slug: string } | null = null) {