Automatically place servers using learned resource capacity

src/lib/server/fleet/collections.ts

@@ -12,6 +12,7 @@ import { serverObservation } from './status.js';
 import { activeBetaRemovalBlocker, getServer } from './servers.js';
 import { parseServerName, zombieMapBySlug, zombieMaps } from './map-aliases.js';
 import { nativeSelection, nextNativePort } from '../provisioning/native.js';
+import { listHosts } from '../hosts/index.js';
 import { nativeInstance } from '../backends/native.js';
 
 function coverage(entries: BlueprintEntry[]) {
@@ -73,15 +74,24 @@ function collectionPlan(entries: BlueprintEntry[], mode: CollectionMode) {
 function allocate(entries: BlueprintEntry[], releasingServers: string[] = []): CollectionPreview['servers'] {
     const names: string[] = [];
     const ports: number[] = [];
+    const planned: { hostId: string; port: number }[] = [];
     const counts = coverage(entries);
     return entries.flatMap((entry, entryIndex) => Array.from({ length: counts[entryIndex].missing }, () => {
         const base = `${entry.recipe.game}_zombie_${entry.recipe.mapSlug}`;
         const lobby = nextLobbyNumber(base, names);
         const name = lobby === null ? null : `${base}_${lobby}`;
-        const port = entry.recipe.native ? nextNativePort(entry.recipe.native, ports) : nextAvailablePort(ports, releasingServers);
+        let native = entry.recipe.native;
+        let port: number | null;
+        if (native) {
+            try {
+                native = nativeSelection(native as unknown as Record<string, unknown>, entry.recipe.game, { planned });
+                port = nextNativePort(native, planned.filter(item => item.hostId === native!.hostId).map(item => item.port));
+                if (port !== null) planned.push({ hostId: native.hostId, port });
+            } catch { port = null; }
+        } else port = nextAvailablePort(ports, releasingServers);
         if (name) names.push(name);
         if (port !== null) ports.push(port);
-        return { entryIndex, name, port, hasSavedKey: !!name && !!getServerKey(name) };
+        return { entryIndex, name, port, ...(native ? { native } : {}), hasSavedKey: !!name && !!getServerKey(name) };
     }));
 }
 
@@ -98,7 +108,7 @@ function blockersFor(servers: CollectionPreview['servers'], entries: BlueprintEn
         if (!rconConfigured()) blockers.push('Configure RCON_PASSWORD so every new server can be verified.');
     }
     if (servers.some(server => !server.name)) blockers.push('There are not enough free lobbies for one or more maps (20 per map). Reduce their counts or free capacity.');
-    if (servers.some(server => server.port === null)) blockers.push(`There are not enough free game ports in ${config.portRange.min}–${config.portRange.max} for the whole collection.`);
+    if (servers.some(server => server.port === null)) blockers.push(entries.some(entry => entry.recipe.native) ? 'There is not enough host CPU, memory or port capacity for the whole collection.' : `There are not enough free game ports in ${config.portRange.min}–${config.portRange.max} for the whole collection.`);
     return blockers;
 }
 
@@ -117,7 +127,7 @@ export function previewCollection(blueprintId: unknown, mode: unknown = 'fill',
     if (mode !== 'fill' && mode !== 'exact') throw new Error('Choose fill or exact collection mode.');
     return db().transaction((): CollectionPreview => {
         const { entries, blueprintName } = blueprintEntries(blueprintId);
-        if (selection?.hostId !== undefined || !config.komodo.address) {
+        if (selection?.hostId !== undefined || !config.komodo.address || listHosts().length > 0) {
             const libraries = selection?.libraryIds as Record<string, unknown> | undefined;
             for (const entry of entries) {
                 entry.recipe.native = nativeSelection({ ...selection, libraryId: libraries?.[entry.recipe.game] ?? selection?.libraryId }, entry.recipe.game);
@@ -159,7 +169,7 @@ export function queueCollection(input: { previewId?: unknown; keys?: unknown }):
         const servers = allocate(entries, releasingServers);
         const blockers = [...blockersFor(servers, entries), ...removalBlockersFor(removals)];
         if (blockers.length) throw new Error(blockers.join(' '));
-        if (servers.length !== reviewed.length || servers.some((server, i) => server.entryIndex !== reviewed[i]?.entryIndex || server.name !== reviewed[i]?.name || server.port !== reviewed[i]?.port)) {
+        if (servers.length !== reviewed.length || servers.some((server, i) => server.entryIndex !== reviewed[i]?.entryIndex || server.name !== reviewed[i]?.name || (!server.native?.automatic && server.port !== reviewed[i]?.port))) {
             throw new Error('Fleet counts, lobby or port availability changed. Nothing was queued. Refresh the preview and review each server key.');
         }
         const expected = new Set(servers.map(server => server.name));
@@ -196,7 +206,7 @@ export function queueCollection(input: { previewId?: unknown; keys?: unknown }):
             return { id, ports };
         });
         servers.forEach((server, index) => {
-            const recipe = entries[server.entryIndex].recipe;
+            const recipe = { ...entries[server.entryIndex].recipe, ...(server.native ? { native: server.native } : {}) };
             const childPreviewId = randomUUID();
             db().prepare('INSERT INTO server_launch_previews (id, expires_at, server, port, recipe, blueprint_name) VALUES (?, ?, ?, ?, ?, ?)')
                 .run(childPreviewId, preview.expires_at, server.name, server.port, JSON.stringify(recipe), preview.blueprint_name);

src/lib/server/fleet/launch-recipes.ts

@@ -9,7 +9,7 @@ import { getBaselineForScope, getVersion, listPromotedOverlaysForScope } from '.
 import { sha256Buffer } from './files.js';
 
 export interface LaunchRecipe {
-    native?: { hostId: string; libraryId: string; image?: string; bindAddress?: string; publicAddress?: string; publicPort?: number };
+    native?: import('../../hosts.js').NativePlacement;
     format: 1;
     game: ZombieGame;
     mapSlug: string;