diff --git a/internal/websocket/client_commands.go b/internal/websocket/client_commands.go index c5e5340..b88ca78 100644 --- a/internal/websocket/client_commands.go +++ b/internal/websocket/client_commands.go @@ -6,13 +6,8 @@ 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) { for { diff --git a/internal/websocket/handle_connections.go b/internal/websocket/handle_connections.go index 433ff82..be49918 100644 --- a/internal/websocket/handle_connections.go +++ b/internal/websocket/handle_connections.go @@ -5,8 +5,13 @@ import ( "github.com/gorilla/websocket" "log" "net/http" + "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 + // Upgrader to upgrade HTTP requests to WebSocket connections var upgrader = websocket.Upgrader{ CheckOrigin: func(r *http.Request) bool { return true }, diff --git a/pkg/models/config.go b/pkg/models/config.go index 628e685..6bb63a1 100644 --- a/pkg/models/config.go +++ b/pkg/models/config.go @@ -1,13 +1,13 @@ package models type GoTomatoTimerConfig struct { - Work int `json:"work"` - ShortBreak int `json:"shortBreak"` - LongBreak int `json:"longBreak"` - Sessions int `json:"sessions"` + Work int `json:"work"` // Length of work sessions in seconds + ShortBreak int `json:"shortBreak"` // Length of short break in seconds + LongBreak int `json:"longBreak"` // Length if ling break in seconds + Sessions int `json:"sessions"` // Number of total sessions } type GoTomatoServerConfig struct { - ListenAddress string `json:"listenAddress"` - ListenPort int `json:"listenPort"` + ListenAddress string `json:"listenAddress"` // Server listen address + ListenPort int `json:"listenPort"` // Server listen port }