merge: 최신 main을 Gateway 릴리스 시각 교정에 통합
This commit is contained in:
@@ -45,6 +45,7 @@ import {
|
|||||||
import {
|
import {
|
||||||
resolveGeneralTypeCall,
|
resolveGeneralTypeCall,
|
||||||
resolveLeadershipBonus,
|
resolveLeadershipBonus,
|
||||||
|
resolveNextTurnMonthOffset,
|
||||||
resolveRefreshScoreText,
|
resolveRefreshScoreText,
|
||||||
resolveRemainingMinutes,
|
resolveRemainingMinutes,
|
||||||
} from '../../services/generalBasicCardProjection.js';
|
} from '../../services/generalBasicCardProjection.js';
|
||||||
@@ -265,6 +266,7 @@ export const getGeneralContext = async (ctx: GameApiContext) => {
|
|||||||
dedication: true,
|
dedication: true,
|
||||||
age: true,
|
age: true,
|
||||||
turnTime: true,
|
turnTime: true,
|
||||||
|
turnTick: true,
|
||||||
recentWarTime: true,
|
recentWarTime: true,
|
||||||
crewTypeId: true,
|
crewTypeId: true,
|
||||||
personalCode: true,
|
personalCode: true,
|
||||||
@@ -333,7 +335,14 @@ export const getGeneralContext = async (ctx: GameApiContext) => {
|
|||||||
})
|
})
|
||||||
: Promise.resolve(NEUTRAL_NATION_CONTEXT),
|
: Promise.resolve(NEUTRAL_NATION_CONTEXT),
|
||||||
ctx.db.worldState.findFirst({
|
ctx.db.worldState.findFirst({
|
||||||
select: { currentYear: true, currentMonth: true, tickSeconds: true, config: true, meta: true },
|
select: {
|
||||||
|
currentYear: true,
|
||||||
|
currentMonth: true,
|
||||||
|
tickSeconds: true,
|
||||||
|
lastTurnTick: true,
|
||||||
|
config: true,
|
||||||
|
meta: true,
|
||||||
|
},
|
||||||
}),
|
}),
|
||||||
officerCityId > 0
|
officerCityId > 0
|
||||||
? ctx.db.city.findUnique({ where: { id: officerCityId }, select: { name: true } })
|
? ctx.db.city.findUnique({ where: { id: officerCityId }, select: { name: true } })
|
||||||
@@ -521,6 +530,13 @@ export const getGeneralContext = async (ctx: GameApiContext) => {
|
|||||||
age: general.age,
|
age: general.age,
|
||||||
retirementYear,
|
retirementYear,
|
||||||
turnTime: general.turnTime.toISOString(),
|
turnTime: general.turnTime.toISOString(),
|
||||||
|
nextTurnMonthOffset: resolveNextTurnMonthOffset({
|
||||||
|
turnTime: general.turnTime,
|
||||||
|
turnTick: general.turnTick,
|
||||||
|
lastExecuted: parsedLastExecuted,
|
||||||
|
lastTurnTick: worldState?.lastTurnTick,
|
||||||
|
turnSeconds: worldState?.tickSeconds ?? 0,
|
||||||
|
}),
|
||||||
recentWar: general.recentWarTime?.toISOString() ?? null,
|
recentWar: general.recentWarTime?.toISOString() ?? null,
|
||||||
defenceTrain: settings.defence_train,
|
defenceTrain: settings.defence_train,
|
||||||
killTurn: readNumber(metaRecord.killturn ?? metaRecord.killTurn, 0),
|
killTurn: readNumber(metaRecord.killturn ?? metaRecord.killTurn, 0),
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import { GAME_TICKS_PER_TURN } from '@sammo-ts/common';
|
||||||
|
|
||||||
export interface GeneralBasicStats {
|
export interface GeneralBasicStats {
|
||||||
leadership: number;
|
leadership: number;
|
||||||
strength: number;
|
strength: number;
|
||||||
@@ -53,3 +55,41 @@ export const resolveRemainingMinutes = (
|
|||||||
}
|
}
|
||||||
return Math.floor(Math.min(999, Math.max(0, (nextTurnMillis - lastExecuted.getTime()) / 60_000)));
|
return Math.floor(Math.min(999, Math.max(0, (nextTurnMillis - lastExecuted.getTime()) / 60_000)));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export interface NextTurnMonthOffsetInput {
|
||||||
|
turnTime: Date;
|
||||||
|
turnTick?: bigint | number | null;
|
||||||
|
lastExecuted: Date | null;
|
||||||
|
lastTurnTick?: bigint | number | null;
|
||||||
|
turnSeconds: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
const normalizeTick = (value: bigint | number | null | undefined): bigint | null => {
|
||||||
|
if (typeof value === 'bigint') return value;
|
||||||
|
if (typeof value === 'number' && Number.isSafeInteger(value)) return BigInt(value);
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const turnBucket = (tick: bigint): bigint => {
|
||||||
|
const ticksPerTurn = BigInt(GAME_TICKS_PER_TURN);
|
||||||
|
const quotient = tick / ticksPerTurn;
|
||||||
|
return tick % ticksPerTurn < 0 ? quotient - 1n : quotient;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ref Command.GetReservedCommand cuts both clocks to a gameplay-turn bucket.
|
||||||
|
* A general in the next bucket has already acted in the displayed world month,
|
||||||
|
* so the first reserved command belongs to the following month.
|
||||||
|
*/
|
||||||
|
export const resolveNextTurnMonthOffset = (input: NextTurnMonthOffsetInput): 0 | 1 => {
|
||||||
|
const turnTick = normalizeTick(input.turnTick);
|
||||||
|
const lastTurnTick = normalizeTick(input.lastTurnTick);
|
||||||
|
if (turnTick !== null && lastTurnTick !== null) {
|
||||||
|
return turnBucket(turnTick) > turnBucket(lastTurnTick) ? 1 : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
const turnTimeMs = input.turnTime.getTime();
|
||||||
|
const lastExecutedMs = input.lastExecuted?.getTime() ?? Number.NaN;
|
||||||
|
if (!Number.isFinite(turnTimeMs) || !Number.isFinite(lastExecutedMs) || input.turnSeconds <= 0) return 0;
|
||||||
|
return turnTimeMs >= lastExecutedMs + input.turnSeconds * 1_000 ? 1 : 0;
|
||||||
|
};
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { describe, expect, it } from 'vitest';
|
|||||||
import {
|
import {
|
||||||
resolveGeneralTypeCall,
|
resolveGeneralTypeCall,
|
||||||
resolveLeadershipBonus,
|
resolveLeadershipBonus,
|
||||||
|
resolveNextTurnMonthOffset,
|
||||||
resolveRefreshScoreText,
|
resolveRefreshScoreText,
|
||||||
resolveRemainingMinutes,
|
resolveRemainingMinutes,
|
||||||
} from '../src/services/generalBasicCardProjection.js';
|
} from '../src/services/generalBasicCardProjection.js';
|
||||||
@@ -41,4 +42,55 @@ describe('general basic card Ref projection', () => {
|
|||||||
expect(resolveRemainingMinutes(new Date('2026-08-12T23:59:00.000Z'), lastExecuted, 3_600)).toBe(59);
|
expect(resolveRemainingMinutes(new Date('2026-08-12T23:59:00.000Z'), lastExecuted, 3_600)).toBe(59);
|
||||||
expect(resolveRemainingMinutes(new Date('2026-08-13T00:07:06.000Z'), null, 3_600)).toBeNull();
|
expect(resolveRemainingMinutes(new Date('2026-08-13T00:07:06.000Z'), null, 3_600)).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('moves the first reserved month only after the general turn bucket has passed', () => {
|
||||||
|
const lastExecuted = new Date('2026-08-13T00:00:00.000Z');
|
||||||
|
const lastTurnTick = 36_000_000n * 11n;
|
||||||
|
|
||||||
|
expect(
|
||||||
|
resolveNextTurnMonthOffset({
|
||||||
|
turnTime: new Date('2026-08-13T00:07:00.000Z'),
|
||||||
|
turnTick: lastTurnTick + 12_000_000n,
|
||||||
|
lastExecuted,
|
||||||
|
lastTurnTick,
|
||||||
|
turnSeconds: 600,
|
||||||
|
})
|
||||||
|
).toBe(0);
|
||||||
|
expect(
|
||||||
|
resolveNextTurnMonthOffset({
|
||||||
|
turnTime: new Date('2026-08-13T00:17:00.000Z'),
|
||||||
|
turnTick: lastTurnTick + 48_000_000n,
|
||||||
|
lastExecuted,
|
||||||
|
lastTurnTick,
|
||||||
|
turnSeconds: 600,
|
||||||
|
})
|
||||||
|
).toBe(1);
|
||||||
|
expect(
|
||||||
|
resolveNextTurnMonthOffset({
|
||||||
|
turnTime: new Date('2026-08-13T00:10:00.000Z'),
|
||||||
|
turnTick: 1n,
|
||||||
|
lastExecuted,
|
||||||
|
lastTurnTick: -1n,
|
||||||
|
turnSeconds: 600,
|
||||||
|
})
|
||||||
|
).toBe(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the same boundary for legacy Date-only schedules', () => {
|
||||||
|
const lastExecuted = new Date('2026-08-13T00:00:00.000Z');
|
||||||
|
expect(
|
||||||
|
resolveNextTurnMonthOffset({
|
||||||
|
turnTime: new Date('2026-08-13T00:07:00.000Z'),
|
||||||
|
lastExecuted,
|
||||||
|
turnSeconds: 600,
|
||||||
|
})
|
||||||
|
).toBe(0);
|
||||||
|
expect(
|
||||||
|
resolveNextTurnMonthOffset({
|
||||||
|
turnTime: new Date('2026-08-13T00:10:00.000Z'),
|
||||||
|
lastExecuted,
|
||||||
|
turnSeconds: 600,
|
||||||
|
})
|
||||||
|
).toBe(1);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ type NavigationFixture = {
|
|||||||
operations: string[];
|
operations: string[];
|
||||||
generalName?: string;
|
generalName?: string;
|
||||||
generalTurnTime?: string;
|
generalTurnTime?: string;
|
||||||
|
nextTurnMonthOffset?: 0 | 1;
|
||||||
serverTime?: string;
|
serverTime?: string;
|
||||||
serverWallTime?: string;
|
serverWallTime?: string;
|
||||||
clockMode?: 'realtime' | 'manual';
|
clockMode?: 'realtime' | 'manual';
|
||||||
@@ -440,6 +441,7 @@ const generalContext = (state: NavigationFixture) => ({
|
|||||||
crewTypeName: '보병',
|
crewTypeName: '보병',
|
||||||
traits: { personal: '대담', specialDomestic: '상재', specialWar: '무쌍' },
|
traits: { personal: '대담', specialDomestic: '상재', specialWar: '무쌍' },
|
||||||
turnTime: state.generalTurnTime ?? '0185-01-01T00:00:00.000Z',
|
turnTime: state.generalTurnTime ?? '0185-01-01T00:00:00.000Z',
|
||||||
|
nextTurnMonthOffset: state.nextTurnMonthOffset ?? 0,
|
||||||
},
|
},
|
||||||
city: {
|
city: {
|
||||||
id: 1,
|
id: 1,
|
||||||
@@ -1188,7 +1190,7 @@ test('desktop menus preserve ref columns, prefix-safe routes, and controlled dro
|
|||||||
await expect(page.locator('.legacy-game-info')).toContainText('현재: 185년 1월');
|
await expect(page.locator('.legacy-game-info')).toContainText('현재: 185년 1월');
|
||||||
await expect(page.locator('.legacy-game-info')).toContainText('턴: 10분');
|
await expect(page.locator('.legacy-game-info')).toContainText('턴: 10분');
|
||||||
await expect(page.locator('.legacy-game-info')).not.toContainText('최근 턴:');
|
await expect(page.locator('.legacy-game-info')).not.toContainText('최근 턴:');
|
||||||
await expect(page.locator('.execution-status')).toHaveText('동작 시각: 08-13 09:05');
|
await expect(page.locator('.execution-status')).toHaveText('현재 시각: 08-13 09:00');
|
||||||
await expect(page.locator('.tournament-status')).toHaveText('토너먼트: 참가 모집중');
|
await expect(page.locator('.tournament-status')).toHaveText('토너먼트: 참가 모집중');
|
||||||
await expect(page.locator('.vote-status')).toHaveText('설문: 메뉴 설문');
|
await expect(page.locator('.vote-status')).toHaveText('설문: 메뉴 설문');
|
||||||
const headerStatusGeometry = await page.locator('.main-page').evaluate((element) => {
|
const headerStatusGeometry = await page.locator('.main-page').evaluate((element) => {
|
||||||
@@ -1623,6 +1625,105 @@ test('the repeated bottom global menu opens upward on the mobile document', asyn
|
|||||||
await persistArtifact(page, `${basePath.slice(1)}-mobile-bottom-dropup`);
|
await persistArtifact(page, `${basePath.slice(1)}-mobile-bottom-dropup`);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('first reserved month crosses December only after the general turn has passed', async ({ page }, testInfo) => {
|
||||||
|
const state: NavigationFixture = {
|
||||||
|
officerLevel: 0,
|
||||||
|
permission: 0,
|
||||||
|
nationLevel: 0,
|
||||||
|
stage: 0,
|
||||||
|
npcMode: 1,
|
||||||
|
generalMeCalls: 0,
|
||||||
|
operations: [],
|
||||||
|
currentYear: 179,
|
||||||
|
currentMonth: 12,
|
||||||
|
nextTurnMonthOffset: 0,
|
||||||
|
validMapImages: true,
|
||||||
|
reservedTurns: [
|
||||||
|
{ index: 0, action: '휴식', args: {} },
|
||||||
|
{ index: 1, action: '휴식', args: {} },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
await installRealtimeHarness(page);
|
||||||
|
await installFixture(page, state);
|
||||||
|
await page.setViewportSize({ width: 1200, height: 900 });
|
||||||
|
await waitForMain(page);
|
||||||
|
await waitForMainRealtime(page);
|
||||||
|
|
||||||
|
const map = page.locator('[data-main-target="map"] .map-viewer').first();
|
||||||
|
const commandPanel = page.locator('[data-main-target="commands"]').first();
|
||||||
|
const firstDate = commandPanel.locator('.date-column [data-turn-index="0"]');
|
||||||
|
const secondDate = commandPanel.locator('.date-column [data-turn-index="1"]');
|
||||||
|
|
||||||
|
await expect(map).toContainText('179年 12月');
|
||||||
|
await expect(firstDate).toHaveText('179年 12月');
|
||||||
|
await expect(secondDate).toHaveText('180年 1月');
|
||||||
|
const before = await firstDate.evaluate((element) => {
|
||||||
|
const rect = element.getBoundingClientRect();
|
||||||
|
const style = getComputedStyle(element);
|
||||||
|
return {
|
||||||
|
rect: rect.toJSON(),
|
||||||
|
fontSize: style.fontSize,
|
||||||
|
lineHeight: style.lineHeight,
|
||||||
|
color: style.color,
|
||||||
|
documentScrollWidth: document.documentElement.scrollWidth,
|
||||||
|
viewportWidth: window.innerWidth,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
await commandPanel.screenshot({ path: testInfo.outputPath('turn-month-before.png') });
|
||||||
|
|
||||||
|
state.nextTurnMonthOffset = 1;
|
||||||
|
state.contextRevision = 'BBBBBBBBBBBBBBBBBBBBBB';
|
||||||
|
state.contextOperations = [{ op: 'replace', path: '/general/nextTurnMonthOffset', value: 1 }];
|
||||||
|
await emitReadModelInvalidation(page, readModelInvalidation({ context: true }));
|
||||||
|
|
||||||
|
await expect(map).toContainText('179年 12月');
|
||||||
|
await expect(firstDate).toHaveText('180年 1月');
|
||||||
|
await expect(secondDate).toHaveText('180年 2月');
|
||||||
|
await firstDate.hover();
|
||||||
|
const after = await firstDate.evaluate((element) => {
|
||||||
|
const rect = element.getBoundingClientRect();
|
||||||
|
const style = getComputedStyle(element);
|
||||||
|
return {
|
||||||
|
rect: rect.toJSON(),
|
||||||
|
fontSize: style.fontSize,
|
||||||
|
lineHeight: style.lineHeight,
|
||||||
|
color: style.color,
|
||||||
|
documentScrollWidth: document.documentElement.scrollWidth,
|
||||||
|
viewportWidth: window.innerWidth,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
expect(after.rect.width).toBe(before.rect.width);
|
||||||
|
expect(after.rect.height).toBe(before.rect.height);
|
||||||
|
expect(after.rect.left).toBe(before.rect.left);
|
||||||
|
expect(after.rect.right).toBe(before.rect.right);
|
||||||
|
expect(after.fontSize).toBe(before.fontSize);
|
||||||
|
expect(after.lineHeight).toBe(before.lineHeight);
|
||||||
|
expect(after.color).toBe(before.color);
|
||||||
|
expect(before.documentScrollWidth).toBe(before.viewportWidth);
|
||||||
|
expect(after.documentScrollWidth).toBe(after.viewportWidth);
|
||||||
|
await commandPanel.screenshot({ path: testInfo.outputPath('turn-month-after.png') });
|
||||||
|
|
||||||
|
await page.setViewportSize({ width: 390, height: 844 });
|
||||||
|
await firstDate.scrollIntoViewIfNeeded();
|
||||||
|
await expect(firstDate).toHaveText('180年 1月');
|
||||||
|
const mobile = await firstDate.evaluate((element) => {
|
||||||
|
const rect = element.getBoundingClientRect();
|
||||||
|
const style = getComputedStyle(element);
|
||||||
|
return {
|
||||||
|
rect: rect.toJSON(),
|
||||||
|
fontSize: style.fontSize,
|
||||||
|
lineHeight: style.lineHeight,
|
||||||
|
documentScrollWidth: document.documentElement.scrollWidth,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
expect(mobile.rect.left).toBeGreaterThanOrEqual(0);
|
||||||
|
expect(mobile.rect.right).toBeLessThanOrEqual(500);
|
||||||
|
expect(mobile.fontSize).toBe(before.fontSize);
|
||||||
|
expect(mobile.lineHeight).toBe(before.lineHeight);
|
||||||
|
expect(mobile.documentScrollWidth).toBe(500);
|
||||||
|
await commandPanel.screenshot({ path: testInfo.outputPath('turn-month-mobile.png') });
|
||||||
|
});
|
||||||
|
|
||||||
test('main general card uses local turn time and command clock tracks corrected server time', async ({ page }) => {
|
test('main general card uses local turn time and command clock tracks corrected server time', async ({ page }) => {
|
||||||
const state: NavigationFixture = {
|
const state: NavigationFixture = {
|
||||||
officerLevel: 0,
|
officerLevel: 0,
|
||||||
@@ -1793,6 +1894,89 @@ test('main general card uses local turn time and command clock tracks corrected
|
|||||||
expect(state.operations).toHaveLength(operationsBeforePreopenBoundary);
|
expect(state.operations).toHaveLength(operationsBeforePreopenBoundary);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('main header clock follows minute boundaries only while game-server contact is recent', async ({
|
||||||
|
page,
|
||||||
|
}, testInfo) => {
|
||||||
|
const state: NavigationFixture = {
|
||||||
|
officerLevel: 0,
|
||||||
|
permission: 0,
|
||||||
|
nationLevel: 0,
|
||||||
|
stage: 0,
|
||||||
|
npcMode: 1,
|
||||||
|
generalMeCalls: 0,
|
||||||
|
operations: [],
|
||||||
|
serverTime: '2026-08-13T00:00:35.000Z',
|
||||||
|
serverWallTime: '2026-08-13T00:00:00.000Z',
|
||||||
|
clockMode: 'realtime',
|
||||||
|
clockRunning: true,
|
||||||
|
};
|
||||||
|
await installRealtimeHarness(page);
|
||||||
|
await installFixture(page, state);
|
||||||
|
await page.clock.install({ time: new Date('2026-08-13T00:00:00.000Z') });
|
||||||
|
await page.setViewportSize({ width: 1200, height: 900 });
|
||||||
|
await waitForMain(page);
|
||||||
|
await waitForMainRealtime(page);
|
||||||
|
|
||||||
|
const clock = page.locator('.execution-status');
|
||||||
|
const initialRequestCount = state.trpcRequests?.length ?? 0;
|
||||||
|
await expect(clock).toHaveText('현재 시각: 08-13 09:00');
|
||||||
|
await expect(clock).not.toHaveClass(/execution-status--stale/u);
|
||||||
|
|
||||||
|
await page.clock.runFor(25_000);
|
||||||
|
await expect(clock).toHaveText('현재 시각: 08-13 09:01');
|
||||||
|
|
||||||
|
await page.clock.runFor(21_000);
|
||||||
|
await expect(clock).toHaveClass(/execution-status--stale/u);
|
||||||
|
await expect(clock).toHaveAttribute('title', '최근 45초 동안 서버 통신이 없어 시각 갱신을 멈췄습니다.');
|
||||||
|
await expect.poll(() => clock.evaluate((element) => getComputedStyle(element).color)).toBe('rgb(255, 0, 255)');
|
||||||
|
const staleDesktopGeometry = await clock.evaluate((element) => ({
|
||||||
|
rect: element.getBoundingClientRect().toJSON(),
|
||||||
|
overflow: element.scrollWidth - element.clientWidth,
|
||||||
|
color: getComputedStyle(element).color,
|
||||||
|
fontSize: getComputedStyle(element).fontSize,
|
||||||
|
lineHeight: getComputedStyle(element).lineHeight,
|
||||||
|
}));
|
||||||
|
expect(staleDesktopGeometry.rect.width).toBeCloseTo(333.33, 0);
|
||||||
|
expect(staleDesktopGeometry.rect.height).toBeGreaterThanOrEqual(36);
|
||||||
|
expect(staleDesktopGeometry.overflow).toBeLessThanOrEqual(0);
|
||||||
|
await clock.screenshot({ path: testInfo.outputPath('main-header-clock-stale-desktop-1200.png') });
|
||||||
|
await page.clock.runFor(60_000);
|
||||||
|
await expect(clock).toHaveText('현재 시각: 08-13 09:01');
|
||||||
|
|
||||||
|
await page.evaluate(() => {
|
||||||
|
(window as unknown as { __emitMainRealtime: (type: string, value: unknown) => void }).__emitMainRealtime(
|
||||||
|
'ping',
|
||||||
|
{}
|
||||||
|
);
|
||||||
|
});
|
||||||
|
await expect(clock).toHaveText('현재 시각: 08-13 09:02');
|
||||||
|
await expect(clock).not.toHaveClass(/execution-status--stale/u);
|
||||||
|
await page.clock.runFor(39_000);
|
||||||
|
await expect(clock).toHaveText('현재 시각: 08-13 09:03');
|
||||||
|
await expect.poll(() => clock.evaluate((element) => getComputedStyle(element).color)).toBe('rgb(0, 255, 255)');
|
||||||
|
|
||||||
|
await page.setViewportSize({ width: 500, height: 900 });
|
||||||
|
const freshMobileGeometry = await clock.evaluate((element) => ({
|
||||||
|
rect: element.getBoundingClientRect().toJSON(),
|
||||||
|
overflow: element.scrollWidth - element.clientWidth,
|
||||||
|
color: getComputedStyle(element).color,
|
||||||
|
fontSize: getComputedStyle(element).fontSize,
|
||||||
|
lineHeight: getComputedStyle(element).lineHeight,
|
||||||
|
documentScrollWidth: document.documentElement.scrollWidth,
|
||||||
|
}));
|
||||||
|
expect(freshMobileGeometry.rect.width).toBeCloseTo(166.67, 0);
|
||||||
|
expect(freshMobileGeometry.overflow).toBeLessThanOrEqual(0);
|
||||||
|
expect(freshMobileGeometry.documentScrollWidth).toBe(500);
|
||||||
|
await Promise.all([
|
||||||
|
clock.screenshot({ path: testInfo.outputPath('main-header-clock-fresh-mobile-500.png') }),
|
||||||
|
writeFile(
|
||||||
|
testInfo.outputPath('main-header-clock-geometry.json'),
|
||||||
|
`${JSON.stringify({ staleDesktopGeometry, freshMobileGeometry }, null, 2)}\n`
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
expect(state.trpcRequests?.length ?? 0).toBe(initialRequestCount);
|
||||||
|
});
|
||||||
|
|
||||||
test('message targets keep reply behavior and use nation-color contrast in labels and select options', async ({
|
test('message targets keep reply behavior and use nation-color contrast in labels and select options', async ({
|
||||||
page,
|
page,
|
||||||
}) => {
|
}) => {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { computed, onUnmounted, ref, watch } from 'vue';
|
|||||||
import { addMinutes } from 'date-fns';
|
import { addMinutes } from 'date-fns';
|
||||||
import ReservedCommandEditor from '../command/ReservedCommandEditor.vue';
|
import ReservedCommandEditor from '../command/ReservedCommandEditor.vue';
|
||||||
import { formatLocalDateTime, formatLocalTimeSeconds } from '../../utils/legacyDateTime';
|
import { formatLocalDateTime, formatLocalTimeSeconds } from '../../utils/legacyDateTime';
|
||||||
|
import { projectServerClock, sampleServerClock, type SampledServerClock } from '../../utils/serverClockProjection';
|
||||||
import type {
|
import type {
|
||||||
CommandMapData,
|
CommandMapData,
|
||||||
CommandMapLayout,
|
CommandMapLayout,
|
||||||
@@ -15,7 +16,7 @@ const props = defineProps<{
|
|||||||
commandTable: CommandTable | null;
|
commandTable: CommandTable | null;
|
||||||
loading: boolean;
|
loading: boolean;
|
||||||
reservedGeneralTurns: Array<{ index: number; action: string; args?: unknown }> | null;
|
reservedGeneralTurns: Array<{ index: number; action: string; args?: unknown }> | null;
|
||||||
general: { id: number; turnTime?: string } | null;
|
general: { id: number; turnTime?: string; nextTurnMonthOffset?: 0 | 1 } | null;
|
||||||
currentYear?: number;
|
currentYear?: number;
|
||||||
currentMonth?: number;
|
currentMonth?: number;
|
||||||
turnTermMinutes?: number;
|
turnTermMinutes?: number;
|
||||||
@@ -44,13 +45,19 @@ const labelMap = computed(() => {
|
|||||||
return result;
|
return result;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const firstReservedMonth = computed(
|
||||||
|
() =>
|
||||||
|
(props.currentYear ?? 0) * 12 +
|
||||||
|
(props.currentMonth ?? 1) -
|
||||||
|
1 +
|
||||||
|
(props.general?.nextTurnMonthOffset ?? 0)
|
||||||
|
);
|
||||||
|
|
||||||
const rows = computed<ReservedCommandRow[]>(() => {
|
const rows = computed<ReservedCommandRow[]>(() => {
|
||||||
const base = props.general?.turnTime ? new Date(props.general.turnTime) : null;
|
const base = props.general?.turnTime ? new Date(props.general.turnTime) : null;
|
||||||
const term = props.turnTermMinutes ?? 0;
|
const term = props.turnTermMinutes ?? 0;
|
||||||
const baseYear = props.currentYear ?? 0;
|
|
||||||
const baseMonth = props.currentMonth ?? 1;
|
|
||||||
return (props.reservedGeneralTurns ?? []).map((turn, offset) => {
|
return (props.reservedGeneralTurns ?? []).map((turn, offset) => {
|
||||||
const absoluteMonth = baseYear * 12 + baseMonth - 1 + offset;
|
const absoluteMonth = firstReservedMonth.value + offset;
|
||||||
const date = base && Number.isFinite(base.getTime()) ? addMinutes(base, offset * term) : null;
|
const date = base && Number.isFinite(base.getTime()) ? addMinutes(base, offset * term) : null;
|
||||||
return {
|
return {
|
||||||
...turn,
|
...turn,
|
||||||
@@ -70,9 +77,7 @@ const rows = computed<ReservedCommandRow[]>(() => {
|
|||||||
|
|
||||||
const autonomousUntil = computed(() => {
|
const autonomousUntil = computed(() => {
|
||||||
if (props.autorunLimit == null) return null;
|
if (props.autorunLimit == null) return null;
|
||||||
const baseYear = props.currentYear ?? 0;
|
const currentAbsoluteMonth = firstReservedMonth.value;
|
||||||
const baseMonth = props.currentMonth ?? 1;
|
|
||||||
const currentAbsoluteMonth = baseYear * 12 + baseMonth - 1;
|
|
||||||
const lastAutonomousMonth = props.autorunLimit - 1;
|
const lastAutonomousMonth = props.autorunLimit - 1;
|
||||||
if (lastAutonomousMonth < currentAbsoluteMonth) return null;
|
if (lastAutonomousMonth < currentAbsoluteMonth) return null;
|
||||||
|
|
||||||
@@ -90,27 +95,20 @@ const autonomousUntil = computed(() => {
|
|||||||
|
|
||||||
const currentServerTime = ref('--:--:--');
|
const currentServerTime = ref('--:--:--');
|
||||||
const MAX_SERVER_CLOCK_TIMER_DELAY_MS = 60_000;
|
const MAX_SERVER_CLOCK_TIMER_DELAY_MS = 60_000;
|
||||||
let sampledServerTimeMs: number | null = null;
|
let serverClockSample: SampledServerClock | null = null;
|
||||||
let sampledClientTimeMs = 0;
|
|
||||||
let sampledStartDelayMs: number | null = 0;
|
|
||||||
let serverClockTimer: ReturnType<typeof setTimeout> | undefined;
|
let serverClockTimer: ReturnType<typeof setTimeout> | undefined;
|
||||||
|
|
||||||
const updateServerClock = () => {
|
const updateServerClock = () => {
|
||||||
if (serverClockTimer !== undefined) clearTimeout(serverClockTimer);
|
if (serverClockTimer !== undefined) clearTimeout(serverClockTimer);
|
||||||
serverClockTimer = undefined;
|
serverClockTimer = undefined;
|
||||||
if (sampledServerTimeMs === null) {
|
if (serverClockSample === null) {
|
||||||
currentServerTime.value = '--:--:--';
|
currentServerTime.value = '--:--:--';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const clientElapsedMs = Math.max(0, Date.now() - sampledClientTimeMs);
|
const { clientElapsedMs, time: projectedTime } = projectServerClock(serverClockSample);
|
||||||
const elapsedGameMs =
|
|
||||||
props.clockMode === 'manual' || sampledStartDelayMs === null
|
|
||||||
? 0
|
|
||||||
: Math.max(0, clientElapsedMs - sampledStartDelayMs);
|
|
||||||
const projectedTime = new Date(sampledServerTimeMs + elapsedGameMs);
|
|
||||||
currentServerTime.value = formatLocalTimeSeconds(projectedTime);
|
currentServerTime.value = formatLocalTimeSeconds(projectedTime);
|
||||||
if (props.clockMode !== 'manual' && sampledStartDelayMs !== null) {
|
if (serverClockSample.clockMode !== 'manual' && serverClockSample.startDelayMs !== null) {
|
||||||
const untilStartMs = sampledStartDelayMs - clientElapsedMs;
|
const untilStartMs = serverClockSample.startDelayMs - clientElapsedMs;
|
||||||
serverClockTimer = setTimeout(
|
serverClockTimer = setTimeout(
|
||||||
updateServerClock,
|
updateServerClock,
|
||||||
untilStartMs > 0
|
untilStartMs > 0
|
||||||
@@ -123,21 +121,7 @@ const updateServerClock = () => {
|
|||||||
watch(
|
watch(
|
||||||
() => [props.serverTime, props.serverWallTime, props.clockMode, props.clockRunning, props.clockStartsAt] as const,
|
() => [props.serverTime, props.serverWallTime, props.clockMode, props.clockRunning, props.clockStartsAt] as const,
|
||||||
([serverTime, serverWallTime, clockMode, clockRunning, clockStartsAt]) => {
|
([serverTime, serverWallTime, clockMode, clockRunning, clockStartsAt]) => {
|
||||||
const parsed = serverTime ? new Date(serverTime).getTime() : Number.NaN;
|
serverClockSample = sampleServerClock({ serverTime, serverWallTime, clockMode, clockRunning, clockStartsAt });
|
||||||
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();
|
updateServerClock();
|
||||||
},
|
},
|
||||||
{ immediate: true }
|
{ immediate: true }
|
||||||
|
|||||||
@@ -1,10 +1,26 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { formatServerDateTime } from '@sammo-ts/common/time/ServerDateTime';
|
import { formatServerDateTime } from '@sammo-ts/common/time/ServerDateTime';
|
||||||
import { computed } from 'vue';
|
import { computed, onUnmounted, ref, watch } from 'vue';
|
||||||
import { resolveTournamentStageName } from '../../utils/tournamentStatus';
|
import { resolveTournamentStageName } from '../../utils/tournamentStatus';
|
||||||
|
import {
|
||||||
|
GAME_SERVER_ACTIVITY_FRESHNESS_MS,
|
||||||
|
gameServerActivity,
|
||||||
|
isRecentGameServerActivity,
|
||||||
|
} from '../../utils/gameServerActivity';
|
||||||
|
import {
|
||||||
|
millisecondsUntilNextMinute,
|
||||||
|
projectServerClock,
|
||||||
|
sampleServerClock,
|
||||||
|
type SampledServerClock,
|
||||||
|
} from '../../utils/serverClockProjection';
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
tournamentStage: number;
|
tournamentStage: number;
|
||||||
|
serverTime?: string;
|
||||||
|
serverWallTime?: string;
|
||||||
|
clockMode?: 'realtime' | 'manual';
|
||||||
|
clockRunning?: boolean;
|
||||||
|
clockStartsAt?: string | null;
|
||||||
status: {
|
status: {
|
||||||
onlineUserCount: number;
|
onlineUserCount: number;
|
||||||
onlineNations: string;
|
onlineNations: string;
|
||||||
@@ -20,16 +36,75 @@ const props = defineProps<{
|
|||||||
}>();
|
}>();
|
||||||
|
|
||||||
const tournamentStatus = computed(() => resolveTournamentStageName(props.tournamentStage));
|
const tournamentStatus = computed(() => resolveTournamentStageName(props.tournamentStage));
|
||||||
const lastExecutedStatus = computed(() =>
|
const currentServerTime = ref('기록 없음');
|
||||||
formatServerDateTime(props.status?.lastExecuted, { format: 'monthDayTime', fallback: '기록 없음' })
|
const hasServerClock = ref(false);
|
||||||
|
const serverClockFresh = ref(false);
|
||||||
|
const serverClockTitle = computed(() => {
|
||||||
|
if (!hasServerClock.value) return '서버 시각을 아직 받지 못했습니다.';
|
||||||
|
if (!serverClockFresh.value) return '최근 45초 동안 서버 통신이 없어 시각 갱신을 멈췄습니다.';
|
||||||
|
return undefined;
|
||||||
|
});
|
||||||
|
|
||||||
|
let serverClockSample: SampledServerClock | null = null;
|
||||||
|
let serverClockTimer: ReturnType<typeof setTimeout> | undefined;
|
||||||
|
|
||||||
|
const updateServerClock = () => {
|
||||||
|
if (serverClockTimer !== undefined) clearTimeout(serverClockTimer);
|
||||||
|
serverClockTimer = undefined;
|
||||||
|
if (serverClockSample === null) {
|
||||||
|
currentServerTime.value = '기록 없음';
|
||||||
|
hasServerClock.value = false;
|
||||||
|
serverClockFresh.value = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const now = Date.now();
|
||||||
|
const projection = projectServerClock(serverClockSample, now);
|
||||||
|
currentServerTime.value = formatServerDateTime(projection.time, {
|
||||||
|
format: 'monthDayTime',
|
||||||
|
fallback: '기록 없음',
|
||||||
|
});
|
||||||
|
hasServerClock.value = true;
|
||||||
|
|
||||||
|
const lastContactAt = gameServerActivity.lastContactAt.value;
|
||||||
|
serverClockFresh.value = isRecentGameServerActivity(lastContactAt, now);
|
||||||
|
if (!serverClockFresh.value || lastContactAt === null) return;
|
||||||
|
|
||||||
|
const nextDelays = [lastContactAt + GAME_SERVER_ACTIVITY_FRESHNESS_MS - now + 1];
|
||||||
|
if (serverClockSample.clockMode !== 'manual' && serverClockSample.startDelayMs !== null) {
|
||||||
|
const untilStartMs = serverClockSample.startDelayMs - projection.clientElapsedMs;
|
||||||
|
nextDelays.push(untilStartMs > 0 ? untilStartMs : millisecondsUntilNextMinute(projection.time));
|
||||||
|
}
|
||||||
|
serverClockTimer = setTimeout(updateServerClock, Math.max(1, Math.min(...nextDelays)));
|
||||||
|
};
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => [props.serverTime, props.serverWallTime, props.clockMode, props.clockRunning, props.clockStartsAt] as const,
|
||||||
|
([serverTime, serverWallTime, clockMode, clockRunning, clockStartsAt]) => {
|
||||||
|
serverClockSample = sampleServerClock({ serverTime, serverWallTime, clockMode, clockRunning, clockStartsAt });
|
||||||
|
updateServerClock();
|
||||||
|
},
|
||||||
|
{ immediate: true }
|
||||||
);
|
);
|
||||||
|
watch(() => gameServerActivity.lastContactAt.value, updateServerClock);
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (serverClockTimer !== undefined) clearTimeout(serverClockTimer);
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<section class="front-status" aria-label="접속 현황과 국가 방침">
|
<section class="front-status" aria-label="접속 현황과 국가 방침">
|
||||||
<div class="activity-status" aria-label="동작 시각, 토너먼트와 설문 진행 현황">
|
<div class="activity-status" aria-label="현재 시각, 토너먼트와 설문 진행 현황">
|
||||||
<div class="status-row execution-status" :class="{ 'execution-status--empty': !status?.lastExecuted }">
|
<div
|
||||||
동작 시각: {{ lastExecutedStatus }}
|
class="status-row execution-status"
|
||||||
|
:class="{
|
||||||
|
'execution-status--empty': !hasServerClock,
|
||||||
|
'execution-status--stale': hasServerClock && !serverClockFresh,
|
||||||
|
}"
|
||||||
|
:title="serverClockTitle"
|
||||||
|
>
|
||||||
|
현재 시각: {{ currentServerTime }}
|
||||||
</div>
|
</div>
|
||||||
<div class="status-row tournament-status">
|
<div class="status-row tournament-status">
|
||||||
<RouterLink to="/tournament">
|
<RouterLink to="/tournament">
|
||||||
@@ -120,6 +195,10 @@ const lastExecutedStatus = computed(() =>
|
|||||||
color: magenta;
|
color: magenta;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.execution-status--stale {
|
||||||
|
color: magenta;
|
||||||
|
}
|
||||||
|
|
||||||
.vote-label {
|
.vote-label {
|
||||||
color: cyan;
|
color: cyan;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import {
|
|||||||
import { createBroadcastTabCoordinator, type BroadcastTabCoordinator } from '../utils/broadcastTabCoordinator';
|
import { createBroadcastTabCoordinator, type BroadcastTabCoordinator } from '../utils/broadcastTabCoordinator';
|
||||||
import { resolveWithReadModelSnapshotFallback } from '../utils/readModelDeltaRecovery';
|
import { resolveWithReadModelSnapshotFallback } from '../utils/readModelDeltaRecovery';
|
||||||
import { createRealtimeRequestOptions } from '../utils/realtimeAccessGrant';
|
import { createRealtimeRequestOptions } from '../utils/realtimeAccessGrant';
|
||||||
|
import { markGameServerContact } from '../utils/gameServerActivity';
|
||||||
|
|
||||||
const REALTIME_FULL_REFRESH_MIN_INTERVAL_MS = 5_000;
|
const REALTIME_FULL_REFRESH_MIN_INTERVAL_MS = 5_000;
|
||||||
|
|
||||||
@@ -1097,10 +1098,12 @@ export const useMainDashboardStore = defineStore('mainDashboard', () => {
|
|||||||
onPayload: (message) => {
|
onPayload: (message) => {
|
||||||
if (!isRealtimeParticipant()) return;
|
if (!isRealtimeParticipant()) return;
|
||||||
if (message.kind === 'patch') {
|
if (message.kind === 'patch') {
|
||||||
|
markGameServerContact();
|
||||||
applyDashboardPatch(message.patch);
|
applyDashboardPatch(message.patch);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
realtimeStatus.value = message.status;
|
realtimeStatus.value = message.status;
|
||||||
|
if (message.status === 'connected') markGameServerContact();
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
realtimeCoordinator.start();
|
realtimeCoordinator.start();
|
||||||
@@ -1153,6 +1156,7 @@ export const useMainDashboardStore = defineStore('mainDashboard', () => {
|
|||||||
realtimeSource = source;
|
realtimeSource = source;
|
||||||
|
|
||||||
source.addEventListener('open', () => {
|
source.addEventListener('open', () => {
|
||||||
|
markGameServerContact();
|
||||||
realtimeStatus.value = 'connected';
|
realtimeStatus.value = 'connected';
|
||||||
realtimeCoordinator?.postFromLeader({ kind: 'status', status: 'connected' });
|
realtimeCoordinator?.postFromLeader({ kind: 'status', status: 'connected' });
|
||||||
});
|
});
|
||||||
@@ -1166,6 +1170,7 @@ export const useMainDashboardStore = defineStore('mainDashboard', () => {
|
|||||||
if (!payload || payload.type !== 'readModelInvalidated') {
|
if (!payload || payload.type !== 'readModelInvalidated') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
markGameServerContact();
|
||||||
readModelRefreshQueue.request(payload.invalidation, payload.refreshGrant);
|
readModelRefreshQueue.request(payload.invalidation, payload.refreshGrant);
|
||||||
});
|
});
|
||||||
source.addEventListener('messagesInvalidated', (event) => {
|
source.addEventListener('messagesInvalidated', (event) => {
|
||||||
@@ -1174,6 +1179,7 @@ export const useMainDashboardStore = defineStore('mainDashboard', () => {
|
|||||||
if (!payload || payload.type !== 'messagesInvalidated') {
|
if (!payload || payload.type !== 'messagesInvalidated') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
markGameServerContact();
|
||||||
void refreshMessages(payload.refreshGrant);
|
void refreshMessages(payload.refreshGrant);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1182,14 +1188,17 @@ export const useMainDashboardStore = defineStore('mainDashboard', () => {
|
|||||||
for (const legacyEventType of ['turnCompleted', 'readModelChanged'] as const) {
|
for (const legacyEventType of ['turnCompleted', 'readModelChanged'] as const) {
|
||||||
source.addEventListener(legacyEventType, () => {
|
source.addEventListener(legacyEventType, () => {
|
||||||
if (realtimeCoordinator !== null && !realtimeCoordinator.isLeader()) return;
|
if (realtimeCoordinator !== null && !realtimeCoordinator.isLeader()) return;
|
||||||
|
markGameServerContact();
|
||||||
realtimeRefreshQueue.request();
|
realtimeRefreshQueue.request();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
source.addEventListener('messageCreated', () => {
|
source.addEventListener('messageCreated', () => {
|
||||||
if (realtimeCoordinator !== null && !realtimeCoordinator.isLeader()) return;
|
if (realtimeCoordinator !== null && !realtimeCoordinator.isLeader()) return;
|
||||||
|
markGameServerContact();
|
||||||
void refreshMessages();
|
void refreshMessages();
|
||||||
});
|
});
|
||||||
source.addEventListener('ping', () => {
|
source.addEventListener('ping', () => {
|
||||||
|
markGameServerContact();
|
||||||
if (realtimeEnabled.value) {
|
if (realtimeEnabled.value) {
|
||||||
realtimeStatus.value = 'connected';
|
realtimeStatus.value = 'connected';
|
||||||
realtimeCoordinator?.postFromLeader({ kind: 'status', status: 'connected' });
|
realtimeCoordinator?.postFromLeader({ kind: 'status', status: 'connected' });
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
import { readonly, ref, type Ref } from 'vue';
|
||||||
|
|
||||||
|
export const GAME_SERVER_ACTIVITY_FRESHNESS_MS = 45_000;
|
||||||
|
|
||||||
|
export type GameServerActivityTracker = {
|
||||||
|
lastContactAt: Readonly<Ref<number | null>>;
|
||||||
|
markContact: (contactAt?: number) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const createGameServerActivityTracker = (): GameServerActivityTracker => {
|
||||||
|
const lastContactAt = ref<number | null>(null);
|
||||||
|
|
||||||
|
return {
|
||||||
|
lastContactAt: readonly(lastContactAt),
|
||||||
|
markContact(contactAt = Date.now()) {
|
||||||
|
if (!Number.isFinite(contactAt)) return;
|
||||||
|
lastContactAt.value = contactAt;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export const isRecentGameServerActivity = (
|
||||||
|
lastContactAt: number | null,
|
||||||
|
now = Date.now(),
|
||||||
|
freshnessMs = GAME_SERVER_ACTIVITY_FRESHNESS_MS
|
||||||
|
): boolean =>
|
||||||
|
lastContactAt !== null &&
|
||||||
|
Number.isFinite(lastContactAt) &&
|
||||||
|
Number.isFinite(now) &&
|
||||||
|
Math.max(0, now - lastContactAt) <= freshnessMs;
|
||||||
|
|
||||||
|
export const gameServerActivity = createGameServerActivityTracker();
|
||||||
|
|
||||||
|
export const markGameServerContact = (contactAt = Date.now()) => gameServerActivity.markContact(contactAt);
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
export type ServerClockProjectionInput = {
|
||||||
|
serverTime?: string;
|
||||||
|
serverWallTime?: string;
|
||||||
|
clockMode?: 'realtime' | 'manual';
|
||||||
|
clockRunning?: boolean;
|
||||||
|
clockStartsAt?: string | null;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type SampledServerClock = {
|
||||||
|
serverTimeMs: number;
|
||||||
|
sampledClientTimeMs: number;
|
||||||
|
clockMode: 'realtime' | 'manual';
|
||||||
|
startDelayMs: number | null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const parseInstant = (value?: string | null): number | null => {
|
||||||
|
if (!value) return null;
|
||||||
|
const parsed = new Date(value).getTime();
|
||||||
|
return Number.isFinite(parsed) ? parsed : null;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const sampleServerClock = (
|
||||||
|
input: ServerClockProjectionInput,
|
||||||
|
sampledClientTimeMs = Date.now()
|
||||||
|
): SampledServerClock | null => {
|
||||||
|
const serverTimeMs = parseInstant(input.serverTime);
|
||||||
|
if (serverTimeMs === null) return null;
|
||||||
|
|
||||||
|
let startDelayMs: number | null;
|
||||||
|
if (input.clockMode === 'manual') {
|
||||||
|
startDelayMs = null;
|
||||||
|
} else if (input.clockRunning !== false) {
|
||||||
|
startDelayMs = 0;
|
||||||
|
} else {
|
||||||
|
const serverWallTimeMs = parseInstant(input.serverWallTime);
|
||||||
|
const clockStartsAtMs = parseInstant(input.clockStartsAt);
|
||||||
|
startDelayMs =
|
||||||
|
serverWallTimeMs !== null && clockStartsAtMs !== null
|
||||||
|
? Math.max(0, clockStartsAtMs - serverWallTimeMs)
|
||||||
|
: null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
serverTimeMs,
|
||||||
|
sampledClientTimeMs,
|
||||||
|
clockMode: input.clockMode ?? 'realtime',
|
||||||
|
startDelayMs,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export const projectServerClock = (sample: SampledServerClock, clientTimeMs = Date.now()) => {
|
||||||
|
const clientElapsedMs = Math.max(0, clientTimeMs - sample.sampledClientTimeMs);
|
||||||
|
const elapsedGameMs =
|
||||||
|
sample.clockMode === 'manual' || sample.startDelayMs === null
|
||||||
|
? 0
|
||||||
|
: Math.max(0, clientElapsedMs - sample.startDelayMs);
|
||||||
|
|
||||||
|
return {
|
||||||
|
clientElapsedMs,
|
||||||
|
time: new Date(sample.serverTimeMs + elapsedGameMs),
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export const millisecondsUntilNextMinute = (time: Date): number => {
|
||||||
|
const remainder = ((time.getTime() % 60_000) + 60_000) % 60_000;
|
||||||
|
return remainder === 0 ? 60_000 : 60_000 - remainder;
|
||||||
|
};
|
||||||
@@ -3,6 +3,7 @@ import { REALTIME_ACCESS_GRANT_HEADER } from '@sammo-ts/common/realtime/types';
|
|||||||
import { createTRPCProxyClient, httpBatchLink } from '@trpc/client';
|
import { createTRPCProxyClient, httpBatchLink } from '@trpc/client';
|
||||||
import type { AppRouter } from '@sammo-ts/game-api';
|
import type { AppRouter } from '@sammo-ts/game-api';
|
||||||
import { resolveBatchRealtimeAccessGrant } from './realtimeAccessGrant';
|
import { resolveBatchRealtimeAccessGrant } from './realtimeAccessGrant';
|
||||||
|
import { markGameServerContact } from './gameServerActivity';
|
||||||
|
|
||||||
const getGameToken = (): string | null => {
|
const getGameToken = (): string | null => {
|
||||||
if (typeof window === 'undefined') {
|
if (typeof window === 'undefined') {
|
||||||
@@ -17,6 +18,11 @@ export const trpc = createTRPCProxyClient<AppRouter>({
|
|||||||
httpBatchLink({
|
httpBatchLink({
|
||||||
url: import.meta.env.VITE_GAME_API_URL ?? '/api/trpc',
|
url: import.meta.env.VITE_GAME_API_URL ?? '/api/trpc',
|
||||||
...trpcJsonBodyHttpClientOptions,
|
...trpcJsonBodyHttpClientOptions,
|
||||||
|
async fetch(input, init) {
|
||||||
|
const result = await globalThis.fetch(input, init);
|
||||||
|
markGameServerContact();
|
||||||
|
return result;
|
||||||
|
},
|
||||||
headers({ opList }) {
|
headers({ opList }) {
|
||||||
const token = getGameToken();
|
const token = getGameToken();
|
||||||
const refreshGrant = resolveBatchRealtimeAccessGrant(opList);
|
const refreshGrant = resolveBatchRealtimeAccessGrant(opList);
|
||||||
|
|||||||
@@ -243,7 +243,15 @@ watch(
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div data-main-target="policy">
|
<div data-main-target="policy">
|
||||||
<MainFrontStatus :status="frontStatus" :tournament-stage="tournamentStage" />
|
<MainFrontStatus
|
||||||
|
:status="frontStatus"
|
||||||
|
:tournament-stage="tournamentStage"
|
||||||
|
:server-time="lobbyInfo?.serverTime"
|
||||||
|
:server-wall-time="lobbyInfo?.serverWallTime"
|
||||||
|
:clock-mode="lobbyInfo?.clockMode"
|
||||||
|
:clock-running="lobbyInfo?.clockRunning"
|
||||||
|
:clock-starts-at="lobbyInfo?.clockStartsAt"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<aside v-if="surveyNotice" class="survey-notice" role="status" aria-live="polite">
|
<aside v-if="surveyNotice" class="survey-notice" role="status" aria-live="polite">
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import test from 'node:test';
|
||||||
|
|
||||||
|
import {
|
||||||
|
GAME_SERVER_ACTIVITY_FRESHNESS_MS,
|
||||||
|
createGameServerActivityTracker,
|
||||||
|
isRecentGameServerActivity,
|
||||||
|
} from '../src/utils/gameServerActivity.ts';
|
||||||
|
|
||||||
|
void test('keeps the most recently observed server contact timestamp', () => {
|
||||||
|
const tracker = createGameServerActivityTracker();
|
||||||
|
tracker.markContact(2_000);
|
||||||
|
tracker.markContact(1_000);
|
||||||
|
tracker.markContact(Number.NaN);
|
||||||
|
assert.equal(tracker.lastContactAt.value, 1_000);
|
||||||
|
});
|
||||||
|
|
||||||
|
void test('treats three heartbeat intervals as recent activity', () => {
|
||||||
|
assert.equal(isRecentGameServerActivity(1_000, 1_000 + GAME_SERVER_ACTIVITY_FRESHNESS_MS), true);
|
||||||
|
assert.equal(isRecentGameServerActivity(1_000, 1_001 + GAME_SERVER_ACTIVITY_FRESHNESS_MS), false);
|
||||||
|
assert.equal(isRecentGameServerActivity(null, 1_000), false);
|
||||||
|
});
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import test from 'node:test';
|
||||||
|
|
||||||
|
import {
|
||||||
|
millisecondsUntilNextMinute,
|
||||||
|
projectServerClock,
|
||||||
|
sampleServerClock,
|
||||||
|
} from '../src/utils/serverClockProjection.ts';
|
||||||
|
|
||||||
|
void test('projects a running server clock from the browser sample instant', () => {
|
||||||
|
const sample = sampleServerClock(
|
||||||
|
{
|
||||||
|
serverTime: '2026-08-13T00:00:35.250Z',
|
||||||
|
clockMode: 'realtime',
|
||||||
|
clockRunning: true,
|
||||||
|
},
|
||||||
|
10_000
|
||||||
|
);
|
||||||
|
assert.ok(sample);
|
||||||
|
assert.equal(projectServerClock(sample, 34_750).time.toISOString(), '2026-08-13T00:01:00.000Z');
|
||||||
|
assert.equal(millisecondsUntilNextMinute(projectServerClock(sample, 10_000).time), 24_750);
|
||||||
|
});
|
||||||
|
|
||||||
|
void test('keeps manual clocks fixed even while client time advances', () => {
|
||||||
|
const sample = sampleServerClock(
|
||||||
|
{ serverTime: '2026-08-13T00:00:35.000Z', clockMode: 'manual', clockRunning: false },
|
||||||
|
10_000
|
||||||
|
);
|
||||||
|
assert.ok(sample);
|
||||||
|
assert.equal(projectServerClock(sample, 130_000).time.toISOString(), '2026-08-13T00:00:35.000Z');
|
||||||
|
});
|
||||||
|
|
||||||
|
void test('holds a preopen clock until its wall-clock start delay passes', () => {
|
||||||
|
const sample = sampleServerClock(
|
||||||
|
{
|
||||||
|
serverTime: '2026-08-13T00:00:00.000Z',
|
||||||
|
serverWallTime: '2026-08-13T08:00:00.000Z',
|
||||||
|
clockMode: 'realtime',
|
||||||
|
clockRunning: false,
|
||||||
|
clockStartsAt: '2026-08-13T08:01:00.000Z',
|
||||||
|
},
|
||||||
|
10_000
|
||||||
|
);
|
||||||
|
assert.ok(sample);
|
||||||
|
assert.equal(projectServerClock(sample, 69_999).time.toISOString(), '2026-08-13T00:00:00.000Z');
|
||||||
|
assert.equal(projectServerClock(sample, 70_001).time.toISOString(), '2026-08-13T00:00:00.001Z');
|
||||||
|
});
|
||||||
|
|
||||||
|
void test('rejects an invalid server clock sample', () => {
|
||||||
|
assert.equal(sampleServerClock({ serverTime: 'not-a-time' }, 10_000), null);
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user