The keeper can say a word at a table through the keeper's door, signed as the keeper and heard whether or not the gallery may talk, so a call answered too late, after the duel began, can still be answered; waving-hands-say.sh sends it
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0141G6xqLeNRYEtviLWSB5Up
This commit is contained in:
1 parent
745b8e99b9
commit
f21b2c3b16
9 files changed
+48
-4
No files matched your search
@@ -57,6 +57,9 @@ A fresh host, when one is needed: `doctl compute droplet create hall --region ny
|
|||||||
through the duel server's `/keeper` door, which Caddy does not proxy and
|
through the duel server's `/keeper` door, which Caddy does not proxy and
|
||||||
which asks for the key in /etc/waving-hands/keeper.key, made by the deploy
|
which asks for the key in /etc/waving-hands/keeper.key, made by the deploy
|
||||||
and readable by root and the waving-hands user alone.
|
and readable by root and the waving-hands user alone.
|
||||||
|
- `waving-hands-say.sh ROOM "text"`: a word from the keeper in a table's
|
||||||
|
talk, signed as the keeper, through the same door; it is heard whether or
|
||||||
|
not the gallery may talk, so a call that came too late can be answered.
|
||||||
- `waving-hands-pulse.sh`: the weekly health check (service, errors, rollup
|
- `waving-hands-pulse.sh`: the weekly health check (service, errors, rollup
|
||||||
trend, backup, box).
|
trend, backup, box).
|
||||||
- `waving-hands-rollup.sh [day]`: one JSON line per day of counts, run
|
- `waving-hands-rollup.sh [day]`: one JSON line per day of counts, run
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ ssh "root@$HOST" '
|
|||||||
install -m 755 /opt/waving-hands/app/deploy/waving-hands-rollup.sh /usr/local/bin/waving-hands-rollup.sh
|
install -m 755 /opt/waving-hands/app/deploy/waving-hands-rollup.sh /usr/local/bin/waving-hands-rollup.sh
|
||||||
install -m 755 /opt/waving-hands/app/deploy/waving-hands-backup.sh /usr/local/bin/waving-hands-backup.sh
|
install -m 755 /opt/waving-hands/app/deploy/waving-hands-backup.sh /usr/local/bin/waving-hands-backup.sh
|
||||||
install -m 755 /opt/waving-hands/app/deploy/waving-hands-reseat.sh /usr/local/bin/waving-hands-reseat.sh
|
install -m 755 /opt/waving-hands/app/deploy/waving-hands-reseat.sh /usr/local/bin/waving-hands-reseat.sh
|
||||||
|
install -m 755 /opt/waving-hands/app/deploy/waving-hands-say.sh /usr/local/bin/waving-hands-say.sh
|
||||||
# The key to the keeper door: made once, readable by root (the reseat script) and the game user (the server) alone.
|
# The key to the keeper door: made once, readable by root (the reseat script) and the game user (the server) alone.
|
||||||
if [ ! -s /etc/waving-hands/keeper.key ]; then
|
if [ ! -s /etc/waving-hands/keeper.key ]; then
|
||||||
install -d -m 750 -o root -g waving-hands /etc/waving-hands
|
install -d -m 750 -o root -g waving-hands /etc/waving-hands
|
||||||
|
|||||||
Executable
+18
@@ -0,0 +1,18 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# A word from the keeper in a table's talk, signed as the keeper, whether or
|
||||||
|
# not the host lets the gallery talk: the answer to a call that came too late,
|
||||||
|
# or anything else the table should hear from the keeper. Runs ON the droplet,
|
||||||
|
# through the duel server's keeper door.
|
||||||
|
# waving-hands-say.sh ROOM "text"
|
||||||
|
set -euo pipefail
|
||||||
|
ROOM="${1:?usage: waving-hands-say.sh ROOM \"text\"}"
|
||||||
|
TEXT="${2:?usage: waving-hands-say.sh ROOM \"text\"}"
|
||||||
|
DOOR="http://127.0.0.1:8788/keeper/rooms/${ROOM^^}"
|
||||||
|
[ -s /etc/waving-hands/keeper.key ] || { echo "No keeper's key at /etc/waving-hands/keeper.key; a deploy makes it." >&2; exit 1; }
|
||||||
|
# The key goes as a header read from a file descriptor, never on a command line another user could see.
|
||||||
|
KEY="@/dev/fd/3"
|
||||||
|
exec 3< <(printf 'x-keeper-key: %s\n' "$(cat /etc/waving-hands/keeper.key)")
|
||||||
|
BODY=$(TEXT="$TEXT" python3 -c 'import json, os; print(json.dumps({"text": os.environ["TEXT"]}))')
|
||||||
|
CODE=$(curl -s -o /tmp/waving-hands-say.$$ -w '%{http_code}' -X POST -H "$KEY" -H 'content-type: application/json' -d "$BODY" "$DOOR/say")
|
||||||
|
if [ "$CODE" = 204 ]; then echo "said at ${ROOM^^}"; else cat /tmp/waving-hands-say.$$ >&2; echo >&2; rm -f /tmp/waving-hands-say.$$; exit 1; fi
|
||||||
|
rm -f /tmp/waving-hands-say.$$
|
||||||
@@ -31,6 +31,7 @@
|
|||||||
//
|
//
|
||||||
// GET /keeper/rooms/:id who sits at the table, and when each wizard last moved or spoke
|
// GET /keeper/rooms/:id who sits at the table, and when each wizard last moved or spoke
|
||||||
// POST /keeper/rooms/:id/reseat {seat} a new token for a player locked out, as a link to send them
|
// POST /keeper/rooms/:id/reseat {seat} a new token for a player locked out, as a link to send them
|
||||||
|
// POST /keeper/rooms/:id/say {text} a word from the keeper in the table's talk
|
||||||
|
|
||||||
import * as Sentry from '@sentry/node';
|
import * as Sentry from '@sentry/node';
|
||||||
import { createServer, type IncomingMessage, type ServerResponse } from 'node:http';
|
import { createServer, type IncomingMessage, type ServerResponse } from 'node:http';
|
||||||
@@ -234,6 +235,11 @@ async function handleKeeper(req: IncomingMessage, res: ServerResponse, parts: st
|
|||||||
// The token rides the fragment, which the browser keeps to itself: it reaches neither Caddy's log nor this server.
|
// The token rides the fragment, which the browser keeps to itself: it reaches neither Caddy's log nor this server.
|
||||||
return send(res, 200, { name: seat.name, link: `${PUBLIC_URL}/join/${room.id}#seat=${seat.id}.${token}` });
|
return send(res, 200, { name: seat.name, link: `${PUBLIC_URL}/join/${room.id}#seat=${seat.id}.${token}` });
|
||||||
}
|
}
|
||||||
|
if (parts[3] === 'say' && parts.length === 4 && req.method === 'POST') {
|
||||||
|
const body = await readBody(req);
|
||||||
|
rooms.keeperSays(room, KEEPER, body.text);
|
||||||
|
return send(res, 204, {});
|
||||||
|
}
|
||||||
throw new RoomError('Not here.', 404);
|
throw new RoomError('Not here.', 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
|||||||
import { Rooms } from './rooms';
|
import { Rooms } from './rooms';
|
||||||
import { chooseBotTurn } from '../../src/lib/game/bot';
|
import { chooseBotTurn } from '../../src/lib/game/bot';
|
||||||
import { Store } from './store';
|
import { Store } from './store';
|
||||||
|
import { SPECTATOR } from '../../src/lib/game/state';
|
||||||
|
|
||||||
let dir: string;
|
let dir: string;
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
@@ -38,6 +39,15 @@ describe('rooms', () => {
|
|||||||
expect(() => rooms.seatOf(reopened, bo)).toThrow(/opens no seat/);
|
expect(() => rooms.seatOf(reopened, bo)).toThrow(/opens no seat/);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("puts the keeper's word in the table's talk though the gallery may not talk, and a restart keeps it", () => {
|
||||||
|
const { rooms, room } = table();
|
||||||
|
expect(room.galleryTalk).toBe(false);
|
||||||
|
rooms.keeperSays(room, 'Kestrel', 'I came too late for the seat; call me again.');
|
||||||
|
const said = { id: SPECTATOR, name: 'Kestrel', keeper: true, text: 'I came too late for the seat; call me again.' };
|
||||||
|
expect(room.chat.at(-1)).toMatchObject(said);
|
||||||
|
expect(new Rooms(new Store(dir)).get(room.id).chat.at(-1)).toMatchObject(said);
|
||||||
|
});
|
||||||
|
|
||||||
it('re-seats only a wizard, and says when each last acted', () => {
|
it('re-seats only a wizard, and says when each last acted', () => {
|
||||||
const { rooms, room, ann } = table();
|
const { rooms, room, ann } = table();
|
||||||
expect(() => rooms.reseat(room, 'Z')).toThrow(/No wizard sits/);
|
expect(() => rooms.reseat(room, 'Z')).toThrow(/No wizard sits/);
|
||||||
|
|||||||
+6
-1
@@ -203,6 +203,11 @@ export class Rooms {
|
|||||||
this.commit(room, { t: 'chat', at: Date.now(), id: SPECTATOR, name, text: cleanTalk(raw) });
|
this.commit(room, { t: 'chat', at: Date.now(), id: SPECTATOR, name, text: cleanTalk(raw) });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The keeper of the site says a word at a table from the keeper's door, whether or not the gallery may talk: the answer to a call they could not take up. */
|
||||||
|
keeperSays(room: Room, keeper: string, raw: unknown): void {
|
||||||
|
this.commit(room, { t: 'chat', at: Date.now(), id: SPECTATOR, name: keeper, text: cleanTalk(raw), keeper: true });
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A seated wizard calls the keeper of the site to the table: a seat is
|
* A seated wizard calls the keeper of the site to the table: a seat is
|
||||||
* held under the keeper's name and the call goes on the ledger. Once per
|
* held under the keeper's name and the call goes on the ledger. Once per
|
||||||
@@ -552,7 +557,7 @@ function apply(room: Room, line: LedgerLine): void {
|
|||||||
case 'over':
|
case 'over':
|
||||||
break;
|
break;
|
||||||
case 'chat':
|
case 'chat':
|
||||||
room.chat.push({ id: line.id, text: line.text, at: line.at, ...(line.name ? { name: line.name } : {}) });
|
room.chat.push({ id: line.id, text: line.text, at: line.at, ...(line.name ? { name: line.name } : {}), ...(line.keeper ? { keeper: true as const } : {}) });
|
||||||
if (room.chat.length > CHAT_KEEP) room.chat.splice(0, room.chat.length - CHAT_KEEP);
|
if (room.chat.length > CHAT_KEEP) room.chat.splice(0, room.chat.length - CHAT_KEEP);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@ export type LedgerLine =
|
|||||||
/** Written after the turn that ends the duel, for anything that reads ledgers without the engine. */
|
/** Written after the turn that ends the duel, for anything that reads ledgers without the engine. */
|
||||||
| { t: 'over'; at: number; winner: WizardId | null; reason: string }
|
| { t: 'over'; at: number; winner: WizardId | null; reason: string }
|
||||||
/** A line of table talk: from a seat, or, with `name`, from the Peanut Gallery (id SPECTATOR). */
|
/** A line of table talk: from a seat, or, with `name`, from the Peanut Gallery (id SPECTATOR). */
|
||||||
| { t: 'chat'; at: number; id: WizardId; text: string; name?: string }
|
| { t: 'chat'; at: number; id: WizardId; text: string; name?: string; keeper?: true }
|
||||||
/** The host let the gallery talk, or hushed it. */
|
/** The host let the gallery talk, or hushed it. */
|
||||||
| { t: 'galleryTalk'; at: number; on: boolean; by: WizardId }
|
| { t: 'galleryTalk'; at: number; on: boolean; by: WizardId }
|
||||||
/** A seat is held for the keeper of the site, called to the table. */
|
/** A seat is held for the keeper of the site, called to the table. */
|
||||||
|
|||||||
@@ -49,7 +49,7 @@
|
|||||||
<li class="muted">Nobody has said a word.</li>
|
<li class="muted">Nobody has said a word.</li>
|
||||||
{/if}
|
{/if}
|
||||||
{#each lines as line, i (line.at + ':' + i)}
|
{#each lines as line, i (line.at + ':' + i)}
|
||||||
<li class:you={!line.name && line.id === duel.me}><em>{line.name ? `${line.name} (gallery)` : line.id === duel.me ? 'You' : duel.speaker(line.id)}</em> {line.text}</li>
|
<li class:you={!line.name && line.id === duel.me}><em>{line.keeper ? `${line.name}, the keeper` : line.name ? `${line.name} (gallery)` : line.id === duel.me ? 'You' : duel.speaker(line.id)}</em> {line.text}</li>
|
||||||
{/each}
|
{/each}
|
||||||
</ul>
|
</ul>
|
||||||
{#if remote.spectating && remote.galleryTalk}
|
{#if remote.spectating && remote.galleryTalk}
|
||||||
|
|||||||
@@ -15,12 +15,13 @@ export function viewFor(state: GameState, viewer: WizardId): GameState {
|
|||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** One line of table talk: from a seat, or from the Peanut Gallery when the host allows it (id SPECTATOR, signed with `name`). */
|
/** One line of table talk: from a seat, or from the Peanut Gallery when the host allows it (id SPECTATOR, signed with `name`), or from the keeper of the site. */
|
||||||
export interface ChatLine {
|
export interface ChatLine {
|
||||||
id: WizardId;
|
id: WizardId;
|
||||||
text: string;
|
text: string;
|
||||||
at: number;
|
at: number;
|
||||||
name?: string;
|
name?: string;
|
||||||
|
keeper?: true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** What a seated player, or the gallery, is told by the server. Other seats' moves and tokens never leave it. */
|
/** What a seated player, or the gallery, is told by the server. Other seats' moves and tokens never leave it. */
|
||||||
|
|||||||
Reference in new issue
Block a user