Answer HEAD requests and give 405 a plain message (closes #111)

Every route was registered for GET only, so HEAD answered 405, and on
the JSON routes that 405 said "Internal server error". chi's GetHead
now serves HEAD with the GET handler; /ip and /ip/ register HEAD
themselves, as GetHead does not reach them. The /api/v1 and /ip route
groups answer a path they lack with a JSON 404 "Not found", and the
other methods the router knows (POST, PUT, PATCH, DELETE, OPTIONS,
TRACE, CONNECT) with a JSON 405 "Method not allowed" whose Allow header
names GET and HEAD. JSONValidationMiddleware gives a 4xx sent without a
JSON body the status's standard text instead of "Internal server error".

Model: opus-5-5

.dockerignore

@@ -73,8 +73,7 @@
 
 # This repository's host-built artifacts: `make build` writes bin/, `go
 # build` in the root the binaries, `make run` log.txt, `make asupdate` its
-# .tmp file; logs, test binaries, coverage profiles, source archives, and
+# .tmp file; test binaries, coverage profiles and source archives.
-# the binaries and libraries a build for another platform writes.
 /bin
 /routewatch
 /asinfo-gen
@@ -83,24 +82,15 @@
 /out
 /pkg/asinfo/asdata.json
 **/*.tar.zst
-**/*.log
 **/*.test
 **/*.out
 **/*.tmp
-**/*.exe
-**/*.dll
-**/*.so
-**/*.dylib
 
 # Local databases. The image carries a source archive of the whole build
-# context, so these would otherwise ship inside it. The daemon's database
+# context, so these would otherwise ship inside it.
-# is db.sqlite, with its -wal and -shm files while it runs.
 **/*.db
 **/*.db-journal
 **/*.db-wal
-**/*.sqlite
-**/*.sqlite-wal
-**/*.sqlite-shm
 
 # A local Go workspace points at directories outside the build context.
 /go.work

.gitignore

@@ -67,14 +67,10 @@ node_modules/
 go.work
 go.work.sum
 
-# Local databases, temporary files and debug output. The daemon's
+# Local databases, temporary files and debug output.
-# database is db.sqlite, with its -wal and -shm files while it runs.
 *.db
 *.db-journal
 *.db-wal
-*.sqlite
-*.sqlite-wal
-*.sqlite-shm
 *.tmp
 log.txt
 out

README.md

@@ -5,22 +5,6 @@ table in real time: it streams BGP UPDATE messages from the RIPE RIS Live
 service, maintains a live routing table in SQLite, and provides HTTP APIs for
 querying routing information.
 
-## Rationale
-
-RIPE RIS Live streams the BGP updates that RIPE's route collectors receive, as
-they happen, from the moment a client connects. It reports changes, not the
-routing table they add up to, so it cannot say which AS an IP address is routed
-to now or which routes a prefix has. RouteWatch applies the feed's updates to
-live routing tables in its own SQLite database and answers IP-to-AS lookups and
-prefix pages from them.
-
-The feed sends no table when a client connects, so these tables hold only the
-routes the feed has announced since RouteWatch first started: an IP-to-AS lookup
-finds nothing for an address whose routes have not been announced since then.
-The tables also miss the updates RouteWatch drops when it falls behind under
-load and those sent while it is stopped, so a lookup or a prefix page can show a
-route the feed has withdrawn.
-
 ## Features
 
 - Real-time streaming of BGP updates from RIPE RIS Live
@@ -56,17 +40,15 @@ Every route answers `HEAD` as it answers `GET`, without the body.
 
 ### Web Interface
 
-- `GET /` - Home page (HTML): headline figures, lookups by AS number and by IP
+- `GET /` - Home page (HTML): headline figures, and lookups by AS number and by
-  address, and a search of AS names
+  IP address
 - `GET /status` - HTML status dashboard, which reads `/api/v1/stats`
 - `GET /status.json` - JSON statistics: feed, memory, database and route figures
 - `GET /.well-known/healthcheck.json` - Health check (JSON): 200 when the
   database answers and the RIS Live feed is connected, otherwise 503;
   `data.status` is `ok` or `error` and `data.checks` says which check failed
 - `GET /as/{asn}` - AS detail page (HTML): the prefixes the AS originates and
-  its peers. When the database has no record of the AS, its handle and
+  its peers
-  description come from the AS list built into RouteWatch. The page then shows
-  no first-seen date.
 - `GET /prefix/{prefix}/{length}` - Prefix detail page (HTML), such as
   `/prefix/192.0.2.0/24`: every live route for the prefix, one per peer, and its
   origin ASes
@@ -81,9 +63,7 @@ Every route answers `HEAD` as it answers `GET`, without the body.
 ### API v1
 
 - `GET /api/v1/stats` - The `/status.json` figures plus connection, garbage
-  collector, stream and handler queue statistics. `stream.route_churn_per_min`
+  collector, stream and handler queue statistics
-  is the number of prefix announcements and withdrawals, from all peers, in the
-  last full clock minute.
 - `GET /api/v1/ip/{ip}` - Looks up each address: its most specific live route
   (`netblock`), that route's origin AS with its WHOIS details, and the address's
   PTR names. `{ip}` is an IP address, a host name, or a comma-separated list of
@@ -97,22 +77,9 @@ Every route answers `HEAD` as it answers `GET`, without the body.
   and 404 when none of the addresses has a live route. A PTR lookup gets 2
   seconds; an address whose lookup takes longer is answered without PTR names.
 - `GET /api/v1/as/{asn}` - The AS and the prefixes it originates, IPv4 and IPv6
-  apart, each with when its newest route was updated. When the database has no
+  apart, each with when its newest route was updated
-  record of the AS, its handle and description come from the AS list built into
-  RouteWatch. The answer then has no `first_seen` or `last_seen`.
 - `GET /api/v1/prefix/{prefix}/{length}` - Every live route for the prefix, one
   per peer, and the same routes grouped by origin AS in `origins`
-- `GET /api/v1/search/as?q={text}` - Finds the ASes whose handle or description
-  contains `{text}`, ignoring case. `data` holds:
-    - `query`: `{text}` without its leading and trailing spaces
-    - `total`: the number of ASes that match
-    - `results`: the first 50 of them in AS number order, each with `asn`,
-      `handle` and `description`
-
-    The search reads the AS list built into RouteWatch, not the database. The
-    list comes from [ipverse/asn-info](https://github.com/ipverse/asn-info). A
-    match can therefore be an AS that the database has no record of. A `q` that
-    is missing, empty or only spaces answers 400.
 
 A JSON answer is `{"status": "ok", "data": ...}`, or for an error
 `{"status": "error", "error": {"msg": ..., "code": ...}}`, and carries an
@@ -123,16 +90,13 @@ took. The health check is the exception: its 503 answer is also
 A request that runs past its time limit answers 504: the limit is 30 seconds,
 and 4 seconds for the database reads behind `/status.json` and `/api/v1/stats`.
 An AS number, prefix or mask length that does not parse answers 400, as does a
-mask length out of range for its IP version. An AS answers 404 when it is not in
+mask length out of range for its IP version. An AS the database does not hold,
-the AS list built into RouteWatch and the database has neither a record of it
+or a prefix with no live route, answers 404. The HTML pages give these errors as
-nor a live route it originates. AS 0 always answers 404, because it means no
+plain text. Under `/api/v1` and `/ip/`, a path no route matches answers 404 with
-known origin. The AS name search never lists it. A prefix with no live route
+the message `Not found`, and `POST`, `PUT`, `PATCH`, `DELETE`, `OPTIONS`,
-answers 404 too. The HTML pages give these errors as plain text. Under `/api/v1`
+`TRACE` or `CONNECT` answers 405 with `Method not allowed`. A 500 answer says
-and `/ip/`, a path no route matches answers 404 with the message `Not found`,
+only `Internal server error`, and a host name that does not resolve only
-and `POST`, `PUT`, `PATCH`, `DELETE`, `OPTIONS`, `TRACE` or `CONNECT` answers
+`could not resolve host name`; the detail goes to the log.
-405 with `Method not allowed`. A 500 answer says only `Internal server error`,
-and a host name that does not resolve only `could not resolve host name`; the
-detail goes to the log.
 
 Every answer carries `Strict-Transport-Security`, `Content-Security-Policy`,
 `X-Frame-Options`, `X-Content-Type-Options`, `Referrer-Policy` and
@@ -231,8 +195,7 @@ routewatch/
     - **ASHandler**: Tracks all ASNs seen in AS paths
     - **PeerHandler**: Records BGP peer information
     - **PrefixHandler**: Maintains live routing table (upserts on announcement,
-      deletes on withdrawal or on an announcement whose AS path is empty or
+      deletes on withdrawal, deletes all of a peer's routes when its BGP session
-      holds AS 0 anywhere, deletes all of a peer's routes when its BGP session
       goes down). Routes are kept per peer IP, so when one peer IP has sessions
       on two collectors, a session going down on one also removes the routes the
       other still carries, until they are announced again.

TODO.md

@@ -33,21 +33,6 @@ tested.
 
 # Completed Steps
 
-- 2026-10-26: the status page shows "Route Churn/min", the number of prefix
-  announcements and withdrawals, from all peers, in the last full clock minute.
-  `/api/v1/stats` reports it as `route_churn_per_min` in `stream`, which
-  replaces the moving average `route_churn_per_sec`. The messages and updates
-  per second on `/` and `/status` are whole numbers (closes #160)
-- 2026-10-26: the WHOIS fetcher backs off more slowly. A failure makes its wait
-  1.5 times as long, up to one minute instead of five. Its queries to RIPE,
-  APNIC and AFRINIC leave out person and role objects, which RIPE counts against
-  a daily limit per address. A refused query is logged with the RIR's error line
-  (closes #159)
-- 2026-10-26: the home page's AS name search lists the ASes whose handle or
-  description holds the text, as links to their pages, from the new
-  `/api/v1/search/as`; the search ignores case. When the database has no record
-  of an AS, its page takes the handle and description from the AS list built
-  into RouteWatch and still lists the AS's prefixes (closes #151)
 - 2026-10-19: README "HTTP Endpoints" lists every route with what it answers,
   "Database Schema" matches `schema.sql`, and the rest of the README matches the
   code; this file brought up to date (closes #72)

internal/database/counts_internal_test.go

@@ -148,9 +148,7 @@ func TestLiveCountsTrackWritesInRealtime(t *testing.T) {
 func writeASNsPrefixesAndPeers(t *testing.T, db *Database, ts time.Time) {
 	t.Helper()
 
-	seen := SeenTimes{First: ts, Last: ts}
+	err := db.GetOrCreateASNBatch(map[int]time.Time{64500: ts, 64501: ts})
-
-	err := db.GetOrCreateASNBatch(map[int]SeenTimes{64500: seen, 64501: seen})
 	if err != nil {
 		t.Fatalf("GetOrCreateASNBatch: %v", err)
 	}
@@ -166,14 +164,14 @@ func writeASNsPrefixesAndPeers(t *testing.T, db *Database, ts time.Time) {
 	err = db.UpdatePeerBatch(map[string]PeerUpdate{
 		testV4PeerIP: {
 			PeerIP: testV4PeerIP, PeerASN: 64500,
-			MessageType: "UPDATE", Seen: seen,
+			MessageType: "UPDATE", Timestamp: ts,
 		},
 	})
 	if err != nil {
 		t.Fatalf("UpdatePeerBatch: %v", err)
 	}
 
-	err = db.RecordPeering(64500, 64501, seen)
+	err = db.RecordPeering(64500, 64501, ts)
 	if err != nil {
 		t.Fatalf("RecordPeering: %v", err)
 	}
@@ -194,10 +192,7 @@ func TestLiveCountsSeededFromDatabaseAtStartup(t *testing.T) {
 
 	ts := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)
 
-	seen := SeenTimes{First: ts, Last: ts}
+	err = db.GetOrCreateASNBatch(map[int]time.Time{64500: ts, 64501: ts, 64502: ts})
-
-	err = db.GetOrCreateASNBatch(
-		map[int]SeenTimes{64500: seen, 64501: seen, 64502: seen})
 	if err != nil {
 		t.Fatalf("GetOrCreateASNBatch: %v", err)
 	}

internal/database/database.go

@@ -21,7 +21,6 @@ import (
 
 	"git.eeqj.de/sneak/routewatch/internal/config"
 	"git.eeqj.de/sneak/routewatch/internal/logger"
-	"git.eeqj.de/sneak/routewatch/internal/ristypes"
 	"git.eeqj.de/sneak/routewatch/pkg/asinfo"
 	_ "github.com/mattn/go-sqlite3" // CGO SQLite driver
 )
@@ -170,20 +169,6 @@ func New(cfg *config.Config, logger *logger.Logger) (*Database, error) {
 		return nil, fmt.Errorf("failed to create database directory: %w", err)
 	}
 
-	// The size of the WAL file the previous run left, which Initialize logs
-	// with the start-up checkpoint. It is read before the database is opened,
-	// because opening it writes a frame to the WAL. There is no WAL file when
-	// the database is new or the last run closed the database, which deletes
-	// it.
-	var walBytes int64
-
-	wal, err := os.Stat(dbPath + walFileSuffix)
-	if err == nil {
-		walBytes = wal.Size()
-	} else if !errors.Is(err, os.ErrNotExist) {
-		logger.Warn("Failed to read the WAL file's size on startup", "error", err)
-	}
-
 	// Per-connection SQLite settings go in the DSN so every pooled connection
 	// gets them, not just the one that runs the Initialize pragmas. _txlock=
 	// immediate makes every transaction take the write lock at BEGIN. Without it
@@ -244,7 +229,7 @@ func New(cfg *config.Config, logger *logger.Logger) (*Database, error) {
 		counts: &liveCounts{},
 	}
 
-	err = database.Initialize(walBytes)
+	err = database.Initialize()
 	if err != nil {
 		return nil, fmt.Errorf("failed to initialize database: %w", err)
 	}
@@ -260,16 +245,8 @@ func New(cfg *config.Config, logger *logger.Logger) (*Database, error) {
 	return database, nil
 }
 
-// The messages Initialize logs the start-up WAL checkpoint with.
+// Initialize creates the database schema if it doesn't exist.
-const (
+func (d *Database) Initialize() error {
-	startupCheckpointMessage           = "WAL checkpoint on startup"
-	startupCheckpointIncompleteMessage = "WAL checkpoint on startup incomplete"
-)
-
-// Initialize creates the database schema if it doesn't exist. walBytes is the
-// size of the WAL file the previous run left, which New reads before it opens
-// the database.
-func (d *Database) Initialize(walBytes int64) error {
 	// Set SQLite pragmas for performance. Per-connection settings (cache_size,
 	// synchronous, busy_timeout, journal_mode) live in the DSN, and New sets the
 	// writing connection's cache_size; temp_store is left at its default so
@@ -289,33 +266,19 @@ func (d *Database) Initialize(walBytes int64) error {
 		}
 	}
 
-	// The start-up checkpoint copies the WAL a previous run left into the
+	// Run WAL checkpoint on startup to consolidate any existing WAL
-	// database file and empties the WAL file; its frame counts then read 0,
+	var walPages, checkpointedPages, movedPages int
-	// so walBytes is logged with them.
-	var busy, walFrames, checkpointedFrames int
 
 	err := d.writer.QueryRowContext(context.Background(),
 		"PRAGMA wal_checkpoint(TRUNCATE)",
-	).Scan(&busy, &walFrames, &checkpointedFrames)
+	).Scan(&walPages, &checkpointedPages, &movedPages)
-
+	if err != nil {
-	switch {
-	case err != nil:
 		d.logger.Warn("Failed to checkpoint WAL on startup", "error", err)
-	case busy != 0:
+	} else {
-		// Another process using the database kept the checkpoint from
+		d.logger.Info("WAL checkpoint on startup",
-		// copying or emptying all of the WAL.
+			"wal_pages", walPages,
-		d.logger.Warn(startupCheckpointIncompleteMessage,
+			"checkpointed", checkpointedPages,
-			"wal_bytes", walBytes,
+			"moved", movedPages,
-			"busy", busy,
-			"wal_frames", walFrames,
-			"checkpointed_frames", checkpointedFrames,
-		)
-	default:
-		d.logger.Info(startupCheckpointMessage,
-			"wal_bytes", walBytes,
-			"busy", busy,
-			"wal_frames", walFrames,
-			"checkpointed_frames", checkpointedFrames,
 		)
 	}
 
@@ -892,7 +855,7 @@ func insertPrefixesInTable(
 
 // UpdatePrefixesBatch stores, in a single transaction, the prefixes that are
 // not stored yet, each first seen at its time in prefixes: the IPv4 prefixes
-// first and then the IPv6 prefixes. A prefix that does not parse is not stored.
+// first and then the IPv6 prefixes.
 func (d *Database) UpdatePrefixesBatch(prefixes map[string]time.Time) error {
 	if len(prefixes) == 0 {
 		return nil
@@ -911,11 +874,6 @@ func (d *Database) UpdatePrefixesBatch(prefixes map[string]time.Time) error {
 	prefixesV6 := make(map[string]time.Time)
 
 	for prefix, timestamp := range prefixes {
-		_, err := netip.ParsePrefix(prefix)
-		if err != nil {
-			continue
-		}
-
 		if detectIPVersion(prefix) == ipVersionV4 {
 			prefixesV4[prefix] = timestamp
 		} else {
@@ -945,14 +903,13 @@ func (d *Database) UpdatePrefixesBatch(prefixes map[string]time.Time) error {
 	return nil
 }
 
-// newASN returns a new ASN record first seen at seen.First and last seen at
+// newASN returns a new ASN record first and last seen at timestamp, with the
-// seen.Last, with the handle and description from the AS info lookup when it
+// handle and description from the AS info lookup when it knows the number.
-// knows the number.
+func newASN(number int, timestamp time.Time) ASN {
-func newASN(number int, seen SeenTimes) ASN {
 	asn := ASN{
 		ASN:       number,
-		FirstSeen: seen.First,
+		FirstSeen: timestamp,
-		LastSeen:  seen.Last,
+		LastSeen:  timestamp,
 	}
 
 	// Look up ASN info
@@ -964,12 +921,12 @@ func newASN(number int, seen SeenTimes) ASN {
 	return asn
 }
 
-// upsertASN sets the last_seen time of ASN number to seen.Last with the given
+// upsertASN updates the last_seen time of ASN number with the given
 // statements, inserting the ASN when it is new. It reports whether it inserted
 // it.
 func upsertASN(
 	ctx context.Context, selectStmt, updateStmt, insertStmt *sql.Stmt,
-	number int, seen SeenTimes,
+	number int, timestamp time.Time,
 ) (bool, error) {
 	var (
 		asn                 ASN
@@ -980,7 +937,7 @@ func upsertASN(
 		&description, &asn.FirstSeen, &asn.LastSeen)
 	if err == nil {
 		// ASN exists, update last_seen
-		_, err = updateStmt.ExecContext(ctx, seen.Last, number)
+		_, err = updateStmt.ExecContext(ctx, timestamp, number)
 		if err != nil {
 			return false, fmt.Errorf("failed to update ASN %d: %w", number, err)
 		}
@@ -993,7 +950,7 @@ func upsertASN(
 	}
 
 	// ASN doesn't exist, create it
-	asn = newASN(number, seen)
+	asn = newASN(number, timestamp)
 
 	_, err = insertStmt.ExecContext(ctx, asn.ASN, asn.Handle,
 		asn.Description, asn.FirstSeen, asn.LastSeen)
@@ -1005,7 +962,7 @@ func upsertASN(
 }
 
 // GetOrCreateASNBatch creates or updates multiple ASNs in a single transaction
-func (d *Database) GetOrCreateASNBatch(asns map[int]SeenTimes) error {
+func (d *Database) GetOrCreateASNBatch(asns map[int]time.Time) error {
 	if len(asns) == 0 {
 		return nil
 	}
@@ -1047,9 +1004,9 @@ func (d *Database) GetOrCreateASNBatch(asns map[int]SeenTimes) error {
 
 	var newASNs int
 
-	for number, seen := range asns {
+	for number, timestamp := range asns {
 		inserted, err := upsertASN(ctx, selectStmt, updateStmt, insertStmt,
-			number, seen)
+			number, timestamp)
 		if err != nil {
 			return err
 		}
@@ -1118,7 +1075,7 @@ func (d *Database) GetOrCreateASN(number int, timestamp time.Time) (*ASN, error)
 	}
 
 	// ASN doesn't exist, create it with ASN info lookup
-	asn = newASN(number, SeenTimes{First: timestamp, Last: timestamp})
+	asn = newASN(number, timestamp)
 
 	_, err = tx.Exec("INSERT INTO asns "+
 		"(asn, handle, description, first_seen, last_seen) "+
@@ -1225,7 +1182,7 @@ func (d *Database) RecordAnnouncement(announcement *Announcement) error {
 }
 
 // RecordPeering records a peering relationship between two ASNs.
-func (d *Database) RecordPeering(asA, asB int, seen SeenTimes) error {
+func (d *Database) RecordPeering(asA, asB int, timestamp time.Time) error {
 	// Validate ASNs
 	if asA <= 0 || asB <= 0 {
 		return fmt.Errorf("%w: asA=%d, asB=%d", errInvalidASN, asA, asB)
@@ -1261,12 +1218,12 @@ func (d *Database) RecordPeering(asA, asB int, seen SeenTimes) error {
 	if exists {
 		_, err = tx.Exec(
 			"UPDATE peerings SET last_seen = ? WHERE as_a = ? AND as_b = ?",
-			seen.Last, asA, asB)
+			timestamp, asA, asB)
 	} else {
 		_, err = tx.Exec(`
 			INSERT INTO peerings (id, as_a, as_b, first_seen, last_seen)
 			VALUES (?, ?, ?, ?, ?)`,
-			generateUUID().String(), asA, asB, seen.First, seen.Last)
+			generateUUID().String(), asA, asB, timestamp, timestamp)
 	}
 
 	if err != nil {
@@ -1344,11 +1301,11 @@ func (d *Database) UpdatePeerBatch(peers map[string]PeerUpdate) error {
 
 		if exists {
 			_, err = updateStmt.ExecContext(ctx, update.PeerASN,
-				update.Seen.Last, update.MessageType, update.PeerIP)
+				update.Timestamp, update.MessageType, update.PeerIP)
 		} else {
 			_, err = insertStmt.ExecContext(ctx,
 				generateUUID().String(), update.PeerIP, update.PeerASN,
-				update.Seen.First, update.Seen.Last, update.MessageType)
+				update.Timestamp, update.Timestamp, update.MessageType)
 		}
 
 		if err != nil {
@@ -1749,21 +1706,9 @@ func (d *Database) GetASDetails(asn int) (*ASN, []LiveRoute, error) {
 // GetASDetailsContext returns the AS and the prefixes it originates, the IPv4
 // ones first, each once with the time of its newest route. It makes two index
 // searches per prefix, however many peers carry the prefix.
-//
-// The routes of an AS can be stored before its record in the asns table. When
-// the AS has no record, its handle and description come from the AS info
-// lookup, and it has no seen times. An AS with no record, no lookup entry and
-// no prefix is ErrNoRoute.
-//
-// ristypes.NoOrigin means no known origin, not an AS, so it is ErrNoRoute
-// whatever is stored.
 func (d *Database) GetASDetailsContext(
 	ctx context.Context, asn int,
 ) (*ASN, []LiveRoute, error) {
-	if asn == ristypes.NoOrigin {
-		return nil, nil, fmt.Errorf("%w: AS%d", ErrNoRoute, asn)
-	}
-
 	// Get AS information
 	var (
 		asnInfo             ASN
@@ -1776,27 +1721,16 @@ func (d *Database) GetASDetailsContext(
 		asn,
 	).Scan(&asnInfo.ASN, &handle, &description, &asnInfo.FirstSeen,
 		&asnInfo.LastSeen)
-
+	if err != nil {
-	// known is whether the asns table or the AS info lookup holds the AS.
+		if errors.Is(err, sql.ErrNoRows) {
-	known := true
+			return nil, nil, fmt.Errorf("%w: AS%d", ErrNoRoute, asn)
-
-	switch {
-	case errors.Is(err, sql.ErrNoRows):
-		asnInfo.ASN = asn
-
-		info, ok := asinfo.Get(asn)
-		if ok {
-			asnInfo.Handle = info.Handle
-			asnInfo.Description = info.Description
 		}
 
-		known = ok
-	case err != nil:
 		return nil, nil, fmt.Errorf("failed to query AS: %w", err)
-	default:
+	}
+
 	asnInfo.Handle = handle.String
 	asnInfo.Description = description.String
-	}
 
 	allPrefixes, err := d.originPrefixes(ctx, asn, ipVersionV4)
 	if err != nil {
@@ -1808,13 +1742,7 @@ func (d *Database) GetASDetailsContext(
 		return &asnInfo, allPrefixes, err
 	}
 
-	allPrefixes = append(allPrefixes, prefixesV6...)
+	return &asnInfo, append(allPrefixes, prefixesV6...), nil
-
-	if !known && len(allPrefixes) == 0 {
-		return nil, nil, fmt.Errorf("%w: AS%d", ErrNoRoute, asn)
-	}
-
-	return &asnInfo, allPrefixes, nil
 }
 
 // ASPeer represents a peering relationship with another AS including handle,

internal/database/database_internal_test.go

@@ -1,10 +1,8 @@
 package database
 
 import (
-	"bytes"
 	"context"
 	"database/sql"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"log/slog"
@@ -20,7 +18,6 @@ import (
 
 	"git.eeqj.de/sneak/routewatch/internal/config"
 	"git.eeqj.de/sneak/routewatch/internal/logger"
-	"git.eeqj.de/sneak/routewatch/pkg/asinfo"
 	"github.com/mattn/go-sqlite3"
 )
 
@@ -618,12 +615,10 @@ func TestBatchWriteDuringCheckpoint(t *testing.T) {
 	})
 
 	ts := time.Now().UTC()
-	seen := SeenTimes{First: ts, Last: ts}
-
 	for i := range contentionIterations {
-		asns := map[int]SeenTimes{
+		asns := map[int]time.Time{
-			i % contendedASNCount:                   seen,
+			i % contendedASNCount:                   ts,
-			(i % contendedASNCount) + asnSecondBand: seen,
+			(i % contendedASNCount) + asnSecondBand: ts,
 		}
 
 		err := db.GetOrCreateASNBatch(asns)
@@ -752,8 +747,7 @@ func TestBatchWriteWaitsForAnalyze(t *testing.T) {
 
 	db, messages := newDatabaseWithLockMessages(t)
 	ctx := context.Background()
-	now := time.Now().UTC()
+	asns := map[int]time.Time{lockTestASN: time.Now().UTC()}
-	asns := map[int]SeenTimes{lockTestASN: {First: now, Last: now}}
 
 	// A stored AS gives ANALYZE a table to analyze and statistics to write.
 	err := db.GetOrCreateASNBatch(asns)
@@ -1055,176 +1049,6 @@ func walFileSize(t *testing.T, db *Database) int64 {
 	return wal.Size()
 }
 
-// TestStartupCheckpointLogsItsFigures opens a new database, writes a route,
-// and opens the same file again while the first stays open, so that its WAL
-// file stays. The first open finds no WAL file: it logs a size of 0 and no
-// warning. The second logs the size of the WAL file the first left, and the
-// checkpoint's busy flag and frame counts, each under its own name; the
-// counts read 0 once the checkpoint has emptied the file.
-// Initialize logged the busy flag as wal_pages and the counts under each
-// other's names (https://git.eeqj.de/sneak/routewatch/issues/117).
-func TestStartupCheckpointLogsItsFigures(t *testing.T) {
-	t.Parallel()
-
-	cfg := &config.Config{StateDir: t.TempDir()}
-
-	db, lines := openLogged(t, cfg)
-
-	for _, line := range lines {
-		if line[slog.LevelKey] == slog.LevelWarn.String() {
-			t.Errorf("opening a new database logged a warning: %v", line)
-		}
-	}
-
-	line := findLine(t, lines, startupCheckpointMessage)
-	if line["wal_bytes"] != 0.0 {
-		t.Errorf("new database: start-up checkpoint logged wal_bytes = %v, "+
-			"want 0", line["wal_bytes"])
-	}
-
-	err := db.UpsertLiveRouteBatch([]*LiveRoute{
-		mkV4Route(t, "192.0.2.0/24", lockTestASN, time.Now().UTC()),
-	})
-	if err != nil {
-		t.Fatalf("failed to store a route: %v", err)
-	}
-
-	walBytes := walFileSize(t, db)
-	if walBytes == 0 {
-		t.Fatal("WAL file empty after the route write, want frames in it")
-	}
-
-	_, lines = openLogged(t, cfg)
-	line = findLine(t, lines, startupCheckpointMessage)
-
-	for _, key := range []string{"busy", "wal_frames", "checkpointed_frames"} {
-		if line[key] != 0.0 {
-			t.Errorf("start-up checkpoint logged %s = %v, want 0", key, line[key])
-		}
-	}
-
-	if line["wal_bytes"] != float64(walBytes) {
-		t.Errorf("start-up checkpoint logged wal_bytes = %v, want the %d "+
-			"bytes the first database left", line["wal_bytes"], walBytes)
-	}
-}
-
-// TestStartupCheckpointWarnsWhenIncomplete keeps a read open on a database
-// while a route is written after the read began, then opens the same file
-// again. The second open's start-up checkpoint cannot copy the frames written
-// after the read began, and gives up once the busy timeout has passed. It
-// checks that the checkpoint is logged as a warning with busy 1 and fewer
-// frames copied than the WAL holds.
-func TestStartupCheckpointWarnsWhenIncomplete(t *testing.T) {
-	t.Parallel()
-
-	cfg := &config.Config{StateDir: t.TempDir()}
-	db, _ := openLogged(t, cfg)
-	ctx := context.Background()
-
-	reader, err := db.db.Conn(ctx)
-	if err != nil {
-		t.Fatalf("failed to open the reading connection: %v", err)
-	}
-	defer func() { _ = reader.Close() }()
-
-	// A plain BEGIN starts a transaction that only reads, unlike the BEGIN
-	// IMMEDIATE of _txlock. It keeps the snapshot its first read takes until
-	// it ends.
-	_, err = reader.ExecContext(ctx, "BEGIN")
-	if err != nil {
-		t.Fatalf("failed to begin the read transaction: %v", err)
-	}
-	defer func() { _, _ = reader.ExecContext(ctx, "ROLLBACK") }()
-
-	var routes int
-
-	err = reader.QueryRowContext(ctx,
-		"SELECT count(*) FROM live_routes_v4").Scan(&routes)
-	if err != nil {
-		t.Fatalf("failed to read the live routes: %v", err)
-	}
-
-	err = db.UpsertLiveRouteBatch([]*LiveRoute{
-		mkV4Route(t, "192.0.2.0/24", lockTestASN, time.Now().UTC()),
-	})
-	if err != nil {
-		t.Fatalf("failed to store a route after the read: %v", err)
-	}
-
-	_, lines := openLogged(t, cfg)
-	line := findLine(t, lines, startupCheckpointIncompleteMessage)
-
-	if line[slog.LevelKey] != slog.LevelWarn.String() {
-		t.Errorf("start-up checkpoint logged at level %v, want %s",
-			line[slog.LevelKey], slog.LevelWarn)
-	}
-
-	if line["busy"] != 1.0 {
-		t.Errorf("start-up checkpoint logged busy = %v, want 1", line["busy"])
-	}
-
-	walFrames, _ := line["wal_frames"].(float64)
-	checkpointedFrames, _ := line["checkpointed_frames"].(float64)
-
-	if checkpointedFrames >= walFrames {
-		t.Errorf("start-up checkpoint logged checkpointed_frames = %v and "+
-			"wal_frames = %v with a read open, want fewer copied than the WAL "+
-			"holds", line["checkpointed_frames"], line["wal_frames"])
-	}
-}
-
-// openLogged opens the database of cfg with a logger that writes JSON, and
-// returns it with the lines it logged while it opened, decoded.
-func openLogged(t *testing.T, cfg *config.Config) (*Database, []map[string]any) {
-	t.Helper()
-
-	var logged bytes.Buffer
-
-	db, err := New(cfg,
-		&logger.Logger{Logger: slog.New(slog.NewJSONHandler(&logged, nil))})
-	if err != nil {
-		t.Fatalf("failed to open the database: %v", err)
-	}
-
-	t.Cleanup(func() { _ = db.Close() })
-
-	var lines []map[string]any
-
-	decoder := json.NewDecoder(&logged)
-	for decoder.More() {
-		var line map[string]any
-
-		err := decoder.Decode(&line)
-		if err != nil {
-			t.Fatalf("failed to decode the log: %v", err)
-		}
-
-		lines = append(lines, line)
-	}
-
-	return db, lines
-}
-
-// findLine returns the first of lines logged with message.
-func findLine(
-	t *testing.T,
-	lines []map[string]any,
-	message string,
-) map[string]any {
-	t.Helper()
-
-	for _, line := range lines {
-		if line[slog.MessageKey] == message {
-			return line
-		}
-	}
-
-	t.Fatalf("no line %q in the log", message)
-
-	return nil
-}
-
 // TestGetRandomPrefixesByLengthListsPrefixOnce stores one prefix of each
 // family learned from two peers in the same second and checks that the
 // prefix-length sample lists each of them once.
@@ -1700,85 +1524,6 @@ func TestGetASDetailsListsEachPrefixOnce(t *testing.T) {
 	}
 }
 
-// TestGetASDetailsOfASNotInDatabase asks for ASes that the database has no
-// record of, some with stored routes. Each gets the prefixes of its routes and
-// no seen times. One that the AS info lookup knows gets its handle and
-// description from it. An AS with no record, no lookup entry and no route is
-// ErrNoRoute. Before the fix every AS with no record was ErrNoRoute.
-func TestGetASDetailsOfASNotInDatabase(t *testing.T) {
-	t.Parallel()
-
-	db, err := New(&config.Config{StateDir: t.TempDir()}, logger.New())
-	if err != nil {
-		t.Fatalf("failed to create database: %v", err)
-	}
-	defer func() { _ = db.Close() }()
-
-	ts := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)
-
-	tests := []struct {
-		asn      int
-		listed   bool     // in the AS info lookup
-		prefixes []string // of the routes stored for the AS
-	}{
-		{15169, true, []string{"192.0.2.0/24"}},
-		{13335, true, nil},
-		{4200000000, false, []string{"198.51.100.0/24"}},
-	}
-
-	var routes []*LiveRoute
-
-	for _, tt := range tests {
-		if _, ok := asinfo.Get(tt.asn); ok != tt.listed {
-			t.Fatalf("AS%d in the AS info data: %t, want %t", tt.asn, ok, tt.listed)
-		}
-
-		for _, prefix := range tt.prefixes {
-			routes = append(routes, mkV4Route(t, prefix, tt.asn, ts))
-		}
-	}
-
-	err = db.UpsertLiveRouteBatch(routes)
-	if err != nil {
-		t.Fatalf("UpsertLiveRouteBatch: %v", err)
-	}
-
-	for _, tt := range tests {
-		got, prefixes, err := db.GetASDetails(tt.asn)
-		if err != nil {
-			t.Errorf("GetASDetails(%d): %v", tt.asn, err)
-
-			continue
-		}
-
-		want := ASN{ASN: tt.asn}
-		if info, ok := asinfo.Get(tt.asn); ok {
-			want.Handle, want.Description = info.Handle, info.Description
-		}
-
-		var gotPrefixes []string
-		for _, route := range prefixes {
-			gotPrefixes = append(gotPrefixes, route.Prefix)
-		}
-
-		if *got != want || !slices.Equal(gotPrefixes, tt.prefixes) {
-			t.Errorf("GetASDetails(%d) = %+v with prefixes %v, want %+v with %v",
-				tt.asn, *got, gotPrefixes, want, tt.prefixes)
-		}
-	}
-
-	const absentASN = 4200000001 // no record, no lookup entry and no route
-
-	if _, ok := asinfo.Get(absentASN); ok {
-		t.Fatalf("AS%d is in the AS info data", absentASN)
-	}
-
-	_, _, err = db.GetASDetails(absentASN)
-	if !errors.Is(err, ErrNoRoute) {
-		t.Errorf("GetASDetails(%d): error %v, want %v", absentASN, err, ErrNoRoute)
-	}
-}
-
 // TestASPrefixQueriesUseCoveringIndexes checks the plan of each query that
 // lists the prefixes an AS originates: a search of a covering index and no
 // temporary B-tree, so the list reads one index entry per prefix, not one
@@ -1918,48 +1663,6 @@ func TestUpdatePrefixesBatchKeepsFirstSeen(t *testing.T) {
 	}
 }
 
-// TestUpdatePeerBatchStoresTheEarliestAndLatestTimesOfANewPeer writes a new
-// peer whose updates span 5 seconds. Its row is first seen at the earliest time
-// and last seen at the latest.
-func TestUpdatePeerBatchStoresTheEarliestAndLatestTimesOfANewPeer(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	db, err := New(&config.Config{StateDir: t.TempDir()}, logger.New())
-	if err != nil {
-		t.Fatalf("failed to create database: %v", err)
-	}
-	defer func() { _ = db.Close() }()
-
-	first := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)
-	last := first.Add(5 * time.Second)
-
-	err = db.UpdatePeerBatch(map[string]PeerUpdate{
-		testPeerIP: {
-			PeerIP: testPeerIP, PeerASN: 64500, MessageType: "UPDATE",
-			Seen: SeenTimes{First: first, Last: last},
-		},
-	})
-	if err != nil {
-		t.Fatalf("UpdatePeerBatch: %v", err)
-	}
-
-	var firstSeen, lastSeen time.Time
-
-	err = db.db.QueryRowContext(t.Context(),
-		"SELECT first_seen, last_seen FROM bgp_peers WHERE peer_ip = ?",
-		testPeerIP).Scan(&firstSeen, &lastSeen)
-	if err != nil {
-		t.Fatalf("reading peer %s: %v", testPeerIP, err)
-	}
-
-	if !firstSeen.Equal(first) || !lastSeen.Equal(last) {
-		t.Errorf("peer %s: first seen %s, last seen %s; want %s, %s",
-			testPeerIP, firstSeen, lastSeen, first, last)
-	}
-}
-
 // TestUpsertLiveRouteBatchWritesInKeyOrder writes new routes of two peers out
 // of key order, the last one a second announcement of the first, and checks
 // that the rows were inserted in key order, peer then prefix (each new row's id

internal/database/dockerignore_internal_test.go

@@ -1,61 +0,0 @@
-package database
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"git.eeqj.de/sneak/routewatch/internal/config"
-	"git.eeqj.de/sneak/routewatch/internal/logger"
-)
-
-// TestDockerignoreExcludesDatabaseFiles checks that .dockerignore keeps the
-// database file, and the WAL and shared-memory files SQLite writes next to it,
-// out of the build context wherever they sit in the clone. The image ships the
-// whole build context as a source archive.
-func TestDockerignoreExcludesDatabaseFiles(t *testing.T) {
-	t.Parallel()
-
-	db, err := New(&config.Config{StateDir: t.TempDir()}, logger.New())
-	if err != nil {
-		t.Fatalf("failed to create database: %v", err)
-	}
-	defer func() { _ = db.Close() }()
-
-	data, err := os.ReadFile("../../.dockerignore")
-	if err != nil {
-		t.Fatalf("failed to read .dockerignore: %v", err)
-	}
-
-	// Docker reads `**/` as any number of directories and the rest of the
-	// pattern as filepath.Match does, so `**/` followed by a pattern that
-	// matches a file's name excludes that file at any depth.
-	var anyDepth []string
-
-	for line := range strings.Lines(string(data)) {
-		pattern, ok := strings.CutPrefix(strings.TrimSpace(line), "**/")
-		if ok {
-			anyDepth = append(anyDepth, pattern)
-		}
-	}
-
-	name := filepath.Base(db.path)
-
-	for _, file := range []string{name, name + "-wal", name + "-shm"} {
-		excluded := false
-
-		for _, pattern := range anyDepth {
-			matched, err := filepath.Match(pattern, file)
-			if err != nil {
-				t.Fatalf("bad .dockerignore pattern **/%s: %v", pattern, err)
-			}
-
-			excluded = excluded || matched
-		}
-
-		if !excluded {
-			t.Errorf(".dockerignore has no **/ pattern that excludes %s", file)
-		}
-	}
-}

internal/database/interface.go

@@ -34,7 +34,7 @@ type Stats struct {
 type Store interface {
 	// ASN operations
 	GetOrCreateASN(number int, timestamp time.Time) (*ASN, error)
-	GetOrCreateASNBatch(asns map[int]SeenTimes) error
+	GetOrCreateASNBatch(asns map[int]time.Time) error
 
 	// Prefix operations
 	GetOrCreatePrefix(prefix string, timestamp time.Time) (*Prefix, error)
@@ -44,7 +44,7 @@ type Store interface {
 	RecordAnnouncement(announcement *Announcement) error
 
 	// Peering operations
-	RecordPeering(asA, asB int, seen SeenTimes) error
+	RecordPeering(asA, asB int, timestamp time.Time) error
 
 	// Statistics
 	GetStats() (Stats, error)

internal/database/models.go

@@ -28,10 +28,9 @@ type ASN struct {
 	RIRRegDate  *time.Time `json:"rir_registration_date,omitempty"`
 	RIRLastMod  *time.Time `json:"rir_last_modified,omitempty"`
 	WHOISRaw    string     `json:"whois_raw,omitempty"`
-	// Timestamps. They are zero, and left out of JSON, for an AS that has no
+	// Timestamps
-	// record in the asns table.
+	FirstSeen      time.Time  `json:"first_seen"`
-	FirstSeen      time.Time  `json:"first_seen,omitzero"`
+	LastSeen       time.Time  `json:"last_seen"`
-	LastSeen       time.Time  `json:"last_seen,omitzero"`
 	WHOISUpdatedAt *time.Time `json:"whois_updated_at,omitempty"`
 }
 
@@ -123,35 +122,12 @@ type LiveRouteDeletion struct {
 	IPVersion int
 }
 
-// SeenTimes is the earliest and the latest time one batch of updates saw an AS,
+// PeerUpdate represents parameters for updating a peer
-// a peer or a peering. A row the batch adds is stored first seen at First and
-// last seen at Last; a row already stored keeps its first_seen and has its
-// last_seen set to Last.
-type SeenTimes struct {
-	First time.Time
-	Last  time.Time
-}
-
-// Add makes t the earliest time of s when it is earlier than First, and the
-// latest when it is later than Last. The zero SeenTimes holds no time yet, so
-// the first Add sets both.
-func (s *SeenTimes) Add(t time.Time) {
-	if s.First.IsZero() || t.Before(s.First) {
-		s.First = t
-	}
-
-	if s.Last.IsZero() || t.After(s.Last) {
-		s.Last = t
-	}
-}
-
-// PeerUpdate represents parameters for updating a peer. PeerASN and
-// MessageType are those of the peer's latest update.
 type PeerUpdate struct {
 	PeerIP      string
 	PeerASN     int
 	MessageType string
-	Seen        SeenTimes
+	Timestamp   time.Time
 }
 
 // ASNWHOISUpdate contains WHOIS data for updating an ASN record.

internal/metrics/metrics.go

@@ -34,7 +34,7 @@ type Tracker struct {
 	// Announcement/withdrawal metrics
 	announcementCounter metrics.Counter
 	withdrawalCounter   metrics.Counter
-	churnPerMinute      minuteCounter // prefix announcements and withdrawals
+	churnRate           metrics.Meter // combined announcements + withdrawals per second
 
 	// BGP peer tracking
 	bgpPeerCount atomic.Int32
@@ -56,7 +56,7 @@ func New() *Tracker {
 		ipv6UpdateRate:      metrics.NewMeter(),
 		announcementCounter: metrics.NewCounter(),
 		withdrawalCounter:   metrics.NewCounter(),
-		churnPerMinute:      minuteCounter{now: time.Now},
+		churnRate:           metrics.NewMeter(),
 	}
 }
 
@@ -156,13 +156,13 @@ func (t *Tracker) RecordIPv6Update() {
 // RecordAnnouncement records a route announcement
 func (t *Tracker) RecordAnnouncement() {
 	t.announcementCounter.Inc(1)
-	t.churnPerMinute.add()
+	t.churnRate.Mark(1)
 }
 
 // RecordWithdrawal records a route withdrawal
 func (t *Tracker) RecordWithdrawal() {
 	t.withdrawalCounter.Inc(1)
-	t.churnPerMinute.add()
+	t.churnRate.Mark(1)
 }
 
 // SetBGPPeerCount updates the current BGP peer count
@@ -198,10 +198,9 @@ func (t *Tracker) GetWithdrawalCount() uint64 {
 	return uint64(count)
 }
 
-// GetChurnPerMinute returns the number of prefix announcements and
+// GetChurnRate returns the route churn rate per second
-// withdrawals, from all peers, in the last full clock minute.
+func (t *Tracker) GetChurnRate() float64 {
-func (t *Tracker) GetChurnPerMinute() int {
+	return t.churnRate.Rate1()
-	return t.churnPerMinute.lastFullMinute()
 }
 
 // GetRouteMetrics returns current route update metrics

internal/metrics/minutecounter.go

@@ -1,59 +0,0 @@
-package metrics
-
-import (
-	"sync"
-	"time"
-)
-
-// minuteCounter counts events in each clock minute and reports the count of
-// the last full minute. It is safe for concurrent use.
-type minuteCounter struct {
-	mu  sync.Mutex
-	now func() time.Time
-
-	// minute is the start of the minute that count belongs to.
-	minute time.Time
-	count  int
-	// lastMinuteCount is the count of the minute just before minute.
-	lastMinuteCount int
-}
-
-// add counts one event in the current minute.
-func (c *minuteCounter) add() {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	c.moveToCurrentMinute()
-	c.count++
-}
-
-// lastFullMinute returns the number of events in the minute that ended most
-// recently.
-func (c *minuteCounter) lastFullMinute() int {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	c.moveToCurrentMinute()
-
-	return c.lastMinuteCount
-}
-
-// moveToCurrentMinute starts a new count when the clock has moved into
-// another minute. The count it ends becomes the last full minute's count when
-// its minute is the one just before the current minute. Otherwise the last
-// full minute had no events. The caller holds mu.
-func (c *minuteCounter) moveToCurrentMinute() {
-	minute := c.now().Truncate(time.Minute)
-	if minute.Equal(c.minute) {
-		return
-	}
-
-	if minute.Sub(c.minute) == time.Minute {
-		c.lastMinuteCount = c.count
-	} else {
-		c.lastMinuteCount = 0
-	}
-
-	c.minute = minute
-	c.count = 0
-}

internal/metrics/minutecounter_internal_test.go

@@ -1,86 +0,0 @@
-package metrics
-
-import (
-	"sync"
-	"testing"
-	"time"
-)
-
-// TestChurnPerMinuteCountsLastFullMinute announces and withdraws prefixes on
-// an injected clock and expects each minute's whole count once that minute
-// has ended, and 0 for a minute with none.
-func TestChurnPerMinuteCountsLastFullMinute(t *testing.T) {
-	t.Parallel()
-
-	now := time.Date(2026, 10, 26, 12, 0, 30, 0, time.UTC)
-	tracker := New()
-	tracker.churnPerMinute.now = func() time.Time { return now }
-
-	expectChurn := func(want int, why string) {
-		t.Helper()
-
-		got := tracker.GetChurnPerMinute()
-		if got != want {
-			t.Fatalf("at %s churn = %d, want %d: %s",
-				now.Format(time.TimeOnly), got, want, why)
-		}
-	}
-
-	const firstMinuteChurn = 2
-
-	tracker.RecordAnnouncement()
-	tracker.RecordWithdrawal()
-	expectChurn(0, "12:00 has not ended")
-
-	now = time.Date(2026, 10, 26, 12, 1, 59, 0, time.UTC)
-
-	tracker.RecordAnnouncement()
-	expectChurn(firstMinuteChurn, "12:00 had one announcement and one withdrawal")
-
-	now = time.Date(2026, 10, 26, 12, 2, 0, 0, time.UTC)
-
-	expectChurn(1, "12:01 had one announcement")
-
-	now = time.Date(2026, 10, 26, 12, 4, 0, 0, time.UTC)
-
-	expectChurn(0, "12:03 had none")
-
-	tracker.RecordWithdrawal()
-
-	now = time.Date(2026, 10, 26, 12, 6, 0, 0, time.UTC)
-
-	expectChurn(0, "12:05 had none, though 12:04 had one withdrawal")
-}
-
-// TestChurnPerMinuteCountsConcurrentRecords announces prefixes from several
-// goroutines at once and expects every one counted.
-func TestChurnPerMinuteCountsConcurrentRecords(t *testing.T) {
-	t.Parallel()
-
-	const (
-		goroutines          = 8
-		recordsPerGoroutine = 1000
-	)
-
-	now := time.Date(2026, 10, 26, 12, 0, 0, 0, time.UTC)
-	tracker := New()
-	tracker.churnPerMinute.now = func() time.Time { return now }
-
-	var wg sync.WaitGroup
-	for range goroutines {
-		wg.Go(func() {
-			for range recordsPerGoroutine {
-				tracker.RecordAnnouncement()
-			}
-		})
-	}
-
-	wg.Wait()
-
-	now = now.Add(time.Minute)
-
-	want := goroutines * recordsPerGoroutine
-	if got := tracker.GetChurnPerMinute(); got != want {
-		t.Fatalf("churn = %d, want %d", got, want)
-	}
-}

internal/ristypes/ris.go

@@ -4,7 +4,6 @@ package ristypes
 
 import (
 	"encoding/json"
-	"slices"
 	"time"
 )
 
@@ -25,8 +24,7 @@ const (
 )
 
 // ASPath is a BGP AS path as the feed writes it: an array of AS numbers in
-// which an AS set is an array of its members, such as [1, 2, [3, 4]]. A path
+// which an AS set is an array of its members, such as [1, 2, [3, 4]].
-// that holds AS 0 decodes as an empty one (UnmarshalJSON).
 type ASPath struct {
 	// Sequence is the path's AS numbers in order. A set of one member that
 	// ends the path counts as that AS and is its last element. The members of
@@ -39,56 +37,34 @@ type ASPath struct {
 	Set []int
 }
 
-// NoOrigin is the origin AS of a route whose origin is not known. AS 0 is
-// reserved, so no AS has this number.
-const NoOrigin = 0
-
 // Origin returns the AS that originated the route: the last AS of the
-// sequence, or NoOrigin when the path ends in a set of several members or is
+// sequence, or 0 (none) when the path ends in a set of several members or is
 // empty.
 func (p *ASPath) Origin() int {
 	if len(p.Set) > 0 || len(p.Sequence) == 0 {
-		return NoOrigin
+		return 0
 	}
 
 	return p.Sequence[len(p.Sequence)-1]
 }
 
-// UnmarshalJSON implements the json.Unmarshaler interface for ASPath. A path
+// UnmarshalJSON implements the json.Unmarshaler interface for ASPath.
-// that holds AS 0 anywhere, a member of an AS set included, decodes as an empty
-// path: RFC 7607 makes such a path malformed and its announcements
-// withdrawals. On an announcement with an empty path the prefix handler
-// deletes the peer's route, and the AS and peering handlers record nothing.
 func (p *ASPath) UnmarshalJSON(data []byte) error {
-	path, err := decodeASPath(data)
-	if err != nil {
-		return err
-	}
-
-	if slices.Contains(path.Sequence, 0) || slices.Contains(path.Set, 0) {
-		path = ASPath{}
-	}
-
-	*p = path
-
-	return nil
-}
-
-// decodeASPath decodes an AS path as the feed writes it.
-func decodeASPath(data []byte) (ASPath, error) {
 	// Most paths have no AS set and decode as a plain array of integers.
 	var sequence []int
 
 	err := json.Unmarshal(data, &sequence)
 	if err == nil {
-		return ASPath{Sequence: sequence}, nil
+		*p = ASPath{Sequence: sequence}
+
+		return nil
 	}
 
 	var raw []any
 
 	err = json.Unmarshal(data, &raw)
 	if err != nil {
-		return ASPath{}, err
+		return err
 	}
 
 	path := ASPath{Sequence: make([]int, 0, len(raw))}
@@ -114,7 +90,9 @@ func decodeASPath(data []byte) (ASPath, error) {
 		}
 	}
 
-	return path, nil
+	*p = path
+
+	return nil
 }
 
 // RISLiveMessage represents the outer wrapper message from the RIPE RIS Live stream.

internal/ristypes/ris_test.go

@@ -145,33 +145,3 @@ func TestASPathKeepsATrailingSetApart(t *testing.T) {
 		})
 	}
 }
-
-// TestASPathWithASZeroDecodesAsAnEmptyPath decodes AS paths that hold AS 0
-// before their end, at their end, or in an AS set. RFC 7607 makes such a path
-// malformed, so each decodes as an empty path.
-func TestASPathWithASZeroDecodesAsAnEmptyPath(t *testing.T) {
-	t.Parallel()
-
-	for _, path := range []string{
-		"[64496, 0, 64497]",
-		"[64496, 0]",
-		"[64496, [0, 64497], 64498]",
-		"[64496, [64497, 0]]",
-	} {
-		t.Run(path, func(t *testing.T) {
-			t.Parallel()
-
-			var got ristypes.ASPath
-
-			err := json.Unmarshal([]byte(path), &got)
-			if err != nil {
-				t.Fatalf("unmarshal %s: %v", path, err)
-			}
-
-			if len(got.Sequence) > 0 || len(got.Set) > 0 {
-				t.Errorf("%s decoded to sequence %v and set %v, want an empty path",
-					path, got.Sequence, got.Set)
-			}
-		})
-	}
-}

internal/routewatch/app.go

@@ -116,18 +116,17 @@ func (rw *RouteWatch) Run(ctx context.Context) error {
 		return err
 	}
 
-	// Start ASN WHOIS fetcher for background updates. The HTTP handlers read
-	// the server's fetcher without a lock, so it is set before they run.
-	rw.asnFetcher = NewASNFetcher(rw.db, rw.logger.Logger)
-	rw.asnFetcher.Start(ctx)
-	rw.server.SetASNFetcher(rw.asnFetcher)
-
 	// Start HTTP server
 	err = rw.server.Start(ctx)
 	if err != nil {
 		return err
 	}
 
+	// Start ASN WHOIS fetcher for background updates
+	rw.asnFetcher = NewASNFetcher(rw.db, rw.logger.Logger)
+	rw.asnFetcher.Start(ctx)
+	rw.server.SetASNFetcher(rw.asnFetcher)
+
 	// Start database maintenance goroutine
 	rw.dbMaintainer = NewDBMaintainer(rw.db, rw.logger.Logger)
 	rw.dbMaintainer.Start(ctx)

internal/routewatch/app_integration_internal_test.go

@@ -152,7 +152,7 @@ func (m *mockStore) RecordAnnouncement(_ *database.Announcement) error {
 }
 
 // RecordPeering mock implementation
-func (m *mockStore) RecordPeering(asA, asB int, _ database.SeenTimes) error {
+func (m *mockStore) RecordPeering(asA, asB int, _ time.Time) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
@@ -396,16 +396,16 @@ func (m *mockStore) DeleteLiveRoutesOfPeer(_ string) (int, error) {
 }
 
 // GetOrCreateASNBatch mock implementation
-func (m *mockStore) GetOrCreateASNBatch(asns map[int]database.SeenTimes) error {
+func (m *mockStore) GetOrCreateASNBatch(asns map[int]time.Time) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
-	for number, seen := range asns {
+	for number, timestamp := range asns {
 		if _, exists := m.ASNs[number]; !exists {
 			m.ASNs[number] = &database.ASN{
 				ASN:       number,
-				FirstSeen: seen.First,
+				FirstSeen: timestamp,
-				LastSeen:  seen.Last,
+				LastSeen:  timestamp,
 			}
 			m.ASNCount++
 		}
@@ -766,9 +766,7 @@ const (
 	callClose      = "close"
 )
 
-func (s *closeOrderStore) GetOrCreateASNBatch(
+func (s *closeOrderStore) GetOrCreateASNBatch(asns map[int]time.Time) error {
-	asns map[int]database.SeenTimes,
-) error {
 	s.record(callWrite)
 
 	return s.Store.GetOrCreateASNBatch(asns)

internal/routewatch/ashandler.go

@@ -229,21 +229,19 @@ func (h *ASHandler) flushBatch() {
 		return
 	}
 
-	// The earliest and the latest time the batch saw each AS. The batch holds
+	// Process ASNs first (deduped)
-	// several updates for an AS, from many peers, so a new AS is stored first
+	asnMap := make(map[int]time.Time)
-	// seen at the earliest of them and last seen at the latest.
-	asns := make(map[int]database.SeenTimes)
 	for _, op := range batch {
-		seen := asns[op.number]
+		if existing, ok := asnMap[op.number]; !ok || op.timestamp.After(existing) {
-		seen.Add(op.timestamp)
+			asnMap[op.number] = op.timestamp
-		asns[op.number] = seen
+		}
 	}
 
 	// Process all ASNs in a single batch transaction
-	err := h.db.GetOrCreateASNBatch(asns)
+	err := h.db.GetOrCreateASNBatch(asnMap)
 	if err != nil {
 		h.logger.Error("Failed to process ASN batch",
-			"error", err, "count", len(asns))
+			"error", err, "count", len(asnMap))
 	}
 
 	h.mu.Lock()

internal/routewatch/ashandler_internal_test.go

@@ -1,68 +0,0 @@
-package routewatch
-
-import (
-	"maps"
-	"slices"
-	"testing"
-
-	"git.eeqj.de/sneak/routewatch/internal/logger"
-)
-
-// TestASHandlerStoresTheEarliestAndLatestTimesOfANewAS handles two updates
-// whose path carries an AS the database does not hold yet, the second 5
-// seconds after the first, in one batch into a real database. The AS is stored
-// first seen at the time of the first update and last seen at the time of the
-// second.
-func TestASHandlerStoresTheEarliestAndLatestTimesOfANewAS(t *testing.T) {
-	t.Parallel()
-
-	db := newTestDatabase(t)
-
-	// Built without NewASHandler's flush goroutine, so the test flushes itself.
-	h := &ASHandler{db: db, logger: logger.New()}
-
-	first := peerAnnouncement(testPeerIP, testV4Prefix)
-	second := peerAnnouncement(testPeerIP, testV4Prefix)
-	second.ParsedTimestamp = first.ParsedTimestamp.Add(secondUpdateAfter)
-
-	h.HandleMessage(first)
-	h.HandleMessage(second)
-	h.flushBatch()
-
-	asn, _, err := db.GetASDetails(testASNA)
-	if err != nil {
-		t.Fatalf("GetASDetails(%d): %v", testASNA, err)
-	}
-
-	if !asn.FirstSeen.Equal(first.ParsedTimestamp) {
-		t.Errorf("first_seen of AS%d = %s, want %s", testASNA,
-			asn.FirstSeen, first.ParsedTimestamp)
-	}
-
-	if !asn.LastSeen.Equal(second.ParsedTimestamp) {
-		t.Errorf("last_seen of AS%d = %s, want %s", testASNA,
-			asn.LastSeen, second.ParsedTimestamp)
-	}
-}
-
-// TestASHandlerRecordsNothingFromAPathWithASZero handles an update whose AS
-// path holds AS 0 between two other ASes. RFC 7607 makes such a path
-// malformed, so neither AS is recorded.
-func TestASHandlerRecordsNothingFromAPathWithASZero(t *testing.T) {
-	t.Parallel()
-
-	store := newMockStore()
-
-	// Built without NewASHandler's flush goroutine, so the test flushes itself.
-	h := &ASHandler{db: store, logger: logger.New()}
-
-	msg := peerAnnouncement(testPeerIP, testV4Prefix)
-	msg.Path = decodePath(t, testASNA, 0, testASNB)
-	h.HandleMessage(msg)
-	h.flushBatch()
-
-	if len(store.ASNs) > 0 {
-		t.Errorf("ASes recorded = %v, want none",
-			slices.Sorted(maps.Keys(store.ASNs)))
-	}
-}

internal/routewatch/asnfetcher.go

@@ -21,16 +21,10 @@ const (
 	minInterval = 1 * time.Second
 
 	// maxInterval is the maximum interval after failures (backoff cap).
-	maxInterval = time.Minute
+	maxInterval = 5 * time.Minute
 
-	// A failure multiplies the interval by backoffNumerator divided by
+	// backoffMultiplier is how much to multiply interval on failure.
-	// backoffDenominator, 1.5, up to maxInterval.
+	backoffMultiplier = 2
-	backoffNumerator   = 3
-	backoffDenominator = 2
-
-	// A success divides the interval by successDivisor, down to
-	// minInterval.
-	successDivisor = 2
 
 	// whoisStaleThreshold is how old WHOIS data can be before refresh.
 	whoisStaleThreshold = 30 * 24 * time.Hour // 30 days
@@ -59,8 +53,7 @@ type ASNFetcher struct {
 	currentInterval  time.Duration
 	consecutiveFails int
 
-	// hourly stats tracking; now is the clock, time.Now except in tests
+	// hourly stats tracking
-	now          func() time.Time
 	statsMu      sync.Mutex
 	successTimes []time.Time
 	errorTimes   []time.Time
@@ -76,7 +69,6 @@ func NewASNFetcher(db database.Store, logger *slog.Logger) *ASNFetcher {
 		stopCh:          make(chan struct{}),
 		done:            make(chan struct{}),
 		currentInterval: baseInterval,
-		now:             time.Now,
 		successTimes:    make([]time.Time, 0),
 		errorTimes:      make([]time.Time, 0),
 	}
@@ -129,7 +121,7 @@ func (f *ASNFetcher) GetStats() server.ASNFetcherStats {
 	f.intervalMu.Unlock()
 
 	// Prune old entries and count
-	cutoff := f.now().Add(-statsWindow)
+	cutoff := time.Now().Add(-statsWindow)
 	f.successTimes = pruneOldTimes(f.successTimes, cutoff)
 	f.errorTimes = pruneOldTimes(f.errorTimes, cutoff)
 
@@ -141,15 +133,16 @@ func (f *ASNFetcher) GetStats() server.ASNFetcherStats {
 	}
 }
 
-// pruneOldTimes drops the times at or before cutoff from the front of times,
+// pruneOldTimes removes times older than cutoff and returns the pruned slice.
-// which holds times in the order they were recorded, and returns the rest. It
-// copies nothing, so it is cheap enough to run on every append.
 func pruneOldTimes(times []time.Time, cutoff time.Time) []time.Time {
-	for len(times) > 0 && !times[0].After(cutoff) {
+	result := make([]time.Time, 0, len(times))
-		times = times[1:]
+	for _, t := range times {
+		if t.After(cutoff) {
+			result = append(result, t)
+		}
 	}
 
-	return times
+	return result
 }
 
 // getInterval returns the current fetch interval.
@@ -166,7 +159,7 @@ func (f *ASNFetcher) recordSuccess() {
 	f.consecutiveFails = 0
 
 	// Decrease interval by half, but not below minimum
-	newInterval := max(f.currentInterval/successDivisor, minInterval)
+	newInterval := max(f.currentInterval/backoffMultiplier, minInterval)
 
 	if newInterval != f.currentInterval {
 		f.logger.Debug("Decreased fetch interval",
@@ -177,11 +170,9 @@ func (f *ASNFetcher) recordSuccess() {
 	}
 	f.intervalMu.Unlock()
 
-	// Record success time for stats, dropping those older than statsWindow
+	// Record success time for stats
 	f.statsMu.Lock()
-	now := f.now()
+	f.successTimes = append(f.successTimes, time.Now())
-	f.successTimes = pruneOldTimes(f.successTimes, now.Add(-statsWindow))
-	f.successTimes = append(f.successTimes, now)
 	f.statsMu.Unlock()
 }
 
@@ -190,9 +181,8 @@ func (f *ASNFetcher) recordFailure() {
 	f.intervalMu.Lock()
 	f.consecutiveFails++
 
-	// Exponential backoff: multiply by 1.5, capped at max
+	// Exponential backoff: multiply by 2, capped at max
-	newInterval := min(
+	newInterval := min(f.currentInterval*backoffMultiplier, maxInterval)
-		f.currentInterval*backoffNumerator/backoffDenominator, maxInterval)
 
 	if newInterval != f.currentInterval {
 		f.logger.Debug("Increased fetch interval due to failure",
@@ -204,11 +194,9 @@ func (f *ASNFetcher) recordFailure() {
 	}
 	f.intervalMu.Unlock()
 
-	// Record error time for stats, dropping those older than statsWindow
+	// Record error time for stats
 	f.statsMu.Lock()
-	now := f.now()
+	f.errorTimes = append(f.errorTimes, time.Now())
-	f.errorTimes = pruneOldTimes(f.errorTimes, now.Add(-statsWindow))
-	f.errorTimes = append(f.errorTimes, now)
 	f.statsMu.Unlock()
 }
 

internal/routewatch/asnfetcher_internal_test.go

@@ -120,58 +120,17 @@ func TestFetchAndUpdateKeepsTheRowWhenTheLookupFails(t *testing.T) {
 					"was stored", stats.NeverFetched)
 			}
 
-			want := baseInterval * backoffNumerator / backoffDenominator
-
 			got := f.GetStats()
-			if got.CurrentInterval != want || got.ConsecutiveFails != 1 {
+			if got.CurrentInterval != baseInterval*backoffMultiplier ||
+				got.ConsecutiveFails != 1 {
 				t.Errorf("interval %v after %d failures, want %v after 1",
-					got.CurrentInterval, got.ConsecutiveFails, want)
+					got.CurrentInterval, got.ConsecutiveFails,
+					baseInterval*backoffMultiplier)
 			}
 		})
 	}
 }
 
-// TestRecordStepsTheInterval has the fetcher fail from its base interval of
-// 15 seconds, then succeed. Each failure makes the interval 1.5 times as
-// long, up to one minute, and each success halves it, down to one second.
-func TestRecordStepsTheInterval(t *testing.T) {
-	t.Parallel()
-
-	f := NewASNFetcher(newMockStore(), logger.New().Logger)
-
-	for i, want := range []time.Duration{
-		22500 * time.Millisecond,
-		33750 * time.Millisecond,
-		50625 * time.Millisecond,
-		time.Minute,
-		time.Minute,
-	} {
-		f.recordFailure()
-
-		if got := f.getInterval(); got != want {
-			t.Errorf("interval after %d failures = %v, want %v",
-				i+1, got, want)
-		}
-	}
-
-	for i, want := range []time.Duration{
-		30 * time.Second,
-		15 * time.Second,
-		7500 * time.Millisecond,
-		3750 * time.Millisecond,
-		1875 * time.Millisecond,
-		time.Second,
-		time.Second,
-	} {
-		f.recordSuccess()
-
-		if got := f.getInterval(); got != want {
-			t.Errorf("interval after %d successes = %v, want %v",
-				i+1, got, want)
-		}
-	}
-}
-
 // TestFetchAndUpdateMarksAnASWithoutReferral looks up a private-use AS, which
 // IANA refers to no RIR. The AS must not be looked up again until it is
 // stale, and the lookup counts as neither a success nor a failure.
@@ -244,35 +203,3 @@ func TestASNFetcherStopReturnsByItsDeadline(t *testing.T) {
 		t.Fatal("the fetcher goroutine did not return after the lookup ended")
 	}
 }
-
-// TestRecordKeepsOnlyTheStatsWindow records a success and a failure every
-// second, by a clock the test sets, far longer than statsWindow, and never
-// asks for the stats. The fetcher must keep only the times within the last
-// statsWindow.
-func TestRecordKeepsOnlyTheStatsWindow(t *testing.T) {
-	t.Parallel()
-
-	const (
-		records = 100_000
-		step    = time.Second
-		want    = int(statsWindow / step)
-	)
-
-	clock := time.Now()
-
-	f := NewASNFetcher(newMockStore(), logger.New().Logger)
-	f.now = func() time.Time { return clock }
-
-	for range records {
-		clock = clock.Add(step)
-
-		f.recordSuccess()
-		f.recordFailure()
-	}
-
-	if len(f.successTimes) != want || len(f.errorTimes) != want {
-		t.Errorf("%d success and %d error times kept, want %d of each, "+
-			"those of the last %s", len(f.successTimes), len(f.errorTimes),
-			want, statsWindow)
-	}
-}

internal/routewatch/batchwrite_internal_test.go

@@ -66,7 +66,7 @@ func (s *blockingStore) UpsertLiveRouteBatch(routes []*database.LiveRoute) error
 	return nil
 }
 
-func (s *blockingStore) GetOrCreateASNBatch(asns map[int]database.SeenTimes) error {
+func (s *blockingStore) GetOrCreateASNBatch(asns map[int]time.Time) error {
 	s.waitForRelease()
 	s.mu.Lock()
 	defer s.mu.Unlock()
@@ -96,12 +96,10 @@ func (s *blockingStore) DeleteLiveRoutesOfPeer(peerIP string) (int, error) {
 	return s.mockStore.DeleteLiveRoutesOfPeer(peerIP)
 }
 
-func (s *blockingStore) RecordPeering(
+func (s *blockingStore) RecordPeering(asA, asB int, ts time.Time) error {
-	asA, asB int, seen database.SeenTimes,
-) error {
 	s.waitForRelease()
 
-	return s.mockStore.RecordPeering(asA, asB, seen)
+	return s.mockStore.RecordPeering(asA, asB, ts)
 }
 
 func (s *blockingStore) waitForRelease() {

internal/routewatch/peerhandler.go

@@ -37,8 +37,8 @@ const (
 
 // PeerHandler tracks BGP peers from UPDATE messages using batched operations.
 // It maintains a queue of peer updates and periodically flushes them to the database
-// in batches to improve performance. The handler writes one row per peer IP
+// in batches to improve performance. The handler deduplicates peer updates within
-// address for each batch, with the earliest and the latest time of its updates.
+// each batch, keeping only the most recent update for each peer IP address.
 type PeerHandler struct {
 	db     database.Store
 	logger *logger.Logger
@@ -227,28 +227,31 @@ func (h *PeerHandler) flushBatch() {
 		return
 	}
 
-	// The earliest and the latest time the batch saw each peer, with the peer
+	// Deduplicate by peer IP, keeping the latest update for each peer
-	// AS and message type of its latest update. The batch holds several
+	peerMap := make(map[string]peerUpdate)
-	// updates for a peer, so a new peer is stored first seen at the earliest of
-	// them and last seen at the latest.
-	peers := make(map[string]database.PeerUpdate)
 	for _, update := range batch {
-		peer, ok := peers[update.peerIP]
+		existing, ok := peerMap[update.peerIP]
-		if !ok || update.timestamp.After(peer.Seen.Last) {
+		if !ok || update.timestamp.After(existing.timestamp) {
-			peer.PeerIP = update.peerIP
+			peerMap[update.peerIP] = update
-			peer.PeerASN = update.peerASN
+		}
-			peer.MessageType = update.messageType
 	}
 
-		peer.Seen.Add(update.timestamp)
+	// Convert to database format
-		peers[update.peerIP] = peer
+	dbPeerMap := make(map[string]database.PeerUpdate)
+	for peerIP, update := range peerMap {
+		dbPeerMap[peerIP] = database.PeerUpdate{
+			PeerIP:      update.peerIP,
+			PeerASN:     update.peerASN,
+			MessageType: update.messageType,
+			Timestamp:   update.timestamp,
+		}
 	}
 
 	// Process all peers in a single batch transaction
-	err := h.db.UpdatePeerBatch(peers)
+	err := h.db.UpdatePeerBatch(dbPeerMap)
 	if err != nil {
 		h.logger.Error("Failed to process peer batch",
-			"error", err, "count", len(peers))
+			"error", err, "count", len(dbPeerMap))
 	}
 
 	h.mu.Lock()

internal/routewatch/peerhandler_internal_test.go

@@ -1,59 +0,0 @@
-package routewatch
-
-import (
-	"testing"
-
-	"git.eeqj.de/sneak/routewatch/internal/database"
-	"git.eeqj.de/sneak/routewatch/internal/logger"
-)
-
-// peerBatchStore keeps the peers of the last UpdatePeerBatch call. The
-// database has no read of the peer table, so the peer handler's test checks
-// what the handler writes.
-type peerBatchStore struct {
-	*mockStore
-
-	peers map[string]database.PeerUpdate
-}
-
-func (s *peerBatchStore) UpdatePeerBatch(
-	peers map[string]database.PeerUpdate,
-) error {
-	s.peers = peers
-
-	return nil
-}
-
-// TestPeerHandlerWritesTheEarliestAndLatestTimesOfANewPeer handles two updates
-// from one peer, the second 5 seconds after the first, in one batch. The peer
-// handler writes the peer first seen at the time of the first update and last
-// seen at the time of the second.
-func TestPeerHandlerWritesTheEarliestAndLatestTimesOfANewPeer(t *testing.T) {
-	t.Parallel()
-
-	store := &peerBatchStore{mockStore: newMockStore()}
-
-	// Built without NewPeerHandler's flush goroutine, so the test flushes
-	// itself.
-	h := &PeerHandler{db: store, logger: logger.New()}
-
-	first := peerAnnouncement(testPeerIP, testV4Prefix)
-	second := peerAnnouncement(testPeerIP, testV4Prefix)
-	second.ParsedTimestamp = first.ParsedTimestamp.Add(secondUpdateAfter)
-
-	h.HandleMessage(first)
-	h.HandleMessage(second)
-	h.flushBatch()
-
-	seen := store.peers[testPeerIP].Seen
-
-	if !seen.First.Equal(first.ParsedTimestamp) {
-		t.Errorf("first_seen of peer %s = %s, want %s", testPeerIP,
-			seen.First, first.ParsedTimestamp)
-	}
-
-	if !seen.Last.Equal(second.ParsedTimestamp) {
-		t.Errorf("last_seen of peer %s = %s, want %s", testPeerIP,
-			seen.Last, second.ParsedTimestamp)
-	}
-}

internal/routewatch/peeringhandler.go

@@ -42,11 +42,10 @@ type PeeringHandler struct {
 	db     database.Store
 	logger *logger.Logger
 
-	// In-memory AS path tracking: each path, JSON-encoded, with the earliest
+	// In-memory AS path tracking
-	// and the latest time an update carried it.
 	mu           sync.Mutex
-	asPaths      map[string]database.SeenTimes
+	asPaths      map[string]time.Time // key is JSON-encoded AS path
-	droppedPaths int // paths dropped since the last run because the map was full
+	droppedPaths int                  // paths dropped because the map was full
 	// writing is how many paths processPeerings took from asPaths and has
 	// not finished writing the peerings of.
 	writing int
@@ -65,7 +64,7 @@ func NewPeeringHandler(db database.Store, logger *logger.Logger) *PeeringHandler
 	h := &PeeringHandler{
 		db:      db,
 		logger:  logger,
-		asPaths: make(map[string]database.SeenTimes),
+		asPaths: make(map[string]time.Time),
 		stopCh:  make(chan context.Context, 1),
 		done:    make(chan struct{}),
 	}
@@ -119,18 +118,16 @@ func (h *PeeringHandler) HandleMessage(msg *ristypes.RISMessage) {
 	key := string(pathJSON)
 
 	h.mu.Lock()
-	defer h.mu.Unlock()
+	if _, exists := h.asPaths[key]; exists {
-
+		// Already tracked: refresh its timestamp.
-	seen, exists := h.asPaths[key]
+		h.asPaths[key] = timestamp
-	if !exists && len(h.asPaths) >= maxTrackedPaths {
+	} else if len(h.asPaths) >= maxTrackedPaths {
 		// Map is full; drop this new path and count it.
 		h.droppedPaths++
-
+	} else {
-		return
+		h.asPaths[key] = timestamp
 	}
-
+	h.mu.Unlock()
-	seen.Add(timestamp)
-	h.asPaths[key] = seen
 }
 
 // ProcessPeeringsNow triggers immediate processing of all accumulated AS
@@ -190,14 +187,12 @@ func (h *PeeringHandler) processLoop() {
 func (h *PeeringHandler) processPeerings() {
 	// Take the accumulated paths and replace the map with a fresh empty one
 	// under the lock. Each path is processed exactly once and the memory is
-	// released, so the map never grows past a single interval's traffic. The
+	// released, so the map never grows past a single interval's traffic.
-	// count of dropped paths starts again with the new map.
 	h.mu.Lock()
 	paths := h.asPaths
-	h.asPaths = make(map[string]database.SeenTimes)
+	h.asPaths = make(map[string]time.Time)
 	h.writing = len(paths)
 	dropped := h.droppedPaths
-	h.droppedPaths = 0
 	h.mu.Unlock()
 
 	if len(paths) == 0 {
@@ -209,13 +204,9 @@ func (h *PeeringHandler) processPeerings() {
 		low, high int
 	}
 
-	// The earliest and the latest time an update carried each peering. Several
+	peerings := make(map[peeringKey]time.Time)
-	// paths, each carried at several times, can hold a peering, so a new
-	// peering is stored first seen at the earliest of them and last seen at the
-	// latest.
-	peerings := make(map[peeringKey]database.SeenTimes)
 
-	for pathJSON, pathSeen := range paths {
+	for pathJSON, timestamp := range paths {
 		var path []int
 
 		err := json.Unmarshal([]byte(pathJSON), &path)
@@ -242,11 +233,10 @@ func (h *PeeringHandler) processPeerings() {
 			}
 
 			key := peeringKey{low: low, high: high}
-
+			// Update timestamp if this is newer
-			seen := peerings[key]
+			if existing, ok := peerings[key]; !ok || timestamp.After(existing) {
-			seen.Add(pathSeen.First)
+				peerings[key] = timestamp
-			seen.Add(pathSeen.Last)
+			}
-			peerings[key] = seen
 		}
 	}
 
@@ -254,8 +244,8 @@ func (h *PeeringHandler) processPeerings() {
 	start := time.Now()
 	successCount := 0
 
-	for key, seen := range peerings {
+	for key, ts := range peerings {
-		err := h.db.RecordPeering(key.low, key.high, seen)
+		err := h.db.RecordPeering(key.low, key.high, ts)
 		if err != nil {
 			h.logger.Error("Failed to record peering",
 				"as_a", key.low,

internal/routewatch/peeringhandler_internal_test.go

@@ -31,14 +31,12 @@ type recordingStore struct {
 	calls int
 }
 
-func (r *recordingStore) RecordPeering(
+func (r *recordingStore) RecordPeering(asA, asB int, ts time.Time) error {
-	asA, asB int, seen database.SeenTimes,
-) error {
 	r.mu.Lock()
 	r.calls++
 	r.mu.Unlock()
 
-	return r.mockStore.RecordPeering(asA, asB, seen)
+	return r.mockStore.RecordPeering(asA, asB, ts)
 }
 
 func (r *recordingStore) callCount() int {
@@ -54,7 +52,7 @@ func newTestHandler(db database.Store) *PeeringHandler {
 	return &PeeringHandler{
 		db:      db,
 		logger:  logger.New(),
-		asPaths: make(map[string]database.SeenTimes),
+		asPaths: make(map[string]time.Time),
 	}
 }
 
@@ -153,43 +151,6 @@ func TestPeeringHandlerLeavesATrailingASSetOutOfThePeerings(t *testing.T) {
 	}
 }
 
-// TestPeeringHandlerRecordsNothingFromAPathWithASZero handles AS paths that
-// hold AS 0. RFC 7607 makes such a path malformed, so no peering is recorded
-// from it, not even one between two other ASes of the path.
-func TestPeeringHandlerRecordsNothingFromAPathWithASZero(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		name string
-		path []any
-	}{
-		{name: "AS 0 between two ASes", path: []any{testASNA, 0, testASNB}},
-		{
-			name: "AS 0 after two ASes",
-			path: []any{testASNA, testASNB, 0, testASNC},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			store := newMockStore()
-			h := newTestHandler(store)
-			h.HandleMessage(&ristypes.RISMessage{
-				Path:            decodePath(t, tt.path...),
-				ParsedTimestamp: time.Now().UTC(),
-			})
-			h.ProcessPeeringsNow()
-
-			if len(store.Peerings) > 0 {
-				t.Errorf("peerings recorded = %v, want none",
-					slices.Sorted(maps.Keys(store.Peerings)))
-			}
-		})
-	}
-}
-
 // TestPeeringHandlerProcessesEachRunAndEmpties verifies that a processing run
 // empties the path map (the swap) and that a path seen again after a run is
 // recorded in the next run too.
@@ -259,10 +220,10 @@ func TestPeeringHandlerCapDropsAndCounts(t *testing.T) {
 	existing := pathKey(t, testASNA, testASNB)
 
 	h.mu.Lock()
-	h.asPaths[existing] = database.SeenTimes{First: now, Last: now}
+	h.asPaths[existing] = now
 
 	for i := 0; len(h.asPaths) < maxTrackedPaths; i++ {
-		h.asPaths[strconv.Itoa(i)] = database.SeenTimes{First: now, Last: now}
+		h.asPaths[strconv.Itoa(i)] = now
 	}
 	h.mu.Unlock()
 
@@ -292,83 +253,11 @@ func TestPeeringHandlerCapDropsAndCounts(t *testing.T) {
 	}
 
 	h.mu.Lock()
-	gotSeen := h.asPaths[existing]
+	gotTS := h.asPaths[existing]
 	h.mu.Unlock()
 
-	if !gotSeen.Last.Equal(refreshed) {
+	if !gotTS.Equal(refreshed) {
-		t.Fatalf("existing path last seen not refreshed: want %v, got %v",
+		t.Fatalf("existing path timestamp not refreshed: want %v, got %v",
-			refreshed, gotSeen.Last)
+			refreshed, gotTS)
-	}
-}
-
-// TestPeeringHandlerRunResetsTheDroppedCount fills the map, has the handler
-// drop one path, and runs the processing. The count of dropped paths is the
-// run's own, so it is 0 again after the run.
-func TestPeeringHandlerRunResetsTheDroppedCount(t *testing.T) {
-	t.Parallel()
-
-	h := newTestHandler(newMockStore())
-
-	now := time.Now().UTC()
-
-	// Paths of one AS carry no peering, so the run records nothing.
-	h.mu.Lock()
-	for asn := 1; len(h.asPaths) < maxTrackedPaths; asn++ {
-		h.asPaths[pathKey(t, asn)] = database.SeenTimes{First: now, Last: now}
-	}
-	h.mu.Unlock()
-
-	handle(h, now, testASNA, testASNB)
-
-	if _, dropped := snapshot(h); dropped != 1 {
-		t.Fatalf("want dropped count 1 with the map full, got %d", dropped)
-	}
-
-	h.ProcessPeeringsNow()
-
-	if _, dropped := snapshot(h); dropped != 0 {
-		t.Errorf("want dropped count 0 after a run, got %d", dropped)
-	}
-}
-
-// TestPeeringHandlerStoresTheEarliestAndLatestTimesOfANewPeering handles two
-// updates whose path carries a peering the database does not hold yet, the
-// second 5 seconds after the first, in one run into a real database. The
-// peering is stored first seen at the time of the first update and last seen
-// at the time of the second.
-func TestPeeringHandlerStoresTheEarliestAndLatestTimesOfANewPeering(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	db := newTestDatabase(t)
-	h := newTestHandler(db)
-
-	first := peerAnnouncement(testPeerIP, testV4Prefix)
-	second := peerAnnouncement(testPeerIP, testV4Prefix)
-	second.ParsedTimestamp = first.ParsedTimestamp.Add(secondUpdateAfter)
-
-	h.HandleMessage(first)
-	h.HandleMessage(second)
-	h.ProcessPeeringsNow()
-
-	peers, err := db.GetASPeers(testASNA)
-	if err != nil {
-		t.Fatalf("GetASPeers(%d): %v", testASNA, err)
-	}
-
-	if len(peers) != 1 || peers[0].ASN != testASNB {
-		t.Fatalf("peers of AS%d = %+v, want AS%d alone", testASNA, peers,
-			testASNB)
-	}
-
-	if !peers[0].FirstSeen.Equal(first.ParsedTimestamp) {
-		t.Errorf("first_seen of peering AS%d-AS%d = %s, want %s", testASNA,
-			testASNB, peers[0].FirstSeen, first.ParsedTimestamp)
-	}
-
-	if !peers[0].LastSeen.Equal(second.ParsedTimestamp) {
-		t.Errorf("last_seen of peering AS%d-AS%d = %s, want %s", testASNA,
-			testASNB, peers[0].LastSeen, second.ParsedTimestamp)
 	}
 }

internal/routewatch/prefixhandler.go

@@ -44,9 +44,8 @@ const (
 )
 
 // PrefixHandler tracks BGP prefixes and maintains a live routing table in the
-// database. Routes are added on announcement and deleted on withdrawal or on an
+// database. Routes are added on announcement and deleted on withdrawal, and all
-// announcement whose AS path is empty or holds AS 0 anywhere, and all routes of
+// routes of a peer are deleted when its BGP session goes down.
-// a peer are deleted when its BGP session goes down.
 type PrefixHandler struct {
 	db      database.Store
 	logger  *logger.Logger
@@ -348,19 +347,8 @@ func (h *PrefixHandler) flushBatch() {
 
 	lastUpdates := make(map[prefixAndPeer]prefixUpdate)
 
-	// Each prefix the batch names, announced or withdrawn, with the earliest
-	// timestamp among all of its updates, not only each peer's last one: the
-	// prefix tables store only first_seen, written when the prefix is new and
-	// never changed after.
-	prefixesToUpdate := make(map[string]time.Time)
-
 	for _, update := range batch {
 		lastUpdates[prefixAndPeer{update.prefix, update.peer}] = update
-
-		seen, exists := prefixesToUpdate[update.prefix]
-		if !exists || update.timestamp.Before(seen) {
-			prefixesToUpdate[update.prefix] = update.timestamp
-		}
 	}
 
 	// Collect routes to upsert and delete
@@ -369,14 +357,19 @@ func (h *PrefixHandler) flushBatch() {
 		routesToDelete []database.LiveRouteDeletion
 	)
 
+	// Collect unique prefixes to update
+	prefixesToUpdate := make(map[string]time.Time)
+
 	for _, update := range lastUpdates {
+		// Track prefix for both announcements and withdrawals
+		seen, exists := prefixesToUpdate[update.prefix]
+		if !exists || update.timestamp.After(seen) {
+			prefixesToUpdate[update.prefix] = update.timestamp
+		}
+
 		// An announcement is stored when its path gives an origin, or when it
 		// ends in an AS set of several members: that route is stored with
-		// origin 0 (none). Any other update deletes the peer's route for the
+		// origin 0 (none). An announcement with an empty path is not stored.
-		// prefix: a withdrawal, or an announcement whose path is empty or
-		// holds AS 0 anywhere (the decoder empties such a path). Such an
-		// announcement replaces the peer's route, as any announcement does,
-		// with none (RFC 7607 treats AS 0 in a path as a withdrawal).
 		if update.messageType == "announcement" &&
 			(update.originASN > 0 || update.endsInSet) {
 			// Create live route for batch upsert
@@ -384,11 +377,11 @@ func (h *PrefixHandler) flushBatch() {
 			if route != nil {
 				routesToUpsert = append(routesToUpsert, route)
 			}
-		} else {
+		} else if update.messageType == "withdrawal" {
 			// Parse CIDR to get IP version
 			_, ipVersion, err := parseCIDR(update.prefix)
 			if err != nil {
-				h.logger.Error("Failed to parse CIDR for route deletion",
+				h.logger.Error("Failed to parse CIDR for withdrawal",
 					"prefix", update.prefix, "error", err)
 
 				continue

internal/routewatch/prefixhandler_internal_test.go

@@ -26,10 +26,6 @@ const (
 	testV6Prefix = "2001:db8:1::/48"
 )
 
-// secondUpdateAfter is how long after the first update the tests of first_seen
-// and last_seen send the second, in the same batch.
-const secondUpdateAfter = 5 * time.Second
-
 // TestPrefixHandlerStoresPrefixesTheIPLookupFinds runs announcements and
 // withdrawals through the prefix handler into a real database and looks the
 // addresses up. The prefixes are written the way the feed sends them: IPv6
@@ -87,49 +83,6 @@ func TestPrefixHandlerStoresPrefixesTheIPLookupFinds(t *testing.T) {
 	}
 }
 
-// TestPrefixHandlerStoresANewPrefixFirstSeenAtItsEarliestUpdate announces a
-// prefix the database does not hold yet twice in one batch, the second time 5
-// seconds after the first, through the prefix handler into a real database. The
-// prefix is stored first seen at the time of the first announcement, whether
-// the two come from two peers or from one, and the IP lookup answers with that
-// time.
-func TestPrefixHandlerStoresANewPrefixFirstSeenAtItsEarliestUpdate(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	const otherPeerIP = "2001:db8:ffff::2"
-
-	tests := []struct {
-		name                  string
-		firstPeer, secondPeer string
-	}{
-		{name: "two peers", firstPeer: testPeerIP, secondPeer: otherPeerIP},
-		{name: "one peer", firstPeer: testPeerIP, secondPeer: testPeerIP},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			first := peerAnnouncement(tt.firstPeer, testV4Prefix)
-			second := peerAnnouncement(tt.secondPeer, testV4Prefix)
-			second.ParsedTimestamp = first.ParsedTimestamp.Add(secondUpdateAfter)
-			db := handleBatches(t, [][]*ristypes.RISMessage{{first, second}})
-
-			info, err := db.GetIPInfo("192.0.2.1")
-			if err != nil {
-				t.Fatalf("GetIPInfo(192.0.2.1): %v", err)
-			}
-
-			if !info.FirstSeen.Equal(first.ParsedTimestamp) {
-				t.Errorf("first_seen of %s = %s, want %s", testV4Prefix,
-					info.FirstSeen, first.ParsedTimestamp)
-			}
-		})
-	}
-}
-
 // TestPrefixHandlerAppliesEachPeersLastUpdateInABatch runs updates for one
 // prefix through the prefix handler into a real database. All updates carry the
 // same timestamp, as updates within one second of the feed do. Within a batch,
@@ -378,133 +331,6 @@ func TestPrefixHandlerDoesNotStoreAnAnnouncementWithAnEmptyPath(t *testing.T) {
 	assertPeers(t, db, map[string][]string{testV4Prefix: nil})
 }
 
-// TestPrefixHandlerRemovesTheRouteOnAnAnnouncementWithoutAnOrigin runs, through
-// the prefix handler into a real database, a peer's announcement of a prefix
-// with origin AS testASNB and then the peer's announcement of the prefix with
-// an AS path that gives no origin: one whose last AS is 0, an empty one, or one
-// that holds AS 0 before its end, which decodes as an empty path. As any later
-// announcement from the peer does, the second replaces the peer's route, here
-// with none, whether it comes in a later batch or follows a withdrawal in one
-// batch. The in-memory route count and prefix distribution must match the
-// route table.
-func TestPrefixHandlerRemovesTheRouteOnAnAnnouncementWithoutAnOrigin(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	const prefixMaskLength = 24
-
-	noOrigin := func(path ristypes.ASPath) *ristypes.RISMessage {
-		msg := peerAnnouncement(testPeerIP, testV4Prefix)
-		msg.Path = path
-
-		return msg
-	}
-	endsInZero := ristypes.ASPath{Sequence: []int{testASNA, 0}}
-	withdrawal := &ristypes.RISMessage{
-		Type:            ristypes.MessageTypeUpdate,
-		Peer:            testPeerIP,
-		ParsedTimestamp: time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC),
-		Withdrawals:     []string{testV4Prefix},
-	}
-
-	tests := []struct {
-		name string
-		// Handled and flushed as one batch after the announcement with origin
-		// AS testASNB.
-		batch []*ristypes.RISMessage
-	}{
-		{
-			name:  "a path whose last AS is 0",
-			batch: []*ristypes.RISMessage{noOrigin(endsInZero)},
-		},
-		{
-			name:  "an empty path",
-			batch: []*ristypes.RISMessage{noOrigin(ristypes.ASPath{})},
-		},
-		{
-			name: "a path with AS 0 before its end",
-			batch: []*ristypes.RISMessage{
-				noOrigin(decodePath(t, testASNA, 0, testASNB)),
-			},
-		},
-		{
-			name:  "a withdrawal and then a path whose last AS is 0",
-			batch: []*ristypes.RISMessage{withdrawal, noOrigin(endsInZero)},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			db := handleBatches(t, [][]*ristypes.RISMessage{
-				{peerAnnouncement(testPeerIP, testV4Prefix)},
-				tt.batch,
-			})
-			checkLivePeers(t, db, testV4Prefix, prefixMaskLength, nil)
-		})
-	}
-}
-
-// TestPrefixHandlerDoesNotStoreAPrefixThatDoesNotParse runs an announcement of
-// "not-a-prefix" and a withdrawal of "also/bad" through the prefix handler into
-// a real database. Neither is stored in the prefix tables: the prefix count in
-// the stats stays 0, both as kept in memory and as counted from the tables when
-// the database is opened again.
-func TestPrefixHandlerDoesNotStoreAPrefixThatDoesNotParse(t *testing.T) {
-	t.Parallel()
-
-	cfg := &config.Config{StateDir: t.TempDir()}
-
-	db, err := database.New(cfg, logger.New())
-	if err != nil {
-		t.Fatalf("failed to create database: %v", err)
-	}
-
-	// Built without NewPrefixHandler's flush timer, so the test flushes itself.
-	h := &PrefixHandler{db: db, logger: logger.New()}
-
-	withdrawal := &ristypes.RISMessage{
-		Type:            ristypes.MessageTypeUpdate,
-		Peer:            testPeerIP,
-		ParsedTimestamp: time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC),
-		Withdrawals:     []string{"also/bad"},
-	}
-	h.HandleMessage(peerAnnouncement(testPeerIP, "not-a-prefix"))
-	h.HandleMessage(withdrawal)
-	h.flushBatch()
-
-	checkNoPrefixes := func(when string) {
-		t.Helper()
-
-		stats, err := db.GetStatsContext(context.Background())
-		if err != nil {
-			t.Fatalf("GetStatsContext %s: %v", when, err)
-		}
-
-		if stats.Prefixes != 0 {
-			t.Errorf("prefix count %s = %d, want 0", when, stats.Prefixes)
-		}
-	}
-
-	checkNoPrefixes("after the flush")
-
-	err = db.Close()
-	if err != nil {
-		t.Fatalf("Close: %v", err)
-	}
-
-	db, err = database.New(cfg, logger.New())
-	if err != nil {
-		t.Fatalf("failed to open the database again: %v", err)
-	}
-
-	t.Cleanup(func() { _ = db.Close() })
-
-	checkNoPrefixes("after opening the database again")
-}
-
 // TestStateMessagesGoToThePrefixHandlerNotThePeerHandler checks that STATE
 // messages go to the prefix handler, which acts on a down, and not to the peer
 // handler, which would record a peer whose session never comes up as active.

internal/server/handlers.go

@@ -16,7 +16,6 @@ import (
 
 	"git.eeqj.de/sneak/routewatch/internal/database"
 	"git.eeqj.de/sneak/routewatch/internal/metrics"
-	"git.eeqj.de/sneak/routewatch/internal/ristypes"
 	"git.eeqj.de/sneak/routewatch/internal/streamer"
 	"git.eeqj.de/sneak/routewatch/internal/templates"
 	asinfo "git.eeqj.de/sneak/routewatch/pkg/asinfo"
@@ -61,14 +60,6 @@ const (
 	hostNotResolvedMessage = "could not resolve host name"
 	hostNotPublicMessage   = "host name has no public address"
 	tooManyTargetsMessage  = "Too many addresses or host names"
-	searchQueryMissingMessage = "Missing search query"
-)
-
-// The AS name search reads the text it looks for from the URL query parameter
-// asSearchQueryParam, and answers with at most maxASSearchResults matches.
-const (
-	asSearchQueryParam = "q"
-	maxASSearchResults = 50
 )
 
 // IP versions as database.LiveRoute.IPVersion records them.
@@ -443,7 +434,7 @@ type GCStats struct {
 type StreamStats struct {
 	Announcements    uint64  `json:"announcements"`
 	Withdrawals      uint64  `json:"withdrawals"`
-	RouteChurnPerMin int    `json:"route_churn_per_min"`
+	RouteChurnPerSec float64 `json:"route_churn_per_sec"`
 	BGPPeerCount     int     `json:"bgp_peer_count"`
 }
 
@@ -545,7 +536,7 @@ func (s *Server) streamStats() StreamStats {
 	return StreamStats{
 		Announcements:    metricsTracker.GetAnnouncementCount(),
 		Withdrawals:      metricsTracker.GetWithdrawalCount(),
-		RouteChurnPerMin: metricsTracker.GetChurnPerMinute(),
+		RouteChurnPerSec: metricsTracker.GetChurnRate(),
 		BGPPeerCount:     metricsTracker.GetBGPPeerCount(),
 	}
 }
@@ -1010,12 +1001,11 @@ func (s *Server) handleASDetailJSON() http.HandlerFunc {
 	}
 }
 
-// splitRoutesByIPVersion groups routes into the IPv4 and the IPv6 ones. Neither
+// splitRoutesByIPVersion groups routes into the IPv4 and the IPv6 ones.
-// group is nil, so that a JSON answer holds [] for an empty one and not null.
 func splitRoutesByIPVersion(
 	routes []database.LiveRoute,
 ) ([]database.LiveRoute, []database.LiveRoute) {
-	ipv4Routes, ipv6Routes := []database.LiveRoute{}, []database.LiveRoute{}
+	var ipv4Routes, ipv6Routes []database.LiveRoute
 
 	for _, route := range routes {
 		if route.IPVersion == ipVersionV4 {
@@ -1115,56 +1105,6 @@ func (s *Server) handlePrefixDetailJSON() http.HandlerFunc {
 	}
 }
 
-// ASSearchResponse is the answer to an AS name search: the text searched for,
-// the number of ASes that match it, and the first maxASSearchResults of them in
-// AS number order.
-type ASSearchResponse struct {
-	Query   string        `json:"query"`
-	Total   int           `json:"total"`
-	Results []asinfo.Info `json:"results"`
-}
-
-// handleASSearch returns a handler that searches the AS list built into
-// asinfo for the text in the q parameter, without its leading and trailing
-// spaces. It answers 400 when no text is left.
-func (s *Server) handleASSearch() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		query := strings.TrimSpace(r.URL.Query().Get(asSearchQueryParam))
-		if query == "" {
-			s.writeJSONError(w, http.StatusBadRequest, searchQueryMissingMessage)
-
-			return
-		}
-
-		// AS 0 means no known origin and has no AS page, so the answer leaves
-		// it out. The matches come in AS number order, so AS 0 can only be the
-		// first. The search asks for one match more than the answer holds, to
-		// take its place.
-		results, total := asinfo.Search(query, maxASSearchResults+1)
-		if len(results) > 0 && results[0].ASN == ristypes.NoOrigin {
-			results = results[1:]
-			total--
-		}
-
-		results = results[:min(len(results), maxASSearchResults)]
-
-		// results is an empty list rather than nil when nothing matches, so
-		// that the answer holds [] and not null.
-		if results == nil {
-			results = []asinfo.Info{}
-		}
-
-		err := writeJSONSuccess(w, ASSearchResponse{
-			Query:   query,
-			Total:   total,
-			Results: results,
-		})
-		if err != nil {
-			s.logger.Error("Failed to encode AS search results", "error", err)
-		}
-	}
-}
-
 // handleASDetail returns a handler that serves the AS detail HTML page
 func (s *Server) handleASDetail() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {

internal/server/handlers_internal_test.go

@@ -19,7 +19,6 @@ import (
 	"git.eeqj.de/sneak/routewatch/internal/database"
 	"git.eeqj.de/sneak/routewatch/internal/logger"
 	"git.eeqj.de/sneak/routewatch/internal/metrics"
-	"git.eeqj.de/sneak/routewatch/internal/ristypes"
 	"git.eeqj.de/sneak/routewatch/internal/streamer"
 	"git.eeqj.de/sneak/routewatch/pkg/asinfo"
 )
@@ -27,7 +26,6 @@ import (
 // The prefix and peer addresses the prefix page tests store routes for.
 const (
 	testPrefixV4 = "192.0.2.0/24"
-	testPrefixV6 = "2001:db8::/32"
 	testPeerV4   = "198.51.100.1"
 	testPeerV6   = "2001:db8::1"
 )
@@ -195,53 +193,8 @@ func TestStatsHandlersAnswerFromMemory(t *testing.T) {
 	}
 }
 
-// TestStatsAnswerCarriesChurnPerMinute checks that the stream object of the
-// /api/v1/stats answer holds route_churn_per_min as a whole number, and no
-// longer route_churn_per_sec, the moving average it replaces
-// (https://git.eeqj.de/sneak/routewatch/issues/160).
-func TestStatsAnswerCarriesChurnPerMinute(t *testing.T) {
-	t.Parallel()
-
-	s := newServerWithTestRoutes(t)
-
-	rec := httptest.NewRecorder()
-	s.handleStats()(rec,
-		httptest.NewRequestWithContext(t.Context(), http.MethodGet, statsPath, nil))
-
-	if rec.Code != http.StatusOK {
-		t.Fatalf("status %d, want %d; body %s", rec.Code, http.StatusOK, rec.Body)
-	}
-
-	var body struct {
-		Data struct {
-			Stream map[string]json.RawMessage `json:"stream"`
-		} `json:"data"`
-	}
-
-	err := json.Unmarshal(rec.Body.Bytes(), &body)
-	if err != nil {
-		t.Fatalf("decoding the answer: %v", err)
-	}
-
-	churn, ok := body.Data.Stream["route_churn_per_min"]
-	if !ok {
-		t.Fatalf("stream has no route_churn_per_min: %s", rec.Body)
-	}
-
-	var count int
-
-	err = json.Unmarshal(churn, &count)
-	if err != nil {
-		t.Errorf("route_churn_per_min = %s, want a whole number: %v", churn, err)
-	}
-
-	if _, ok := body.Data.Stream["route_churn_per_sec"]; ok {
-		t.Errorf("stream still has route_churn_per_sec: %s", rec.Body)
-	}
-}
-
 // newServerWithTestRoutes returns a server on a new database that holds a
-// route for testPrefixV4 and one for testPrefixV6.
+// route for testPrefixV4 and one for 2001:db8::/32.
 func newServerWithTestRoutes(t *testing.T) *Server {
 	t.Helper()
 
@@ -261,7 +214,7 @@ func newServerWithTestRoutes(t *testing.T) *Server {
 			NextHop: testPeerV4, LastUpdated: ts,
 		},
 		{
-			Prefix: testPrefixV6, MaskLength: 32, IPVersion: 6,
+			Prefix: "2001:db8::/32", MaskLength: 32, IPVersion: 6,
 			OriginASN: 64501, PeerIP: testPeerV6, ASPath: []int{64501},
 			NextHop: testPeerV6, LastUpdated: ts,
 		},
@@ -1213,389 +1166,6 @@ func TestIPLookupHidesPrivateAddresses(t *testing.T) {
 	}
 }
 
-// asSearchPath is the path of the AS name search.
-const asSearchPath = "/api/v1/search/as"
-
-// searchAS sends an AS name search with the URL query rawQuery through s's
-// router, expects a 200 answer, and returns its data.
-func searchAS(t *testing.T, s *Server, rawQuery string) ASSearchResponse {
-	t.Helper()
-
-	rec := httptest.NewRecorder()
-	s.router.ServeHTTP(rec, httptest.NewRequestWithContext(
-		t.Context(), http.MethodGet, asSearchPath+"?"+rawQuery, nil))
-
-	if rec.Code != http.StatusOK {
-		t.Fatalf("%s: status %d, want %d; body %s",
-			rawQuery, rec.Code, http.StatusOK, rec.Body)
-	}
-
-	var body struct {
-		Data ASSearchResponse `json:"data"`
-	}
-
-	err := json.Unmarshal(rec.Body.Bytes(), &body)
-	if err != nil {
-		t.Fatalf("%s: decoding the answer %q: %v", rawQuery, rec.Body, err)
-	}
-
-	return body.Data
-}
-
-// TestASSearchAnswersMatches searches for Cloudflare's handle in lower case,
-// with spaces around it, and expects AS13335 among the matches. Before the fix
-// there was no AS name search, and the home page's search card said it was
-// coming soon (https://git.eeqj.de/sneak/routewatch/issues/151).
-func TestASSearchAnswersMatches(t *testing.T) {
-	t.Parallel()
-
-	const query = "cloudflarenet"
-
-	data := searchAS(t, newServerWithTestRoutes(t), "q=%20"+query+"%20")
-
-	if data.Query != query {
-		t.Errorf("query %q, want %q", data.Query, query)
-	}
-
-	if data.Total != len(data.Results) {
-		t.Errorf("total %d, but %d results", data.Total, len(data.Results))
-	}
-
-	cloudflare := asinfo.Info{
-		ASN: 13335, Handle: "CLOUDFLARENET", Description: "Cloudflare, Inc.",
-	}
-	if !slices.Contains(data.Results, cloudflare) {
-		t.Errorf("results %v do not hold %v", data.Results, cloudflare)
-	}
-}
-
-// TestASSearchAnswersEmptyListWhenNothingMatches expects a search that matches
-// nothing to answer 200 with a total of 0 and an empty list, not null.
-func TestASSearchAnswersEmptyListWhenNothingMatches(t *testing.T) {
-	t.Parallel()
-
-	data := searchAS(t, newServerWithTestRoutes(t), "q=XYZABC123456")
-
-	if data.Total != 0 || data.Results == nil || len(data.Results) != 0 {
-		t.Errorf("total %d and results %#v, want 0 and an empty list",
-			data.Total, data.Results)
-	}
-}
-
-// TestASSearchAnswers400ForEmptyQuery expects a search with no q, an empty q
-// or a q of only spaces to answer 400 with the JSON error body.
-func TestASSearchAnswers400ForEmptyQuery(t *testing.T) {
-	t.Parallel()
-
-	s := newServerWithTestRoutes(t)
-
-	for _, path := range []string{
-		asSearchPath, asSearchPath + "?q=", asSearchPath + "?q=%20%20",
-	} {
-		rec := httptest.NewRecorder()
-		s.router.ServeHTTP(rec, httptest.NewRequestWithContext(
-			t.Context(), http.MethodGet, path, nil))
-
-		if rec.Code != http.StatusBadRequest {
-			t.Errorf("%s: status %d, want %d; body %s",
-				path, rec.Code, http.StatusBadRequest, rec.Body)
-		}
-
-		checkJSONErrorCode(t, path, rec, http.StatusBadRequest)
-		checkJSONErrorMessage(t, path, rec, searchQueryMissingMessage)
-	}
-}
-
-// TestASSearchShowsFirstMatchesAndTotal searches for a word with more matches
-// than an answer holds, and expects the first maxASSearchResults of them, in
-// AS number order, and the number of all of them.
-func TestASSearchShowsFirstMatchesAndTotal(t *testing.T) {
-	t.Parallel()
-
-	const query = "university"
-
-	all, _ := asinfo.Search(query, asinfo.Total())
-	if len(all) <= maxASSearchResults {
-		t.Fatalf("Search(%q) has %d matches; the test needs more than %d",
-			query, len(all), maxASSearchResults)
-	}
-
-	data := searchAS(t, newServerWithTestRoutes(t), "q="+query)
-
-	if data.Total != len(all) {
-		t.Errorf("total %d, want %d", data.Total, len(all))
-	}
-
-	if !slices.Equal(data.Results, all[:maxASSearchResults]) {
-		t.Errorf("results %v, want the first %d matches %v",
-			data.Results, maxASSearchResults, all[:maxASSearchResults])
-	}
-}
-
-// The AS numbers the AS detail tests ask for. storedASN originates the route
-// for testPrefixV4 and is in the database. routeOnlyASN originates the route
-// for testPrefixV6, but the database has no record of the AS itself, as when
-// a route is stored before its AS. builtInOnlyASN is in the AS list built into
-// asinfo but not in the database. unknownASN is in neither.
-const (
-	storedASN      = 64500
-	routeOnlyASN   = 64501
-	builtInOnlyASN = 15169
-	unknownASN     = 4200000000
-)
-
-// zeroDate is how a page writes a time that was never set.
-const zeroDate = "0001-01-01"
-
-// firstSeenCard is the label of the AS page's first-seen date.
-const firstSeenCard = `<div class="info-label">First Seen</div>`
-
-// newServerWithStoredAS returns newServerWithTestRoutes's server with storedASN
-// added to the database. It fails the test when the AS list built into asinfo
-// lacks routeOnlyASN or builtInOnlyASN, or holds unknownASN.
-func newServerWithStoredAS(t *testing.T) *Server {
-	t.Helper()
-
-	for _, asn := range []int{routeOnlyASN, builtInOnlyASN} {
-		if _, ok := asinfo.Get(asn); !ok {
-			t.Fatalf("AS%d is not in the AS info data", asn)
-		}
-	}
-
-	if _, ok := asinfo.Get(unknownASN); ok {
-		t.Fatalf("AS%d is in the AS info data", unknownASN)
-	}
-
-	s := newServerWithTestRoutes(t)
-
-	_, err := s.db.GetOrCreateASN(storedASN, time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC))
-	if err != nil {
-		t.Fatalf("GetOrCreateASN: %v", err)
-	}
-
-	return s
-}
-
-// TestASDetailJSONAnswersBuiltInAS asks /api/v1/as/ for each of the ASes above.
-// All but unknownASN answer 200 with the handle and description from the
-// built-in AS list and their prefixes, as lists even when empty. Only storedASN
-// has a first_seen time. unknownASN answers 404. Before the fix builtInOnlyASN
-// and routeOnlyASN answered 404 too
-// (https://git.eeqj.de/sneak/routewatch/issues/151).
-func TestASDetailJSONAnswersBuiltInAS(t *testing.T) {
-	t.Parallel()
-
-	s := newServerWithStoredAS(t)
-
-	tests := []struct {
-		asn           int
-		wantCode      int
-		wantPrefixes  []string
-		wantFirstSeen bool
-	}{
-		{storedASN, http.StatusOK, []string{testPrefixV4}, true},
-		{routeOnlyASN, http.StatusOK, []string{testPrefixV6}, false},
-		{builtInOnlyASN, http.StatusOK, nil, false},
-		{unknownASN, http.StatusNotFound, nil, false},
-	}
-
-	for _, tt := range tests {
-		path := "/api/v1/as/" + strconv.Itoa(tt.asn)
-		rec := httptest.NewRecorder()
-		s.router.ServeHTTP(rec, httptest.NewRequestWithContext(
-			t.Context(), http.MethodGet, path, nil))
-
-		if rec.Code != tt.wantCode {
-			t.Errorf("%s: status %d, want %d; body %s",
-				path, rec.Code, tt.wantCode, rec.Body)
-
-			continue
-		}
-
-		if tt.wantCode != http.StatusOK {
-			checkJSONErrorCode(t, path, rec, tt.wantCode)
-
-			continue
-		}
-
-		//nolint:tagliatelle // field names are the existing JSON API
-		var body struct {
-			Data struct {
-				ASN          database.ASN         `json:"asn"`
-				IPv4Prefixes []database.LiveRoute `json:"ipv4_prefixes"`
-				IPv6Prefixes []database.LiveRoute `json:"ipv6_prefixes"`
-			} `json:"data"`
-		}
-
-		err := json.Unmarshal(rec.Body.Bytes(), &body)
-		if err != nil {
-			t.Errorf("%s: decoding the answer %q: %v", path, rec.Body, err)
-
-			continue
-		}
-
-		info, _ := asinfo.Get(tt.asn)
-		got := body.Data.ASN
-
-		if got.ASN != tt.asn || got.Handle != info.Handle ||
-			got.Description != info.Description {
-			t.Errorf("%s: AS %d %q %q, want %d %q %q", path, got.ASN,
-				got.Handle, got.Description, tt.asn, info.Handle, info.Description)
-		}
-
-		if body.Data.IPv4Prefixes == nil || body.Data.IPv6Prefixes == nil {
-			t.Errorf("%s: a prefix list is null; body %s", path, rec.Body)
-		}
-
-		routes := slices.Concat(body.Data.IPv4Prefixes, body.Data.IPv6Prefixes)
-
-		gotPrefixes := make([]string, 0, len(routes))
-		for _, route := range routes {
-			gotPrefixes = append(gotPrefixes, route.Prefix)
-		}
-
-		if !slices.Equal(gotPrefixes, tt.wantPrefixes) {
-			t.Errorf("%s: prefixes %v, want %v", path, gotPrefixes, tt.wantPrefixes)
-		}
-
-		gotFirstSeen := strings.Contains(rec.Body.String(), `"first_seen"`)
-		if gotFirstSeen != tt.wantFirstSeen {
-			t.Errorf("%s: has first_seen %t, want %t; body %s",
-				path, gotFirstSeen, tt.wantFirstSeen, rec.Body)
-		}
-	}
-}
-
-// TestASDetailPageShowsBuiltInAS asks /as/ for each of the ASes above. All but
-// unknownASN answer 200 with the handle and description from the built-in AS
-// list. storedASN and routeOnlyASN list their prefixes, and builtInOnlyASN says
-// the AS announces none. Only storedASN shows a first-seen date, and no page
-// shows a date that was never set. unknownASN answers 404. Before the fix
-// builtInOnlyASN and routeOnlyASN answered 404 too
-// (https://git.eeqj.de/sneak/routewatch/issues/151).
-func TestASDetailPageShowsBuiltInAS(t *testing.T) {
-	t.Parallel()
-
-	s := newServerWithStoredAS(t)
-
-	tests := []struct {
-		asn           int
-		wantCode      int
-		wantText      string
-		wantFirstSeen bool
-	}{
-		{storedASN, http.StatusOK, testPrefixV4, true},
-		{routeOnlyASN, http.StatusOK, testPrefixV6, false},
-		{builtInOnlyASN, http.StatusOK, "No prefixes announced by this AS", false},
-		{unknownASN, http.StatusNotFound, "", false},
-	}
-
-	for _, tt := range tests {
-		path := "/as/" + strconv.Itoa(tt.asn)
-		rec := httptest.NewRecorder()
-		s.router.ServeHTTP(rec, httptest.NewRequestWithContext(
-			t.Context(), http.MethodGet, path, nil))
-
-		if rec.Code != tt.wantCode {
-			t.Errorf("%s: status %d, want %d; body %s",
-				path, rec.Code, tt.wantCode, rec.Body)
-
-			continue
-		}
-
-		if tt.wantCode != http.StatusOK {
-			continue
-		}
-
-		info, _ := asinfo.Get(tt.asn)
-		page := rec.Body.String()
-
-		for _, want := range []string{
-			html.EscapeString(info.Handle),
-			html.EscapeString(info.Description),
-			tt.wantText,
-		} {
-			if !strings.Contains(page, want) {
-				t.Errorf("%s: page does not show %q", path, want)
-			}
-		}
-
-		if strings.Contains(page, zeroDate) {
-			t.Errorf("%s: page shows the date %s", path, zeroDate)
-		}
-
-		gotFirstSeen := strings.Contains(page, firstSeenCard)
-		if gotFirstSeen != tt.wantFirstSeen {
-			t.Errorf("%s: shows a first-seen date %t, want %t",
-				path, gotFirstSeen, tt.wantFirstSeen)
-		}
-	}
-}
-
-// TestNoOriginHasNoASAnswers stores a route with no known origin, which has
-// origin AS 0 (https://git.eeqj.de/sneak/routewatch/issues/75). It expects
-// /as/0 and /api/v1/as/0 to answer 404. It expects a search for "iana" to leave
-// AS 0 out of its results and its total, although the AS list built into
-// asinfo holds AS 0. That search has more matches than an answer holds, so it
-// still lists maxASSearchResults of them.
-func TestNoOriginHasNoASAnswers(t *testing.T) {
-	t.Parallel()
-
-	const (
-		noOriginPrefix = "203.0.113.0/24"
-		query          = "iana"
-	)
-
-	s := newServerWithTestRoutes(t)
-
-	err := s.db.UpsertLiveRouteBatch([]*database.LiveRoute{{
-		Prefix: noOriginPrefix, MaskLength: 24, IPVersion: 4,
-		OriginASN: ristypes.NoOrigin, PeerIP: testPeerV4,
-		ASPath: []int{64500, 64501, 64502}, NextHop: testPeerV4,
-		LastUpdated: time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC),
-	}})
-	if err != nil {
-		t.Fatalf("UpsertLiveRouteBatch: %v", err)
-	}
-
-	asn := strconv.Itoa(ristypes.NoOrigin)
-
-	for _, path := range []string{"/as/" + asn, "/api/v1/as/" + asn} {
-		rec := httptest.NewRecorder()
-		s.router.ServeHTTP(rec, httptest.NewRequestWithContext(
-			t.Context(), http.MethodGet, path, nil))
-
-		if rec.Code != http.StatusNotFound {
-			t.Errorf("%s: status %d, want %d; body %s",
-				path, rec.Code, http.StatusNotFound, rec.Body)
-		}
-	}
-
-	first, total := asinfo.Search(query, 1)
-	if len(first) != 1 || first[0].ASN != ristypes.NoOrigin {
-		t.Fatalf("AS%d is not the first match for %q in the AS info data",
-			ristypes.NoOrigin, query)
-	}
-
-	data := searchAS(t, s, "q="+query)
-
-	for _, info := range data.Results {
-		if info.ASN == ristypes.NoOrigin {
-			t.Errorf("the search for %q lists AS%d", query, info.ASN)
-		}
-	}
-
-	if data.Total != total-1 {
-		t.Errorf("the search for %q has a total of %d, want %d",
-			query, data.Total, total-1)
-	}
-
-	if len(data.Results) != maxASSearchResults {
-		t.Errorf("the search for %q lists %d matches, want %d",
-			query, len(data.Results), maxASSearchResults)
-	}
-}
-
 // settledGoroutineCount lets transient goroutines finish, then reports the
 // current count.
 func settledGoroutineCount() int {

internal/server/routes.go

@@ -87,7 +87,6 @@ func (s *Server) setupRoutes() {
 		r.Get("/ip/{ip}", s.handleIPLookup())
 		r.Get("/as/{asn}", s.handleASDetailJSON())
 		r.Get("/prefix/{prefix}/{len}", s.handlePrefixDetailJSON())
-		r.Get("/search/as", s.handleASSearch())
 	})
 
 	s.router = r

internal/server/server.go

@@ -1,8 +1,4 @@
-// Package server serves RouteWatch's web pages and JSON API:
+// Package server provides HTTP endpoints for status monitoring and statistics
-//   - the home page, the status figures and the health check
-//   - the AS, prefix and prefix length pages, and the JSON answers behind them
-//   - the IP lookups
-//   - the AS name search
 package server
 
 import (
@@ -143,8 +139,7 @@ func (s *Server) Stop(ctx context.Context) error {
 	return nil
 }
 
-// SetASNFetcher sets the ASN WHOIS fetcher for on-demand lookups. Call it
+// SetASNFetcher sets the ASN WHOIS fetcher for on-demand lookups.
-// before Start: the handlers read the fetcher without a lock.
 func (s *Server) SetASNFetcher(fetcher ASNFetcher) {
 	s.asnFetcher = fetcher
 }

internal/streamer/streamer.go

@@ -106,12 +106,12 @@ type RawMessageHandler func(line string)
 // handlerMetrics tracks performance metrics for a handler
 type handlerMetrics struct {
 	processedCount     uint64        // Total messages processed
-	droppedCount       atomic.Uint64 // Total messages dropped; not under mu
+	droppedCount       uint64        // Total messages dropped
 	totalTime          time.Duration // Total processing time (for average calculation)
 	minTime            time.Duration // Minimum processing time
 	maxTime            time.Duration // Maximum processing time
 	queueHighWaterMark int           // Maximum queue length seen
-	mu                 sync.Mutex    // Protects the other metrics
+	mu                 sync.Mutex    // Protects the metrics
 }
 
 // handlerInfo wraps a handler with its queue and metrics
@@ -371,7 +371,7 @@ func (s *Streamer) GetHandlerStats() []HandlerStats {
 			QueueCapacity:      cap(info.queue),
 			QueueHighWaterMark: info.metrics.queueHighWaterMark,
 			ProcessedCount:     info.metrics.processedCount,
-			DroppedCount:       info.metrics.droppedCount.Load(),
+			DroppedCount:       info.metrics.droppedCount,
 			MinProcessTime:     info.metrics.minTime,
 			MaxProcessTime:     info.metrics.maxTime,
 		}
@@ -488,7 +488,7 @@ func (s *Streamer) logMetrics() {
 				"queue_len", len(info.queue),
 				"queue_cap", cap(info.queue),
 				"processed", info.metrics.processedCount,
-				"dropped", info.metrics.droppedCount.Load(),
+				"dropped", info.metrics.droppedCount,
 				"avg_time", avgTime,
 				"min_time", info.metrics.minTime,
 				"max_time", info.metrics.maxTime,
@@ -858,7 +858,7 @@ func (s *Streamer) dispatchMessage(
 		}
 
 		if !s.queueMessage(info, msg) {
-			info.metrics.droppedCount.Add(1)
+			atomic.AddUint64(&info.metrics.droppedCount, 1)
 			s.totalDropped.Add(1)
 
 			continue

internal/streamer/streamer_internal_test.go

@@ -621,68 +621,6 @@ func TestStreamReadsLongLine(t *testing.T) {
 	}
 }
 
-// blockedHandler wants UPDATE messages, has room on its queue for one, and
-// does not return from HandleMessage until release is closed.
-type blockedHandler struct {
-	release chan struct{}
-}
-
-func (blockedHandler) WantsMessage(messageType string) bool {
-	return messageType == ristypes.MessageTypeUpdate
-}
-
-func (blockedHandler) QueueCapacity() int { return 1 }
-
-func (h blockedHandler) HandleMessage(*ristypes.RISMessage) { <-h.release }
-
-// TestHandlerStatsReadWhileMessagesAreDropped has the server send a few UPDATE
-// lines to a blockedHandler, so the read loop drops all but the one the
-// handler holds and the one on its queue, while the test reads the handler's
-// statistics. The drop count must reach the number dropped, and the race
-// detector must find the count read and written safely.
-func TestHandlerStatsReadWhileMessagesAreDropped(t *testing.T) {
-	t.Parallel()
-
-	const (
-		lines       = 5
-		wantDropped = lines - 2
-		maxWait     = 5 * time.Second
-	)
-
-	srv := httptest.NewServer(http.HandlerFunc(
-		func(w http.ResponseWriter, r *http.Request) {
-			_, _ = io.WriteString(w, strings.Repeat(updateLine, lines))
-
-			flush(w)
-			<-r.Context().Done()
-		}))
-	defer srv.Close()
-
-	s := New(logger.New(), metrics.New())
-	s.url = srv.URL
-	handler := blockedHandler{release: make(chan struct{})}
-	s.RegisterHandler(handler)
-
-	err := s.Start(t.Context())
-	if err != nil {
-		t.Fatalf("Start returned error: %v", err)
-	}
-	defer s.Stop(t.Context())
-	defer close(handler.release)
-
-	// The test polls instead of waiting for a signal from the read loop: a
-	// signal would order the drops before the reads here, and the race
-	// detector would have nothing to report.
-	deadline := time.Now().Add(maxWait)
-
-	for s.GetHandlerStats()[0].DroppedCount < wantDropped {
-		if time.Now().After(deadline) {
-			t.Fatalf("fewer than %d messages counted as dropped within %s",
-				wantDropped, maxWait)
-		}
-	}
-}
-
 // TestPeerCountCountsEveryPeerHeardFrom has the server send an UPDATE from
 // stateDownPeer and a KEEPALIVE from another peer, with no OPEN from either,
 // and then a message that ends stateDownPeer's session: a NOTIFICATION, or a

internal/templates/as_detail.html

@@ -233,12 +233,10 @@
                 <div class="info-label">Peer ASNs</div>
                 <div class="info-value">{{.PeerCount}}</div>
             </div>
-            {{if not .ASN.FirstSeen.IsZero}}
             <div class="info-card">
                 <div class="info-label">First Seen</div>
                 <div class="info-value">{{.ASN.FirstSeen.Format "2006-01-02"}}</div>
             </div>
-            {{end}}
         </div>
 
         {{if .IPv4Prefixes}}

internal/templates/index.html

@@ -174,38 +174,6 @@
         #asname-results .search-message {
             font-size: 13px;
         }
-        #asname-results .error {
-            color: #c00;
-        }
-        .asname-list {
-            list-style: none;
-            margin: 12px 0 0 0;
-            padding: 0;
-            max-height: 400px;
-            overflow-y: auto;
-        }
-        .asname-list li {
-            border-bottom: 1px solid #eee;
-        }
-        .asname-list a {
-            display: block;
-            padding: 8px 4px;
-            color: #2c3e50;
-            text-decoration: none;
-            font-size: 14px;
-        }
-        .asname-list a:hover {
-            background: #f5f5f5;
-        }
-        .asname-list .asn {
-            font-weight: 600;
-            color: #3498db;
-        }
-        .asname-list .description {
-            display: block;
-            color: #7f8c8d;
-            font-size: 12px;
-        }
 
         /* IP Lookup result */
         .ip-result {
@@ -338,7 +306,7 @@
                     <input type="text" id="asname-input" placeholder="e.g., Google, Cloudflare" autocomplete="off">
                     <button type="submit">Search</button>
                 </form>
-                <p class="search-hint">Search for autonomous systems by organization name or handle</p>
+                <p class="search-hint">Search for autonomous systems by organization name</p>
                 <div id="asname-results"></div>
             </div>
 
@@ -400,7 +368,7 @@
                     }
 
                     const totalUpdates = data.ipv4_updates_per_sec + data.ipv6_updates_per_sec;
-                    document.getElementById('stat-updates').textContent = Math.round(totalUpdates).toLocaleString();
+                    document.getElementById('stat-updates').textContent = totalUpdates.toFixed(1);
                 })
                 .catch(() => {
                     document.getElementById('stat-status').textContent = 'Error';
@@ -419,82 +387,24 @@
             }
         });
 
-        // AS name search. The handles and descriptions come from outside data,
+        // AS name search
-        // so the results are built with textContent, never innerHTML.
-        const asNameResults = document.getElementById('asname-results');
-
-        // Replace the search results with one line of text.
-        function showASNameMessage(text, className) {
-            const line = document.createElement('p');
-            line.className = className;
-            line.textContent = text;
-            asNameResults.replaceChildren(line);
-        }
-
-        // List the matches of a search answer, each as a link to its AS page,
-        // and say how many more matched than the answer holds.
-        function showASNameMatches(data) {
-            if (data.total === 0) {
-                showASNameMessage('No AS matches "' + data.query + '".', 'search-message');
-                return;
-            }
-
-            const list = document.createElement('ul');
-            list.className = 'asname-list';
-            for (const match of data.results) {
-                const asn = document.createElement('span');
-                asn.className = 'asn';
-                asn.textContent = 'AS' + match.asn;
-
-                const description = document.createElement('span');
-                description.className = 'description';
-                description.textContent = match.description;
-
-                const link = document.createElement('a');
-                link.href = '/as/' + match.asn;
-                link.append(asn, ' ' + match.handle, description);
-
-                const item = document.createElement('li');
-                item.append(link);
-                list.append(item);
-            }
-            asNameResults.replaceChildren(list);
-
-            const more = data.total - data.results.length;
-            if (more > 0) {
-                const line = document.createElement('p');
-                line.className = 'search-message';
-                line.textContent = more.toLocaleString() + ' more matched. Narrow the search to see them.';
-                asNameResults.append(line);
-            }
-        }
-
         document.getElementById('asname-form').addEventListener('submit', function(e) {
             e.preventDefault();
             const query = document.getElementById('asname-input').value.trim();
             if (!query) return;
 
-            // A number, or AS and a number, opens that AS's page
+            const resultsDiv = document.getElementById('asname-results');
-            const asn = query.replace(/^AS/i, '');
+            resultsDiv.innerHTML = '<p class="loading">Searching...</p>';
-            if (/^\d+$/.test(asn)) {
+
-                window.location.href = '/as/' + asn;
+            // Use a simple client-side search against the asinfo data
+            // For now, redirect to AS page if it looks like an ASN
+            if (/^\d+$/.test(query)) {
+                window.location.href = '/as/' + query;
                 return;
             }
 
-            showASNameMessage('Searching...', 'loading');
+            // Show a message that server-side search is coming
-
+            resultsDiv.innerHTML = '<p class="search-message">AS name search coming soon. For now, try an AS number.</p>';
-            fetch('/api/v1/search/as?q=' + encodeURIComponent(query))
-                .then(response => response.json())
-                .then(response => {
-                    if (response.status === 'error') {
-                        showASNameMessage('Error: ' + response.error.msg, 'error');
-                    } else {
-                        showASNameMatches(response.data);
-                    }
-                })
-                .catch(error => {
-                    showASNameMessage('Error: ' + error.message, 'error');
-                });
         });
 
         // IP lookup

internal/templates/status.html

@@ -231,8 +231,8 @@
                 <span class="metric-value" id="withdrawals">-</span>
             </div>
             <div class="metric">
-                <span class="metric-label">Route Churn/min</span>
+                <span class="metric-label">Route Churn/sec</span>
-                <span class="metric-value" id="route_churn_per_min">-</span>
+                <span class="metric-value" id="route_churn_per_sec">-</span>
             </div>
             <div class="metric">
                 <span class="metric-label">Total Data</span>
@@ -511,7 +511,7 @@
             document.getElementById('messages_per_sec').textContent = '-';
             document.getElementById('announcements').textContent = '-';
             document.getElementById('withdrawals').textContent = '-';
-            document.getElementById('route_churn_per_min').textContent = '-';
+            document.getElementById('route_churn_per_sec').textContent = '-';
             document.getElementById('total_wire_bytes').textContent = '-';
             document.getElementById('wire_mbits_per_sec').textContent = '-';
             document.getElementById('gc_num').textContent = '-';
@@ -578,7 +578,7 @@
                     document.getElementById('connection_duration').textContent = data.connection_duration;
                     document.getElementById('reconnect_count').textContent = formatNumber(data.reconnect_count);
                     document.getElementById('total_messages').textContent = formatNumber(data.total_messages);
-                    document.getElementById('messages_per_sec').textContent = formatNumber(Math.round(data.messages_per_sec));
+                    document.getElementById('messages_per_sec').textContent = data.messages_per_sec.toFixed(1);
                     document.getElementById('total_wire_bytes').textContent = formatBytes(data.total_wire_bytes);
                     document.getElementById('wire_mbits_per_sec').textContent = data.wire_mbits_per_sec.toFixed(2) + ' Mbps';
                     document.getElementById('asns').textContent = formatNumber(data.asns);
@@ -591,8 +591,8 @@
                     document.getElementById('live_routes').textContent = formatNumber(data.live_routes);
                     document.getElementById('ipv4_routes').textContent = formatNumber(data.ipv4_routes);
                     document.getElementById('ipv6_routes').textContent = formatNumber(data.ipv6_routes);
-                    document.getElementById('ipv4_updates_per_sec').textContent = formatNumber(Math.round(data.ipv4_updates_per_sec));
+                    document.getElementById('ipv4_updates_per_sec').textContent = data.ipv4_updates_per_sec.toFixed(1);
-                    document.getElementById('ipv6_updates_per_sec').textContent = formatNumber(Math.round(data.ipv6_updates_per_sec));
+                    document.getElementById('ipv6_updates_per_sec').textContent = data.ipv6_updates_per_sec.toFixed(1);
                     document.getElementById('oldest_route').textContent = formatRelativeTime(data.oldest_route);
                     document.getElementById('newest_route').textContent = formatRelativeTime(data.newest_route);
 
@@ -601,7 +601,7 @@
                         document.getElementById('bgp_peer_count').textContent = formatNumber(data.stream.bgp_peer_count);
                         document.getElementById('announcements').textContent = formatNumber(data.stream.announcements);
                         document.getElementById('withdrawals').textContent = formatNumber(data.stream.withdrawals);
-                        document.getElementById('route_churn_per_min').textContent = formatNumber(data.stream.route_churn_per_min);
+                        document.getElementById('route_churn_per_sec').textContent = data.stream.route_churn_per_sec.toFixed(1);
                     }
 
                     // Update GC stats

internal/templates/templates_test.go

@@ -1,54 +0,0 @@
-package templates_test
-
-import (
-	"bytes"
-	"html/template"
-	"strings"
-	"testing"
-
-	"git.eeqj.de/sneak/routewatch/internal/templates"
-)
-
-// TestFooterLicense renders the home and status pages and expects each footer
-// to name the licence in LICENSE, MIT, and not WTFPL.
-func TestFooterLicense(t *testing.T) {
-	t.Parallel()
-
-	const (
-		license      = "MIT"
-		wrongLicense = "WTFPL"
-	)
-
-	pages := map[string]*template.Template{
-		"index":  templates.IndexTemplate(),
-		"status": templates.StatusTemplate(),
-	}
-
-	for name, tmpl := range pages {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			var page bytes.Buffer
-
-			err := tmpl.Execute(&page, struct{ CSPNonce string }{})
-			if err != nil {
-				t.Fatalf("rendering the page: %v", err)
-			}
-
-			_, footer, found := strings.Cut(page.String(), "<footer")
-			if !found {
-				t.Fatal("the page has no footer")
-			}
-
-			footer, _, _ = strings.Cut(footer, "</footer>")
-
-			if !strings.Contains(footer, license) {
-				t.Errorf("footer does not name %s: %q", license, footer)
-			}
-
-			if strings.Contains(footer, wrongLicense) {
-				t.Errorf("footer names %s: %q", wrongLicense, footer)
-			}
-		})
-	}
-}

internal/version/version.go

@@ -19,8 +19,8 @@ const (
 	Author = "@sneak"
 	// AuthorURL is the author's website
 	AuthorURL = "https://sneak.berlin"
-	// License is the program license, as LICENSE grants it
+	// License is the program license
-	License = "MIT"
+	License = "WTFPL"
 	// RepoURL is the git repository URL
 	RepoURL = "https://git.eeqj.de/sneak/routewatch"
 )

internal/whois/whois.go

@@ -49,31 +49,6 @@ const (
 	RIRAFRNIC = "AFRINIC"
 )
 
-// noPersonalFlag keeps person and role objects out of an answer. The
-// organisation object stays in it. RIPE counts the person and role objects
-// it returns against a daily limit per IP address. Role objects for abuse
-// contacts do not count. RIPE refuses an address for good that passes the
-// limit too often:
-// https://docs.db.ripe.net/Types-of-Queries/Access-Control-for-Queries/
-//
-// RIPE documents the flag here:
-// https://docs.db.ripe.net/Types-of-Queries/Referenced-Objects-in-Query-Response/
-// APNIC and AFRINIC list it in their answers to the query "help". AFRINIC
-// sends readers to that answer for its full list of flags:
-// https://afrinic.net/whois-getting-started
-const noPersonalFlag = "--no-personal"
-
-// The error lines with which RIPE's database software refuses a query:
-// access denied to the client's IP address, and that address's limit
-// reached. APNIC and AFRINIC run the same software. The lines are listed
-// under "Access Errors" on this page, whose URL is split over two lines:
-// https://docs.db.ripe.net/Appendices/
-// Appendix-C--RIPE-Database-Query-Server-Response-Codes-and-Messages/
-const (
-	accessDeniedError = "%ERROR:201:"
-	accessLimitError  = "%ERROR:202:"
-)
-
 // Errors LookupASN returns when a WHOIS answer has nothing to store.
 var (
 	// ErrNoReferral is returned when IANA refers the AS to no RIR, as it
@@ -83,7 +58,6 @@ var (
 	errNoASBlock = errors.New("IANA answered with neither a referral " +
 		"nor an AS block")
 	errNoFields       = errors.New("RIR answered with no WHOIS fields")
-	errRefused        = errors.New("RIR refused the query")
 	errUnknownServer  = errors.New("IANA refers the AS to a server no RIR runs")
 	errAnswerTooLarge = errors.New("WHOIS answer reached the size cap")
 )
@@ -123,10 +97,10 @@ func NewClient() *Client {
 
 // LookupASN asks IANA which RIR holds the given ASN, asks that RIR, and
 // returns what the RIR's answer says. It returns ErrNoReferral when IANA
-// refers the AS to no RIR, and another error when a query fails, when the
+// refers the AS to no RIR, and another error when a query fails, when IANA's
-// RIR refuses it, when IANA's answer has neither a referral nor the AS's
+// answer has neither a referral nor the AS's block, when IANA refers the AS
-// block, when IANA refers the AS to a server none of the five RIRs run, or
+// to a server none of the five RIRs run, or when the RIR's answer carries
-// when the RIR's answer carries none of ASNInfo's fields.
+// none of ASNInfo's fields, as a refusal of service does.
 func (c *Client) LookupASN(ctx context.Context, asn int) (*ASNInfo, error) {
 	// Query IANA first to find the authoritative RIR
 	query := fmt.Sprintf("AS%d", asn)
@@ -153,7 +127,7 @@ func (c *Client) LookupASN(ctx context.Context, asn int) (*ASNInfo, error) {
 	}
 
 	// Query the authoritative RIR
-	rirResp, err := c.queryRIR(ctx, whoisServer, rirQuery(rir, query))
+	rirResp, err := c.query(ctx, whoisServer, query)
 	if err != nil {
 		return nil, fmt.Errorf("RIR query failed: %w", err)
 	}
@@ -180,39 +154,6 @@ func (info *ASNInfo) isEmpty() bool {
 		info.RegDate == nil && info.LastMod == nil
 }
 
-// rirQuery returns the query sent to rir's server for asQuery, an AS
-// number such as "AS3333". RIPE, APNIC and AFRINIC are asked to keep person
-// and role objects out of the answer.
-func rirQuery(rir, asQuery string) string {
-	switch rir {
-	case RIRRIPE, RIRAPNIC, RIRAFRNIC:
-		return noPersonalFlag + " " + asQuery
-	default:
-		return asQuery
-	}
-}
-
-// queryRIR sends query to an RIR's server and returns the answer. An answer
-// holding an error line with which the server refuses the query is an
-// error, and the error holds that line.
-func (c *Client) queryRIR(
-	ctx context.Context, server, query string,
-) (string, error) {
-	answer, err := c.query(ctx, server, query)
-	if err != nil {
-		return "", err
-	}
-
-	for line := range strings.SplitSeq(answer, "\n") {
-		if strings.HasPrefix(line, accessDeniedError) ||
-			strings.HasPrefix(line, accessLimitError) {
-			return "", fmt.Errorf("%w: %s", errRefused, line)
-		}
-	}
-
-	return answer, nil
-}
-
 // query performs a raw WHOIS query to the specified server. An answer that
 // reaches maxAnswerSize is an error.
 func (c *Client) query(ctx context.Context, server, query string) (string, error) {

internal/whois/whois_test.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"io"
 	"net"
-	"slices"
 	"strings"
 	"sync"
 	"syscall"
@@ -22,20 +21,8 @@ const (
 	ripeServer = "whois.ripe.net:43"
 )
 
-// testASN is the AS the tests look up, and asQuery the query for it.
+// testASN is the AS the tests look up.
-const (
+const testASN = 3333
-	testASN = 3333
-	asQuery = "AS3333"
-)
-
-// The fake servers' answers are keyed by a server's address, a space and a
-// query. These are the keys of the queries LookupASN sends for testASN:
-// IANA's, then RIPE's, which asks RIPE to leave out person and role
-// objects.
-const (
-	ianaQuery = ianaServer + " " + asQuery
-	ripeQuery = ripeServer + " --no-personal " + asQuery
-)
 
 // ianaReferral is IANA's answer for an AS in a block it gave to RIPE.
 const ianaReferral = `% IANA WHOIS server
@@ -49,75 +36,27 @@ changed:      2002-09-01
 source:       IANA
 `
 
-// ripeRecord is RIPE's answer for the AS when asked to leave out person and
+// ripeRecord is RIPE's answer for the AS.
-// role objects: the abuse address as a comment, the AS's object and the
-// organisation object it refers to.
 const ripeRecord = `% This is the RIPE Database query service.
-% The objects are in RPSL format.
-
-% Note: --no-personal means ALL personal data has been filtered from this output.
-
-% Information related to 'AS3333'
-
-% Abuse contact for 'AS3333' is 'abuse@ripe.net'
 
 aut-num:        AS3333
 as-name:        RIPE-NCC-AS
 org:            ORG-RIEN1-RIPE
-admin-c:        BRD-RIPE
-tech-c:         OPS4-RIPE
-abuse-c:        OPS4-RIPE
-mnt-by:         RIPE-NCC-MNT
 created:        2002-09-17T13:08:32Z
 last-modified:  2024-01-09T08:55:41Z
 source:         RIPE
-
-organisation:   ORG-RIEN1-RIPE
-org-name:       Reseaux IP Europeens Network Coordination Centre (RIPE NCC)
-country:        NL
-org-type:       RIR
-address:        P.O. Box 10096
-address:        1001EB Amsterdam
-abuse-c:        OPS4-RIPE
-created:        2012-03-09T13:08:29Z
-last-modified:  2024-03-26T10:55:38Z
-source:         RIPE
 `
 
-// The error lines with which RIPE refuses a query: access denied to the
-// host, and the host's limit on returned objects reached.
-const (
-	ripeAccessDenied = "%ERROR:201: access denied for 192.0.2.1"
-	ripeLimitReached = "%ERROR:202: access control limit reached"
-)
-
 // ripeRefusal is RIPE's answer to a host it no longer serves.
 const ripeRefusal = `% This is the RIPE Database query service.
 % The objects are in RPSL format.
 %
-` + ripeAccessDenied + `
+%ERROR:201: access denied for 192.0.2.1
 %
 % Sorry, access from your host has been permanently
 % denied because of a repeated excessive querying.
 `
 
-// apnicAfrinicRecord is the answer of APNIC or AFRINIC for the AS when asked
-// to leave out person and role objects. Like RIPE's, it holds the abuse
-// address as a comment, the AS's object and the organisation object.
-const apnicAfrinicRecord = `% Abuse contact for 'AS3333' is 'abuse@example.net'
-
-aut-num:        AS3333
-as-name:        EXAMPLE-AS
-org:            ORG-EXAMPLE1
-admin-c:        EX1-TEST
-last-modified:  2026-08-26T00:40:00Z
-
-organisation:   ORG-EXAMPLE1
-org-name:       Example Networks
-country:        ZA
-address:        1 Example Road
-`
-
 // ianaPrivateUse is IANA's answer for a private-use AS: its block and no
 // referral.
 const ianaPrivateUse = `% IANA WHOIS server
@@ -141,29 +80,20 @@ const fillerLine = "remarks:        and more\n"
 const endlessAnswerSize = 4 << 20
 
 // fakeServers returns a DialContext for a whois.Client that connects to a
-// fake server at each address answers names. Each key of answers is a
+// fake server for each address in answers, which reads the query and sends
-// server's address, a space and a query, and its value is that server's
+// answers[address]. Connecting to any other address is refused.
-// answer to that query. A server reads one query and sends its answer, or
-// nothing for a query it has no answer for. Connecting to any other address
-// is refused.
 func fakeServers(
 	t *testing.T, answers map[string]string,
 ) func(context.Context, string, string) (net.Conn, error) {
 	t.Helper()
 
-	addresses := make(map[string]bool)
-
-	for key := range answers {
-		address, _, _ := strings.Cut(key, " ")
-		addresses[address] = true
-	}
-
 	var servers sync.WaitGroup
 
 	t.Cleanup(servers.Wait)
 
 	return func(_ context.Context, _, address string) (net.Conn, error) {
-		if !addresses[address] {
+		answer, ok := answers[address]
+		if !ok {
 			return nil, syscall.ECONNREFUSED
 		}
 
@@ -172,8 +102,7 @@ func fakeServers(
 		servers.Go(func() {
 			defer func() { _ = server.Close() }()
 
-			query, _ := bufio.NewReader(server).ReadString('\n')
+			_, _ = bufio.NewReader(server).ReadString('\n')
-			answer := answers[address+" "+strings.TrimSpace(query)]
 			_, _ = io.WriteString(server, answer)
 		})
 
@@ -193,41 +122,25 @@ func lookUp(
 	return client.LookupASN(t.Context(), testASN)
 }
 
-// TestLookupASNReadsTheRIRAnswer looks up an AS IANA refers to RIPE. RIPE
+// TestLookupASNReadsTheRIRAnswer looks up an AS IANA refers to RIPE. The
-// answers only a query that leaves out person and role objects, and its
+// fields come from RIPE's answer, the last-modified date included: IANA's
-// answer to that still fills the AS's fields: the abuse address from the
+// "changed:" line dates its block, not the AS.
-// comment line, and the organisation's name and country from its object.
-// The dates are the AS's: IANA's "changed:" line dates its block.
 func TestLookupASNReadsTheRIRAnswer(t *testing.T) {
 	t.Parallel()
 
 	info, err := lookUp(t, map[string]string{
-		ianaQuery: ianaReferral,
+		ianaServer: ianaReferral,
-		ripeQuery: ripeRecord,
+		ripeServer: ripeRecord,
 	})
 	if err != nil {
 		t.Fatalf("LookupASN: %v", err)
 	}
 
-	got := []string{
+	if info.ASName != "RIPE-NCC-AS" || info.OrgID != "ORG-RIEN1-RIPE" ||
-		info.ASName, info.OrgID, info.OrgName, info.CountryCode,
+		info.RIR != whois.RIRRIPE {
-		info.AbuseEmail, info.RIR,
+		t.Errorf("LookupASN = AS name %q, org %q, RIR %q; "+
-	}
+			"want RIPE-NCC-AS, ORG-RIEN1-RIPE, RIPE",
-	want := []string{
+			info.ASName, info.OrgID, info.RIR)
-		"RIPE-NCC-AS", "ORG-RIEN1-RIPE",
-		"Reseaux IP Europeens Network Coordination Centre (RIPE NCC)", "NL",
-		"abuse@ripe.net", whois.RIRRIPE,
-	}
-
-	if !slices.Equal(got, want) {
-		t.Errorf("LookupASN = AS name, org ID, org name, country, abuse "+
-			"address, RIR %q; want %q", got, want)
-	}
-
-	wantRegDate := time.Date(2002, 9, 17, 13, 8, 32, 0, time.UTC)
-	if info.RegDate == nil || !info.RegDate.Equal(wantRegDate) {
-		t.Errorf("LookupASN registered = %v, want %v",
-			info.RegDate, wantRegDate)
 	}
 
 	wantLastMod := time.Date(2024, 1, 9, 8, 55, 41, 0, time.UTC)
@@ -237,65 +150,6 @@ func TestLookupASNReadsTheRIRAnswer(t *testing.T) {
 	}
 }
 
-// TestLookupASNAsksAPNICAndAFRINICToLeaveOutPersonalData looks up an AS at
-// APNIC and at AFRINIC. Each answers only a query that leaves out person
-// and role objects, as RIPE does. That one answer still holds the
-// organisation object, so the organisation's name and country are filled.
-func TestLookupASNAsksAPNICAndAFRINICToLeaveOutPersonalData(t *testing.T) {
-	t.Parallel()
-
-	for _, server := range []string{"whois.apnic.net", "whois.afrinic.net"} {
-		t.Run(server, func(t *testing.T) {
-			t.Parallel()
-
-			address := server + ":43"
-
-			info, err := lookUp(t, map[string]string{
-				ianaQuery:                             "refer:        " + server + "\n",
-				address + " --no-personal " + asQuery: apnicAfrinicRecord,
-			})
-			if err != nil {
-				t.Fatalf("LookupASN: %v", err)
-			}
-
-			got := []string{
-				info.ASName, info.OrgName, info.CountryCode, info.AbuseEmail,
-			}
-			want := []string{
-				"EXAMPLE-AS", "Example Networks", "ZA", "abuse@example.net",
-			}
-
-			if !slices.Equal(got, want) {
-				t.Errorf("LookupASN = AS name, org name, country, abuse "+
-					"address %q; want %q", got, want)
-			}
-		})
-	}
-}
-
-// TestLookupASNReportsARefusal looks up an AS IANA refers to RIPE when RIPE
-// refuses the query, with each of the error lines RIPE refuses with. The
-// error holds RIPE's line, so the log says why the lookup failed.
-func TestLookupASNReportsARefusal(t *testing.T) {
-	t.Parallel()
-
-	for _, line := range []string{ripeAccessDenied, ripeLimitReached} {
-		t.Run(line, func(t *testing.T) {
-			t.Parallel()
-
-			_, err := lookUp(t, map[string]string{
-				ianaQuery: ianaReferral,
-				ripeQuery: "% This is the RIPE Database query service.\n" +
-					line + "\n",
-			})
-			if err == nil || !strings.Contains(err.Error(), line) {
-				t.Errorf("LookupASN error = %v, want one holding %q",
-					err, line)
-			}
-		})
-	}
-}
-
 // TestLookupASNFailsWhenTheRIRGivesNoAnswer looks up an AS IANA refers to
 // RIPE when RIPE's server refuses the connection, and when it answers only
 // with an error. Neither is a lookup that found the AS.
@@ -303,8 +157,8 @@ func TestLookupASNFailsWhenTheRIRGivesNoAnswer(t *testing.T) {
 	t.Parallel()
 
 	for name, answers := range map[string]map[string]string{
-		"connection refused": {ianaQuery: ianaReferral},
+		"connection refused": {ianaServer: ianaReferral},
-		"only an error":      {ianaQuery: ianaReferral, ripeQuery: ripeRefusal},
+		"only an error":      {ianaServer: ianaReferral, ripeServer: ripeRefusal},
 	} {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
@@ -323,7 +177,7 @@ func TestLookupASNFailsWhenTheRIRGivesNoAnswer(t *testing.T) {
 func TestLookupASNReportsNoReferral(t *testing.T) {
 	t.Parallel()
 
-	_, err := lookUp(t, map[string]string{ianaQuery: ianaPrivateUse})
+	_, err := lookUp(t, map[string]string{ianaServer: ianaPrivateUse})
 	if !errors.Is(err, whois.ErrNoReferral) {
 		t.Errorf("LookupASN error = %v, want ErrNoReferral", err)
 	}
@@ -335,7 +189,7 @@ func TestLookupASNReportsNoReferral(t *testing.T) {
 func TestLookupASNFailsWhenIANAAnswersNoBlock(t *testing.T) {
 	t.Parallel()
 
-	_, err := lookUp(t, map[string]string{ianaQuery: ianaNoObject})
+	_, err := lookUp(t, map[string]string{ianaServer: ianaNoObject})
 	if err == nil || errors.Is(err, whois.ErrNoReferral) {
 		t.Errorf("LookupASN error = %v, want one that is not ErrNoReferral",
 			err)
@@ -352,8 +206,8 @@ func TestLookupASNFailsWhenTheRIRAnswerDoesNotEnd(t *testing.T) {
 		strings.Repeat(fillerLine, endlessAnswerSize/len(fillerLine))
 
 	_, err := lookUp(t, map[string]string{
-		ianaQuery: ianaReferral,
+		ianaServer: ianaReferral,
-		ripeQuery: endless,
+		ripeServer: endless,
 	})
 	if err == nil || errors.Is(err, whois.ErrNoReferral) {
 		t.Errorf("LookupASN error = %v, want one that is not ErrNoReferral",
@@ -379,9 +233,9 @@ func TestLookupASNFailsOnAReferralToAnotherServer(t *testing.T) {
 			t.Parallel()
 
 			_, err := lookUp(t, map[string]string{
-				ianaQuery: "refer:        " + refer + "\n\n" +
+				ianaServer: "refer:        " + refer + "\n\n" +
 					"as-block:     3154-3353\n",
-				address + " " + asQuery: ripeRecord,
+				address: ripeRecord,
 			})
 			if err == nil || errors.Is(err, whois.ErrNoReferral) {
 				t.Errorf("LookupASN error = %v, want one that is not "+

pkg/asinfo/asinfo.go

@@ -2,13 +2,10 @@ package asinfo
 
 import (
 	"bytes"
-	"cmp"
 	"compress/gzip"
 	_ "embed"
 	"encoding/json"
 	"io"
-	"slices"
-	"strings"
 	"sync"
 )
 
@@ -26,17 +23,6 @@ type Info struct {
 type Registry struct {
 	mu    sync.RWMutex
 	byASN map[int]*Info
-	// searchEntries holds every entry in AS number order, for Search.
-	searchEntries []searchEntry
-}
-
-// searchEntry is an entry with its handle and description in lower case. They
-// are put in lower case once, when the data loads, so that Search only
-// compares.
-type searchEntry struct {
-	info             *Info
-	lowerHandle      string
-	lowerDescription string
 }
 
 var (
@@ -73,21 +59,9 @@ func initRegistry() {
 		panic("failed to unmarshal embedded AS data: " + err.Error())
 	}
 
-	slices.SortFunc(asInfos, func(a, b Info) int {
-		return cmp.Compare(a.ASN, b.ASN)
-	})
-
-	defaultRegistry.searchEntries = make([]searchEntry, 0, len(asInfos))
-
 	for i := range asInfos {
 		info := &asInfos[i]
 		defaultRegistry.byASN[info.ASN] = info
-		defaultRegistry.searchEntries = append(defaultRegistry.searchEntries,
-			searchEntry{
-				info:             info,
-				lowerHandle:      strings.ToLower(info.Handle),
-				lowerDescription: strings.ToLower(info.Description),
-			})
 	}
 }
 
@@ -155,36 +129,36 @@ func All() []Info {
 	return result
 }
 
-// Search finds the AS entries whose handle or description contains query,
+// Search searches for AS entries where the handle or description contains the query
-// ignoring case. It returns the first limit of them in AS number order, and the
+// This is a simple case-sensitive substring search
-// number of entries that match. An empty query matches nothing.
+func Search(query string) []Info {
-func Search(query string, limit int) ([]Info, int) {
 	once.Do(initRegistry)
 
-	if query == "" {
-		return nil, 0
-	}
-
-	query = strings.ToLower(query)
-
 	defaultRegistry.mu.RLock()
 	defer defaultRegistry.mu.RUnlock()
 
-	var (
+	var results []Info
-		results []Info
-		total   int
-	)
 
-	for _, entry := range defaultRegistry.searchEntries {
+	for _, info := range defaultRegistry.byASN {
-		if strings.Contains(entry.lowerHandle, query) ||
+		if contains(info.Handle, query) || contains(info.Description, query) {
-			strings.Contains(entry.lowerDescription, query) {
+			results = append(results, *info)
-			if total < limit {
-				results = append(results, *entry.info)
-			}
-
-			total++
 		}
 	}
 
-	return results, total
+	return results
+}
+
+// contains is a simple substring search
+func contains(s, substr string) bool {
+	return len(substr) > 0 && len(s) >= len(substr) && containsImpl(s, substr)
+}
+
+func containsImpl(s, substr string) bool {
+	for i := 0; i <= len(s)-len(substr); i++ {
+		if s[i:i+len(substr)] == substr {
+			return true
+		}
+	}
+
+	return false
 }

pkg/asinfo/asinfo_test.go

@@ -1,8 +1,6 @@
 package asinfo_test
 
 import (
-	"cmp"
-	"slices"
 	"strings"
 	"testing"
 
@@ -142,6 +140,11 @@ func TestSearch(t *testing.T) {
 			query:   "University",
 			wantMin: 10,
 		},
+		{
+			name:    "Empty search",
+			query:   "",
+			wantMin: 0,
+		},
 		{
 			name:    "Non-existent org",
 			query:   "XYZABC123456",
@@ -153,115 +156,26 @@ func TestSearch(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
-			results, _ := asinfo.Search(tt.query, asinfo.Total())
+			results := asinfo.Search(tt.query)
 			if len(results) < tt.wantMin {
 				t.Errorf("Search(%q) returned %d results, want at least %d",
 					tt.query, len(results), tt.wantMin)
 			}
 
-			// Verify all results contain the query, ignoring case
+			// Verify all results contain the query
-			query := strings.ToLower(tt.query)
+			if tt.query != "" {
 				for _, r := range results {
-				if !strings.Contains(strings.ToLower(r.Handle), query) &&
+					if !strings.Contains(r.Handle, tt.query) &&
-					!strings.Contains(strings.ToLower(r.Description), query) {
+						!strings.Contains(r.Description, tt.query) {
 						t.Errorf("Search result ASN %d doesn't contain query %q",
 							r.ASN, tt.query)
 					}
 				}
+			}
 		})
 	}
 }
 
-// TestSearchEmptyQueryMatchesNothing expects an empty query to match no AS,
-// although every handle contains the empty string.
-func TestSearchEmptyQueryMatchesNothing(t *testing.T) {
-	t.Parallel()
-
-	results, total := asinfo.Search("", asinfo.Total())
-	if len(results) != 0 || total != 0 {
-		t.Errorf(`Search("") returned %d results and a total of %d, want none`,
-			len(results), total)
-	}
-}
-
-// TestSearchIgnoresCase searches for Cloudflare's handle in lower case and its
-// description in upper case, and expects both searches to find AS13335.
-func TestSearchIgnoresCase(t *testing.T) {
-	t.Parallel()
-
-	const cloudflareASN = 13335 // handle CLOUDFLARENET, "Cloudflare, Inc."
-
-	isCloudflare := func(info asinfo.Info) bool {
-		return info.ASN == cloudflareASN
-	}
-
-	for _, query := range []string{"cloudflarenet", "CLOUDFLARE, INC."} {
-		results, _ := asinfo.Search(query, asinfo.Total())
-		if !slices.ContainsFunc(results, isCloudflare) {
-			t.Errorf("Search(%q) did not find AS%d", query, cloudflareASN)
-		}
-	}
-}
-
-// TestSearchOrdersByASN expects the matches of a search with many of them to
-// come in AS number order.
-func TestSearchOrdersByASN(t *testing.T) {
-	t.Parallel()
-
-	const query = "University"
-
-	results, _ := asinfo.Search(query, asinfo.Total())
-
-	for i := 1; i < len(results); i++ {
-		if results[i-1].ASN >= results[i].ASN {
-			t.Fatalf("Search(%q): AS%d comes after AS%d",
-				query, results[i].ASN, results[i-1].ASN)
-		}
-	}
-}
-
-// TestSearchStopsAtLimit searches for a word that matches more entries than
-// the limit. It expects exactly limit entries, the first matches in AS number
-// order, and the number of all matches, counted here from All.
-func TestSearchStopsAtLimit(t *testing.T) {
-	t.Parallel()
-
-	const (
-		query = "university"
-		limit = 10
-	)
-
-	var matches []asinfo.Info
-
-	for _, info := range asinfo.All() {
-		if strings.Contains(strings.ToLower(info.Handle), query) ||
-			strings.Contains(strings.ToLower(info.Description), query) {
-			matches = append(matches, info)
-		}
-	}
-
-	if len(matches) <= limit {
-		t.Fatalf("%q matches %d entries; the test needs more than %d",
-			query, len(matches), limit)
-	}
-
-	slices.SortFunc(matches, func(a, b asinfo.Info) int {
-		return cmp.Compare(a.ASN, b.ASN)
-	})
-
-	results, total := asinfo.Search(query, limit)
-
-	if total != len(matches) {
-		t.Errorf("Search(%q, %d): total %d, want %d",
-			query, limit, total, len(matches))
-	}
-
-	if !slices.Equal(results, matches[:limit]) {
-		t.Errorf("Search(%q, %d) = %v, want %v",
-			query, limit, results, matches[:limit])
-	}
-}
-
 func TestDataIntegrity(t *testing.T) {
 	t.Parallel()
 
@@ -301,13 +215,11 @@ func BenchmarkGet(b *testing.B) {
 }
 
 func BenchmarkSearch(b *testing.B) {
-	const limit = 50
-
 	queries := []string{"Google", "Amazon", "Microsoft", "University"}
 
 	b.ResetTimer()
 
 	for i := range b.N {
-		asinfo.Search(queries[i%len(queries)], limit)
+		asinfo.Search(queries[i%len(queries)])
 	}
 }

pkg/asinfo/doc.go

@@ -16,10 +16,8 @@ Basic usage:
 	// Get just the description
 	desc := asinfo.GetDescription(15169) // "Google LLC"
 
-	// Search the handles and descriptions, ignoring case, for the first 10
+	// Search for AS entries
-	// matches in AS number order and the number of all matches
+	results := asinfo.Search("University")
-	results, total := asinfo.Search("university", 10)
-	fmt.Printf("%d matches\n", total)
 	for _, as := range results {
 		fmt.Printf("AS%d: %s\n", as.ASN, as.Description)
 	}

pkg/asinfo/example_test.go

@@ -21,16 +21,9 @@ func ExampleGetDescription() {
 }
 
 func ExampleSearch() {
-	const limit = 10
+	results := asinfo.Search("MIT-GATEWAY")
-
-	results, total := asinfo.Search("mit-gateway", limit)
-
-	fmt.Printf("%d of %d matches\n", len(results), total)
-
 	for _, info := range results {
 		fmt.Printf("AS%d: %s - %s\n", info.ASN, info.Handle, info.Description)
 	}
-	// Output:
+	// Output: AS3: MIT-GATEWAYS - Massachusetts Institute of Technology
-	// 1 of 1 matches
-	// AS3: MIT-GATEWAYS - Massachusetts Institute of Technology
 }