mirror of
https://github.com/yusing/godoxy.git
synced 2026-04-10 02:43:37 +02:00
910ef639a4
This major overhaul of the idlewatcher system introduces a modern, real-time loading experience with Server-Sent Events (SSE) streaming and improved error handling. - **Real-time Event Streaming**: New SSE endpoint (`/$godoxy/wake-events`) provides live updates during container wake process - **Enhanced Loading Page**: Modern console-style interface with timestamped events and color-coded status messages - **Improved Static Asset Management**: Dedicated paths for CSS, JS, and favicon to avoid conflicting with upstream assets - **Event History Buffer**: Stores wake events for reconnecting clients and debugging - Refactored HTTP request handling with cleaner static asset routing - Added `WakeEvent` system with structured event types (starting, waking_dep, dep_ready, container_woke, waiting_ready, ready, error) - Implemented thread-safe event broadcasting using xsync.Map for concurrent SSE connections - Enhanced error handling with detailed logging and user-friendly error messages - Simplified loading page template system with better asset path management - Fixed race conditions in dependency waking and state management - Removed `common.go` functions (canceled, waitStarted) - moved inline for better context - Updated Waker interface to accept context parameter in Wake() method - New static asset paths use `/$godoxy/` prefix to avoid conflicts - Console-style output with Fira Code font for better readability - Color-coded event types (yellow for starting, blue for dependencies, green for success, red for errors) - Automatic page refresh when container becomes ready - Improved visual design with better glassmorphism effects and responsive layout - Real-time progress feedback during dependency wake and container startup This change transforms the static loading page into a dynamic, informative experience that keeps users informed during the wake process while maintaining backward compatibility with existing routing behavior.
76 lines
1.7 KiB
Go
76 lines
1.7 KiB
Go
package idlewatcher
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"time"
|
|
|
|
"github.com/bytedance/sonic"
|
|
)
|
|
|
|
type WakeEvent struct {
|
|
Type string `json:"type"`
|
|
Message string `json:"message"`
|
|
Timestamp time.Time `json:"timestamp"`
|
|
Error string `json:"error,omitempty"`
|
|
}
|
|
|
|
type WakeEventType string
|
|
|
|
const (
|
|
WakeEventStarting WakeEventType = "starting"
|
|
WakeEventWakingDep WakeEventType = "waking_dep"
|
|
WakeEventDepReady WakeEventType = "dep_ready"
|
|
WakeEventContainerWoke WakeEventType = "container_woke"
|
|
WakeEventWaitingReady WakeEventType = "waiting_ready"
|
|
WakeEventReady WakeEventType = "ready"
|
|
WakeEventError WakeEventType = "error"
|
|
)
|
|
|
|
func (w *Watcher) newWakeEvent(eventType WakeEventType, message string, err error) *WakeEvent {
|
|
event := &WakeEvent{
|
|
Type: string(eventType),
|
|
Message: message,
|
|
Timestamp: time.Now(),
|
|
}
|
|
if err != nil {
|
|
event.Error = err.Error()
|
|
}
|
|
return event
|
|
}
|
|
|
|
func (e *WakeEvent) WriteSSE(w io.Writer) error {
|
|
data, err := sonic.Marshal(e)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = fmt.Fprintf(w, "data: %s\n\n", data)
|
|
return err
|
|
}
|
|
|
|
func (w *Watcher) clearEventHistory() {
|
|
w.eventHistoryMu.Lock()
|
|
w.eventHistory = w.eventHistory[:0]
|
|
w.eventHistoryMu.Unlock()
|
|
}
|
|
|
|
func (w *Watcher) sendEvent(eventType WakeEventType, message string, err error) {
|
|
event := w.newWakeEvent(eventType, message, err)
|
|
|
|
w.l.Debug().Str("event", string(eventType)).Str("message", message).Err(err).Msg("sending event")
|
|
|
|
// Store event in history
|
|
w.eventHistoryMu.Lock()
|
|
w.eventHistory = append(w.eventHistory, *event)
|
|
w.eventHistoryMu.Unlock()
|
|
|
|
// Broadcast to current subscribers
|
|
for ch := range w.eventChs.Range {
|
|
select {
|
|
case ch <- event:
|
|
default:
|
|
// channel full, drop event
|
|
}
|
|
}
|
|
}
|