diff --git a/deploy/visitors.sh b/deploy/visitors.sh index 7e5aff6..8026f54 100755 --- a/deploy/visitors.sh +++ b/deploy/visitors.sh @@ -44,7 +44,7 @@ for f in glob.glob("/var/lib/waving-hands/rooms/*.jsonl"): continue created = datetime.datetime.fromtimestamp(meta["createdAt"] / 1000, datetime.timezone.utc) humans, bots_seated, started, turns, last, over, talk = [], [], False, 0, created, None, 0 - names = {} + names, seat_changes = {}, [] for x in lines[1:]: if x["t"] == "seat": (bots_seated if x["bot"] else humans).append(x["name"]) @@ -56,6 +56,10 @@ for f in glob.glob("/var/lib/waving-hands/rooms/*.jsonl"): elif x["t"] == "turn": turns += 1 last = datetime.datetime.fromtimestamp(x["at"] / 1000, datetime.timezone.utc) + elif x["t"] == "standIn": + seat_changes.append("%s %s's seat to a bot" % (datetime.datetime.fromtimestamp(x["at"] / 1000, datetime.timezone.utc).strftime("%H:%M"), names.get(x["id"], x["id"]))) + elif x["t"] == "reseat": + seat_changes.append("%s %s re-seated" % (datetime.datetime.fromtimestamp(x["at"] / 1000, datetime.timezone.utc).strftime("%H:%M"), names.get(x["id"], x["id"]))) elif x["t"] == "chat": talk += 1 elif x["t"] == "over": @@ -63,7 +67,7 @@ for f in glob.glob("/var/lib/waving-hands/rooms/*.jsonl"): for h in humans: if h not in first_seen or created < first_seen[h]: first_seen[h] = created - rooms.append(dict(id=meta["id"], size=meta["seats"], created=created, humans=humans, bots=bots_seated, started=started, turns=turns, last=last, over=over, talk=talk)) + rooms.append(dict(id=meta["id"], size=meta["seats"], created=created, humans=humans, bots=bots_seated, started=started, turns=turns, last=last, over=over, talk=talk, seat_changes=seat_changes)) today = sorted([r for r in rooms if r["created"].strftime("%F") == day], key=lambda r: r["created"]) names = sorted({h for r in today for h in r["humans"]}) @@ -80,4 +84,6 @@ for r in today: r["created"].strftime("%H:%M"), r["id"], seated, (" (%d seat%s empty)" % (empty, "" if empty == 1 else "s")) if empty else "", state, r["turns"], span, r["last"].strftime("%H:%M") if r["turns"] else "never", (" %d line%s of talk" % (r["talk"], "" if r["talk"] == 1 else "s")) if r["talk"] else "")) + for change in r["seat_changes"]: + print(" %s" % change) PY diff --git a/deploy/waving-hands-reseat.sh b/deploy/waving-hands-reseat.sh index e52ceb0..e2e1ebd 100755 --- a/deploy/waving-hands-reseat.sh +++ b/deploy/waving-hands-reseat.sh @@ -19,7 +19,7 @@ r = json.load(sys.stdin) if "error" in r: sys.exit(r["error"]) print("room %s, %s" % (r["roomId"], "in play" if r["started"] else "not begun")) for s in r["seats"]: - when = "bot" if s["bot"] else "never moved or spoke" if s["lastActed"] is None else "last acted " + datetime.datetime.fromtimestamp(s["lastActed"] / 1000, datetime.timezone.utc).strftime("%Y-%m-%d %H:%M UTC") + when = "bot" if s["bot"] else ("a bot stands in; " if s.get("standIn") else "") + ("never moved or spoke" if s["lastActed"] is None else "last acted " + datetime.datetime.fromtimestamp(s["lastActed"] / 1000, datetime.timezone.utc).strftime("%Y-%m-%d %H:%M UTC")) print(" %-3s %-24s %s" % (s["id"], s["name"], when)) ' else diff --git a/server/src/index.ts b/server/src/index.ts index 1ccaa8b..8851d6c 100644 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -14,6 +14,8 @@ // POST /api/rooms/:id/challenge {token} call the keeper of the site to a held seat; their phone rings // POST /api/rooms/:id/rematch {token} a finished table opens another with the same company // POST /api/rooms/:id/transfer {token} a four-word phrase that carries this seat to another device +// POST /api/rooms/:id/phrase {token, seat} the host mints one for another wizard's seat, which re-seats it when claimed +// POST /api/rooms/:id/standin {token, seat} the host gives a wizard's seat to a bot for the rest of the duel // POST /api/transfer {phrase} claim a phrase: the seat and its token, once // WS /ws?room=:id&token= {type:"update", seq} whenever the room changes; without a token, // a seat in the Peanut Gallery, counted for the table @@ -79,6 +81,8 @@ const bells = new RateLimit(3, 60 * 60 * 1000); /** Claims on transfer phrases: a phrase is guessed, not brute-forced. */ const claims = new RateLimit(10, 10 * 60 * 1000); const MAX_AUDIENCE = 30; +/** How often each socket is asked to answer; one silent through a whole round is a browser gone, and is closed. */ +const PING_MS = Number(process.env.PING_MS ?? 30_000); const IDLE_ROOM_MS = 7 * 24 * 60 * 60 * 1000; setInterval(() => { const n = rooms.evictIdle(IDLE_ROOM_MS); @@ -339,6 +343,14 @@ async function handle(req: IncomingMessage, res: ServerResponse): Promise if (action === 'transfer') { return send(res, 200, rooms.transfer(room, typeof body.token === 'string' ? body.token : undefined)); } + if (action === 'phrase') { + return send(res, 200, rooms.hostPhrase(room, typeof body.token === 'string' ? body.token : undefined, body.seat)); + } + if (action === 'standin') { + const token = typeof body.token === 'string' ? body.token : undefined; + rooms.standIn(room, token, body.seat); + return send(res, 200, rooms.view(room, rooms.seatOf(room, token).id)); + } throw new RoomError('Not here.', 404); } @@ -372,12 +384,31 @@ server.on('upgrade', (req, socket, head) => { }; const unsubscribe = seatId === SPECTATOR ? rooms.watch(room, onChange) : rooms.subscribe(room.id, onChange); ws.on('close', unsubscribe); + answered.set(ws, true); + ws.on('pong', () => answered.set(ws, true)); // A socket's own error (a message over the limit, a malformed frame) closes that socket, never the server. ws.on('error', () => ws.terminate()); ws.send(JSON.stringify({ type: 'hello', seat: seatId })); }); }); +/** + * A browser that died without closing (a crashed tab, a sleeping laptop, a dropped network) leaves its socket + * open until TCP gives up, counted in the gallery all the while. The protocol's own ping, which every browser + * answers by itself, finds it within two rounds. + */ +const answered = new WeakMap(); +setInterval(() => { + for (const ws of wss.clients) { + if (!answered.get(ws)) { + ws.terminate(); + continue; + } + answered.set(ws, false); + ws.ping(); + } +}, PING_MS).unref(); + server.listen(PORT, HOST, () => { console.log(`waving-hands server listening on http://${HOST}:${PORT}, rooms in ${DATA_DIR}`); }); diff --git a/server/src/rooms.test.ts b/server/src/rooms.test.ts index 1820dc4..7e043d5 100644 --- a/server/src/rooms.test.ts +++ b/server/src/rooms.test.ts @@ -3,6 +3,7 @@ import { tmpdir } from 'node:os'; import { join } from 'node:path'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import { Rooms } from './rooms'; +import { chooseBotTurn } from '../../src/lib/game/bot'; import { Store } from './store'; let dir: string; @@ -47,3 +48,66 @@ describe('rooms', () => { expect(seats[1].lastActed).toBeNull(); }); }); + +describe('the host and the other seats', () => { + it("gives a wizard's seat to a bot, which duels the turn it was waiting on, and the wizard's token opens nothing", () => { + const { rooms, room, ann, bo } = table(); + rooms.submit(room, ann, chooseBotTurn(room.state!, 'A'), 0); + rooms.standIn(room, ann, 'B'); + expect(room.resolved).toBe(1); + expect(() => rooms.seatOf(room, bo)).toThrow(/gave your seat to a bot/); + expect(rooms.view(room, 'A').seats[1]).toEqual({ id: 'B', name: 'Bo', bot: true, standIn: true }); + }); + + it('keeps the gestures a wizard made before the bot stood in', () => { + const { rooms, room, ann, bo } = table(); + const mine = { left: 'P', right: 'W', casts: [] } as const; + rooms.submit(room, bo, mine, 0); + rooms.standIn(room, ann, 'B'); + rooms.submit(room, ann, chooseBotTurn(room.state!, 'A'), 0); + expect(room.state!.wizards.B.history.at(-1)).toMatchObject({ left: 'P', right: 'W' }); + }); + + it("is the host's call alone, in a duel under way, for a wizard other than the host", () => { + const { rooms, room, ann, bo } = table(); + expect(() => rooms.standIn(room, bo, 'A')).toThrow(/Only the wizard who opened/); + expect(() => rooms.standIn(room, ann, 'A')).toThrow(/keeps their own seat/); + expect(() => rooms.standIn(room, ann, 'Z')).toThrow(/No wizard sits/); + const lobby = rooms.create('Ann', 2); + rooms.join(lobby.room, 'Bo'); + expect(() => rooms.standIn(lobby.room, lobby.token, 'B')).toThrow(/under way/); + }); + + it("gives the seat back by the host's phrase, with a new token, and a restart keeps both changes", () => { + const { rooms, room, ann, bo } = table(); + rooms.standIn(room, ann, 'B'); + expect(new Rooms(new Store(dir)).get(room.id).seats[1]).toMatchObject({ bot: true, standIn: true }); + const claimed = rooms.claim(rooms.hostPhrase(room, ann, 'B').phrase); + expect(rooms.seatOf(room, claimed.token).name).toBe('Bo'); + expect(() => rooms.seatOf(room, bo)).toThrow(/opens no seat/); + const reopened = new Rooms(new Store(dir)).get(room.id); + expect(reopened.seats[1]).toEqual({ id: 'B', name: 'Bo', tokenHash: room.seats[1].tokenHash, bot: false }); + }); + + it("re-seats a wizard whose browser lost the seat, by the host's phrase, once, and only the host makes one", () => { + const { rooms, room, ann, bo } = table(); + expect(() => rooms.hostPhrase(room, bo, 'A')).toThrow(/Only the wizard who opened/); + expect(() => rooms.hostPhrase(room, ann, 'A')).toThrow(/No other wizard/); + const { phrase } = rooms.hostPhrase(room, ann, 'B'); + expect(rooms.claim(phrase).token).not.toBe(bo); + expect(() => rooms.seatOf(room, bo)).toThrow(/opens no seat/); + expect(() => rooms.claim(phrase)).toThrow(/unknown or has expired/); + }); + + it('voids a phrase for the seat once a bot stands in, and holds the wizard\'s seat at a rematch without the stand-in', () => { + const { rooms, room, ann } = table(); + const { phrase } = rooms.hostPhrase(room, ann, 'B'); + rooms.standIn(room, ann, 'B'); + expect(() => rooms.claim(phrase)).toThrow(/unknown or has expired/); + room.state = { ...room.state!, over: { winner: 'A', reason: 'test' } } as typeof room.state; + const next = rooms.get(rooms.rematch(room, ann).roomId); + expect(next.expected).toEqual(['Bo']); + expect(next.seats.map((s) => s.name)).toEqual(['Ann']); + }); +}); + diff --git a/server/src/rooms.ts b/server/src/rooms.ts index 161d2d6..8e4b8e4 100644 --- a/server/src/rooms.ts +++ b/server/src/rooms.ts @@ -23,9 +23,12 @@ const CHAT_KEEP = 200; export interface Seat { id: WizardId; name: string; - /** SHA-256 of the seat's token, hex; empty for a bot. */ + /** SHA-256 of the seat's token, hex; empty for a bot. A seat a bot stands in for keeps the wizard's, which opens nothing while it does. */ tokenHash: string; + /** A bot plays this seat: one seated as a bot, or one standing in for a wizard. */ bot: boolean; + /** The host gave this wizard's seat to a bot; a phrase from the host, or the keeper, gives it back. */ + standIn?: true; } export function hashToken(token: string): string { @@ -153,7 +156,8 @@ export class Rooms { seatOf(room: Room, token: string | undefined): Seat { if (!token) throw new RoomError('That token opens no seat at this duel.', 403); const given = Buffer.from(hashToken(token), 'hex'); - const seat = room.seats.find((s) => !s.bot && s.tokenHash.length === given.length * 2 && timingSafeEqual(Buffer.from(s.tokenHash, 'hex'), given)); + const seat = room.seats.find((s) => s.tokenHash.length === given.length * 2 && timingSafeEqual(Buffer.from(s.tokenHash, 'hex'), given)); + if (seat?.standIn) throw new RoomError('The host gave your seat to a bot, which duels on in your place. Ask them for a transfer phrase to take it back.', 403); if (!seat) throw new RoomError('That token opens no seat at this duel.', 403); return seat; } @@ -223,21 +227,38 @@ export class Rooms { const caller = this.seatOf(room, token); if (!room.state?.over) throw new RoomError('The duel is not over yet.', 409); if (room.rematch) return { roomId: room.rematch.to, seat: null, token: null, created: false }; - const others = room.seats.filter((s) => !s.bot && s.id !== caller.id).map((s) => s.name); + // A wizard a bot stood in for is still one of the company; the stand-in does not follow. + const others = room.seats.filter((s) => (!s.bot || s.standIn) && s.id !== caller.id).map((s) => s.name); const next = this.open(caller.name, room.size, { rematchOf: room.id, expected: others }); - for (const bot of room.seats.filter((s) => s.bot)) this.sit(next.room, bot.name, true); + for (const bot of room.seats.filter((s) => s.bot && !s.standIn)) this.sit(next.room, bot.name, true); this.commit(room, { t: 'rematch', at: Date.now(), to: next.room.id, by: caller.id }); return { roomId: next.room.id, seat: next.seat, token: next.token, created: true }; } - /** Phrases waiting to be claimed, with the seat and the token they carry. */ - private transfers = new Map(); + /** Phrases waiting to be claimed, with the seat and the token they carry; the host's carry none, and re-seat on claim. */ + private transfers = new Map(); private failedClaims = 0; private failWindowStart = 0; /** Mint a phrase that brings this seat to another device: four words, ten minutes, one use. */ transfer(room: Room, token: string | undefined): { phrase: string; expiresAt: number } { const seat = this.seatOf(room, token); + return this.mint(room.id, seat.id, token!); + } + + /** + * The host mints a phrase for another wizard's seat: for a player whose browser lost it, or to take it back + * from a bot standing in. Claimed, it gives the seat a new token, so the old one opens nothing after. + */ + hostPhrase(room: Room, token: string | undefined, seatId: unknown): { phrase: string; expiresAt: number } { + const host = this.seatOf(room, token); + if (host.id !== room.seats[0]?.id) throw new RoomError('Only the wizard who opened the table may make a phrase for another seat.', 403); + const seat = room.seats.find((s) => s.id === seatId && s.id !== host.id && (!s.bot || s.standIn)); + if (!seat) throw new RoomError('No other wizard sits in that seat.', 404); + return this.mint(room.id, seat.id, null); + } + + private mint(roomId: string, seatId: WizardId, token: string | null): { phrase: string; expiresAt: number } { const now = Date.now(); for (const [phrase, t] of this.transfers) if (t.expiresAt < now) this.transfers.delete(phrase); if (this.transfers.size >= 200) throw new RoomError('Too many transfers are pending; try again in a few minutes.', 429); @@ -246,7 +267,7 @@ export class Rooms { phrase = Array.from({ length: 4 }, () => TRANSFER_WORDS[randomBytes(1)[0] % TRANSFER_WORDS.length]).join('-'); } while (this.transfers.has(phrase)); const expiresAt = now + TRANSFER_TTL_MS; - this.transfers.set(phrase, { roomId: room.id, seatId: seat.id, token: token!, expiresAt }); + this.transfers.set(phrase, { roomId, seatId, token, expiresAt }); return { phrase, expiresAt }; } @@ -267,6 +288,10 @@ export class Rooms { } this.transfers.delete(phrase); const room = this.get(t.roomId); + if (t.token === null) { + const { seat, token } = this.reseat(room, t.seatId); + return { roomId: room.id, seat: seat.id, token }; + } const seat = this.seatOf(room, t.token); return { roomId: room.id, seat: seat.id, token: t.token }; } @@ -308,27 +333,49 @@ export class Rooms { } /** - * The keeper gives a wizard's seat a new token, for a player whose browser lost the old one. Whether the one - * asking holds the seat is the keeper's judgment; this carries it out. The old token opens nothing after. + * A wizard's seat gets a new token, for a player whose browser lost the old one, or one taking it back from a + * bot standing in. Whether the one asking holds the seat is the keeper's judgment, or the host's in the phrase + * they made; this carries it out. The old token opens nothing after. */ reseat(room: Room, seatId: unknown): { seat: Seat; token: string } { - const seat = room.seats.find((s) => s.id === seatId && !s.bot); + const seat = room.seats.find((s) => s.id === seatId && (!s.bot || s.standIn)); if (!seat) throw new RoomError('No wizard sits in that seat.', 404); const token = newId(18); this.commit(room, { t: 'reseat', at: Date.now(), id: seat.id, tokenHash: hashToken(token) }); - // A phrase minted with the old token would carry a seat that no longer answers to it. - for (const [phrase, t] of this.transfers) if (t.roomId === room.id && t.seatId === seat.id) this.transfers.delete(phrase); + this.voidPhrases(room, seat.id); return { seat, token }; } + /** + * The host gives a wizard's seat to a bot, for a player who cannot go on: the bot plays it from the gestures the + * seat owes, and the wizard's token opens nothing until a phrase from the host gives it back. + */ + standIn(room: Room, token: string | undefined, seatId: unknown): void { + const host = this.seatOf(room, token); + if (host.id !== room.seats[0]?.id) throw new RoomError('Only the wizard who opened the table may give a seat to a bot.', 403); + if (!room.state || room.state.over) throw new RoomError('Only a duel under way needs a stand-in.', 409); + if (seatId === host.id) throw new RoomError('The host keeps their own seat.', 409); + const seat = room.seats.find((s) => s.id === seatId && !s.bot); + if (!seat) throw new RoomError('No wizard sits in that seat.', 404); + this.commit(room, { t: 'standIn', at: Date.now(), id: seat.id, by: host.id }); + this.voidPhrases(room, seat.id); + // The turn may have been waiting on this seat alone. + if (waitingOn(room).length === 0) this.resolve(room); + } + + /** A phrase minted for a seat whose token has changed hands would carry a seat that no longer answers to it. */ + private voidPhrases(room: Room, seatId: WizardId): void { + for (const [phrase, t] of this.transfers) if (t.roomId === room.id && t.seatId === seatId) this.transfers.delete(phrase); + } + /** The table as the keeper sees it before re-seating: who sits where, and when each wizard last moved or spoke. */ - seatsForKeeper(room: Room): { id: WizardId; name: string; bot: boolean; lastActed: number | null }[] { + seatsForKeeper(room: Room): { id: WizardId; name: string; bot: boolean; standIn: boolean; lastActed: number | null }[] { const last = new Map(); for (const line of this.store.read(room.id)) { if (line.t === 'input' || line.t === 'chat') last.set(line.id, line.at); else if (line.t === 'turn') for (const id of Object.keys(line.inputs)) last.set(id, line.at); } - return room.seats.map((s) => ({ id: s.id, name: s.name, bot: s.bot, lastActed: s.bot ? null : (last.get(s.id) ?? null) })); + return room.seats.map((s) => ({ id: s.id, name: s.name, bot: s.bot && !s.standIn, standIn: !!s.standIn, lastActed: s.bot && !s.standIn ? null : (last.get(s.id) ?? null) })); } /** The host sends a bot away before the duel begins. People leave by not coming back. */ @@ -361,8 +408,9 @@ export class Rooms { private resolve(room: Room): void { const state = room.state!; const inputs: Record = { ...room.pending }; + // Gestures a wizard made before a bot stood in for them stand. for (const seat of room.seats) { - if (seat.bot && needsInput(state, seat.id)) inputs[seat.id] = chooseBotTurn(state, seat.id); + if (seat.bot && needsInput(state, seat.id) && !(seat.id in inputs)) inputs[seat.id] = chooseBotTurn(state, seat.id); } this.commit(room, { t: 'turn', at: Date.now(), inputs }); // A time stop owed to a bot resolves at once; a human's waits for them. @@ -387,7 +435,7 @@ export class Rooms { size: room.size, me: seatId, host: room.seats[0]?.id ?? seatId, - seats: room.seats.map((s) => ({ id: s.id, name: s.name, bot: s.bot })), + seats: room.seats.map((s) => ({ id: s.id, name: s.name, bot: s.bot, ...(s.standIn ? { standIn: true as const } : {}) })), waitingOn: waitingOn(room), resolved: room.resolved, state: room.state ? viewFor(room.state, seatId) : null, @@ -463,7 +511,17 @@ function apply(room: Room, line: LedgerLine): void { break; case 'reseat': { const seat = room.seats.find((s) => s.id === line.id); - if (seat) seat.tokenHash = line.tokenHash; + if (!seat) break; + seat.tokenHash = line.tokenHash; + seat.bot = false; + delete seat.standIn; + break; + } + case 'standIn': { + const seat = room.seats.find((s) => s.id === line.id); + if (!seat) break; + seat.bot = true; + seat.standIn = true; break; } case 'input': diff --git a/server/src/store.ts b/server/src/store.ts index 67dbf1a..0849ea2 100644 --- a/server/src/store.ts +++ b/server/src/store.ts @@ -11,8 +11,13 @@ export type LedgerLine = | { t: 'room'; id: string; seats: number; createdAt: number; rematchOf?: string; expected?: string[] } /** A seat holds only the hash of its token; the token itself goes once to the browser that earned it. Ledgers written before hashing carry `token` and are read once more. */ | { t: 'seat'; id: WizardId; name: string; tokenHash?: string; token?: string; bot: boolean } - /** The keeper gave a wizard's seat a new token, for a player whose browser lost the old one; the old one opens nothing after. */ + /** + * A wizard's seat got a new token, from the keeper or a phrase the host made, for a player whose browser lost the + * old one; the old one opens nothing after. A seat a bot was standing in for is the wizard's again. + */ | { t: 'reseat'; at: number; id: WizardId; tokenHash: string } + /** The host gave a wizard's seat to a bot, which duels in it from here on; a reseat gives it back. */ + | { t: 'standIn'; at: number; id: WizardId; by: WizardId } /** One seat's move for the turn in progress, so a restart keeps it. The turn line that follows carries every input again. */ | { t: 'input'; at: number; id: WizardId; input: TurnInput } /** A bot sent away by the host before the duel began; its seat id is free again. */ diff --git a/src/lib/components/Hall.svelte b/src/lib/components/Hall.svelte index 8c0eeb1..1f11b8d 100644 --- a/src/lib/components/Hall.svelte +++ b/src/lib/components/Hall.svelte @@ -183,7 +183,7 @@ const g = games[held.roomId]; if (g === undefined) return 'looking'; if (g === null) return 'unreachable'; - const others = g.seats.filter((s) => s.id !== held.seat).map((s) => (s.bot ? `${s.name} (the bot)` : s.name)); + const others = g.seats.filter((s) => s.id !== held.seat).map((s) => (s.standIn ? `${s.name} (a bot stands in)` : s.bot ? `${s.name} (the bot)` : s.name)); if (!g.state) return `waiting to start${g.seats.length ? ` ยท ${g.seats.map((s) => s.name).join(', ')}` : ''}`; if (g.state.over) { if (g.state.over.winner === held.seat) return 'you won'; diff --git a/src/lib/components/Roster.svelte b/src/lib/components/Roster.svelte index 90bc83e..a86ff14 100644 --- a/src/lib/components/Roster.svelte +++ b/src/lib/components/Roster.svelte @@ -20,8 +20,9 @@ if (!duel.remote?.started || duel.state.over) return ''; const w = duel.state.wizards[id]; if (!w.alive || w.surrendered) return 'out'; - const bot = duel.remote.seats.find((s) => s.id === id)?.bot; - if (bot) return ''; + const seat = duel.remote.seats.find((s) => s.id === id); + if (seat?.standIn) return 'a bot duels for them'; + if (seat?.bot) return ''; return waitingOn.includes(id) ? 'writing' : 'moved'; } diff --git a/src/lib/components/SeatsSlip.svelte b/src/lib/components/SeatsSlip.svelte new file mode 100644 index 0000000..e6bd0f4 --- /dev/null +++ b/src/lib/components/SeatsSlip.svelte @@ -0,0 +1,154 @@ + + + open && e.key === 'Escape' && close()} /> + +{#if open} + +{/if} + + diff --git a/src/lib/game/client.ts b/src/lib/game/client.ts index 75d290e..31f63ab 100644 --- a/src/lib/game/client.ts +++ b/src/lib/game/client.ts @@ -169,6 +169,9 @@ export const api = { rematch: (roomId: string, token: string) => call<{ roomId: string; seat: WizardId | null; token: string | null; created: boolean }>('POST', `/api/rooms/${roomId}/rematch`, { token }), transfer: (roomId: string, token: string) => call<{ phrase: string; expiresAt: number }>('POST', `/api/rooms/${roomId}/transfer`, { token }), + /** The host's phrase for another wizard's seat; claimed, it re-seats them. */ + hostPhrase: (roomId: string, token: string, seat: WizardId) => call<{ phrase: string; expiresAt: number }>('POST', `/api/rooms/${roomId}/phrase`, { token, seat }), + standIn: (roomId: string, token: string, seat: WizardId) => call('POST', `/api/rooms/${roomId}/standin`, { token, seat }), claim: (phrase: string) => call<{ roomId: string; seat: WizardId; token: string }>('POST', '/api/transfer', { phrase }), report: (roomId: string, token: string, happened: string, expected: string) => call<{ id: string }>('POST', `/api/rooms/${roomId}/report`, { token, happened, expected }), diff --git a/src/lib/game/duel.svelte.ts b/src/lib/game/duel.svelte.ts index b0fd113..7eff06a 100644 --- a/src/lib/game/duel.svelte.ts +++ b/src/lib/game/duel.svelte.ts @@ -4,7 +4,7 @@ import { tick } from 'svelte'; import { chooseBotTurn } from './bot'; -import { api, rememberSeat, watchRoom, type HeldSeat } from './client'; +import { api, rememberSeat, ServerError, watchRoom, type HeldSeat } from './client'; import { markTalkSeen } from './talk'; import { cellsOverlap, @@ -219,6 +219,8 @@ export interface Remote extends HeldSeat { started: boolean; connected: boolean; error: string; + /** The server stopped taking this seat's token while the page was open, and why; the page goes to the gallery. */ + lost: string; chat: ChatLine[]; /** How many watch from the Peanut Gallery. */ audience: number; @@ -867,6 +869,26 @@ export class Duel { return api.transfer(r.roomId, r.token); } + /** Host only: a phrase for another wizard's seat, which gives it a new token when claimed. */ + hostPhrase(seat: WizardId): Promise<{ phrase: string; expiresAt: number }> { + const r = this.remote!; + return api.hostPhrase(r.roomId, r.token, seat); + } + + /** Host only: a bot duels in this wizard's seat for the rest of the duel, until a phrase gives it back. */ + async standIn(seat: WizardId): Promise { + const r = this.remote; + if (!r) return false; + r.error = ''; + try { + this.apply(await api.standIn(r.roomId, r.token, seat)); + return true; + } catch (e) { + r.error = e instanceof Error ? e.message : 'The seat could not be given to a bot.'; + return false; + } + } + /** Say something to the whole table. Resolves false when the words did not arrive. */ async say(text: string): Promise { const r = this.remote; @@ -913,7 +935,10 @@ export class Duel { const refresh = () => { fetchView() .then((v) => this.apply(v)) - .catch((e: Error) => (r.error = e.message)); + .catch((e: Error) => { + if (e instanceof ServerError && e.status === 403 && !r.spectating) r.lost = e.message; + else r.error = e.message; + }); }; return watchRoom(r.roomId, r.token, refresh, (open) => (r.connected = open)); } @@ -1045,6 +1070,7 @@ function remoteFrom(view: RoomView, token: string): Remote { started: view.state !== null, connected: false, error: '', + lost: '', chat: view.chat, audience: view.audience, spectating: view.me === SPECTATOR, diff --git a/src/lib/game/view.ts b/src/lib/game/view.ts index a1fe2f6..53033d7 100644 --- a/src/lib/game/view.ts +++ b/src/lib/game/view.ts @@ -33,7 +33,8 @@ export interface RoomView { me: WizardId; /** The wizard who opened the table and may begin the duel. */ host: WizardId; - seats: { id: WizardId; name: string; bot: boolean }[]; + /** Who sits where; `standIn` marks a wizard's seat the host gave to a bot, which duels in it until they take it back. */ + seats: { id: WizardId; name: string; bot: boolean; standIn?: true }[]; /** Seats that still have to move before the turn resolves. */ waitingOn: WizardId[]; /** Turns played so far, time stops included; gestures are sent with the count they were made against. */ diff --git a/src/routes/guide/+page.svelte b/src/routes/guide/+page.svelte index 5834380..5e3cf85 100644 --- a/src/routes/guide/+page.svelte +++ b/src/routes/guide/+page.svelte @@ -104,7 +104,7 @@

