Messer-Server für die Seitenwahl: 5v5/2v2, im Admin startbar, setzen sich nach der Runde selbst zurück

server/src/servers/serverManager.js

@@ -168,14 +168,20 @@ export class ServerManager {
       FROM servers s JOIN matches m ON m.id = s.match_id
       WHERE s.status != 'stopped' AND s.host IS NOT NULL
     `).all();
+    const knives = this.db.prepare('SELECT id, name, status, host FROM knife_servers WHERE host IS NOT NULL').all();
     const stats = this.adapter.hostStats();
     const disks = await Promise.all(stats.map((h) => this.adapter.diskUsage?.(h.name) ?? null));
     return stats.map((h, i) => ({
       ...h,
       disk: disks[i],
-      matches: rows
-        .filter((r) => r.host === h.publicHost)
-        .map((r) => ({ id: r.match_id, title: `${r.team_a_name} vs. ${r.team_b_name}`, status: r.status })),
+      matches: [
+        ...rows
+          .filter((r) => r.host === h.publicHost)
+          .map((r) => ({ id: r.match_id, title: `${r.team_a_name} vs. ${r.team_b_name}`, status: r.status })),
+        ...knives
+          .filter((k) => k.host === h.publicHost)
+          .map((k) => ({ id: k.id, title: `${k.name} (Seitenwahl)`, status: k.status })),
+      ],
     }));
   }
 
@@ -258,12 +264,20 @@ export class ServerManager {
       used.add(r.port);
       used.add(r.tv_port);
     }
+    // Messer-Server belegen ihre Ports dauerhaft
+    for (const r of this.db.prepare('SELECT port, tv_port FROM knife_servers WHERE host = ? AND port IS NOT NULL').all(host)) {
+      used.add(r.port);
+      used.add(r.tv_port);
+    }
     return used;
   }
 
   usedPorts() {
     const used = new Set();
-    for (const r of this.db.prepare(`SELECT host, port, tv_port FROM servers WHERE status != 'stopped' AND port IS NOT NULL`).all()) {
+    for (const r of this.db.prepare(`
+      SELECT host, port, tv_port FROM servers WHERE status != 'stopped' AND port IS NOT NULL
+      UNION ALL SELECT host, port, tv_port FROM knife_servers WHERE port IS NOT NULL
+    `).all()) {
       used.add(r.port);
       used.add(r.tv_port);
       used.add(`${r.host}:${r.port}`);