fix: introduce const for broadcast interval

- change ticker to use BROADCAST_INTERVAL constant
- define BROADCAST_INTERVAL as 1 second

🤖

internal/websocket/broadcast.go

@@ -11,9 +11,10 @@ import (
 
 // Sends continous messages to all connected WebSocket clients
 func SendPermanentBroadCastMessage() {
-	tick := time.NewTicker(time.Second)
+	ticker := time.NewTicker(BROADCAST_INTERVAL * time.Second)
+	defer ticker.Stop()
 
-	for {
+	for range ticker.C {
 		// Marshal the message into JSON format
 		jsonMessage, err := json.Marshal(shared.State)
 		if err != nil {
@@ -22,14 +23,15 @@ func SendPermanentBroadCastMessage() {
 		}
 
 		// Iterate over all connected clients and broadcast the message
+		mu.Lock()
 		for _, client := range Clients {
 			// Send message to client
-			err := client.SendMessage(websocket.TextMessage, jsonMessage)
+			client.Conn.SetWriteDeadline(time.Now().Add(SEND_TIMEOUT * time.Second))
+			err := client.Conn.WriteMessage(websocket.TextMessage, jsonMessage)
 			if err != nil {
 				helper.Logger.Error("Error broadcasting to client:", "msg", err, "host", client.RealIP, "clients", len(Clients))
 			}
 		}
-
-		<-tick.C
+		mu.Unlock()
 	}
 }

internal/websocket/client_commands.go

@@ -22,7 +22,9 @@ func handleClientCommands(c models.WebsocketClient) {
 		_, message, err := ws.ReadMessage()
 		if err != nil {
 			// remove client on error/disconnect
+			mu.Lock()
 			delete(Clients, ws.LocalAddr())
+			mu.Unlock()
 			helper.Logger.Info("Client disconnected:", "msg", err, "host", c.RealIP, "clients", len(Clients))
 			break
 		}

internal/websocket/vars.go

@@ -7,6 +7,7 @@ import (
 	"git.smsvc.net/pomodoro/GoTomato/pkg/models"
 )
 
+const BROADCAST_INTERVAL = 1
 const SEND_TIMEOUT = 10
 const STALE_CLIENT_TIMEOUT = 90
 const STALE_CHECK_INTERVALL = 30

pkg/models/client.go

@@ -19,9 +19,3 @@ type WebsocketClient struct {
 	LastPong time.Time
 	RealIP   string
 }
-
-// Sends a message to the websocket.
-func (c *WebsocketClient) SendMessage(messageType int, data []byte) error {
-	c.Conn.SetWriteDeadline(time.Now().Add(TIMEOUT * time.Second))
-	return c.Conn.WriteMessage(messageType, data)
-}