refactor: simplify chat subscription API
Room.Subscribe() now returns a channel of parsed Message structs instead of raw NATS messages. The room handles NATS subscription and message parsing internally, so callers no longer need to call Receive() separately.
This commit is contained in:
@@ -132,11 +132,8 @@ func HandleGameEvents(store *connect4.Store, nc *nats.Conn, sm *scs.SessionManag
|
||||
defer gameSub.Unsubscribe() //nolint:errcheck
|
||||
|
||||
// Subscribe to chat messages
|
||||
chatCh, chatSub, err := room.Subscribe()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
defer chatSub.Unsubscribe() //nolint:errcheck
|
||||
chatCh, cleanupChat := room.Subscribe()
|
||||
defer cleanupChat()
|
||||
|
||||
ctx := r.Context()
|
||||
for {
|
||||
@@ -147,8 +144,7 @@ func HandleGameEvents(store *connect4.Store, nc *nats.Conn, sm *scs.SessionManag
|
||||
if err := patchAll(); err != nil {
|
||||
return
|
||||
}
|
||||
case msg := <-chatCh:
|
||||
chatMsg, _ := room.Receive(msg.Data)
|
||||
case chatMsg := <-chatCh:
|
||||
err := sse.PatchElementTempl(
|
||||
chatcomponents.ChatMessage(chatMsg, chatCfg),
|
||||
datastar.WithSelectorID("c4-chat-history"),
|
||||
|
||||
@@ -137,15 +137,12 @@ func HandleSnakeEvents(snakeStore *snake.SnakeStore, nc *nats.Conn, sm *scs.Sess
|
||||
defer gameSub.Unsubscribe() //nolint:errcheck
|
||||
|
||||
// Chat subscription (multiplayer only)
|
||||
var chatCh chan *nats.Msg
|
||||
var chatSub *nats.Subscription
|
||||
var chatCh <-chan chat.Message
|
||||
var cleanupChat func()
|
||||
|
||||
if room != nil {
|
||||
chatCh, chatSub, err = room.Subscribe()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
defer chatSub.Unsubscribe() //nolint:errcheck
|
||||
chatCh, cleanupChat = room.Subscribe()
|
||||
defer cleanupChat()
|
||||
}
|
||||
|
||||
ctx := r.Context()
|
||||
@@ -168,11 +165,10 @@ func HandleSnakeEvents(snakeStore *snake.SnakeStore, nc *nats.Conn, sm *scs.Sess
|
||||
return
|
||||
}
|
||||
|
||||
case msg := <-chatCh:
|
||||
if msg == nil {
|
||||
case chatMsg, ok := <-chatCh:
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
chatMsg, _ := room.Receive(msg.Data)
|
||||
err := sse.PatchElementTempl(
|
||||
chatcomponents.ChatMessage(chatMsg, chatCfg),
|
||||
datastar.WithSelectorID("snake-chat-history"),
|
||||
|
||||
Reference in New Issue
Block a user