mirror of
https://github.com/Kpa-clawbot/meshcore-analyzer.git
synced 2026-06-01 18:44:09 +00:00
317b59ab10
## Summary - Adds configurable GPS polygon areas to `config.json`; nodes are attributed to an area if their last-known position falls inside the polygon - New `Area: …` dropdown filter (matching the existing region filter style) appears on all analytics, nodes, packets, map, and live screens when areas are configured - Backend resolves area membership with a 30s TTL cache; area filter bypasses the 500-node cap on `/api/bulk-health` so all area nodes are always returned - Includes a polygon builder tool (`/area-map.html`) for drawing and exporting area boundaries ## Changes **Backend** - `AreaEntry` type + `Areas` config field - `GetNodePubkeysInArea` DB query + `resolveAreaNodes` (30s TTL, `areaNodeMu` RWMutex) - `PacketQuery.Area` + `filterPackets` polygon check - `?area=` param propagated through all analytics, topology, clock-health, and bulk-health routes - `/api/config/areas` endpoint **Frontend** - `area-filter.js`: single-select dropdown, persists to localStorage, cleans up stale keys on load - Wired into analytics, nodes, packets, channels, map, and live pages - Live map clears node markers on area change **Docs & tools** - `docs/user-guide/area-filter.md` — configuration and usage guide - `docs/api-spec.md` — updated with new endpoint and `?area=` param table - `tools/area-map.html` — polygon builder for defining area boundaries - Demo areas added to `config.example.json` ## Test plan - [x] No areas configured → filter dropdown does not appear on any page - [x] Areas configured → dropdown appears, "All" selected by default - [x] Selecting an area filters nodes/packets/topology/map correctly - [x] Selecting "All" restores unfiltered view - [x] Selection persists across page reloads (localStorage) - [x] Stale localStorage key (area removed from config) is cleared on load - [x] `/api/bulk-health?area=X` returns all nodes in area (no 500-node cap) - [x] `/api/config/areas` returns correct list 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> Co-authored-by: Kpa-clawbot <kpaclawbot@outlook.com> Co-authored-by: openclaw-bot <bot@openclaw.local>
167 lines
5.1 KiB
Go
167 lines
5.1 KiB
Go
package main
|
|
|
|
import (
|
|
"math"
|
|
"net/http"
|
|
"sort"
|
|
"strings"
|
|
)
|
|
|
|
// RoleStats summarises one role's population and clock-skew posture.
|
|
type RoleStats struct {
|
|
Role string `json:"role"`
|
|
NodeCount int `json:"nodeCount"`
|
|
WithSkew int `json:"withSkew"`
|
|
MeanAbsSkewSec float64 `json:"meanAbsSkewSec"`
|
|
MedianAbsSkewSec float64 `json:"medianAbsSkewSec"`
|
|
OkCount int `json:"okCount"`
|
|
WarningCount int `json:"warningCount"`
|
|
CriticalCount int `json:"criticalCount"`
|
|
AbsurdCount int `json:"absurdCount"`
|
|
NoClockCount int `json:"noClockCount"`
|
|
}
|
|
|
|
// RoleAnalyticsResponse is the payload returned by /api/analytics/roles.
|
|
type RoleAnalyticsResponse struct {
|
|
TotalNodes int `json:"totalNodes"`
|
|
Roles []RoleStats `json:"roles"`
|
|
}
|
|
|
|
// normalizeRole canonicalises a role string so empty/unknown roles bucket
|
|
// together and case differences don't fragment the distribution.
|
|
func normalizeRole(r string) string {
|
|
r = strings.ToLower(strings.TrimSpace(r))
|
|
if r == "" {
|
|
return "unknown"
|
|
}
|
|
return r
|
|
}
|
|
|
|
// computeRoleAnalytics groups nodes by role and aggregates clock-skew per
|
|
// role. Pure function: takes the node roster and the per-pubkey skew map and
|
|
// returns the response — no store / lock dependencies, easy to unit test.
|
|
//
|
|
// `nodesByPubkey` lists every known node (pubkey → role). `skewByPubkey`
|
|
// is the subset of pubkeys that have clock-skew data with their severity and
|
|
// most-recent corrected skew (in seconds, signed — we take |x| for averages).
|
|
func computeRoleAnalytics(nodesByPubkey map[string]string, skewByPubkey map[string]*NodeClockSkew) RoleAnalyticsResponse {
|
|
type bucket struct {
|
|
stats RoleStats
|
|
absSkews []float64
|
|
}
|
|
buckets := make(map[string]*bucket)
|
|
for pk, rawRole := range nodesByPubkey {
|
|
role := normalizeRole(rawRole)
|
|
b, ok := buckets[role]
|
|
if !ok {
|
|
b = &bucket{stats: RoleStats{Role: role}}
|
|
buckets[role] = b
|
|
}
|
|
b.stats.NodeCount++
|
|
cs, has := skewByPubkey[pk]
|
|
if !has || cs == nil {
|
|
continue
|
|
}
|
|
b.stats.WithSkew++
|
|
abs := math.Abs(cs.RecentMedianSkewSec)
|
|
if abs == 0 {
|
|
abs = math.Abs(cs.LastSkewSec)
|
|
}
|
|
b.absSkews = append(b.absSkews, abs)
|
|
switch cs.Severity {
|
|
case SkewOK:
|
|
b.stats.OkCount++
|
|
case SkewWarning:
|
|
b.stats.WarningCount++
|
|
case SkewCritical:
|
|
b.stats.CriticalCount++
|
|
case SkewAbsurd:
|
|
b.stats.AbsurdCount++
|
|
case SkewNoClock:
|
|
b.stats.NoClockCount++
|
|
}
|
|
}
|
|
resp := RoleAnalyticsResponse{Roles: make([]RoleStats, 0, len(buckets))}
|
|
for _, b := range buckets {
|
|
if n := len(b.absSkews); n > 0 {
|
|
sum := 0.0
|
|
for _, v := range b.absSkews {
|
|
sum += v
|
|
}
|
|
b.stats.MeanAbsSkewSec = round(sum/float64(n), 2)
|
|
sorted := make([]float64, n)
|
|
copy(sorted, b.absSkews)
|
|
sort.Float64s(sorted)
|
|
if n%2 == 1 {
|
|
b.stats.MedianAbsSkewSec = round(sorted[n/2], 2)
|
|
} else {
|
|
b.stats.MedianAbsSkewSec = round((sorted[n/2-1]+sorted[n/2])/2, 2)
|
|
}
|
|
}
|
|
resp.TotalNodes += b.stats.NodeCount
|
|
resp.Roles = append(resp.Roles, b.stats)
|
|
}
|
|
// Sort: largest population first, then role name for stable output.
|
|
sort.Slice(resp.Roles, func(i, j int) bool {
|
|
if resp.Roles[i].NodeCount != resp.Roles[j].NodeCount {
|
|
return resp.Roles[i].NodeCount > resp.Roles[j].NodeCount
|
|
}
|
|
return resp.Roles[i].Role < resp.Roles[j].Role
|
|
})
|
|
return resp
|
|
}
|
|
|
|
// handleAnalyticsRoles serves /api/analytics/roles. Reads from the
|
|
// steady-state recomputer snapshot (issue #1256) so the request never
|
|
// holds s.mu.RLock for a full clock-skew recompute over the advert
|
|
// transmissions — that path hung >60s on staging with 78k tx.
|
|
func (s *Server) handleAnalyticsRoles(w http.ResponseWriter, r *http.Request) {
|
|
if s.store == nil {
|
|
writeJSON(w, RoleAnalyticsResponse{Roles: []RoleStats{}})
|
|
return
|
|
}
|
|
writeJSON(w, s.store.GetAnalyticsRoles())
|
|
}
|
|
|
|
// GetAnalyticsRoles returns the role-distribution analytics, preferring
|
|
// the steady-state recomputer snapshot (issue #1256). Falls back to an
|
|
// on-request compute path if the recomputer is not yet running (e.g.
|
|
// during the brief startup window before the initial compute completes
|
|
// — Start runs it synchronously, so this fallback is effectively only
|
|
// hit in tests that skip the recomputer entirely).
|
|
func (s *PacketStore) GetAnalyticsRoles() RoleAnalyticsResponse {
|
|
s.analyticsRecomputerMu.RLock()
|
|
rc := s.recompRoles
|
|
s.analyticsRecomputerMu.RUnlock()
|
|
if rc != nil {
|
|
if v := rc.Load(); v != nil {
|
|
if r, ok := v.(RoleAnalyticsResponse); ok {
|
|
s.cacheMu.Lock()
|
|
s.cacheHits++
|
|
s.cacheMu.Unlock()
|
|
return r
|
|
}
|
|
}
|
|
}
|
|
return s.computeAnalyticsRoles()
|
|
}
|
|
|
|
// computeAnalyticsRoles runs the actual role aggregation. Used by the
|
|
// background recomputer (issue #1256) and as a fallback for callers
|
|
// arriving before the snapshot is populated.
|
|
func (s *PacketStore) computeAnalyticsRoles() RoleAnalyticsResponse {
|
|
nodes, _ := s.getCachedNodesAndPM()
|
|
roles := make(map[string]string, len(nodes))
|
|
for _, n := range nodes {
|
|
roles[n.PublicKey] = n.Role
|
|
}
|
|
skewMap := make(map[string]*NodeClockSkew)
|
|
for _, cs := range s.GetFleetClockSkew("") {
|
|
if cs == nil {
|
|
continue
|
|
}
|
|
skewMap[cs.Pubkey] = cs
|
|
}
|
|
return computeRoleAnalytics(roles, skewMap)
|
|
}
|