diff --git a/internal/handler/computer.go b/internal/handler/computer.go index a8ea064..313059c 100644 --- a/internal/handler/computer.go +++ b/internal/handler/computer.go @@ -2,6 +2,7 @@ package handler import ( "backend/internal/model" + "backend/internal/service" "encoding/json" "log/slog" "net/http" @@ -25,12 +26,14 @@ func HandleComputerWebSocket(w http.ResponseWriter, r *http.Request) { defer conn.Close() slog.Info("Websocket connection established!") + online := true // Read messages for { _, message, err := conn.ReadMessage() if err != nil { slog.Error("WebSocket connection closed by client", slog.Any("error", err)) + online = false break } @@ -40,6 +43,12 @@ func HandleComputerWebSocket(w http.ResponseWriter, r *http.Request) { continue } + service.AddComputerData(online, clientMessage) slog.Info("Recieved message", slog.Any("message", clientMessage)) } } + +func HandleComputerGraphData(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json") + json.NewEncoder(w).Encode(service.ComputerData) +} diff --git a/internal/model/computer.go b/internal/model/computer.go index 9674326..1a9d1c1 100644 --- a/internal/model/computer.go +++ b/internal/model/computer.go @@ -4,3 +4,9 @@ type ComputerWebSocketMessage struct { Cpu uint8 `json:"cpu"` Ram uint8 `json:"ram"` } + +type ComputerGraphData struct { + Online bool `json:"online"` + Cpu []int `json:"cpu"` + Ram []int `json:"ram"` +} diff --git a/internal/server/router.go b/internal/server/router.go index 5543aed..06dbfb7 100644 --- a/internal/server/router.go +++ b/internal/server/router.go @@ -42,6 +42,7 @@ func NewRouter() { r.Get("/currently-playing", handler.HandleGetCurrentlyPlaying) r.Get("/status", handler.HandleGetStatus) + r.Get("/computer", handler.HandleComputerGraphData) r.Get("/ws/computer", handler.HandleComputerWebSocket) port := os.Getenv("PORT") diff --git a/internal/service/computer.go b/internal/service/computer.go new file mode 100644 index 0000000..84e910d --- /dev/null +++ b/internal/service/computer.go @@ -0,0 +1,18 @@ +package service + +import ( + "backend/internal/model" +) + +var ComputerData model.ComputerGraphData + +func AddComputerData(online bool, clientMessage model.ComputerWebSocketMessage) { + ComputerData.Online = online + ComputerData.Cpu = append(ComputerData.Cpu, int(clientMessage.Cpu)) + ComputerData.Ram = append(ComputerData.Ram, int(clientMessage.Ram)) + + if len(ComputerData.Cpu) > 20 { + ComputerData.Cpu = ComputerData.Cpu[1:] + ComputerData.Ram = ComputerData.Ram[1:] + } +}