Queue server creation and verify health and selected map before completion
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
import { db } from '$lib/server/db/index.js';
|
||||
import { kick } from '$lib/server/pipeline/worker.js';
|
||||
import { json } from '@sveltejs/kit';
|
||||
import { listServers, heldByBeta } from '$lib/server/fleet/servers.js';
|
||||
import { classifyHealth } from '$lib/server/fleet/health.js';
|
||||
import { createServer } from '$lib/server/fleet/create.js';
|
||||
import { queueCreateServer } from '$lib/server/fleet/create.js';
|
||||
import { config, komodoConfigured, rconConfigured } from '$lib/server/config.js';
|
||||
import type { RconPlayer } from '$lib/server/integrations/rcon.js';
|
||||
import type { GameMode } from '$lib/server/fleet/map-aliases.js';
|
||||
@@ -29,6 +31,7 @@ export async function GET() {
|
||||
}));
|
||||
return json({
|
||||
servers,
|
||||
reservedNames: (db().prepare("SELECT j.server FROM server_creation_jobs j JOIN server_deployments d ON d.id = j.deployment_id WHERE d.state IN ('queued', 'running', 'awaiting-health')").all() as { server: string }[]).map(row => row.server),
|
||||
integrations: {
|
||||
rcon: rconConfigured(),
|
||||
komodo: komodoConfigured(),
|
||||
@@ -51,7 +54,7 @@ export async function POST({ request }: { request: Request }) {
|
||||
{ status: 400 }
|
||||
);
|
||||
}
|
||||
const result = await createServer({
|
||||
const result = queueCreateServer({
|
||||
gameMode: body.gameMode as GameMode,
|
||||
mapSlug: body.mapSlug,
|
||||
plutoKey: body.plutoKey,
|
||||
@@ -64,5 +67,6 @@ export async function POST({ request }: { request: Request }) {
|
||||
: 500;
|
||||
return json({ ok: false, error: result.message, kind: result.kind }, { status });
|
||||
}
|
||||
return json({ ok: true, name: result.name, port: result.port });
|
||||
void kick().catch((err) => console.error('[create] worker kick failed:', err));
|
||||
return json({ ok: true, name: result.name, port: result.port, deploymentId: result.deploymentId }, { status: 202 });
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user