A room's link is an invitation to sit while the table is laid and to watch once the duel has begun. Anyone who opens it without a seat takes a place in the Peanut Gallery. They see the ledger, the result of each turn and the chronicle, and the table can see how many are watching. The gallery is shown only what every wizard at the table could see. A gesture hidden from any one wizard is a question mark to the whole gallery, and the turn being written shows nothing at all.

Table talk, in the rail, is for the wizards seated. A line goes to everyone at the table and in the gallery, and it is kept with the duel. When you come back, the hall says how many lines were said while you were away. The gallery only listens unless the host lets it talk. Then a watcher signs a name, and their lines read Name (gallery).

Before a duel begins, any seated wizard may challenge the keeper, who looks after this site. A seat is held under the keeper's name and the keeper's phone rings. The note beside the button gives the hour where the keeper lives, so you know whether to wait or come back later.

-

When a duel is over, anyone at the table may call for a rematch. That opens a new table of the same size with the same bots, and holds a seat for everyone who played. Transfer seat at the top of the page gives you four words that move your seat to another device. They work for ten minutes, and you enter them in the hall on the other device. If your browser has lost your seat altogether, write to the keeper from the room's page, and the keeper can send you a link that brings it back.

+

When a duel is over, anyone at the table may call for a rematch. That opens a new table of the same size with the same bots, and holds a seat for everyone who played. Transfer seat at the top of the page gives you four words that move your seat to another device. They work for ten minutes, and you enter them in the hall on the other device. If your browser has lost your seat altogether, ask the host: Seats at the top of their page makes the four words for you. Failing that, write to the keeper from the room's page for a link that brings the seat back. A wizard who cannot go on can have their seat given to a bot by the host, and four words from the host bring them back to it.

