fix: prevent concurrent write to websocket connection
- refactor client handling and message broadcasting
- replace Client struct
- implement SendMessage method in Client struct for safer message sending
- update client map to use *models.Client instead of bool
- adjust BroadcastMessage and RunPomodoroTimer functions to use new client type
🤖
This commit is contained in:
parent
ffc6913344
commit
4471c86a0c
7 changed files with 53 additions and 17 deletions
|
@ -6,10 +6,22 @@ import (
|
|||
"git.smsvc.net/pomodoro/GoTomato/pkg/models"
|
||||
"github.com/gorilla/websocket"
|
||||
"log"
|
||||
"sync"
|
||||
)
|
||||
|
||||
// Clients is a map of connected WebSocket clients, where each client is represented by the Client struct
|
||||
var Clients = make(map[*websocket.Conn]*models.Client)
|
||||
var mu sync.Mutex // Mutex to protect access to the Clients map
|
||||
|
||||
// handleClientCommands listens for commands from WebSocket clients and dispatches to the timer.
|
||||
func handleClientCommands(ws *websocket.Conn) {
|
||||
// Create a new Client and add it to the Clients map
|
||||
mu.Lock()
|
||||
Clients[ws] = &models.Client{
|
||||
Conn: ws,
|
||||
}
|
||||
mu.Unlock()
|
||||
|
||||
for {
|
||||
_, message, err := ws.ReadMessage()
|
||||
if err != nil {
|
||||
|
|
|
@ -1,14 +1,12 @@
|
|||
package websocket
|
||||
|
||||
import (
|
||||
"git.smsvc.net/pomodoro/GoTomato/pkg/models"
|
||||
"github.com/gorilla/websocket"
|
||||
"log"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
// Map to track connected clients
|
||||
var Clients = make(map[*websocket.Conn]bool)
|
||||
|
||||
// Upgrader to upgrade HTTP requests to WebSocket connections
|
||||
var upgrader = websocket.Upgrader{
|
||||
CheckOrigin: func(r *http.Request) bool { return true },
|
||||
|
@ -25,7 +23,9 @@ func HandleConnections(w http.ResponseWriter, r *http.Request) {
|
|||
defer ws.Close()
|
||||
|
||||
// Register the new client
|
||||
Clients[ws] = true
|
||||
Clients[ws] = &models.Client{
|
||||
Conn: ws, // Store the WebSocket connection
|
||||
}
|
||||
|
||||
// Listen for commands from the connected client
|
||||
handleClientCommands(ws)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue