diff --git a/README.md b/README.md index edcf42a..e6d0ca5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,2 @@ # Introduction to Network Programming Homework -## TODO - -- Connection - - Scan port diff --git a/handlers/wordle/postGuess.go b/handlers/wordle/postGuess.go index 263b840..b275921 100644 --- a/handlers/wordle/postGuess.go +++ b/handlers/wordle/postGuess.go @@ -1,6 +1,7 @@ package wordle import ( + "encoding/json" "fmt" "io" "net/http" @@ -8,12 +9,11 @@ import ( "gitea.konchin.com/ytshih/inp2025/middlewares" "gitea.konchin.com/ytshih/inp2025/utils" "github.com/uptrace/bunrouter" - "github.com/vmihailenco/msgpack/v5" "go.uber.org/zap" ) type PostGuessInput struct { - Guess string `msgpack:"guess"` + Guess string `json:"guess"` } func (self *Handlers) PostGuess( @@ -31,7 +31,7 @@ func (self *Handlers) PostGuess( } var input PostGuessInput - if err := msgpack.Unmarshal(b, &input); err != nil { + if err := json.Unmarshal(b, &input); err != nil { return middlewares.HTTPError{ StatusCode: http.StatusBadRequest, Message: "failed to unmarshal from msgpack", @@ -39,9 +39,6 @@ func (self *Handlers) PostGuess( } } - zap.L().Info("input", - zap.String("input", fmt.Sprintf("%+v", input))) - username, _, ok := req.BasicAuth() if !ok { return middlewares.HTTPError{ @@ -50,6 +47,10 @@ func (self *Handlers) PostGuess( } } + zap.L().Info("input", + zap.String("input", fmt.Sprintf("%+v", input)), + zap.String("username", username)) + self.opCh <- &OperationGuess{ Username: username, Guess: input.Guess, diff --git a/stages/wordle.go b/stages/wordle.go index 62d9250..b5aeb5d 100644 --- a/stages/wordle.go +++ b/stages/wordle.go @@ -86,14 +86,10 @@ func (m *WordleClientModel) getState() tea.Cmd { func (m *WordleClientModel) postGuess(guess string) tea.Cmd { return func() tea.Msg { - b, err := msgpack.Marshal(wordle.PostGuessInput{ - Guess: guess, - }) - if err != nil { - m.err = fmt.Errorf("failed to post guess, %w", err) - } - _, err = m.client.R(). - SetBody(b). + _, err := m.client.R(). + SetBody(wordle.PostGuessInput{ + Guess: guess, + }). Post("/api/guess") if err != nil { m.err = fmt.Errorf("failed to post guess, %w", err)