Pace collection startups and clarify deployment queue progress

src/lib/server/fleet/collections.ts

@@ -3,7 +3,7 @@ import type { CollectionDetail, CollectionPreview, CollectionSummary } from '$li
 import { db } from '../db/index.js';
 import { config, komodoConfigured, rconConfigured } from '../config.js';
 import { blueprintEntries, summarizeRecipe, type BlueprintEntry } from './launch-recipes.js';
-import { nextAvailablePort, nextLobbyNumber, queueCreateServer } from './create.js';
+import { creationQueue, nextAvailablePort, nextLobbyNumber, queueCreateServer } from './create.js';
 import { getServerKey } from './server-keys.js';
 import { parseServerName, zombieMapBySlug, zombieMaps } from './map-aliases.js';
 
@@ -70,7 +70,7 @@ export function previewCollection(blueprintId: unknown): CollectionPreview {
         db().prepare('DELETE FROM server_collection_previews WHERE expires_at < ? AND collection_id IS NULL').run(new Date().toISOString());
         db().prepare('INSERT INTO server_collection_previews (id, expires_at, blueprint_name, entries, servers) VALUES (?, ?, ?, ?, ?)')
             .run(id, expiresAt, blueprintName, JSON.stringify(entries), JSON.stringify(servers));
-        return { id, expiresAt, blueprintName, servers, blockers, ready: blockers.length === 0,
+        return { id, expiresAt, blueprintName, launchConcurrency: config.createConcurrency, servers, blockers, ready: blockers.length === 0,
             entries: entries.map((entry, index) => ({ count: entry.count, ...counts[index], recipe: summarizeRecipe(entry.recipe) })) };
     })();
 }
@@ -123,7 +123,10 @@ export function queueCollection(input: { previewId?: unknown; keys?: unknown }):
 const summarySql = `SELECT c.id, c.name, c.created_at, COUNT(d.id) AS total,
     COALESCE(SUM(d.state IN ('done', 'warning')), 0) AS done,
     COALESCE(SUM(d.state IN ('failed', 'interrupted')), 0) AS failed,
-    COALESCE(SUM(d.state IN ('queued', 'running', 'awaiting-health', 'waiting')), 0) AS active
+    COALESCE(SUM(d.state IN ('queued', 'running', 'awaiting-health', 'waiting')), 0) AS active,
+    COALESCE(SUM(d.state = 'queued'), 0) AS queued,
+    COALESCE(SUM(d.state = 'running'), 0) AS provisioning,
+    COALESCE(SUM(d.state = 'awaiting-health'), 0) AS verifying
     FROM server_launch_collections c
     LEFT JOIN server_collection_members m ON m.collection_id = c.id
     LEFT JOIN server_deployments d ON d.id = m.deployment_id`;
@@ -139,5 +142,8 @@ export function getCollection(id: string): CollectionDetail | null {
         EXISTS(SELECT 1 FROM servers s WHERE s.name = d.server) AS server_exists
         FROM server_collection_members m JOIN server_deployments d ON d.id = m.deployment_id
         JOIN server_creation_jobs j ON j.deployment_id = d.id WHERE m.collection_id = ? ORDER BY m.position`).all(id) as CollectionDetail['servers'];
-    return { collection, servers };
+    const queue = creationQueue();
+    const positions = new Map(queue.queued.map((job, index) => [job.id, index + 1]));
+    return { collection, queue: { concurrency: config.createConcurrency, active: queue.active, queued: queue.queued.length },
+        servers: servers.map(server => ({ ...server, queuePosition: positions.get(server.id) ?? null })) };
 }