ryan/games
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

refactor: extract shared player, session, and chat packages #5

Merged
ryan merged 14 commits from refactor/shared-player-session-chat into main 2026-03-03 08:50:13 +00:00
Conversation 0 Commits 14 Files Changed 53 +20 -8
5 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fb6c0e3d90 - Show all commits

6
connect4/types.go
View File

@@ -6,6 +6,12 @@ import (
"github.com/ryanhamamura/games/player"
)
// NATS subject helpers.
const SubjectPrefix = "connect4"
func GameSubject(gameID string) string { return SubjectPrefix + "." + gameID }
func ChatSubject(gameID string) string { return SubjectPrefix + ".chat." + gameID }
type Player struct {
ID player.ID
UserID *string // UUID for authenticated users, nil for guests

6
features/c4game/handlers.go
View File

@@ -111,14 +111,14 @@ func HandleGameEvents(store *connect4.Store, nc *nats.Conn, sm *scs.SessionManag
))
chatCfg := c4ChatConfig(gameID)
room := chat.NewPersistentRoom(nc, "connect4.chat."+gameID, queries, gameID)
room := chat.NewPersistentRoom(nc, connect4.ChatSubject(gameID), queries, gameID)
// Send initial render
sendGameComponents(sse, gi, myColor, room, chatCfg)
// Subscribe to game state updates
gameCh := make(chan *nats.Msg, 64)
gameSub, err := nc.ChanSubscribe("connect4."+gameID, gameCh)
gameSub, err := nc.ChanSubscribe(connect4.GameSubject(gameID), gameCh)
if err != nil {
return
}
@@ -228,7 +228,7 @@ func HandleSendChat(store *connect4.Store, nc *nats.Conn, sm *scs.SessionManager
Message: signals.ChatMsg,
Time: time.Now().UnixMilli(),
}
room := chat.NewPersistentRoom(nc, "connect4.chat."+gameID, queries, gameID)
room := chat.NewPersistentRoom(nc, connect4.ChatSubject(gameID), queries, gameID)
room.Send(msg)
sse := datastar.NewSSE(w, r)

6
features/snakegame/handlers.go
View File

@@ -114,7 +114,7 @@ func HandleSnakeEvents(snakeStore *snake.SnakeStore, nc *nats.Conn, sm *scs.Sess
// Subscribe to game updates via NATS
gameCh := make(chan *nats.Msg, 64)
gameSub, err := nc.ChanSubscribe("snake."+gameID, gameCh)
gameSub, err := nc.ChanSubscribe(snake.GameSubject(gameID), gameCh)
if err != nil {
return
}
@@ -126,7 +126,7 @@ func HandleSnakeEvents(snakeStore *snake.SnakeStore, nc *nats.Conn, sm *scs.Sess
var room *chat.Room
if sg.Mode == snake.ModeMultiplayer {
room = chat.NewRoom(nc, "snake.chat."+gameID)
room = chat.NewRoom(nc, snake.ChatSubject(gameID))
chatCh, chatSub, err = room.Subscribe()
if err != nil {
return
@@ -247,7 +247,7 @@ func HandleSendChat(snakeStore *snake.SnakeStore, nc *nats.Conn, sm *scs.Session
Message: signals.ChatMsg,
}
room := chat.NewRoom(nc, "snake.chat."+gameID)
room := chat.NewRoom(nc, snake.ChatSubject(gameID))
room.Send(msg)
sse := datastar.NewSSE(w, r)

4
main.go
View File

@@ -73,12 +73,12 @@ func run(ctx context.Context) error {
// Game stores
store := connect4.NewStore(queries)
store.SetNotifyFunc(func(gameID string) {
nc.Publish("connect4."+gameID, nil) //nolint:errcheck // best-effort notification
nc.Publish(connect4.GameSubject(gameID), nil) //nolint:errcheck // best-effort notification
})
snakeStore := snake.NewSnakeStore(queries)
snakeStore.SetNotifyFunc(func(gameID string) {
nc.Publish("snake."+gameID, nil) //nolint:errcheck // best-effort notification
nc.Publish(snake.GameSubject(gameID), nil) //nolint:errcheck // best-effort notification
})
// Router

6
snake/types.go
View File

@@ -7,6 +7,12 @@ import (
"github.com/ryanhamamura/games/player"
)
// NATS subject helpers.
const SubjectPrefix = "snake"
func GameSubject(gameID string) string { return SubjectPrefix + "." + gameID }
func ChatSubject(gameID string) string { return SubjectPrefix + ".chat." + gameID }
type Direction int
const (