Files
meshcore-analyzer/cmd/server/rx_dashboard.go
T
efitenandClaude Opus 5.5 bb3c8cc001 fix(rx-coverage): My coverage and the observer filter on the noise layer (#2326)
"My coverage" and a selected observer only narrowed the signal layer on
the coverage page. On the noise layer the toggle stayed pressed, but
`/api/rf-noise` was called without `mine` or `rx` and returned every
companion's samples.

## Changes

- **Backend:** `/api/rf-noise` now accepts `rx` and `mine=1`, with the
same session rules as `/api/rx-coverage`: 401 without a session, 403 for
a device token, 404 with user management off. The `rx_pubkey` filter
moved into 1 helper, `appendRxFilter` (`cmd/server/rx_dashboard.go`),
which both queries use. Both parameters are in the OpenAPI entry.
- **Frontend:** `public/rx-coverage.js` fetches both layers through
`fetchLayer`. It builds the URL with the time window, observer and
toggle, and judges the reply with the existing `coverageReply`. The
request sequence (`signalSeq`, now `drawSeq`) covers both layers, so the
noise layer also drops a superseded reply. Before, a slow unfiltered
noise reply could overwrite a newer filtered one.

## Performance

The noise query gets 1 extra `WHERE` clause on `rx_pubkey`. There are no
new requests: the page still makes 1 request per redraw.

## Verification

- New Go tests in `cmd/server/rf_noise_mine_test.go`: `rx` narrows the
result (case-insensitive), `mine=1` returns 401 without a session,
returns empty with nothing linked, returns the linked companion's cells,
returns 403 for a device token, and returns 404 with user management
off. Both failed before the fix.
- `tests/unit/test-rx-coverage-mine.js` is updated for the new
`coverageUrl(path, ...)` signature and checks that both layers fetch
through `fetchLayer`.
- New step in `tests/e2e/test-rx-coverage-noise-e2e.js`: a
`?layer=noise&rx=...` link sends `rx`, and clicking "My coverage"
refetches with `mine=1`. It fails against the current master frontend
and passes with this change.
- Local runs (Windows): `go test` and `go vet` in `cmd/server`,
`test-all.sh`, and the noise, gaps and viewport E2E in Chrome. All
green. I did not run the full Playwright suite locally.

## Not in this PR

- The "nothing received" gap cells still skip `mine=1`, unchanged: the
track query cannot narrow to a set of companions yet.
- The time window (`days`) already worked on the noise layer, so it is
not touched.

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-29 22:39:02 +01:00

444 lines
15 KiB
Go

package main
import (
"context"
"database/sql"
"encoding/json"
"log"
"net/http"
"sort"
"strconv"
"strings"
"time"
)
// scanCoverageRows reads (lat,lon,snr,rssi,heard_key,rx_at) rows into coverageRow values.
func scanCoverageRows(rows *sql.Rows) ([]coverageRow, error) {
out := []coverageRow{}
for rows.Next() {
var lat, lon float64
var snr sql.NullFloat64
var rssi sql.NullInt64
var heardKey, rxAt sql.NullString
if err := rows.Scan(&lat, &lon, &snr, &rssi, &heardKey, &rxAt); err != nil {
return nil, err
}
cr := coverageRow{Lat: lat, Lon: lon, HeardKey: strings.ToLower(heardKey.String), RxAt: rxAt.String}
if snr.Valid {
v := snr.Float64
cr.SNR = &v
}
if rssi.Valid {
v := int(rssi.Int64)
cr.RSSI = &v
}
out = append(out, cr)
}
return out, rows.Err()
}
// heardKeyResolverFor builds a nodeResolver for exactly the distinct heard_keys
// present in rows, resolving them all in one batched query instead of one query
// per key (the previous per-key resolver was N+1 on the read connection). Maps a
// heard_key to (pubkey, name) on a unique, non-hidden match; to (heardKey, "")
// otherwise. nil when there's no DB.
func (s *Server) heardKeyResolverFor(rows []coverageRow) nodeResolver {
if s.db == nil || s.db.conn == nil {
return nil
}
keys := make([]string, 0, len(rows))
seen := map[string]bool{}
for _, r := range rows {
if r.HeardKey != "" && !seen[r.HeardKey] {
seen[r.HeardKey] = true
keys = append(keys, r.HeardKey)
}
}
resolved := s.batchResolveHeardKeys(keys)
return func(heardKey string) (string, string) {
if v, ok := resolved[heardKey]; ok {
return v[0], v[1]
}
return heardKey, ""
}
}
// batchResolveHeardKeys resolves many heard_keys (2-3 byte prefixes or full
// pubkeys) to their canonical (pubkey, name) in a single round-trip per chunk
// (lookupPrefixes), so the whole set costs one query, not N. A unique match
// returns [pubkey, name], where name falls back to the repeater's own reported
// name (client_node_names) when nodes has none; unknown / ambiguous /
// blacklisted / hidden-prefix keys (#15, #1181) return [heardKey, ""].
func (s *Server) batchResolveHeardKeys(keys []string) map[string][2]string {
res := make(map[string][2]string, len(keys))
valid := make([]string, 0, len(keys))
seen := map[string]bool{}
for _, k := range keys {
if k == "" || seen[k] {
continue
}
seen[k] = true
if !hexPrefixRe.MatchString(k) {
res[k] = [2]string{k, ""}
continue
}
valid = append(valid, k)
}
hits := s.lookupPrefixes(valid)
for _, k := range valid {
if h, ok := hits[k]; ok && s.visible(h) {
res[k] = [2]string{h.pubkey, h.name}
} else {
res[k] = [2]string{k, ""}
}
}
return res
}
// resolveHeardKey resolves a single heard_key (2-3 byte prefix or full pubkey)
// to its canonical (pubkey, name), or (heardKey, "") when unknown / ambiguous /
// hidden. Thin wrapper over batchResolveHeardKeys so there is one code path.
func (s *Server) resolveHeardKey(heardKey string) (string, string) {
v := s.batchResolveHeardKeys([]string{heardKey})[heardKey]
if v[0] == "" && v[1] == "" {
return heardKey, "" // empty/unresolved → echo the key
}
return v[0], v[1]
}
// queryCoverageFiltered returns coverage rows within a bbox, optionally filtered
// by heard node (prefix/pubkey), contributing client (rx_pubkey), and time window
// (days; 0 = all time). Powers the global and per-observer coverage maps.
// rxIn, when non-nil, keeps only receptions by those companions (rx_pubkey,
// lowercase); an empty non-nil rxIn matches nothing.
func (s *Server) queryCoverageFiltered(node, rx string, rxIn []string, days int, b bbox) ([]coverageRow, error) {
if rxIn != nil && len(rxIn) == 0 {
return nil, nil
}
where := []string{"lat BETWEEN ? AND ?", "lon BETWEEN ? AND ?"}
args := []interface{}{b.MinLat, b.MaxLat, b.MinLon, b.MaxLon}
if node != "" {
// Sargable heard_key IN-list (see coverageHeardKeyCandidates) so the
// (heard_key, …) composite index is used instead of a substr() scan (#5).
cands := coverageHeardKeyCandidates(node)
where = append(where, "heard_key IN ("+sqlPlaceholders(len(cands))+")")
for _, c := range cands {
args = append(args, c)
}
}
where, args = appendRxFilter(where, args, "rx_pubkey", rx, rxIn)
if days > 0 {
since := time.Now().UTC().AddDate(0, 0, -days).Format(time.RFC3339)
where = append(where, "rx_at >= ?")
args = append(args, since)
}
rows, err := s.db.conn.Query("SELECT lat, lon, snr, rssi, heard_key, rx_at FROM client_receptions WHERE "+strings.Join(where, " AND "), args...)
if err != nil {
return nil, err
}
defer rows.Close()
return scanCoverageRows(rows)
}
// appendRxFilter narrows a client_* table query to one companion (rx) and/or
// to a set of companions (rxIn, lowercase; see myCompanionPubkeys). col is
// the table's rx_pubkey column. Callers return early on an empty non-nil rxIn.
func appendRxFilter(where []string, args []interface{}, col, rx string, rxIn []string) ([]string, []interface{}) {
if rx != "" {
where = append(where, col+" = ?")
args = append(args, strings.ToLower(rx))
}
if len(rxIn) > 0 {
where = append(where, col+" IN ("+sqlPlaceholders(len(rxIn))+")")
for _, pk := range rxIn {
args = append(args, pk)
}
}
return where, args
}
// handleRxCoverage serves global (or per-observer via ?rx=) coverage as GeoJSON
// hexbins, over a time window. ?node= also works (same as the per-node endpoint).
// requireClientRxCoverage writes a 404 and returns false when the opt-in
// client-RX coverage feature is disabled, so the coverage endpoints read as
// "not found" instead of serving data on deployments that haven't enabled it.
func (s *Server) requireClientRxCoverage(w http.ResponseWriter, r *http.Request) bool {
// Routes are registered unconditionally, so guard against a nil server/cfg
// (e.g. handlers exercised in isolation) rather than panicking (#4).
// ClientRxCoverageEnabled is itself nil-receiver-safe.
if s == nil || s.cfg == nil || !s.cfg.ClientRxCoverageEnabled() {
http.NotFound(w, r)
return false
}
return true
}
func (s *Server) handleRxCoverage(w http.ResponseWriter, r *http.Request) {
if !s.requireClientRxCoverage(w, r) {
return
}
var mine []string
if r.URL.Query().Get("mine") == "1" {
var ok bool
if mine, ok = s.myCompanionPubkeys(w, r); !ok {
return
}
}
b, ok := parseBBox(r.URL.Query().Get("bbox"))
if !ok {
http.Error(w, "bbox required as minLat,minLon,maxLat,maxLon", http.StatusBadRequest)
return
}
if s.db == nil || s.db.conn == nil {
http.Error(w, "unavailable", http.StatusServiceUnavailable)
return
}
days := clampDays(atoiDefault(r.URL.Query().Get("days"), 7))
z, _ := strconv.Atoi(r.URL.Query().Get("z"))
node, rx := r.URL.Query().Get("node"), r.URL.Query().Get("rx")
rows, err := s.queryCoverageFiltered(node, rx, mine, days, b)
if err != nil {
http.Error(w, "query failed", http.StatusInternalServerError)
return
}
fc := aggregateCoverage(rows, zoomToHexRes(z), s.heardKeyResolverFor(rows))
// "Nothing received" cells need the track, so only with the RF sample
// stream on; with ?node= the question would be "this node not heard",
// which these cells do not answer. Not with ?mine=1 either: the track
// query cannot narrow to a set of companions yet.
if r.URL.Query().Get("gaps") == "1" && node == "" && mine == nil && s.cfg.ClientRfSamplesEnabled() {
track, err := s.queryTrackPoints(rx, days, b)
if err != nil {
http.Error(w, "query failed", http.StatusInternalServerError)
return
}
fc.Gaps, fc.GapsTruncated = aggregateGaps(track, rows, zoomToHexRes(z))
}
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(fc)
}
// myCompanionPubkeys resolves ?mine=1 to the caller's linked companions
// (never nil, so an empty list filters everything out). Browser session
// only: 404 with user management off, 403 for a bearer token (coverage is
// outside its scope), 401 without a session.
func (s *Server) myCompanionPubkeys(w http.ResponseWriter, r *http.Request) ([]string, bool) {
if s.auth == nil {
http.NotFound(w, r)
return nil, false
}
if _, ok := bearerToken(r); ok {
writeBearerFail(w, http.StatusForbidden)
return nil, false
}
u, _ := s.auth.currentUser(w, r)
if u == nil {
writeError(w, http.StatusUnauthorized, "not logged in")
return nil, false
}
links, err := s.auth.st.ListCompanionLinks(u.ID)
if err != nil {
log.Printf("[users] coverage mine for user #%d: %v", u.ID, err)
http.Error(w, "query failed", http.StatusInternalServerError)
return nil, false
}
out := make([]string, 0, len(links))
for _, l := range links {
out = append(out, l.Pubkey)
}
return out, true
}
// --- Leaderboard (top mobile observers) ---
type LeaderObserver struct {
Pubkey string `json:"pubkey"`
Name string `json:"name"`
Receptions int `json:"receptions"`
Nodes int `json:"nodes"`
Cells int `json:"cells"` // distinct fixed-res hex cells covered
Score float64 `json:"score"` // frontier-weighted coverage score
}
type RxLeaderboardResp struct {
Days int `json:"days"`
Observers []LeaderObserver `json:"observers"`
}
// leaderboardHexRes is the fixed hex resolution used to bucket receptions into
// "cells visited" for the frontier-weighted score. ~150 m ground cells at our
// latitude: coarse enough that a parked node's GPS jitter stays in one cell,
// fine enough that real driving paints many. Independent of the coverage map's
// zoom-dependent render resolution so the ranking is stable across views.
const leaderboardHexRes = 13
// leaderboardScanCap bounds how many rows the leaderboard aggregates in memory.
// The endpoint is unauthenticated (only requireClientRxCoverage), and the Go-side
// rarity weighting can't push the GROUP BY into SQLite, so without a cap a wide
// window on a busy network would stream the whole table into maps. At the cap we
// log and return a partial (best-effort) ranking rather than OOM (#review r2).
const leaderboardScanCap = 500000
// rxLeaderboard ranks mobile observers by frontier-weighted cell coverage over
// the time window. Each distinct cell an observer covers contributes
// 1/(observers covering that cell): a cell only they reached weighs 1.0, a cell
// shared by N observers weighs 1/N. This rewards expanding the map's edge and is
// spam-proof — a stationary node covers exactly one cell regardless of how many
// receptions it logs. Bucketing + the rarity weight can't be expressed in SQL,
// so we aggregate the window's rows in Go (bounded by leaderboardScanCap).
func (s *Server) rxLeaderboard(ctx context.Context, days, limit int) ([]LeaderObserver, error) {
since := time.Now().UTC().AddDate(0, 0, -days).Format(time.RFC3339)
// Name preference: the node's advertised name, else the companion's
// self-reported name (client_observers), else empty (UI shows the prefix).
// Hard LIMIT bounds memory; ORDER BY rx_at DESC so a truncated window keeps
// the most recent receptions.
rows, err := s.db.conn.QueryContext(ctx, `
SELECT cr.rx_pubkey, COALESCE(NULLIF(n.name,''), NULLIF(co.name,''), ''),
cr.lat, cr.lon, cr.heard_key
FROM client_receptions cr
LEFT JOIN nodes n ON n.public_key = cr.rx_pubkey
LEFT JOIN client_observers co ON co.pubkey = cr.rx_pubkey
WHERE cr.rx_at >= ?
ORDER BY cr.rx_at DESC
LIMIT ?`, since, leaderboardScanCap)
if err != nil {
return nil, err
}
defer rows.Close()
type agg struct {
name string
receptions int
cells map[string]struct{}
nodes map[string]struct{}
}
obsAgg := map[string]*agg{}
cellObservers := map[string]map[string]struct{}{} // cell -> set of rx_pubkey
scanned := 0
for rows.Next() {
// Honour client cancellation/timeout on the long scan (checked in batches
// to avoid a per-row context mutex on up to 500k rows).
if scanned&2047 == 0 && ctx.Err() != nil {
return nil, ctx.Err()
}
var pk, name, heardKey string
var lat, lon float64
if err := rows.Scan(&pk, &name, &lat, &lon, &heardKey); err != nil {
return nil, err
}
scanned++
a := obsAgg[pk]
if a == nil {
a = &agg{name: name, cells: map[string]struct{}{}, nodes: map[string]struct{}{}}
obsAgg[pk] = a
}
a.receptions++
a.nodes[heardKey] = struct{}{}
cell := hexCellAt(lat, lon, leaderboardHexRes)
a.cells[cell] = struct{}{}
set := cellObservers[cell]
if set == nil {
set = map[string]struct{}{}
cellObservers[cell] = set
}
set[pk] = struct{}{}
}
if err := rows.Err(); err != nil {
return nil, err
}
if scanned >= leaderboardScanCap {
log.Printf("[rx-leaderboard] scan hit cap %d over %dd window; ranking is partial (most-recent rows)", leaderboardScanCap, days)
}
// Per-cell observer counts EXCLUDING blacklisted contributors, so an operator
// of a blacklisted node parked in a cell can't silently dilute everyone else's
// frontier weight (#review r2). Name-hidden (not blacklisted) observers are
// legitimate contributors and still count.
cellCount := make(map[string]int, len(cellObservers))
for cell, set := range cellObservers {
n := 0
for pk := range set {
if !s.cfg.IsObserverBlacklisted(pk) && !s.cfg.IsBlacklisted(pk) {
n++
}
}
cellCount[cell] = n
}
out := make([]LeaderObserver, 0, len(obsAgg))
for pk, a := range obsAgg {
var score float64
for cell := range a.cells {
if c := cellCount[cell]; c > 0 {
score += 1.0 / float64(c)
}
}
out = append(out, LeaderObserver{
Pubkey: pk,
Name: a.name,
Receptions: a.receptions,
Nodes: len(a.nodes),
Cells: len(a.cells),
Score: score,
})
}
// Rank by frontier score; ties broken by raw receptions then pubkey so the
// order is deterministic (keeps same-location fixtures stable).
sort.Slice(out, func(i, j int) bool {
if out[i].Score != out[j].Score {
return out[i].Score > out[j].Score
}
if out[i].Receptions != out[j].Receptions {
return out[i].Receptions > out[j].Receptions
}
return out[i].Pubkey < out[j].Pubkey
})
// Identity hiding parity (#1727 r2): drop observer-blacklisted contributors,
// blank node-blacklisted / hidden-prefix names, cap at limit. nil cfg ⇒ no-ops.
filtered := make([]LeaderObserver, 0, limit)
for _, o := range out {
if s.cfg.IsObserverBlacklisted(o.Pubkey) {
continue
}
if s.cfg.IsBlacklisted(o.Pubkey) || s.cfg.IsNameHidden(o.Name) {
o.Name = ""
}
filtered = append(filtered, o)
if len(filtered) >= limit {
break
}
}
return filtered, nil
}
func (s *Server) handleRxLeaderboard(w http.ResponseWriter, r *http.Request) {
if !s.requireClientRxCoverage(w, r) {
return
}
if s.db == nil || s.db.conn == nil {
http.Error(w, "unavailable", http.StatusServiceUnavailable)
return
}
days := clampDays(atoiDefault(r.URL.Query().Get("days"), 7))
limit := atoiDefault(r.URL.Query().Get("limit"), 20)
if limit < 1 || limit > 100 {
limit = 20
}
obs, err := s.rxLeaderboard(r.Context(), days, limit)
if err != nil {
http.Error(w, "query failed", http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(RxLeaderboardResp{Days: days, Observers: obs})
}
func atoiDefault(s string, d int) int {
if n, err := strconv.Atoi(strings.TrimSpace(s)); err == nil {
return n
}
return d
}