feat: System page, live Logi, dashboard icons, floating help #56
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,255 @@ | ||
| package httpapi | ||
|
There was a problem hiding this comment. ✨ [POSITIVE] POSITIVE: The new |
||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "errors" | ||
| "io" | ||
| "net" | ||
| "net/http" | ||
| "strings" | ||
|
|
||
| "github.com/coder/websocket" | ||
| miclient "github.com/dcc-bigfred/microinit/go/client" | ||
| "github.com/go-chi/chi/v5" | ||
|
|
||
| "github.com/keskad/loco/pkgs/bigfred/server/cmd" | ||
| "github.com/keskad/loco/pkgs/bigfred/server/domain" | ||
| "github.com/keskad/loco/pkgs/bigfred/server/service" | ||
| ) | ||
|
|
||
| const microinitLogHistoryLines = 300 | ||
|
|
||
| type microinitWSMessage struct { | ||
| Type string `json:"type"` | ||
| Lines []string `json:"lines,omitempty"` | ||
| Text string `json:"text,omitempty"` | ||
| Error string `json:"error,omitempty"` | ||
| } | ||
|
|
||
| // MicroinitHandler serves admin microinit service listing, info, and log WS. | ||
|
There was a problem hiding this comment. ✨ [POSITIVE] POSITIVE: The implementation of the |
||
| type MicroinitHandler struct { | ||
| svc *service.MicroinitControl | ||
| auth *cmd.Auth | ||
| } | ||
|
|
||
| // NewMicroinitHandler returns a MicroinitHandler. svc/auth may be nil (503/401). | ||
| func NewMicroinitHandler(svc *service.MicroinitControl, auth *cmd.Auth) *MicroinitHandler { | ||
| return &MicroinitHandler{svc: svc, auth: auth} | ||
| } | ||
|
|
||
| // ListServices handles GET /api/v1/admin/microinit/services. | ||
| func (h *MicroinitHandler) ListServices(w http.ResponseWriter, _ *http.Request) { | ||
| if h.svc == nil || !h.svc.Available() { | ||
| writeJSONError(w, http.StatusServiceUnavailable, "service_unavailable") | ||
| return | ||
| } | ||
| services, err := h.svc.ListServices() | ||
| if err != nil { | ||
| if errors.Is(err, service.ErrSystemUnavailable) { | ||
| writeJSONError(w, http.StatusServiceUnavailable, "service_unavailable") | ||
| return | ||
| } | ||
| writeJSONError(w, http.StatusInternalServerError, "internal_error") | ||
| return | ||
| } | ||
| w.Header().Set("Content-Type", "application/json") | ||
| _ = json.NewEncoder(w).Encode(map[string]any{"services": services}) | ||
| } | ||
|
|
||
| // Info handles GET /api/v1/admin/microinit/info. | ||
| func (h *MicroinitHandler) Info(w http.ResponseWriter, _ *http.Request) { | ||
| if h.svc == nil || !h.svc.Available() { | ||
| writeJSONError(w, http.StatusServiceUnavailable, "service_unavailable") | ||
| return | ||
| } | ||
| info, err := h.svc.Info() | ||
| if err != nil { | ||
| if errors.Is(err, service.ErrSystemUnavailable) { | ||
| writeJSONError(w, http.StatusServiceUnavailable, "service_unavailable") | ||
| return | ||
| } | ||
| writeJSONError(w, http.StatusInternalServerError, "internal_error") | ||
| return | ||
| } | ||
| w.Header().Set("Content-Type", "application/json") | ||
| _ = json.NewEncoder(w).Encode(info) | ||
| } | ||
|
|
||
| // StreamLogs handles GET /api/v1/admin/microinit/services/{id}/logs/stream (WebSocket). | ||
| // Auth is verified in-handler (cookie / ?token=) like ScanWS — chi | ||
| // RequireRole does not reliably gate the WS upgrade itself. Uses | ||
| // auth.Effective so sudo-elevated admins match the rest of the admin UI. | ||
| func (h *MicroinitHandler) StreamLogs(w http.ResponseWriter, r *http.Request) { | ||
| if h.auth == nil { | ||
| writeJSONError(w, http.StatusUnauthorized, "unauthorized") | ||
| return | ||
| } | ||
| token := readSessionToken(r) | ||
| if token == "" { | ||
| writeJSONError(w, http.StatusUnauthorized, "unauthorized") | ||
| return | ||
| } | ||
| id, err := h.auth.VerifyToken(r.Context(), token) | ||
| if err != nil { | ||
| writeJSONError(w, http.StatusUnauthorized, "unauthorized") | ||
| return | ||
| } | ||
| eff, err := h.auth.Effective(r.Context(), id.User, id.Layout.ID) | ||
| if err != nil { | ||
| writeJSONError(w, http.StatusInternalServerError, "internal_error") | ||
| return | ||
| } | ||
| if !eff.Has(domain.RoleAdmin) { | ||
| writeJSONError(w, http.StatusForbidden, "forbidden") | ||
| return | ||
| } | ||
|
|
||
| serviceID := chi.URLParam(r, "id") | ||
| if err := miclient.ValidateName(serviceID); err != nil { | ||
| writeJSONError(w, http.StatusBadRequest, "bad_request") | ||
| return | ||
| } | ||
| if h.svc == nil || !h.svc.Available() { | ||
| writeJSONError(w, http.StatusServiceUnavailable, "service_unavailable") | ||
| return | ||
| } | ||
|
|
||
| wsConn, err := websocket.Accept(w, r, &websocket.AcceptOptions{ | ||
| InsecureSkipVerify: true, | ||
|
There was a problem hiding this comment. ℹ️ [LOW] PRIORITY:LOW: The |
||
| }) | ||
| if err != nil { | ||
| return | ||
| } | ||
| defer wsConn.Close(websocket.StatusNormalClosure, "done") | ||
|
|
||
| ctx := r.Context() | ||
|
|
||
| history, err := h.fetchLogHistory(serviceID, microinitLogHistoryLines) | ||
| if err != nil { | ||
| _ = writeMicroinitWS(wsConn, ctx, microinitWSMessage{Type: "error", Error: err.Error()}) | ||
|
There was a problem hiding this comment. ℹ️ [LOW] PRIORITY:LOW: The |
||
| return | ||
| } | ||
| if err := writeMicroinitWS(wsConn, ctx, microinitWSMessage{Type: "history", Lines: history}); err != nil { | ||
| return | ||
| } | ||
|
|
||
| unix, err := h.svc.FollowLogs(serviceID, 0, true) | ||
| if err != nil { | ||
| _ = writeMicroinitWS(wsConn, ctx, microinitWSMessage{Type: "error", Error: err.Error()}) | ||
| return | ||
| } | ||
| defer unix.Close() | ||
|
|
||
| // Keepalive + disconnect detection: answer client pings, and when the | ||
| // WebSocket read fails (client gone), close the microinit follow conn so | ||
| // the blocking ReadFrame loop below unblocks instead of leaking. | ||
| go func() { | ||
| defer unix.Close() | ||
| for { | ||
| _, data, err := wsConn.Read(ctx) | ||
| if err != nil { | ||
| return | ||
| } | ||
| var msg struct { | ||
| Type string `json:"type"` | ||
| } | ||
| if json.Unmarshal(data, &msg) != nil { | ||
| continue | ||
| } | ||
| if msg.Type == "ping" { | ||
| _ = writeMicroinitWS(wsConn, ctx, microinitWSMessage{Type: "pong"}) | ||
| } | ||
| } | ||
| }() | ||
|
|
||
| for { | ||
| resp, err := h.svc.ReadFrame(unix) | ||
| if err != nil { | ||
| if errors.Is(err, io.EOF) || errors.Is(err, net.ErrClosed) || isClosedConn(err) { | ||
| return | ||
| } | ||
| // Client disconnect closes unix from the ping goroutine; treat | ||
| // resulting read errors as a clean end of stream. | ||
| if ctx.Err() != nil { | ||
| return | ||
| } | ||
| _ = writeMicroinitWS(wsConn, ctx, microinitWSMessage{Type: "error", Error: "stream_failed"}) | ||
| return | ||
| } | ||
|
|
||
| switch resp.Type { | ||
| case "log": | ||
| if resp.Line == nil { | ||
| continue | ||
| } | ||
| text := miclient.FormatLogLine(*resp.Line) | ||
| if err := writeMicroinitWS(wsConn, ctx, microinitWSMessage{Type: "line", Text: text}); err != nil { | ||
| return | ||
| } | ||
| case "error": | ||
| msg := resp.Message | ||
| if msg == "" { | ||
| msg = "stream_failed" | ||
| } | ||
| _ = writeMicroinitWS(wsConn, ctx, microinitWSMessage{Type: "error", Error: msg}) | ||
| return | ||
| case "ok": | ||
| return | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (h *MicroinitHandler) fetchLogHistory(name string, lines int) ([]string, error) { | ||
| unix, err := h.svc.FollowLogs(name, lines, false) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| defer unix.Close() | ||
|
|
||
| out := make([]string, 0, 64) | ||
| for { | ||
| resp, err := h.svc.ReadFrame(unix) | ||
| if err != nil { | ||
| if errors.Is(err, io.EOF) { | ||
| return out, nil | ||
| } | ||
| return nil, err | ||
| } | ||
| switch resp.Type { | ||
| case "log": | ||
| if resp.Line != nil { | ||
| out = append(out, miclient.FormatLogLine(*resp.Line)) | ||
| } | ||
| case "ok": | ||
| return out, nil | ||
| case "error": | ||
| msg := resp.Message | ||
| if msg == "" { | ||
| msg = "read_failed" | ||
| } | ||
| return nil, errors.New(msg) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func writeMicroinitWS(conn *websocket.Conn, ctx context.Context, msg microinitWSMessage) error { | ||
| data, err := json.Marshal(msg) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return conn.Write(ctx, websocket.MessageText, data) | ||
| } | ||
|
|
||
| func isClosedConn(err error) bool { | ||
| if err == nil { | ||
| return false | ||
| } | ||
| var opErr *net.OpError | ||
| if errors.As(err, &opErr) { | ||
| return true | ||
| } | ||
| msg := err.Error() | ||
|
There was a problem hiding this comment. ℹ️ [LOW] PRIORITY:LOW: The |
||
| return strings.Contains(msg, "use of closed network connection") || | ||
| strings.Contains(msg, "closed") | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✨ [POSITIVE] POSITIVE: The refactoring to replace the direct
microinit.EnsureMicrodnsConfig()call with a structuredmicroinit.MicrodnsConfigwithinInfraConfigis a good architectural improvement. It centralizes configuration management and makes the system more modular and testable.