pomodoro/ChronoTomato
3
0
Fork 0
Code Issues 4 Pull requests Releases 7 Activity

feat: refactor connection handling to use models.Client

Browse source 
- introduce `Client` model
- modify all websocket operations to use the new `Client` model
- update function signatures to accept `models.Client` instead of `*websocket.Conn`
- ensure consistent usage of `client` across all related functions

🤖
This commit is contained in:
Sebastian Mark 2024-10-30 08:28:22 +01:00
parent f1071f33c6
commit b943c9d6eb
6 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/frontend/keyhandler.go
View file

@ -2,7 +2,6 @@ package frontend
import (
"github.com/eiannone/keyboard"
ws "github.com/gorilla/websocket"
"git.smsvc.net/pomodoro/ChronoTomato/internal/websocket"
@ -21,16 +20,16 @@ func start_pause_resume(message GoTomato.ServerMessage) string {
}
}
func keyhandler(key keyboard.KeyEvent, conn *ws.Conn, config ChronoTomato.Config, message GoTomato.ServerMessage) bool {
func keyhandler(key keyboard.KeyEvent, client ChronoTomato.Client, config ChronoTomato.Config, message GoTomato.ServerMessage) bool {
switch key.Rune {
case 0: // space
cmd := start_pause_resume(message)
websocket.SendCmd(conn, config.Password, cmd)
websocket.SendCmd(client, config.Password, cmd)
case 115: // s
websocket.SendCmd(conn, config.Password, "stop")
websocket.SendCmd(client, config.Password, "stop")
case 114: // r
if config.PomodoroConfig != (GoTomato.PomodoroConfig{}) {
websocket.Send_updateSettings(conn, config.Password, config.PomodoroConfig)
websocket.Send_updateSettings(client, config.Password, config.PomodoroConfig)
}
case 113: // q
return false

5
internal/frontend/main.go
View file

@ -2,7 +2,6 @@ package frontend
import (
"github.com/eiannone/keyboard"
ws "github.com/gorilla/websocket"
"git.smsvc.net/pomodoro/ChronoTomato/internal/websocket"
@ -10,7 +9,7 @@ import (
GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models"
)
func UpdateLoop(conn *ws.Conn, config ChronoTomato.Config, channel <-chan GoTomato.ServerMessage) {
func UpdateLoop(client ChronoTomato.Client, config ChronoTomato.Config, channel <-chan GoTomato.ServerMessage) {
var message GoTomato.ServerMessage
keysEvents, _ := keyboard.GetKeys(1)
@ -22,7 +21,7 @@ func UpdateLoop(conn *ws.Conn, config ChronoTomato.Config, channel <-chan GoToma
desktopNotifications(message)
terminalOutput(message)
case keypress := <-keysEvents:
if !keyhandler(keypress, conn, config, message) {
if !keyhandler(keypress, client, config, message) {
return
}
case <-websocket.Done: