internal/pomodoro/pomodoro.go

@@ -42,7 +42,7 @@ func RunPomodoro() {
 
 		// Work
 		shared.State.Mode = "Work"
-		timer.StartAsync(pomodoroConfig.Work)
+		go timer.Start(pomodoroConfig.Work)
 		if !waitForTimer(timer) {
 			break
 		}
@@ -50,13 +50,13 @@ func RunPomodoro() {
 		// Breaks
 		if session < pomodoroConfig.Sessions {
 			shared.State.Mode = "ShortBreak"
-			timer.StartAsync(pomodoroConfig.ShortBreak)
+			go timer.Start(pomodoroConfig.ShortBreak)
 			if !waitForTimer(timer) {
 				break
 			}
 		} else { // last phase, prepare for finish
 			shared.State.Mode = "LongBreak"
-			timer.StartAsync(pomodoroConfig.LongBreak)
+			go timer.Start(pomodoroConfig.LongBreak)
 			if !waitForTimer(timer) {
 				break
 			}

internal/pomodoro/timer.go

@@ -24,12 +24,7 @@ func (t Timer) Init() Timer {
 	}
 }
 
-// Start the timer (goroutine)
-func (t *Timer) StartAsync(duration int) {
-	go t.Start(duration)
-}
-
-// Start the timer (blocking)
+// Start the timer
 func (t *Timer) Start(duration int) {
 	tick := time.NewTicker(time.Second)
 	for timeLeft := duration; timeLeft > 0; {

internal/websocket/client_commands.go

@@ -3,6 +3,7 @@ package websocket
 import (
 	"encoding/json"
 	"github.com/charmbracelet/log"
+	"github.com/gorilla/websocket"
 
 	"git.smsvc.net/pomodoro/GoTomato/internal/pomodoro"
 	"git.smsvc.net/pomodoro/GoTomato/internal/shared"
@@ -10,8 +11,7 @@ import (
 )
 
 // Listens for commands from a client and handles them
-func handleClientCommands(c models.Client) {
-	ws := c.Conn
+func handleClientCommands(ws *websocket.Conn) {
 	for {
 		var clientCommand models.ClientCommand
 

internal/websocket/handle_connection.go

@@ -31,13 +31,12 @@ func HandleConnection(w http.ResponseWriter, r *http.Request) {
 	log.Info("Client connected", "host", ws.NetConn().RemoteAddr(), "clients", len(Clients)+1)
 
 	// Register the new client
-	client := models.Client{
-		Conn: ws,
-	}
 	mu.Lock()
-	Clients[ws] = &client
+	Clients[ws] = &models.Client{
+		Conn: ws, // Store the WebSocket connection
+	}
 	mu.Unlock()
 
 	// Listen for commands from the connected client
-	handleClientCommands(client)
+	handleClientCommands(ws)
 }

pkg/models/client.go

@@ -3,6 +3,7 @@ package models
 import (
 	"github.com/charmbracelet/log"
 	"github.com/gorilla/websocket"
+	"sync"
 )
 
 // Represents a command from the client (start/stop)
@@ -14,12 +15,16 @@ type ClientCommand struct {
 
 // Represents a single client
 type Client struct {
-	Conn *websocket.Conn
+	Conn  *websocket.Conn // Websocket connection of the client
+	Mutex sync.Mutex      // Mutex used to lock
 }
 
 // Sends a message to the websocket.
 // Automatically locks and unlocks the client mutex, to ensure that only one goroutine can write at a time.
 func (c *Client) SendMessage(messageType int, data []byte) error {
+	c.Mutex.Lock()
+	defer c.Mutex.Unlock()
+
 	err := c.Conn.WriteMessage(messageType, data)
 	if err != nil {
 		log.Error("Error writing to WebSocket:", "msg", err)