feat: add orchestrator admin action interval and integrate game engine dependency

This commit is contained in:
2026-01-03 16:35:48 +00:00
parent 822acebca0
commit 020028fc74
7 changed files with 343 additions and 147 deletions
+2
View File
@@ -3,6 +3,8 @@
"private": true,
"version": "0.0.0",
"type": "module",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"scripts": {
"build": "tsdown -c ../../tsdown.config.ts -F @sammo-ts/game-engine",
"dev": "tsdown -c ../../tsdown.config.ts -F @sammo-ts/game-engine --watch",
+2 -113
View File
@@ -26,8 +26,6 @@ import { createReservedTurnHandler } from './reservedTurnHandler.js';
import { createReservedTurnStore } from './reservedTurnStore.js';
import { loadTurnCommandProfile } from './turnCommandProfile.js';
import { loadTurnWorldFromDatabase } from './worldLoader.js';
import { seedScenarioToDatabase } from '../scenario/scenarioSeeder.js';
import { createGamePostgresConnector, createGatewayPostgresConnector } from '@sammo-ts/infra';
export interface TurnDaemonRuntimeOptions {
profile: string;
@@ -219,75 +217,6 @@ export const createTurnDaemonRuntime = async (
{ profile: options.profile, defaultBudget }
);
const resolveScenarioId = async (): Promise<number | null> => {
const meta = world.getState().meta as Record<string, unknown>;
const raw = meta.scenarioId;
if (typeof raw === 'number' && Number.isFinite(raw)) {
return Math.floor(raw);
}
if (typeof raw === 'string') {
const parsed = Number(raw);
if (Number.isFinite(parsed)) {
return Math.floor(parsed);
}
}
const connector = createGamePostgresConnector({ url: options.databaseUrl });
await connector.connect();
try {
const prisma = connector.prisma as unknown as {
worldState: { findFirst: (args: unknown) => Promise<{ scenarioCode: string } | null> };
};
const row = await prisma.worldState.findFirst({
select: { scenarioCode: true },
});
if (!row) {
return null;
}
const parsed = Number(row.scenarioCode);
return Number.isFinite(parsed) ? Math.floor(parsed) : null;
} finally {
await connector.disconnect();
}
};
const updateGatewayProfileStatus = async (
nextStatus: 'RUNNING' | 'STOPPED'
): Promise<{ previous?: string; updated: boolean }> => {
const connector = createGatewayPostgresConnector({
url: options.gatewayDatabaseUrl ?? options.databaseUrl,
});
await connector.connect();
try {
const prisma = connector.prisma as unknown as {
gatewayProfile: {
findUnique: (args: unknown) => Promise<{ status: string } | null>;
update: (args: unknown) => Promise<void>;
};
};
const profile = await prisma.gatewayProfile.findUnique({
where: { profileName: options.profileName },
select: { status: true },
});
if (!profile) {
return { updated: false };
}
if (profile.status === 'DISABLED') {
return { previous: profile.status, updated: false };
}
await prisma.gatewayProfile.update({
where: { profileName: options.profileName },
data: {
status: nextStatus,
lastError: null,
},
});
return { previous: profile.status, updated: true };
} finally {
await connector.disconnect();
}
};
let resetInFlight = false;
if (options.profileName) {
adminActionConsumer = await createGatewayAdminActionConsumer({
@@ -298,48 +227,8 @@ export const createTurnDaemonRuntime = async (
handler: async (action) => {
const reason = action.reason ?? `admin:${action.action ?? 'action'}`;
if (action.action === 'RESET_NOW' || action.action === 'RESET_SCHEDULED') {
if (resetInFlight) {
return { status: 'IGNORED', detail: 'reset already in progress' };
}
if (action.action === 'RESET_SCHEDULED') {
if (!action.scheduledAt) {
return { status: 'FAILED', detail: 'scheduledAt is required' };
}
const scheduledAt = new Date(action.scheduledAt);
if (Number.isNaN(scheduledAt.getTime())) {
return { status: 'FAILED', detail: 'scheduledAt is invalid' };
}
if (scheduledAt.getTime() > Date.now()) {
return { status: 'REQUESTED', detail: 'waiting for schedule' };
}
}
resetInFlight = true;
try {
await lifecycle.stop('admin reset');
const scenarioId = await resolveScenarioId();
if (!scenarioId) {
return { status: 'FAILED', detail: 'scenarioId is missing' };
}
const seedTime =
action.scheduledAt && action.action === 'RESET_SCHEDULED'
? new Date(action.scheduledAt)
: new Date();
await seedScenarioToDatabase({
databaseUrl: options.databaseUrl,
scenarioId,
tickSeconds: world.getState().tickSeconds,
now: seedTime,
});
const statusUpdate = await updateGatewayProfileStatus('RUNNING');
return {
status: 'APPLIED',
detail: statusUpdate.updated
? `seeded scenario ${scenarioId}; status RUNNING`
: `seeded scenario ${scenarioId}; status unchanged`,
};
} finally {
resetInFlight = false;
}
// 리셋은 오케스트레이터에서 빌드+재기동으로 처리한다.
return { status: 'REQUESTED', detail: 'waiting for orchestrator reset' };
}
switch (action.action) {
case 'RESUME':