mirror of
https://github.com/Kpa-clawbot/meshcore-analyzer.git
synced 2026-06-03 20:51:19 +00:00
0b35c7eef3
## Summary Follows the reconciliation recommendation in #916 — extracts only the NET-NEW persistence layer from that PR (which is now superseded by #1002 for the overlay UI) into a focused 6-file change against current master. **What this adds:** - `multibyte_sup_v1` migration: `multibyte_sup INTEGER NOT NULL DEFAULT 0` + `multibyte_evidence TEXT` on `nodes`/`inactive_nodes` so capability survives restart - `hasMultibyteSupCols` schema detection gates the persist/load paths - `loadMultibyteCapFromDB()`: pre-populates `mbCapSnapshot`/`mbCapIndex` at startup — cold starts serve last-known capability without waiting for the first ~15s analytics cycle - `maybePersistMultibyteCapability()` + `persistMultibyteCapability()`: after each analytics cycle; TryLock-gated (concurrent cycles coalesce); skips `sup==0` entries (data-destruction guard) - `GetMultibyteCapFor(pk)`: O(1) map lookup; both `handleNodes` and node-detail call sites updated from the O(N)-alloc `GetMultiByteCapMap()` **What this explicitly does NOT change:** - API field names (`multi_byte_status`, `multi_byte_evidence`, `multi_byte_max_hash_size`) - `EnrichNodeWithMultiByte` — unchanged - `GetMultiByteCapMap` — still present for any external callers - `public/map.js`, `public/live.css`, `Dockerfile`, `docs/` — zero frontend churn ## Test plan - [x] `TestMultibyteCapPersistRoundTrip` — confirmed values survive persist → fresh-store load - [x] `TestMultibyteCapPersistSkipsUnknown` — data-destruction guard: `sup==0` entry does not overwrite DB-confirmed value - [x] `TestMultibyteCapMaybePersistCoalesces` — TryLock coalesces 10 concurrent callers without deadlock - [x] `TestMultibyteCapGetMultibyteCapForO1` — O(1) index returns correct entry / false for unknown pubkey - [x] `TestMultibyteCapLoadFromDB` — only `sup>0` rows loaded; `sup==0` row excluded - [x] `TestSchemaMultibyteSupColumns` — migration adds columns to both tables; idempotent on second `OpenStore` - [x] All existing `TestMultiByteCapability_*` tests pass unchanged - [x] Full ingestor test suite: `ok` in 27s - [x] `go build ./cmd/server/ && go build ./cmd/ingestor/` clean 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> Co-authored-by: openclaw-bot <bot@openclaw>
167 lines
6.0 KiB
Go
167 lines
6.0 KiB
Go
package main
|
|
|
|
import (
|
|
"database/sql"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"reflect"
|
|
"regexp"
|
|
"strings"
|
|
"testing"
|
|
|
|
_ "modernc.org/sqlite"
|
|
)
|
|
|
|
// TestServerSourceHasNoCachedRWCalls enforces issue #1287: after the
|
|
// follow-up to #1283, cmd/server/ must contain ZERO writer call sites.
|
|
// Specifically, no `cachedRW(`, no `mode=rw`, and no `sql.Open(...rw...)`
|
|
// in non-test source files. All schema migrations, backfills, and
|
|
// neighbor-edge persistence must live in cmd/ingestor or a shared
|
|
// package — the server is the read path.
|
|
func TestServerSourceHasNoCachedRWCalls(t *testing.T) {
|
|
entries, err := os.ReadDir(".")
|
|
if err != nil {
|
|
t.Fatalf("read cmd/server dir: %v", err)
|
|
}
|
|
// Patterns that indicate write-side DB usage on the server.
|
|
patterns := []*regexp.Regexp{
|
|
regexp.MustCompile(`\bcachedRW\s*\(`),
|
|
regexp.MustCompile(`mode=rw`),
|
|
regexp.MustCompile(`sql\.Open\([^)]*\?[^)]*_journal_mode=WAL[^)]*\)`),
|
|
// #1324 follow-up: PR #903's persistMultibyteCapability moved
|
|
// to cmd/ingestor — the server may NEVER UPDATE these columns
|
|
// (it opens mode=ro since #1289). Server publishes a snapshot
|
|
// file via internal/mbcapqueue; the ingestor applies it.
|
|
regexp.MustCompile(`UPDATE\s+nodes\s+SET\s+multibyte_`),
|
|
regexp.MustCompile(`UPDATE\s+inactive_nodes\s+SET\s+multibyte_`),
|
|
regexp.MustCompile(`\bpersistMultibyteCapability\s*\(`),
|
|
regexp.MustCompile(`\bmaybePersistMultibyteCapability\s*\(`),
|
|
}
|
|
violations := []string{}
|
|
for _, e := range entries {
|
|
name := e.Name()
|
|
if e.IsDir() {
|
|
continue
|
|
}
|
|
if !strings.HasSuffix(name, ".go") {
|
|
continue
|
|
}
|
|
if strings.HasSuffix(name, "_test.go") {
|
|
continue
|
|
}
|
|
b, err := os.ReadFile(filepath.Join(".", name))
|
|
if err != nil {
|
|
t.Fatalf("read %s: %v", name, err)
|
|
}
|
|
for _, p := range patterns {
|
|
if loc := p.FindIndex(b); loc != nil {
|
|
// Get line number
|
|
line := 1 + strings.Count(string(b[:loc[0]]), "\n")
|
|
violations = append(violations, fmt.Sprintf("%s:%d: %s", name, line, p.String()))
|
|
}
|
|
}
|
|
}
|
|
if len(violations) > 0 {
|
|
t.Errorf("cmd/server/ contains forbidden writer call sites (#1287):\n %s",
|
|
strings.Join(violations, "\n "))
|
|
}
|
|
}
|
|
|
|
// TestServerDBHasNoWriteMethods enforces the architectural invariant from
|
|
// issue #1283: cmd/server is the read path. All write/maintenance methods
|
|
// (PruneOldPackets, PruneOldMetrics, RemoveStaleObservers) MUST live on
|
|
// the ingestor's *Store, not on the server's *DB.
|
|
//
|
|
// Before the fix, these methods existed on cmd/server/*DB and used
|
|
// cachedRW(db.path) to acquire a write lock, racing with the ingestor's
|
|
// concurrent INSERTs and producing SQLITE_BUSY (the bug in #1283).
|
|
// After the fix, this test passes because the methods are gone.
|
|
func TestServerDBHasNoWriteMethods(t *testing.T) {
|
|
forbidden := []string{
|
|
"PruneOldPackets",
|
|
"PruneOldMetrics",
|
|
"RemoveStaleObservers",
|
|
// #738 / one-click geo-prune: the DELETE must live on the
|
|
// ingestor's *Store. The server's HTTP handler now enqueues a
|
|
// marker file (see internal/prunequeue); it does not write.
|
|
"DeleteNodesByPubkeys",
|
|
// #1324 follow-up: PR #903 originally added these to *PacketStore
|
|
// (not *DB), and they UPDATEd nodes/inactive_nodes from a
|
|
// mode=ro handle. After relocation, the methods live in the
|
|
// ingestor's *Store (cmd/ingestor/multibyte_persist.go). Server
|
|
// must expose neither on *DB nor on *PacketStore — see the
|
|
// dedicated test below for *PacketStore.
|
|
}
|
|
typ := reflect.TypeOf((*DB)(nil))
|
|
for _, name := range forbidden {
|
|
if _, ok := typ.MethodByName(name); ok {
|
|
t.Errorf("server *DB exposes forbidden write method %q — must be relocated to ingestor (#1283)", name)
|
|
}
|
|
}
|
|
}
|
|
|
|
// TestServerDBConnIsReadOnly asserts that the *sql.DB the server opens
|
|
// cannot acquire a write lock. The server has always opened mode=ro, but
|
|
// before #1283 it routed around that by calling cachedRW(path) to get a
|
|
// second RW handle. After the fix, server-side writes are impossible
|
|
// because there is no helper to open a writable connection.
|
|
func TestServerDBConnIsReadOnly(t *testing.T) {
|
|
dir := t.TempDir()
|
|
path := dir + "/ro_invariant.db"
|
|
|
|
// Bootstrap a minimal DB with the ingestor-style WAL opener so the
|
|
// server can attach in read-only mode.
|
|
if err := bootstrapMinimalDB(path); err != nil {
|
|
t.Fatalf("bootstrap: %v", err)
|
|
}
|
|
|
|
d, err := OpenDB(path)
|
|
if err != nil {
|
|
t.Fatalf("OpenDB: %v", err)
|
|
}
|
|
defer d.conn.Close()
|
|
|
|
_, err = d.conn.Exec(`INSERT INTO nodes (public_key, name) VALUES ('x','y')`)
|
|
if err == nil {
|
|
t.Fatalf("expected INSERT via server *DB to fail (read-only invariant)")
|
|
}
|
|
}
|
|
|
|
// bootstrapMinimalDB creates a tiny DB with the columns these tests
|
|
// need, opened with WAL so the read-only opener in OpenDB can attach.
|
|
// Kept in *_test.go so it does NOT add any write capability to the
|
|
// production server binary.
|
|
func bootstrapMinimalDB(path string) error {
|
|
dsn := fmt.Sprintf("file:%s?_journal_mode=WAL&_busy_timeout=5000", path)
|
|
rw, err := sql.Open("sqlite", dsn)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer rw.Close()
|
|
if _, err := rw.Exec(`CREATE TABLE IF NOT EXISTS nodes (public_key TEXT PRIMARY KEY, name TEXT)`); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// TestPacketStoreHasNoMultibytePersistMethods enforces the #1324 follow-up:
|
|
// PR #903 wired persistMultibyteCapability + maybePersistMultibyteCapability
|
|
// onto *PacketStore in cmd/server. Both executed UPDATEs on
|
|
// nodes/inactive_nodes from a mode=ro DB handle — impossible since #1289.
|
|
// After relocation the persistence lives in cmd/ingestor/*Store; the
|
|
// server only publishes a snapshot via internal/mbcapqueue. This test
|
|
// fails if a future change re-introduces these methods on *PacketStore.
|
|
func TestPacketStoreHasNoMultibytePersistMethods(t *testing.T) {
|
|
forbidden := []string{
|
|
"persistMultibyteCapability",
|
|
"maybePersistMultibyteCapability",
|
|
}
|
|
typ := reflect.TypeOf((*PacketStore)(nil))
|
|
for _, name := range forbidden {
|
|
if _, ok := typ.MethodByName(name); ok {
|
|
t.Errorf("server *PacketStore exposes forbidden write method %q — must be relocated to ingestor (#1324)", name)
|
|
}
|
|
}
|
|
}
|