diff --git a/apps/server/src/game.test.ts b/apps/server/src/game.test.ts index 2d36c44..e35636d 100644 --- a/apps/server/src/game.test.ts +++ b/apps/server/src/game.test.ts @@ -260,7 +260,7 @@ describe('game flow', () => { const p = await nextOf(a, 'play', 0); await sleep(p.startAt - Date.now() + 80); let g = await gameWhere(a, (x) => x.phase === 'play'); - expect(g.need).toEqual({ skip: 2, hint: 1, replay: 1 }); + expect(g.need).toEqual({ skip: 2, hint: 1, replay: 1, next: 1 }); a.send({ t: 'vote', kind: 'hint' }); g = await gameWhere(a, (x) => !!x.hint); expect(g.hint).toMatch(/^ㄴㄹ\d+$/); @@ -296,6 +296,53 @@ describe('game flow', () => { stop(); }); + test('다음 문제까지: the reveal lasts the room revealSec; 다음 문제 votes (all online) move on at once, the last one to the results', async () => { + seedLater(() => seed(2)); + const { cls } = await room(['방장', '철수'], { skipVotes: '1', nextVotes: 'all', revealSec: 30, listenSec: 10 }, { revealMs: undefined } as unknown as Record); + const [a, b] = cls as [Client, Client]; + const stop = autoReady(cls); + a.send({ t: 'start' }); + await nextOf(a, 'play', 0); + a.send({ t: 'vote', kind: 'next' }); + expect(((await a.waitFor((m) => m.t === 'error')) as Msg<'error'>).message).toBe('정답이 공개된 뒤에 누를 수 있어요.'); + a.send({ t: 'vote', kind: 'skip' }); + let g = await gameWhere(a, (x) => x.phase === 'reveal'); + expect(g.revealUntil! - Date.now()).toBeGreaterThan(29_000); + expect(g.revealUntil! - Date.now()).toBeLessThanOrEqual(30_000); + expect(g.need.next).toBe(2); + a.send({ t: 'vote', kind: 'next' }); + g = await gameWhere(a, (x) => x.votes.next.length === 1); + expect(g.phase).toBe('reveal'); + b.send({ t: 'vote', kind: 'next' }); + g = await gameWhere(a, (x) => x.n === 2 && x.phase !== 'reveal'); + expect(g.votes.next).toEqual([]); + await nextOf(a, 'play', 0, (m) => m.n === 2); + a.send({ t: 'vote', kind: 'skip' }); + await gameWhere(a, (x) => x.n === 2 && x.phase === 'reveal'); + a.send({ t: 'vote', kind: 'next' }); + await gameWhere(a, (x) => x.votes.next.length === 1); + // The other voter leaves: everyone still online has voted, so it moves on (to the results after the last one). + b.close(); + g = await gameWhere(a, (x) => x.phase === 'result'); + expect(g.history.map((h) => h.how)).toEqual(['skip', 'skip']); + stop(); + }); + + test('다음 문제 off: the server explains', async () => { + seedLater(() => seed(2)); + const { cls } = await room(['방장'], { skipVotes: '1', nextVotes: 'none' }); + const [a] = cls as [Client]; + const stop = autoReady(cls); + a.send({ t: 'start' }); + await nextOf(a, 'play', 0); + a.send({ t: 'vote', kind: 'skip' }); + await gameWhere(a, (x) => x.phase === 'reveal'); + a.send({ t: 'vote', kind: 'next' }); + expect(((await a.waitFor((m) => m.t === 'error')) as Msg<'error'>).message).toBe('이 방은 바로 다음 문제가 꺼져 있어요.'); + expect(last(a, 'game')!.game!.need.next).toBeNull(); + stop(); + }); + test('somebody joining mid-game plays from the next question', async () => { seedLater(() => seed(3)); const { cls, code } = await room(['방장']); diff --git a/apps/server/src/game/engine.ts b/apps/server/src/game/engine.ts index bc8a1d8..1199440 100644 --- a/apps/server/src/game/engine.ts +++ b/apps/server/src/game/engine.ts @@ -15,7 +15,8 @@ import type { Room } from '../rooms/manager'; export interface GameTiming { /** 3·2·1 before the first play of a question. */ countdownMs: number; - revealMs: number; + /** Tests only: replaces the room's 다음 문제까지 (revealSec). */ + revealMs?: number; /** Lead time for a resume / replay so every client starts together (docs/12 Q1: now + 800ms). */ resumeLeadMs: number; /** A client that has not reported the clip end this long after the expected end gets one more stop (docs/12 Q1). */ @@ -26,7 +27,7 @@ export interface GameTiming { /** Tests only: replaces the site's question time limit for short clips. */ limitMs?: number; } -export const DEFAULT_TIMING: GameTiming = { countdownMs: 3000, revealMs: 5000, resumeLeadMs: 800, clipGraceMs: 3000, lateMs: 30_000, tickMs: 200 }; +export const DEFAULT_TIMING: GameTiming = { countdownMs: 3000, resumeLeadMs: 800, clipGraceMs: 3000, lateMs: 30_000, tickMs: 200 }; export interface Score { nickname: string; @@ -79,7 +80,7 @@ export class Game { private limitMs: number | null = null; hint: string | null = null; private lyrics: string[] | null = null; - votes = { skip: new Set(), hint: new Set(), replay: new Set() }; + votes = { skip: new Set(), hint: new Set(), replay: new Set(), next: new Set() }; history: GameHistoryItem[] = []; private revealUntil: number | null = null; private timer: ReturnType | null = null; @@ -135,8 +136,10 @@ export class Game { const p = this.audioAtSec + Math.max(0, now - this.audioStartAt) / 1000; return this.clip.endSec !== null ? Math.min(p, this.clip.endSec) : p; } - private need(kind: 'skip' | 'hint' | 'replay'): number | null { + private need(kind: 'skip' | 'hint' | 'replay' | 'next'): number | null { const c = this.room.config; + // 다음 문제: everyone in the room plays the next question, so everyone online counts. + if (kind === 'next') return voteThreshold(c.nextVotes, this.room.online().length); const rule = kind === 'skip' ? c.skipVotes : kind === 'hint' ? (c.hint === 'manual' ? c.hintVotes : 'none') : this.listening ? c.replayVotes : 'none'; return voteThreshold(rule, this.active().length); } @@ -332,10 +335,18 @@ export class Game { this.paused = null; this.playing = false; this.phase = 'reveal'; - this.revealUntil = now + this.timing.revealMs; + this.votes.next.clear(); + this.revealUntil = now + (this.timing.revealMs ?? this.room.config.revealSec * 1000); this.broadcast(); } + /** Reveal over (time or 다음 문제 votes): the next question, or the results after the last one. */ + private afterReveal(): void { + if (this.phase !== 'reveal') return; + if (this.n >= this.total) this.finish(); + else this.next(); + } + finish(): void { if (this.phase === 'result') return; this.phase = 'result'; @@ -355,10 +366,7 @@ export class Game { tick(now = this.now()): void { if (this.phase === 'reveal') { - if (this.revealUntil !== null && now >= this.revealUntil) { - if (this.n >= this.total) this.finish(); - else this.next(); - } + if (this.revealUntil !== null && now >= this.revealUntil) this.afterReveal(); return; } if (this.phase !== 'play') return; @@ -423,7 +431,17 @@ export class Game { return true; } - vote(userId: string, kind: 'skip' | 'hint' | 'replay'): string | null { + vote(userId: string, kind: 'skip' | 'hint' | 'replay' | 'next'): string | null { + if (kind === 'next') { + if (this.phase !== 'reveal') return '정답이 공개된 뒤에 누를 수 있어요.'; + if (this.room.config.nextVotes === 'none') return '이 방은 바로 다음 문제가 꺼져 있어요.'; + if (!this.online(userId)) return '방에 접속해 있지 않아요.'; + if (this.votes.next.has(userId)) this.votes.next.delete(userId); + else this.votes.next.add(userId); + this.checkNext(); + if (this.phase === 'reveal') this.broadcast(); + return null; + } if (this.phase !== 'play' && this.phase !== 'prepare') return '지금은 투표할 수 없어요.'; if (!this.active().includes(userId)) return '이번 문제에 참가하고 있지 않아요.'; const c = this.room.config; @@ -451,7 +469,7 @@ export class Game { private checkVotes(): void { const act = new Set(this.active()); - for (const v of Object.values(this.votes)) for (const id of v) if (!act.has(id)) v.delete(id); + for (const k of ['skip', 'hint', 'replay'] as const) for (const id of this.votes[k]) if (!act.has(id)) this.votes[k].delete(id); const pass = (k: 'skip' | 'hint' | 'replay') => { const need = this.need(k); return need !== null && this.votes[k].size >= need; @@ -461,8 +479,21 @@ export class Game { if (pass('replay') && this.phase === 'play' && this.firstStartAt !== null) this.replay(); } + /** 다음 문제 votes: drop people who left, move on when enough are in. */ + private checkNext(): void { + if (this.phase !== 'reveal') return; + for (const id of this.votes.next) if (!this.online(id)) this.votes.next.delete(id); + const need = this.need('next'); + if (need !== null && this.votes.next.size >= need) this.afterReveal(); + } + /** A player went offline or left: do not wait for them, drop their votes (docs/05 진행 중 나간 사람). */ onGone(userId: string): void { + if (this.phase === 'reveal') { + this.checkNext(); + if ((this.phase as GamePhase) === 'reveal') this.broadcast(); + return; + } if (this.phase !== 'prepare' && this.phase !== 'play') return this.broadcast(); this.waitingSince.delete(userId); if (this.paused?.who.includes(userId)) this.paused = { ...this.paused, who: this.paused.who.filter((x) => x !== userId) }; @@ -533,8 +564,8 @@ export class Game { hint: this.hint, hintAtSec: typeof c.hint === 'number' ? c.hint : null, lyrics: this.lyrics, - votes: { skip: [...this.votes.skip], hint: [...this.votes.hint], replay: [...this.votes.replay] }, - need: { skip: this.need('skip'), hint: this.need('hint'), replay: this.need('replay') }, + votes: { skip: [...this.votes.skip], hint: [...this.votes.hint], replay: [...this.votes.replay], next: [...this.votes.next] }, + need: { skip: this.need('skip'), hint: this.need('hint'), replay: this.need('replay'), next: this.need('next') }, scores: [...ids] .map((id) => { const s = scores.get(id); diff --git a/apps/server/src/rooms/manager.ts b/apps/server/src/rooms/manager.ts index 59a610b..673a330 100644 --- a/apps/server/src/rooms/manager.ts +++ b/apps/server/src/rooms/manager.ts @@ -403,7 +403,7 @@ export class RoomManager { this.inRoom(ws)?.game?.onAudio(ws.data.userId, n, ev, code); } - vote(ws: ServerWebSocket, kind: 'skip' | 'hint' | 'replay'): string | null { + vote(ws: ServerWebSocket, kind: 'skip' | 'hint' | 'replay' | 'next'): string | null { const room = this.inRoom(ws); if (!room?.game) return '게임 중이 아니에요.'; return room.game.vote(ws.data.userId, kind); diff --git a/apps/web/src/components/RoomSettings.tsx b/apps/web/src/components/RoomSettings.tsx index c941013..9321408 100644 --- a/apps/web/src/components/RoomSettings.tsx +++ b/apps/web/src/components/RoomSettings.tsx @@ -10,6 +10,7 @@ import { LISTEN_SECS, LYRICS_SECS, MODES, + REVEAL_SECS, VOTE_RULES, listenLabel, voteLabel, @@ -394,6 +395,12 @@ export function RoomSettings({ onPatch({ replayVotes })} options={vote(VOTE_RULES)} /> )} +
+ onPatch({ revealSec })} options={REVEAL_SECS.map((v) => ({ v, label: `${v}초` }))} /> +
+
+ onPatch({ nextVotes })} options={vote(VOTE_RULES)} /> +
socket.send(m); - const vote = (kind: 'skip' | 'hint' | 'replay') => send({ t: 'vote', kind }); + const vote = (kind: 'skip' | 'hint' | 'replay' | 'next') => send({ t: 'vote', kind }); + // Ctrl+K during the reveal = 다음 문제 (the shortcut handler is set up once, so it reads the phase from a ref). + const phaseRef = useRef(game.phase); + phaseRef.current = game.phase; const name = (id: string) => room.players.find((x) => x.id === id)?.nickname ?? game.scores.find((x) => x.id === id)?.nickname ?? '?'; const inQuestion = game.participants.includes(me.id) && !game.excluded.includes(me.id); const listening = game.mode !== 'lyrics'; @@ -62,7 +65,7 @@ export function GameScreen({ room, game }: { room: RoomView; game: GameView }) { const onKey = (e: KeyboardEvent) => { if ((e.ctrlKey || e.metaKey) && !e.altKey && !e.shiftKey) { const k = e.key.toLowerCase(); - const kind = k === 'i' ? 'hint' : k === 'k' ? 'skip' : k === 'r' ? 'replay' : null; + const kind = k === 'i' ? 'hint' : k === 'k' ? (phaseRef.current === 'reveal' ? 'next' : 'skip') : k === 'r' ? 'replay' : null; if (kind) { e.preventDefault(); vote(kind); @@ -83,7 +86,7 @@ export function GameScreen({ room, game }: { room: RoomView; game: GameView }) { const elapsed = game.clock.elapsedMs + (game.clock.runningSince !== null ? Math.max(0, now - game.clock.runningSince) : 0); const countdown = game.startAt !== null && now < game.startAt && !game.paused ? Math.ceil((game.startAt - now) / 1000) : 0; const reveal = game.phase === 'reveal' ? game.history.at(-1) : undefined; - const voteBtn = (kind: 'skip' | 'hint' | 'replay', icon: string, label: string, key: string) => { + const voteBtn = (kind: 'skip' | 'hint' | 'replay' | 'next', icon: string, label: string, key: string) => { const need = game.need[kind]; const n = game.votes[kind].length; const on = game.votes[kind].includes(me.id); @@ -121,7 +124,7 @@ export function GameScreen({ room, game }: { room: RoomView; game: GameView }) { ★{c.level}
{voteBtn('hint', '💡', '힌트', 'Ctrl+I')} - {voteBtn('skip', '⏭', '스킵', 'Ctrl+K')} + {reveal ? voteBtn('next', '⏭', '다음 문제', 'Ctrl+K') : voteBtn('skip', '⏭', '스킵', 'Ctrl+K')} {listening && voteBtn('replay', '🔁', '다시듣기', 'Ctrl+R')} {listening && (