mirror of
https://github.com/yusing/godoxy.git
synced 2026-01-14 14:23:33 +01: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.
66 lines
1.3 KiB
Go
66 lines
1.3 KiB
Go
package idlewatcher
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
)
|
|
|
|
type watcherError struct {
|
|
watcher *Watcher
|
|
err error
|
|
}
|
|
|
|
func (e *watcherError) Unwrap() error {
|
|
return e.err
|
|
}
|
|
|
|
func (e *watcherError) Error() string {
|
|
return fmt.Sprintf("watcher %q error: %s", e.watcher.cfg.ContainerName(), e.err.Error())
|
|
}
|
|
|
|
func (w *Watcher) newWatcherError(err error) error {
|
|
if errors.Is(err, causeReload) {
|
|
return nil
|
|
}
|
|
if wErr, ok := err.(*watcherError); ok { //nolint:errorlint
|
|
return wErr
|
|
}
|
|
return &watcherError{watcher: w, err: convertError(err)}
|
|
}
|
|
|
|
type depError struct {
|
|
action string
|
|
dep *dependency
|
|
err error
|
|
}
|
|
|
|
func (e *depError) Unwrap() error {
|
|
return e.err
|
|
}
|
|
|
|
func (e *depError) Error() string {
|
|
return fmt.Sprintf("%s failed for dependency %q: %s", e.action, e.dep.cfg.ContainerName(), e.err.Error())
|
|
}
|
|
|
|
func (w *Watcher) newDepError(action string, dep *dependency, err error) error {
|
|
if errors.Is(err, causeReload) {
|
|
return nil
|
|
}
|
|
if dErr, ok := err.(*depError); ok { //nolint:errorlint
|
|
return dErr
|
|
}
|
|
return &depError{action: action, dep: dep, err: convertError(err)}
|
|
}
|
|
|
|
func convertError(err error) error {
|
|
switch {
|
|
case err == nil:
|
|
return nil
|
|
case errors.Is(err, context.DeadlineExceeded):
|
|
return errors.New("timeout")
|
|
default:
|
|
return err
|
|
}
|
|
}
|