SPA (cmd/frontend/web): - New "lb buckets" column backed by a 1s-debounced GetVPPLBState fetch loop with leading+trailing edge coalesce. - Per-frontend health icon (✅/⚠️/❗/‼️/❓) in the Zippy header, gated by a settling flag that suppresses ‼️ until the next lb-state reconciliation after a backend transition or weight change. - In-place leaf merge on lb-state so stable bucket values (e.g. "0") don't retrigger the Flash animation on every refresh. - Zippy cards remember open state in a cookie, default closed on fresh load; fixed-width frontend-title-name + reserved icon slot so headers line up across all cards. - Clock-drift watchdog in sse.ts that forces a fresh EventSource on laptop-wake so the broker emits a resync instead of hanging on a dead half-open socket. Frontend service (cmd/frontend): - maglevClient.lbStateLoop, trigger on backend transitions + vpp-connect, best-effort fetch on refreshAll. - Admin handlers explicitly wake the lb-state loop after lifecycle ops and set-weight (the latter emits no transition event on the maglevd side, so the WatchEvents path wouldn't have caught it). - /favicon.ico served from embedded web/public IPng logo. VPP integration: - internal/vpp/lbstate.go: dumpASesForVIP drops Pfx from the dump request (setting it silently wipes IPv4 replies in the LB plugin) and filters results by prefix on the response side instead, which also demuxes multi-VIP-on-same-port cases correctly. maglevc: - Walk now returns the unconsumed token tail; dispatch and the question listener reject unknown commands with a targeted error instead of dumping the full command tree prefixed with garbage. - On '?', echo the current line (including the '?') before the help list so the output reads like birdc. Checker / prober: - internal/checker: ±10% jitter on NextInterval so probes across restart don't all fire on the same tick. - internal/prober: HTTP User-Agent now carries the build version and project URL. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
183 lines
5.9 KiB
Go
183 lines
5.9 KiB
Go
// Copyright (c) 2026, Pim van Pelt <pim@ipng.ch>
|
|
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/chzyer/readline"
|
|
|
|
"git.ipng.ch/ipng/vpp-maglev/internal/grpcapi"
|
|
)
|
|
|
|
const completeTimeout = 1 * time.Second
|
|
|
|
// Completer implements readline.AutoCompleter for the command tree.
|
|
type Completer struct {
|
|
root *Node
|
|
client grpcapi.MaglevClient
|
|
}
|
|
|
|
// Do implements readline.AutoCompleter.
|
|
// line is the full current line; pos is the cursor position.
|
|
// Returns (newLine [][]rune, length int) where length is how many rune bytes
|
|
// before pos should be replaced by each candidate in newLine.
|
|
func (co *Completer) Do(line []rune, pos int) (newLine [][]rune, length int) {
|
|
before := string(line[:pos])
|
|
tokens := splitTokens(before)
|
|
|
|
// Determine the partial token being completed.
|
|
var partial string
|
|
var prefix []string
|
|
if len(tokens) == 0 || (len(before) > 0 && before[len(before)-1] == ' ') {
|
|
// Cursor is after a space — completing a new token.
|
|
prefix = tokens
|
|
partial = ""
|
|
} else {
|
|
// Cursor is within the last token.
|
|
prefix = tokens[:len(tokens)-1]
|
|
partial = tokens[len(tokens)-1]
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), completeTimeout)
|
|
defer cancel()
|
|
|
|
candidates := Candidates(co.root, prefix, partial, ctx, co.client)
|
|
|
|
var suffixes [][]rune
|
|
for _, c := range candidates {
|
|
suffix := c.Word[len(partial):]
|
|
suffixes = append(suffixes, []rune(suffix+" "))
|
|
}
|
|
return suffixes, len([]rune(partial))
|
|
}
|
|
|
|
// questionListener intercepts the '?' key and prints inline help.
|
|
type questionListener struct {
|
|
root *Node
|
|
client grpcapi.MaglevClient
|
|
rl *readline.Instance
|
|
}
|
|
|
|
func (ql *questionListener) OnChange(line []rune, pos int, key rune) (newLine []rune, newPos int, ok bool) {
|
|
if key != '?' {
|
|
return line, pos, false
|
|
}
|
|
|
|
// Strip the '?' that was just appended to line[:pos].
|
|
before := string(line[:pos])
|
|
if len(before) > 0 && before[len(before)-1] == '?' {
|
|
before = before[:len(before)-1]
|
|
}
|
|
tokens := splitTokens(before)
|
|
|
|
// Split into confirmed prefix tokens and the partial token being typed.
|
|
var prefix []string
|
|
var partial string
|
|
if len(before) == 0 || before[len(before)-1] == ' ' {
|
|
prefix = tokens
|
|
partial = ""
|
|
} else if len(tokens) > 0 {
|
|
prefix = tokens[:len(tokens)-1]
|
|
partial = tokens[len(tokens)-1]
|
|
}
|
|
|
|
// Walk the confirmed prefix to the current node, then try to advance one
|
|
// more step using the partial token (via prefix-match or slot fallback).
|
|
// This mirrors birdc: "sh?" expands "sh" to "show" and shows show's subtree.
|
|
node, _, remaining := Walk(ql.root, prefix)
|
|
displayPrefix := strings.Join(prefix, " ")
|
|
var unknownMsg string
|
|
if len(remaining) > 0 {
|
|
// One of the confirmed prefix tokens was unknown. Show an
|
|
// "unknown" banner, then list what's available at the deepest
|
|
// node we *did* reach so the operator can see what they could
|
|
// have typed instead. The partial at the cursor is irrelevant
|
|
// once the left context is already broken.
|
|
consumed := prefix[:len(prefix)-len(remaining)]
|
|
bad := remaining[0]
|
|
if len(consumed) == 0 {
|
|
unknownMsg = fmt.Sprintf("unknown command: %s", bad)
|
|
} else {
|
|
unknownMsg = fmt.Sprintf("unknown subcommand %q after %q", bad, strings.Join(consumed, " "))
|
|
}
|
|
displayPrefix = strings.Join(consumed, " ")
|
|
partial = ""
|
|
} else if partial != "" {
|
|
if next := matchFixedChild(node.Children, partial); next != nil {
|
|
// Partial uniquely matched a fixed child — descend into it.
|
|
node = next
|
|
displayPrefix = strings.Join(tokens, " ")
|
|
} else if slot := findSlotChild(node.Children); slot != nil {
|
|
// Partial is filling a slot node.
|
|
node = slot
|
|
displayPrefix = strings.Join(tokens, " ")
|
|
}
|
|
// If partial matched nothing (ambiguous or dead end), stay at the
|
|
// current node and show its subcommands with the confirmed prefix.
|
|
}
|
|
|
|
// Expand all leaf paths reachable from the current node.
|
|
lines := expandPaths(node, displayPrefix, make(map[*Node]bool))
|
|
|
|
// If the cursor is at a position where the next input is a dynamic slot,
|
|
// fetch live values now and show them below the syntax lines.
|
|
ctx, cancel := context.WithTimeout(context.Background(), completeTimeout)
|
|
defer cancel()
|
|
var dynValues []string
|
|
var dynWord string
|
|
if slot := findSlotChild(node.Children); slot != nil && slot.Dynamic != nil {
|
|
dynValues = slot.Dynamic(ctx, ql.client)
|
|
dynWord = slot.Word
|
|
}
|
|
|
|
// Right-align the help column at the width of the longest path + 2.
|
|
maxLen := 0
|
|
for _, l := range lines {
|
|
if len(l.path) > maxLen {
|
|
maxLen = len(l.path)
|
|
}
|
|
}
|
|
|
|
// Emit output. Raw terminal mode requires \r\n.
|
|
//
|
|
// readline's wrapWriter wraps every Write in a clean-write-print
|
|
// cycle: it erases the current input line, runs our closure, and
|
|
// redraws the prompt+buffer afterwards. That means starting the
|
|
// output with a bare "\r\n" leaves the original row blank, so the
|
|
// operator loses sight of what they typed. Instead we echo the
|
|
// full "maglev> show vpp lb ?" ourselves as the first write —
|
|
// that lands on the just-cleaned row, birdc-style, and the
|
|
// subsequent Fprintfs each redraw a fresh prompt below the help.
|
|
fmt.Fprintf(ql.rl.Stderr(), "%s%s\r\n", ql.rl.Config.Prompt, string(line))
|
|
if unknownMsg != "" {
|
|
fmt.Fprintf(ql.rl.Stderr(), " %s\r\n", unknownMsg)
|
|
}
|
|
if len(lines) == 0 {
|
|
fmt.Fprintf(ql.rl.Stderr(), " <no completions>\r\n")
|
|
} else {
|
|
for _, l := range lines {
|
|
if l.help != "" {
|
|
fmt.Fprintf(ql.rl.Stderr(), "%-*s %s\r\n", maxLen+2, l.path, l.help)
|
|
} else {
|
|
fmt.Fprintf(ql.rl.Stderr(), "%s\r\n", l.path)
|
|
}
|
|
}
|
|
if len(dynValues) > 0 {
|
|
fmt.Fprintf(ql.rl.Stderr(), " %s: %s\r\n", dynWord, strings.Join(dynValues, " "))
|
|
}
|
|
}
|
|
|
|
// Remove the '?' from the line and step cursor back one position.
|
|
newLine = append(append([]rune{}, line[:pos-1]...), line[pos:]...)
|
|
return newLine, pos - 1, true
|
|
}
|
|
|
|
// splitTokens splits a string into whitespace-separated tokens.
|
|
func splitTokens(s string) []string {
|
|
return strings.Fields(s)
|
|
}
|