Compare commits

...

2 commits

Author SHA1 Message Date
dd9490bb3b feat: bump version to v0.0.6 2024-10-30 11:29:47 +01:00
e7618b19ef feat: validate client settings and improve logging
- add a function to check if Pomodoro settings are valid
- log a warning for invalid client configurations
- log an info message for valid client configurations
- implement Stringer interface for PomodoroConfig model

🤖
2024-10-30 11:28:42 +01:00
3 changed files with 17 additions and 1 deletions

View file

@ -2,5 +2,5 @@ package metadata
import "strings" import "strings"
const GoTomatoVersion = "v0.0.5" // The GoTomato version const GoTomatoVersion = "v0.0.6" // The GoTomato version
var ProtocolVersion = strings.Split(GoTomatoVersion, ".")[0] // The protocol version var ProtocolVersion = strings.Split(GoTomatoVersion, ".")[0] // The protocol version

View file

@ -9,6 +9,10 @@ import (
"git.smsvc.net/pomodoro/GoTomato/pkg/models" "git.smsvc.net/pomodoro/GoTomato/pkg/models"
) )
func checkSettings(settings models.PomodoroConfig) bool {
return settings.Work > 0 && settings.ShortBreak > 0 && settings.LongBreak > 0 && settings.Sessions > 0
}
// Listens for commands from a client and handles them // Listens for commands from a client and handles them
func handleClientCommands(c models.WebsocketClient) { func handleClientCommands(c models.WebsocketClient) {
ws := c.Conn ws := c.Conn
@ -50,6 +54,11 @@ func handleClientCommands(c models.WebsocketClient) {
} }
case "updateSettings": case "updateSettings":
if !pomodoro.IsPomodoroOngoing() { if !pomodoro.IsPomodoroOngoing() {
if !checkSettings(clientCommand.Settings) {
log.Warn("Ignoring invalid config:", "msg", clientCommand.Settings, "host", c.Conn.RemoteAddr())
break
}
log.Info("Client send config", "config", clientCommand.Settings, "host", c.Conn.RemoteAddr())
pomodoro.UpdateSettings(clientCommand.Settings) pomodoro.UpdateSettings(clientCommand.Settings)
} }
} }

View file

@ -1,5 +1,7 @@
package models package models
import "fmt"
// Represents the configuration of a pomodoro // Represents the configuration of a pomodoro
type PomodoroConfig struct { type PomodoroConfig struct {
Work int `json:"work"` // Length of work sessions in seconds Work int `json:"work"` // Length of work sessions in seconds
@ -8,6 +10,11 @@ type PomodoroConfig struct {
Sessions int `json:"sessions"` // Number of total sessions Sessions int `json:"sessions"` // Number of total sessions
} }
// Stringer interface for the PomodocoConfig model
func (c PomodoroConfig) String() string {
return fmt.Sprintf("{work: %d, short: %d, long: %d, sessions: %d}", c.Work, c.ShortBreak, c.LongBreak, c.Sessions)
}
// Represents the server configuration // Represents the server configuration
type ServerConfig struct { type ServerConfig struct {
ListenAddress string `json:"listenAddress"` // Server listen address ListenAddress string `json:"listenAddress"` // Server listen address