diff --git a/server/internal/websocket/socket.go b/server/internal/websocket/socket.go index 7a2c6b7..2439cd2 100644 --- a/server/internal/websocket/socket.go +++ b/server/internal/websocket/socket.go @@ -1,6 +1,7 @@ package websocket import ( + "encoding/json" "strings" "sync" @@ -9,6 +10,7 @@ import ( type WebSocket struct { id string + ws WebSocketHandler connection *websocket.Conn mu sync.Mutex } @@ -29,7 +31,18 @@ func (socket *WebSocket) Send(v interface{}) error { return nil } - return socket.connection.WriteJSON(v) + raw, err := json.Marshal(v) + if err != nil { + return err + } + + socket.ws.logger.Debug(). + Str("session", socket.id). + Str("address", socket.connection.RemoteAddr().String()). + Str("raw", string(raw)). + Msg("sending message to client") + + return socket.connection.WriteMessage(websocket.TextMessage, raw) } func (socket *WebSocket) Destroy() error { diff --git a/server/internal/websocket/websocket.go b/server/internal/websocket/websocket.go index f3da856..57cf34e 100644 --- a/server/internal/websocket/websocket.go +++ b/server/internal/websocket/websocket.go @@ -240,6 +240,7 @@ func (ws *WebSocketHandler) handle(connection *websocket.Conn, id string) { case raw := <-bytes: ws.logger.Debug(). Str("session", id). + Str("address", connection.RemoteAddr().String()). Str("raw", string(raw)). Msg("recieved message from client") if err := ws.handler.Message(id, raw); err != nil {