refactor: better check for empty pomodoro client settings

- replace UnsetPomodoroConfig with empty struct check in client commands
- remove unused UnsetPomodoroConfig variable

🤖

.gitignore

@@ -0,0 +1 @@
+GoTomato

README.md

@@ -63,14 +63,15 @@ The server periodically (every second) sends JSON-encoded messages to all connec
 - time_left: The remaining time for the current mode, in seconds (e.g., 900 for 15 minutes).
 - ongoing: Whether a Pomodoro session is currently ongoing.
 - paused: Whether the timer is paused.
+* version: The protocol version of the send message (this is always the same as the major app version) 
 
-| Message Type      | Example                                                                                                                                                       |
+| Message Type      | Example                                                                                                                                                                       |
-| ---               | ---                                                                                                                                                           |
+| ---               | ---                                                                                                                                                                           |
-| Welcome Message   | {"mode":"Idle", "settings":{"work":1500, "shortBreak":300, "longBreak":900, "sessions":4}, "session":0, "time_left":1500, "ongoing":false, "paused":false}    |
+| Welcome Message   | {"mode":"Idle", "settings":{"work":1500, "shortBreak":300, "longBreak":900, "sessions":4}, "session":0, "time_left":1500, "ongoing":false, "paused":false, "version":"v0"}    |
-| Session Running   | {"mode":"Work", "settings":{"work":1500, "shortBreak":300, "longBreak":900, "sessions":4}, "session":1, "time_left":900, "ongoing":true, "paused":false}      |
+| Session Running   | {"mode":"Work", "settings":{"work":1500, "shortBreak":300, "longBreak":900, "sessions":4}, "session":1, "time_left":900, "ongoing":true, "paused":false, "version":"v0"}      |
-| Session Running   | {"mode":"ShortBreak", "settings":{"work":1500, "shortBreak":300, "longBreak":900, "sessions":4}, "session":2, "time_left":50, "ongoing":true, "paused":false} |
+| Session Running   | {"mode":"ShortBreak", "settings":{"work":1500, "shortBreak":300, "longBreak":900, "sessions":4}, "session":2, "time_left":50, "ongoing":true, "paused":false, "version":"v0"} |
-| Session Paused    | {"mode":"Work", "settings":{"work":1500, "shortBreak":300, "longBreak":900, "sessions":4}, "session":2, "time_left":456, "ongoing":true, "paused":true}       |
+| Session Paused    | {"mode":"Work", "settings":{"work":1500, "shortBreak":300, "longBreak":900, "sessions":4}, "session":2, "time_left":456, "ongoing":true, "paused":true, "version":"v0"}       |
-| Session End/Reset | {"mode":"End", "settings":{"work":1500, "shortBreak":300, "longBreak":900, "sessions":4}, "session":0, "time_left":0, "ongoing":false, "paused":false}        |
+| Session End/Reset | {"mode":"End", "settings":{"work":1500, "shortBreak":300, "longBreak":900, "sessions":4}, "session":0, "time_left":0, "ongoing":false, "paused":false, "version":"v0"}        |
 
 ## Testing
 
@@ -80,3 +81,10 @@ go run .
 ```
 
 open http://localhost:8081
+
+## Building
+
+```
+go build -ldflags "-w"
+upx --best --lzma GoTomato
+```

cmd/server/main.go

@@ -3,11 +3,14 @@ package server
 import (
 	"flag"
 	"fmt"
+	"git.smsvc.net/pomodoro/GoTomato/internal/metadata"
 	"git.smsvc.net/pomodoro/GoTomato/internal/shared"
 	"git.smsvc.net/pomodoro/GoTomato/internal/websocket"
 	"git.smsvc.net/pomodoro/GoTomato/pkg/models"
 	"log"
 	"net/http"
+	"os"
+	"strings"
 )
 
 func Start() {
@@ -15,8 +18,16 @@ func Start() {
 	listenAddress := flag.String("listenAddress", shared.DefaultServerConfig.ListenAddress, "IP address to listen on")
 	listenPort := flag.Int("listenPort", shared.DefaultServerConfig.ListenPort, "Port to listen on")
 	password := flag.String("password", "", "Control password for pomodoro session (optional)")
+	showVersionFlag := flag.Bool("version", false, "Output version")
 	flag.Parse()
 
+	shared.Message.GoTomatoVersion = strings.Split(metadata.GoTomatoVersion, ".")[0]
+	if *showVersionFlag {
+		fmt.Printf("App-Version: %s\n", metadata.GoTomatoVersion)
+		fmt.Printf("Protocol-Version: %s\n", shared.Message.GoTomatoVersion)
+		os.Exit(0)
+	}
+
 	serverConfig := models.GoTomatoServerConfig{
 		ListenAddress: *listenAddress,
 		ListenPort:    *listenPort,

internal/metadata/version.go

@@ -0,0 +1,3 @@
+package metadata
+
+const GoTomatoVersion = "v0.0.1" // The GoTomato Version

internal/shared/configDefaults.go

@@ -15,6 +15,3 @@ var DefaultPomodoroConfig = models.GoTomatoPomodoroConfig{
 	LongBreak:  15 * 60,
 	Sessions:   4,
 }
-
-// used to check if client passed a config json
-var UnsetPomodoroConfig models.GoTomatoPomodoroConfig

internal/websocket/client_commands.go

@@ -49,7 +49,7 @@ func handleClientCommands(ws *websocket.Conn) {
 				}
 			case "updateSettings":
 				if !pomodoro.IsPomodoroOngoing() {
-					if clientCommand.PomodoroSettings != shared.UnsetPomodoroConfig {
+					if clientCommand.PomodoroSettings != (models.GoTomatoPomodoroConfig{}) {
 						shared.Message.PomodoroSettings = clientCommand.PomodoroSettings
 						shared.Message.TimeLeft = clientCommand.PomodoroSettings.Work
 					}

pkg/models/server.go

@@ -8,4 +8,5 @@ type ServerMessage struct {
 	TimeLeft         int                    `json:"time_left"` // Remaining time in seconds
 	Ongoing          bool                   `json:"ongoing"`   // Ongoing pomodoro
 	Paused           bool                   `json:"paused"`    // Is timer paused
+	GoTomatoVersion  string                 `json:"version"`   // Version of the server
 }