refactor: websocket client and closure variable

- update comments
- move `Done` variable to vars.go
- move `Connected()` method

🤖

go.mod

@@ -6,7 +6,7 @@ require (
 	git.smsvc.net/pomodoro/GoTomato v0.4.0
 	github.com/alecthomas/colour v0.1.0
 	github.com/charmbracelet/bubbles v0.20.0
-	github.com/charmbracelet/bubbletea v1.2.2
+	github.com/charmbracelet/bubbletea v1.2.3
 	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

@@ -6,8 +6,8 @@ github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiE
 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.2 h1:EMz//Ky/aFS2uLcKqpCst5UOE6z5CFDGRsUpyXz0chs=
-github.com/charmbracelet/bubbletea v1.2.2/go.mod h1:Qr6fVQw+wX7JkWWkVyXYk/ZUQ92a6XNekLXa3rR18MM=
+github.com/charmbracelet/bubbletea v1.2.3 h1:d9MdMsANIYZB5pE1KkRqaUV6GfsiWm+/9z4fTuGVm9I=
+github.com/charmbracelet/bubbletea v1.2.3/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,13 +1,15 @@
 package websocket
 
 import (
-	"github.com/gorilla/websocket"
 	"time"
 
+	"github.com/gorilla/websocket"
+
 	ChronoTomato "git.smsvc.net/pomodoro/ChronoTomato/pkg/models"
 )
 
-type Client ChronoTomato.GoTomatoClient // New websocket client
+// New websocket client
+type Client ChronoTomato.GoTomatoClient
 
 // Connects to websocket
 func Connect(url string) Client {
@@ -16,10 +18,6 @@ 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
@@ -33,3 +31,7 @@ func (c Client) Disconnect() {
 	}
 	return
 }
+
+func (c Client) Connected() bool {
+	return c.Conn != nil
+}

internal/websocket/receive.go

@@ -9,12 +9,10 @@ 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, prevMessage GoTomato.ServerMessage
+	var serverMessage GoTomato.ServerMessage
 
 	defer close(Done)
 
@@ -22,27 +20,22 @@ 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
 			}
 
-			c.LastErr = err
-			// Try to reconnect on unexpected disconnect
-			for {
-				channel <- prevMessage // send previous ServerMessage to update view
-
-				time.Sleep(time.Second)
-
-				// reconnect while preserving password
+			// reset connection and reconnect
+			c.Conn = nil
 			pw := c.Password
+			for !c.Connected() {
+				channel <- serverMessage // send last known ServerMessage to update view
+				time.Sleep(time.Second)
 				*c = Connect(c.Server)
+			}
 			c.Password = pw
-
-				if c.Connected() {
-					break
-				}
-			}
 			continue
 		}
 
@@ -50,6 +43,5 @@ func (c *Client) ProcessServerMessages(channel chan<- GoTomato.ServerMessage) {
 		c.LastErr = err
 
 		channel <- serverMessage
-		prevMessage = serverMessage
 	}
 }

internal/websocket/vars.go

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