feat(server): restructure Pomodoro server into modular components
- move server logic to cmd/server/main.go
- create packages for websocket, pomodoro and broadcast handling
- define models for messages
- remove old GoTomato.go file
- update README
🤖
This commit is contained in:
parent
6d73711341
commit
c59f737eb7
10 changed files with 224 additions and 157 deletions
41
internal/websocket/client_commands.go
Normal file
41
internal/websocket/client_commands.go
Normal file
|
@ -0,0 +1,41 @@
|
|||
package websocket
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"git.smsvc.net/pomodoro/GoTomato/internal/pomodoro"
|
||||
"git.smsvc.net/pomodoro/GoTomato/pkg/models"
|
||||
"github.com/gorilla/websocket"
|
||||
"log"
|
||||
)
|
||||
|
||||
// handleClientCommands listens for commands from WebSocket clients and dispatches to the timer.
|
||||
func handleClientCommands(ws *websocket.Conn) {
|
||||
for {
|
||||
_, message, err := ws.ReadMessage()
|
||||
if err != nil {
|
||||
log.Printf("Client disconnected: %v", err)
|
||||
delete(Clients, ws)
|
||||
break
|
||||
}
|
||||
|
||||
// Handle incoming commands
|
||||
var command models.ClientCommand
|
||||
err = json.Unmarshal(message, &command)
|
||||
if err != nil {
|
||||
log.Printf("Error unmarshalling command: %v", err)
|
||||
continue
|
||||
}
|
||||
|
||||
// Process the command
|
||||
switch command.Command {
|
||||
case "start":
|
||||
if !pomodoro.IsTimerRunning() {
|
||||
go pomodoro.RunPomodoroTimer(Clients) // Start the timer with the list of clients
|
||||
}
|
||||
case "stop":
|
||||
if pomodoro.IsTimerRunning() {
|
||||
pomodoro.StopTimer() // Stop the timer in the Pomodoro package
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
32
internal/websocket/handle_connections.go
Normal file
32
internal/websocket/handle_connections.go
Normal file
|
@ -0,0 +1,32 @@
|
|||
package websocket
|
||||
|
||||
import (
|
||||
"github.com/gorilla/websocket"
|
||||
"log"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
// Map to track connected clients
|
||||
var Clients = make(map[*websocket.Conn]bool)
|
||||
|
||||
// Upgrader to upgrade HTTP requests to WebSocket connections
|
||||
var upgrader = websocket.Upgrader{
|
||||
CheckOrigin: func(r *http.Request) bool { return true },
|
||||
}
|
||||
|
||||
// HandleConnections upgrades HTTP requests to WebSocket connections and manages the client lifecycle.
|
||||
func HandleConnections(w http.ResponseWriter, r *http.Request) {
|
||||
// Upgrade initial GET request to a WebSocket
|
||||
ws, err := upgrader.Upgrade(w, r, nil)
|
||||
if err != nil {
|
||||
log.Printf("WebSocket upgrade error: %v", err)
|
||||
return
|
||||
}
|
||||
defer ws.Close()
|
||||
|
||||
// Register the new client
|
||||
Clients[ws] = true
|
||||
|
||||
// Listen for commands from the connected client
|
||||
handleClientCommands(ws)
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue