The keeper can bring back a seat a browser lost: a reseat line on the ledger gives that wizard's seat a new token and the old one opens nothing after, wizwar-reseat.sh on the host asks for it through a keeper door that listens on the loopback alone and opens only to a key the deploy makes once, and the link it prints carries the seat in the fragment, which leaves the address bar at once and is kept only when no seat held in this browser still opens and the server takes it; a gallery watching a game in play is told both ways back, the front page asks before forgetting a game not yet finished, and the server's tests now run with the rest
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01MbtUPJ24P6vc6tE1x6RS3m
This commit is contained in:
Eric Wagoner
co-authored by
Claude Opus 5.5
Claude Opus 5.5
parent
1b9acfd7c4
commit
5ea0d4fdec
@@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { motion } from "./motion";
|
||||
import { attentionLabel, net, SIDE_NAMES, spellName } from "./net.svelte";
|
||||
import { attentionLabel, net, seatInLink, SIDE_NAMES, spellName } from "./net.svelte";
|
||||
import { MediaQuery } from "svelte/reactivity";
|
||||
import { FISTS } from "./fpv/paintedFx";
|
||||
import Board from "./Board.svelte";
|
||||
@@ -37,14 +37,29 @@
|
||||
* seat or the gallery, a started game is watched from the gallery. */
|
||||
const inviteCode = location.pathname.match(/^\/join\/([A-Za-z0-9]{4})$/)?.[1]?.toUpperCase() ?? null;
|
||||
if (inviteCode) joinCode = inviteCode;
|
||||
/** A link from the keeper carries a seat in its fragment. It leaves the
|
||||
* address bar at once, is tried only when no seat held here still opens,
|
||||
* and is kept only once the server takes it, so a link someone else
|
||||
* sends cannot take a working seat away. */
|
||||
const linkedSeat = inviteCode ? seatInLink(location.hash, inviteCode) : null;
|
||||
if (location.hash.startsWith("#seat=")) history.replaceState(history.state, "", location.pathname + location.search);
|
||||
let inviteFollowed = false;
|
||||
$effect(() => {
|
||||
if (!inviteCode || inviteFollowed || net.status !== "connected" || net.roomId) return;
|
||||
inviteFollowed = true;
|
||||
const seat = net.seats.find((s) => s.roomId === inviteCode);
|
||||
if (seat) net.resume(seat);
|
||||
else net.watch(inviteCode);
|
||||
const code = inviteCode;
|
||||
const fromLink = linkedSeat && (() => net.resume(linkedSeat, () => {
|
||||
net.watch(code);
|
||||
net.flash("The keeper's link no longer opens that seat. Write again for a fresh one.");
|
||||
}));
|
||||
const seat = net.seats.find((s) => s.roomId === code);
|
||||
if (seat) net.resume(seat, fromLink || undefined);
|
||||
else if (fromLink) fromLink();
|
||||
else net.watch(code);
|
||||
});
|
||||
/** A game not yet finished asks before it is forgotten: this browser may
|
||||
* be all that holds the seat. */
|
||||
let forgetting = $state<string | null>(null);
|
||||
/** The address bar holds the table's invite link while you sit at one,
|
||||
* so recruiting is a copy away. */
|
||||
$effect(() => {
|
||||
@@ -2701,8 +2716,15 @@
|
||||
<button class="stamp tiny" title="take your seat at the rematch"
|
||||
onclick={() => { net.you = seat.name; net.spectating = false; net.join(g.rematch!.roomId, seat.name); }}>rematch</button>
|
||||
{/if}
|
||||
<button class="ledger-forget" title="forget this game"
|
||||
onclick={() => net.forgetSeat(seat.roomId)}>×</button>
|
||||
{#if forgetting === seat.roomId}
|
||||
<span class="forget-ask">This browser may be all that holds your seat.
|
||||
<button class="hint-cancel" onclick={() => { forgetting = null; net.forgetSeat(seat.roomId); }}>forget it</button>
|
||||
<button class="hint-cancel" onclick={() => (forgetting = null)}>keep it</button>
|
||||
</span>
|
||||
{:else}
|
||||
<button class="ledger-forget" title="forget this game"
|
||||
onclick={() => { if (g?.finished) net.forgetSeat(seat.roomId); else forgetting = seat.roomId; }}>×</button>
|
||||
{/if}
|
||||
</div>
|
||||
{/each}
|
||||
{#if net.feedbackReports.length > 0}
|
||||
@@ -3731,6 +3753,9 @@
|
||||
<div class="hand" bind:this={handEl} role="list" class:spent={actionsSpent && !discardMode && discardSelection.size === 0} aria-label="your hand">
|
||||
{#if net.spectating}
|
||||
<span class="gallery-note">👁 You watch from the Peanut Gallery, and every hand stays secret, even from you.</span>
|
||||
{#if view.phase !== "finished"}
|
||||
<span class="gallery-note">Had a seat at this table on another device? Choose <em>transfer seat</em> there and claim the phrase on the front page, or <a href="mailto:eric@ericwagoner.com?subject={encodeURIComponent(`My seat in room ${net.roomId}`)}">write to the keeper</a> for a link that brings it back.</span>
|
||||
{/if}
|
||||
{/if}
|
||||
{#each view.phase === "finished" ? [] : orderedHand as card (card.instanceId)}
|
||||
<div class="hand-slot"
|
||||
@@ -4399,6 +4424,7 @@
|
||||
padding: 0 0.3rem;
|
||||
}
|
||||
.ledger-forget:hover { color: #b3372b; }
|
||||
.forget-ask { font-size: 0.8rem; color: #8d8672; flex: none; }
|
||||
|
||||
.stamp {
|
||||
font-family: "Oswald", sans-serif;
|
||||
|
||||
@@ -306,6 +306,12 @@
|
||||
whatever name you like, and know that what you say and do at an
|
||||
online table is part of its record.
|
||||
</p>
|
||||
<p>
|
||||
Your seat at an online game is kept in this browser. To carry it to
|
||||
another device, choose <em>transfer seat</em> at the table and claim
|
||||
the phrase there. If a browser loses it, write to the keeper for a
|
||||
link that brings it back.
|
||||
</p>
|
||||
<h3>Send word</h3>
|
||||
<p>
|
||||
Feedback, bug reports and faint praise are all welcome. Ravens fly to
|
||||
|
||||
@@ -297,6 +297,15 @@ function loadSeen(): Record<string, number> {
|
||||
|
||||
export interface Seat { name: string; roomId: string; token: string }
|
||||
|
||||
/** A seat the keeper sent in a link, `#seat=<name>.<token>`: a fragment
|
||||
* stays in the browser, out of every log. */
|
||||
export function seatInLink(hash: string, roomId: string): Seat | null {
|
||||
const m = /^#seat=(.+)\.([0-9a-f]{32})$/.exec(hash);
|
||||
if (!m) return null;
|
||||
try { return { name: decodeURIComponent(m[1]!), roomId, token: m[2]! }; }
|
||||
catch { return null; }
|
||||
}
|
||||
|
||||
export interface FeedbackReportView {
|
||||
id: string;
|
||||
at: string;
|
||||
@@ -445,6 +454,8 @@ class Net {
|
||||
private ws: WebSocket | null = null;
|
||||
private token: string | null = null;
|
||||
private roomIdPending: string | null = null;
|
||||
/** Where a resume turns when the server refuses its seat. */
|
||||
private onRefused: (() => void) | null = null;
|
||||
|
||||
connect(): void {
|
||||
if (this.ws) return;
|
||||
@@ -483,6 +494,8 @@ class Net {
|
||||
ws.onclose = () => {
|
||||
this.status = "disconnected";
|
||||
this.ws = null;
|
||||
// A dropped socket proves nothing about a seat: no fallback outlives it.
|
||||
this.onRefused = null;
|
||||
// Whatever was in flight is now in doubt: the board will say what
|
||||
// landed when the connection returns, and the talk goes back in the box.
|
||||
if (this.pending) { this.unconfirmed = this.pending.label; this.pending = null; }
|
||||
@@ -524,6 +537,7 @@ class Net {
|
||||
case "pong":
|
||||
break;
|
||||
case "seat": {
|
||||
this.onRefused = null;
|
||||
this.token = msg.token;
|
||||
const seatRoom = (this.roomIdPending ?? this.roomId ?? "").toUpperCase();
|
||||
if (seatRoom) {
|
||||
@@ -715,7 +729,20 @@ class Net {
|
||||
}
|
||||
break;
|
||||
}
|
||||
case "error":
|
||||
case "error": {
|
||||
// A refused seat with somewhere else to turn takes that turn, with
|
||||
// no toast for a door that was only tried. Only the server's word
|
||||
// that the token is wrong counts as a refusal; any other error
|
||||
// disarms the fallback.
|
||||
const refused = this.onRefused;
|
||||
this.onRefused = null;
|
||||
if (refused && this.roomIdPending && /name is taken/.test(msg.message)) {
|
||||
localStorage.removeItem(SEAT_KEY);
|
||||
this.roomIdPending = null;
|
||||
this.token = null;
|
||||
refused();
|
||||
break;
|
||||
}
|
||||
// "Name is taken" means THIS token was tried and refused: the
|
||||
// credential itself is dead, and holding it helps nobody. But
|
||||
// "no such room" proves nothing about the seat — a restarting
|
||||
@@ -734,6 +761,7 @@ class Net {
|
||||
this.log = [...this.log, { text: `— ${msg.message} —`, turn: null, notable: false }];
|
||||
setTimeout(() => { if (this.error === msg.message) this.error = null; }, 5000);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -775,8 +803,10 @@ class Net {
|
||||
}
|
||||
}
|
||||
|
||||
/** Sit back down at a remembered seat. */
|
||||
resume(seat: Seat): void {
|
||||
/** Sit back down at a seat. It is remembered only once the server
|
||||
* takes it; `refused` runs if the server turns it away. */
|
||||
resume(seat: Seat, refused?: () => void): void {
|
||||
this.onRefused = refused ?? null;
|
||||
this.you = seat.name;
|
||||
this.spectating = false;
|
||||
this.token = seat.token;
|
||||
|
||||
Reference in New Issue
Block a user