diff --git a/go.mod b/go.mod index e6d7694..2ca4644 100644 --- a/go.mod +++ b/go.mod @@ -7,4 +7,7 @@ require ( golang.org/x/term v0.33.0 ) -require golang.org/x/sys v0.34.0 // indirect +require ( + github.com/gorilla/websocket v1.5.3 // indirect + golang.org/x/sys v0.34.0 // indirect +) diff --git a/go.sum b/go.sum index 5181155..7b1422c 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA= golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg= diff --git a/http_input_handler.go b/http_input_handler.go new file mode 100644 index 0000000..08ca5e7 --- /dev/null +++ b/http_input_handler.go @@ -0,0 +1,88 @@ +package main + +import ( + "context" + "log" + "net/http" + + _ "embed" + + "github.com/google/uuid" + "github.com/gorilla/websocket" +) + +//go:embed index.html +var frontend []byte + +var upgrader = websocket.Upgrader{ + CheckOrigin: func(r *http.Request) bool { + return true + }, +} + +type HttpInputHandler struct { + playerService PlayerService + server *http.Server + mux *http.ServeMux + playerIdMap map[uuid.UUID]int +} + +func NewHttpInputHandler(ps PlayerService) *HttpInputHandler { + handler := &HttpInputHandler{ + playerService: ps, + playerIdMap: map[uuid.UUID]int{}, + + mux: http.NewServeMux(), + } + + handler.mux.HandleFunc("GET /", handler.serveFrontend) + handler.mux.HandleFunc("GET /ws", handler.serveWebsocket) + + return handler +} + +func (k *HttpInputHandler) Listen(addr string) { + k.server = &http.Server{ + Addr: addr, + Handler: k.mux, + } + k.server.ListenAndServe() +} + +func (h *HttpInputHandler) serveFrontend(w http.ResponseWriter, req *http.Request) { + w.Write(frontend) +} + +func (h *HttpInputHandler) serveWebsocket(w http.ResponseWriter, req *http.Request) { + conn, err := upgrader.Upgrade(w, req, nil) + if err != nil { + log.Println("Error upgrading connection:", err) + return + } + defer conn.Close() + + playerId := uuid.New() + h.playerService.Join(playerId) + + for { + _, msg, err := conn.ReadMessage() + if err != nil { + log.Println("Error reading message:", err) + break + } + + switch string(msg) { + case "l": + h.playerService.TurnLeft(playerId) + case "r": + h.playerService.TurnRight(playerId) + } + } +} + +func (k *HttpInputHandler) Close() { + if k.server == nil { + return + } + k.server.Shutdown(context.Background()) +} diff --git a/index.html b/index.html new file mode 100644 index 0000000..0c5b7c0 --- /dev/null +++ b/index.html @@ -0,0 +1,67 @@ + + + + + + Full Screen Buttons + + + +
+ + +
+ + + \ No newline at end of file diff --git a/input_handler.go b/keyboard_input_handler.go similarity index 100% rename from input_handler.go rename to keyboard_input_handler.go diff --git a/main.go b/main.go index f963b3c..e5f5854 100644 --- a/main.go +++ b/main.go @@ -10,5 +10,9 @@ func main() { go keyboard.Listen() defer keyboard.Close() + httpServer := NewHttpInputHandler(game) + defer httpServer.Close() + go httpServer.Listen(":8080") + game.Run() } diff --git a/renderer.go b/renderer.go index efa9347..552ce95 100644 --- a/renderer.go +++ b/renderer.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "log" "os" "golang.org/x/term" @@ -109,8 +108,6 @@ func NewRenderer() *Renderer { if width > height && width > 100 { gameCols -= scoreboardWidth scoreboard = true - } else { - log.Println("Terminal too small for scoreboard, hiding it.") } r := Renderer{ @@ -175,7 +172,6 @@ func (r *Renderer) bufferScoreboard(g *Game, b [][]character) { } for i, p := range scoreboard { - log.Println(p.Id) name := PlayerNames[p.Id] scoreText := fmt.Sprintf("%s: %d", name, 100) for j, char := range scoreText {