ui/phase-11: map wired to live game state
Replaces the Phase 10 map stub with live planet rendering driven by `user.games.report`, and wires the header turn counter to the same data. Phase 11's frontend sits on a per-game `GameStateStore` that lives in `lib/game-state.svelte.ts`: the in-game shell layout instantiates one per game, exposes it through Svelte context, and disposes it on remount. The store discovers the game's current turn through `lobby.my.games.list`, fetches the matching report, and exposes a TS-friendly snapshot to the header turn counter, the map view, and the inspector / order / calculator tabs that later phases will plug onto the same instance. The pipeline forced one cross-stage decision: the user surface needs the current turn number to know which report to fetch, but `GameSummary` did not expose it. Phase 11 extends the lobby catalogue (FB schema, transcoder, Go model, backend gameSummaryWire, gateway decoders, openapi, TS bindings, api/lobby.ts) with `current_turn:int32`. The data was already tracked in backend's `RuntimeSnapshot.CurrentTurn`; surfacing it is a wire change only. Two alternatives were rejected: a brand-new `user.games.state` message (full wire-flow for one field) and hard-coding `turn=0` (works for the dev sandbox, which never advances past zero, but renders the initial state for any real game). The change crosses Phase 8's already-shipped catalogue per the project's "decisions baked back into the live plan" rule — existing tests and fixtures are updated in the same patch. The state binding lives in `map/state-binding.ts::reportToWorld`: one Point primitive per planet across all four kinds (local / other / uninhabited / unidentified) with distinct fill colours, fill alphas, and point radii so the user can tell them apart at a glance. The planet engine number is reused as the primitive id so a hit-test result resolves directly to a planet without an extra lookup table. Zero-planet reports yield a well-formed empty world; malformed dimensions fall back to 1×1 so a bad report cannot crash the renderer. The map view's mount effect creates the renderer once and skips re-mount on no-op refreshes (same turn, same wrap mode); a turn change or wrap-mode flip disposes and recreates it. The renderer's external API does not yet expose `setWorld`; Phase 24 / 34 will extract it once high-frequency updates land. The store installs a `visibilitychange` listener that calls `refresh()` when the tab regains focus. Wrap-mode preference uses `Cache` namespace `game-prefs`, key `<gameId>/wrap-mode`, default `torus`. Phase 11 reads through `store.wrapMode`; Phase 29 wires the toggle UI on top of `setWrapMode`. Tests: Vitest unit coverage for `reportToWorld` (every kind, ids, styling, empty / zero-dimension edges, priority order) and for the store lifecycle (init success, missing-membership error, forbidden-result error, `setTurn`, wrap-mode persistence across instances, `failBootstrap`). Playwright e2e mocks the gateway for `lobby.my.games.list` and `user.games.report` and asserts the live data path: turn counter shows the reported turn, `active-view-map` flips to `data-status="ready"`, and `data-planet-count` matches the fixture count. The zero-planet regression and the missing-membership error path are covered. Phase 11 status stays `pending` in `ui/PLAN.md` until the local-ci run lands green; flipping to `done` follows in the next commit per the per-stage CI gate in `CLAUDE.md`. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -62,7 +62,10 @@ type MyGamesListResponse struct {
|
||||
|
||||
// GameSummary stores one game record returned by the various lobby
|
||||
// list endpoints. `OwnerUserID` is empty for public games (no human
|
||||
// owner).
|
||||
// owner). `CurrentTurn` carries the runtime's most recently observed
|
||||
// turn number; the value is zero before the engine produces its first
|
||||
// snapshot. The user surface uses it to fetch the corresponding
|
||||
// `user.games.report` without an extra round-trip.
|
||||
type GameSummary struct {
|
||||
GameID string `json:"game_id"`
|
||||
GameName string `json:"game_name"`
|
||||
@@ -74,6 +77,7 @@ type GameSummary struct {
|
||||
EnrollmentEndsAt time.Time `json:"enrollment_ends_at"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
UpdatedAt time.Time `json:"updated_at"`
|
||||
CurrentTurn int32 `json:"current_turn"`
|
||||
}
|
||||
|
||||
// PublicGamesListRequest stores the paginated read request for joinable
|
||||
|
||||
@@ -6,7 +6,11 @@ namespace lobby;
|
||||
|
||||
// GameSummary stores one game record returned by the lobby list
|
||||
// endpoints. owner_user_id is empty for public games (no human owner).
|
||||
// The shape matches `lobby/openapi.yaml` `MyGameSummary`.
|
||||
// current_turn carries the runtime's most recent observed turn number
|
||||
// (zero before the engine produces its first snapshot); the user
|
||||
// surface uses it to read the corresponding `user.games.report`
|
||||
// without an extra round-trip. The shape matches `lobby/openapi.yaml`
|
||||
// `MyGameSummary`.
|
||||
table GameSummary {
|
||||
game_id:string;
|
||||
game_name:string;
|
||||
@@ -18,6 +22,7 @@ table GameSummary {
|
||||
enrollment_ends_at_ms:int64;
|
||||
created_at_ms:int64;
|
||||
updated_at_ms:int64;
|
||||
current_turn:int32;
|
||||
}
|
||||
|
||||
// MyGamesListRequest stores the authenticated read request for the
|
||||
|
||||
@@ -141,8 +141,20 @@ func (rcv *GameSummary) MutateUpdatedAtMs(n int64) bool {
|
||||
return rcv._tab.MutateInt64Slot(22, n)
|
||||
}
|
||||
|
||||
func (rcv *GameSummary) CurrentTurn() int32 {
|
||||
o := flatbuffers.UOffsetT(rcv._tab.Offset(24))
|
||||
if o != 0 {
|
||||
return rcv._tab.GetInt32(o + rcv._tab.Pos)
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (rcv *GameSummary) MutateCurrentTurn(n int32) bool {
|
||||
return rcv._tab.MutateInt32Slot(24, n)
|
||||
}
|
||||
|
||||
func GameSummaryStart(builder *flatbuffers.Builder) {
|
||||
builder.StartObject(10)
|
||||
builder.StartObject(11)
|
||||
}
|
||||
func GameSummaryAddGameId(builder *flatbuffers.Builder, gameId flatbuffers.UOffsetT) {
|
||||
builder.PrependUOffsetTSlot(0, flatbuffers.UOffsetT(gameId), 0)
|
||||
@@ -174,6 +186,9 @@ func GameSummaryAddCreatedAtMs(builder *flatbuffers.Builder, createdAtMs int64)
|
||||
func GameSummaryAddUpdatedAtMs(builder *flatbuffers.Builder, updatedAtMs int64) {
|
||||
builder.PrependInt64Slot(9, updatedAtMs, 0)
|
||||
}
|
||||
func GameSummaryAddCurrentTurn(builder *flatbuffers.Builder, currentTurn int32) {
|
||||
builder.PrependInt32Slot(10, currentTurn, 0)
|
||||
}
|
||||
func GameSummaryEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT {
|
||||
return builder.EndObject()
|
||||
}
|
||||
|
||||
@@ -783,6 +783,7 @@ func encodeGameSummary(builder *flatbuffers.Builder, summary lobbymodel.GameSumm
|
||||
lobbyfbs.GameSummaryAddEnrollmentEndsAtMs(builder, summary.EnrollmentEndsAt.UTC().UnixMilli())
|
||||
lobbyfbs.GameSummaryAddCreatedAtMs(builder, summary.CreatedAt.UTC().UnixMilli())
|
||||
lobbyfbs.GameSummaryAddUpdatedAtMs(builder, summary.UpdatedAt.UTC().UnixMilli())
|
||||
lobbyfbs.GameSummaryAddCurrentTurn(builder, summary.CurrentTurn)
|
||||
return lobbyfbs.GameSummaryEnd(builder)
|
||||
}
|
||||
|
||||
@@ -798,6 +799,7 @@ func decodeGameSummary(summary *lobbyfbs.GameSummary) lobbymodel.GameSummary {
|
||||
EnrollmentEndsAt: time.UnixMilli(summary.EnrollmentEndsAtMs()).UTC(),
|
||||
CreatedAt: time.UnixMilli(summary.CreatedAtMs()).UTC(),
|
||||
UpdatedAt: time.UnixMilli(summary.UpdatedAtMs()).UTC(),
|
||||
CurrentTurn: summary.CurrentTurn(),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -29,13 +29,14 @@ func TestLobbyMyGamesListRoundTrip(t *testing.T) {
|
||||
GameID: "game-private-7c8f",
|
||||
GameName: "First Contact",
|
||||
GameType: "private",
|
||||
Status: "draft",
|
||||
Status: "running",
|
||||
OwnerUserID: "user-9912",
|
||||
MinPlayers: 2,
|
||||
MaxPlayers: 8,
|
||||
EnrollmentEndsAt: ends,
|
||||
CreatedAt: created,
|
||||
UpdatedAt: updated,
|
||||
CurrentTurn: 7,
|
||||
},
|
||||
{
|
||||
GameID: "game-public-aabb",
|
||||
@@ -48,6 +49,7 @@ func TestLobbyMyGamesListRoundTrip(t *testing.T) {
|
||||
EnrollmentEndsAt: ends,
|
||||
CreatedAt: created,
|
||||
UpdatedAt: updated,
|
||||
CurrentTurn: 0,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user