From dd38c10f32a3130e9dbcb19f68eee00b63fbe8a6 Mon Sep 17 00:00:00 2001 From: Trevor Slocum Date: Mon, 22 Jul 2024 02:15:56 -0700 Subject: [PATCH] Do not include WebSocket client support by default --- pkg/server/client_websocket.go | 2 ++ pkg/server/server.go | 25 ------------------------- pkg/server/server_web.go | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/pkg/server/client_websocket.go b/pkg/server/client_websocket.go index 1c13ef8..67cc25c 100644 --- a/pkg/server/client_websocket.go +++ b/pkg/server/client_websocket.go @@ -1,3 +1,5 @@ +//go:build full + package server import ( diff --git a/pkg/server/server.go b/pkg/server/server.go index 073f969..83b4f1c 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -12,7 +12,6 @@ import ( "log" "math/big" "net" - "net/http" "os" "os/exec" "regexp" @@ -242,30 +241,6 @@ func (s *server) handleListener(listener net.Listener) { } } -func (s *server) handleWebSocket(w http.ResponseWriter, r *http.Request) { - const bufferSize = 8 - commands := make(chan []byte, bufferSize) - events := make(chan []byte, bufferSize) - - wsClient := newWebSocketClient(r, w, commands, events, s.verbose) - if wsClient == nil { - return - } - - now := time.Now().Unix() - - c := &serverClient{ - id: <-s.newClientIDs, - language: "bgammon-en", - accountID: -1, - connected: now, - active: now, - commands: commands, - Client: wsClient, - } - s.handleClient(c) -} - func (s *server) nameAllowed(username []byte) bool { return !guestName.Match(username) } diff --git a/pkg/server/server_web.go b/pkg/server/server_web.go index aad88f5..c435012 100644 --- a/pkg/server/server_web.go +++ b/pkg/server/server_web.go @@ -44,6 +44,30 @@ func (s *server) listenWebSocket(address string) { log.Fatalf("failed to listen on %s: %s", address, err) } +func (s *server) handleWebSocket(w http.ResponseWriter, r *http.Request) { + const bufferSize = 8 + commands := make(chan []byte, bufferSize) + events := make(chan []byte, bufferSize) + + wsClient := newWebSocketClient(r, w, commands, events, s.verbose) + if wsClient == nil { + return + } + + now := time.Now().Unix() + + c := &serverClient{ + id: <-s.newClientIDs, + language: "bgammon-en", + accountID: -1, + connected: now, + active: now, + commands: commands, + Client: wsClient, + } + s.handleClient(c) +} + func (s *server) cachedMatches() []byte { s.gamesCacheLock.Lock() defer s.gamesCacheLock.Unlock()