diff --git a/plays/game.go b/plays/game.go index 43229e7..3fbfcd6 100644 --- a/plays/game.go +++ b/plays/game.go @@ -125,4 +125,4 @@ func (m *Game) Next(queue *[]*tea.Program) error { tea.NewProgram(NewGame(m.Base, m.server, m.roomID))) } return nil -} \ No newline at end of file +} diff --git a/plays/lobby.go b/plays/lobby.go index c1e7da5..a7fbec0 100644 --- a/plays/lobby.go +++ b/plays/lobby.go @@ -37,7 +37,7 @@ func NewLobby(base *Base) *Lobby { func (m *Lobby) fetchLobbyInfo() tea.Msg { var users []models.UserStatus - resp, err := m.Base.client.R(). + resp, err := m.Base.client.R(). SetResult(&users). Get("/api/lobby/users") if err != nil || resp.StatusCode() != http.StatusOK { diff --git a/plays/roomWaiting.go b/plays/roomWaiting.go index 2d3ed40..ae6a456 100644 --- a/plays/roomWaiting.go +++ b/plays/roomWaiting.go @@ -87,4 +87,4 @@ func (m *RoomWaiting) Next(queue *[]*tea.Program) error { *queue = append(*queue, tea.NewProgram(NewLobby(m.Base))) } return nil -} \ No newline at end of file +} diff --git a/server/wordle/handlers.go b/server/wordle/handlers.go index 61c4eff..21852f3 100644 --- a/server/wordle/handlers.go +++ b/server/wordle/handlers.go @@ -62,4 +62,4 @@ func (self *Handlers) GameFlow() { } } } -} \ No newline at end of file +} diff --git a/types/game.go b/types/game.go index 4194579..9fc355f 100644 --- a/types/game.go +++ b/types/game.go @@ -15,11 +15,11 @@ var ( ) type Room struct { - ID string `json:"id"` - Creater string `json:"creater"` + ID string `json:"id"` + Creater string `json:"creater"` Status RoomStatus `json:"status"` - Players []string `json:"players"` - Addr string `json:"-"` + Players []string `json:"players"` + Addr string `json:"-"` } func (self Room) View() string { diff --git a/utils/udp.go b/utils/udp.go index 5074071..2ef7456 100644 --- a/utils/udp.go +++ b/utils/udp.go @@ -64,13 +64,21 @@ func ListenUDP( func SendPayload(endpoint, data string) error { conn, err := net.Dial("udp", endpoint) if err != nil { - return fmt.Errorf("failed to dial endpoint") + return fmt.Errorf("failed to dial endpoint, %w", err) } defer conn.Close() - _, err = conn.Write([]byte(data)) + b, err := msgpack.Marshal(UDPPayload{ + MagicNumber: MAGIC_NUMBER, + Data: data, + }) if err != nil { - return fmt.Errorf("failed to send payload") + return fmt.Errorf("failed to marshal payload, %w", err) + } + + _, err = conn.Write(b) + if err != nil { + return fmt.Errorf("failed to send payload, %w", err) } return nil