refactor: 턴 경계와 12턴 묶음을 보존하는 2배속 복구 구현

This commit is contained in:
2026-09-06 10:04:33 +00:00
parent 63da0921cb
commit d3443ec7f5
53 changed files with 1467 additions and 160 deletions
+26 -2
View File
@@ -1,4 +1,4 @@
import { GameClock, inferClockPhase, parseGameClockPhase } from '@sammo-ts/common';
import { GameClock, readTurnRecovery, inferClockPhase, parseGameClockPhase } from '@sammo-ts/common';
import { GamePrisma, type GamePrismaClient } from './gamePrisma.js';
import { acquireGameSchemaAdvisoryXactLock, CLOCK_OPERATION_PERSISTENCE_LOCK } from './gameSchemaAdvisoryLock.js';
@@ -9,6 +9,21 @@ interface DbWallRow {
wallNow: Date;
}
/** 새 daemon의 시계 복구가 끝나기 전에는 독립 worker가 시간을 진행하지 않는다. */
export const readTurnRuntimeReady = async (
db: Pick<GamePrismaClient, '$queryRaw'>,
revision: bigint
): Promise<boolean> => {
const [row] = await db.$queryRaw<Array<{ ready: boolean }>>(GamePrisma.sql`
SELECT EXISTS (
SELECT 1 FROM turn_daemon_lease, world_state
WHERE clock_ready = TRUE AND lease_until > timezone('UTC', clock_timestamp())
AND clock_revision = ${revision}
) AS ready
`);
return row?.ready === true;
};
export interface InputEventClockCoordinate {
wallAt: Date;
gameAt: Date;
@@ -38,6 +53,9 @@ export const readInputEventClockCoordinate = async (
clockTick: true,
clockMode: true,
clockWallAnchor: true,
clockRecoveryStartTick: true,
clockRecoveryEndTick: true,
clockRecoveryStartWallAt: true,
tickSeconds: true,
clockPhase: true,
clockRevision: true,
@@ -60,11 +78,17 @@ export const readInputEventClockCoordinate = async (
tick,
mode,
wallAnchor: world.clockWallAnchor,
recovery: readTurnRecovery(world),
turnSeconds: world.tickSeconds,
phase,
revision,
});
const observedTick = clock.nowTick(wall.wallNow);
const ready =
phase !== 'RUNNING' ||
mode !== 'realtime' ||
world.clockRecoveryStartTick === undefined ||
(await readTurnRuntimeReady(db, world.clockRevision));
const observedTick = ready ? clock.nowTick(wall.wallNow) : clock.tick;
return {
wallAt: wall.wallNow,
gameAt: clock.tickToDate(observedTick),
+9
View File
@@ -15,6 +15,9 @@ export interface TurnEngineWorldStateRow {
clockTick: bigint | null;
clockMode: string;
clockWallAnchor: Date | null;
clockRecoveryStartTick?: bigint | null;
clockRecoveryEndTick?: bigint | null;
clockRecoveryStartWallAt?: Date | null;
lastTurnTick: bigint | null;
clockPhase: string;
clockRevision: bigint;
@@ -183,6 +186,9 @@ export interface TurnEngineWorldStateUpdateInput {
clockTick: bigint;
clockMode: string;
clockWallAnchor: Date;
clockRecoveryStartTick?: bigint | null;
clockRecoveryEndTick?: bigint | null;
clockRecoveryStartWallAt?: Date | null;
lastTurnTick: bigint;
clockPhase: string;
clockRevision: bigint;
@@ -200,6 +206,9 @@ export interface TurnEngineWorldStateCreateInput {
clockTick: bigint;
clockMode: string;
clockWallAnchor: Date;
clockRecoveryStartTick?: bigint | null;
clockRecoveryEndTick?: bigint | null;
clockRecoveryStartWallAt?: Date | null;
lastTurnTick: bigint;
clockPhase: string;
clockRevision: bigint;