add logging to check events

main
DustyP 9 months ago
parent 3ad2c294d2
commit 500eff7402

@ -39,15 +39,19 @@ func main() {
var wg sync.WaitGroup
// Create a fan-out mechanism for events
eventBroadcaster := make(chan derby.Event, 10)
// Create multiple event channels for fan-out
terminalEvents := make(chan derby.Event, 10)
webEvents := make(chan derby.Event, 10)
// Start the event broadcaster
// Start the event broadcaster with fan-out to multiple channels
go func() {
for event := range clock.Events() {
eventBroadcaster <- event
// Clone the event to both channels
terminalEvents <- event
webEvents <- event
}
close(eventBroadcaster)
close(terminalEvents)
close(webEvents)
}()
// Create a context for graceful shutdown
@ -59,7 +63,7 @@ func main() {
wg.Add(1)
go func() {
defer wg.Done()
startWebInterface(clock, eventBroadcaster, *webPort, ctx)
startWebInterface(clock, webEvents, *webPort, ctx)
}()
}
@ -68,7 +72,7 @@ func main() {
wg.Add(1)
go func() {
defer wg.Done()
startTerminalInterface(clock, eventBroadcaster, ctx)
startTerminalInterface(clock, terminalEvents, ctx)
}()
}

@ -3,6 +3,7 @@ package web
import (
"context"
"embed"
"encoding/json"
"fmt"
"io/fs"
"net/http"
@ -136,27 +137,52 @@ func (s *Server) forwardEvents() {
// broadcastEvent sends an event to all connected clients
func (s *Server) broadcastEvent(event derby.Event) {
var message string
switch event.Type {
case derby.EventRaceStart:
message = "event: race-start\ndata: {\"status\": \"running\"}\n\n"
statusMsg := struct {
Status string `json:"status"`
}{
Status: "running",
}
statusJSON, _ := json.Marshal(statusMsg)
message = fmt.Sprintf("event: status\ndata: %s", statusJSON)
case derby.EventLaneFinish:
result := event.Result
message = fmt.Sprintf("event: lane-finish\ndata: {\"lane\": %d, \"place\": %d, \"time\": %.4f}\n\n",
result.Lane, result.FinishPlace, result.Time)
// Create a message for lane finish
laneData := struct {
Lane int `json:"lane"`
Time float64 `json:"time"`
Place int `json:"place"`
}{
Lane: event.Result.Lane,
Time: event.Result.Time,
Place: event.Result.FinishPlace,
}
laneJSON, _ := json.Marshal(laneData)
message = fmt.Sprintf("event: lane-finish\ndata: %s", laneJSON)
case derby.EventRaceComplete:
message = "event: race-complete\ndata: {\"status\": \"finished\"}\n\n"
statusMsg := struct {
Status string `json:"status"`
}{
Status: "finished",
}
statusJSON, _ := json.Marshal(statusMsg)
message = fmt.Sprintf("event: status\ndata: %s", statusJSON)
}
if message == "" {
return
}
// Send to all clients
s.clientsMux.Lock()
for clientChan := range s.clients {
// Non-blocking send to avoid slow clients blocking others
select {
case clientChan <- message:
default:
// Client channel is full, could log this or take other action
// Client channel is full, could log this
}
}
s.clientsMux.Unlock()

@ -45,6 +45,7 @@ templ Index() {
const eventSource = new EventSource('/api/events');
eventSource.addEventListener('lane-finish', function(event) {
console.log("Lane finish event received:", event.data);
const laneFinishData = JSON.parse(event.data);
const lane = document.getElementById(`lane-${laneFinishData.lane}`);
if (lane) {

@ -37,7 +37,7 @@ func Index() templ.Component {
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</div><div class=\"flex justify-center space-x-4\"><button hx-post=\"/api/reset\" hx-swap=\"none\" class=\"bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded\">Reset Race</button> <button hx-post=\"/api/force-end\" hx-swap=\"none\" class=\"bg-red-500 hover:bg-red-700 text-white font-bold py-2 px-4 rounded\">Force End Race</button></div></div><script>\r\n\t\t\t// Set up SSE connection\r\n\t\t\tconst eventSource = new EventSource('/api/events');\r\n\t\t\t\r\n\t\t\teventSource.addEventListener('lane-finish', function(event) {\r\n\t\t\t\tconst laneFinishData = JSON.parse(event.data);\r\n\t\t\t\tconst lane = document.getElementById(`lane-${laneFinishData.lane}`);\r\n\t\t\t\tif (lane) {\r\n\t\t\t\t\tlane.classList.add('finished');\r\n\t\t\t\t\tlane.querySelector('.time').textContent = laneFinishData.time.toFixed(4);\r\n\t\t\t\t\t\r\n\t\t\t\t\tconst placeEl = lane.querySelector('.place');\r\n\t\t\t\t\tplaceEl.textContent = `${getOrdinal(laneFinishData.place)} Place`;\r\n\t\t\t\t\tplaceEl.classList.remove('hidden');\r\n\t\t\t\t}\r\n\t\t\t});\r\n\t\t\t\r\n\t\t\teventSource.addEventListener('status', function(event) {\r\n\t\t\t\tconst statusData = JSON.parse(event.data);\r\n\t\t\t\tlet statusText = 'Unknown';\r\n\t\t\t\tlet statusClass = 'bg-gray-500';\r\n\t\t\t\t\r\n\t\t\t\tif (statusData.status === 'idle') {\r\n\t\t\t\t\tstatusText = 'Ready';\r\n\t\t\t\t\tstatusClass = 'bg-blue-600';\r\n\t\t\t\t\t\r\n\t\t\t\t\t// Reset all lanes\r\n\t\t\t\t\tdocument.querySelectorAll('.lane').forEach(lane => {\r\n\t\t\t\t\t\tlane.classList.remove('finished');\r\n\t\t\t\t\t\tlane.querySelector('.time').textContent = '--.--.---';\r\n\t\t\t\t\t\tlane.querySelector('.place').classList.add('hidden');\r\n\t\t\t\t\t});\r\n\t\t\t\t} else if (statusData.status === 'running') {\r\n\t\t\t\t\tstatusText = 'Race Running';\r\n\t\t\t\t\tstatusClass = 'bg-green-600';\r\n\t\t\t\t} else if (statusData.status === 'finished') {\r\n\t\t\t\t\tstatusText = 'Race Complete';\r\n\t\t\t\t\tstatusClass = 'bg-purple-600';\r\n\t\t\t\t}\r\n\t\t\t\t\r\n\t\t\t\tdocument.getElementById('race-status').textContent = statusText;\r\n\t\t\t\tdocument.getElementById('race-status').className = `px-4 py-2 rounded-full text-white ${statusClass}`;\r\n\t\t\t});\r\n\t\t\t\r\n\t\t\tfunction getOrdinal(n) {\r\n\t\t\t\tconst s = [\"th\", \"st\", \"nd\", \"rd\"];\r\n\t\t\t\tconst v = n % 100;\r\n\t\t\t\treturn n + (s[(v-20)%10] || s[v] || s[0]);\r\n\t\t\t}\r\n\t\t</script></body></html>")
templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</div><div class=\"flex justify-center space-x-4\"><button hx-post=\"/api/reset\" hx-swap=\"none\" class=\"bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded\">Reset Race</button> <button hx-post=\"/api/force-end\" hx-swap=\"none\" class=\"bg-red-500 hover:bg-red-700 text-white font-bold py-2 px-4 rounded\">Force End Race</button></div></div><script>\r\n\t\t\t// Set up SSE connection\r\n\t\t\tconst eventSource = new EventSource('/api/events');\r\n\t\t\t\r\n\t\t\teventSource.addEventListener('lane-finish', function(event) {\r\n\t\t\t\tconsole.log(\"Lane finish event received:\", event.data);\r\n\t\t\t\tconst laneFinishData = JSON.parse(event.data);\r\n\t\t\t\tconst lane = document.getElementById(`lane-${laneFinishData.lane}`);\r\n\t\t\t\tif (lane) {\r\n\t\t\t\t\tlane.classList.add('finished');\r\n\t\t\t\t\tlane.querySelector('.time').textContent = laneFinishData.time.toFixed(4);\r\n\t\t\t\t\t\r\n\t\t\t\t\tconst placeEl = lane.querySelector('.place');\r\n\t\t\t\t\tplaceEl.textContent = `${getOrdinal(laneFinishData.place)} Place`;\r\n\t\t\t\t\tplaceEl.classList.remove('hidden');\r\n\t\t\t\t}\r\n\t\t\t});\r\n\t\t\t\r\n\t\t\teventSource.addEventListener('status', function(event) {\r\n\t\t\t\tconst statusData = JSON.parse(event.data);\r\n\t\t\t\tlet statusText = 'Unknown';\r\n\t\t\t\tlet statusClass = 'bg-gray-500';\r\n\t\t\t\t\r\n\t\t\t\tif (statusData.status === 'idle') {\r\n\t\t\t\t\tstatusText = 'Ready';\r\n\t\t\t\t\tstatusClass = 'bg-blue-600';\r\n\t\t\t\t\t\r\n\t\t\t\t\t// Reset all lanes\r\n\t\t\t\t\tdocument.querySelectorAll('.lane').forEach(lane => {\r\n\t\t\t\t\t\tlane.classList.remove('finished');\r\n\t\t\t\t\t\tlane.querySelector('.time').textContent = '--.--.---';\r\n\t\t\t\t\t\tlane.querySelector('.place').classList.add('hidden');\r\n\t\t\t\t\t});\r\n\t\t\t\t} else if (statusData.status === 'running') {\r\n\t\t\t\t\tstatusText = 'Race Running';\r\n\t\t\t\t\tstatusClass = 'bg-green-600';\r\n\t\t\t\t} else if (statusData.status === 'finished') {\r\n\t\t\t\t\tstatusText = 'Race Complete';\r\n\t\t\t\t\tstatusClass = 'bg-purple-600';\r\n\t\t\t\t}\r\n\t\t\t\t\r\n\t\t\t\tdocument.getElementById('race-status').textContent = statusText;\r\n\t\t\t\tdocument.getElementById('race-status').className = `px-4 py-2 rounded-full text-white ${statusClass}`;\r\n\t\t\t});\r\n\t\t\t\r\n\t\t\tfunction getOrdinal(n) {\r\n\t\t\t\tconst s = [\"th\", \"st\", \"nd\", \"rd\"];\r\n\t\t\t\tconst v = n % 100;\r\n\t\t\t\treturn n + (s[(v-20)%10] || s[v] || s[0]);\r\n\t\t\t}\r\n\t\t</script></body></html>")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@ -104,7 +104,7 @@ func laneComponent(lane int) templ.Component {
var templ_7745c5c3_Var4 string
templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs("lane-" + string(rune('0'+lane)))
if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/index.templ`, Line: 104, Col: 45}
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/index.templ`, Line: 105, Col: 45}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
if templ_7745c5c3_Err != nil {
@ -117,7 +117,7 @@ func laneComponent(lane int) templ.Component {
var templ_7745c5c3_Var5 string
templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(string(rune('0' + lane)))
if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/index.templ`, Line: 105, Col: 72}
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/index.templ`, Line: 106, Col: 72}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
if templ_7745c5c3_Err != nil {

Loading…
Cancel
Save