@@ -4,17 +4,16 @@ import (
44 "encoding/json"
55 "fmt"
66 "io"
7- "io/ioutil"
8- "log"
97 "net/http"
108 "net/url"
9+ "os"
1110 "strconv"
1211 "strings"
1312)
1413
1514type server struct {
1615 router router
17- log printfer
16+ log logger
1817 gm gameManager
1918 pm playerManager
2019 rootHandler http.Handler
@@ -26,8 +25,10 @@ type router interface {
2625 HandleFunc (string , string , func (http.ResponseWriter , * http.Request ))
2726}
2827
29- type printfer interface {
28+ type logger interface {
3029 Printf (string , ... interface {})
30+ Info (any , ... any )
31+ Error (any , ... any )
3132}
3233
3334type gameManager interface {
@@ -42,8 +43,8 @@ type playerManager interface {
4243 NewPlayer (string ) * Player
4344}
4445
45- func newServer (l printfer , gm gameManager , pm playerManager ) (* server , error ) {
46- l .Printf ("Setting up new server" )
46+ func newServer (l logger , gm gameManager , pm playerManager ) (* server , error ) {
47+ l .Info ("Setting up new server" )
4748 s := & server {
4849 router : & methodRouter {},
4950 log : l ,
@@ -57,7 +58,7 @@ func newServer(l printfer, gm gameManager, pm playerManager) (*server, error) {
5758
5859func (s * server ) handleRoot () http.HandlerFunc {
5960 return func (w http.ResponseWriter , r * http.Request ) {
60- i , err := ioutil .ReadFile ("index.html" )
61+ i , err := os .ReadFile ("index.html" )
6162 if err != nil {
6263 http .NotFound (w , r )
6364 return
@@ -67,14 +68,15 @@ func (s *server) handleRoot() http.HandlerFunc {
6768}
6869
6970func (s * server ) ServeHTTP (w http.ResponseWriter , r * http.Request ) {
70- s .log .Printf ( "%v %v %v%v" , r .Proto , r .Method , r .Host , r .URL )
71+ s .log .Info ( "request" , "protocol" , r .Proto , "method" , r .Method , "host" , r .Host , "uri" , r .URL )
7172 s .router .ServeHTTP (w , r )
7273}
7374
7475func (s * server ) getGames () http.HandlerFunc {
7576 return func (w http.ResponseWriter , r * http.Request ) {
7677 data , err := json .Marshal (s .gm .List ())
7778 if err != nil {
79+ s .log .Error ("Error marshaling games" , "err" , err )
7880 http .Error (w , "Error marshaling games" , http .StatusInternalServerError )
7981 return
8082 }
@@ -87,16 +89,16 @@ func (s *server) postGamesHandler() http.HandlerFunc {
8789 return func (w http.ResponseWriter , r * http.Request ) {
8890 player , err := PlayerFromReq (r , s .pm )
8991 if err != nil {
90- s .log .Printf ( err .Error ())
92+ s .log .Error ( "Error reading body" , "err" , err .Error ())
9193 http .Error (w , "Error occured reading body" , http .StatusBadRequest )
9294 return
9395 }
9496 pathElements := strings .Split (r .URL .Path , "/" )
95- s .log .Printf ("Last element of path is %v" , pathElements [len (pathElements )- 1 ])
97+ s .log .Info ("Last element of path is %v" , pathElements [len (pathElements )- 1 ])
9698 if pathElements [len (pathElements )- 1 ] == "join" {
9799 gidint , err := strconv .ParseUint (pathElements [len (pathElements )- 2 ], 10 , 64 )
98100 if err != nil {
99- s .log .Printf ( err . Error () )
101+ s .log .Error ("parsing game id" , "err" , err )
100102 http .Error (w , "Error occured parsing game id" , http .StatusBadRequest )
101103 }
102104 s .gm .AddPlayerToGame (player , gameId (gidint ))
@@ -136,51 +138,44 @@ func (s *server) getGamesHandler() http.HandlerFunc {
136138
137139func (s * server ) createGameHandler () http.HandlerFunc {
138140 return func (w http.ResponseWriter , r * http.Request ) {
139- var err error
140- p , err := PlayerFromReq (r , s .pm )
141- if err != nil {
142- s .log .Printf ( err . Error () )
143- http .Error (w , "Unable to create game with this user" , http .StatusBadRequest )
144- return
145- }
146- postData , _ := io .ReadAll (r .Body )
147- var jd newGameData
148- err = json .Unmarshal (postData , & jd )
149- if err != nil {
150- log .Printf ("ERROR: failed to unmarshal postData: %v" , err . Error () )
151- http .Error (w , "Unable to create game with provided data" , http .StatusBadRequest )
152- return
153- }
154- s .log .Printf ( "%v creating new game: %v\n "p , jd )
155- g := s .gm .CreateGame (jd .Name , p )
156- if g == nil {
157- http .Error (w , "Unable to create game" , http .StatusInternalServerError )
158- return
159- }
160- w .Header ().Set ("Content-Type" , "application/json" )
161- w .WriteHeader (http .StatusCreated )
162- body , _ := json .Marshal (g )
163- w .Write (body )
141+ // var err error
142+ // p, err := PlayerFromReq(r, s.pm)
143+ // if err != nil {
144+ // s.log.Error("PlayerFromReq", "err", err )
145+ // http.Error(w, "Unable to create game with this user", http.StatusBadRequest)
146+ // return
147+ // }
148+ // postData, _ := io.ReadAll(r.Body)
149+ // var jd newGameData
150+ // err = json.Unmarshal(postData, &jd)
151+ // if err != nil {
152+ // s. log.Error ("ERROR: failed to unmarshal postData", "err" , err)
153+ // http.Error(w, "Unable to create game with provided data", http.StatusBadRequest)
154+ // return
155+ // }
156+ // s.log.Info(" creating new game: %v\n", "player", p, "gameData" , jd)
157+ // g := s.gm.CreateGame(jd.Name, p)
158+ // if g == nil {
159+ // http.Error(w, "Unable to create game", http.StatusInternalServerError)
160+ // return
161+ // }
162+ // w.Header().Set("Content-Type", "application/json")
163+ // w.WriteHeader(http.StatusCreated)
164+ // body, _ := json.Marshal(g)
165+ // w.Write(body)
164166 }
165167}
166168
167169func (s * server ) newUser () http.HandlerFunc {
168170 return func (w http.ResponseWriter , r * http.Request ) {
169- if r .Method != http .MethodPost {
170- http .Error (w , "You can only POST to this endpoint" , http .StatusMethodNotAllowed )
171- return
172- }
173- body , _ := io .ReadAll (r .Body )
174- s .log .Printf ("%v" , string (body ))
175- pd := struct { Name string }{}
176- err := json .Unmarshal (body , & pd )
171+ err := r .ParseForm ()
177172 if err != nil {
178- s .log .Printf ("Unable to create player with data: %+v, error: %v" , string (body ), err .Error ())
179- http .Error (w , "Invalid format" , http .StatusBadRequest )
180- return
173+ s .log .Error ("Unable to parse form" , "err" , err )
181174 }
182- p := s .pm .NewPlayer (pd .Name )
183- s .log .Printf ("Creating new player: %v(%d)" , p .Name , p .Id )
175+ data := r .PostForm
176+ s .log .Info ("newUser" , "data" , data )
177+ p := s .pm .NewPlayer (data .Get ("name" ))
178+ s .log .Info ("Creating new player" , "name" , p .Name , "id" , p .Id )
184179 rbody , _ := json .Marshal (p )
185180 w .WriteHeader (http .StatusCreated )
186181 w .Write (rbody )
@@ -212,11 +207,11 @@ func PlayerFromReq(r *http.Request, pm playerManager) (*Player, error) {
212207 pidstring := r .Header .Get ("X-Player-Id" )
213208 pidint , err := strconv .ParseUint (pidstring , 10 , 64 )
214209 if err != nil {
215- return nil , err
210+ return nil , fmt . Errorf ( "unable to parse uint from string ''%s': %w" , pidstring , err )
216211 }
217212 player , err := pm .FindPlayer (PlayerId (pidint ))
218213 if err != nil {
219- return nil , err
214+ return nil , fmt . Errorf ( "unable to find player with pid %d: %w" , pidint , err )
220215 }
221216 return player , nil
222217}
0 commit comments