f9faebfa91
CI / changes (pull_request) Successful in 2s
CI / unit (pull_request) Successful in 10s
CI / integration (pull_request) Successful in 13s
CI / ui (pull_request) Successful in 51s
CI / gate (pull_request) Successful in 0s
CI / deploy (pull_request) Successful in 2m20s
The in-game hint badge re-fetched on entry and, for a game where it was the player's turn, showed a too-high count that "reset" (e.g. back to 11) — the wallet hint spent in another game was not reflected. Root cause: the server sends one hints_remaining = per-game allowance + global wallet, and the client cached that combined number per game. The wallet is global, so spending a wallet hint in one game left every other game's cached count stale (a my-turn game holds the stalest value: the opponent-moved delta preserves the old number, whereas a game you just moved in re-cached a fresh one). The backend allowance-then-wallet spend order was already correct. Fix: split the two. StateView/HintResult gain a trailing wallet_balance field (the global wallet alone); the client derives the per-game allowance as hints_remaining - wallet_balance (stable, cacheable) and reads the wallet live from the profile, refreshing it from every state/hint response. The badge is allowance + live wallet, so a wallet hint anywhere updates every game at once. - wire: scrabble.fbs StateView/HintResult + pkg/wire.BuildStateView (the single encoder for both the gateway transcode and the backend's event StateView), gateway encode + resp structs, regen. - backend: game StateView/HintResult + service (GameState/Hint) + eventwire + notify PlayerState/encode + server DTOs. - ui: lib/hints.ts (pure hintsLeft), Game.svelte (badge + syncWallet on load/hint, carry wallet_balance through applyMoveResult), codec/model, mock. - docs: ARCHITECTURE §Hint. Tests: hints.ts unit (incl. the staleness case), TestHintPolicy extended (wallet_balance + allowance-first), gateway state/hint round-trips.
122 lines
4.3 KiB
Go
122 lines
4.3 KiB
Go
package notify
|
|
|
|
import (
|
|
flatbuffers "github.com/google/flatbuffers/go"
|
|
|
|
"scrabble/backend/internal/engine"
|
|
"scrabble/pkg/wire"
|
|
)
|
|
|
|
// The builders below encode the nested wire tables embedded in enriched event
|
|
// payloads. They map the domain's already-resolved values (notify.* payload structs
|
|
// and the decoded engine.MoveRecord) to the neutral scrabble/pkg/wire structs and
|
|
// delegate the FlatBuffers construction to package wire — the single definition of the
|
|
// nested-table layout shared with the gateway transcoder. Each returns the offset of
|
|
// the table it built; callers must build every nested table before opening the parent.
|
|
|
|
// toWireGame maps a GameSummary to the shared wire.GameView.
|
|
func toWireGame(g GameSummary) wire.GameView {
|
|
seats := make([]wire.SeatView, len(g.Seats))
|
|
for i, s := range g.Seats {
|
|
seats[i] = wire.SeatView{
|
|
Seat: s.Seat,
|
|
AccountID: s.AccountID,
|
|
Score: s.Score,
|
|
HintsUsed: s.HintsUsed,
|
|
IsWinner: s.IsWinner,
|
|
DisplayName: s.DisplayName,
|
|
}
|
|
}
|
|
return wire.GameView{
|
|
ID: g.ID,
|
|
Variant: g.Variant,
|
|
DictVersion: g.DictVersion,
|
|
Status: g.Status,
|
|
Players: g.Players,
|
|
ToMove: g.ToMove,
|
|
TurnTimeoutSecs: g.TurnTimeoutSecs,
|
|
MultipleWordsPerTurn: g.MultipleWordsPerTurn,
|
|
VsAI: g.VsAI,
|
|
MoveCount: g.MoveCount,
|
|
EndReason: g.EndReason,
|
|
Seats: seats,
|
|
LastActivityUnix: g.LastActivityUnix,
|
|
}
|
|
}
|
|
|
|
// buildGameView builds a GameView table from a GameSummary and returns its offset.
|
|
func buildGameView(b *flatbuffers.Builder, g GameSummary) flatbuffers.UOffsetT {
|
|
return wire.BuildGameView(b, toWireGame(g))
|
|
}
|
|
|
|
// buildMoveRecord builds a MoveRecord table from a decoded engine move and returns its
|
|
// offset (Count is the engine count: the number of tiles swapped on an exchange, zero
|
|
// otherwise).
|
|
func buildMoveRecord(b *flatbuffers.Builder, m engine.MoveRecord) flatbuffers.UOffsetT {
|
|
tiles := make([]wire.TileRecord, len(m.Tiles))
|
|
for i, t := range m.Tiles {
|
|
tiles[i] = wire.TileRecord{Row: t.Row, Col: t.Col, Letter: t.Letter, Blank: t.Blank}
|
|
}
|
|
return wire.BuildMoveRecord(b, wire.MoveRecord{
|
|
Player: m.Player,
|
|
Action: m.Action.String(),
|
|
Dir: m.Dir.String(),
|
|
MainRow: m.MainRow,
|
|
MainCol: m.MainCol,
|
|
Tiles: tiles,
|
|
Words: m.Words,
|
|
Count: m.Count,
|
|
Score: m.Score,
|
|
Total: m.Total,
|
|
})
|
|
}
|
|
|
|
// buildStateView builds a StateView table from a PlayerState and returns its offset.
|
|
func buildStateView(b *flatbuffers.Builder, s PlayerState) flatbuffers.UOffsetT {
|
|
alphabet := make([]wire.AlphabetEntry, len(s.Alphabet))
|
|
for i, e := range s.Alphabet {
|
|
alphabet[i] = wire.AlphabetEntry{Index: e.Index, Letter: e.Letter, Value: e.Value}
|
|
}
|
|
return wire.BuildStateView(b, wire.StateView{
|
|
Game: toWireGame(s.Game),
|
|
Seat: s.Seat,
|
|
Rack: s.Rack,
|
|
BagLen: s.BagLen,
|
|
HintsRemaining: s.HintsRemaining,
|
|
WalletBalance: s.WalletBalance,
|
|
Alphabet: alphabet,
|
|
})
|
|
}
|
|
|
|
// buildAccountRef builds an AccountRef table and returns its offset.
|
|
func buildAccountRef(b *flatbuffers.Builder, a AccountRef) flatbuffers.UOffsetT {
|
|
return wire.BuildAccountRef(b, wire.AccountRef{AccountID: a.AccountID, DisplayName: a.DisplayName})
|
|
}
|
|
|
|
// buildInvitation builds an Invitation table from an InvitationSummary and returns its offset.
|
|
func buildInvitation(b *flatbuffers.Builder, inv InvitationSummary) flatbuffers.UOffsetT {
|
|
invitees := make([]wire.InvitationInvitee, len(inv.Invitees))
|
|
for i, iv := range inv.Invitees {
|
|
invitees[i] = wire.InvitationInvitee{
|
|
AccountID: iv.AccountID,
|
|
DisplayName: iv.DisplayName,
|
|
Seat: iv.Seat,
|
|
Response: iv.Response,
|
|
}
|
|
}
|
|
return wire.BuildInvitation(b, wire.Invitation{
|
|
ID: inv.ID,
|
|
Inviter: wire.AccountRef{AccountID: inv.Inviter.AccountID, DisplayName: inv.Inviter.DisplayName},
|
|
Invitees: invitees,
|
|
Variant: inv.Variant,
|
|
TurnTimeoutSecs: inv.TurnTimeoutSecs,
|
|
HintsAllowed: inv.HintsAllowed,
|
|
HintsPerPlayer: inv.HintsPerPlayer,
|
|
MultipleWordsPerTurn: inv.MultipleWordsPerTurn,
|
|
DropoutTiles: inv.DropoutTiles,
|
|
Status: inv.Status,
|
|
GameID: inv.GameID,
|
|
ExpiresAtUnix: inv.ExpiresAtUnix,
|
|
})
|
|
}
|