Sebastian Mark
0ca90b50a5
- add new websocket.Client type
- change Connect and Disconnect functions to use the new Client type
- implement methods for sending commands and updating settings on Client
- update keyhandler to use websocket.Client instead of ChronoTomato.Client
- modify UpdateLoop to accept websocket.Client
- refactor ProcessServerMessages to accept the new Client type
🤖
40 lines
825 B
Go
40 lines
825 B
Go
package websocket
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"github.com/charmbracelet/log"
|
|
"github.com/gorilla/websocket"
|
|
|
|
GoTomato "git.smsvc.net/pomodoro/GoTomato/pkg/models"
|
|
)
|
|
|
|
var Done = make(chan struct{})
|
|
|
|
func ProcessServerMessages(client Client, channel chan<- GoTomato.ServerMessage) {
|
|
var serverMessage GoTomato.ServerMessage
|
|
|
|
defer close(Done)
|
|
|
|
for {
|
|
_, message, err := client.Conn.ReadMessage()
|
|
if err != nil {
|
|
if websocket.IsCloseError(err, websocket.CloseNormalClosure) {
|
|
// Ignore normal closure and exit gracefully
|
|
return
|
|
}
|
|
// Log any other errors
|
|
fmt.Println()
|
|
log.Error("Read error!", "reason", err)
|
|
return
|
|
}
|
|
|
|
err = json.Unmarshal(message, &serverMessage)
|
|
if err != nil {
|
|
log.Error("Error unmarshalling!", "reason", err)
|
|
continue
|
|
}
|
|
|
|
channel <- serverMessage
|
|
}
|
|
}
|