Draft: big refactor

plays/lobby.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net/http"
 	"strings"
-	"time"
 
 	"gitea.konchin.com/ytshih/inp2025/game/models"
 	"gitea.konchin.com/ytshih/inp2025/game/tracing"
@@ -14,7 +13,7 @@ import (
 )
 
 var (
-	lobbyChoices = []string{"No-op", "Logout"}
+	lobbyChoices = []string{"Create Room", "Join Room", "Refresh", "Logout"}
 )
 
 type Lobby struct {
@@ -23,62 +22,44 @@ type Lobby struct {
 	choice string
 	cursor int
 
-	updateCh chan struct{}
-	users    []models.UserStatus
-	rooms    []models.Room
+	users []models.UserStatus
+	rooms []types.Room
 }
 
 func NewLobby(base *Base) *Lobby {
-	m := Lobby{
-		Base:     base,
-		choice:   "",
-		cursor:   0,
-		updateCh: make(chan struct{}, 1),
+	m := &Lobby{
+		Base:   base,
+		choice: "",
+		cursor: 0,
 	}
-
-	return &m
+	return m
 }
 
-func updateLobbyInfo(m *Lobby) error {
-	for {
-		select {
-		case <-m.updateCh:
-			return nil
-		default:
-			var users []models.UserStatus
-			resp, err := m.Base.client.R().
-				SetResult(&users).
-				ForceContentType("application/json").
-				Get("/api/lobby/users")
-			if resp.StatusCode() != http.StatusOK {
-				tracing.Logger.
-					Error("failed to get lobby users",
-						zap.Error(err))
-				return err
-			}
-			m.users = users
-
-			var rooms []models.Room
-			_, err = m.Base.client.R().
-				SetResult(&rooms).
-				ForceContentType("application/json").
-				Get("/api/lobby/rooms")
-			if err != nil {
-				tracing.Logger.
-					Error("failed to get lobby rooms",
-						zap.Error(err))
-				return err
-			}
-			m.rooms = rooms
-
-			time.Sleep(refetchTick)
-		}
+func (m *Lobby) fetchLobbyInfo() tea.Msg {
+	var users []models.UserStatus
+	resp, err := m.Base.client.R(). 
+		SetResult(&users).
+		Get("/api/lobby/users")
+	if err != nil || resp.StatusCode() != http.StatusOK {
+		tracing.Logger.Error("failed to get lobby users", zap.Error(err))
+		return nil
 	}
+	m.users = users
+
+	var rooms []types.Room
+	resp, err = m.Base.client.R().
+		SetResult(&rooms).
+		Get("/api/lobby/rooms")
+	if err != nil || resp.StatusCode() != http.StatusOK {
+		tracing.Logger.Error("failed to get lobby rooms", zap.Error(err))
+		return nil
+	}
+	m.rooms = rooms
+	return nil
 }
 
 func (m *Lobby) Init() tea.Cmd {
-	go updateLobbyInfo(m)
-	return tea.Sequence(tea.ClearScreen, Tick(refreshTick))
+	return tea.Batch(tea.ClearScreen, m.fetchLobbyInfo)
 }
 
 func (m *Lobby) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
@@ -107,8 +88,6 @@ func (m *Lobby) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				m.cursor = len(lobbyChoices) - 1
 			}
 		}
-	case types.TickMsg:
-		return m, Tick(refreshTick)
 	}
 	return m, nil
 }
@@ -116,19 +95,20 @@ func (m *Lobby) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 func (m *Lobby) View() string {
 	var b strings.Builder
 
-	fmt.Fprintf(&b, "Game lobby\n")
+	fmt.Fprintf(&b, "Game lobby\n\n")
 
-	fmt.Fprintf(&b, "User Status (%d):\n", len(m.users))
+	fmt.Fprintf(&b, "Online Users (%d):\n", len(m.users))
 	for _, user := range m.users {
 		b.WriteString("- " + user.View() + "\n")
 	}
+	b.WriteString("\n")
 
-	fmt.Fprintf(&b, "Room Status (%d):\n", len(m.rooms))
+	fmt.Fprintf(&b, "Game Rooms (%d):\n", len(m.rooms))
 	for _, room := range m.rooms {
 		b.WriteString("- " + room.View() + "\n")
 	}
 
-	b.WriteString("==========\n")
+	b.WriteString("\n==========\n")
 
 	for i := 0; i < len(lobbyChoices); i++ {
 		if m.cursor == i {
@@ -142,11 +122,23 @@ func (m *Lobby) View() string {
 }
 
 func (m *Lobby) Next(queue *[]*tea.Program) error {
-	m.updateCh <- struct{}{}
 	switch m.choice {
-	case "No-op":
+	case "Refresh":
 		*queue = append(*queue,
 			tea.NewProgram(NewLobby(m.Base)))
+	case "Create Room":
+		resp, err := m.Base.client.R().
+			SetResult(&types.Room{}).
+			Post("/api/rooms")
+		if err != nil || resp.StatusCode() != http.StatusOK {
+			return fmt.Errorf("failed to create room")
+		}
+		room := resp.Result().(*types.Room)
+		*queue = append(*queue,
+			tea.NewProgram(NewRoomWaiting(m.Base, room.ID)))
+	case "Join Room":
+		*queue = append(*queue,
+			tea.NewProgram(NewJoinRoom(m.Base, m.rooms)))
 	case "Logout":
 		*queue = append(*queue,
 			tea.NewProgram(NewLogout(m.Base)))