Fix prefix links on prefix length page with URL encoding

- Add urlEncode template function to properly encode prefix URLs
- Move prefix_length.html to embedded templates with function map
- Prevents broken links for prefixes containing slashes

.gitignore

@@ -35,3 +35,4 @@ pkg/asinfo/asdata.json
 
 # Debug output files
 out
+log.txt

Makefile

@@ -21,7 +21,7 @@ clean:
 	rm -rf bin/
 
 run: build
-	./bin/routewatch
+	DEBUG=routewatch ./bin/routewatch 2>&1 | tee log.txt
 
 asupdate:
 	@echo "Updating AS info data..."

internal/database/database.go

@@ -2,6 +2,7 @@
 package database
 
 import (
+	"context"
 	"database/sql"
 	_ "embed"
 	"encoding/json"
@@ -10,6 +11,8 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"runtime"
+	"sync"
 	"time"
 
 	"git.eeqj.de/sneak/routewatch/internal/config"
@@ -42,9 +45,12 @@ var (
 
 // Database manages the SQLite database connection and operations.
 type Database struct {
-	db     *sql.DB
-	logger *logger.Logger
-	path   string
+	db       *sql.DB
+	logger   *logger.Logger
+	path     string
+	mu       sync.Mutex
+	lockedAt time.Time
+	lockedBy string
 }
 
 // New creates a new database connection and initializes the schema.
@@ -61,8 +67,11 @@ func New(cfg *config.Config, logger *logger.Logger) (*Database, error) {
 	}
 
 	// Add connection parameters for go-sqlite3
-	// Enable WAL mode and other performance optimizations
-	dsn := fmt.Sprintf("file:%s?_busy_timeout=5000&_journal_mode=WAL&_synchronous=NORMAL&cache=shared", dbPath)
+	// Configure SQLite connection parameters
+	dsn := fmt.Sprintf(
+		"file:%s",
+		dbPath,
+	)
 	db, err := sql.Open("sqlite3", dsn)
 	if err != nil {
 		return nil, fmt.Errorf("failed to open database: %w", err)
@@ -73,9 +82,10 @@ func New(cfg *config.Config, logger *logger.Logger) (*Database, error) {
 	}
 
 	// Set connection pool parameters
-	// Single connection to avoid locking issues with SQLite
-	db.SetMaxOpenConns(1)
-	db.SetMaxIdleConns(1)
+	// Multiple connections allow concurrent reads while writes are serialized
+	const maxConns = 10
+	db.SetMaxOpenConns(maxConns)
+	db.SetMaxIdleConns(maxConns)
 	db.SetConnMaxLifetime(0)
 
 	database := &Database{db: db, logger: logger, path: dbPath}
@@ -89,19 +99,15 @@ func New(cfg *config.Config, logger *logger.Logger) (*Database, error) {
 
 // Initialize creates the database schema if it doesn't exist.
 func (d *Database) Initialize() error {
-	// Set SQLite pragmas for better performance
-	// WARNING: These settings trade durability for speed
+	// Set SQLite pragmas for performance
 	pragmas := []string{
 		"PRAGMA journal_mode=WAL",         // Write-Ahead Logging
-		"PRAGMA synchronous=OFF",          // Don't wait for disk writes - RISKY but FAST
-		"PRAGMA cache_size=-1048576",      // 1GB cache (negative = KB)
+		"PRAGMA synchronous=OFF",          // Don't wait for disk writes
+		"PRAGMA cache_size=-3145728",      // 3GB cache (upper limit for 2.4GB DB)
 		"PRAGMA temp_store=MEMORY",        // Use memory for temp tables
-		"PRAGMA mmap_size=536870912",      // 512MB memory-mapped I/O
-		"PRAGMA wal_autocheckpoint=10000", // Checkpoint every 10000 pages (less frequent)
-		"PRAGMA wal_checkpoint(PASSIVE)",  // Checkpoint now
-		"PRAGMA page_size=8192",           // Larger page size for better performance
-		"PRAGMA busy_timeout=30000",       // 30 second busy timeout
-		"PRAGMA optimize",                 // Run optimizer
+		"PRAGMA wal_checkpoint(TRUNCATE)", // Checkpoint and truncate WAL now
+		"PRAGMA busy_timeout=5000",        // 5 second busy timeout
+		"PRAGMA analysis_limit=0",         // Disable automatic ANALYZE
 	}
 
 	for _, pragma := range pragmas {
@@ -111,8 +117,17 @@ func (d *Database) Initialize() error {
 	}
 
 	err := d.exec(dbSchema)
+	if err != nil {
+		return err
+	}
 
-	return err
+	// Run VACUUM on startup to optimize database
+	d.logger.Info("Running VACUUM to optimize database (this may take a moment)")
+	if err := d.exec("VACUUM"); err != nil {
+		d.logger.Warn("Failed to VACUUM database", "error", err)
+	}
+
+	return nil
 }
 
 // Close closes the database connection.
@@ -120,6 +135,33 @@ func (d *Database) Close() error {
 	return d.db.Close()
 }
 
+// lock acquires the database mutex and logs debug information
+func (d *Database) lock(operation string) {
+	// Get caller information
+	_, file, line, _ := runtime.Caller(1)
+	caller := fmt.Sprintf("%s:%d", filepath.Base(file), line)
+
+	d.logger.Debug("Acquiring database lock", "operation", operation, "caller", caller)
+
+	d.mu.Lock()
+	d.lockedAt = time.Now()
+	d.lockedBy = fmt.Sprintf("%s (%s)", operation, caller)
+
+	d.logger.Debug("Database lock acquired", "operation", operation, "caller", caller)
+}
+
+// unlock releases the database mutex and logs debug information including hold duration
+func (d *Database) unlock() {
+	holdDuration := time.Since(d.lockedAt)
+	lockedBy := d.lockedBy
+
+	d.lockedAt = time.Time{}
+	d.lockedBy = ""
+	d.mu.Unlock()
+
+	d.logger.Debug("Database lock released", "held_by", lockedBy, "duration_ms", holdDuration.Milliseconds())
+}
+
 // beginTx starts a new transaction with logging
 func (d *Database) beginTx() (*loggingTx, error) {
 	tx, err := d.db.Begin()
@@ -130,8 +172,255 @@ func (d *Database) beginTx() (*loggingTx, error) {
 	return &loggingTx{Tx: tx, logger: d.logger}, nil
 }
 
+// UpsertLiveRouteBatch inserts or updates multiple live routes in a single transaction
+func (d *Database) UpsertLiveRouteBatch(routes []*LiveRoute) error {
+	if len(routes) == 0 {
+		return nil
+	}
+
+	d.lock("UpsertLiveRouteBatch")
+	defer d.unlock()
+
+	tx, err := d.beginTx()
+	if err != nil {
+		return fmt.Errorf("failed to begin transaction: %w", err)
+	}
+	defer func() {
+		if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
+			d.logger.Error("Failed to rollback transaction", "error", err)
+		}
+	}()
+
+	// Use prepared statement for better performance
+	query := `
+		INSERT INTO live_routes (id, prefix, mask_length, ip_version, origin_asn, peer_ip, as_path, next_hop, 
+			last_updated, v4_ip_start, v4_ip_end)
+		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+		ON CONFLICT(prefix, origin_asn, peer_ip) DO UPDATE SET
+			mask_length = excluded.mask_length,
+			ip_version = excluded.ip_version,
+			as_path = excluded.as_path,
+			next_hop = excluded.next_hop,
+			last_updated = excluded.last_updated,
+			v4_ip_start = excluded.v4_ip_start,
+			v4_ip_end = excluded.v4_ip_end
+	`
+
+	stmt, err := tx.Prepare(query)
+	if err != nil {
+		return fmt.Errorf("failed to prepare statement: %w", err)
+	}
+	defer func() { _ = stmt.Close() }()
+
+	for _, route := range routes {
+		// Encode AS path as JSON
+		pathJSON, err := json.Marshal(route.ASPath)
+		if err != nil {
+			return fmt.Errorf("failed to encode AS path: %w", err)
+		}
+
+		// Convert v4_ip_start and v4_ip_end to interface{} for SQL NULL handling
+		var v4Start, v4End interface{}
+		if route.V4IPStart != nil {
+			v4Start = *route.V4IPStart
+		}
+		if route.V4IPEnd != nil {
+			v4End = *route.V4IPEnd
+		}
+
+		_, err = stmt.Exec(
+			route.ID.String(),
+			route.Prefix,
+			route.MaskLength,
+			route.IPVersion,
+			route.OriginASN,
+			route.PeerIP,
+			string(pathJSON),
+			route.NextHop,
+			route.LastUpdated,
+			v4Start,
+			v4End,
+		)
+		if err != nil {
+			return fmt.Errorf("failed to upsert route %s: %w", route.Prefix, err)
+		}
+	}
+
+	if err = tx.Commit(); err != nil {
+		return fmt.Errorf("failed to commit transaction: %w", err)
+	}
+
+	return nil
+}
+
+// DeleteLiveRouteBatch deletes multiple live routes in a single transaction
+func (d *Database) DeleteLiveRouteBatch(deletions []LiveRouteDeletion) error {
+	if len(deletions) == 0 {
+		return nil
+	}
+
+	d.lock("DeleteLiveRouteBatch")
+	defer d.unlock()
+
+	tx, err := d.beginTx()
+	if err != nil {
+		return fmt.Errorf("failed to begin transaction: %w", err)
+	}
+	defer func() {
+		if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
+			d.logger.Error("Failed to rollback transaction", "error", err)
+		}
+	}()
+
+	// Separate deletions by type and use prepared statements
+	var withOrigin []LiveRouteDeletion
+	var withoutOrigin []LiveRouteDeletion
+
+	for _, del := range deletions {
+		if del.OriginASN == 0 {
+			withoutOrigin = append(withoutOrigin, del)
+		} else {
+			withOrigin = append(withOrigin, del)
+		}
+	}
+
+	// Process deletions with origin ASN
+	if len(withOrigin) > 0 {
+		stmt, err := tx.Prepare(`DELETE FROM live_routes WHERE prefix = ? AND origin_asn = ? AND peer_ip = ?`)
+		if err != nil {
+			return fmt.Errorf("failed to prepare delete statement: %w", err)
+		}
+		defer func() { _ = stmt.Close() }()
+
+		for _, del := range withOrigin {
+			_, err = stmt.Exec(del.Prefix, del.OriginASN, del.PeerIP)
+			if err != nil {
+				return fmt.Errorf("failed to delete route %s: %w", del.Prefix, err)
+			}
+		}
+	}
+
+	// Process deletions without origin ASN
+	if len(withoutOrigin) > 0 {
+		stmt, err := tx.Prepare(`DELETE FROM live_routes WHERE prefix = ? AND peer_ip = ?`)
+		if err != nil {
+			return fmt.Errorf("failed to prepare delete statement: %w", err)
+		}
+		defer func() { _ = stmt.Close() }()
+
+		for _, del := range withoutOrigin {
+			_, err = stmt.Exec(del.Prefix, del.PeerIP)
+			if err != nil {
+				return fmt.Errorf("failed to delete route %s: %w", del.Prefix, err)
+			}
+		}
+	}
+
+	if err = tx.Commit(); err != nil {
+		return fmt.Errorf("failed to commit transaction: %w", err)
+	}
+
+	return nil
+}
+
+// GetOrCreateASNBatch creates or updates multiple ASNs in a single transaction
+func (d *Database) GetOrCreateASNBatch(asns map[int]time.Time) error {
+	if len(asns) == 0 {
+		return nil
+	}
+
+	d.lock("GetOrCreateASNBatch")
+	defer d.unlock()
+
+	tx, err := d.beginTx()
+	if err != nil {
+		return fmt.Errorf("failed to begin transaction: %w", err)
+	}
+	defer func() {
+		if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
+			d.logger.Error("Failed to rollback transaction", "error", err)
+		}
+	}()
+
+	// Prepare statements
+	selectStmt, err := tx.Prepare(
+		"SELECT id, number, handle, description, first_seen, last_seen FROM asns WHERE number = ?")
+	if err != nil {
+		return fmt.Errorf("failed to prepare select statement: %w", err)
+	}
+	defer func() { _ = selectStmt.Close() }()
+
+	updateStmt, err := tx.Prepare("UPDATE asns SET last_seen = ? WHERE id = ?")
+	if err != nil {
+		return fmt.Errorf("failed to prepare update statement: %w", err)
+	}
+	defer func() { _ = updateStmt.Close() }()
+
+	insertStmt, err := tx.Prepare(
+		"INSERT INTO asns (id, number, handle, description, first_seen, last_seen) VALUES (?, ?, ?, ?, ?, ?)")
+	if err != nil {
+		return fmt.Errorf("failed to prepare insert statement: %w", err)
+	}
+	defer func() { _ = insertStmt.Close() }()
+
+	for number, timestamp := range asns {
+		var asn ASN
+		var idStr string
+		var handle, description sql.NullString
+
+		err = selectStmt.QueryRow(number).Scan(&idStr, &asn.Number, &handle, &description, &asn.FirstSeen, &asn.LastSeen)
+
+		if err == nil {
+			// ASN exists, update last_seen
+			asn.ID, _ = uuid.Parse(idStr)
+			_, err = updateStmt.Exec(timestamp, asn.ID.String())
+			if err != nil {
+				return fmt.Errorf("failed to update ASN %d: %w", number, err)
+			}
+
+			continue
+		}
+
+		if err == sql.ErrNoRows {
+			// ASN doesn't exist, create it
+			asn = ASN{
+				ID:        generateUUID(),
+				Number:    number,
+				FirstSeen: timestamp,
+				LastSeen:  timestamp,
+			}
+
+			// Look up ASN info
+			if info, ok := asinfo.Get(number); ok {
+				asn.Handle = info.Handle
+				asn.Description = info.Description
+			}
+
+			_, err = insertStmt.Exec(asn.ID.String(), asn.Number, asn.Handle, asn.Description, asn.FirstSeen, asn.LastSeen)
+			if err != nil {
+				return fmt.Errorf("failed to insert ASN %d: %w", number, err)
+			}
+
+			continue
+		}
+
+		if err != nil {
+			return fmt.Errorf("failed to query ASN %d: %w", number, err)
+		}
+	}
+
+	if err = tx.Commit(); err != nil {
+		return fmt.Errorf("failed to commit transaction: %w", err)
+	}
+
+	return nil
+}
+
 // GetOrCreateASN retrieves an existing ASN or creates a new one if it doesn't exist.
 func (d *Database) GetOrCreateASN(number int, timestamp time.Time) (*ASN, error) {
+	d.lock("GetOrCreateASN")
+	defer d.unlock()
+
 	tx, err := d.beginTx()
 	if err != nil {
 		return nil, err
@@ -203,6 +492,9 @@ func (d *Database) GetOrCreateASN(number int, timestamp time.Time) (*ASN, error)
 
 // GetOrCreatePrefix retrieves an existing prefix or creates a new one if it doesn't exist.
 func (d *Database) GetOrCreatePrefix(prefix string, timestamp time.Time) (*Prefix, error) {
+	d.lock("GetOrCreatePrefix")
+	defer d.unlock()
+
 	tx, err := d.beginTx()
 	if err != nil {
 		return nil, err
@@ -265,6 +557,9 @@ func (d *Database) GetOrCreatePrefix(prefix string, timestamp time.Time) (*Prefi
 
 // RecordAnnouncement inserts a new BGP announcement or withdrawal into the database.
 func (d *Database) RecordAnnouncement(announcement *Announcement) error {
+	d.lock("RecordAnnouncement")
+	defer d.unlock()
+
 	err := d.exec(`
 		INSERT INTO announcements (id, prefix_id, asn_id, origin_asn_id, path, next_hop, timestamp, is_withdrawal)
 		VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
@@ -290,6 +585,9 @@ func (d *Database) RecordPeering(asA, asB int, timestamp time.Time) error {
 		asA, asB = asB, asA
 	}
 
+	d.lock("RecordPeering")
+	defer d.unlock()
+
 	tx, err := d.beginTx()
 	if err != nil {
 		return err
@@ -333,8 +631,77 @@ func (d *Database) RecordPeering(asA, asB int, timestamp time.Time) error {
 	return nil
 }
 
+// UpdatePeerBatch updates or creates multiple BGP peer records in a single transaction
+func (d *Database) UpdatePeerBatch(peers map[string]PeerUpdate) error {
+	if len(peers) == 0 {
+		return nil
+	}
+
+	d.lock("UpdatePeerBatch")
+	defer d.unlock()
+
+	tx, err := d.beginTx()
+	if err != nil {
+		return fmt.Errorf("failed to begin transaction: %w", err)
+	}
+	defer func() {
+		if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
+			d.logger.Error("Failed to rollback transaction", "error", err)
+		}
+	}()
+
+	// Prepare statements
+	checkStmt, err := tx.Prepare("SELECT EXISTS(SELECT 1 FROM bgp_peers WHERE peer_ip = ?)")
+	if err != nil {
+		return fmt.Errorf("failed to prepare check statement: %w", err)
+	}
+	defer func() { _ = checkStmt.Close() }()
+
+	updateStmt, err := tx.Prepare(
+		"UPDATE bgp_peers SET peer_asn = ?, last_seen = ?, last_message_type = ? WHERE peer_ip = ?")
+	if err != nil {
+		return fmt.Errorf("failed to prepare update statement: %w", err)
+	}
+	defer func() { _ = updateStmt.Close() }()
+
+	insertStmt, err := tx.Prepare(
+		"INSERT INTO bgp_peers (id, peer_ip, peer_asn, first_seen, last_seen, last_message_type) VALUES (?, ?, ?, ?, ?, ?)")
+	if err != nil {
+		return fmt.Errorf("failed to prepare insert statement: %w", err)
+	}
+	defer func() { _ = insertStmt.Close() }()
+
+	for _, update := range peers {
+		var exists bool
+		err = checkStmt.QueryRow(update.PeerIP).Scan(&exists)
+		if err != nil {
+			return fmt.Errorf("failed to check peer %s: %w", update.PeerIP, err)
+		}
+
+		if exists {
+			_, err = updateStmt.Exec(update.PeerASN, update.Timestamp, update.MessageType, update.PeerIP)
+		} else {
+			_, err = insertStmt.Exec(
+				generateUUID().String(), update.PeerIP, update.PeerASN,
+				update.Timestamp, update.Timestamp, update.MessageType)
+		}
+		if err != nil {
+			return fmt.Errorf("failed to update peer %s: %w", update.PeerIP, err)
+		}
+	}
+
+	if err = tx.Commit(); err != nil {
+		return fmt.Errorf("failed to commit transaction: %w", err)
+	}
+
+	return nil
+}
+
 // UpdatePeer updates or creates a BGP peer record
 func (d *Database) UpdatePeer(peerIP string, peerASN int, messageType string, timestamp time.Time) error {
+	d.lock("UpdatePeer")
+	defer d.unlock()
+
 	tx, err := d.beginTx()
 	if err != nil {
 		return err
@@ -381,41 +748,48 @@ func (d *Database) UpdatePeer(peerIP string, peerASN int, messageType string, ti
 
 // GetStats returns database statistics
 func (d *Database) GetStats() (Stats, error) {
+	return d.GetStatsContext(context.Background())
+}
+
+// GetStatsContext returns database statistics with context support
+func (d *Database) GetStatsContext(ctx context.Context) (Stats, error) {
 	var stats Stats
 
 	// Count ASNs
-	err := d.queryRow("SELECT COUNT(*) FROM asns").Scan(&stats.ASNs)
+	err := d.db.QueryRowContext(ctx, "SELECT COUNT(*) FROM asns").Scan(&stats.ASNs)
 	if err != nil {
 		return stats, err
 	}
 
 	// Count prefixes
-	err = d.queryRow("SELECT COUNT(*) FROM prefixes").Scan(&stats.Prefixes)
+	err = d.db.QueryRowContext(ctx, "SELECT COUNT(*) FROM prefixes").Scan(&stats.Prefixes)
 	if err != nil {
 		return stats, err
 	}
 
 	// Count IPv4 and IPv6 prefixes
 	const ipVersionV4 = 4
-	err = d.queryRow("SELECT COUNT(*) FROM prefixes WHERE ip_version = ?", ipVersionV4).Scan(&stats.IPv4Prefixes)
+	err = d.db.QueryRowContext(ctx,
+		"SELECT COUNT(*) FROM prefixes WHERE ip_version = ?", ipVersionV4).Scan(&stats.IPv4Prefixes)
 	if err != nil {
 		return stats, err
 	}
 
 	const ipVersionV6 = 6
-	err = d.queryRow("SELECT COUNT(*) FROM prefixes WHERE ip_version = ?", ipVersionV6).Scan(&stats.IPv6Prefixes)
+	err = d.db.QueryRowContext(ctx,
+		"SELECT COUNT(*) FROM prefixes WHERE ip_version = ?", ipVersionV6).Scan(&stats.IPv6Prefixes)
 	if err != nil {
 		return stats, err
 	}
 
 	// Count peerings
-	err = d.queryRow("SELECT COUNT(*) FROM peerings").Scan(&stats.Peerings)
+	err = d.db.QueryRowContext(ctx, "SELECT COUNT(*) FROM peerings").Scan(&stats.Peerings)
 	if err != nil {
 		return stats, err
 	}
 
 	// Count peers
-	err = d.queryRow("SELECT COUNT(*) FROM bgp_peers").Scan(&stats.Peers)
+	err = d.db.QueryRowContext(ctx, "SELECT COUNT(*) FROM bgp_peers").Scan(&stats.Peers)
 	if err != nil {
 		return stats, err
 	}
@@ -430,13 +804,13 @@ func (d *Database) GetStats() (Stats, error) {
 	}
 
 	// Get live routes count
-	err = d.db.QueryRow("SELECT COUNT(*) FROM live_routes").Scan(&stats.LiveRoutes)
+	err = d.db.QueryRowContext(ctx, "SELECT COUNT(*) FROM live_routes").Scan(&stats.LiveRoutes)
 	if err != nil {
 		return stats, fmt.Errorf("failed to count live routes: %w", err)
 	}
 
 	// Get prefix distribution
-	stats.IPv4PrefixDistribution, stats.IPv6PrefixDistribution, err = d.GetPrefixDistribution()
+	stats.IPv4PrefixDistribution, stats.IPv6PrefixDistribution, err = d.GetPrefixDistributionContext(ctx)
 	if err != nil {
 		// Log but don't fail
 		d.logger.Warn("Failed to get prefix distribution", "error", err)
@@ -447,6 +821,9 @@ func (d *Database) GetStats() (Stats, error) {
 
 // UpsertLiveRoute inserts or updates a live route
 func (d *Database) UpsertLiveRoute(route *LiveRoute) error {
+	d.lock("UpsertLiveRoute")
+	defer d.unlock()
+
 	query := `
 		INSERT INTO live_routes (id, prefix, mask_length, ip_version, origin_asn, peer_ip, as_path, next_hop, 
 			last_updated, v4_ip_start, v4_ip_end)
@@ -496,6 +873,9 @@ func (d *Database) UpsertLiveRoute(route *LiveRoute) error {
 // DeleteLiveRoute deletes a live route
 // If originASN is 0, deletes all routes for the prefix/peer combination
 func (d *Database) DeleteLiveRoute(prefix string, originASN int, peerIP string) error {
+	d.lock("DeleteLiveRoute")
+	defer d.unlock()
+
 	var query string
 	var err error
 
@@ -512,17 +892,23 @@ func (d *Database) DeleteLiveRoute(prefix string, originASN int, peerIP string)
 	return err
 }
 
-// GetPrefixDistribution returns the distribution of prefixes by mask length
+// GetPrefixDistribution returns the distribution of unique prefixes by mask length
 func (d *Database) GetPrefixDistribution() (ipv4 []PrefixDistribution, ipv6 []PrefixDistribution, err error) {
-	// IPv4 distribution
+	return d.GetPrefixDistributionContext(context.Background())
+}
+
+// GetPrefixDistributionContext returns the distribution of unique prefixes by mask length with context support
+func (d *Database) GetPrefixDistributionContext(ctx context.Context) (
+	ipv4 []PrefixDistribution, ipv6 []PrefixDistribution, err error) {
+	// IPv4 distribution - count unique prefixes, not routes
 	query := `
-		SELECT mask_length, COUNT(*) as count
+		SELECT mask_length, COUNT(DISTINCT prefix) as count
 		FROM live_routes
 		WHERE ip_version = 4
 		GROUP BY mask_length
 		ORDER BY mask_length
 	`
-	rows, err := d.db.Query(query)
+	rows, err := d.db.QueryContext(ctx, query)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to query IPv4 distribution: %w", err)
 	}
@@ -536,15 +922,15 @@ func (d *Database) GetPrefixDistribution() (ipv4 []PrefixDistribution, ipv6 []Pr
 		ipv4 = append(ipv4, dist)
 	}
 
-	// IPv6 distribution
+	// IPv6 distribution - count unique prefixes, not routes
 	query = `
-		SELECT mask_length, COUNT(*) as count
+		SELECT mask_length, COUNT(DISTINCT prefix) as count
 		FROM live_routes
 		WHERE ip_version = 6
 		GROUP BY mask_length
 		ORDER BY mask_length
 	`
-	rows, err = d.db.Query(query)
+	rows, err = d.db.QueryContext(ctx, query)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to query IPv6 distribution: %w", err)
 	}
@@ -563,14 +949,19 @@ func (d *Database) GetPrefixDistribution() (ipv4 []PrefixDistribution, ipv6 []Pr
 
 // GetLiveRouteCounts returns the count of IPv4 and IPv6 routes
 func (d *Database) GetLiveRouteCounts() (ipv4Count, ipv6Count int, err error) {
+	return d.GetLiveRouteCountsContext(context.Background())
+}
+
+// GetLiveRouteCountsContext returns the count of IPv4 and IPv6 routes with context support
+func (d *Database) GetLiveRouteCountsContext(ctx context.Context) (ipv4Count, ipv6Count int, err error) {
 	// Get IPv4 count
-	err = d.db.QueryRow("SELECT COUNT(*) FROM live_routes WHERE ip_version = 4").Scan(&ipv4Count)
+	err = d.db.QueryRowContext(ctx, "SELECT COUNT(*) FROM live_routes WHERE ip_version = 4").Scan(&ipv4Count)
 	if err != nil {
 		return 0, 0, fmt.Errorf("failed to count IPv4 routes: %w", err)
 	}
 
 	// Get IPv6 count
-	err = d.db.QueryRow("SELECT COUNT(*) FROM live_routes WHERE ip_version = 6").Scan(&ipv6Count)
+	err = d.db.QueryRowContext(ctx, "SELECT COUNT(*) FROM live_routes WHERE ip_version = 6").Scan(&ipv6Count)
 	if err != nil {
 		return 0, 0, fmt.Errorf("failed to count IPv6 routes: %w", err)
 	}
@@ -580,6 +971,11 @@ func (d *Database) GetLiveRouteCounts() (ipv4Count, ipv6Count int, err error) {
 
 // GetASInfoForIP returns AS information for the given IP address
 func (d *Database) GetASInfoForIP(ip string) (*ASInfo, error) {
+	return d.GetASInfoForIPContext(context.Background(), ip)
+}
+
+// GetASInfoForIPContext returns AS information for the given IP address with context support
+func (d *Database) GetASInfoForIPContext(ctx context.Context, ip string) (*ASInfo, error) {
 	// Parse the IP to validate it
 	parsedIP := net.ParseIP(ip)
 	if parsedIP == nil {
@@ -612,7 +1008,7 @@ func (d *Database) GetASInfoForIP(ip string) (*ASInfo, error) {
 		var lastUpdated time.Time
 		var handle, description sql.NullString
 
-		err := d.db.QueryRow(query, ipVersionV4, ipUint, ipUint).Scan(
+		err := d.db.QueryRowContext(ctx, query, ipVersionV4, ipUint, ipUint).Scan(
 			&prefix, &maskLength, &originASN, &lastUpdated, &handle, &description)
 		if err != nil {
 			if err == sql.ErrNoRows {
@@ -643,7 +1039,7 @@ func (d *Database) GetASInfoForIP(ip string) (*ASInfo, error) {
 		ORDER BY lr.mask_length DESC
 	`
 
-	rows, err := d.db.Query(query, ipVersionV6)
+	rows, err := d.db.QueryContext(ctx, query, ipVersionV6)
 	if err != nil {
 		return nil, fmt.Errorf("failed to query routes: %w", err)
 	}
@@ -743,3 +1139,186 @@ func CalculateIPv4Range(cidr string) (start, end uint32, err error) {
 
 	return start, end, nil
 }
+
+// GetASDetails returns detailed information about an AS including prefixes
+func (d *Database) GetASDetails(asn int) (*ASN, []LiveRoute, error) {
+	return d.GetASDetailsContext(context.Background(), asn)
+}
+
+// GetASDetailsContext returns detailed information about an AS including prefixes with context support
+func (d *Database) GetASDetailsContext(ctx context.Context, asn int) (*ASN, []LiveRoute, error) {
+	// Get AS information
+	var asnInfo ASN
+	var idStr string
+	var handle, description sql.NullString
+	err := d.db.QueryRowContext(ctx,
+		"SELECT id, number, handle, description, first_seen, last_seen FROM asns WHERE number = ?",
+		asn,
+	).Scan(&idStr, &asnInfo.Number, &handle, &description, &asnInfo.FirstSeen, &asnInfo.LastSeen)
+
+	if err != nil {
+		if err == sql.ErrNoRows {
+			return nil, nil, fmt.Errorf("%w: AS%d", ErrNoRoute, asn)
+		}
+
+		return nil, nil, fmt.Errorf("failed to query AS: %w", err)
+	}
+
+	asnInfo.ID, _ = uuid.Parse(idStr)
+	asnInfo.Handle = handle.String
+	asnInfo.Description = description.String
+
+	// Get prefixes announced by this AS (unique prefixes with most recent update)
+	query := `
+		SELECT prefix, mask_length, ip_version, MAX(last_updated) as last_updated
+		FROM live_routes
+		WHERE origin_asn = ?
+		GROUP BY prefix, mask_length, ip_version
+	`
+
+	rows, err := d.db.QueryContext(ctx, query, asn)
+	if err != nil {
+		return &asnInfo, nil, fmt.Errorf("failed to query prefixes: %w", err)
+	}
+	defer func() { _ = rows.Close() }()
+
+	var prefixes []LiveRoute
+	for rows.Next() {
+		var route LiveRoute
+		var lastUpdatedStr string
+		err := rows.Scan(&route.Prefix, &route.MaskLength, &route.IPVersion, &lastUpdatedStr)
+		if err != nil {
+			d.logger.Error("Failed to scan prefix row", "error", err, "asn", asn)
+
+			continue
+		}
+		// Parse the timestamp string
+		route.LastUpdated, err = time.Parse("2006-01-02 15:04:05-07:00", lastUpdatedStr)
+		if err != nil {
+			// Try without timezone
+			route.LastUpdated, err = time.Parse("2006-01-02 15:04:05", lastUpdatedStr)
+			if err != nil {
+				d.logger.Error("Failed to parse timestamp", "error", err, "timestamp", lastUpdatedStr)
+
+				continue
+			}
+		}
+		route.OriginASN = asn
+		prefixes = append(prefixes, route)
+	}
+
+	return &asnInfo, prefixes, nil
+}
+
+// GetPrefixDetails returns detailed information about a prefix
+func (d *Database) GetPrefixDetails(prefix string) ([]LiveRoute, error) {
+	return d.GetPrefixDetailsContext(context.Background(), prefix)
+}
+
+// GetPrefixDetailsContext returns detailed information about a prefix with context support
+func (d *Database) GetPrefixDetailsContext(ctx context.Context, prefix string) ([]LiveRoute, error) {
+	query := `
+		SELECT lr.origin_asn, lr.peer_ip, lr.as_path, lr.next_hop, lr.last_updated,
+			   a.handle, a.description
+		FROM live_routes lr
+		LEFT JOIN asns a ON a.number = lr.origin_asn
+		WHERE lr.prefix = ?
+		ORDER BY lr.origin_asn, lr.peer_ip
+	`
+
+	rows, err := d.db.QueryContext(ctx, query, prefix)
+	if err != nil {
+		return nil, fmt.Errorf("failed to query prefix details: %w", err)
+	}
+	defer func() { _ = rows.Close() }()
+
+	var routes []LiveRoute
+	for rows.Next() {
+		var route LiveRoute
+		var pathJSON string
+		var handle, description sql.NullString
+
+		err := rows.Scan(
+			&route.OriginASN, &route.PeerIP, &pathJSON, &route.NextHop,
+			&route.LastUpdated, &handle, &description,
+		)
+		if err != nil {
+			continue
+		}
+
+		// Decode AS path
+		if err := json.Unmarshal([]byte(pathJSON), &route.ASPath); err != nil {
+			route.ASPath = []int{}
+		}
+
+		route.Prefix = prefix
+		routes = append(routes, route)
+	}
+
+	if len(routes) == 0 {
+		return nil, fmt.Errorf("%w: %s", ErrNoRoute, prefix)
+	}
+
+	return routes, nil
+}
+
+// GetRandomPrefixesByLength returns a random sample of prefixes with the specified mask length
+func (d *Database) GetRandomPrefixesByLength(maskLength, ipVersion, limit int) ([]LiveRoute, error) {
+	return d.GetRandomPrefixesByLengthContext(context.Background(), maskLength, ipVersion, limit)
+}
+
+// GetRandomPrefixesByLengthContext returns a random sample of prefixes with context support
+func (d *Database) GetRandomPrefixesByLengthContext(
+	ctx context.Context, maskLength, ipVersion, limit int) ([]LiveRoute, error) {
+	// Select unique prefixes with their most recent route information
+	query := `
+		WITH unique_prefixes AS (
+			SELECT prefix, MAX(last_updated) as max_updated
+			FROM live_routes
+			WHERE mask_length = ? AND ip_version = ?
+			GROUP BY prefix
+			ORDER BY RANDOM()
+			LIMIT ?
+		)
+		SELECT lr.prefix, lr.mask_length, lr.ip_version, lr.origin_asn, lr.as_path, 
+			lr.peer_ip, lr.last_updated
+		FROM live_routes lr
+		INNER JOIN unique_prefixes up ON lr.prefix = up.prefix AND lr.last_updated = up.max_updated
+		WHERE lr.mask_length = ? AND lr.ip_version = ?
+	`
+
+	rows, err := d.db.QueryContext(ctx, query, maskLength, ipVersion, limit, maskLength, ipVersion)
+	if err != nil {
+		return nil, fmt.Errorf("failed to query random prefixes: %w", err)
+	}
+	defer func() {
+		_ = rows.Close()
+	}()
+
+	var routes []LiveRoute
+	for rows.Next() {
+		var route LiveRoute
+		var pathJSON string
+		err := rows.Scan(
+			&route.Prefix,
+			&route.MaskLength,
+			&route.IPVersion,
+			&route.OriginASN,
+			&pathJSON,
+			&route.PeerIP,
+			&route.LastUpdated,
+		)
+		if err != nil {
+			continue
+		}
+
+		// Decode AS path
+		if err := json.Unmarshal([]byte(pathJSON), &route.ASPath); err != nil {
+			route.ASPath = []int{}
+		}
+
+		routes = append(routes, route)
+	}
+
+	return routes, nil
+}

internal/database/interface.go

@@ -1,6 +1,7 @@
 package database
 
 import (
+	"context"
 	"time"
 )
 
@@ -22,6 +23,7 @@ type Stats struct {
 type Store interface {
 	// ASN operations
 	GetOrCreateASN(number int, timestamp time.Time) (*ASN, error)
+	GetOrCreateASNBatch(asns map[int]time.Time) error
 
 	// Prefix operations
 	GetOrCreatePrefix(prefix string, timestamp time.Time) (*Prefix, error)
@@ -34,18 +36,33 @@ type Store interface {
 
 	// Statistics
 	GetStats() (Stats, error)
+	GetStatsContext(ctx context.Context) (Stats, error)
 
 	// Peer operations
 	UpdatePeer(peerIP string, peerASN int, messageType string, timestamp time.Time) error
+	UpdatePeerBatch(peers map[string]PeerUpdate) error
 
 	// Live route operations
 	UpsertLiveRoute(route *LiveRoute) error
+	UpsertLiveRouteBatch(routes []*LiveRoute) error
 	DeleteLiveRoute(prefix string, originASN int, peerIP string) error
+	DeleteLiveRouteBatch(deletions []LiveRouteDeletion) error
 	GetPrefixDistribution() (ipv4 []PrefixDistribution, ipv6 []PrefixDistribution, err error)
+	GetPrefixDistributionContext(ctx context.Context) (ipv4 []PrefixDistribution, ipv6 []PrefixDistribution, err error)
 	GetLiveRouteCounts() (ipv4Count, ipv6Count int, err error)
+	GetLiveRouteCountsContext(ctx context.Context) (ipv4Count, ipv6Count int, err error)
 
 	// IP lookup operations
 	GetASInfoForIP(ip string) (*ASInfo, error)
+	GetASInfoForIPContext(ctx context.Context, ip string) (*ASInfo, error)
+
+	// AS and prefix detail operations
+	GetASDetails(asn int) (*ASN, []LiveRoute, error)
+	GetASDetailsContext(ctx context.Context, asn int) (*ASN, []LiveRoute, error)
+	GetPrefixDetails(prefix string) ([]LiveRoute, error)
+	GetPrefixDetailsContext(ctx context.Context, prefix string) ([]LiveRoute, error)
+	GetRandomPrefixesByLength(maskLength, ipVersion, limit int) ([]LiveRoute, error)
+	GetRandomPrefixesByLengthContext(ctx context.Context, maskLength, ipVersion, limit int) ([]LiveRoute, error)
 
 	// Lifecycle
 	Close() error

internal/database/models.go

@@ -77,3 +77,18 @@ type ASInfo struct {
 	LastUpdated time.Time `json:"last_updated"`
 	Age         string    `json:"age"`
 }
+
+// LiveRouteDeletion represents parameters for deleting a live route
+type LiveRouteDeletion struct {
+	Prefix    string
+	OriginASN int
+	PeerIP    string
+}
+
+// PeerUpdate represents parameters for updating a peer
+type PeerUpdate struct {
+	PeerIP      string
+	PeerASN     int
+	MessageType string
+	Timestamp   time.Time
+}

internal/database/schema.sql

@@ -92,3 +92,5 @@ CREATE INDEX IF NOT EXISTS idx_live_routes_ip_version_mask ON live_routes(ip_ver
 CREATE INDEX IF NOT EXISTS idx_live_routes_last_updated ON live_routes(last_updated);
 -- Indexes for IPv4 range queries
 CREATE INDEX IF NOT EXISTS idx_live_routes_ipv4_range ON live_routes(v4_ip_start, v4_ip_end) WHERE ip_version = 4;
+-- Index to optimize COUNT(DISTINCT prefix) queries
+CREATE INDEX IF NOT EXISTS idx_live_routes_ip_mask_prefix ON live_routes(ip_version, mask_length, prefix);

internal/database/slowquery.go

@@ -19,6 +19,7 @@ func logSlowQuery(logger *logger.Logger, query string, start time.Time) {
 }
 
 // queryRow wraps QueryRow with slow query logging
+// nolint:unused // kept for consistency with other query wrappers
 func (d *Database) queryRow(query string, args ...interface{}) *sql.Row {
 	start := time.Now()
 	defer logSlowQuery(d.logger, query, start)

internal/routewatch/app.go

@@ -139,6 +139,10 @@ func (rw *RouteWatch) Shutdown() {
 		rw.logger.Info("Flushing prefix handler")
 		rw.prefixHandler.Stop()
 	}
+	if rw.peeringHandler != nil {
+		rw.logger.Info("Flushing peering handler")
+		rw.peeringHandler.Stop()
+	}
 
 	// Stop services
 	rw.streamer.Stop()

internal/routewatch/app_integration_test.go

@@ -163,6 +163,11 @@ func (m *mockStore) GetStats() (database.Stats, error) {
 	}, nil
 }
 
+// GetStatsContext returns statistics about the mock store with context support
+func (m *mockStore) GetStatsContext(ctx context.Context) (database.Stats, error) {
+	return m.GetStats()
+}
+
 // UpsertLiveRoute mock implementation
 func (m *mockStore) UpsertLiveRoute(route *database.LiveRoute) error {
 	// Simple mock - just return nil
@@ -181,12 +186,22 @@ func (m *mockStore) GetPrefixDistribution() (ipv4 []database.PrefixDistribution,
 	return nil, nil, nil
 }
 
+// GetPrefixDistributionContext mock implementation with context support
+func (m *mockStore) GetPrefixDistributionContext(ctx context.Context) (ipv4 []database.PrefixDistribution, ipv6 []database.PrefixDistribution, err error) {
+	return m.GetPrefixDistribution()
+}
+
 // GetLiveRouteCounts mock implementation
 func (m *mockStore) GetLiveRouteCounts() (ipv4Count, ipv6Count int, err error) {
 	// Return mock counts
 	return m.RouteCount / 2, m.RouteCount / 2, nil
 }
 
+// GetLiveRouteCountsContext mock implementation with context support
+func (m *mockStore) GetLiveRouteCountsContext(ctx context.Context) (ipv4Count, ipv6Count int, err error) {
+	return m.GetLiveRouteCounts()
+}
+
 // GetASInfoForIP mock implementation
 func (m *mockStore) GetASInfoForIP(ip string) (*database.ASInfo, error) {
 	// Simple mock - return a test AS
@@ -201,6 +216,109 @@ func (m *mockStore) GetASInfoForIP(ip string) (*database.ASInfo, error) {
 	}, nil
 }
 
+// GetASInfoForIPContext mock implementation with context support
+func (m *mockStore) GetASInfoForIPContext(ctx context.Context, ip string) (*database.ASInfo, error) {
+	return m.GetASInfoForIP(ip)
+}
+
+// GetASDetails mock implementation
+func (m *mockStore) GetASDetails(asn int) (*database.ASN, []database.LiveRoute, error) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	// Check if ASN exists
+	if asnInfo, exists := m.ASNs[asn]; exists {
+		// Return empty prefixes for now
+		return asnInfo, []database.LiveRoute{}, nil
+	}
+
+	return nil, nil, database.ErrNoRoute
+}
+
+// GetASDetailsContext mock implementation with context support
+func (m *mockStore) GetASDetailsContext(ctx context.Context, asn int) (*database.ASN, []database.LiveRoute, error) {
+	return m.GetASDetails(asn)
+}
+
+// GetPrefixDetails mock implementation
+func (m *mockStore) GetPrefixDetails(prefix string) ([]database.LiveRoute, error) {
+	// Return empty routes for now
+	return []database.LiveRoute{}, nil
+}
+
+// GetPrefixDetailsContext mock implementation with context support
+func (m *mockStore) GetPrefixDetailsContext(ctx context.Context, prefix string) ([]database.LiveRoute, error) {
+	return m.GetPrefixDetails(prefix)
+}
+
+func (m *mockStore) GetRandomPrefixesByLength(maskLength, ipVersion, limit int) ([]database.LiveRoute, error) {
+	// Return empty routes for now
+	return []database.LiveRoute{}, nil
+}
+
+// GetRandomPrefixesByLengthContext mock implementation with context support
+func (m *mockStore) GetRandomPrefixesByLengthContext(ctx context.Context, maskLength, ipVersion, limit int) ([]database.LiveRoute, error) {
+	return m.GetRandomPrefixesByLength(maskLength, ipVersion, limit)
+}
+
+// UpsertLiveRouteBatch mock implementation
+func (m *mockStore) UpsertLiveRouteBatch(routes []*database.LiveRoute) error {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	for _, route := range routes {
+		// Track prefix
+		if _, exists := m.Prefixes[route.Prefix]; !exists {
+			m.Prefixes[route.Prefix] = &database.Prefix{
+				ID:        uuid.New(),
+				Prefix:    route.Prefix,
+				IPVersion: route.IPVersion,
+				FirstSeen: route.LastUpdated,
+				LastSeen:  route.LastUpdated,
+			}
+			m.PrefixCount++
+			if route.IPVersion == 4 {
+				m.IPv4Prefixes++
+			} else {
+				m.IPv6Prefixes++
+			}
+		}
+		m.RouteCount++
+	}
+	return nil
+}
+
+// DeleteLiveRouteBatch mock implementation
+func (m *mockStore) DeleteLiveRouteBatch(deletions []database.LiveRouteDeletion) error {
+	// Simple mock - just return nil
+	return nil
+}
+
+// GetOrCreateASNBatch mock implementation
+func (m *mockStore) GetOrCreateASNBatch(asns map[int]time.Time) error {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	for number, timestamp := range asns {
+		if _, exists := m.ASNs[number]; !exists {
+			m.ASNs[number] = &database.ASN{
+				ID:        uuid.New(),
+				Number:    number,
+				FirstSeen: timestamp,
+				LastSeen:  timestamp,
+			}
+			m.ASNCount++
+		}
+	}
+	return nil
+}
+
+// UpdatePeerBatch mock implementation
+func (m *mockStore) UpdatePeerBatch(peers map[string]database.PeerUpdate) error {
+	// Simple mock - just return nil
+	return nil
+}
+
 func TestRouteWatchLiveFeed(t *testing.T) {
 
 	// Create mock database

internal/routewatch/ashandler.go

@@ -11,12 +11,14 @@ import (
 
 const (
 	// asHandlerQueueSize is the queue capacity for ASN operations
+	// DO NOT set this higher than 100000 without explicit instructions
 	asHandlerQueueSize = 100000
 
 	// asnBatchSize is the number of ASN operations to batch together
-	asnBatchSize = 10000
+	asnBatchSize = 30000
 
 	// asnBatchTimeout is the maximum time to wait before flushing a batch
+	// DO NOT reduce this timeout - larger batches are more efficient
 	asnBatchTimeout = 2 * time.Second
 )
 
@@ -144,11 +146,9 @@ func (h *ASHandler) flushBatchLocked() {
 		}
 	}
 
-	for asn, ts := range asnMap {
-		_, err := h.db.GetOrCreateASN(asn, ts)
-		if err != nil {
-			h.logger.Error("Failed to get/create ASN", "asn", asn, "error", err)
-		}
+	// Process all ASNs in a single batch transaction
+	if err := h.db.GetOrCreateASNBatch(asnMap); err != nil {
+		h.logger.Error("Failed to process ASN batch", "error", err, "count", len(asnMap))
 	}
 
 	// Clear batch

internal/routewatch/cli.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"os"
 	"os/signal"
+	"runtime"
+	"strings"
 	"syscall"
 	"time"
 
@@ -14,30 +16,67 @@ import (
 const (
 	// shutdownTimeout is the maximum time allowed for graceful shutdown
 	shutdownTimeout = 60 * time.Second
+	// debugInterval is how often to log debug stats
+	debugInterval = 60 * time.Second
+	// bytesPerMB is bytes per megabyte
+	bytesPerMB = 1024 * 1024
 )
 
+// logDebugStats logs goroutine count and memory usage
+func logDebugStats(logger *logger.Logger) {
+	// Only run if DEBUG env var contains "routewatch"
+	debugEnv := os.Getenv("DEBUG")
+	if !strings.Contains(debugEnv, "routewatch") {
+		return
+	}
+
+	ticker := time.NewTicker(debugInterval)
+	defer ticker.Stop()
+
+	for range ticker.C {
+		var m runtime.MemStats
+		runtime.ReadMemStats(&m)
+
+		logger.Debug("System stats",
+			"goroutines", runtime.NumGoroutine(),
+			"alloc_mb", m.Alloc/bytesPerMB,
+			"total_alloc_mb", m.TotalAlloc/bytesPerMB,
+			"sys_mb", m.Sys/bytesPerMB,
+			"num_gc", m.NumGC,
+			"heap_alloc_mb", m.HeapAlloc/bytesPerMB,
+			"heap_sys_mb", m.HeapSys/bytesPerMB,
+			"heap_idle_mb", m.HeapIdle/bytesPerMB,
+			"heap_inuse_mb", m.HeapInuse/bytesPerMB,
+			"heap_released_mb", m.HeapReleased/bytesPerMB,
+			"stack_inuse_mb", m.StackInuse/bytesPerMB,
+		)
+	}
+}
+
 // CLIEntry is the main entry point for the CLI
 func CLIEntry() {
 	app := fx.New(
 		getModule(),
 		fx.StopTimeout(shutdownTimeout), // Allow 60 seconds for graceful shutdown
-		fx.Invoke(func(lc fx.Lifecycle, rw *RouteWatch, logger *logger.Logger) {
+		fx.Invoke(func(lc fx.Lifecycle, rw *RouteWatch, logger *logger.Logger, shutdowner fx.Shutdowner) {
 			lc.Append(fx.Hook{
-				OnStart: func(_ context.Context) error {
+				OnStart: func(ctx context.Context) error {
+					// Start debug stats logging
+					go logDebugStats(logger)
+
+					// Handle shutdown signals
+					sigCh := make(chan os.Signal, 1)
+					signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
+
 					go func() {
-						ctx, cancel := context.WithCancel(context.Background())
-						defer cancel()
-
-						// Handle shutdown signals
-						sigCh := make(chan os.Signal, 1)
-						signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
-
-						go func() {
-							<-sigCh
-							logger.Info("Received shutdown signal")
-							cancel()
-						}()
+						<-sigCh
+						logger.Info("Received shutdown signal")
+						if err := shutdowner.Shutdown(); err != nil {
+							logger.Error("Failed to shutdown gracefully", "error", err)
+						}
+					}()
 
+					go func() {
 						if err := rw.Run(ctx); err != nil {
 							logger.Error("RouteWatch error", "error", err)
 						}

internal/routewatch/peerhandler.go

@@ -135,18 +135,22 @@ func (h *PeerHandler) flushBatchLocked() {
 		}
 	}
 
-	// Apply updates
-	for _, update := range peerMap {
-		if err := h.db.UpdatePeer(update.peerIP, update.peerASN, update.messageType, update.timestamp); err != nil {
-			h.logger.Error("Failed to update peer",
-				"peer", update.peerIP,
-				"peer_asn", update.peerASN,
-				"message_type", update.messageType,
-				"error", err,
-			)
+	// Convert to database format
+	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
+	if err := h.db.UpdatePeerBatch(dbPeerMap); err != nil {
+		h.logger.Error("Failed to process peer batch", "error", err, "count", len(dbPeerMap))
+	}
+
 	// Clear batch
 	h.peerBatch = h.peerBatch[:0]
 	h.lastFlush = time.Now()

internal/routewatch/prefixhandler.go

@@ -15,13 +15,15 @@ import (
 
 const (
 	// prefixHandlerQueueSize is the queue capacity for prefix tracking operations
+	// DO NOT set this higher than 100000 without explicit instructions
 	prefixHandlerQueueSize = 100000
 
 	// prefixBatchSize is the number of prefix updates to batch together
-	prefixBatchSize = 25000
+	prefixBatchSize = 20000
 
 	// prefixBatchTimeout is the maximum time to wait before flushing a batch
-	prefixBatchTimeout = 2 * time.Second
+	// DO NOT reduce this timeout - larger batches are more efficient
+	prefixBatchTimeout = 1 * time.Second
 
 	// IP version constants
 	ipv4Version = 4
@@ -163,6 +165,9 @@ func (h *PrefixHandler) flushBatchLocked() {
 		return
 	}
 
+	startTime := time.Now()
+	batchSize := len(h.batch)
+
 	// Group updates by prefix to deduplicate
 	// For each prefix, keep the latest update
 	prefixMap := make(map[string]prefixUpdate)
@@ -173,27 +178,55 @@ func (h *PrefixHandler) flushBatchLocked() {
 		}
 	}
 
-	// Apply updates to database
+	// Collect routes to upsert and delete
+	var routesToUpsert []*database.LiveRoute
+	var routesToDelete []database.LiveRouteDeletion
+
+	// Skip the prefix table updates entirely - just update live_routes
+	// The prefix table is not critical for routing lookups
 	for _, update := range prefixMap {
-		// Get or create prefix (this maintains the prefixes table)
-		prefix, err := h.db.GetOrCreatePrefix(update.prefix, update.timestamp)
-		if err != nil {
-			h.logger.Error("Failed to get/create prefix",
-				"prefix", update.prefix,
-				"error", err,
-			)
-
-			continue
-		}
-
-		// For announcements, get ASN info and create announcement record
 		if update.messageType == "announcement" && update.originASN > 0 {
-			h.processAnnouncement(prefix, update)
+			// Create live route for batch upsert
+			route := h.createLiveRoute(update)
+			if route != nil {
+				routesToUpsert = append(routesToUpsert, route)
+			}
 		} else if update.messageType == "withdrawal" {
-			h.processWithdrawal(prefix, update)
+			// Create deletion record for batch delete
+			routesToDelete = append(routesToDelete, database.LiveRouteDeletion{
+				Prefix:    update.prefix,
+				OriginASN: update.originASN,
+				PeerIP:    update.peer,
+			})
 		}
 	}
 
+	// Process batch operations
+	successCount := 0
+	if len(routesToUpsert) > 0 {
+		if err := h.db.UpsertLiveRouteBatch(routesToUpsert); err != nil {
+			h.logger.Error("Failed to upsert route batch", "error", err, "count", len(routesToUpsert))
+		} else {
+			successCount += len(routesToUpsert)
+		}
+	}
+
+	if len(routesToDelete) > 0 {
+		if err := h.db.DeleteLiveRouteBatch(routesToDelete); err != nil {
+			h.logger.Error("Failed to delete route batch", "error", err, "count", len(routesToDelete))
+		} else {
+			successCount += len(routesToDelete)
+		}
+	}
+
+	elapsed := time.Since(startTime)
+	h.logger.Debug("Flushed prefix batch",
+		"batch_size", batchSize,
+		"unique_prefixes", len(prefixMap),
+		"success", successCount,
+		"duration_ms", elapsed.Milliseconds(),
+	)
+
 	// Clear batch
 	h.batch = h.batch[:0]
 	h.lastFlush = time.Now()
@@ -215,6 +248,7 @@ func parseCIDR(prefix string) (maskLength int, ipVersion int, err error) {
 }
 
 // processAnnouncement handles storing an announcement in the database
+// nolint:unused // kept for potential future use
 func (h *PrefixHandler) processAnnouncement(_ *database.Prefix, update prefixUpdate) {
 	// Parse CIDR to get mask length
 	maskLength, ipVersion, err := parseCIDR(update.prefix)
@@ -271,7 +305,143 @@ func (h *PrefixHandler) processAnnouncement(_ *database.Prefix, update prefixUpd
 	}
 }
 
+// createLiveRoute creates a LiveRoute from a prefix update
+func (h *PrefixHandler) createLiveRoute(update prefixUpdate) *database.LiveRoute {
+	// Parse CIDR to get mask length
+	maskLength, ipVersion, err := parseCIDR(update.prefix)
+	if err != nil {
+		h.logger.Error("Failed to parse CIDR",
+			"prefix", update.prefix,
+			"error", err,
+		)
+
+		return nil
+	}
+
+	// Track route update metrics
+	if h.metrics != nil {
+		if ipVersion == ipv4Version {
+			h.metrics.RecordIPv4Update()
+		} else {
+			h.metrics.RecordIPv6Update()
+		}
+	}
+
+	// Create live route record
+	liveRoute := &database.LiveRoute{
+		ID:          uuid.New(),
+		Prefix:      update.prefix,
+		MaskLength:  maskLength,
+		IPVersion:   ipVersion,
+		OriginASN:   update.originASN,
+		PeerIP:      update.peer,
+		ASPath:      update.path,
+		NextHop:     update.peer, // Using peer as next hop
+		LastUpdated: update.timestamp,
+	}
+
+	// For IPv4, calculate the IP range
+	if ipVersion == ipv4Version {
+		start, end, err := database.CalculateIPv4Range(update.prefix)
+		if err == nil {
+			liveRoute.V4IPStart = &start
+			liveRoute.V4IPEnd = &end
+		} else {
+			h.logger.Error("Failed to calculate IPv4 range",
+				"prefix", update.prefix,
+				"error", err,
+			)
+		}
+	}
+
+	return liveRoute
+}
+
+// processAnnouncementDirect handles storing an announcement directly without prefix table
+// nolint:unused // kept for potential future use
+func (h *PrefixHandler) processAnnouncementDirect(update prefixUpdate) {
+	// Parse CIDR to get mask length
+	maskLength, ipVersion, err := parseCIDR(update.prefix)
+	if err != nil {
+		h.logger.Error("Failed to parse CIDR",
+			"prefix", update.prefix,
+			"error", err,
+		)
+
+		return
+	}
+
+	// Track route update metrics
+	if h.metrics != nil {
+		if ipVersion == ipv4Version {
+			h.metrics.RecordIPv4Update()
+		} else {
+			h.metrics.RecordIPv6Update()
+		}
+	}
+
+	// Create live route record
+	liveRoute := &database.LiveRoute{
+		ID:          uuid.New(),
+		Prefix:      update.prefix,
+		MaskLength:  maskLength,
+		IPVersion:   ipVersion,
+		OriginASN:   update.originASN,
+		PeerIP:      update.peer,
+		ASPath:      update.path,
+		NextHop:     update.peer, // Using peer as next hop
+		LastUpdated: update.timestamp,
+	}
+
+	// For IPv4, calculate the IP range
+	if ipVersion == ipv4Version {
+		start, end, err := database.CalculateIPv4Range(update.prefix)
+		if err == nil {
+			liveRoute.V4IPStart = &start
+			liveRoute.V4IPEnd = &end
+		} else {
+			h.logger.Error("Failed to calculate IPv4 range",
+				"prefix", update.prefix,
+				"error", err,
+			)
+		}
+	}
+
+	if err := h.db.UpsertLiveRoute(liveRoute); err != nil {
+		h.logger.Error("Failed to upsert live route",
+			"prefix", update.prefix,
+			"error", err,
+		)
+	}
+}
+
+// processWithdrawalDirect handles removing a route directly without prefix table
+// nolint:unused // kept for potential future use
+func (h *PrefixHandler) processWithdrawalDirect(update prefixUpdate) {
+	// For withdrawals, we need to delete the route from live_routes
+	if update.originASN > 0 {
+		if err := h.db.DeleteLiveRoute(update.prefix, update.originASN, update.peer); err != nil {
+			h.logger.Error("Failed to delete live route",
+				"prefix", update.prefix,
+				"origin_asn", update.originASN,
+				"peer", update.peer,
+				"error", err,
+			)
+		}
+	} else {
+		// If no origin ASN, just delete all routes for this prefix from this peer
+		if err := h.db.DeleteLiveRoute(update.prefix, 0, update.peer); err != nil {
+			h.logger.Error("Failed to delete live route (no origin ASN)",
+				"prefix", update.prefix,
+				"peer", update.peer,
+				"error", err,
+			)
+		}
+	}
+}
+
 // processWithdrawal handles removing a route from the live routing table
+// nolint:unused // kept for potential future use
 func (h *PrefixHandler) processWithdrawal(_ *database.Prefix, update prefixUpdate) {
 	// For withdrawals, we need to delete the route from live_routes
 	// Since we have the origin ASN from the update, we can delete the specific route

internal/server/handlers.go

@@ -0,0 +1,869 @@
+package server
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"net"
+	"net/http"
+	"net/url"
+	"runtime"
+	"sort"
+	"strconv"
+	"time"
+
+	"git.eeqj.de/sneak/routewatch/internal/database"
+	"git.eeqj.de/sneak/routewatch/internal/templates"
+	asinfo "git.eeqj.de/sneak/routewatch/pkg/asinfo"
+	"github.com/dustin/go-humanize"
+	"github.com/go-chi/chi/v5"
+)
+
+// handleRoot returns a handler that redirects to /status
+func (s *Server) handleRoot() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		http.Redirect(w, r, "/status", http.StatusSeeOther)
+	}
+}
+
+// writeJSONError writes a standardized JSON error response
+func writeJSONError(w http.ResponseWriter, statusCode int, message string) {
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(statusCode)
+	_ = json.NewEncoder(w).Encode(map[string]interface{}{
+		"status": "error",
+		"error": map[string]interface{}{
+			"msg":  message,
+			"code": statusCode,
+		},
+	})
+}
+
+// writeJSONSuccess writes a standardized JSON success response
+func writeJSONSuccess(w http.ResponseWriter, data interface{}) error {
+	w.Header().Set("Content-Type", "application/json")
+
+	return json.NewEncoder(w).Encode(map[string]interface{}{
+		"status": "ok",
+		"data":   data,
+	})
+}
+
+// handleStatusJSON returns a handler that serves JSON statistics
+func (s *Server) handleStatusJSON() http.HandlerFunc {
+	// Stats represents the statistics response
+	type Stats struct {
+		Uptime                 string                        `json:"uptime"`
+		TotalMessages          uint64                        `json:"total_messages"`
+		TotalBytes             uint64                        `json:"total_bytes"`
+		MessagesPerSec         float64                       `json:"messages_per_sec"`
+		MbitsPerSec            float64                       `json:"mbits_per_sec"`
+		Connected              bool                          `json:"connected"`
+		GoVersion              string                        `json:"go_version"`
+		Goroutines             int                           `json:"goroutines"`
+		MemoryUsage            string                        `json:"memory_usage"`
+		ASNs                   int                           `json:"asns"`
+		Prefixes               int                           `json:"prefixes"`
+		IPv4Prefixes           int                           `json:"ipv4_prefixes"`
+		IPv6Prefixes           int                           `json:"ipv6_prefixes"`
+		Peerings               int                           `json:"peerings"`
+		Peers                  int                           `json:"peers"`
+		DatabaseSizeBytes      int64                         `json:"database_size_bytes"`
+		LiveRoutes             int                           `json:"live_routes"`
+		IPv4Routes             int                           `json:"ipv4_routes"`
+		IPv6Routes             int                           `json:"ipv6_routes"`
+		IPv4UpdatesPerSec      float64                       `json:"ipv4_updates_per_sec"`
+		IPv6UpdatesPerSec      float64                       `json:"ipv6_updates_per_sec"`
+		IPv4PrefixDistribution []database.PrefixDistribution `json:"ipv4_prefix_distribution"`
+		IPv6PrefixDistribution []database.PrefixDistribution `json:"ipv6_prefix_distribution"`
+	}
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		// Create a 1 second timeout context for this request
+		ctx, cancel := context.WithTimeout(r.Context(), 1*time.Second)
+		defer cancel()
+
+		metrics := s.streamer.GetMetrics()
+
+		// Get database stats with timeout
+		statsChan := make(chan database.Stats)
+		errChan := make(chan error)
+
+		go func() {
+			dbStats, err := s.db.GetStatsContext(ctx)
+			if err != nil {
+				s.logger.Debug("Database stats query failed", "error", err)
+				errChan <- err
+
+				return
+			}
+			statsChan <- dbStats
+		}()
+
+		var dbStats database.Stats
+		select {
+		case <-ctx.Done():
+			s.logger.Error("Database stats timeout in status.json")
+			writeJSONError(w, http.StatusRequestTimeout, "Database timeout")
+
+			return
+		case err := <-errChan:
+			s.logger.Error("Failed to get database stats", "error", err)
+			writeJSONError(w, http.StatusInternalServerError, err.Error())
+
+			return
+		case dbStats = <-statsChan:
+			// Success
+		}
+
+		uptime := time.Since(metrics.ConnectedSince).Truncate(time.Second).String()
+		if metrics.ConnectedSince.IsZero() {
+			uptime = "0s"
+		}
+
+		const bitsPerMegabit = 1000000.0
+
+		// Get route counts from database
+		ipv4Routes, ipv6Routes, err := s.db.GetLiveRouteCountsContext(ctx)
+		if err != nil {
+			s.logger.Warn("Failed to get live route counts", "error", err)
+			// Continue with zero counts
+		}
+
+		// Get route update metrics
+		routeMetrics := s.streamer.GetMetricsTracker().GetRouteMetrics()
+
+		// Get memory stats
+		var memStats runtime.MemStats
+		runtime.ReadMemStats(&memStats)
+
+		stats := Stats{
+			Uptime:                 uptime,
+			TotalMessages:          metrics.TotalMessages,
+			TotalBytes:             metrics.TotalBytes,
+			MessagesPerSec:         metrics.MessagesPerSec,
+			MbitsPerSec:            metrics.BitsPerSec / bitsPerMegabit,
+			Connected:              metrics.Connected,
+			GoVersion:              runtime.Version(),
+			Goroutines:             runtime.NumGoroutine(),
+			MemoryUsage:            humanize.Bytes(memStats.Alloc),
+			ASNs:                   dbStats.ASNs,
+			Prefixes:               dbStats.Prefixes,
+			IPv4Prefixes:           dbStats.IPv4Prefixes,
+			IPv6Prefixes:           dbStats.IPv6Prefixes,
+			Peerings:               dbStats.Peerings,
+			Peers:                  dbStats.Peers,
+			DatabaseSizeBytes:      dbStats.FileSizeBytes,
+			LiveRoutes:             dbStats.LiveRoutes,
+			IPv4Routes:             ipv4Routes,
+			IPv6Routes:             ipv6Routes,
+			IPv4UpdatesPerSec:      routeMetrics.IPv4UpdatesPerSec,
+			IPv6UpdatesPerSec:      routeMetrics.IPv6UpdatesPerSec,
+			IPv4PrefixDistribution: dbStats.IPv4PrefixDistribution,
+			IPv6PrefixDistribution: dbStats.IPv6PrefixDistribution,
+		}
+
+		if err := writeJSONSuccess(w, stats); err != nil {
+			s.logger.Error("Failed to encode stats", "error", err)
+		}
+	}
+}
+
+// handleStats returns a handler that serves API v1 statistics
+func (s *Server) handleStats() http.HandlerFunc {
+	// HandlerStatsInfo represents handler statistics in the API response
+	type HandlerStatsInfo struct {
+		Name             string  `json:"name"`
+		QueueLength      int     `json:"queue_length"`
+		QueueCapacity    int     `json:"queue_capacity"`
+		ProcessedCount   uint64  `json:"processed_count"`
+		DroppedCount     uint64  `json:"dropped_count"`
+		AvgProcessTimeMs float64 `json:"avg_process_time_ms"`
+		MinProcessTimeMs float64 `json:"min_process_time_ms"`
+		MaxProcessTimeMs float64 `json:"max_process_time_ms"`
+	}
+
+	// StatsResponse represents the API statistics response
+	type StatsResponse struct {
+		Uptime                 string                        `json:"uptime"`
+		TotalMessages          uint64                        `json:"total_messages"`
+		TotalBytes             uint64                        `json:"total_bytes"`
+		MessagesPerSec         float64                       `json:"messages_per_sec"`
+		MbitsPerSec            float64                       `json:"mbits_per_sec"`
+		Connected              bool                          `json:"connected"`
+		GoVersion              string                        `json:"go_version"`
+		Goroutines             int                           `json:"goroutines"`
+		MemoryUsage            string                        `json:"memory_usage"`
+		ASNs                   int                           `json:"asns"`
+		Prefixes               int                           `json:"prefixes"`
+		IPv4Prefixes           int                           `json:"ipv4_prefixes"`
+		IPv6Prefixes           int                           `json:"ipv6_prefixes"`
+		Peerings               int                           `json:"peerings"`
+		Peers                  int                           `json:"peers"`
+		DatabaseSizeBytes      int64                         `json:"database_size_bytes"`
+		LiveRoutes             int                           `json:"live_routes"`
+		IPv4Routes             int                           `json:"ipv4_routes"`
+		IPv6Routes             int                           `json:"ipv6_routes"`
+		IPv4UpdatesPerSec      float64                       `json:"ipv4_updates_per_sec"`
+		IPv6UpdatesPerSec      float64                       `json:"ipv6_updates_per_sec"`
+		HandlerStats           []HandlerStatsInfo            `json:"handler_stats"`
+		IPv4PrefixDistribution []database.PrefixDistribution `json:"ipv4_prefix_distribution"`
+		IPv6PrefixDistribution []database.PrefixDistribution `json:"ipv6_prefix_distribution"`
+	}
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		// Create a 1 second timeout context for this request
+		ctx, cancel := context.WithTimeout(r.Context(), 1*time.Second)
+		defer cancel()
+
+		// Check if context is already cancelled
+		select {
+		case <-ctx.Done():
+			http.Error(w, "Request timeout", http.StatusRequestTimeout)
+
+			return
+		default:
+		}
+
+		metrics := s.streamer.GetMetrics()
+
+		// Get database stats with timeout
+		statsChan := make(chan database.Stats)
+		errChan := make(chan error)
+
+		go func() {
+			dbStats, err := s.db.GetStatsContext(ctx)
+			if err != nil {
+				s.logger.Debug("Database stats query failed", "error", err)
+				errChan <- err
+
+				return
+			}
+			statsChan <- dbStats
+		}()
+
+		var dbStats database.Stats
+		select {
+		case <-ctx.Done():
+			s.logger.Error("Database stats timeout")
+			// Don't write response here - timeout middleware already handles it
+			return
+		case err := <-errChan:
+			s.logger.Error("Failed to get database stats", "error", err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+
+			return
+		case dbStats = <-statsChan:
+			// Success
+		}
+
+		uptime := time.Since(metrics.ConnectedSince).Truncate(time.Second).String()
+		if metrics.ConnectedSince.IsZero() {
+			uptime = "0s"
+		}
+
+		const bitsPerMegabit = 1000000.0
+
+		// Get route counts from database
+		ipv4Routes, ipv6Routes, err := s.db.GetLiveRouteCountsContext(ctx)
+		if err != nil {
+			s.logger.Warn("Failed to get live route counts", "error", err)
+			// Continue with zero counts
+		}
+
+		// Get route update metrics
+		routeMetrics := s.streamer.GetMetricsTracker().GetRouteMetrics()
+
+		// Get handler stats
+		handlerStats := s.streamer.GetHandlerStats()
+		handlerStatsInfo := make([]HandlerStatsInfo, 0, len(handlerStats))
+		const microsecondsPerMillisecond = 1000.0
+		for _, hs := range handlerStats {
+			handlerStatsInfo = append(handlerStatsInfo, HandlerStatsInfo{
+				Name:             hs.Name,
+				QueueLength:      hs.QueueLength,
+				QueueCapacity:    hs.QueueCapacity,
+				ProcessedCount:   hs.ProcessedCount,
+				DroppedCount:     hs.DroppedCount,
+				AvgProcessTimeMs: float64(hs.AvgProcessTime.Microseconds()) / microsecondsPerMillisecond,
+				MinProcessTimeMs: float64(hs.MinProcessTime.Microseconds()) / microsecondsPerMillisecond,
+				MaxProcessTimeMs: float64(hs.MaxProcessTime.Microseconds()) / microsecondsPerMillisecond,
+			})
+		}
+
+		// Get memory stats
+		var memStats runtime.MemStats
+		runtime.ReadMemStats(&memStats)
+
+		stats := StatsResponse{
+			Uptime:                 uptime,
+			TotalMessages:          metrics.TotalMessages,
+			TotalBytes:             metrics.TotalBytes,
+			MessagesPerSec:         metrics.MessagesPerSec,
+			MbitsPerSec:            metrics.BitsPerSec / bitsPerMegabit,
+			Connected:              metrics.Connected,
+			GoVersion:              runtime.Version(),
+			Goroutines:             runtime.NumGoroutine(),
+			MemoryUsage:            humanize.Bytes(memStats.Alloc),
+			ASNs:                   dbStats.ASNs,
+			Prefixes:               dbStats.Prefixes,
+			IPv4Prefixes:           dbStats.IPv4Prefixes,
+			IPv6Prefixes:           dbStats.IPv6Prefixes,
+			Peerings:               dbStats.Peerings,
+			Peers:                  dbStats.Peers,
+			DatabaseSizeBytes:      dbStats.FileSizeBytes,
+			LiveRoutes:             dbStats.LiveRoutes,
+			IPv4Routes:             ipv4Routes,
+			IPv6Routes:             ipv6Routes,
+			IPv4UpdatesPerSec:      routeMetrics.IPv4UpdatesPerSec,
+			IPv6UpdatesPerSec:      routeMetrics.IPv6UpdatesPerSec,
+			HandlerStats:           handlerStatsInfo,
+			IPv4PrefixDistribution: dbStats.IPv4PrefixDistribution,
+			IPv6PrefixDistribution: dbStats.IPv6PrefixDistribution,
+		}
+
+		if err := writeJSONSuccess(w, stats); err != nil {
+			s.logger.Error("Failed to encode stats", "error", err)
+		}
+	}
+}
+
+// handleStatusHTML returns a handler that serves the HTML status page
+func (s *Server) handleStatusHTML() http.HandlerFunc {
+	return func(w http.ResponseWriter, _ *http.Request) {
+		w.Header().Set("Content-Type", "text/html; charset=utf-8")
+
+		tmpl := templates.StatusTemplate()
+		if err := tmpl.Execute(w, nil); err != nil {
+			s.logger.Error("Failed to render template", "error", err)
+			http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+		}
+	}
+}
+
+// handleIPLookup returns a handler that looks up AS information for an IP address
+func (s *Server) handleIPLookup() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		ip := chi.URLParam(r, "ip")
+		if ip == "" {
+			writeJSONError(w, http.StatusBadRequest, "IP parameter is required")
+
+			return
+		}
+
+		// Look up AS information for the IP
+		asInfo, err := s.db.GetASInfoForIPContext(r.Context(), ip)
+		if err != nil {
+			// Check if it's an invalid IP error
+			if errors.Is(err, database.ErrInvalidIP) {
+				writeJSONError(w, http.StatusBadRequest, err.Error())
+			} else {
+				// All other errors (including ErrNoRoute) are 404
+				writeJSONError(w, http.StatusNotFound, err.Error())
+			}
+
+			return
+		}
+
+		// Return successful response
+		if err := writeJSONSuccess(w, asInfo); err != nil {
+			s.logger.Error("Failed to encode AS info", "error", err)
+		}
+	}
+}
+
+// handleASDetailJSON returns AS details as JSON
+func (s *Server) handleASDetailJSON() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		asnStr := chi.URLParam(r, "asn")
+		asn, err := strconv.Atoi(asnStr)
+		if err != nil {
+			writeJSONError(w, http.StatusBadRequest, "Invalid ASN")
+
+			return
+		}
+
+		asInfo, prefixes, err := s.db.GetASDetailsContext(r.Context(), asn)
+		if err != nil {
+			if errors.Is(err, database.ErrNoRoute) {
+				writeJSONError(w, http.StatusNotFound, err.Error())
+			} else {
+				writeJSONError(w, http.StatusInternalServerError, err.Error())
+			}
+
+			return
+		}
+
+		// Group prefixes by IP version
+		const ipVersionV4 = 4
+		var ipv4Prefixes, ipv6Prefixes []database.LiveRoute
+		for _, p := range prefixes {
+			if p.IPVersion == ipVersionV4 {
+				ipv4Prefixes = append(ipv4Prefixes, p)
+			} else {
+				ipv6Prefixes = append(ipv6Prefixes, p)
+			}
+		}
+
+		response := map[string]interface{}{
+			"asn":           asInfo,
+			"ipv4_prefixes": ipv4Prefixes,
+			"ipv6_prefixes": ipv6Prefixes,
+			"total_count":   len(prefixes),
+		}
+
+		if err := writeJSONSuccess(w, response); err != nil {
+			s.logger.Error("Failed to encode AS details", "error", err)
+		}
+	}
+}
+
+// handlePrefixDetailJSON returns prefix details as JSON
+func (s *Server) handlePrefixDetailJSON() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		prefixParam := chi.URLParam(r, "prefix")
+		if prefixParam == "" {
+			writeJSONError(w, http.StatusBadRequest, "Prefix parameter is required")
+
+			return
+		}
+
+		// URL decode the prefix parameter
+		prefix, err := url.QueryUnescape(prefixParam)
+		if err != nil {
+			writeJSONError(w, http.StatusBadRequest, "Invalid prefix parameter")
+
+			return
+		}
+
+		routes, err := s.db.GetPrefixDetailsContext(r.Context(), prefix)
+		if err != nil {
+			if errors.Is(err, database.ErrNoRoute) {
+				writeJSONError(w, http.StatusNotFound, err.Error())
+			} else {
+				writeJSONError(w, http.StatusInternalServerError, err.Error())
+			}
+
+			return
+		}
+
+		// Group by origin AS
+		originMap := make(map[int][]database.LiveRoute)
+		for _, route := range routes {
+			originMap[route.OriginASN] = append(originMap[route.OriginASN], route)
+		}
+
+		response := map[string]interface{}{
+			"prefix":       prefix,
+			"routes":       routes,
+			"origins":      originMap,
+			"peer_count":   len(routes),
+			"origin_count": len(originMap),
+		}
+
+		if err := writeJSONSuccess(w, response); err != nil {
+			s.logger.Error("Failed to encode prefix details", "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) {
+		asnStr := chi.URLParam(r, "asn")
+		asn, err := strconv.Atoi(asnStr)
+		if err != nil {
+			http.Error(w, "Invalid ASN", http.StatusBadRequest)
+
+			return
+		}
+
+		asInfo, prefixes, err := s.db.GetASDetailsContext(r.Context(), asn)
+		if err != nil {
+			if errors.Is(err, database.ErrNoRoute) {
+				http.Error(w, "AS not found", http.StatusNotFound)
+			} else {
+				s.logger.Error("Failed to get AS details", "error", err)
+				http.Error(w, "Internal server error", http.StatusInternalServerError)
+			}
+
+			return
+		}
+
+		// Group prefixes by IP version
+		const ipVersionV4 = 4
+		var ipv4Prefixes, ipv6Prefixes []database.LiveRoute
+		for _, p := range prefixes {
+			if p.IPVersion == ipVersionV4 {
+				ipv4Prefixes = append(ipv4Prefixes, p)
+			} else {
+				ipv6Prefixes = append(ipv6Prefixes, p)
+			}
+		}
+
+		// Sort prefixes by network address
+		sort.Slice(ipv4Prefixes, func(i, j int) bool {
+			// Parse the prefixes to compare network addresses
+			ipI, netI, _ := net.ParseCIDR(ipv4Prefixes[i].Prefix)
+			ipJ, netJ, _ := net.ParseCIDR(ipv4Prefixes[j].Prefix)
+
+			// Compare by network address first
+			cmp := bytes.Compare(ipI.To4(), ipJ.To4())
+			if cmp != 0 {
+				return cmp < 0
+			}
+
+			// If network addresses are equal, compare by mask length
+			onesI, _ := netI.Mask.Size()
+			onesJ, _ := netJ.Mask.Size()
+
+			return onesI < onesJ
+		})
+
+		sort.Slice(ipv6Prefixes, func(i, j int) bool {
+			// Parse the prefixes to compare network addresses
+			ipI, netI, _ := net.ParseCIDR(ipv6Prefixes[i].Prefix)
+			ipJ, netJ, _ := net.ParseCIDR(ipv6Prefixes[j].Prefix)
+
+			// Compare by network address first
+			cmp := bytes.Compare(ipI.To16(), ipJ.To16())
+			if cmp != 0 {
+				return cmp < 0
+			}
+
+			// If network addresses are equal, compare by mask length
+			onesI, _ := netI.Mask.Size()
+			onesJ, _ := netJ.Mask.Size()
+
+			return onesI < onesJ
+		})
+
+		// Prepare template data
+		data := struct {
+			ASN          *database.ASN
+			IPv4Prefixes []database.LiveRoute
+			IPv6Prefixes []database.LiveRoute
+			TotalCount   int
+			IPv4Count    int
+			IPv6Count    int
+		}{
+			ASN:          asInfo,
+			IPv4Prefixes: ipv4Prefixes,
+			IPv6Prefixes: ipv6Prefixes,
+			TotalCount:   len(prefixes),
+			IPv4Count:    len(ipv4Prefixes),
+			IPv6Count:    len(ipv6Prefixes),
+		}
+
+		// Check if context is still valid before writing response
+		select {
+		case <-r.Context().Done():
+			// Request was cancelled, don't write response
+			return
+		default:
+		}
+
+		w.Header().Set("Content-Type", "text/html; charset=utf-8")
+		tmpl := templates.ASDetailTemplate()
+		if err := tmpl.Execute(w, data); err != nil {
+			s.logger.Error("Failed to render AS detail template", "error", err)
+			http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+		}
+	}
+}
+
+// handlePrefixDetail returns a handler that serves the prefix detail HTML page
+func (s *Server) handlePrefixDetail() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		prefixParam := chi.URLParam(r, "prefix")
+		if prefixParam == "" {
+			http.Error(w, "Prefix parameter is required", http.StatusBadRequest)
+
+			return
+		}
+
+		// URL decode the prefix parameter
+		prefix, err := url.QueryUnescape(prefixParam)
+		if err != nil {
+			http.Error(w, "Invalid prefix parameter", http.StatusBadRequest)
+
+			return
+		}
+
+		routes, err := s.db.GetPrefixDetailsContext(r.Context(), prefix)
+		if err != nil {
+			if errors.Is(err, database.ErrNoRoute) {
+				http.Error(w, "Prefix not found", http.StatusNotFound)
+			} else {
+				s.logger.Error("Failed to get prefix details", "error", err)
+				http.Error(w, "Internal server error", http.StatusInternalServerError)
+			}
+
+			return
+		}
+
+		// Group by origin AS and collect unique AS info
+		type ASNInfo struct {
+			Number      int
+			Handle      string
+			Description string
+			PeerCount   int
+		}
+		originMap := make(map[int]*ASNInfo)
+		for _, route := range routes {
+			if _, exists := originMap[route.OriginASN]; !exists {
+				// Get AS info from database
+				asInfo, _, _ := s.db.GetASDetailsContext(r.Context(), route.OriginASN)
+				handle := ""
+				description := ""
+				if asInfo != nil {
+					handle = asInfo.Handle
+					description = asInfo.Description
+				}
+				originMap[route.OriginASN] = &ASNInfo{
+					Number:      route.OriginASN,
+					Handle:      handle,
+					Description: description,
+					PeerCount:   0,
+				}
+			}
+			originMap[route.OriginASN].PeerCount++
+		}
+
+		// Get the first route to extract some common info
+		var maskLength, ipVersion int
+		if len(routes) > 0 {
+			// Parse CIDR to get mask length and IP version
+			_, ipNet, err := net.ParseCIDR(prefix)
+			if err == nil {
+				ones, _ := ipNet.Mask.Size()
+				maskLength = ones
+				if ipNet.IP.To4() != nil {
+					ipVersion = 4
+				} else {
+					ipVersion = 6
+				}
+			}
+		}
+
+		// Convert origin map to sorted slice
+		var origins []*ASNInfo
+		for _, origin := range originMap {
+			origins = append(origins, origin)
+		}
+
+		// Create enhanced routes with AS path handles
+		type ASPathEntry struct {
+			Number int
+			Handle string
+		}
+		type EnhancedRoute struct {
+			database.LiveRoute
+			ASPathWithHandle []ASPathEntry
+		}
+
+		enhancedRoutes := make([]EnhancedRoute, len(routes))
+		for i, route := range routes {
+			enhancedRoute := EnhancedRoute{
+				LiveRoute:        route,
+				ASPathWithHandle: make([]ASPathEntry, len(route.ASPath)),
+			}
+
+			// Look up handle for each AS in the path
+			for j, asn := range route.ASPath {
+				handle := asinfo.GetHandle(asn)
+				enhancedRoute.ASPathWithHandle[j] = ASPathEntry{
+					Number: asn,
+					Handle: handle,
+				}
+			}
+
+			enhancedRoutes[i] = enhancedRoute
+		}
+
+		// Prepare template data
+		data := struct {
+			Prefix      string
+			MaskLength  int
+			IPVersion   int
+			Routes      []EnhancedRoute
+			Origins     []*ASNInfo
+			PeerCount   int
+			OriginCount int
+		}{
+			Prefix:      prefix,
+			MaskLength:  maskLength,
+			IPVersion:   ipVersion,
+			Routes:      enhancedRoutes,
+			Origins:     origins,
+			PeerCount:   len(routes),
+			OriginCount: len(originMap),
+		}
+
+		// Check if context is still valid before writing response
+		select {
+		case <-r.Context().Done():
+			// Request was cancelled, don't write response
+			return
+		default:
+		}
+
+		w.Header().Set("Content-Type", "text/html; charset=utf-8")
+		tmpl := templates.PrefixDetailTemplate()
+		if err := tmpl.Execute(w, data); err != nil {
+			s.logger.Error("Failed to render prefix detail template", "error", err)
+			http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+		}
+	}
+}
+
+// handleIPRedirect looks up the prefix containing the IP and redirects to its detail page
+func (s *Server) handleIPRedirect() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		ip := chi.URLParam(r, "ip")
+		if ip == "" {
+			http.Error(w, "IP parameter is required", http.StatusBadRequest)
+
+			return
+		}
+
+		// Look up AS information for the IP (which includes the prefix)
+		asInfo, err := s.db.GetASInfoForIP(ip)
+		if err != nil {
+			if errors.Is(err, database.ErrInvalidIP) {
+				http.Error(w, "Invalid IP address", http.StatusBadRequest)
+			} else if errors.Is(err, database.ErrNoRoute) {
+				http.Error(w, "No route found for this IP", http.StatusNotFound)
+			} else {
+				s.logger.Error("Failed to look up IP", "error", err)
+				http.Error(w, "Internal server error", http.StatusInternalServerError)
+			}
+
+			return
+		}
+
+		// Redirect to the prefix detail page (URL encode the prefix)
+		http.Redirect(w, r, "/prefix/"+url.QueryEscape(asInfo.Prefix), http.StatusSeeOther)
+	}
+}
+
+// handlePrefixLength shows a random sample of prefixes with the specified mask length
+func (s *Server) handlePrefixLength() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		lengthStr := chi.URLParam(r, "length")
+		if lengthStr == "" {
+			http.Error(w, "Length parameter is required", http.StatusBadRequest)
+
+			return
+		}
+
+		maskLength, err := strconv.Atoi(lengthStr)
+		if err != nil {
+			http.Error(w, "Invalid mask length", http.StatusBadRequest)
+
+			return
+		}
+
+		// Determine IP version based on mask length
+		const (
+			maxIPv4MaskLength = 32
+			maxIPv6MaskLength = 128
+		)
+		var ipVersion int
+		if maskLength <= maxIPv4MaskLength {
+			ipVersion = 4
+		} else if maskLength <= maxIPv6MaskLength {
+			ipVersion = 6
+		} else {
+			http.Error(w, "Invalid mask length", http.StatusBadRequest)
+
+			return
+		}
+
+		// Get random sample of prefixes
+		const maxPrefixes = 500
+		prefixes, err := s.db.GetRandomPrefixesByLengthContext(r.Context(), maskLength, ipVersion, maxPrefixes)
+		if err != nil {
+			s.logger.Error("Failed to get prefixes by length", "error", err)
+			http.Error(w, "Internal server error", http.StatusInternalServerError)
+
+			return
+		}
+
+		// Sort prefixes for display
+		sort.Slice(prefixes, func(i, j int) bool {
+			// First compare by IP version
+			if prefixes[i].IPVersion != prefixes[j].IPVersion {
+				return prefixes[i].IPVersion < prefixes[j].IPVersion
+			}
+			// Then by prefix
+			return prefixes[i].Prefix < prefixes[j].Prefix
+		})
+
+		// Create enhanced prefixes with AS descriptions
+		type EnhancedPrefix struct {
+			database.LiveRoute
+			OriginASDescription string
+			Age                 string
+		}
+
+		enhancedPrefixes := make([]EnhancedPrefix, len(prefixes))
+		for i, prefix := range prefixes {
+			enhancedPrefixes[i] = EnhancedPrefix{
+				LiveRoute: prefix,
+				Age:       formatAge(prefix.LastUpdated),
+			}
+
+			// Get AS description
+			if asInfo, ok := asinfo.Get(prefix.OriginASN); ok {
+				enhancedPrefixes[i].OriginASDescription = asInfo.Description
+			}
+		}
+
+		// Render template
+		data := map[string]interface{}{
+			"MaskLength": maskLength,
+			"IPVersion":  ipVersion,
+			"Prefixes":   enhancedPrefixes,
+			"Count":      len(prefixes),
+		}
+
+		// Check if context is still valid before writing response
+		select {
+		case <-r.Context().Done():
+			// Request was cancelled, don't write response
+			return
+		default:
+		}
+
+		tmpl := templates.PrefixLengthTemplate()
+		if err := tmpl.Execute(w, data); err != nil {
+			s.logger.Error("Failed to render prefix length template", "error", err)
+			http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+		}
+	}
+}
+
+// formatAge returns a human-readable age string
+func formatAge(timestamp time.Time) string {
+	age := time.Since(timestamp)
+
+	const hoursPerDay = 24
+
+	if age < time.Minute {
+		return "< 1m"
+	} else if age < time.Hour {
+		minutes := int(age.Minutes())
+
+		return strconv.Itoa(minutes) + "m"
+	} else if age < hoursPerDay*time.Hour {
+		hours := int(age.Hours())
+
+		return strconv.Itoa(hours) + "h"
+	}
+
+	days := int(age.Hours() / hoursPerDay)
+
+	return strconv.Itoa(days) + "d"
+}

internal/server/middleware.go

@@ -108,6 +108,7 @@ type timeoutWriter struct {
 	http.ResponseWriter
 	mu      sync.Mutex
 	written bool
+	header  http.Header // cached header to prevent concurrent access
 }
 
 func (tw *timeoutWriter) Write(b []byte) (int, error) {
@@ -133,6 +134,18 @@ func (tw *timeoutWriter) WriteHeader(statusCode int) {
 }
 
 func (tw *timeoutWriter) Header() http.Header {
+	tw.mu.Lock()
+	defer tw.mu.Unlock()
+
+	if tw.written {
+		// Return a copy to prevent modifications after timeout
+		if tw.header == nil {
+			tw.header = make(http.Header)
+		}
+
+		return tw.header
+	}
+
 	return tw.ResponseWriter.Header()
 }
 
@@ -153,6 +166,7 @@ func TimeoutMiddleware(timeout time.Duration) func(http.Handler) http.Handler {
 
 			tw := &timeoutWriter{
 				ResponseWriter: w,
+				header:         make(http.Header),
 			}
 
 			done := make(chan struct{})
@@ -178,8 +192,12 @@ func TimeoutMiddleware(timeout time.Duration) func(http.Handler) http.Handler {
 				tw.markWritten() // Prevent the handler from writing after timeout
 				execTime := time.Since(startTime)
 
+				// Write directly to the underlying writer since we've marked tw as written
+				// This is safe because markWritten() prevents the handler from writing
+				tw.mu.Lock()
 				w.Header().Set("Content-Type", "application/json")
 				w.WriteHeader(http.StatusRequestTimeout)
+				tw.mu.Unlock()
 
 				response := map[string]interface{}{
 					"status": "error",

internal/server/routes.go

@@ -0,0 +1,43 @@
+package server
+
+import (
+	"time"
+
+	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/chi/v5/middleware"
+)
+
+// setupRoutes configures the HTTP routes
+func (s *Server) setupRoutes() {
+	r := chi.NewRouter()
+
+	// Middleware
+	r.Use(middleware.RequestID)
+	r.Use(middleware.RealIP)
+	r.Use(middleware.Logger)
+	r.Use(middleware.Recoverer)
+	const requestTimeout = 2 * time.Second
+	r.Use(TimeoutMiddleware(requestTimeout))
+	r.Use(JSONResponseMiddleware)
+
+	// Routes
+	r.Get("/", s.handleRoot())
+	r.Get("/status", s.handleStatusHTML())
+	r.Get("/status.json", s.handleStatusJSON())
+
+	// AS and prefix detail pages
+	r.Get("/as/{asn}", s.handleASDetail())
+	r.Get("/prefix/{prefix}", s.handlePrefixDetail())
+	r.Get("/prefixlength/{length}", s.handlePrefixLength())
+	r.Get("/ip/{ip}", s.handleIPRedirect())
+
+	// API routes
+	r.Route("/api/v1", func(r chi.Router) {
+		r.Get("/stats", s.handleStats())
+		r.Get("/ip/{ip}", s.handleIPLookup())
+		r.Get("/as/{asn}", s.handleASDetailJSON())
+		r.Get("/prefix/{prefix}", s.handlePrefixDetailJSON())
+	})
+
+	s.router = r
+}

internal/server/server.go

@@ -3,20 +3,14 @@ package server
 
 import (
 	"context"
-	"encoding/json"
-	"errors"
 	"net/http"
 	"os"
-	"runtime"
 	"time"
 
 	"git.eeqj.de/sneak/routewatch/internal/database"
 	"git.eeqj.de/sneak/routewatch/internal/logger"
 	"git.eeqj.de/sneak/routewatch/internal/streamer"
-	"git.eeqj.de/sneak/routewatch/internal/templates"
-	"github.com/dustin/go-humanize"
 	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/chi/v5/middleware"
 )
 
 // Server provides HTTP endpoints for status monitoring
@@ -41,33 +35,6 @@ func New(db database.Store, streamer *streamer.Streamer, logger *logger.Logger)
 	return s
 }
 
-// setupRoutes configures the HTTP routes
-func (s *Server) setupRoutes() {
-	r := chi.NewRouter()
-
-	// Middleware
-	r.Use(middleware.RequestID)
-	r.Use(middleware.RealIP)
-	r.Use(middleware.Logger)
-	r.Use(middleware.Recoverer)
-	const requestTimeout = 2 * time.Second
-	r.Use(TimeoutMiddleware(requestTimeout))
-	r.Use(JSONResponseMiddleware)
-
-	// Routes
-	r.Get("/", s.handleRoot())
-	r.Get("/status", s.handleStatusHTML())
-	r.Get("/status.json", s.handleStatusJSON())
-
-	// API routes
-	r.Route("/api/v1", func(r chi.Router) {
-		r.Get("/stats", s.handleStats())
-		r.Get("/ip/{ip}", s.handleIPLookup())
-	})
-
-	s.router = r
-}
-
 // Start starts the HTTP server
 func (s *Server) Start() error {
 	port := os.Getenv("PORT")
@@ -103,357 +70,3 @@ func (s *Server) Stop(ctx context.Context) error {
 
 	return s.srv.Shutdown(ctx)
 }
-
-// handleRoot returns a handler that redirects to /status
-func (s *Server) handleRoot() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		http.Redirect(w, r, "/status", http.StatusSeeOther)
-	}
-}
-
-// writeJSONError writes a standardized JSON error response
-func writeJSONError(w http.ResponseWriter, statusCode int, message string) {
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(statusCode)
-	_ = json.NewEncoder(w).Encode(map[string]interface{}{
-		"status": "error",
-		"error": map[string]interface{}{
-			"msg":  message,
-			"code": statusCode,
-		},
-	})
-}
-
-// writeJSONSuccess writes a standardized JSON success response
-func writeJSONSuccess(w http.ResponseWriter, data interface{}) error {
-	w.Header().Set("Content-Type", "application/json")
-
-	return json.NewEncoder(w).Encode(map[string]interface{}{
-		"status": "ok",
-		"data":   data,
-	})
-}
-
-// handleStatusJSON returns a handler that serves JSON statistics
-func (s *Server) handleStatusJSON() http.HandlerFunc {
-	// Stats represents the statistics response
-	type Stats struct {
-		Uptime                 string                        `json:"uptime"`
-		TotalMessages          uint64                        `json:"total_messages"`
-		TotalBytes             uint64                        `json:"total_bytes"`
-		MessagesPerSec         float64                       `json:"messages_per_sec"`
-		MbitsPerSec            float64                       `json:"mbits_per_sec"`
-		Connected              bool                          `json:"connected"`
-		GoVersion              string                        `json:"go_version"`
-		Goroutines             int                           `json:"goroutines"`
-		MemoryUsage            string                        `json:"memory_usage"`
-		ASNs                   int                           `json:"asns"`
-		Prefixes               int                           `json:"prefixes"`
-		IPv4Prefixes           int                           `json:"ipv4_prefixes"`
-		IPv6Prefixes           int                           `json:"ipv6_prefixes"`
-		Peerings               int                           `json:"peerings"`
-		Peers                  int                           `json:"peers"`
-		DatabaseSizeBytes      int64                         `json:"database_size_bytes"`
-		LiveRoutes             int                           `json:"live_routes"`
-		IPv4Routes             int                           `json:"ipv4_routes"`
-		IPv6Routes             int                           `json:"ipv6_routes"`
-		IPv4UpdatesPerSec      float64                       `json:"ipv4_updates_per_sec"`
-		IPv6UpdatesPerSec      float64                       `json:"ipv6_updates_per_sec"`
-		IPv4PrefixDistribution []database.PrefixDistribution `json:"ipv4_prefix_distribution"`
-		IPv6PrefixDistribution []database.PrefixDistribution `json:"ipv6_prefix_distribution"`
-	}
-
-	return func(w http.ResponseWriter, r *http.Request) {
-		// Create a 1 second timeout context for this request
-		ctx, cancel := context.WithTimeout(r.Context(), 1*time.Second)
-		defer cancel()
-
-		metrics := s.streamer.GetMetrics()
-
-		// Get database stats with timeout
-		statsChan := make(chan database.Stats)
-		errChan := make(chan error)
-
-		go func() {
-			dbStats, err := s.db.GetStats()
-			if err != nil {
-				s.logger.Debug("Database stats query failed", "error", err)
-				errChan <- err
-
-				return
-			}
-			statsChan <- dbStats
-		}()
-
-		var dbStats database.Stats
-		select {
-		case <-ctx.Done():
-			s.logger.Error("Database stats timeout in status.json")
-			writeJSONError(w, http.StatusRequestTimeout, "Database timeout")
-
-			return
-		case err := <-errChan:
-			s.logger.Error("Failed to get database stats", "error", err)
-			writeJSONError(w, http.StatusInternalServerError, err.Error())
-
-			return
-		case dbStats = <-statsChan:
-			// Success
-		}
-
-		uptime := time.Since(metrics.ConnectedSince).Truncate(time.Second).String()
-		if metrics.ConnectedSince.IsZero() {
-			uptime = "0s"
-		}
-
-		const bitsPerMegabit = 1000000.0
-
-		// Get route counts from database
-		ipv4Routes, ipv6Routes, err := s.db.GetLiveRouteCounts()
-		if err != nil {
-			s.logger.Warn("Failed to get live route counts", "error", err)
-			// Continue with zero counts
-		}
-
-		// Get route update metrics
-		routeMetrics := s.streamer.GetMetricsTracker().GetRouteMetrics()
-
-		// Get memory stats
-		var memStats runtime.MemStats
-		runtime.ReadMemStats(&memStats)
-
-		stats := Stats{
-			Uptime:                 uptime,
-			TotalMessages:          metrics.TotalMessages,
-			TotalBytes:             metrics.TotalBytes,
-			MessagesPerSec:         metrics.MessagesPerSec,
-			MbitsPerSec:            metrics.BitsPerSec / bitsPerMegabit,
-			Connected:              metrics.Connected,
-			GoVersion:              runtime.Version(),
-			Goroutines:             runtime.NumGoroutine(),
-			MemoryUsage:            humanize.Bytes(memStats.Alloc),
-			ASNs:                   dbStats.ASNs,
-			Prefixes:               dbStats.Prefixes,
-			IPv4Prefixes:           dbStats.IPv4Prefixes,
-			IPv6Prefixes:           dbStats.IPv6Prefixes,
-			Peerings:               dbStats.Peerings,
-			Peers:                  dbStats.Peers,
-			DatabaseSizeBytes:      dbStats.FileSizeBytes,
-			LiveRoutes:             dbStats.LiveRoutes,
-			IPv4Routes:             ipv4Routes,
-			IPv6Routes:             ipv6Routes,
-			IPv4UpdatesPerSec:      routeMetrics.IPv4UpdatesPerSec,
-			IPv6UpdatesPerSec:      routeMetrics.IPv6UpdatesPerSec,
-			IPv4PrefixDistribution: dbStats.IPv4PrefixDistribution,
-			IPv6PrefixDistribution: dbStats.IPv6PrefixDistribution,
-		}
-
-		if err := writeJSONSuccess(w, stats); err != nil {
-			s.logger.Error("Failed to encode stats", "error", err)
-		}
-	}
-}
-
-// handleStats returns a handler that serves API v1 statistics
-func (s *Server) handleStats() http.HandlerFunc {
-	// HandlerStatsInfo represents handler statistics in the API response
-	type HandlerStatsInfo struct {
-		Name             string  `json:"name"`
-		QueueLength      int     `json:"queue_length"`
-		QueueCapacity    int     `json:"queue_capacity"`
-		ProcessedCount   uint64  `json:"processed_count"`
-		DroppedCount     uint64  `json:"dropped_count"`
-		AvgProcessTimeMs float64 `json:"avg_process_time_ms"`
-		MinProcessTimeMs float64 `json:"min_process_time_ms"`
-		MaxProcessTimeMs float64 `json:"max_process_time_ms"`
-	}
-
-	// StatsResponse represents the API statistics response
-	type StatsResponse struct {
-		Uptime                 string                        `json:"uptime"`
-		TotalMessages          uint64                        `json:"total_messages"`
-		TotalBytes             uint64                        `json:"total_bytes"`
-		MessagesPerSec         float64                       `json:"messages_per_sec"`
-		MbitsPerSec            float64                       `json:"mbits_per_sec"`
-		Connected              bool                          `json:"connected"`
-		GoVersion              string                        `json:"go_version"`
-		Goroutines             int                           `json:"goroutines"`
-		MemoryUsage            string                        `json:"memory_usage"`
-		ASNs                   int                           `json:"asns"`
-		Prefixes               int                           `json:"prefixes"`
-		IPv4Prefixes           int                           `json:"ipv4_prefixes"`
-		IPv6Prefixes           int                           `json:"ipv6_prefixes"`
-		Peerings               int                           `json:"peerings"`
-		Peers                  int                           `json:"peers"`
-		DatabaseSizeBytes      int64                         `json:"database_size_bytes"`
-		LiveRoutes             int                           `json:"live_routes"`
-		IPv4Routes             int                           `json:"ipv4_routes"`
-		IPv6Routes             int                           `json:"ipv6_routes"`
-		IPv4UpdatesPerSec      float64                       `json:"ipv4_updates_per_sec"`
-		IPv6UpdatesPerSec      float64                       `json:"ipv6_updates_per_sec"`
-		HandlerStats           []HandlerStatsInfo            `json:"handler_stats"`
-		IPv4PrefixDistribution []database.PrefixDistribution `json:"ipv4_prefix_distribution"`
-		IPv6PrefixDistribution []database.PrefixDistribution `json:"ipv6_prefix_distribution"`
-	}
-
-	return func(w http.ResponseWriter, r *http.Request) {
-		// Create a 1 second timeout context for this request
-		ctx, cancel := context.WithTimeout(r.Context(), 1*time.Second)
-		defer cancel()
-
-		// Check if context is already cancelled
-		select {
-		case <-ctx.Done():
-			http.Error(w, "Request timeout", http.StatusRequestTimeout)
-
-			return
-		default:
-		}
-
-		metrics := s.streamer.GetMetrics()
-
-		// Get database stats with timeout
-		statsChan := make(chan database.Stats)
-		errChan := make(chan error)
-
-		go func() {
-			dbStats, err := s.db.GetStats()
-			if err != nil {
-				s.logger.Debug("Database stats query failed", "error", err)
-				errChan <- err
-
-				return
-			}
-			statsChan <- dbStats
-		}()
-
-		var dbStats database.Stats
-		select {
-		case <-ctx.Done():
-			s.logger.Error("Database stats timeout")
-			http.Error(w, "Database timeout", http.StatusRequestTimeout)
-
-			return
-		case err := <-errChan:
-			s.logger.Error("Failed to get database stats", "error", err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-
-			return
-		case dbStats = <-statsChan:
-			// Success
-		}
-
-		uptime := time.Since(metrics.ConnectedSince).Truncate(time.Second).String()
-		if metrics.ConnectedSince.IsZero() {
-			uptime = "0s"
-		}
-
-		const bitsPerMegabit = 1000000.0
-
-		// Get route counts from database
-		ipv4Routes, ipv6Routes, err := s.db.GetLiveRouteCounts()
-		if err != nil {
-			s.logger.Warn("Failed to get live route counts", "error", err)
-			// Continue with zero counts
-		}
-
-		// Get route update metrics
-		routeMetrics := s.streamer.GetMetricsTracker().GetRouteMetrics()
-
-		// Get handler stats
-		handlerStats := s.streamer.GetHandlerStats()
-		handlerStatsInfo := make([]HandlerStatsInfo, 0, len(handlerStats))
-		const microsecondsPerMillisecond = 1000.0
-		for _, hs := range handlerStats {
-			handlerStatsInfo = append(handlerStatsInfo, HandlerStatsInfo{
-				Name:             hs.Name,
-				QueueLength:      hs.QueueLength,
-				QueueCapacity:    hs.QueueCapacity,
-				ProcessedCount:   hs.ProcessedCount,
-				DroppedCount:     hs.DroppedCount,
-				AvgProcessTimeMs: float64(hs.AvgProcessTime.Microseconds()) / microsecondsPerMillisecond,
-				MinProcessTimeMs: float64(hs.MinProcessTime.Microseconds()) / microsecondsPerMillisecond,
-				MaxProcessTimeMs: float64(hs.MaxProcessTime.Microseconds()) / microsecondsPerMillisecond,
-			})
-		}
-
-		// Get memory stats
-		var memStats runtime.MemStats
-		runtime.ReadMemStats(&memStats)
-
-		stats := StatsResponse{
-			Uptime:                 uptime,
-			TotalMessages:          metrics.TotalMessages,
-			TotalBytes:             metrics.TotalBytes,
-			MessagesPerSec:         metrics.MessagesPerSec,
-			MbitsPerSec:            metrics.BitsPerSec / bitsPerMegabit,
-			Connected:              metrics.Connected,
-			GoVersion:              runtime.Version(),
-			Goroutines:             runtime.NumGoroutine(),
-			MemoryUsage:            humanize.Bytes(memStats.Alloc),
-			ASNs:                   dbStats.ASNs,
-			Prefixes:               dbStats.Prefixes,
-			IPv4Prefixes:           dbStats.IPv4Prefixes,
-			IPv6Prefixes:           dbStats.IPv6Prefixes,
-			Peerings:               dbStats.Peerings,
-			Peers:                  dbStats.Peers,
-			DatabaseSizeBytes:      dbStats.FileSizeBytes,
-			LiveRoutes:             dbStats.LiveRoutes,
-			IPv4Routes:             ipv4Routes,
-			IPv6Routes:             ipv6Routes,
-			IPv4UpdatesPerSec:      routeMetrics.IPv4UpdatesPerSec,
-			IPv6UpdatesPerSec:      routeMetrics.IPv6UpdatesPerSec,
-			HandlerStats:           handlerStatsInfo,
-			IPv4PrefixDistribution: dbStats.IPv4PrefixDistribution,
-			IPv6PrefixDistribution: dbStats.IPv6PrefixDistribution,
-		}
-
-		if err := writeJSONSuccess(w, stats); err != nil {
-			s.logger.Error("Failed to encode stats", "error", err)
-		}
-	}
-}
-
-// handleStatusHTML returns a handler that serves the HTML status page
-func (s *Server) handleStatusHTML() http.HandlerFunc {
-	return func(w http.ResponseWriter, _ *http.Request) {
-		w.Header().Set("Content-Type", "text/html; charset=utf-8")
-
-		tmpl := templates.StatusTemplate()
-		if err := tmpl.Execute(w, nil); err != nil {
-			s.logger.Error("Failed to render template", "error", err)
-			http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-		}
-	}
-}
-
-// handleIPLookup returns a handler that looks up AS information for an IP address
-func (s *Server) handleIPLookup() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		ip := chi.URLParam(r, "ip")
-		if ip == "" {
-			writeJSONError(w, http.StatusBadRequest, "IP parameter is required")
-
-			return
-		}
-
-		// Look up AS information for the IP
-		asInfo, err := s.db.GetASInfoForIP(ip)
-		if err != nil {
-			// Check if it's an invalid IP error
-			if errors.Is(err, database.ErrInvalidIP) {
-				writeJSONError(w, http.StatusBadRequest, err.Error())
-			} else {
-				// All other errors (including ErrNoRoute) are 404
-				writeJSONError(w, http.StatusNotFound, err.Error())
-			}
-
-			return
-		}
-
-		// Return successful response
-		if err := writeJSONSuccess(w, asInfo); err != nil {
-			s.logger.Error("Failed to encode AS info", "error", err)
-		}
-	}
-}

internal/streamer/streamer.go

@@ -7,8 +7,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"math"
 	"net/http"
-	"os"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -19,9 +19,12 @@ import (
 )
 
 const (
-	risLiveURL            = "https://ris-live.ripe.net/v1/stream/?format=json"
+	risLiveURL = "https://ris-live.ripe.net/v1/stream/?format=json&" +
+		"client=https%3A%2F%2Fgit.eeqj.de%2Fsneak%2Froutewatch"
 	metricsWindowSize     = 60 // seconds for rolling average
 	metricsUpdateRate     = time.Second
+	minBackoffDelay       = 5 * time.Second
+	maxBackoffDelay       = 320 * time.Second
 	metricsLogInterval    = 10 * time.Second
 	bytesPerKB            = 1024
 	bytesPerMB            = 1024 * 1024
@@ -95,6 +98,9 @@ func (s *Streamer) RegisterHandler(handler MessageHandler) {
 	info := &handlerInfo{
 		handler: handler,
 		queue:   make(chan *ristypes.RISMessage, handler.QueueCapacity()),
+		metrics: handlerMetrics{
+			minTime: time.Duration(math.MaxInt64), // Initialize to max so first value sets the floor
+		},
 	}
 
 	s.handlers = append(s.handlers, info)
@@ -131,9 +137,7 @@ func (s *Streamer) Start() error {
 	}
 
 	go func() {
-		if err := s.stream(ctx); err != nil {
-			s.logger.Error("Streaming error", "error", err)
-		}
+		s.streamWithReconnect(ctx)
 		s.mu.Lock()
 		s.running = false
 		s.mu.Unlock()
@@ -170,7 +174,7 @@ func (s *Streamer) runHandlerWorker(info *handlerInfo) {
 		info.metrics.totalTime += elapsed
 
 		// Update min time
-		if info.metrics.minTime == 0 || elapsed < info.metrics.minTime {
+		if elapsed < info.metrics.minTime {
 			info.metrics.minTime = elapsed
 		}
 
@@ -320,6 +324,72 @@ func (s *Streamer) updateMetrics(messageBytes int) {
 	s.metrics.RecordMessage(int64(messageBytes))
 }
 
+// streamWithReconnect handles streaming with automatic reconnection and exponential backoff
+func (s *Streamer) streamWithReconnect(ctx context.Context) {
+	backoffDelay := minBackoffDelay
+	consecutiveFailures := 0
+
+	for {
+		select {
+		case <-ctx.Done():
+			s.logger.Info("Stream context cancelled, stopping reconnection attempts")
+
+			return
+		default:
+		}
+
+		// Attempt to stream
+		startTime := time.Now()
+		err := s.stream(ctx)
+		streamDuration := time.Since(startTime)
+
+		if err == nil {
+			// Clean exit (context cancelled)
+			return
+		}
+
+		// Log the error
+		s.logger.Error("Stream disconnected",
+			"error", err,
+			"consecutive_failures", consecutiveFailures+1,
+			"stream_duration", streamDuration)
+		s.metrics.SetConnected(false)
+
+		// Check if context is cancelled
+		if ctx.Err() != nil {
+			return
+		}
+
+		// If we streamed for more than 30 seconds, reset the backoff
+		// This indicates we had a successful connection that received data
+		if streamDuration > 30*time.Second {
+			s.logger.Info("Resetting backoff delay due to successful connection",
+				"stream_duration", streamDuration)
+			backoffDelay = minBackoffDelay
+			consecutiveFailures = 0
+		} else {
+			// Increment consecutive failures
+			consecutiveFailures++
+		}
+
+		// Wait with exponential backoff
+		s.logger.Info("Waiting before reconnection attempt",
+			"delay_seconds", backoffDelay.Seconds(),
+			"consecutive_failures", consecutiveFailures)
+
+		select {
+		case <-ctx.Done():
+			return
+		case <-time.After(backoffDelay):
+			// Double the backoff delay for next time, up to max
+			backoffDelay *= 2
+			if backoffDelay > maxBackoffDelay {
+				backoffDelay = maxBackoffDelay
+			}
+		}
+	}
+}
+
 func (s *Streamer) stream(ctx context.Context) error {
 	req, err := http.NewRequestWithContext(ctx, "GET", risLiveURL, nil)
 	if err != nil {
@@ -390,10 +460,13 @@ func (s *Streamer) stream(ctx context.Context) error {
 		// Parse the message first
 		var wrapper ristypes.RISLiveMessage
 		if err := json.Unmarshal(line, &wrapper); err != nil {
-			// Output the raw line and panic on parse failure
-			fmt.Fprintf(os.Stderr, "Failed to parse JSON: %v\n", err)
-			fmt.Fprintf(os.Stderr, "Raw line: %s\n", string(line))
-			panic(fmt.Sprintf("JSON parse error: %v", err))
+			// Log the error and return to trigger reconnection
+			s.logger.Error("Failed to parse JSON",
+				"error", err,
+				"line", string(line),
+				"line_length", len(line))
+
+			return fmt.Errorf("JSON parse error: %w", err)
 		}
 
 		// Check if it's a ris_message wrapper
@@ -443,18 +516,11 @@ func (s *Streamer) stream(ctx context.Context) error {
 			// Peer state changes - silently ignore
 			continue
 		default:
-			fmt.Fprintf(
-				os.Stderr,
-				"UNKNOWN MESSAGE TYPE: %s\nRAW MESSAGE: %s\n",
-				msg.Type,
-				string(line),
-			)
-			panic(
-				fmt.Sprintf(
-					"Unknown RIS message type: %s",
-					msg.Type,
-				),
+			s.logger.Error("Unknown message type",
+				"type", msg.Type,
+				"line", string(line),
 			)
+			panic(fmt.Sprintf("Unknown RIS message type: %s", msg.Type))
 		}
 
 		// Dispatch to interested handlers

internal/templates/as_detail.html

@@ -0,0 +1,228 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>AS{{.ASN.Number}} - {{.ASN.Handle}} - RouteWatch</title>
+    <style>
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+            margin: 0;
+            padding: 20px;
+            background: #f5f5f5;
+            color: #333;
+        }
+        .container {
+            max-width: 1200px;
+            margin: 0 auto;
+            background: white;
+            padding: 30px;
+            border-radius: 8px;
+            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+        }
+        h1 {
+            margin: 0 0 10px 0;
+            color: #2c3e50;
+        }
+        .subtitle {
+            color: #7f8c8d;
+            margin-bottom: 30px;
+        }
+        .info-grid {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+            gap: 20px;
+            margin-bottom: 30px;
+        }
+        .info-card {
+            background: #f8f9fa;
+            padding: 20px;
+            border-radius: 6px;
+            border-left: 4px solid #3498db;
+        }
+        .info-label {
+            font-size: 14px;
+            color: #7f8c8d;
+            margin-bottom: 5px;
+        }
+        .info-value {
+            font-size: 24px;
+            font-weight: bold;
+            color: #2c3e50;
+        }
+        .prefix-section {
+            margin-top: 30px;
+        }
+        .prefix-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 20px;
+        }
+        .prefix-header h2 {
+            margin: 0;
+            color: #2c3e50;
+        }
+        .prefix-count {
+            background: #e74c3c;
+            color: white;
+            padding: 5px 12px;
+            border-radius: 20px;
+            font-size: 14px;
+            font-weight: bold;
+        }
+        .prefix-table {
+            width: 100%;
+            border-collapse: collapse;
+            background: white;
+            border: 1px solid #e0e0e0;
+            border-radius: 6px;
+            overflow: hidden;
+        }
+        .prefix-table th {
+            background: #34495e;
+            color: white;
+            padding: 12px;
+            text-align: left;
+            font-weight: 600;
+        }
+        .prefix-table td {
+            padding: 12px;
+            border-bottom: 1px solid #e0e0e0;
+        }
+        .prefix-table tr:hover {
+            background: #f8f9fa;
+        }
+        .prefix-table tr:last-child td {
+            border-bottom: none;
+        }
+        .prefix-link {
+            color: #3498db;
+            text-decoration: none;
+            font-family: monospace;
+        }
+        .prefix-link:hover {
+            text-decoration: underline;
+        }
+        .age {
+            color: #7f8c8d;
+            font-size: 14px;
+        }
+        .nav-link {
+            display: inline-block;
+            margin-bottom: 20px;
+            color: #3498db;
+            text-decoration: none;
+        }
+        .nav-link:hover {
+            text-decoration: underline;
+        }
+        .empty-state {
+            text-align: center;
+            padding: 40px;
+            color: #7f8c8d;
+        }
+        @media (max-width: 768px) {
+            .container {
+                padding: 20px;
+            }
+            .info-grid {
+                grid-template-columns: 1fr;
+            }
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <a href="/status" class="nav-link">← Back to Status</a>
+        
+        <h1>AS{{.ASN.Number}}{{if .ASN.Handle}} - {{.ASN.Handle}}{{end}}</h1>
+        {{if .ASN.Description}}
+        <p class="subtitle">{{.ASN.Description}}</p>
+        {{end}}
+        
+        <div class="info-grid">
+            <div class="info-card">
+                <div class="info-label">Total Prefixes</div>
+                <div class="info-value">{{.TotalCount}}</div>
+            </div>
+            <div class="info-card">
+                <div class="info-label">IPv4 Prefixes</div>
+                <div class="info-value">{{.IPv4Count}}</div>
+            </div>
+            <div class="info-card">
+                <div class="info-label">IPv6 Prefixes</div>
+                <div class="info-value">{{.IPv6Count}}</div>
+            </div>
+            <div class="info-card">
+                <div class="info-label">First Seen</div>
+                <div class="info-value">{{.ASN.FirstSeen.Format "2006-01-02"}}</div>
+            </div>
+        </div>
+
+        {{if .IPv4Prefixes}}
+        <div class="prefix-section">
+            <div class="prefix-header">
+                <h2>IPv4 Prefixes</h2>
+                <span class="prefix-count">{{.IPv4Count}}</span>
+            </div>
+            <table class="prefix-table">
+                <thead>
+                    <tr>
+                        <th>Prefix</th>
+                        <th>Mask Length</th>
+                        <th>Last Updated</th>
+                        <th>Age</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {{range .IPv4Prefixes}}
+                    <tr>
+                        <td><a href="/prefix/{{.Prefix | urlEncode}}" class="prefix-link">{{.Prefix}}</a></td>
+                        <td>/{{.MaskLength}}</td>
+                        <td>{{.LastUpdated.Format "2006-01-02 15:04:05"}}</td>
+                        <td class="age">{{.LastUpdated | timeSince}}</td>
+                    </tr>
+                    {{end}}
+                </tbody>
+            </table>
+        </div>
+        {{end}}
+
+        {{if .IPv6Prefixes}}
+        <div class="prefix-section">
+            <div class="prefix-header">
+                <h2>IPv6 Prefixes</h2>
+                <span class="prefix-count">{{.IPv6Count}}</span>
+            </div>
+            <table class="prefix-table">
+                <thead>
+                    <tr>
+                        <th>Prefix</th>
+                        <th>Mask Length</th>
+                        <th>Last Updated</th>
+                        <th>Age</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {{range .IPv6Prefixes}}
+                    <tr>
+                        <td><a href="/prefix/{{.Prefix | urlEncode}}" class="prefix-link">{{.Prefix}}</a></td>
+                        <td>/{{.MaskLength}}</td>
+                        <td>{{.LastUpdated.Format "2006-01-02 15:04:05"}}</td>
+                        <td class="age">{{.LastUpdated | timeSince}}</td>
+                    </tr>
+                    {{end}}
+                </tbody>
+            </table>
+        </div>
+        {{end}}
+
+        {{if eq .TotalCount 0}}
+        <div class="empty-state">
+            <p>No prefixes announced by this AS</p>
+        </div>
+        {{end}}
+    </div>
+</body>
+</html>

internal/templates/prefix_detail.html

@@ -0,0 +1,259 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{{.Prefix}} - RouteWatch</title>
+    <style>
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+            margin: 0;
+            padding: 20px;
+            background: #f5f5f5;
+            color: #333;
+        }
+        .container {
+            width: 90%;
+            max-width: 1600px;
+            margin: 0 auto;
+            background: white;
+            padding: 30px;
+            border-radius: 8px;
+            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+        }
+        h1 {
+            margin: 0 0 10px 0;
+            color: #2c3e50;
+            font-family: monospace;
+            font-size: 28px;
+        }
+        .subtitle {
+            color: #7f8c8d;
+            margin-bottom: 30px;
+        }
+        .info-grid {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+            gap: 20px;
+            margin-bottom: 30px;
+        }
+        .info-card {
+            background: #f8f9fa;
+            padding: 20px;
+            border-radius: 6px;
+            border-left: 4px solid #3498db;
+        }
+        .info-label {
+            font-size: 14px;
+            color: #7f8c8d;
+            margin-bottom: 5px;
+        }
+        .info-value {
+            font-size: 24px;
+            font-weight: bold;
+            color: #2c3e50;
+        }
+        .routes-section {
+            margin-top: 30px;
+        }
+        .routes-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 20px;
+        }
+        .routes-header h2 {
+            margin: 0;
+            color: #2c3e50;
+        }
+        .route-count {
+            background: #e74c3c;
+            color: white;
+            padding: 5px 12px;
+            border-radius: 20px;
+            font-size: 14px;
+            font-weight: bold;
+        }
+        .route-table {
+            width: 100%;
+            border-collapse: collapse;
+            background: white;
+            border: 1px solid #e0e0e0;
+            border-radius: 6px;
+            overflow: hidden;
+        }
+        .route-table th {
+            background: #34495e;
+            color: white;
+            padding: 12px;
+            text-align: left;
+            font-weight: 600;
+        }
+        .route-table td {
+            padding: 12px;
+            border-bottom: 1px solid #e0e0e0;
+            white-space: nowrap;
+        }
+        .route-table tr:hover {
+            background: #f8f9fa;
+        }
+        .route-table tr:last-child td {
+            border-bottom: none;
+        }
+        .as-link {
+            color: #3498db;
+            text-decoration: none;
+        }
+        .as-link:hover {
+            text-decoration: underline;
+        }
+        .peer-ip {
+            font-family: monospace;
+            font-size: 14px;
+            color: #555;
+        }
+        .as-path {
+            font-family: monospace;
+            font-size: 13px;
+            color: #666;
+            max-width: 600px;
+            word-wrap: break-word;
+            white-space: normal !important;
+            line-height: 1.5;
+        }
+        .as-path .as-link {
+            font-weight: 600;
+        }
+        .age {
+            color: #7f8c8d;
+            font-size: 14px;
+        }
+        .nav-link {
+            display: inline-block;
+            margin-bottom: 20px;
+            color: #3498db;
+            text-decoration: none;
+        }
+        .nav-link:hover {
+            text-decoration: underline;
+        }
+        .origins-section {
+            margin-top: 30px;
+            background: #f8f9fa;
+            padding: 20px;
+            border-radius: 6px;
+        }
+        .origins-section h3 {
+            margin-top: 0;
+            color: #2c3e50;
+        }
+        .origin-list {
+            display: flex;
+            flex-wrap: wrap;
+            gap: 10px;
+        }
+        .origin-item {
+            background: white;
+            padding: 10px 15px;
+            border-radius: 4px;
+            border: 1px solid #e0e0e0;
+        }
+        .empty-state {
+            text-align: center;
+            padding: 40px;
+            color: #7f8c8d;
+        }
+        @media (max-width: 768px) {
+            .container {
+                padding: 20px;
+            }
+            .info-grid {
+                grid-template-columns: 1fr;
+            }
+            .route-table {
+                font-size: 14px;
+            }
+            .as-path {
+                max-width: 100%;
+            }
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <a href="/status" class="nav-link">← Back to Status</a>
+        
+        <h1>{{.Prefix}}</h1>
+        <p class="subtitle">IPv{{.IPVersion}} Prefix{{if .MaskLength}} • /{{.MaskLength}}{{end}}</p>
+        
+        <div class="info-grid">
+            <div class="info-card">
+                <div class="info-label">Seen from Peers</div>
+                <div class="info-value">{{.PeerCount}}</div>
+            </div>
+            <div class="info-card">
+                <div class="info-label">Origin ASNs</div>
+                <div class="info-value">{{.OriginCount}}</div>
+            </div>
+            <div class="info-card">
+                <div class="info-label">IP Version</div>
+                <div class="info-value">IPv{{.IPVersion}}</div>
+            </div>
+        </div>
+
+        {{if .Origins}}
+        <div class="origins-section">
+            <h3>Origin ASNs</h3>
+            <div class="origin-list">
+                {{range .Origins}}
+                <div class="origin-item">
+                    <a href="/as/{{.Number}}" class="as-link">AS{{.Number}}</a>
+                    {{if .Handle}} ({{.Handle}}){{end}}
+                    <span style="color: #7f8c8d; margin-left: 10px;">{{.PeerCount}} peer{{if ne .PeerCount 1}}s{{end}}</span>
+                </div>
+                {{end}}
+            </div>
+        </div>
+        {{end}}
+
+        {{if .Routes}}
+        <div class="routes-section">
+            <div class="routes-header">
+                <h2>Route Details</h2>
+                <span class="route-count">{{.PeerCount}} route{{if ne .PeerCount 1}}s{{end}}</span>
+            </div>
+            <table class="route-table">
+                <thead>
+                    <tr>
+                        <th>Origin AS</th>
+                        <th>Peer IP</th>
+                        <th>AS Path</th>
+                        <th>Next Hop</th>
+                        <th>Last Updated</th>
+                        <th>Age</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {{range .Routes}}
+                    <tr>
+                        <td>
+                            <a href="/as/{{.OriginASN}}" class="as-link">AS{{.OriginASN}}</a>
+                        </td>
+                        <td class="peer-ip">{{.PeerIP}}</td>
+                        <td class="as-path">{{range $i, $as := .ASPathWithHandle}}{{if $i}} → {{end}}<a href="/as/{{$as.Number}}" class="as-link">{{if $as.Handle}}{{$as.Handle}}{{else}}AS{{$as.Number}}{{end}}</a>{{end}}</td>
+                        <td class="peer-ip">{{.NextHop}}</td>
+                        <td>{{.LastUpdated.Format "2006-01-02 15:04:05"}}</td>
+                        <td class="age">{{.LastUpdated | timeSince}}</td>
+                    </tr>
+                    {{end}}
+                </tbody>
+            </table>
+        </div>
+        {{else}}
+        <div class="empty-state">
+            <p>No routes found for this prefix</p>
+        </div>
+        {{end}}
+    </div>
+</body>
+</html>

internal/templates/prefix_length.html

@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Prefixes with /{{ .MaskLength }} - RouteWatch</title>
+    <style>
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+            max-width: 1200px;
+            margin: 0 auto;
+            padding: 20px;
+            background: #f5f5f5;
+        }
+        h1 {
+            color: #333;
+            margin-bottom: 10px;
+        }
+        .subtitle {
+            color: #666;
+            margin-bottom: 30px;
+        }
+        .info-card {
+            background: white;
+            padding: 20px;
+            border-radius: 8px;
+            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+            margin-bottom: 20px;
+        }
+        table {
+            width: 100%;
+            border-collapse: collapse;
+            background: white;
+            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+            border-radius: 8px;
+            overflow: hidden;
+        }
+        th {
+            background: #f8f9fa;
+            padding: 12px;
+            text-align: left;
+            font-weight: 600;
+            color: #333;
+            border-bottom: 2px solid #dee2e6;
+        }
+        td {
+            padding: 12px;
+            border-bottom: 1px solid #eee;
+        }
+        tr:last-child td {
+            border-bottom: none;
+        }
+        tr:hover {
+            background: #f8f9fa;
+        }
+        a {
+            color: #0066cc;
+            text-decoration: none;
+        }
+        a:hover {
+            text-decoration: underline;
+        }
+        .prefix-link {
+            font-family: 'SF Mono', Monaco, 'Cascadia Mono', 'Roboto Mono', Consolas, 'Courier New', monospace;
+        }
+        .as-link {
+            white-space: nowrap;
+        }
+        .age {
+            color: #666;
+            font-size: 0.9em;
+        }
+        .back-link {
+            display: inline-block;
+            margin-bottom: 20px;
+            color: #0066cc;
+        }
+    </style>
+</head>
+<body>
+    <a href="/status" class="back-link">← Back to Status</a>
+    <h1>IPv{{ .IPVersion }} Prefixes with /{{ .MaskLength }}</h1>
+    <p class="subtitle">Showing {{ .Count }} randomly selected prefixes</p>
+    
+    <table>
+        <thead>
+            <tr>
+                <th>Prefix</th>
+                <th>Age</th>
+                <th>Origin AS</th>
+            </tr>
+        </thead>
+        <tbody>
+            {{ range .Prefixes }}
+            <tr>
+                <td><a href="/prefix/{{ .Prefix | urlEncode }}" class="prefix-link">{{ .Prefix }}</a></td>
+                <td class="age">{{ .Age }}</td>
+                <td>
+                    <a href="/as/{{ .OriginASN }}" class="as-link">
+                        AS{{ .OriginASN }}{{ if .OriginASDescription }} ({{ .OriginASDescription }}){{ end }}
+                    </a>
+                </td>
+            </tr>
+            {{ end }}
+        </tbody>
+    </table>
+</body>
+</html>

internal/templates/status.html

@@ -49,6 +49,16 @@
             font-family: 'SF Mono', Monaco, 'Cascadia Mono', 'Roboto Mono', Consolas, 'Courier New', monospace;
             color: #333;
         }
+        .metric-value.metric-link {
+            text-decoration: underline;
+            text-decoration-style: dashed;
+            text-underline-offset: 2px;
+            cursor: pointer;
+        }
+        .metric-value.metric-link:hover {
+            color: #0066cc;
+            text-decoration-style: solid;
+        }
         .connected {
             color: #22c55e;
         }
@@ -231,7 +241,7 @@
                 metric.className = 'metric';
                 metric.innerHTML = `
                     <span class="metric-label">/${item.mask_length}</span>
-                    <span class="metric-value">${formatNumber(item.count)}</span>
+                    <a href="/prefixlength/${item.mask_length}" class="metric-value metric-link">${formatNumber(item.count)}</a>
                 `;
                 container.appendChild(metric);
             });

internal/templates/templates.go

@@ -4,15 +4,29 @@ package templates
 import (
 	_ "embed"
 	"html/template"
+	"net/url"
 	"sync"
+	"time"
 )
 
 //go:embed status.html
 var statusHTML string
 
+//go:embed as_detail.html
+var asDetailHTML string
+
+//go:embed prefix_detail.html
+var prefixDetailHTML string
+
+//go:embed prefix_length.html
+var prefixLengthHTML string
+
 // Templates contains all parsed templates
 type Templates struct {
-	Status *template.Template
+	Status       *template.Template
+	ASDetail     *template.Template
+	PrefixDetail *template.Template
+	PrefixLength *template.Template
 }
 
 var (
@@ -22,17 +36,79 @@ var (
 	once sync.Once
 )
 
+const (
+	hoursPerDay  = 24
+	daysPerMonth = 30
+)
+
+// timeSince returns a human-readable duration since the given time
+func timeSince(t time.Time) string {
+	duration := time.Since(t)
+	if duration < time.Minute {
+		return "just now"
+	}
+	if duration < time.Hour {
+		minutes := int(duration.Minutes())
+		if minutes == 1 {
+			return "1 minute ago"
+		}
+
+		return duration.Truncate(time.Minute).String() + " ago"
+	}
+	if duration < hoursPerDay*time.Hour {
+		hours := int(duration.Hours())
+		if hours == 1 {
+			return "1 hour ago"
+		}
+
+		return duration.Truncate(time.Hour).String() + " ago"
+	}
+	days := int(duration.Hours() / hoursPerDay)
+	if days == 1 {
+		return "1 day ago"
+	}
+	if days < daysPerMonth {
+		return duration.Truncate(hoursPerDay*time.Hour).String() + " ago"
+	}
+
+	return t.Format("2006-01-02")
+}
+
 // initTemplates parses all embedded templates
 func initTemplates() {
 	var err error
 
 	defaultTemplates = &Templates{}
 
+	// Create common template functions
+	funcs := template.FuncMap{
+		"timeSince": timeSince,
+		"urlEncode": url.QueryEscape,
+	}
+
 	// Parse status template
 	defaultTemplates.Status, err = template.New("status").Parse(statusHTML)
 	if err != nil {
 		panic("failed to parse status template: " + err.Error())
 	}
+
+	// Parse AS detail template
+	defaultTemplates.ASDetail, err = template.New("asDetail").Funcs(funcs).Parse(asDetailHTML)
+	if err != nil {
+		panic("failed to parse AS detail template: " + err.Error())
+	}
+
+	// Parse prefix detail template
+	defaultTemplates.PrefixDetail, err = template.New("prefixDetail").Funcs(funcs).Parse(prefixDetailHTML)
+	if err != nil {
+		panic("failed to parse prefix detail template: " + err.Error())
+	}
+
+	// Parse prefix length template
+	defaultTemplates.PrefixLength, err = template.New("prefixLength").Funcs(funcs).Parse(prefixLengthHTML)
+	if err != nil {
+		panic("failed to parse prefix length template: " + err.Error())
+	}
 }
 
 // Get returns the singleton Templates instance
@@ -46,3 +122,18 @@ func Get() *Templates {
 func StatusTemplate() *template.Template {
 	return Get().Status
 }
+
+// ASDetailTemplate returns the parsed AS detail template
+func ASDetailTemplate() *template.Template {
+	return Get().ASDetail
+}
+
+// PrefixDetailTemplate returns the parsed prefix detail template
+func PrefixDetailTemplate() *template.Template {
+	return Get().PrefixDetail
+}
+
+// PrefixLengthTemplate returns the parsed prefix length template
+func PrefixLengthTemplate() *template.Template {
+	return Get().PrefixLength
+}