From f6f764da7f8302848918d5060f17f281fe2d8795 Mon Sep 17 00:00:00 2001 From: hided62 Date: Fri, 21 Aug 2026 16:57:42 +0000 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=EA=B0=80=EC=98=A4=ED=94=88=20?= =?UTF-8?q?=EB=8F=99=EC=95=88=20=EC=84=9C=EB=B2=84=20=EA=B2=8C=EC=9E=84=20?= =?UTF-8?q?=EC=8B=9C=EA=B3=84=EB=A5=BC=20=EC=A0=95=EC=A7=80=ED=95=9C?= =?UTF-8?q?=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 정식 오픈 시각을 게임 시계 anchor로 전달하고, API가 실제 진행 상태와 시작 경계를 반환하게 한다. 프론트는 추가 조회 없이 경계에서 자동으로 시계를 시작한다. --- app/game-api/src/router/lobby/index.ts | 3 ++ app/game-api/src/services/gameClock.ts | 27 +++++++++- app/game-api/test/auctionWorker.test.ts | 3 ++ app/game-api/test/gameClock.test.ts | 52 +++++++++++++++++++ app/game-api/test/lobbyRouter.test.ts | 26 ++++++++++ .../src/scenario/scenarioSeeder.ts | 8 ++- app/game-engine/test/scenarioSeeder.test.ts | 4 ++ app/game-frontend/e2e/mainNavigation.spec.ts | 42 +++++++++++++++ .../src/components/main/CommandListPanel.vue | 40 +++++++++++--- app/game-frontend/src/views/MainView.vue | 6 +++ .../src/orchestrator/gatewayOrchestrator.ts | 2 + .../src/orchestrator/profileSeedCli.ts | 11 +++- .../test/profileSeedCli.integration.test.ts | 3 ++ app/gateway-api/test/profileSeedCli.test.ts | 7 ++- 14 files changed, 221 insertions(+), 13 deletions(-) create mode 100644 app/game-api/test/gameClock.test.ts diff --git a/app/game-api/src/router/lobby/index.ts b/app/game-api/src/router/lobby/index.ts index 0b611078..a2fe2dde 100644 --- a/app/game-api/src/router/lobby/index.ts +++ b/app/game-api/src/router/lobby/index.ts @@ -68,7 +68,10 @@ export const lobbyRouter = router({ preopenAt: worldState.meta.preopenAt ?? '', turntime: worldState.meta.turntime ?? '', serverTime: gameTime.now.toISOString(), + serverWallTime: gameTime.wallNow.toISOString(), clockMode: gameTime.mode ?? 'realtime', + clockRunning: gameTime.running, + clockStartsAt: gameTime.startsAt?.toISOString() ?? null, otherTextInfo: worldState.meta.otherTextInfo ?? '', npcMode: worldState.config.npcMode ?? 0, defaultStatTotal: asNumber(asRecord(rawConfig.stat).total, 165), diff --git a/app/game-api/src/services/gameClock.ts b/app/game-api/src/services/gameClock.ts index d8862e96..d64a103d 100644 --- a/app/game-api/src/services/gameClock.ts +++ b/app/game-api/src/services/gameClock.ts @@ -4,14 +4,25 @@ import type { DatabaseClient } from '../context.js'; export interface CurrentGameTime { now: Date; + wallNow: Date; tick: number | null; mode: GameClockMode | null; + running: boolean; + startsAt: Date | null; dateToTick(date: Date): number | null; } export const loadCurrentGameTime = async (db: DatabaseClient, wallNow = new Date()): Promise => { if (!db.worldState) { - return { now: wallNow, tick: null, mode: null, dateToTick: () => null }; + return { + now: wallNow, + wallNow, + tick: null, + mode: null, + running: true, + startsAt: null, + dateToTick: () => null, + }; } const state = await db.worldState.findFirst({ orderBy: { id: 'asc' }, @@ -24,7 +35,15 @@ export const loadCurrentGameTime = async (db: DatabaseClient, wallNow = new Date }, }); if (!state?.clockBaseTime || state.clockTick === null || !state.clockWallAnchor) { - return { now: wallNow, tick: null, mode: null, dateToTick: () => null }; + return { + now: wallNow, + wallNow, + tick: null, + mode: null, + running: true, + startsAt: null, + dateToTick: () => null, + }; } const mode: GameClockMode = state.clockMode === 'manual' ? 'manual' : 'realtime'; const storedTick = Number(state.clockTick); @@ -39,10 +58,14 @@ export const loadCurrentGameTime = async (db: DatabaseClient, wallNow = new Date turnSeconds: state.tickSeconds, }); const tick = clock.nowTick(wallNow); + const running = mode === 'realtime' && wallNow.getTime() >= state.clockWallAnchor.getTime(); return { now: clock.tickToDate(tick), + wallNow, tick, mode, + running, + startsAt: mode === 'realtime' && !running ? state.clockWallAnchor : null, dateToTick: (date) => clock.dateToTick(date), }; }; diff --git a/app/game-api/test/auctionWorker.test.ts b/app/game-api/test/auctionWorker.test.ts index 8c98cd83..cab054e9 100644 --- a/app/game-api/test/auctionWorker.test.ts +++ b/app/game-api/test/auctionWorker.test.ts @@ -57,8 +57,11 @@ describe('auction worker clock-shift race', () => { const now = new Date('2026-07-30T12:00:00.000Z'); const time = { now, + wallNow: now, tick: 36_000_000, mode: 'manual' as const, + running: false, + startsAt: null, dateToTick: () => 72_000_000, }; const closeAt = new Date('2099-01-01T00:00:00.000Z'); diff --git a/app/game-api/test/gameClock.test.ts b/app/game-api/test/gameClock.test.ts new file mode 100644 index 00000000..9d746e11 --- /dev/null +++ b/app/game-api/test/gameClock.test.ts @@ -0,0 +1,52 @@ +import { describe, expect, it, vi } from 'vitest'; + +import type { DatabaseClient } from '../src/context.js'; +import { loadCurrentGameTime } from '../src/services/gameClock.js'; + +const buildDatabase = (mode: 'realtime' | 'manual' = 'realtime'): DatabaseClient => + ({ + worldState: { + findFirst: vi.fn(async () => ({ + clockBaseTime: new Date('2026-08-21T09:50:00.000Z'), + clockTick: 36_000_000n, + clockMode: mode, + clockWallAnchor: new Date('2026-08-21T11:00:00.000Z'), + tickSeconds: 600, + })), + }, + }) as unknown as DatabaseClient; + +describe('current game time projection', () => { + it('holds a realtime clock at its persisted tick until the future wall anchor', async () => { + const db = buildDatabase(); + + const preopen = await loadCurrentGameTime(db, new Date('2026-08-21T10:30:00.000Z')); + expect(preopen).toMatchObject({ + now: new Date('2026-08-21T10:00:00.000Z'), + wallNow: new Date('2026-08-21T10:30:00.000Z'), + tick: 36_000_000, + mode: 'realtime', + running: false, + startsAt: new Date('2026-08-21T11:00:00.000Z'), + }); + + const opened = await loadCurrentGameTime(db, new Date('2026-08-21T11:00:05.000Z')); + expect(opened).toMatchObject({ + now: new Date('2026-08-21T10:00:05.000Z'), + tick: 36_300_000, + running: true, + startsAt: null, + }); + }); + + it('keeps a manual clock stopped without scheduling an automatic start', async () => { + const result = await loadCurrentGameTime(buildDatabase('manual'), new Date('2026-08-21T12:00:00.000Z')); + + expect(result).toMatchObject({ + now: new Date('2026-08-21T10:00:00.000Z'), + tick: 36_000_000, + running: false, + startsAt: null, + }); + }); +}); diff --git a/app/game-api/test/lobbyRouter.test.ts b/app/game-api/test/lobbyRouter.test.ts index fe228c12..c9c09ec8 100644 --- a/app/game-api/test/lobbyRouter.test.ts +++ b/app/game-api/test/lobbyRouter.test.ts @@ -68,6 +68,32 @@ describe('lobby season state', () => { expect(result.serverTime).toBe('2026-08-15T02:00:00.000Z'); expect(result.clockMode).toBe('manual'); + expect(result.clockRunning).toBe(false); + expect(result.clockStartsAt).toBeNull(); + expect(new Date(result.serverWallTime).getTime()).not.toBeNaN(); + }); + + it('exposes the future realtime wall anchor without advancing the preopen clock', async () => { + const wallAnchor = new Date('2099-08-21T11:00:00.000Z'); + const result = await appRouter + .createCaller( + buildContext( + {}, + { + baseTime: new Date('2026-08-21T09:00:00.000Z'), + tick: 36_000_000n, + mode: 'realtime', + wallAnchor, + } + ) + ) + .lobby.info(); + + expect(result.serverTime).toBe('2026-08-21T10:00:00.000Z'); + expect(result.clockMode).toBe('realtime'); + expect(result.clockRunning).toBe(false); + expect(result.clockStartsAt).toBe(wallAnchor.toISOString()); + expect(new Date(result.serverWallTime).getTime()).toBeLessThan(wallAnchor.getTime()); }); it('preserves zero as the first official game index', async () => { diff --git a/app/game-engine/src/scenario/scenarioSeeder.ts b/app/game-engine/src/scenario/scenarioSeeder.ts index 5bf328fe..fabe1c5d 100644 --- a/app/game-engine/src/scenario/scenarioSeeder.ts +++ b/app/game-engine/src/scenario/scenarioSeeder.ts @@ -50,6 +50,7 @@ export interface ScenarioInstallOptions { joinMode?: 'full' | 'onlyRandom'; autorunUser?: ScenarioAutorunOptions | null; preopenAt?: Date | null; + openAt?: Date | null; season?: number; firstGameIdx?: number; serverId?: string; @@ -229,11 +230,14 @@ export const seedScenarioToDatabase = async (options: ScenarioSeedOptions): Prom const sync = install?.sync ?? false; const startState = resolveStartState(scenario.startYear ?? null, now, turnTermMinutes, sync); const gameClockMode = options.gameClockMode ?? 'realtime'; + // A realtime season prepared before its formal opening must not consume + // wall time while users are only allowed to edit reserved commands. + const initialClockWallAnchor = install?.openAt && install.openAt.getTime() > now.getTime() ? install.openAt : now; const initialClock = new GameClock({ baseTime: startState.startTime, tick: 0, mode: gameClockMode, - wallAnchor: now, + wallAnchor: initialClockWallAnchor, turnSeconds: tickSeconds, }); const initialClockTick = initialClock.dateToTick(now); @@ -410,7 +414,7 @@ export const seedScenarioToDatabase = async (options: ScenarioSeedOptions): Prom clockBaseTime: initialClock.baseTime, clockTick: BigInt(initialClockTick), clockMode: gameClockMode, - clockWallAnchor: now, + clockWallAnchor: initialClock.wallAnchor, lastTurnTick: BigInt(initialClockTick), config: asJson({ ...scenarioConfig, ...worldConfig }), meta: asJson(worldMeta), diff --git a/app/game-engine/test/scenarioSeeder.test.ts b/app/game-engine/test/scenarioSeeder.test.ts index 10ea88b4..2e072812 100644 --- a/app/game-engine/test/scenarioSeeder.test.ts +++ b/app/game-engine/test/scenarioSeeder.test.ts @@ -50,6 +50,7 @@ type ScenarioSeederPrismaClient = { tickSeconds: number; currentYear: number; currentMonth: number; + clockWallAnchor: Date | null; } | null>; }; gameHistory: { @@ -364,6 +365,8 @@ describeDb('scenario database seed', () => { develop: true, }, }, + preopenAt: new Date('2030-01-01T01:00:00Z'), + openAt: new Date('2030-01-01T02:00:00Z'), }, }); @@ -385,6 +388,7 @@ describeDb('scenario database seed', () => { } expect(worldState.tickSeconds).toBe(3600); expect(worldState.currentMonth).toBe(1); + expect(worldState.clockWallAnchor).toEqual(new Date('2030-01-01T02:00:00.000Z')); const config = (worldState.config ?? {}) as Record; expect(config.extendedGeneral).toBe(false); diff --git a/app/game-frontend/e2e/mainNavigation.spec.ts b/app/game-frontend/e2e/mainNavigation.spec.ts index 2f5f31ea..12e29e3c 100644 --- a/app/game-frontend/e2e/mainNavigation.spec.ts +++ b/app/game-frontend/e2e/mainNavigation.spec.ts @@ -34,7 +34,10 @@ type NavigationFixture = { generalName?: string; generalTurnTime?: string; serverTime?: string; + serverWallTime?: string; clockMode?: 'realtime' | 'manual'; + clockRunning?: boolean; + clockStartsAt?: string | null; cityDefence?: number; cityState?: number; nationRate?: number; @@ -555,7 +558,10 @@ const installFixture = async (page: Page, state: NavigationFixture) => { month: state.currentMonth ?? 1, turnTerm: 10, serverTime: state.serverTime ?? '2026-08-13T00:00:00.000Z', + serverWallTime: state.serverWallTime ?? '2026-08-13T00:00:00.000Z', clockMode: state.clockMode ?? 'realtime', + clockRunning: state.clockRunning ?? true, + clockStartsAt: state.clockStartsAt ?? null, scenarioTitle: state.scenarioTitle ?? '', }); } @@ -1711,12 +1717,48 @@ test('main general card uses local turn time and command clock tracks corrected } state.clockMode = 'manual'; + state.clockRunning = false; state.serverTime = '2026-08-13T00:08:30.000Z'; await page.reload(); const frozenClock = page.locator('[data-main-target="commands"] [data-command-current-time]').first(); await expect(frozenClock).toHaveText('09:08:30'); await page.clock.runFor(2_000); await expect(frozenClock).toHaveText('09:08:30'); + + state.clockMode = 'realtime'; + state.clockRunning = false; + state.serverTime = '2026-08-13T00:10:00.000Z'; + state.serverWallTime = '2026-08-21T10:00:00.000Z'; + state.clockStartsAt = '2026-08-21T10:00:02.000Z'; + await page.reload(); + const preopenClock = page.locator('[data-main-target="commands"] [data-command-current-time]').first(); + await expect(preopenClock).toHaveText('09:10:00'); + const operationsBeforePreopenBoundary = state.operations.length; + await page.clock.runFor(1_500); + await expect(preopenClock).toHaveText('09:10:00'); + if (artifactRoot) { + const preopenGeometry = await preopenClock.evaluate((element) => ({ + rect: element.getBoundingClientRect().toJSON(), + overflow: element.scrollWidth - element.clientWidth, + fontSize: getComputedStyle(element).fontSize, + lineHeight: getComputedStyle(element).lineHeight, + value: element.textContent, + })); + expect(preopenGeometry.overflow).toBeLessThanOrEqual(0); + await Promise.all([ + page.screenshot({ + path: resolve(artifactRoot, 'main-preopen-clock-frozen-mobile-500.png'), + fullPage: true, + }), + writeFile( + resolve(artifactRoot, 'main-preopen-clock-frozen-mobile-500.json'), + `${JSON.stringify(preopenGeometry, null, 2)}\n` + ), + ]); + } + await page.clock.runFor(1_500); + await expect(preopenClock).toHaveText('09:10:01'); + expect(state.operations).toHaveLength(operationsBeforePreopenBoundary); }); test('message targets keep reply behavior and use nation-color contrast in labels and select options', async ({ diff --git a/app/game-frontend/src/components/main/CommandListPanel.vue b/app/game-frontend/src/components/main/CommandListPanel.vue index 82846b40..260037dd 100644 --- a/app/game-frontend/src/components/main/CommandListPanel.vue +++ b/app/game-frontend/src/components/main/CommandListPanel.vue @@ -20,7 +20,10 @@ const props = defineProps<{ currentMonth?: number; turnTermMinutes?: number; serverTime?: string; + serverWallTime?: string; clockMode?: 'realtime' | 'manual'; + clockRunning?: boolean; + clockStartsAt?: string | null; autorunLimit?: number | null; storageKey?: string; mapData?: CommandMapData | null; @@ -86,8 +89,10 @@ const autonomousUntil = computed(() => { }); const currentServerTime = ref('--:--:--'); +const MAX_SERVER_CLOCK_TIMER_DELAY_MS = 60_000; let sampledServerTimeMs: number | null = null; let sampledClientTimeMs = 0; +let sampledStartDelayMs: number | null = 0; let serverClockTimer: ReturnType | undefined; const updateServerClock = () => { @@ -97,21 +102,42 @@ const updateServerClock = () => { currentServerTime.value = '--:--:--'; return; } - const projectedTime = new Date( - props.clockMode === 'manual' ? sampledServerTimeMs : sampledServerTimeMs + Date.now() - sampledClientTimeMs - ); + const clientElapsedMs = Math.max(0, Date.now() - sampledClientTimeMs); + const elapsedGameMs = + props.clockMode === 'manual' || sampledStartDelayMs === null + ? 0 + : Math.max(0, clientElapsedMs - sampledStartDelayMs); + const projectedTime = new Date(sampledServerTimeMs + elapsedGameMs); currentServerTime.value = formatLocalTimeSeconds(projectedTime); - if (props.clockMode !== 'manual') { - serverClockTimer = setTimeout(updateServerClock, 1_000 - projectedTime.getMilliseconds()); + if (props.clockMode !== 'manual' && sampledStartDelayMs !== null) { + const untilStartMs = sampledStartDelayMs - clientElapsedMs; + serverClockTimer = setTimeout( + updateServerClock, + untilStartMs > 0 + ? Math.min(untilStartMs, MAX_SERVER_CLOCK_TIMER_DELAY_MS) + : 1_000 - projectedTime.getMilliseconds() + ); } }; watch( - () => [props.serverTime, props.clockMode] as const, - ([serverTime]) => { + () => [props.serverTime, props.serverWallTime, props.clockMode, props.clockRunning, props.clockStartsAt] as const, + ([serverTime, serverWallTime, clockMode, clockRunning, clockStartsAt]) => { const parsed = serverTime ? new Date(serverTime).getTime() : Number.NaN; sampledServerTimeMs = Number.isFinite(parsed) ? parsed : null; sampledClientTimeMs = Date.now(); + if (clockMode === 'manual') { + sampledStartDelayMs = null; + } else if (clockRunning !== false) { + sampledStartDelayMs = 0; + } else { + const wallTimeMs = serverWallTime ? new Date(serverWallTime).getTime() : Number.NaN; + const startsAtMs = clockStartsAt ? new Date(clockStartsAt).getTime() : Number.NaN; + sampledStartDelayMs = + Number.isFinite(wallTimeMs) && Number.isFinite(startsAtMs) + ? Math.max(0, startsAtMs - wallTimeMs) + : null; + } updateServerClock(); }, { immediate: true } diff --git a/app/game-frontend/src/views/MainView.vue b/app/game-frontend/src/views/MainView.vue index e69e0537..1b6618eb 100644 --- a/app/game-frontend/src/views/MainView.vue +++ b/app/game-frontend/src/views/MainView.vue @@ -267,7 +267,10 @@ watch( :current-month="lobbyInfo?.month" :turn-term-minutes="lobbyInfo?.turnTerm" :server-time="lobbyInfo?.serverTime" + :server-wall-time="lobbyInfo?.serverWallTime" :clock-mode="lobbyInfo?.clockMode" + :clock-running="lobbyInfo?.clockRunning" + :clock-starts-at="lobbyInfo?.clockStartsAt" :autorun-limit="reservedGeneralAutorunLimit" :map-data="worldMap" :map-layout="mapLayout" @@ -437,7 +440,10 @@ watch( :current-month="lobbyInfo?.month" :turn-term-minutes="lobbyInfo?.turnTerm" :server-time="lobbyInfo?.serverTime" + :server-wall-time="lobbyInfo?.serverWallTime" :clock-mode="lobbyInfo?.clockMode" + :clock-running="lobbyInfo?.clockRunning" + :clock-starts-at="lobbyInfo?.clockStartsAt" :autorun-limit="reservedGeneralAutorunLimit" :map-data="worldMap" :map-layout="mapLayout" diff --git a/app/gateway-api/src/orchestrator/gatewayOrchestrator.ts b/app/gateway-api/src/orchestrator/gatewayOrchestrator.ts index 9f653a0c..a7a1961b 100644 --- a/app/gateway-api/src/orchestrator/gatewayOrchestrator.ts +++ b/app/gateway-api/src/orchestrator/gatewayOrchestrator.ts @@ -396,6 +396,7 @@ const parseInstallOptions = ( joinMode: joinMode === 'full' || joinMode === 'onlyRandom' ? joinMode : undefined, autorunUser: autorunUser ?? null, preopenAt: preopenAt ?? null, + openAt: openAt ?? null, installOperationId: action.installOperationId, }; @@ -2173,6 +2174,7 @@ export class GatewayOrchestrator implements GatewayOrchestratorHandle { ? { ...options.installOptions, preopenAt: options.installOptions.preopenAt?.toISOString() ?? null, + openAt: options.installOptions.openAt?.toISOString() ?? null, } : undefined, adminUser: options.adminUser, diff --git a/app/gateway-api/src/orchestrator/profileSeedCli.ts b/app/gateway-api/src/orchestrator/profileSeedCli.ts index 7d7194cd..3bafe67d 100644 --- a/app/gateway-api/src/orchestrator/profileSeedCli.ts +++ b/app/gateway-api/src/orchestrator/profileSeedCli.ts @@ -9,7 +9,10 @@ interface ProfileSeedRequest { scenarioId: number; tickSeconds?: number; now: string; - installOptions?: Omit & { preopenAt?: string | null }; + installOptions?: Omit & { + preopenAt?: string | null; + openAt?: string | null; + }; adminUser?: AdminSeedUser | null; } @@ -49,6 +52,11 @@ export const runProfileSeedCli = async (env: NodeJS.ProcessEnv = process.env): P if (preopenAt && Number.isNaN(preopenAt.getTime())) { throw new Error('Profile seed preopenAt must be an ISO date-time.'); } + const rawOpenAt = request.installOptions?.openAt; + const openAt = typeof rawOpenAt === 'string' ? new Date(rawOpenAt) : null; + if (openAt && Number.isNaN(openAt.getTime())) { + throw new Error('Profile seed openAt must be an ISO date-time.'); + } const resourceRoot = path.join(process.cwd(), 'resources'); await seedProfileDatabase({ @@ -61,6 +69,7 @@ export const runProfileSeedCli = async (env: NodeJS.ProcessEnv = process.env): P ? { ...request.installOptions, preopenAt, + openAt, } : undefined, scenarioOptions: { scenarioRoot: path.join(resourceRoot, 'scenario') }, diff --git a/app/gateway-api/test/profileSeedCli.integration.test.ts b/app/gateway-api/test/profileSeedCli.integration.test.ts index d0c26e8d..7d3220e3 100644 --- a/app/gateway-api/test/profileSeedCli.integration.test.ts +++ b/app/gateway-api/test/profileSeedCli.integration.test.ts @@ -54,6 +54,8 @@ describeDatabase('selected workspace profile seed CLI', () => { firstGameIdx: 0, installOperationId: 'selected-cli-operation', installCommitSha: 'selected-cli-commit', + preopenAt: '2036-03-03T01:00:00.000Z', + openAt: '2036-03-03T02:00:00.000Z', }, adminUser: { id: 'selected-cli-admin', @@ -69,6 +71,7 @@ describeDatabase('selected workspace profile seed CLI', () => { const world = await connector.prisma.worldState.findFirstOrThrow(); expect(world).toMatchObject({ scenarioCode: '1010', + clockWallAnchor: new Date('2036-03-03T02:00:00.000Z'), meta: { firstGameIdx: 0, gameIdx: completedGameCount, diff --git a/app/gateway-api/test/profileSeedCli.test.ts b/app/gateway-api/test/profileSeedCli.test.ts index b0d5dfcc..62b11a39 100644 --- a/app/gateway-api/test/profileSeedCli.test.ts +++ b/app/gateway-api/test/profileSeedCli.test.ts @@ -13,13 +13,18 @@ describe('parseProfileSeedRequest', () => { installOperationId: 'operation-id', installCommitSha: 'abcdef', preopenAt: null, + openAt: '2030-01-01T02:00:00.000Z', }, adminUser: { id: 'admin', username: 'admin' }, }) ).toMatchObject({ scenarioId: 1010, tickSeconds: 60, - installOptions: { installOperationId: 'operation-id', installCommitSha: 'abcdef' }, + installOptions: { + installOperationId: 'operation-id', + installCommitSha: 'abcdef', + openAt: '2030-01-01T02:00:00.000Z', + }, }); }); From e3b6f17e48ee27d803b11420b534d36c2b30e1c7 Mon Sep 17 00:00:00 2001 From: hided62 Date: Fri, 21 Aug 2026 17:09:41 +0000 Subject: [PATCH 2/3] =?UTF-8?q?fix(game-ui):=20=EB=B6=80=EB=8C=80=20?= =?UTF-8?q?=EC=98=88=EC=95=BD=20=EB=AA=85=EB=A0=B9=20=EB=82=B4=EB=B6=80=20?= =?UTF-8?q?=ED=82=A4=EB=A5=BC=20=EA=B0=80=EB=A6=B0=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/game-api/src/router/troop/index.ts | 5 +++-- app/game-api/test/troopRouter.test.ts | 30 +++++++++++++++++++++++-- app/game-frontend/e2e/troop.spec.ts | 31 ++++++++++++++++++++++++-- 3 files changed, 60 insertions(+), 6 deletions(-) diff --git a/app/game-api/src/router/troop/index.ts b/app/game-api/src/router/troop/index.ts index 54370c7a..810eb1d1 100644 --- a/app/game-api/src/router/troop/index.ts +++ b/app/game-api/src/router/troop/index.ts @@ -79,7 +79,7 @@ export const troopRouter = router({ troopLeaderIds.length === 0 ? [] : await ctx.db.generalTurn.findMany({ - where: { generalId: { in: troopLeaderIds } }, + where: { generalId: { in: troopLeaderIds }, turnIdx: { lt: 5 } }, select: { generalId: true, turnIdx: true, actionCode: true }, orderBy: [{ generalId: 'asc' }, { turnIdx: 'asc' }], }); @@ -94,7 +94,8 @@ export const troopRouter = router({ : 30; for (const turn of turns) { const list = reservedByLeader.get(turn.generalId) ?? []; - list.push(turn.actionCode); + // Ref 부대 편성은 앞쪽 슬롯이 집합인지 여부만 공개하고 다른 명령은 가립니다. + list.push(turn.actionCode === 'che_집합' ? '집합' : '-'); reservedByLeader.set(turn.generalId, list); } diff --git a/app/game-api/test/troopRouter.test.ts b/app/game-api/test/troopRouter.test.ts index 704c1398..9102d215 100644 --- a/app/game-api/test/troopRouter.test.ts +++ b/app/game-api/test/troopRouter.test.ts @@ -77,10 +77,12 @@ const buildContext = (options: { auth?: GameSessionTokenPayload | null; requestId?: string; transaction?: ReturnType; + turns?: Array<{ generalId: number; turnIdx: number; actionCode: string }>; result: Awaited>; }) => { const me = options.me ?? buildGeneral(); const requestCommand = vi.fn(async () => options.result); + const generalTurnFindMany = vi.fn(async () => options.turns ?? []); const db = { ...(options.transaction ? { $transaction: options.transaction } : {}), general: { @@ -110,7 +112,7 @@ const buildContext = (options: { }, city: { findMany: vi.fn(async () => [{ id: 1, name: '북평' }]) }, worldState: { findFirst: vi.fn(async () => ({ config: { const: { upgradeLimit: 20 } } })) }, - generalTurn: { findMany: vi.fn(async () => []) }, + generalTurn: { findMany: generalTurnFindMany }, }; const accessTokenStore = new RedisAccessTokenStore( { @@ -134,7 +136,7 @@ const buildContext = (options: { flushStore: new InMemoryFlushStore(), gameTokenSecret: 'test-secret', }; - return { context, requestCommand }; + return { context, requestCommand, generalTurnFindMany }; }; describe('troop router permissions and mutations', () => { @@ -175,6 +177,30 @@ describe('troop router permissions and mutations', () => { }); }); + it('returns only the first five Ref-redacted troop command labels without exposing action codes', async () => { + const fixture = buildContext({ + me: buildGeneral({ troopId: 1 }), + turns: [ + { generalId: 1, turnIdx: 0, actionCode: 'che_집합' }, + { generalId: 1, turnIdx: 1, actionCode: 'che_이동' }, + { generalId: 1, turnIdx: 2, actionCode: 'che_징병' }, + { generalId: 1, turnIdx: 3, actionCode: '휴식' }, + { generalId: 1, turnIdx: 4, actionCode: 'che_화계' }, + ], + result: null, + }); + + const result = await appRouter.createCaller(fixture.context).troop.getList(); + + expect(result.troops[0]?.reservedCommands).toEqual(['집합', '-', '-', '-', '-']); + expect(JSON.stringify(result.troops)).not.toContain('che_'); + expect(fixture.generalTurnFindMany).toHaveBeenCalledWith({ + where: { generalId: { in: [1] }, turnIdx: { lt: 5 } }, + select: { generalId: true, turnIdx: true, actionCode: true }, + orderBy: [{ generalId: 'asc' }, { turnIdx: 'asc' }], + }); + }); + it('creates a troop only for the general owned by the authenticated user', async () => { const { context, requestCommand } = buildContext({ result: { type: 'troopCreate', ok: true, generalId: 1, troopId: 1, troopName: '백마대' }, diff --git a/app/game-frontend/e2e/troop.spec.ts b/app/game-frontend/e2e/troop.spec.ts index 67fc7e71..583f52b4 100644 --- a/app/game-frontend/e2e/troop.spec.ts +++ b/app/game-frontend/e2e/troop.spec.ts @@ -80,7 +80,7 @@ const baseTroops = (): TroopFixture[] => [ name: '백마대', nationId: 1, turnTime: '2026-07-25T08:20:30.000Z', - reservedCommands: ['che_집합', 'che_이동'], + reservedCommands: ['집합', '-'], leader: { id: 1, name: '공손찬', @@ -96,7 +96,7 @@ const baseTroops = (): TroopFixture[] => [ name: '청룡대', nationId: 1, turnTime: '2026-07-25T08:30:30.000Z', - reservedCommands: ['che_징병'], + reservedCommands: ['-'], leader: { id: 2, name: '관우', @@ -224,6 +224,27 @@ const installApiFixture = async (page: Page, state: FixtureState) => { }); }; +test('shows only the Ref-safe first-five troop command labels on desktop and mobile', async ({ page }) => { + await installApiFixture(page, { + me: { id: 1, troopId: 1 }, + permission: 4, + troops: baseTroops(), + }); + + for (const viewport of [ + { width: 1000, height: 800 }, + { width: 500, height: 800 }, + ]) { + await page.setViewportSize(viewport); + await gotoTroop(page); + + const firstTroopCommands = page.locator('.troopReservedCommand').first(); + await expect(firstTroopCommands).toContainText('1: 집합'); + await expect(firstTroopCommands).toContainText('2: -'); + await expect(page.locator('#troopList')).not.toContainText('che_'); + } +}); + test('renders the legacy desktop grid with matching computed geometry and states', async ({ page }) => { await installApiFixture(page, { me: { id: 1, troopId: 1 }, @@ -233,6 +254,9 @@ test('renders the legacy desktop grid with matching computed geometry and states await page.setViewportSize({ width: 1000, height: 800 }); await gotoTroop(page); await expect(page.locator('.troopInfo').filter({ hasText: '백마대' })).toBeVisible(); + await expect(page.locator('.troopReservedCommand').first()).toContainText('1: 집합'); + await expect(page.locator('.troopReservedCommand').first()).toContainText('2: -'); + await expect(page.locator('#troopList')).not.toContainText('che_'); const geometry = await page .locator('.troopItem') @@ -319,6 +343,9 @@ test('matches the legacy 500px responsive placement', async ({ page }) => { await page.setViewportSize({ width: 500, height: 800 }); await gotoTroop(page); await expect(page.locator('.troopInfo').filter({ hasText: '백마대' })).toBeVisible(); + await expect(page.locator('.troopReservedCommand').first()).toContainText('1: 집합'); + await expect(page.locator('.troopReservedCommand').first()).toContainText('2: -'); + await expect(page.locator('#troopList')).not.toContainText('che_'); const geometry = await page .locator('.troopItem') From 6b4e4e490c9f5f2fb42812e39bdb0c00b38372b1 Mon Sep 17 00:00:00 2001 From: hided62 Date: Fri, 21 Aug 2026 17:11:40 +0000 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=EB=82=B4=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=EC=99=80=20=EA=B0=90=EC=B0=B0=EB=B6=80=EC=97=90=20=EA=B0=9C?= =?UTF-8?q?=EC=9D=B8=20=EB=B4=89=EA=B8=89=EC=9D=84=20=ED=91=9C=EC=8B=9C?= =?UTF-8?q?=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 공헌 등급에서 계산한 개인 봉급을 두 read model에 투영하고 공통 요약 첫 행에 배치한다. 전투·계략·사관 행과 봉급 snapshot이 없는 과거 플레이의 빈 slot은 유지한다. --- app/game-api/src/router/general/index.ts | 3 ++- .../src/router/nation/endpoints/getBattleCenter.ts | 3 ++- app/game-api/test/inGameMenuPermissions.test.ts | 3 +++ app/game-frontend/e2e/inGameMenus.spec.ts | 9 +++++++-- .../src/components/main/GeneralBattleSummary.vue | 10 ++++++++-- app/game-frontend/src/views/BattleCenterView.vue | 1 + app/game-frontend/src/views/MyPageView.vue | 1 + 7 files changed, 24 insertions(+), 6 deletions(-) diff --git a/app/game-api/src/router/general/index.ts b/app/game-api/src/router/general/index.ts index 29f39cbb..b07c1550 100644 --- a/app/game-api/src/router/general/index.ts +++ b/app/game-api/src/router/general/index.ts @@ -1,7 +1,7 @@ import { TRPCError } from '@trpc/server'; import { z } from 'zod'; -import { LogCategory, LogScope } from '@sammo-ts/logic'; +import { getBillByLevel, LogCategory, LogScope } from '@sammo-ts/logic'; import { asRecord, type RankDataType } from '@sammo-ts/common'; import type { GameApiContext } from '../../context.js'; @@ -517,6 +517,7 @@ export const getGeneralContext = async (ctx: GameApiContext) => { injury: general.injury, experience: general.experience, dedication: general.dedication, + bill: getBillByLevel(dedicationLevel), age: general.age, retirementYear, turnTime: general.turnTime.toISOString(), diff --git a/app/game-api/src/router/nation/endpoints/getBattleCenter.ts b/app/game-api/src/router/nation/endpoints/getBattleCenter.ts index 0601df8a..502adbca 100644 --- a/app/game-api/src/router/nation/endpoints/getBattleCenter.ts +++ b/app/game-api/src/router/nation/endpoints/getBattleCenter.ts @@ -1,7 +1,7 @@ import { TRPCError } from '@trpc/server'; import { asRecord, type RankDataType } from '@sammo-ts/common'; -import { LogCategory } from '@sammo-ts/logic'; +import { getBillByLevel, LogCategory } from '@sammo-ts/logic'; import { accessAuthedProcedure } from '../../../trpc.js'; import { @@ -201,6 +201,7 @@ export const getBattleCenter = accessAuthedProcedure.query(async ({ ctx }) => { }, experience: general.experience, dedication: general.dedication, + bill: getBillByLevel(dedicationLevel), injury: general.injury, gold: general.gold, rice: general.rice, diff --git a/app/game-api/test/inGameMenuPermissions.test.ts b/app/game-api/test/inGameMenuPermissions.test.ts index 4ed4e01f..9cd5752f 100644 --- a/app/game-api/test/inGameMenuPermissions.test.ts +++ b/app/game-api/test/inGameMenuPermissions.test.ts @@ -297,6 +297,7 @@ describe('in-game my information ownership', () => { statUpgradeLimit: 20, dex: [350, 1_375, 3_500, 7_125, 12_650], }, + bill: 1_000, }, city: { population: 322_886, @@ -433,6 +434,7 @@ describe('in-game my information ownership', () => { stats: { attack: 100, defence: 150, speed: 7, avoid: 10, magicCoef: 0, cost: 9, rice: 9 }, }, progression: { experienceLevel: 4, dedicationLevel: 2, dedicationText: '29품관' }, + bill: 800, itemNames: { horse: '노새(+3)' }, itemInfo: { horse: '통솔 +3' }, }, @@ -855,6 +857,7 @@ describe('battle-center general and user permissions', () => { statUpgradeLimit: 20, dex: [0, 0, 0, 0, 0], }, + bill: 600, serviceYears: 3, battleStats: { kills: 5, diff --git a/app/game-frontend/e2e/inGameMenus.spec.ts b/app/game-frontend/e2e/inGameMenus.spec.ts index cb5265b8..5c5a86e8 100644 --- a/app/game-frontend/e2e/inGameMenus.spec.ts +++ b/app/game-frontend/e2e/inGameMenus.spec.ts @@ -112,6 +112,7 @@ const myGeneral = (state: FixtureState) => ({ injury: 0, experience: 100, dedication: 200, + bill: 800, age: 30, turnTime: '2026-01-01 00:10:00', recentWar: '2026-01-01 00:00:00', @@ -296,6 +297,7 @@ const battleCenter = (state: FixtureState) => ({ stats: { leadership: 70, strength: 60, intelligence: 50 }, experience: 100, dedication: 200, + bill: 800, injury: 0, gold: 1_000, rice: 2_000, @@ -334,6 +336,7 @@ const battleCenter = (state: FixtureState) => ({ stats: { leadership: 50, strength: 50, intelligence: 50 }, experience: 0, dedication: 0, + bill: 400, injury: 0, gold: 500, rice: 500, @@ -1245,6 +1248,7 @@ test('내 정보&설정 keeps desktop density and becomes a 390px horizontal-ide await expect(page.locator('.general-table')).toContainText('병종보병'); await expect(page.locator('.general-table')).toContainText('삭턴6 턴'); await expect(page.locator('.battle-general-extra')).toContainText('계급29품관'); + await expect(page.locator('.battle-general-extra')).toContainText('봉급800'); await expect(page.locator('.battle-general-extra')).toContainText('전투8회'); await expect(page.locator('.battle-general-extra')).toContainText('계략12'); await expect(page.locator('.battle-general-extra')).toContainText('사관4년'); @@ -1255,7 +1259,7 @@ test('내 정보&설정 keeps desktop density and becomes a 390px horizontal-ide await expect(page.locator('.battle-general-extra__recent-value')).toHaveText('01-01 00:00'); await expect(page.locator('.legacy-general-details')).toHaveCount(0); expect(await readGeneralSummaryRows(page.locator('.battle-general-extra'))).toEqual([ - ['명성', '계급', ''], + ['명성', '계급', '봉급'], ['전투', '계략', '사관'], ['승률', '승리', '패배'], ['살상률', '사살', '피살'], @@ -2039,6 +2043,7 @@ test('감찰부 keeps the selector interaction and shows the permission error pa await expect(page.locator('.battle-general-name')).toContainText('간의대부'); await expect(page.locator('.battle-general-name')).toContainText('건강'); await expect(page.locator('.battle-general-extra')).toContainText('계급29품관'); + await expect(page.locator('.battle-general-extra')).toContainText('봉급800'); await expect(page.locator('.battle-general-card')).toContainText('병종보병'); await expect(page.locator('.battle-general-card')).not.toContainText('che_'); await expect(page.locator('.battle-general-card')).toHaveAttribute('data-general-basic-card', ''); @@ -2049,7 +2054,7 @@ test('감찰부 keeps the selector interaction and shows the permission error pa await expect(page.locator('.battle-general-extra')).toContainText('승률62.50%'); await expect(page.locator('.battle-general-extra')).toContainText('살상률181.84%'); expect(await readGeneralSummaryRows(page.locator('.battle-general-extra'))).toEqual([ - ['명성', '계급', ''], + ['명성', '계급', '봉급'], ['전투', '계략', '사관'], ['승률', '승리', '패배'], ['살상률', '사살', '피살'], diff --git a/app/game-frontend/src/components/main/GeneralBattleSummary.vue b/app/game-frontend/src/components/main/GeneralBattleSummary.vue index 7b2ec503..b7b97216 100644 --- a/app/game-frontend/src/components/main/GeneralBattleSummary.vue +++ b/app/game-frontend/src/components/main/GeneralBattleSummary.vue @@ -7,6 +7,7 @@ export type GeneralBattleSummaryData = { available?: boolean; experience?: number | null; dedicationText?: string | null; + bill?: number | null; warnum?: number | null; wins?: number | null; losses?: number | null; @@ -62,8 +63,13 @@ const killRate = computed(() => {