devsam/core2026
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(gateway): 일시정지와 서버 중지 상태 계약 분리

Browse Source
This commit is contained in:
Hide_D
2026-08-15 17:12:13 +00:00
parent dc27766dd6
commit 4f841ad82f
16 changed files with 320 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/gateway-frontend/e2e/admin-runtime-actions.spec.ts
+34 -4
View File
@@ -37,6 +37,8 @@ const installFixture = async (
initialActions?: RuntimeAction[];
afterRequestActions?: RuntimeAction[];
pendingProfileReads?: number;
profileStatus?: 'RUNNING' | 'PAUSED' | 'STOPPED';
currentScenario?: string | null;
} = {}
) => {
let requested = false;
@@ -151,7 +153,7 @@ const installFixture = async (
profileName: 'hwe:default',
profile: 'hwe',
instanceKey: 'default',
currentScenario: '1010',
currentScenario: options.currentScenario === undefined ? '1010' : options.currentScenario,
meta: {},
},
]);
@@ -163,10 +165,10 @@ const installFixture = async (
profileName: 'hwe:default',
profile: 'hwe',
instanceKey: 'default',
currentScenario: '1010',
scenario: '1010',
currentScenario: options.currentScenario === undefined ? '1010' : options.currentScenario,
scenario: options.currentScenario ?? 'default',
apiPort: 15015,
status: 'RUNNING',
status: options.profileStatus ?? 'RUNNING',
buildStatus: 'SUCCEEDED',
meta: {},
activeOperation: installActive
@@ -286,6 +288,34 @@ test('reports clock-shift acceptance separately from actual application', async
await expect(page.getByText('설문 생성은 해당 게임의 설문 관리 화면에서 진행해 주세요.')).toBeVisible();
});
test('distinguishes a turn pause from an inaccessible stopped server in operator controls', async ({ page }) => {
await installFixture(page, { profileStatus: 'PAUSED' });
await page.goto('/gateway/admin/servers/hwe%3Adefault');
await expect(page.getByTestId('profile-lifecycle-description')).toContainText('게임 조회와 예약턴 입력 가능');
await expect(page.getByRole('button', { name: '턴 재개' })).toBeEnabled();
await expect(page.getByRole('button', { name: '일시정지' })).toBeDisabled();
await expect(page.getByRole('button', { name: '중지', exact: true })).toBeEnabled();
});
test('shows an initialized STOPPED server as inaccessible and only restartable', async ({ page }) => {
await installFixture(page, { profileStatus: 'STOPPED' });
await page.goto('/gateway/admin/servers/hwe%3Adefault');
await expect(page.getByTestId('profile-lifecycle-description')).toContainText('게임 접근 불가');
await expect(page.getByRole('button', { name: '서버 재개' })).toBeEnabled();
await expect(page.getByRole('button', { name: '일시정지' })).toBeDisabled();
await expect(page.getByRole('button', { name: '중지', exact: true })).toBeDisabled();
});
test('separates an uninitialized database from an initialized stopped server', async ({ page }) => {
await installFixture(page, { profileStatus: 'STOPPED', currentScenario: null });
await page.goto('/gateway/admin/servers/hwe%3Adefault');
await expect(page.getByTestId('profile-lifecycle-description')).toHaveText('DB 초기화 전 · 게임 접근 불가');
await expect(page.getByRole('button', { name: '서버 재개' })).toBeDisabled();
});
test('blocks another clock shift while any recent action is pending', async ({ page }) => {
await installFixture(page, {
initialActions: [
app/gateway-frontend/e2e/lobby-game-auth.spec.ts
+24 -2
View File
@@ -53,7 +53,7 @@ type LobbyFixtureOptions = {
opentime?: string;
turntime?: string;
lobbyBundleFailures?: number;
profileStatus?: 'RUNNING' | 'PREOPEN' | 'PAUSED' | 'COMPLETED';
profileStatus?: 'RUNNING' | 'PREOPEN' | 'PAUSED' | 'COMPLETED' | 'STOPPED';
};
const installFixture = async (page: Page, options: LobbyFixtureOptions = {}) => {
@@ -112,8 +112,17 @@ const installFixture = async (page: Page, options: LobbyFixtureOptions = {}) =>
{
profileName: 'hwe:903',
profile: 'hwe',
instanceKey: '903',
currentScenario: '903',
scenario: '903',
status: profileStatus,
lifecycle: {
runtimeExpected: profileStatus !== 'STOPPED',
userAccessible: profileStatus !== 'STOPPED',
turnsRunning: profileStatus === 'RUNNING',
operatorResumable: profileStatus === 'PAUSED' || profileStatus === 'STOPPED',
dataInitialized: true,
},
apiPort: 15015,
runtime: {
apiRunning: true,
@@ -239,7 +248,7 @@ test('loads and labels a PAUSED profile whose runtime remains available', async
await page.goto('lobby');
const row = page.locator('tbody tr').filter({ hasText: 'hwe섭' });
const pausedStatus = row.getByTestId('profile-paused-status');
await expect(pausedStatus).toHaveText('턴 진행 일시정지');
await expect(pausedStatus).toHaveText('턴 일시정지 · 조회/예약턴 가능');
await expect(pausedStatus).toHaveCSS('color', 'oklch(0.879 0.169 91.605)');
await expect(row).toContainText('선택장수');
await expect(row).not.toContainText('정보를 불러오는 중');
@@ -249,6 +258,19 @@ test('loads and labels a PAUSED profile whose runtime remains available', async
await page.screenshot({ path: testInfo.outputPath('gateway-paused-profile-lobby.png'), fullPage: true });
});
test('does not contact a STOPPED game runtime and labels it inaccessible', async ({ page }, testInfo) => {
const gameOperations = await installFixture(page, { profileStatus: 'STOPPED' });
await page.goto('lobby');
const row = page.locator('tbody tr').filter({ hasText: 'hwe섭' });
await expect(row).toContainText('서버 중지 · 접근 불가');
await expect(row).not.toContainText('정보를 불러오는 중');
await expect(row.getByRole('button', { name: '입장' })).toHaveCount(0);
await expect(page.getByRole('tab', { name: 'hwe섭' })).toHaveCount(0);
expect(gameOperations).toEqual([]);
await page.screenshot({ path: testInfo.outputPath('gateway-stopped-profile-lobby.png'), fullPage: true });
});
test('automatically recovers profile details after a transient update outage', async ({ page }) => {
const gameOperations = await installFixture(page, { lobbyBundleFailures: 1 });
app/gateway-frontend/e2e/public-map-tabs.spec.ts
+19
View File
@@ -13,8 +13,23 @@ type ProfileFixture = {
color: string;
status: 'RUNNING' | 'PREOPEN' | 'PAUSED' | 'COMPLETED' | 'STOPPED';
apiPort: number;
lifecycle: {
runtimeExpected: boolean;
userAccessible: boolean;
turnsRunning: boolean;
operatorResumable: boolean;
dataInitialized: boolean;
};
};
const lifecycleFor = (status: ProfileFixture['status']): ProfileFixture['lifecycle'] => ({
runtimeExpected: status !== 'STOPPED',
userAccessible: status !== 'STOPPED',
turnsRunning: status === 'RUNNING',
operatorResumable: status === 'PAUSED' || status === 'STOPPED',
dataInitialized: true,
});
const profiles: ProfileFixture[] = [
{
profileName: 'che:2',
@@ -23,6 +38,7 @@ const profiles: ProfileFixture[] = [
color: '#ff8080',
status: 'RUNNING',
apiPort: 15003,
lifecycle: lifecycleFor('RUNNING'),
},
{
profileName: 'hwe:2',
@@ -31,6 +47,7 @@ const profiles: ProfileFixture[] = [
color: '#80c0ff',
status: 'PAUSED',
apiPort: 15015,
lifecycle: lifecycleFor('PAUSED'),
},
{
profileName: 'kwe:2',
@@ -39,6 +56,7 @@ const profiles: ProfileFixture[] = [
color: '#b0b0b0',
status: 'STOPPED',
apiPort: 15005,
lifecycle: lifecycleFor('STOPPED'),
},
];
@@ -58,6 +76,7 @@ const orderedProfiles: ProfileFixture[] = orderedProfileData.map(([profile, korN
color: '#b0b0b0',
status: 'STOPPED',
apiPort,
lifecycle: lifecycleFor('STOPPED'),
}));
const fulfill = async (route: Route, results: unknown[]): Promise<void> => {
app/gateway-frontend/src/views/AdminView.vue
+45 -6
View File
@@ -1,5 +1,11 @@
<script setup lang="ts">
import { formatServerDateTime, serverDateTimeInputToIso, toServerDateTimeInputValue } from '@sammo-ts/common';
import {
formatServerDateTime,
gatewayProfileCapabilities,
serverDateTimeInputToIso,
toServerDateTimeInputValue,
type GatewayProfileStatus,
} from '@sammo-ts/common';
import { computed, onMounted, ref, watch } from 'vue';
import ServerProfileTabs from '../components/ServerProfileTabs.vue';
import AdminConsoleLayout from '../layouts/AdminConsoleLayout.vue';
@@ -180,7 +186,7 @@ type AdminProfile = {
currentScenario: string | null;
/** @deprecated Rollback-compatible mirror of currentScenario. */
scenario: string;
status: string;
status: GatewayProfileStatus;
apiPort: number;
runtime: {
apiRunning: boolean;
@@ -423,6 +429,22 @@ const runtimeActionPending = (profile: AdminProfile): boolean => {
return profile.runtimeActions.some((action) => action.status === 'REQUESTED' || action.status === 'PARTIAL');
};
const profileLifecycleText = (profile: AdminProfile): string => {
if (profile.currentScenario === null) return 'DB 초기화 전 · 게임 접근 불가';
if (profile.status === 'PAUSED') return '턴 일시정지 · 게임 조회와 예약턴 입력 가능 · 운영자 재개 가능';
if (profile.status === 'STOPPED') return '서버 프로세스 중지 · 게임 접근 불가 · 운영자 서버 재개 가능';
if (profile.status === 'RUNNING') return '서버 운영 및 턴 진행 중';
if (profile.status === 'PREOPEN') return '서버 접근 가능 · 개장 전 턴 정지';
if (profile.status === 'COMPLETED') return '종료 기수 조회 가능 · 턴 정지';
if (profile.status === 'DISABLED') return '비활성 · 게임 접근 불가';
return '준비 중 · 게임 접근 불가';
};
const canResumeProfile = (profile: AdminProfile): boolean =>
profile.currentScenario !== null && gatewayProfileCapabilities(profile.status).operatorResumable;
const canPauseProfile = (profile: AdminProfile): boolean => profile.status === 'RUNNING';
const canStopProfile = (profile: AdminProfile): boolean => gatewayProfileCapabilities(profile.status).runtimeExpected;
const validDuration = (profileName: string): boolean => {
const value = Number(profileActions.value[profileName]?.durationMinutes);
return Number.isInteger(value) && value >= 1 && value <= 1440;
@@ -2069,6 +2091,12 @@ onMounted(() => {
<div class="text-xs text-zinc-500">
현재 시나리오: {{ profile.currentScenario ?? '미설정' }}
</div>
<div
class="mt-1 text-xs text-amber-200"
data-testid="profile-lifecycle-description"
>
{{ profileLifecycleText(profile) }}
</div>
</div>
<div class="text-xs text-zinc-400">
상태: {{ profile.status }} / API: {{ profile.runtime.apiRunning ? 'ON' : 'OFF' }} /
@@ -2359,19 +2387,30 @@ onMounted(() => {
</div>
<div class="grid grid-cols-2 gap-2 pt-2">
<button
class="bg-blue-700 hover:bg-blue-600 text-white font-semibold px-3 py-2 rounded"
class="bg-blue-700 hover:bg-blue-600 text-white font-semibold px-3 py-2 rounded disabled:opacity-40 disabled:cursor-not-allowed"
:disabled="
profileActionSubmitting[profile.profileName] ||
!canResumeProfile(profile)
"
@click="requestProfileAction(profile.profileName, 'RESUME')"
>
재개
{{ profile.status === 'PAUSED' ? '턴 재개' : '서버 재개' }}
</button>
<button
class="bg-zinc-700 hover:bg-zinc-600 text-white font-semibold px-3 py-2 rounded"
class="bg-zinc-700 hover:bg-zinc-600 text-white font-semibold px-3 py-2 rounded disabled:opacity-40 disabled:cursor-not-allowed"
:disabled="
profileActionSubmitting[profile.profileName] ||
!canPauseProfile(profile)
"
@click="requestProfileAction(profile.profileName, 'PAUSE')"
>
일시정지
</button>
<button
class="bg-red-700 hover:bg-red-600 text-white font-semibold px-3 py-2 rounded"
class="bg-red-700 hover:bg-red-600 text-white font-semibold px-3 py-2 rounded disabled:opacity-40 disabled:cursor-not-allowed"
:disabled="
profileActionSubmitting[profile.profileName] || !canStopProfile(profile)
"
@click="requestProfileAction(profile.profileName, 'STOP')"
>
중지
app/gateway-frontend/src/views/HomeView.vue
+6 -3
View File
@@ -3,6 +3,7 @@ import { computed, onMounted, ref } from 'vue';
import { useRouter } from 'vue-router';
import type { inferRouterOutputs } from '@trpc/server';
import type { AppRouter } from '@sammo-ts/gateway-api';
import { gatewayProfileCapabilities } from '@sammo-ts/common';
import MapPreview from '../components/MapPreview.vue';
import KakaoOtpDialog from '../components/KakaoOtpDialog.vue';
@@ -53,9 +54,11 @@ const loadPublicStatus = async (): Promise<void> => {
try {
const profiles = await trpc.lobby.profiles.query();
profile.value =
PROFILE_PUBLIC_STATUS_ORDER.map((status) => profiles.find((entry) => entry.status === status)).find(
(entry) => entry !== undefined
) ?? null;
PROFILE_PUBLIC_STATUS_ORDER.map((status) =>
profiles.find(
(entry) => entry.status === status && gatewayProfileCapabilities(entry.status).userAccessible
)
).find((entry) => entry !== undefined) ?? null;
if (!profile.value) {
statusError.value = '현재 공개 중인 서버가 없습니다.';
return;
app/gateway-frontend/src/views/LobbyView.vue
+6 -9
View File
@@ -33,8 +33,6 @@ type ProfileLoadState = {
const PROFILE_REQUEST_TIMEOUT_MS = 10_000;
const PROFILE_RETRY_DELAYS_MS = [1_000, 2_000, 3_000, 5_000, 8_000, 15_000] as const;
const PROFILE_RUNTIME_STATUSES = new Set<LobbyProfile['status']>(['RUNNING', 'PREOPEN', 'PAUSED', 'COMPLETED']);
const router = useRouter();
const me = ref<MeOutput>(null);
const notice = ref('');
@@ -67,9 +65,7 @@ const needsKakaoVerification = computed(
);
const userIconBaseUrl = configuredUserIconPublicUrl();
const sharedIconBaseUrl = configuredSharedIconPublicUrl();
const publicMapProfiles = computed(() =>
profiles.value.filter((profile) => PROFILE_RUNTIME_STATUSES.has(profile.status))
);
const publicMapProfiles = computed(() => profiles.value.filter((profile) => profile.lifecycle.userAccessible));
const selectedMapProfile = computed(
() => publicMapProfiles.value.find((profile) => profile.profileName === selectedMapProfileName.value) ?? null
);
@@ -110,11 +106,12 @@ const handleMapTabKeydown = (event: KeyboardEvent, profileName: string): void =>
const formatGraceEndsAt = (value: string | null | undefined): string => formatServerDateTime(value);
const serverSeasonStatus = (info: LobbyInfo) => resolveServerSeasonStatus(info);
const isProfileRuntimeAvailable = (profile: LobbyProfile): boolean => PROFILE_RUNTIME_STATUSES.has(profile.status);
const isProfileRuntimeAvailable = (profile: LobbyProfile): boolean => profile.lifecycle.userAccessible;
const unavailableProfileText = (profile: LobbyProfile): string => {
if (profile.status === 'RESERVED') return '- 준 비 중 -';
if (!profile.lifecycle.dataInitialized) return '- DB 초기화 전 · 접근 불가 -';
if (profile.status === 'RESERVED') return '- 준 비 중 · 접근 불가 -';
if (profile.status === 'DISABLED') return '- 비 활 성 -';
return '- 폐 쇄 중 -';
return '- 서버 중지 · 접근 불가 -';
};
const profileLoadState = (profileName: string): ProfileLoadState | undefined => profileLoadStates.value[profileName];
const setProfileLoadState = (profileName: string, state: ProfileLoadState): void => {
@@ -455,7 +452,7 @@ const handleEnter = async (profile: LobbyProfile, targetPath: string) => {
class="mt-1 whitespace-nowrap text-xs text-amber-300"
data-testid="profile-paused-status"
>
턴 진행 일시정지
턴 일시정지 · 조회/예약턴 가능
</div>
<div
v-if="profile.localAccountPolicy?.specialAccess"