diff --git a/src/routes/join/[code]/+page.svelte b/src/routes/join/[code]/+page.svelte index 715f3ac..d75e3d2 100644 --- a/src/routes/join/[code]/+page.svelte +++ b/src/routes/join/[code]/+page.svelte @@ -3,8 +3,9 @@ import { page } from '$app/state'; import Board from '$lib/components/Board.svelte'; import ReportSlip from '$lib/components/ReportSlip.svelte'; + import SeatsSlip from '$lib/components/SeatsSlip.svelte'; import TableTalk from '$lib/components/TableTalk.svelte'; - import { rememberSeat, seatFor, seatInLink, ServerError, trustSeat, type HeldSeat } from '$lib/game/client'; + import { api, rememberSeat, seatFor, seatInLink, ServerError, trustSeat, type HeldSeat } from '$lib/game/client'; import { COMPACT_QUERY, Duel, NAME_MAX, playerName } from '$lib/game/duel.svelte'; const roomId = $derived((page.params.code ?? '').toUpperCase()); @@ -19,6 +20,11 @@ /** A phrase minted to carry this seat to another device, while it lasts. */ let phrase = $state<{ phrase: string; expiresAt: number } | null>(null); let rematching = $state(false); + let seatsOpen = $state(false); + /** Why this browser's seat no longer opens, when the server said so; shown while watching. */ + let seatLost = $state(''); + let claimPhrase = $state(''); + let claiming = $state(false); /** The hour where the keeper lives, in words, so a caller knows whether to wait. */ let minute = $state(0); @@ -90,8 +96,14 @@ }); // Only the server's refusal of the held token lets a link in: a dropped connection is not a lost seat. const refused = (e: unknown) => e instanceof ServerError && e.status === 403; + // A held seat the server refuses, with no link to replace it, is watched from the gallery, with the reason. + const watchRefused = (e: Error) => { + seatLost = e.message; + return Duel.watchRoom(id); + }; + seatLost = ''; const arrive = held - ? Duel.resumeRoom(id, held).catch((e: Error) => (sent && refused(e) ? take(sent) : Promise.reject(e))) + ? Duel.resumeRoom(id, held).catch((e: Error) => (sent && refused(e) ? take(sent) : refused(e) ? watchRefused(e) : Promise.reject(e))) : sent ? take(sent).catch(() => Duel.watchRoom(id)) : Duel.watchRoom(id); @@ -113,6 +125,37 @@ return stop; }); + // The seat stopped opening while the page was open (the host gave it to a bot): watch on from the gallery. + $effect(() => { + const r = room; + const lost = r?.remote?.lost; + if (!r || !lost) return; + seatLost = lost; + Duel.watchRoom(r.remote!.roomId) + .then((remote) => (room = new Duel(remote))) + .catch((e: Error) => (error = e.message)); + }); + + /** Sit back down by a phrase: the host's, or one this seat minted on another device. */ + async function claim(e: SubmitEvent) { + e.preventDefault(); + claiming = true; + error = ''; + try { + const got = await api.claim(claimPhrase.trim()); + rememberSeat(got.roomId, { seat: got.seat, token: got.token }); + trustSeat(got.roomId); + claimPhrase = ''; + seatLost = ''; + if (got.roomId === roomId) room = new Duel(await Duel.resumeRoom(roomId, { seat: got.seat, token: got.token })); + else await goto(`/join/${got.roomId}`); + } catch (err) { + error = err instanceof Error ? err.message : 'The phrase opened no seat.'; + } finally { + claiming = false; + } + } + // The store's idea of a narrow screen must agree with the stylesheets' breakpoint. $effect(() => { const r = room; @@ -183,6 +226,9 @@ {#if !watching} {/if} + {#if room.isHost && room.remote?.started} + + {/if} {/if} How to play Rules @@ -195,6 +241,7 @@ {#if room} + {#if room.isHost}{/if} {/if} {#if error} @@ -205,8 +252,19 @@

On the other device, open the hall and claim this phrase within ten minutes: {phrase.phrase}

{/if} +{#if room?.remote?.started && !seatLost && room.remote.seats.some((s) => s.standIn)} +

A bot duels for {room.remote.seats.filter((s) => s.standIn).map((s) => s.name).join(', ')}, at the host's word, until a transfer phrase from the host brings them back.

+{/if} + {#if watching && room?.remote?.started && !room.state.over} -

Had a seat at this table on another device? Transfer it from there and claim the phrase in the hall, or write to the keeper for a link that brings it back.

+
+ {#if seatLost}

{seatLost} Claim it here, or write to the keeper.

+ {:else}

Had a seat at this duel? Ask the host for a transfer phrase, or make one on the device that still holds the seat, and claim it here. Or write to the keeper for a link that brings it back.

{/if} +
+ + +
+
{/if} {#if room?.remote?.started && room.state.over && !watching}