README.md

@@ -15,7 +15,7 @@ The configuration is loaded from `~/config/ChronoTomato.yml`, here is an example
 url: ws://localhost:8080/ws
 password: ""
 config:
-  focus: 1500
+  work: 1500
   shortbreak: 300
   longbreak: 600
   sessions: 4

Taskfile.yml

@@ -21,8 +21,6 @@ tasks:
     preconditions:
       - sh: test "{{.BRANCH}}" == "main"
         msg: "You must be on the main branch to release"
-      - sh: test -z "$(git status --porcelain)"
-        msg: "You must have a clean working tree to release"
     prompt: Create new release {{.RELEASE}} from {{.COMMIT}}@{{.BRANCH}}?
     cmds:
       - git tag {{.RELEASE}}
@@ -34,8 +32,3 @@ tasks:
     desc: Create a local snapshot release
     cmds:
       - goreleaser release --clean --snapshot
-
-  install:
-    desc: Install the latest published version locally
-    cmds:
-      - go install git.smsvc.net/pomodoro/ChronoTomato@latest

cmd/client/notification.go

@@ -19,8 +19,8 @@ func desktopNotifications(pomodoro GoTomato.ServerMessage) {
 	sessions := pomodoro.Settings.Sessions
 
 	switch mode {
-	case "Focus":
+	case "Work":
-		duration = pomodoro.Settings.Focus
+		duration = pomodoro.Settings.Work
 		notification = fmt.Sprintf("Session %d/%d: %s %0.f minutes", session, sessions, mode, float32(duration)/60)
 	case "ShortBreak":
 		duration = pomodoro.Settings.ShortBreak

cmd/client/view.go

@@ -43,8 +43,8 @@ func terminalOutput(pomodoro GoTomato.ServerMessage) string {
 	)
 
 	// header
-	output += colour.Sprintf("^D^4Focus: %d ◊ Break: %d ◊ Longbreak: %d^R\n\n",
+	output += colour.Sprintf("^D^4Work: %d ◊ Break: %d ◊ Longbreak: %d^R\n\n",
-		pomodoro.Settings.Focus/60,
+		pomodoro.Settings.Work/60,
 		pomodoro.Settings.ShortBreak/60,
 		pomodoro.Settings.LongBreak/60,
 	)
@@ -80,8 +80,8 @@ func calc_percentage(message GoTomato.ServerMessage) float64 {
 	var duration float64
 
 	switch message.Mode {
-	case "Focus":
+	case "Work":
-		duration = float64(message.Settings.Focus)
+		duration = float64(message.Settings.Work)
 	case "ShortBreak":
 		duration = float64(message.Settings.ShortBreak)
 	case "LongBreak", "End":

go.mod

@@ -3,10 +3,10 @@ module git.smsvc.net/pomodoro/ChronoTomato
 go 1.23.1
 
 require (
-	git.smsvc.net/pomodoro/GoTomato v0.5.0
+	git.smsvc.net/pomodoro/GoTomato v0.3.1
 	github.com/alecthomas/colour v0.1.0
 	github.com/charmbracelet/bubbles v0.20.0
-	github.com/charmbracelet/bubbletea v1.2.3
+	github.com/charmbracelet/bubbletea v1.2.2
 	github.com/charmbracelet/log v0.4.0
 	github.com/gen2brain/beeep v0.0.0-20240516210008-9c006672e7f4
 	github.com/gorilla/websocket v1.5.3

go.sum

@@ -1,13 +1,13 @@
-git.smsvc.net/pomodoro/GoTomato v0.5.0 h1:ni6v5iNnSac/Os3skmGobAwjyXP3uS76N+fhZDubqkU=
+git.smsvc.net/pomodoro/GoTomato v0.3.1 h1:0YUOqwluUlnx1PLQiXCxRuNwejcE/IkNOD1SuCObyUA=
-git.smsvc.net/pomodoro/GoTomato v0.5.0/go.mod h1:LaKrPdnFB5v4RpltExKasW67TmjJlmhDDvmoEYWv0P4=
+git.smsvc.net/pomodoro/GoTomato v0.3.1/go.mod h1:LaKrPdnFB5v4RpltExKasW67TmjJlmhDDvmoEYWv0P4=
 github.com/alecthomas/colour v0.1.0 h1:nOE9rJm6dsZ66RGWYSFrXw461ZIt9A6+nHgL7FRrDUk=
 github.com/alecthomas/colour v0.1.0/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
 github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQWD9LIutE=
 github.com/charmbracelet/bubbles v0.20.0/go.mod h1:39slydyswPy+uVOHZ5x/GjwVAFkCsV8IIVy+4MhzwwU=
-github.com/charmbracelet/bubbletea v1.2.3 h1:d9MdMsANIYZB5pE1KkRqaUV6GfsiWm+/9z4fTuGVm9I=
+github.com/charmbracelet/bubbletea v1.2.2 h1:EMz//Ky/aFS2uLcKqpCst5UOE6z5CFDGRsUpyXz0chs=
-github.com/charmbracelet/bubbletea v1.2.3/go.mod h1:Qr6fVQw+wX7JkWWkVyXYk/ZUQ92a6XNekLXa3rR18MM=
+github.com/charmbracelet/bubbletea v1.2.2/go.mod h1:Qr6fVQw+wX7JkWWkVyXYk/ZUQ92a6XNekLXa3rR18MM=
 github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
 github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
 github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=

internal/websocket/connect.go

@@ -1,15 +1,13 @@
 package websocket
 
 import (
-	"time"
-
 	"github.com/gorilla/websocket"
+	"time"
 
 	ChronoTomato "git.smsvc.net/pomodoro/ChronoTomato/pkg/models"
 )
 
-// New websocket client
+type Client ChronoTomato.GoTomatoClient // New websocket client
-type Client ChronoTomato.GoTomatoClient
 
 // Connects to websocket
 func Connect(url string) Client {
@@ -18,6 +16,10 @@ func Connect(url string) Client {
 	return Client{Conn: conn, Server: url, LastErr: err}
 }
 
+func (c Client) Connected() bool {
+	return c.Conn != nil
+}
+
 // Disconnects from websocket
 func (c Client) Disconnect() {
 	// Cleanly close the connection by sending a close message and then
@@ -31,7 +33,3 @@ func (c Client) Disconnect() {
 	}
 	return
 }
-
-func (c Client) Connected() bool {
-	return c.Conn != nil
-}

internal/websocket/receive.go

@@ -9,10 +9,12 @@ import (
 	GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models"
 )
 
+var Done = make(chan struct{})
+
 // Receives websocket messages and writes them to a channel.
 // Closes the channel if websocket closes.
 func (c *Client) ProcessServerMessages(channel chan<- GoTomato.ServerMessage) {
-	var serverMessage GoTomato.ServerMessage
+	var serverMessage, prevMessage GoTomato.ServerMessage
 
 	defer close(Done)
 
@@ -20,22 +22,27 @@ func (c *Client) ProcessServerMessages(channel chan<- GoTomato.ServerMessage) {
 		c.Conn.SetReadDeadline(time.Now().Add(10 * time.Second))
 		_, message, err := c.Conn.ReadMessage()
 		if err != nil {
-			c.LastErr = err
-
 			// On normal closure exit gracefully
 			if websocket.IsCloseError(err, websocket.CloseNormalClosure) {
 				return
 			}
 
-			// reset connection and reconnect
+			c.LastErr = err
-			c.Conn = nil
+			// Try to reconnect on unexpected disconnect
-			pw := c.Password
+			for {
-			for !c.Connected() {
+				channel <- prevMessage // send previous ServerMessage to update view
-				channel <- serverMessage // send last known ServerMessage to update view
+
 				time.Sleep(time.Second)
+
+				// reconnect while preserving password
+				pw := c.Password
 				*c = Connect(c.Server)
-			}
 				c.Password = pw
+
+				if c.Connected() {
+					break
+				}
+			}
 			continue
 		}
 
@@ -43,5 +50,6 @@ func (c *Client) ProcessServerMessages(channel chan<- GoTomato.ServerMessage) {
 		c.LastErr = err
 
 		channel <- serverMessage
+		prevMessage = serverMessage
 	}
 }

internal/websocket/vars.go

@@ -1,4 +0,0 @@
-package websocket
-
-// Websocket closure
-var Done = make(chan struct{})