refactor: drop SendMessage() method

This commit is contained in:
Sebastian Mark 2024-11-21 07:34:50 +01:00
parent ed67e9bc69
commit 1e9b7fbb79
4 changed files with 5 additions and 11 deletions

View file

@ -24,7 +24,8 @@ func SendPermanentBroadCastMessage() {
mu.Lock()
for _, client := range Clients {
// Send message to client
err := client.SendMessage(websocket.TextMessage, jsonMessage)
client.Conn.SetWriteDeadline(time.Now().Add(TIMEOUT * time.Second))
err := client.Conn.WriteMessage(websocket.TextMessage, jsonMessage)
if err != nil {
helper.Logger.Info("Error broadcasting to client:", "msg", err, "host", client.RealIP, "clients", len(Clients))
}

View file

@ -15,6 +15,8 @@ import (
var Clients = make(map[net.Addr]*models.WebsocketClient)
var mu sync.Mutex // Mutex to protect access to the Clients map
const TIMEOUT = 10
// Upgrade HTTP requests to WebSocket connections
var upgrader = websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool { return true },

View file

@ -8,13 +8,12 @@ import (
"git.smsvc.net/pomodoro/GoTomato/pkg/models"
)
const TIMEOUT = 10
// Checks if the websockets last Pong is recent
func isStale(client *models.WebsocketClient) bool {
return time.Since(client.LastPong) > (TIMEOUT * time.Second)
}
// send a Ping to the websocket client
func sendPing(client *models.WebsocketClient) bool {
client.Conn.SetWriteDeadline(time.Now().Add(TIMEOUT * time.Second))
err := client.Conn.WriteMessage(websocket.PingMessage, nil)

View file

@ -6,8 +6,6 @@ import (
"github.com/gorilla/websocket"
)
const TIMEOUT = 10
// Represents a command from the client (start/stop)
type ClientCommand struct {
Command string `json:"command"` // Command send to the server
@ -21,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)
}