v2.1.1 - Wire REQ/COUNT/EVENT paths through thread pool sync helpers and stabilize filter limit tests

Dockerfile.alpine-musl

@@ -28,7 +28,8 @@ RUN apk add --no-cache \
     sqlite-static \
     linux-headers \
     wget \
-    bash
+    bash \
+    openssh-client
 
 # Set working directory
 WORKDIR /build
@@ -68,15 +69,8 @@ RUN cd /tmp && \
     make install && \
     rm -rf /tmp/libwebsockets
 
-# Copy only submodule configuration and git directory
-COPY .gitmodules /build/.gitmodules
-COPY .git /build/.git
-
-# Clean up any stale submodule references (nips directory is not a submodule)
-RUN git rm --cached nips 2>/dev/null || true
-
-# Initialize submodules (cached unless .gitmodules changes)
-RUN git submodule update --init --recursive
+# Submodules are provided in the local build context and copied explicitly below.
+# Avoid network/SSH dependency inside Docker image build.
 
 # Copy nostr_core_lib source files (cached unless nostr_core_lib changes)
 COPY nostr_core_lib /build/nostr_core_lib/
@@ -84,11 +78,13 @@ COPY nostr_core_lib /build/nostr_core_lib/
 # Copy c_utils_lib source files (cached unless c_utils_lib changes)
 COPY c_utils_lib /build/c_utils_lib/
 
-# Build c_utils_lib with MUSL-compatible flags (cached unless c_utils_lib changes)
+# Build c_utils_lib static library for relay logging utilities
+# (build only debug.c to avoid broken/missing version header surface in submodule revision)
 RUN cd c_utils_lib && \
-    sed -i 's/CFLAGS = -Wall -Wextra -std=c99 -O2 -g/CFLAGS = -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -Wall -Wextra -std=c99 -O2 -g/' Makefile && \
-    make clean && \
-    make
+    mkdir -p build && \
+    gcc -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -Wall -Wextra -std=c99 -O2 -g \
+        -Isrc -Iinclude -c src/debug.c -o build/debug.o && \
+    ar rcs libc_utils.a build/debug.o
 
 # Build nostr_core_lib with required NIPs (cached unless nostr_core_lib changes)
 # Disable fortification in build.sh to prevent __*_chk symbol issues
@@ -122,6 +118,7 @@ RUN if [ "$DEBUG_BUILD" = "true" ]; then \
     src/main.c src/config.c src/dm_admin.c src/request_validator.c \
     src/nip009.c src/nip011.c src/nip013.c src/nip040.c src/nip042.c \
     src/websockets.c src/subscriptions.c src/api.c src/embedded_web_content.c src/ip_ban.c \
+    src/db_ops.c src/thread_pool.c \
     -o /build/c_relay_static \
     c_utils_lib/libc_utils.a \
     nostr_core_lib/libnostr_core_x64.a \

Makefile

@@ -9,7 +9,7 @@ LIBS = -lsqlite3 -lwebsockets -lz -ldl -lpthread -lm -L/usr/local/lib -lsecp256k
 BUILD_DIR = build
 
 # Source files
-MAIN_SRC = src/main.c src/config.c src/dm_admin.c src/request_validator.c src/nip009.c src/nip011.c src/nip013.c src/nip040.c src/nip042.c src/websockets.c src/subscriptions.c src/api.c src/embedded_web_content.c src/ip_ban.c
+MAIN_SRC = src/main.c src/config.c src/dm_admin.c src/request_validator.c src/nip009.c src/nip011.c src/nip013.c src/nip040.c src/nip042.c src/websockets.c src/subscriptions.c src/api.c src/embedded_web_content.c src/ip_ban.c src/db_ops.c src/thread_pool.c
 NOSTR_CORE_LIB = nostr_core_lib/libnostr_core_x64.a
 C_UTILS_LIB = c_utils_lib/libc_utils.a
 

api/index.html

@@ -124,14 +124,14 @@
                             <td>Memory Usage</td>
                             <td id="memory-usage">-</td>
                         </tr>
-                        <tr>
-                            <td>CPU Core</td>
-                            <td id="cpu-core">-</td>
-                        </tr>
                         <tr>
                             <td>CPU Usage</td>
                             <td id="cpu-usage">-</td>
                         </tr>
+                        <tr>
+                            <td>CPU Core</td>
+                            <td id="cpu-core">-</td>
+                        </tr>
                         <tr>
                             <td>Oldest Event</td>
                             <td id="oldest-event">-</td>

api/index.js

@@ -51,6 +51,9 @@ let pendingSqlQueries = new Map();
 let eventRateChart = null;
 let previousTotalEvents = 0; // Track previous total for rate calculation
 
+// Temporary diagnostics toggle: enable deep SimplePool diagnostics in nostr.bundle.js
+window.__SIMPLE_POOL_DEBUG__ = true;
+
 // Relay Events state - now handled by main subscription
 
 // DOM elements
@@ -85,6 +88,47 @@ function log(message, type = 'INFO') {
     // UI logging removed - using console only
 }
 
+function normalizeRelayUrlForPool(url) {
+    try {
+        let normalized = url || '';
+        if (!normalized.includes('://')) {
+            normalized = 'wss://' + normalized;
+        }
+        const parsed = new URL(normalized);
+        parsed.pathname = parsed.pathname.replace(/\/+/g, '/');
+        if (parsed.pathname.endsWith('/')) {
+            parsed.pathname = parsed.pathname.slice(0, -1);
+        }
+        if ((parsed.port === '80' && parsed.protocol === 'ws:') ||
+            (parsed.port === '443' && parsed.protocol === 'wss:')) {
+            parsed.port = '';
+        }
+        parsed.searchParams.sort();
+        parsed.hash = '';
+        return parsed.toString();
+    } catch (error) {
+        console.warn('Failed to normalize relay URL for diagnostics:', url, error?.message || error);
+        return url;
+    }
+}
+
+async function handleNip42Auth(url, challenge, context = 'SimplePool') {
+    console.log(`🔐 NIP-42 AUTH challenge during ${context}:`, challenge);
+    try {
+        if (!window.nostr) {
+            console.error(`NIP-42 auth required during ${context} but no nostr extension available`);
+            return;
+        }
+
+        const authEvent = window.NostrTools.nip42.makeAuthEvent(url, challenge);
+        const signedAuthEvent = await window.nostr.signEvent(authEvent);
+        console.log(`✅ NIP-42 AUTH signed for ${context}`);
+        return signedAuthEvent;
+    } catch (authError) {
+        console.error(`NIP-42 AUTH failed during ${context}:`, authError.message);
+    }
+}
+
 // Utility functions
 function log(message, type = 'INFO') {
     const timestamp = new Date().toISOString().split('T')[1].split('.')[0];
@@ -150,9 +194,9 @@ async function fetchRelayInfo(relayUrl) {
             throw new Error(`HTTP ${response.status}: ${response.statusText}`);
         }
 
-        const contentType = response.headers.get('content-type');
-        if (!contentType || !contentType.includes('application/nostr+json')) {
-            throw new Error(`Invalid content type: ${contentType}. Expected application/nostr+json`);
+        const contentType = response.headers.get('content-type') || '';
+        if (!contentType.includes('application/nostr+json') && !contentType.includes('application/json')) {
+            log(`Unexpected NIP-11 content type: ${contentType}; attempting JSON parse anyway`, 'WARN');
         }
 
         const relayInfo = await response.json();
@@ -237,9 +281,38 @@ async function checkExistingAuthWithRetries() {
                 console.log('Trying window.NOSTR_LOGIN_LITE.getAuthState()...');
                 const authState = window.NOSTR_LOGIN_LITE.getAuthState();
                 if (authState && authState.pubkey) {
-                    console.log('✅ Auth state found via NOSTR_LOGIN_LITE.getAuthState():', authState.pubkey);
-                    await restoreAuthenticationState(authState.pubkey);
-                    return true;
+                    // Extension auth must be actively restorable, otherwise treat as stale and continue.
+                    if (authState.method === 'extension') {
+                        console.log('Stored extension auth found, verifying live extension availability...');
+                        let restoredExtensionAuth = null;
+
+                        if (window.nostr && typeof window.nostr.restoreAuthState === 'function') {
+                            restoredExtensionAuth = await window.nostr.restoreAuthState();
+                        }
+
+                        if (restoredExtensionAuth && restoredExtensionAuth.pubkey) {
+                            console.log('✅ Extension auth restored successfully:', restoredExtensionAuth.pubkey);
+                            console.log('✅ LOGIN ATTEMPT RESULT: SUCCESS (restored extension session)', {
+                                method: 'extension',
+                                pubkey: restoredExtensionAuth.pubkey
+                            });
+                            await restoreAuthenticationState(restoredExtensionAuth.pubkey);
+                            return true;
+                        }
+
+                        console.log('⚠️ Stored extension auth is stale (no live extension), clearing and continuing');
+                        if (typeof window.NOSTR_LOGIN_LITE.clearAuthState === 'function') {
+                            window.NOSTR_LOGIN_LITE.clearAuthState();
+                        }
+                    } else {
+                        console.log('✅ Auth state found via NOSTR_LOGIN_LITE.getAuthState():', authState.pubkey);
+                        console.log('✅ LOGIN ATTEMPT RESULT: SUCCESS (restored NOSTR_LOGIN_LITE auth state)', {
+                            method: authState.method || 'unknown',
+                            pubkey: authState.pubkey
+                        });
+                        await restoreAuthenticationState(authState.pubkey);
+                        return true;
+                    }
                 }
             }
 
@@ -249,6 +322,10 @@ async function checkExistingAuthWithRetries() {
                 const pubkey = await nlLite.getPublicKey();
                 if (pubkey && pubkey.length === 64) {
                     console.log('✅ Pubkey found via nlLite.getPublicKey():', pubkey);
+                    console.log('✅ LOGIN ATTEMPT RESULT: SUCCESS (restored nlLite session)', {
+                        method: 'restored-nlLite',
+                        pubkey
+                    });
                     await restoreAuthenticationState(pubkey);
                     return true;
                 }
@@ -260,6 +337,10 @@ async function checkExistingAuthWithRetries() {
                 const pubkey = await window.nostr.getPublicKey();
                 if (pubkey && pubkey.length === 64) {
                     console.log('✅ Pubkey found via window.nostr.getPublicKey():', pubkey);
+                    console.log('✅ LOGIN ATTEMPT RESULT: SUCCESS (restored window.nostr session)', {
+                        method: 'restored-window.nostr',
+                        pubkey
+                    });
                     await restoreAuthenticationState(pubkey);
                     return true;
                 }
@@ -272,6 +353,10 @@ async function checkExistingAuthWithRetries() {
                     const parsedData = JSON.parse(localStorageData);
                     if (parsedData.pubkey) {
                         console.log('✅ Pubkey found in localStorage:', parsedData.pubkey);
+                        console.log('✅ LOGIN ATTEMPT RESULT: SUCCESS (restored localStorage session)', {
+                            method: 'restored-localStorage',
+                            pubkey: parsedData.pubkey
+                        });
                         await restoreAuthenticationState(parsedData.pubkey);
                         return true;
                     }
@@ -295,6 +380,7 @@ async function checkExistingAuthWithRetries() {
         }
     }
 
+    console.warn('❌ LOGIN ATTEMPT RESULT: NO STORED SESSION FOUND (showing login modal)');
     console.log('🔍 Authentication detection completed - no existing auth found after all attempts');
     return false;
 }
@@ -314,7 +400,12 @@ async function restoreAuthenticationState(pubkey) {
     await setupAutomaticRelayConnection(false);
 
     // Verify admin access before showing admin sections
-    verifyAdminAccess();
+    const adminCheckResult = await verifyAdminAccess('restore-auth-state');
+    if (adminCheckResult?.passed) {
+        console.log('✅ POST-LOGIN ADMIN CHECK PASSED (restore):', adminCheckResult.reason);
+    } else {
+        console.warn('❌ POST-LOGIN ADMIN CHECK FAILED (restore):', adminCheckResult?.reason || 'Unknown reason');
+    }
 
     console.log('✅ Authentication state restored successfully');
 }
@@ -357,12 +448,20 @@ async function setupAutomaticRelayConnection(showSections = false) {
             const httpUrl = relayUrl.replace('ws', 'http').replace('wss', 'https');
             const relayInfo = await fetchRelayInfo(httpUrl);
 
-            if (relayInfo && relayInfo.pubkey) {
-                relayPubkey = relayInfo.pubkey;
+            const fetchedPubkey = relayInfo && relayInfo.pubkey ? relayInfo.pubkey : null;
+            relayPubkey = fetchedPubkey || '4f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa';
+
+            // Keep relay metadata (including version) even when pubkey is missing/fallback
+            relayInfoData = {
+                name: relayInfo?.name || 'C-Relay',
+                version: relayInfo?.version || '',
+                description: relayInfo?.description || 'Nostr Relay',
+                pubkey: relayPubkey
+            };
+
+            if (fetchedPubkey) {
                 console.log('🔑 Auto-fetched relay pubkey:', relayPubkey.substring(0, 16) + '...');
             } else {
-                // Use fallback pubkey
-                relayPubkey = '4f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa';
                 console.log('⚠️ Using fallback relay pubkey');
             }
         } catch (error) {
@@ -447,7 +546,7 @@ async function initializeApp() {
 }
 
 // Handle authentication events
-function handleAuthEvent(event) {
+async function handleAuthEvent(event) {
     const { pubkey, method, error } = event.detail;
 
     if (method && pubkey) {
@@ -455,20 +554,34 @@ function handleAuthEvent(event) {
         isLoggedIn = true;
         console.log(`Login successful! Method: ${method}`);
         console.log(`Public key: ${pubkey}`);
+        console.log('✅ LOGIN ATTEMPT RESULT: SUCCESS (interactive login)', { method, pubkey });
 
         // Hide login modal and show profile in header
         hideLoginModal();
         showProfileInHeader();
         loadUserProfile();
 
+        console.log('🔎 POST-LOGIN DEBUG: Starting admin verification flow', {
+            method,
+            pubkey,
+            isLoggedIn,
+            isRelayConnected
+        });
+
         // Automatically set up relay connection
-        setupAutomaticRelayConnection(false); // Don't show sections yet - wait for admin verification
+        await setupAutomaticRelayConnection(false); // Don't show sections yet - wait for admin verification
 
         // Verify admin access before showing admin sections
-        verifyAdminAccess();
+        const adminCheckResult = await verifyAdminAccess('auth-event');
+        if (adminCheckResult?.passed) {
+            console.log('✅ POST-LOGIN ADMIN CHECK PASSED:', adminCheckResult.reason);
+        } else {
+            console.warn('❌ POST-LOGIN ADMIN CHECK FAILED:', adminCheckResult?.reason || 'Unknown reason');
+        }
 
     } else if (error) {
         console.log(`Authentication error: ${error}`);
+        console.warn('❌ LOGIN ATTEMPT RESULT: FAILED (interactive login)', { error });
     }
 }
 
@@ -509,22 +622,40 @@ function handleLogoutEvent() {
 }
 
 // Verify admin access by sending a system_status command and waiting for response
-async function verifyAdminAccess() {
-    console.log('=== VERIFYING ADMIN ACCESS (BYPASS MODE) ===');
+async function verifyAdminAccess(source = 'unknown') {
+    console.log('=== VERIFYING ADMIN ACCESS (BYPASS MODE) ===', { source, isLoggedIn, isRelayConnected });
     
-    if (!isLoggedIn || !isRelayConnected) {
-        console.log('Cannot verify admin access - not logged in or not connected to relay');
-        showAccessDeniedOverlay();
-        return;
+    if (!isLoggedIn) {
+        const reason = 'User is not logged in';
+        console.warn('❌ Admin check failed:', reason, { source });
+        isAdminVerified = false;
+        pendingAdminVerification = false;
+        hideAccessDeniedOverlay();
+        updateAdminSectionsVisibility();
+        return { passed: false, reason, source };
+    }
+
+    if (!isRelayConnected) {
+        const reason = 'Relay connection is not ready yet';
+        console.warn('⚠️ Admin check deferred:', reason, { source });
+        pendingAdminVerification = false;
+        isAdminVerified = false;
+        hideAccessDeniedOverlay(); // Do not show ACCESS DENIED while connection is still establishing
+        updateAdminSectionsVisibility();
+        return { passed: false, reason, source, deferred: true };
     }
 
     // TEMPORARY BYPASS: Skip admin verification and grant access immediately
     // TODO: Re-enable once idle_connection_timeout_sec is increased to 120+
     pendingAdminVerification = false;
     isAdminVerified = true;
+    hideAccessDeniedOverlay();
     hideAdminVerificationLoading();
     updateAdminSectionsVisibility();
-    console.log('✅ Admin verification bypassed (temporary)');
+
+    const reason = 'Bypass mode enabled (temporary)';
+    console.log('✅ Admin verification passed:', reason, { source });
+    return { passed: true, reason, source, bypass: true };
 }
 
 // Show loading indicator while verifying admin access
@@ -975,40 +1106,17 @@ function attachWebSocketMonitoring(relayPool, url) {
 
     // SimplePool stores connections in _conn object
     if (relayPool && relayPool._conn) {
-        // Monitor when connections are created
-        const originalGetConnection = relayPool._conn[url];
-        if (originalGetConnection) {
+        // Diagnostics only: inspect existing connection without mutating _conn internals
+        const existingConn = relayPool._conn[url];
+        if (existingConn) {
             console.log('📡 Found existing connection for URL:', url);
-
-            // Try to access the WebSocket if it's available
-            const conn = relayPool._conn[url];
-            if (conn && conn.ws) {
-                attachWebSocketEventListeners(conn.ws, url);
+            if (existingConn.ws && !existingConn.ws._monitored) {
+                attachWebSocketEventListeners(existingConn.ws, url);
+                existingConn.ws._monitored = true;
             }
+        } else {
+            console.log('📡 No existing _conn entry yet for URL:', url);
         }
-
-        // Override the connection getter to monitor new connections
-        const originalConn = relayPool._conn;
-        relayPool._conn = new Proxy(originalConn, {
-            get(target, prop) {
-                const conn = target[prop];
-                if (conn && conn.ws && !conn.ws._monitored) {
-                    console.log('🔗 New WebSocket connection detected for:', prop);
-                    attachWebSocketEventListeners(conn.ws, prop);
-                    conn.ws._monitored = true;
-                }
-                return conn;
-            },
-            set(target, prop, value) {
-                if (value && value.ws && !value.ws._monitored) {
-                    console.log('🔗 WebSocket connection being set for:', prop);
-                    attachWebSocketEventListeners(value.ws, prop);
-                    value.ws._monitored = true;
-                }
-                target[prop] = value;
-                return true;
-            }
-        });
     }
 
     console.log('✅ WebSocket monitoring attached');
@@ -1160,7 +1268,32 @@ async function subscribeToConfiguration() {
         console.log(`📝 Generated subscription ID: ${subscriptionId}`);
         console.log(`👤 User pubkey: ${userPubkey}`);
         console.log(`🎯 About to call relayPool.subscribeMany with URL: ${url}`);
+        const normalizedUrl = normalizeRelayUrlForPool(url);
+        const relayMapKeysBefore = relayPool?.relays ? Array.from(relayPool.relays.keys()) : [];
         console.log(`📊 relayPool._conn before subscribeMany:`, Object.keys(relayPool._conn || {}));
+        console.log('🔎 ADMIN SUB DIAG: URL normalization', {
+            rawUrl: url,
+            normalizedUrl,
+            relayMapKeysBefore
+        });
+        const preSubConn = relayPool._conn?.[url] || relayPool._conn?.[normalizedUrl];
+        const preSubRelay = relayPool?.relays?.get?.(normalizedUrl);
+        console.log('🔎 ADMIN SUB DIAG: pre-subscribe connection snapshot', {
+            url,
+            normalizedUrl,
+            hasConn: !!preSubConn,
+            connType: preSubConn?.constructor?.name,
+            hasWs: !!preSubConn?.ws,
+            wsReadyState: preSubConn?.ws?.readyState,
+            wsUrl: preSubConn?.ws?.url,
+            wsProtocol: preSubConn?.ws?.protocol,
+            hasRelayObj: !!preSubRelay,
+            relayConnected: preSubRelay?.connected,
+            isLoggedIn,
+            isRelayConnected,
+            isSubscribed,
+            isSubscribing
+        });
         
         // Mark as subscribed BEFORE calling subscribeMany to prevent race conditions
         isSubscribed = true;
@@ -1310,42 +1443,38 @@ async function subscribeToConfiguration() {
                 }
             },
             async onauth(challenge) {
-                // NIP-42 authentication: relay sent AUTH challenge, sign and respond
-                console.log('🔐 NIP-42 AUTH challenge received:', challenge);
-                try {
-                    if (!window.nostr) {
-                        console.error('NIP-42 auth required but no nostr extension available');
-                        return;
-                    }
-                    const url = relayConnectionUrl.value.trim();
-                    const authEvent = window.NostrTools.nip42.makeAuthEvent(url, challenge);
-                    const signedAuthEvent = await window.nostr.signEvent(authEvent);
-                    console.log('✅ NIP-42 AUTH event signed, responding to challenge');
-                    return signedAuthEvent;
-                } catch (authError) {
-                    console.error('NIP-42 AUTH failed:', authError.message);
-                }
+                const authUrl = relayConnectionUrl.value.trim();
+                return handleNip42Auth(authUrl, challenge, 'subscription');
             },
             onclose(reason) {
-                console.log('Subscription closed:', reason);
-                // Only reset state if the admin relay itself closed (not external relays timing out)
-                // reason is an array of close reasons, one per relay in the subscription
-                const adminUrl = relayConnectionUrl.value.trim();
+                const closeNormalizedUrl = normalizeRelayUrlForPool(url);
+                const closeConn = relayPool?._conn?.[url] || relayPool?._conn?.[closeNormalizedUrl];
+                const closeRelay = relayPool?.relays?.get?.(closeNormalizedUrl);
                 const reasons = Array.isArray(reason) ? reason : [reason];
-                // Check if the admin relay's connection closed (not just external relays timing out)
-                // If all reasons are 'connection timed out', these are external relays, not our relay
-                const allTimeout = reasons.every(r => r === 'connection timed out');
-                if (!allTimeout) {
-                    // Admin relay actually closed — reset state
-                    isSubscribed = false;
-                    isSubscribing = false;
-                    isRelayConnected = false;
-                    updateConfigStatus(false);
-                    log('WebSocket connection closed - subscription state reset', 'WARNING');
-                } else {
-                    // External relays timed out — keep admin relay state intact
-                    log('External relay connections timed out (admin relay still connected)', 'INFO');
-                }
+                console.log('Subscription closed:', reason);
+                console.log('🔎 ADMIN SUB DIAG: onclose details', {
+                    url,
+                    closeNormalizedUrl,
+                    reasons,
+                    allTimeout: reasons.length > 0 && reasons.every(r => String(r).includes('timeout')),
+                    hasConn: !!closeConn,
+                    hasWs: !!closeConn?.ws,
+                    wsReadyState: closeConn?.ws?.readyState,
+                    wsUrl: closeConn?.ws?.url,
+                    hasRelayObj: !!closeRelay,
+                    relayConnected: closeRelay?.connected,
+                    isLoggedIn,
+                    isRelayConnected,
+                    isSubscribed,
+                    isSubscribing
+                });
+                // This subscription is created only for the admin relay URL in subscribeMany([url], ...),
+                // so any close/timeout here must reset admin relay state to force clean reconnect.
+                isSubscribed = false;
+                isSubscribing = false;
+                isRelayConnected = false;
+                updateConfigStatus(false);
+                log('Admin relay subscription closed/timed out - connection state reset', 'WARNING');
             }
         });
 
@@ -1356,6 +1485,27 @@ async function subscribeToConfiguration() {
         isSubscribed = true;
         isSubscribing = false;
 
+        const normalizedUrlAfter = normalizeRelayUrlForPool(url);
+        const relayMapKeysAfter = relayPool?.relays ? Array.from(relayPool.relays.keys()) : [];
+        const postSubConn = relayPool._conn?.[url] || relayPool._conn?.[normalizedUrlAfter];
+        const postSubRelay = relayPool?.relays?.get?.(normalizedUrlAfter);
+        console.log('🔎 ADMIN SUB DIAG: post-subscribe connection snapshot', {
+            url,
+            normalizedUrl: normalizedUrlAfter,
+            relayMapKeysAfter,
+            hasConn: !!postSubConn,
+            connType: postSubConn?.constructor?.name,
+            hasWs: !!postSubConn?.ws,
+            wsReadyState: postSubConn?.ws?.readyState,
+            wsUrl: postSubConn?.ws?.url,
+            wsProtocol: postSubConn?.ws?.protocol,
+            hasRelayObj: !!postSubRelay,
+            relayConnected: postSubRelay?.connected,
+            isLoggedIn,
+            isRelayConnected,
+            isSubscribed,
+            isSubscribing
+        });
         console.log('✅ Subscription established successfully');
         return true;
 
@@ -1479,9 +1629,9 @@ function initializeEventRateChart() {
             debug: false           // Disable debug logging
         });
 
-        console.log('ASCIIBarChart instance created:', eventRateChart);
-        console.log('Chart container content after init:', chartContainer.textContent);
-        console.log('Chart container innerHTML after init:', chartContainer.innerHTML);
+        // console.log('ASCIIBarChart instance created:', eventRateChart);
+        // console.log('Chart container content after init:', chartContainer.textContent);
+        // console.log('Chart container innerHTML after init:', chartContainer.innerHTML);
         
         // Force an initial render
         if (eventRateChart && typeof eventRateChart.render === 'function') {
@@ -1965,7 +2115,7 @@ async function loadWotStatus() {
 
         // Publish via SimplePool
         const url = relayConnectionUrl.value.trim();
-        await relayPool.publish([url], signedEvent);
+        await relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         log('WoT status query sent successfully', 'INFO');
 
@@ -2011,7 +2161,7 @@ async function setWotLevel(level) {
 
         // Publish via SimplePool
         const url = relayConnectionUrl.value.trim();
-        await relayPool.publish([url], signedEvent);
+        await relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         log(`WoT level set to ${level} - sync will trigger automatically`, 'INFO');
 
@@ -2060,7 +2210,7 @@ async function syncWot() {
 
         // Publish via SimplePool
         const url = relayConnectionUrl.value.trim();
-        await relayPool.publish([url], signedEvent);
+        await relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         log('WoT sync command sent', 'INFO');
 
@@ -2243,7 +2393,7 @@ async function fetchConfiguration() {
 
             // Publish via SimplePool with detailed error diagnostics
             const url = relayConnectionUrl.value.trim();
-            const publishPromises = relayPool.publish([url], signedEvent);
+            const publishPromises = relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
             // Use Promise.allSettled to capture per-relay outcomes instead of Promise.any
             const results = await Promise.allSettled(publishPromises);
@@ -2268,6 +2418,13 @@ async function fetchConfiguration() {
             // Throw error if all relays failed
             if (successCount === 0) {
                 const errorDetails = results.map((r, i) => `Relay ${i}: ${r.reason?.message || r.reason}`).join('; ');
+                console.warn('❌ ADMIN COMMAND RESULT: FAILED (config_query)', {
+                    relayUrl: url,
+                    userPubkey,
+                    relayPubkey,
+                    reason: errorDetails,
+                    hint: 'Login can be successful while admin commands fail (wrong admin key, relay-side auth rejection, or command timeout).'
+                });
                 throw new Error(`All relays rejected the event. Details: ${errorDetails}`);
             }
 
@@ -2281,6 +2438,11 @@ async function fetchConfiguration() {
 
     } catch (error) {
         console.error('Failed to fetch configuration:', error);
+        console.warn('❌ ADMIN COMMAND RESULT: FAILED (fetchConfiguration catch)', {
+            userPubkey,
+            relayPubkey,
+            message: error?.message || String(error)
+        });
         return false;
     }
 }
@@ -2488,7 +2650,7 @@ async function sendConfigUpdateCommand(configObjects) {
 
         // Publish via SimplePool with detailed error diagnostics
         const url = relayConnectionUrl.value.trim();
-        const publishPromises = relayPool.publish([url], signedEvent);
+        const publishPromises = relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         // Use Promise.allSettled to capture per-relay outcomes instead of Promise.any
         const results = await Promise.allSettled(publishPromises);
@@ -2684,7 +2846,7 @@ async function loadAuthRules() {
 
         // Publish via SimplePool with detailed error diagnostics
         const url = relayConnectionUrl.value.trim();
-        const publishPromises = relayPool.publish([url], signedEvent);
+        const publishPromises = relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         // Use Promise.allSettled to capture per-relay outcomes instead of Promise.any
         const results = await Promise.allSettled(publishPromises);
@@ -2901,7 +3063,7 @@ async function deleteAuthRule(index) {
 
         // Publish via SimplePool with detailed error diagnostics
         const url = relayConnectionUrl.value.trim();
-        const publishPromises = relayPool.publish([url], signedEvent);
+        const publishPromises = relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         // Use Promise.allSettled to capture per-relay outcomes instead of Promise.any
         const results = await Promise.allSettled(publishPromises);
@@ -3329,7 +3491,7 @@ async function addAuthRuleViaWebSocket(ruleData) {
 
         // Publish via SimplePool with detailed error diagnostics
         const url = relayConnectionUrl.value.trim();
-        const publishPromises = relayPool.publish([url], signedEvent);
+        const publishPromises = relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         // Use Promise.allSettled to capture per-relay outcomes instead of Promise.any
         const results = await Promise.allSettled(publishPromises);
@@ -3435,7 +3597,7 @@ async function testGetAuthRules() {
 
         // Publish via SimplePool with detailed error diagnostics
         const url = relayConnectionUrl.value.trim();
-        const publishPromises = relayPool.publish([url], signedEvent);
+        const publishPromises = relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         // Use Promise.allSettled to capture per-relay outcomes instead of Promise.any
         const results = await Promise.allSettled(publishPromises);
@@ -3509,7 +3671,7 @@ async function testClearAuthRules() {
 
         // Publish via SimplePool with detailed error diagnostics
         const url = relayConnectionUrl.value.trim();
-        const publishPromises = relayPool.publish([url], signedEvent);
+        const publishPromises = relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         // Use Promise.allSettled to capture per-relay outcomes instead of Promise.any
         const results = await Promise.allSettled(publishPromises);
@@ -3592,7 +3754,7 @@ async function testAddBlacklist() {
 
         // Publish via SimplePool with detailed error diagnostics
         const url = relayConnectionUrl.value.trim();
-        const publishPromises = relayPool.publish([url], signedEvent);
+        const publishPromises = relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         // Use Promise.allSettled to capture per-relay outcomes instead of Promise.any
         const results = await Promise.allSettled(publishPromises);
@@ -3675,7 +3837,7 @@ async function testAddWhitelist() {
 
         // Publish via SimplePool
         const url = relayConnectionUrl.value.trim();
-        const publishPromises = relayPool.publish([url], signedEvent);
+        const publishPromises = relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         // Use Promise.allSettled to capture per-relay outcomes instead of Promise.any
         const results = await Promise.allSettled(publishPromises);
@@ -3749,7 +3911,7 @@ async function testConfigQuery() {
 
         // Publish via SimplePool with detailed error diagnostics
         const url = relayUrl.value.trim();
-        const publishPromises = relayPool.publish([url], signedEvent);
+        const publishPromises = relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         // Use Promise.allSettled to capture per-relay outcomes instead of Promise.any
         const results = await Promise.allSettled(publishPromises);
@@ -3819,7 +3981,7 @@ async function testPostEvent() {
         const url = relayConnectionUrl.value.trim();
         logTestEvent('INFO', `Publishing to relay: ${url}`, 'INFO');
 
-        const publishPromises = relayPool.publish([url], signedEvent);
+        const publishPromises = relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         // Use Promise.allSettled to capture per-relay outcomes instead of Promise.any
         const results = await Promise.allSettled(publishPromises);
@@ -3997,7 +4159,7 @@ async function sendNIP17DM() {
 
         // Publish via SimplePool
         const url = relayConnectionUrl.value.trim();
-        const publishPromises = relayPool.publish([url], signedGiftWrap);
+        const publishPromises = relayPool.publish([url], signedGiftWrap, { onauth: (challenge) => handleNip42Auth(url, challenge, 'nip17 dm publish') });
 
         // Use Promise.allSettled to capture per-relay outcomes
         const results = await Promise.allSettled(publishPromises);
@@ -4084,9 +4246,10 @@ function updateRelayInfoInHeader() {
         return;
     }
 
-    // Get relay info from NIP-11 data or use defaults
+    // Get relay info from NIP-11/config data or use defaults
     const relayInfo = getRelayInfo();
     const relayName = relayInfo.name || 'C-Relay';
+    const relayVersion = relayInfo.version || '';
     const relayDescription = relayInfo.description || 'Nostr Relay';
 
     // Convert relay pubkey to npub
@@ -4109,7 +4272,9 @@ function updateRelayInfoInHeader() {
         formattedNpub = line1 + '\n' + line2 + '\n' + line3;
     }
 
-    relayNameElement.textContent = relayName;
+    const displayName = relayVersion ? `${relayName} ${relayVersion}` : relayName;
+    relayNameElement.textContent = displayName;
+    document.title = `${displayName} Admin`;
     relayPubkeyElement.textContent = formattedNpub;
     relayDescriptionElement.textContent = relayDescription;
 }
@@ -4127,6 +4292,7 @@ function getRelayInfo() {
     // Default values
     return {
         name: 'C-Relay',
+        version: '',
         description: 'Nostr Relay',
         pubkey: relayPubkey
     };
@@ -4137,10 +4303,12 @@ function updateStoredRelayInfo(configData) {
     if (configData && configData.data) {
         // Extract relay info from config data
         const relayName = configData.data.find(item => item.key === 'relay_name')?.value || 'C-Relay';
+        const relayVersion = configData.data.find(item => item.key === 'relay_version')?.value || '';
         const relayDescription = configData.data.find(item => item.key === 'relay_description')?.value || 'Nostr Relay';
 
         relayInfoData = {
             name: relayName,
+            version: relayVersion,
             description: relayDescription,
             pubkey: relayPubkey
         };
@@ -4235,7 +4403,7 @@ async function sendRestartCommand() {
 
         // Publish via SimplePool
         const url = relayConnectionUrl.value.trim();
-        const publishPromises = relayPool.publish([url], signedEvent);
+        const publishPromises = relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         // Use Promise.allSettled to capture per-relay outcomes
         const results = await Promise.allSettled(publishPromises);
@@ -4286,6 +4454,12 @@ async function sendStatsQuery() {
     }
 
     try {
+        // Ensure admin subscription/connection is alive before publishing stats command
+        const subscriptionReady = await subscribeToConfiguration();
+        if (!subscriptionReady) {
+            throw new Error('Admin relay subscription is not ready (connection may have timed out)');
+        }
+
         updateStatsStatus('loading', 'Querying database...');
 
         // Create command array for stats query
@@ -4316,7 +4490,28 @@ async function sendStatsQuery() {
 
         // Publish via SimplePool
         const url = relayConnectionUrl.value.trim();
-        const publishPromises = relayPool.publish([url], signedEvent);
+        const normalizedUrl = normalizeRelayUrlForPool(url);
+        const relayMapKeysBeforePublish = relayPool?.relays ? Array.from(relayPool.relays.keys()) : [];
+        const prePublishConn = relayPool._conn?.[url] || relayPool._conn?.[normalizedUrl];
+        const prePublishRelay = relayPool?.relays?.get?.(normalizedUrl);
+        console.log('🔎 ADMIN PUBLISH DIAG: pre-publish connection snapshot', {
+            url,
+            normalizedUrl,
+            relayMapKeysBeforePublish,
+            hasConn: !!prePublishConn,
+            connType: prePublishConn?.constructor?.name,
+            hasWs: !!prePublishConn?.ws,
+            wsReadyState: prePublishConn?.ws?.readyState,
+            wsUrl: prePublishConn?.ws?.url,
+            wsProtocol: prePublishConn?.ws?.protocol,
+            hasRelayObj: !!prePublishRelay,
+            relayConnected: prePublishRelay?.connected,
+            isLoggedIn,
+            isRelayConnected,
+            isSubscribed,
+            isSubscribing
+        });
+        const publishPromises = relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         // Use Promise.allSettled to capture per-relay outcomes
         const results = await Promise.allSettled(publishPromises);
@@ -4334,6 +4529,13 @@ async function sendStatsQuery() {
 
         if (successCount === 0) {
             const errorDetails = results.map((r, i) => `Relay ${i}: ${r.reason?.message || r.reason}`).join('; ');
+            console.warn('❌ ADMIN COMMAND RESULT: FAILED (stats_query)', {
+                relayUrl: url,
+                userPubkey,
+                relayPubkey,
+                reason: errorDetails,
+                hint: 'Login can be successful while admin commands fail (wrong admin key, relay-side auth rejection, or command timeout).'
+            });
             throw new Error(`All relays rejected stats query event. Details: ${errorDetails}`);
         }
 
@@ -4342,6 +4544,11 @@ async function sendStatsQuery() {
 
     } catch (error) {
         log(`Failed to send stats query: ${error.message}`, 'ERROR');
+        console.warn('❌ ADMIN COMMAND RESULT: FAILED (sendStatsQuery catch)', {
+            userPubkey,
+            relayPubkey,
+            message: error?.message || String(error)
+        });
         updateStatsStatus('error', error.message);
     }
 }
@@ -4500,15 +4707,30 @@ function updateStatsFromCpuMonitoringEvent(monitoringData) {
             updateStatsCell('memory-usage', monitoringData.memory_usage_mb.toFixed(1) + ' MB');
         }
 
+        // MEM% bar using memory_percent from server
+        if (monitoringData.memory_percent !== undefined) {
+            const memPct = Math.min(100, Math.max(0, monitoringData.memory_percent));
+            updateStatsCell('memory-usage', makeAsciiBar(memPct) + '  ' + monitoringData.memory_usage_mb.toFixed(1) + ' MB');
+        }
+
         if (monitoringData.current_cpu_core !== undefined) {
             updateStatsCell('cpu-core', 'Core ' + monitoringData.current_cpu_core);
         }
 
-        // Calculate CPU usage percentage if we have the data
+        // CPU% using delta between samples
         if (monitoringData.process_cpu_time !== undefined && monitoringData.system_cpu_time !== undefined) {
-            // For now, just show the raw process CPU time (simplified)
-            // In a real implementation, you'd calculate deltas over time
-            updateStatsCell('cpu-usage', monitoringData.process_cpu_time + ' ticks');
+            if (window._prevCpuSample) {
+                const procDelta = monitoringData.process_cpu_time - window._prevCpuSample.proc;
+                const sysDelta = monitoringData.system_cpu_time - window._prevCpuSample.sys;
+                if (sysDelta > 0) {
+                    const cpuPct = Math.min(100, Math.max(0, (procDelta / sysDelta) * 100));
+                    updateStatsCell('cpu-usage', makeAsciiBar(cpuPct));
+                }
+            }
+            window._prevCpuSample = {
+                proc: monitoringData.process_cpu_time,
+                sys: monitoringData.system_cpu_time
+            };
         }
 
     } catch (error) {
@@ -4898,6 +5120,13 @@ function formatTimestamp(timestamp) {
     return date.toLocaleString();
 }
 
+// Generate ASCII progress bar: [###############.....] 75%
+function makeAsciiBar(pct) {
+    const filled = Math.round(pct / 5); // 20 chars = 100%
+    const empty = 20 - filled;
+    return '[' + '#'.repeat(filled) + '.'.repeat(empty) + '] ' + pct.toFixed(1) + '%';
+}
+
 // Update statistics cell with flash animation if value changed
 function updateStatsCell(cellId, newValue) {
     const cell = document.getElementById(cellId);
@@ -5477,17 +5706,7 @@ async function sendAdminCommand(commandArray) {
     // Publish via SimplePool with NIP-42 auth support
     const url = relayConnectionUrl.value.trim();
     const publishPromises = relayPool.publish([url], signedEvent, {
-        async onauth(challenge) {
-            console.log('🔐 NIP-42 AUTH challenge during publish:', challenge);
-            try {
-                const authEvent = window.NostrTools.nip42.makeAuthEvent(url, challenge);
-                const signedAuthEvent = await window.nostr.signEvent(authEvent);
-                console.log('✅ NIP-42 AUTH signed for publish');
-                return signedAuthEvent;
-            } catch (authError) {
-                console.error('NIP-42 AUTH failed during publish:', authError.message);
-            }
-        }
+        onauth: (challenge) => handleNip42Auth(url, challenge, 'admin publish')
     });
 
     // Use Promise.allSettled to capture per-relay outcomes
@@ -6045,7 +6264,7 @@ async function sendCreateRelayEventCommand(kind, eventData) {
 
         // Publish via SimplePool
         const url = relayConnectionUrl.value.trim();
-        const publishPromises = relayPool.publish([url], signedEvent);
+        const publishPromises = relayPool.publish([url], signedEvent, { onauth: (challenge) => handleNip42Auth(url, challenge, 'publish') });
 
         // Wait for publish results
         const results = await Promise.allSettled(publishPromises);

api/nostr.bundle.js

@@ -3297,8 +3297,18 @@ var NostrTools = (() => {
       this.enablePing = opts.enablePing;
     }
     async ensureRelay(url, params) {
+      const rawUrl = url;
+      const debugEnabled = typeof window !== "undefined" && !!window.__SIMPLE_POOL_DEBUG__;
       url = normalizeURL(url);
       let relay = this.relays.get(url);
+      if (debugEnabled) {
+        console.log("🔎 SIMPLE_POOL ensureRelay START", {
+          rawUrl,
+          normalizedUrl: url,
+          hadRelay: !!relay,
+          relayMapKeysBefore: Array.from(this.relays.keys())
+        });
+      }
       if (!relay) {
         relay = new AbstractRelay(url, {
           verifyEvent: this.trustedRelayURLs.has(url) ? alwaysTrue : this.verifyEvent,
@@ -3306,13 +3316,38 @@ var NostrTools = (() => {
           enablePing: this.enablePing
         });
         relay.onclose = () => {
+          if (debugEnabled) {
+            console.log("🔎 SIMPLE_POOL ensureRelay onclose", {
+              normalizedUrl: url,
+              relayMapKeysBeforeDelete: Array.from(this.relays.keys())
+            });
+          }
           this.relays.delete(url);
+          if (debugEnabled) {
+            console.log("🔎 SIMPLE_POOL ensureRelay onclose complete", {
+              normalizedUrl: url,
+              relayMapKeysAfterDelete: Array.from(this.relays.keys())
+            });
+          }
         };
         if (params?.connectionTimeout)
           relay.connectionTimeout = params.connectionTimeout;
         this.relays.set(url, relay);
+        if (debugEnabled) {
+          console.log("🔎 SIMPLE_POOL ensureRelay created relay", {
+            normalizedUrl: url,
+            relayMapKeysAfterCreate: Array.from(this.relays.keys())
+          });
+        }
       }
       await relay.connect();
+      if (debugEnabled) {
+        console.log("🔎 SIMPLE_POOL ensureRelay connected", {
+          normalizedUrl: url,
+          relayConnected: relay.connected,
+          relayMapKeysAfterConnect: Array.from(this.relays.keys())
+        });
+      }
       return relay;
     }
     close(relays) {
@@ -3334,16 +3369,26 @@ var NostrTools = (() => {
     }
     subscribeMany(relays, filters, params) {
       params.onauth = params.onauth || params.doauth;
+      const debugEnabled = typeof window !== "undefined" && !!window.__SIMPLE_POOL_DEBUG__;
       const request = [];
       const uniqUrls = [];
       for (let i2 = 0; i2 < relays.length; i2++) {
         const url = normalizeURL(relays[i2]);
         if (uniqUrls.indexOf(url) === -1) {
+          uniqUrls.push(url);
           for (let f2 = 0; f2 < filters.length; f2++) {
             request.push({ url, filter: filters[f2] });
           }
         }
       }
+      if (debugEnabled) {
+        console.log("🔎 SIMPLE_POOL subscribeMany", {
+          relaysInput: relays,
+          uniqUrls,
+          filtersCount: filters.length,
+          requestsCount: request.length
+        });
+      }
       return this.subscribeMap(request, params);
     }
     subscribeMap(requests, params) {
@@ -3391,14 +3436,31 @@ var NostrTools = (() => {
         _knownIds.add(id);
         return have;
       };
+      const debugEnabled = typeof window !== "undefined" && !!window.__SIMPLE_POOL_DEBUG__;
       const allOpened = Promise.all(
         requests.map(async ({ url, filter }, i2) => {
+          if (debugEnabled) {
+            console.log("🔎 SIMPLE_POOL subscribeMap request", {
+              index: i2,
+              url,
+              filterKinds: filter?.kinds,
+              hasAuthorFilter: !!filter?.authors,
+              hasPTagFilter: !!filter?.["#p"]
+            });
+          }
           let relay;
           try {
             relay = await this.ensureRelay(url, {
               connectionTimeout: params.maxWait ? Math.max(params.maxWait * 0.8, params.maxWait - 1e3) : void 0
             });
           } catch (err) {
+            if (debugEnabled) {
+              console.log("🔎 SIMPLE_POOL subscribeMap ensureRelay FAILED", {
+                index: i2,
+                url,
+                error: err?.message || String(err)
+              });
+            }
             handleClose(i2, err?.message || String(err));
             return;
           }
@@ -3480,18 +3542,50 @@ var NostrTools = (() => {
       return events[0] || null;
     }
     publish(relays, event, options) {
-      return relays.map(normalizeURL).map(async (url, i2, arr) => {
+      const debugEnabled = typeof window !== "undefined" && !!window.__SIMPLE_POOL_DEBUG__;
+      const normalizedRelays = relays.map(normalizeURL);
+      if (debugEnabled) {
+        console.log("🔎 SIMPLE_POOL publish START", {
+          relaysInput: relays,
+          normalizedRelays,
+          eventKind: event?.kind,
+          eventId: event?.id
+        });
+      }
+      return normalizedRelays.map(async (url, i2, arr) => {
         if (arr.indexOf(url) !== i2) {
+          if (debugEnabled) {
+            console.log("🔎 SIMPLE_POOL publish duplicate URL", { url, index: i2 });
+          }
           return Promise.reject("duplicate url");
         }
         let r = await this.ensureRelay(url);
+        if (debugEnabled) {
+          console.log("🔎 SIMPLE_POOL publish ensured relay", {
+            url,
+            relayConnected: r?.connected,
+            relayMapKeys: Array.from(this.relays.keys())
+          });
+        }
         return r.publish(event).catch(async (err) => {
+          if (debugEnabled) {
+            console.log("🔎 SIMPLE_POOL publish ERROR", {
+              url,
+              error: err?.message || String(err)
+            });
+          }
           if (err instanceof Error && err.message.startsWith("auth-required: ") && options?.onauth) {
             await r.auth(options.onauth);
             return r.publish(event);
           }
           throw err;
         }).then((reason) => {
+          if (debugEnabled) {
+            console.log("🔎 SIMPLE_POOL publish SUCCESS", {
+              url,
+              reason
+            });
+          }
           if (this.trackRelays) {
             let set = this.seenOn.get(event.id);
             if (!set) {

config.csv

@@ -0,0 +1 @@
+key,value,data_type,description,category,requires_restart,created_at,updated_at

plans/c_relay_pg_plan.md

@@ -0,0 +1,632 @@
+# c-relay-pg Plan — PostgreSQL Backend + Multi-Instance + Dashboard
+
+## Overview
+
+**c-relay-pg** is a new project (separate repository) forked from c-relay after the `db_ops` abstraction layer is complete. It replaces the SQLite backend with PostgreSQL, enabling horizontal scaling, external dashboards, and production-grade deployments.
+
+### Prerequisites
+
+- The `db_ops.h` / `db_ops.c` abstraction layer must be complete in c-relay first — see [c-relay thread pool plan](c_relay_thread_pool_plan.md) Phase 1.
+- The fork happens after Phase 1 of that plan is done and tested.
+
+### Why a Separate Project?
+
+| | c-relay | c-relay-pg |
+|---|---------|-----------|
+| **Database** | SQLite (embedded) | PostgreSQL (client-server) |
+| **Deployment** | Single binary + DB file | Binary + PostgreSQL server |
+| **Scaling** | Single instance | Multiple instances + load balancer |
+| **Dashboard** | Embedded web UI | Separate web server + Grafana |
+| **Target user** | Personal relay, small community | Medium-large relay, production |
+| **Complexity** | Minimal | More infrastructure |
+
+For the full analysis of why PostgreSQL was chosen over MySQL/MariaDB and other databases, see the [database architecture analysis](database_architecture_analysis.md).
+
+## Architecture
+
+```mermaid
+flowchart TD
+    subgraph c-relay-pg - Production Deployment
+        LB[nginx - TLS + load balancing] -->|WebSocket| R1[c-relay-pg Instance 1]
+        LB -->|WebSocket| R2[c-relay-pg Instance 2]
+        LB -->|HTTP| DASH[Dashboard]
+        R1 -->|db_ops API| PGBACK[PostgreSQL Backend - db_ops_postgres.c]
+        R2 -->|db_ops API| PGBACK
+        PGBACK -->|libpq| PG[PostgreSQL Server]
+        DASH -->|SQL| PG
+        R1 <-->|LISTEN/NOTIFY| R2
+    end
+```
+
+---
+
+## Phase 1: PostgreSQL Backend
+
+### Goal
+
+Fork c-relay into a new repository called **c-relay-pg**. Replace the SQLite `db_ops` implementation with PostgreSQL using `libpq`. The `db_ops.h` interface stays identical — only the backend changes.
+
+### New Files
+
+- `src/db_ops_sqlite.c` — Renamed from `db_ops.c` (the Phase 1 SQLite implementation from c-relay)
+- `src/db_ops_postgres.c` — New PostgreSQL implementation
+- `src/db_ops.c` — Thin dispatcher that calls the active backend
+
+### PostgreSQL Schema
+
+```sql
+-- PostgreSQL schema for c-relay-pg
+-- No event_tags table needed — JSONB + GIN handles everything
+
+CREATE TABLE events (
+    id TEXT PRIMARY KEY,
+    pubkey TEXT NOT NULL,
+    created_at BIGINT NOT NULL,
+    kind INTEGER NOT NULL,
+    event_type TEXT NOT NULL CHECK (event_type IN ('regular', 'replaceable', 'ephemeral', 'addressable')),
+    content TEXT NOT NULL,
+    sig TEXT NOT NULL,
+    tags JSONB NOT NULL DEFAULT '[]',
+    event_json TEXT NOT NULL,
+    first_seen BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW())::BIGINT
+);
+
+-- Core indexes
+CREATE INDEX idx_events_pubkey ON events(pubkey);
+CREATE INDEX idx_events_kind ON events(kind);
+CREATE INDEX idx_events_created_at ON events(created_at DESC);
+CREATE INDEX idx_events_kind_created_at ON events(kind, created_at DESC);
+CREATE INDEX idx_events_pubkey_created_at ON events(pubkey, created_at DESC);
+CREATE INDEX idx_events_pubkey_kind ON events(pubkey, kind);
+
+-- THE KEY INDEX: GIN on JSONB tags — replaces the entire event_tags table
+CREATE INDEX idx_events_tags ON events USING GIN (tags);
+
+-- Partial index: only non-ephemeral events (what REQ queries actually filter)
+CREATE INDEX idx_events_non_ephemeral ON events(created_at DESC) 
+    WHERE kind < 20000 OR kind >= 30000;
+
+-- Config table
+CREATE TABLE config (
+    key TEXT PRIMARY KEY,
+    value TEXT NOT NULL,
+    data_type TEXT NOT NULL CHECK (data_type IN ('string', 'integer', 'boolean', 'json')),
+    description TEXT,
+    category TEXT DEFAULT 'general',
+    requires_restart INTEGER DEFAULT 0,
+    created_at BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW())::BIGINT,
+    updated_at BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW())::BIGINT
+);
+
+-- Auth rules table
+CREATE TABLE auth_rules (
+    id SERIAL PRIMARY KEY,
+    rule_type TEXT NOT NULL CHECK (rule_type IN ('whitelist', 'blacklist', 'rate_limit', 'auth_required', 'wot_whitelist')),
+    pattern_type TEXT NOT NULL CHECK (pattern_type IN ('pubkey', 'kind', 'ip', 'global')),
+    pattern_value TEXT,
+    active INTEGER NOT NULL DEFAULT 1,
+    created_at BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW())::BIGINT,
+    updated_at BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW())::BIGINT
+);
+
+CREATE INDEX idx_auth_rules_lookup ON auth_rules(rule_type, pattern_type, pattern_value) WHERE active = 1;
+
+-- Relay private key storage
+CREATE TABLE relay_seckey (
+    private_key_hex TEXT NOT NULL CHECK (length(private_key_hex) = 64),
+    created_at BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW())::BIGINT
+);
+
+-- Subscription logging
+CREATE TABLE subscriptions (
+    id SERIAL PRIMARY KEY,
+    subscription_id TEXT NOT NULL,
+    wsi_pointer TEXT NOT NULL,
+    client_ip TEXT NOT NULL,
+    event_type TEXT NOT NULL CHECK (event_type IN ('created', 'closed', 'expired', 'disconnected')),
+    filter_json TEXT,
+    events_sent INTEGER DEFAULT 0,
+    created_at BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW())::BIGINT,
+    ended_at BIGINT,
+    duration INTEGER,
+    UNIQUE(subscription_id, wsi_pointer)
+);
+
+-- IP ban persistence
+CREATE TABLE ip_bans (
+    ip TEXT PRIMARY KEY,
+    failure_count INTEGER NOT NULL DEFAULT 0,
+    ban_count INTEGER NOT NULL DEFAULT 0,
+    banned_until BIGINT NOT NULL DEFAULT 0,
+    first_failure BIGINT NOT NULL DEFAULT 0,
+    has_authed_successfully INTEGER NOT NULL DEFAULT 0,
+    last_success_at BIGINT NOT NULL DEFAULT 0,
+    total_connections INTEGER NOT NULL DEFAULT 0,
+    total_failures INTEGER NOT NULL DEFAULT 0,
+    total_successes INTEGER NOT NULL DEFAULT 0,
+    first_seen BIGINT NOT NULL DEFAULT 0,
+    idle_failure_count INTEGER NOT NULL DEFAULT 0,
+    idle_ban_count INTEGER NOT NULL DEFAULT 0,
+    idle_banned_until BIGINT NOT NULL DEFAULT 0,
+    idle_first_failure BIGINT NOT NULL DEFAULT 0
+);
+
+-- Materialized views for dashboard (refreshed periodically)
+CREATE MATERIALIZED VIEW event_kinds_mv AS
+SELECT kind, COUNT(*) as count,
+       ROUND(COUNT(*) * 100.0 / NULLIF((SELECT COUNT(*) FROM events), 0), 2) as percentage
+FROM events GROUP BY kind;
+
+CREATE MATERIALIZED VIEW time_stats_mv AS
+SELECT 'total' as period, COUNT(*) as total_events, COUNT(DISTINCT pubkey) as unique_pubkeys
+FROM events
+UNION ALL
+SELECT '24h', COUNT(*), COUNT(DISTINCT pubkey)
+FROM events WHERE created_at >= EXTRACT(EPOCH FROM NOW())::BIGINT - 86400
+UNION ALL
+SELECT '7d', COUNT(*), COUNT(DISTINCT pubkey)
+FROM events WHERE created_at >= EXTRACT(EPOCH FROM NOW())::BIGINT - 604800;
+
+CREATE MATERIALIZED VIEW top_pubkeys_mv AS
+SELECT pubkey, COUNT(*) as event_count,
+       ROUND(COUNT(*) * 100.0 / NULLIF((SELECT COUNT(*) FROM events), 0), 2) as percentage
+FROM events GROUP BY pubkey ORDER BY event_count DESC LIMIT 20;
+
+-- Unique indexes required for CONCURRENTLY refresh
+CREATE UNIQUE INDEX idx_event_kinds_mv ON event_kinds_mv(kind);
+CREATE UNIQUE INDEX idx_time_stats_mv ON time_stats_mv(period);
+CREATE UNIQUE INDEX idx_top_pubkeys_mv ON top_pubkeys_mv(pubkey);
+```
+
+### Key Implementation Details
+
+#### Tag Queries with JSONB
+
+The biggest win — replacing the `event_tags` subquery with JSONB containment:
+
+```c
+// SQLite (current): subquery into event_tags table
+// AND id IN (SELECT event_id FROM event_tags WHERE tag_name = ? AND tag_value IN (?))
+
+// PostgreSQL: JSONB containment operator with GIN index
+// AND tags @> '[["p", "pubkey_hex"]]'
+
+// For multiple tag values:
+// AND (tags @> '[["p", "val1"]]' OR tags @> '[["p", "val2"]]')
+```
+
+This eliminates the entire `event_tags` table (4 million rows, ~2 GB indexes in the current SQLite schema). The GIN index on JSONB handles everything in ~100–200 MB.
+
+#### LISTEN/NOTIFY Integration
+
+For cross-instance event broadcasting:
+
+```c
+// In db_ops_postgres.c:
+int db_notify_new_event(const char* event_id) {
+    char cmd[128];
+    snprintf(cmd, sizeof(cmd), "NOTIFY new_event, '%s'", event_id);
+    PGresult* res = PQexec(g_pg_conn, cmd);
+    PQclear(res);
+    return 0;
+}
+
+// Called from the lws event loop every iteration:
+int db_check_notifications(char* event_id_out, size_t max_len) {
+    PQconsumeInput(g_pg_notify_conn);
+    PGnotify* notify = PQnotifies(g_pg_notify_conn);
+    if (notify) {
+        strncpy(event_id_out, notify->extra, max_len);
+        PQfreemem(notify);
+        return 1;  // Got a notification
+    }
+    return 0;  // No notifications
+}
+```
+
+#### Connection Management
+
+```c
+// db_ops_postgres.c connection pool (simple version)
+#define DB_POOL_SIZE 4
+
+static PGconn* g_pg_read_pool[DB_POOL_SIZE];  // For REQ queries
+static PGconn* g_pg_write_conn;                // For EVENT inserts
+static PGconn* g_pg_notify_conn;               // For LISTEN/NOTIFY
+static pthread_mutex_t g_pool_lock;
+
+PGconn* db_get_read_connection(void) {
+    pthread_mutex_lock(&g_pool_lock);
+    // Round-robin or find idle connection
+    // ...
+    pthread_mutex_unlock(&g_pool_lock);
+}
+```
+
+### Build System Changes
+
+```makefile
+# Makefile additions
+DB_BACKEND ?= sqlite  # Default to sqlite, override with: make DB_BACKEND=postgres
+
+ifeq ($(DB_BACKEND),postgres)
+    MAIN_SRC += src/db_ops.c src/db_ops_postgres.c
+    LIBS += -lpq
+    CFLAGS += -DDB_BACKEND_POSTGRES
+else
+    MAIN_SRC += src/db_ops.c src/db_ops_sqlite.c
+    CFLAGS += -DDB_BACKEND_SQLITE
+endif
+```
+
+### Data Migration Tool
+
+A standalone tool to migrate existing SQLite data to PostgreSQL:
+
+```bash
+# migrate_to_postgres.sh
+# 1. Export events from SQLite
+sqlite3 old_relay.db ".mode csv" "SELECT id,pubkey,created_at,kind,event_type,content,sig,tags,event_json,first_seen FROM events" > events.csv
+
+# 2. Import into PostgreSQL
+psql -d crelay -c "\COPY events FROM 'events.csv' WITH CSV"
+
+# 3. Migrate config
+sqlite3 old_relay.db ".mode csv" "SELECT key,value,data_type,description,category,requires_restart FROM config" > config.csv
+psql -d crelay -c "\COPY config(key,value,data_type,description,category,requires_restart) FROM 'config.csv' WITH CSV"
+
+# 4. Migrate auth rules
+sqlite3 old_relay.db ".mode csv" "SELECT rule_type,pattern_type,pattern_value,active FROM auth_rules" > auth_rules.csv
+psql -d crelay -c "\COPY auth_rules(rule_type,pattern_type,pattern_value,active) FROM 'auth_rules.csv' WITH CSV"
+
+# 5. Refresh materialized views
+psql -d crelay -c "REFRESH MATERIALIZED VIEW event_kinds_mv; REFRESH MATERIALIZED VIEW time_stats_mv; REFRESH MATERIALIZED VIEW top_pubkeys_mv;"
+```
+
+---
+
+## Phase 2: Multi-Instance + Dashboard
+
+### Goal
+
+Run multiple c-relay-pg instances behind a load balancer with a separate dashboard web server, all sharing the same PostgreSQL database.
+
+### Components
+
+1. **nginx config** — WebSocket load balancing with `ip_hash` stickiness
+2. **systemd template** — `c-relay-pg@.service` for multiple instances
+3. **LISTEN/NOTIFY integration** — Cross-instance event broadcasting in the `lws_service()` loop
+4. **PgBouncer** — Connection pooling between c-relay-pg instances and PostgreSQL
+5. **Dashboard** — Separate web server querying PostgreSQL directly
+6. **Materialized view refresh** — Background job to refresh analytics views
+
+### Multi-Instance Architecture
+
+```mermaid
+flowchart TD
+    INTERNET[Internet - Nostr Clients] -->|wss://relay.example.com| NGINX[nginx reverse proxy - TLS termination + load balancing]
+    
+    NGINX -->|ws://localhost:8888| R1[c-relay-pg Instance 1 - port 8888]
+    NGINX -->|ws://localhost:8889| R2[c-relay-pg Instance 2 - port 8889]
+    NGINX -->|ws://localhost:8890| R3[c-relay-pg Instance 3 - port 8890]
+    NGINX -->|http://localhost:3000| DASHWEB[Dashboard Web Server]
+    
+    R1 -->|libpq connection pool| PGPOOL[PgBouncer - connection pooler]
+    R2 -->|libpq connection pool| PGPOOL
+    R3 -->|libpq connection pool| PGPOOL
+    
+    PGPOOL -->|pooled connections| PG[PostgreSQL Primary]
+    DASHWEB -->|read queries| PG
+    
+    PG -->|streaming replication| REPLICA[Read Replica - optional]
+    DASHWEB -.->|heavy analytics| REPLICA
+```
+
+### nginx Load Balancing Config
+
+```nginx
+# nginx.conf - WebSocket load balancing for c-relay-pg
+upstream relay_backends {
+    # ip_hash ensures a client always hits the same instance
+    # (important for WebSocket session stickiness)
+    ip_hash;
+    
+    server 127.0.0.1:8888;
+    server 127.0.0.1:8889;
+    server 127.0.0.1:8890;
+}
+
+server {
+    listen 443 ssl;
+    server_name relay.example.com;
+    
+    # TLS config...
+    
+    location / {
+        proxy_pass http://relay_backends;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_read_timeout 86400;  # Keep WebSocket alive for 24h
+    }
+    
+    # Dashboard on separate path
+    location /dashboard {
+        proxy_pass http://127.0.0.1:3000;
+    }
+}
+```
+
+**Session stickiness** (`ip_hash`) ensures that once a client connects to Instance 2, all their subsequent WebSocket frames go to Instance 2. This is important because subscriptions are held in-memory per instance.
+
+### Starting Multiple Instances
+
+Each instance is the same binary, just on a different port, all pointing to the same PostgreSQL:
+
+```bash
+# Instance 1
+./build/c_relay_x86 --port 8888 --db-host localhost --db-name crelay &
+
+# Instance 2
+./build/c_relay_x86 --port 8889 --db-host localhost --db-name crelay &
+
+# Instance 3
+./build/c_relay_x86 --port 8890 --db-host localhost --db-name crelay &
+```
+
+Or with systemd template units:
+
+```ini
+# /etc/systemd/system/c-relay-pg@.service
+[Unit]
+Description=C-Relay-PG Nostr Instance %i
+After=postgresql.service
+
+[Service]
+ExecStart=/opt/c-relay-pg/c_relay_x86 --port %i --db-host localhost --db-name crelay
+Restart=always
+User=c-relay
+
+[Install]
+WantedBy=multi-user.target
+```
+
+```bash
+systemctl enable c-relay-pg@8888 c-relay-pg@8889 c-relay-pg@8890
+systemctl start c-relay-pg@8888 c-relay-pg@8889 c-relay-pg@8890
+```
+
+### Cross-Instance Event Broadcasting
+
+When Instance 1 receives a new EVENT and stores it in PostgreSQL, Instance 2 and Instance 3 need to know about it so they can broadcast to their connected subscribers.
+
+```mermaid
+sequenceDiagram
+    participant Client_A as Client A - connected to Instance 1
+    participant I1 as Instance 1
+    participant PG as PostgreSQL
+    participant I2 as Instance 2
+    participant I3 as Instance 3
+    participant Client_B as Client B - connected to Instance 2
+    participant Client_C as Client C - connected to Instance 3
+
+    Client_A->>I1: EVENT - new kind:1 note
+    I1->>PG: INSERT INTO events...
+    PG-->>I1: OK
+    I1->>I1: broadcast to local subscribers
+    I1->>PG: NOTIFY new_event with event_id
+    
+    Note over PG: PostgreSQL delivers notification to all listeners
+    
+    PG-->>I2: NOTIFY: new_event event_id
+    PG-->>I3: NOTIFY: new_event event_id
+    
+    I2->>PG: SELECT event_json FROM events WHERE id = event_id
+    PG-->>I2: event JSON
+    I2->>I2: match against local subscriptions
+    I2->>Client_B: EVENT message - if subscription matches
+    
+    I3->>PG: SELECT event_json FROM events WHERE id = event_id
+    PG-->>I3: event JSON
+    I3->>I3: match against local subscriptions
+    I3->>Client_C: EVENT message - if subscription matches
+```
+
+#### PostgreSQL LISTEN/NOTIFY Implementation
+
+Built into PostgreSQL — no additional infrastructure needed:
+
+```c
+// === In the relay's event loop (modified lws_service loop) ===
+
+// Setup: create a dedicated connection for LISTEN
+PGconn* notify_conn = PQconnectdb("host=localhost dbname=crelay");
+PQexec(notify_conn, "LISTEN new_event");
+int notify_fd = PQsocket(notify_conn);  // Get the socket fd for poll()
+
+// After storing an event:
+void on_event_stored(PGconn* write_conn, const char* event_id) {
+    char notify_cmd[128];
+    snprintf(notify_cmd, sizeof(notify_cmd),
+             "NOTIFY new_event, '%s'", event_id);
+    PQexec(write_conn, notify_cmd);
+}
+
+// In the main event loop (runs every lws_service iteration):
+void check_cross_instance_events(PGconn* notify_conn) {
+    // Non-blocking check for notifications
+    PQconsumeInput(notify_conn);
+    
+    PGnotify* notify;
+    while ((notify = PQnotifies(notify_conn)) != NULL) {
+        // Another instance stored a new event
+        const char* event_id = notify->extra;
+        
+        // Fetch the event and check against local subscriptions
+        cJSON* event = db_get_event_by_id(event_id);
+        if (event) {
+            broadcast_event_to_subscriptions(event);
+            cJSON_Delete(event);
+        }
+        
+        PQfreemem(notify);
+    }
+}
+```
+
+**Performance**: LISTEN/NOTIFY adds ~1–5ms latency for cross-instance delivery. For a Nostr relay, this is imperceptible — clients already expect network latency.
+
+**Payload limit**: NOTIFY payloads are limited to 8000 bytes. For event IDs (64 hex chars), this is fine.
+
+#### Alternative: Redis Pub/Sub
+
+If you later need even lower latency or more sophisticated routing:
+
+```c
+// Using hiredis (Redis C client)
+redisContext* redis = redisConnect("127.0.0.1", 6379);
+
+// After storing event:
+redisCommand(redis, "PUBLISH new_event %s", event_json);
+
+// Subscriber (in each instance):
+redisCommand(redis, "SUBSCRIBE new_event");
+// Then poll for messages in the event loop
+```
+
+Redis adds sub-millisecond pub/sub but requires running a Redis server. For most relays, PostgreSQL LISTEN/NOTIFY is sufficient.
+
+### Connection Pooling with PgBouncer
+
+Each relay instance needs multiple database connections. Without pooling, 3 instances × 10 connections = 30 PostgreSQL backend processes. With PgBouncer:
+
+```ini
+# /etc/pgbouncer/pgbouncer.ini
+[databases]
+crelay = host=127.0.0.1 port=5432 dbname=crelay
+
+[pgbouncer]
+listen_port = 6432
+listen_addr = 127.0.0.1
+auth_type = md5
+pool_mode = transaction    # Return connection to pool after each transaction
+max_client_conn = 200      # Total connections from all relay instances
+default_pool_size = 20     # Actual PostgreSQL connections
+```
+
+Relay instances connect to PgBouncer (port 6432) instead of PostgreSQL directly (port 5432). PgBouncer multiplexes 200 client connections onto 20 actual PostgreSQL connections.
+
+### Zero-Downtime Deployment
+
+```mermaid
+sequenceDiagram
+    participant LB as nginx
+    participant I1 as Instance 1 - v1.0
+    participant I2 as Instance 2 - v1.0
+    participant I3 as Instance 3 - v1.0
+    participant I1_NEW as Instance 1 - v1.1
+
+    Note over LB,I3: Normal operation: 3 instances serving traffic
+    
+    LB->>I1: Mark upstream as down
+    Note over I1: Drain: wait for existing connections to close or timeout
+    I1->>I1: Graceful shutdown
+    
+    Note over LB: Traffic now goes to I2 and I3 only
+    
+    I1_NEW->>I1_NEW: Start with new binary
+    I1_NEW->>LB: Health check passes
+    LB->>I1_NEW: Mark upstream as up
+    
+    Note over LB,I1_NEW: Instance 1 now running v1.1, repeat for I2 and I3
+```
+
+Rolling deploy script:
+
+```bash
+#!/bin/bash
+# rolling_deploy.sh - Zero-downtime deployment
+
+for port in 8888 8889 8890; do
+    echo "Deploying instance on port $port..."
+    
+    # 1. Tell nginx to stop sending new connections
+    sed -i "s/server 127.0.0.1:$port;/server 127.0.0.1:$port down;/" /etc/nginx/nginx.conf
+    nginx -s reload
+    
+    # 2. Wait for existing connections to drain (30 seconds)
+    sleep 30
+    
+    # 3. Stop old instance
+    systemctl stop c-relay-pg@$port
+    
+    # 4. Deploy new binary
+    cp ./build/c_relay_x86 /opt/c-relay-pg/c_relay_x86
+    
+    # 5. Start new instance
+    systemctl start c-relay-pg@$port
+    
+    # 6. Wait for health check
+    sleep 5
+    
+    # 7. Re-enable in nginx
+    sed -i "s/server 127.0.0.1:$port down;/server 127.0.0.1:$port;/" /etc/nginx/nginx.conf
+    nginx -s reload
+    
+    echo "Instance on port $port deployed successfully"
+done
+```
+
+### Dashboard Options
+
+With PostgreSQL, the dashboard can be built with any technology:
+
+- **Grafana** — Point directly at PostgreSQL, zero custom code
+- **Custom web app** — React/Vue frontend + any backend (Node, Python, Go) querying PostgreSQL
+- **Embedded in c-relay-pg** — Keep current approach but queries go through `db_ops` to PostgreSQL (no longer blocks event loop since PostgreSQL handles concurrency)
+
+### Scaling Scenarios
+
+| Scenario | Instances | Connections | Events/hour | Setup |
+|----------|-----------|-------------|-------------|-------|
+| **Current** | 1 | ~1,200 | 56 | Single process + SQLite |
+| **Small upgrade** | 2 | ~2,500 | 500 | 2 instances + PostgreSQL |
+| **Medium relay** | 4 | ~5,000 | 5,000 | 4 instances + PostgreSQL + PgBouncer |
+| **Large relay** | 8 | ~10,000 | 50,000 | 8 instances + PostgreSQL + read replica |
+| **Multi-region** | 2–4 per region | ~50,000 | 500,000 | Multiple servers + PostgreSQL replication |
+
+### Cost Perspective
+
+Running multiple relay instances with PostgreSQL on a single VPS:
+- **PostgreSQL**: ~200–500 MB RAM baseline
+- **PgBouncer**: ~10 MB RAM
+- **Each relay instance**: ~50–100 MB RAM
+- **Dashboard web server**: ~50–100 MB RAM
+- **4 instances + PostgreSQL + PgBouncer + dashboard**: ~1–2 GB total RAM
+- A **$20/month VPS** with 4 cores and 4 GB RAM handles this easily
+- A **$40/month VPS** with 8 cores and 8 GB RAM handles 8 instances comfortably
+
+---
+
+## Risk Mitigation
+
+| Risk | Mitigation |
+|------|-----------|
+| PostgreSQL connection failures | `db_ops` returns error codes. Relay logs errors but doesn't crash. Reconnection logic with exponential backoff. |
+| Performance regression | Benchmark before/after. PostgreSQL should be faster for complex queries, similar for simple ones. |
+| Data loss during migration | Migration tool is read-only on SQLite. PostgreSQL import is idempotent (INSERT ON CONFLICT). |
+| SQLite fallback needed | Keep `db_ops_sqlite.c` working. Compile-time flag switches backends. Can always go back. |
+| LISTEN/NOTIFY message loss | NOTIFY is transactional — if the INSERT commits, the NOTIFY is guaranteed. Missed notifications during reconnect handled by periodic full-sync. |
+| PgBouncer adds latency | Transaction pooling mode adds <0.1ms. Negligible compared to query time. |
+
+---
+
+## Relationship to c-relay
+
+This project depends on the `db_ops.h` abstraction layer built in [c-relay thread pool plan](c_relay_thread_pool_plan.md) Phase 1. The interface is identical — only the backend implementation changes:
+
+- **c-relay**: `db_ops.c` → SQLite calls via `sqlite3_*`
+- **c-relay-pg**: `db_ops_postgres.c` → PostgreSQL calls via `libpq` (`PQexec`, `PQgetvalue`, etc.)
+
+The `db_ops.h` header file is shared between both projects. Changes to the interface should be coordinated.

plans/c_relay_thread_pool_plan.md

@@ -0,0 +1,332 @@
+# c-relay Thread Pool Plan — db_ops Abstraction + SQLite Thread Pool
+
+## Overview
+
+This plan covers improvements to **c-relay** (this repo) — the lean, single-binary, embedded-SQLite Nostr relay. Two phases:
+
+1. **Phase 1: Database Abstraction Layer** — Consolidate all scattered `sqlite3_*` calls into a single `db_ops.h` / `db_ops.c` module. Pure refactor, no behavior change.
+2. **Phase 2: SQLite Thread Pool** — Add worker threads for concurrent reads, unblocking the `lws_service()` event loop.
+
+This is the **final form of c-relay**: an embedded-SQLite relay with clean architecture and non-blocking database access. The abstraction layer also enables a future fork to PostgreSQL — see [c-relay-pg plan](c_relay_pg_plan.md).
+
+### Why This First?
+
+The current architecture has a fundamental bottleneck documented in the [database architecture analysis](database_architecture_analysis.md): the single-threaded event loop blocks on every database call. A 672ms REQ query freezes every connected client. The thread pool fixes this without changing the database engine or deployment model.
+
+| Metric | Current | After Thread Pool |
+|--------|---------|-------------------|
+| **Event loop blocking** | 0.1–672ms per query | Near-zero |
+| **Concurrent reads** | 1 | 4–8 |
+| **Deployment** | Single binary + DB file | Same |
+| **Database** | SQLite | Same |
+| **Code risk** | N/A | Low — additive change |
+
+## Architecture
+
+```mermaid
+flowchart TD
+    subgraph c-relay - Final Form
+        RELAY[c-relay binary] -->|db_ops API| DBOPS[db_ops.c - abstraction layer]
+        DBOPS -->|sqlite3 calls| SQLITE[SQLite WAL database]
+    end
+```
+
+```mermaid
+flowchart TD
+    subgraph c-relay with Thread Pool
+        LWS[lws_service event loop] -->|REQ arrives| Q[Thread-safe job queue]
+        LWS -->|EVENT arrives| WQ[Write queue - single writer]
+        Q --> T1[Reader Thread 1 - own sqlite3*]
+        Q --> T2[Reader Thread 2 - own sqlite3*]
+        Q --> T3[Reader Thread 3 - own sqlite3*]
+        Q --> T4[Reader Thread 4 - own sqlite3*]
+        WQ --> TW[Writer Thread - own sqlite3*]
+        T1 -->|results| CB[Callback to lws event loop]
+        T2 -->|results| CB
+        T3 -->|results| CB
+        T4 -->|results| CB
+        TW -->|OK/error| CB
+        CB -->|queue_message| LWS
+    end
+```
+
+---
+
+## Phase 1: Database Abstraction Layer
+
+### Goal
+
+Consolidate all 258 scattered `sqlite3_*` calls across 8 files into a single `db_ops.h` / `db_ops.c` module with a backend-agnostic interface. SQLite continues to work — this is a pure refactor.
+
+### Files That Currently Touch SQLite Directly
+
+| File | `sqlite3_*` calls | Operations |
+|------|-------------------|------------|
+| [`src/main.c`](../src/main.c) | ~80 | Event store/retrieve, tag storage, REQ queries, COUNT queries, DB init, schema migration |
+| [`src/config.c`](../src/config.c) | ~60 | Config CRUD, auth rules CRUD, WoT sync, relay key storage, startup sequence |
+| [`src/api.c`](../src/api.c) | ~40 | Stats queries, monitoring views, admin SQL execution, config management |
+| [`src/dm_admin.c`](../src/dm_admin.c) | ~20 | Auth rule management, WoT whitelist operations |
+| [`src/websockets.c`](../src/websockets.c) | ~15 | COUNT queries, IP ban stats, connection tracking |
+| [`src/subscriptions.c`](../src/subscriptions.c) | ~15 | Subscription logging — create/close/disconnect |
+| [`src/nip009.c`](../src/nip009.c) | ~10 | Event deletion — by ID and by address |
+| [`src/request_validator.c`](../src/request_validator.c) | ~8 | Blacklist/whitelist checks |
+| [`src/ip_ban.c`](../src/ip_ban.c) | ~15 | IP ban table CRUD, persistence |
+
+### Abstraction Layer Design
+
+New files: `src/db_ops.h` and `src/db_ops.c`
+
+```c
+// src/db_ops.h — Database operations abstraction layer
+#ifndef DB_OPS_H
+#define DB_OPS_H
+
+#include "../nostr_core_lib/cjson/cJSON.h"
+
+// ============================================================
+// Lifecycle
+// ============================================================
+int db_init(const char* connection_string);  // SQLite: file path, PG: connection string
+void db_close(void);
+int db_is_available(void);
+
+// ============================================================
+// Schema / Migration
+// ============================================================
+int db_ensure_schema(void);
+int db_get_schema_version(void);
+int db_execute_raw(const char* sql);  // For schema DDL only
+
+// ============================================================
+// Event Operations
+// ============================================================
+int db_store_event(cJSON* event);
+int db_event_exists(const char* event_id);
+char* db_get_event_json(const char* event_id);  // Caller must free
+int db_delete_event_by_id(const char* event_id, const char* requester_pubkey);
+int db_delete_events_by_address(const char* pubkey, int kind, 
+                                 const char* d_tag, long before_timestamp);
+
+// ============================================================
+// Event Queries - REQ handling
+// ============================================================
+typedef struct {
+    int* kinds;           int kind_count;
+    char** authors;       int author_count;
+    char** ids;           int id_count;
+    char** tag_names;     // Parallel arrays: tag_names[i] has tag_values[i][]
+    char*** tag_values;
+    int* tag_value_counts;
+    int tag_filter_count;
+    long since;           // 0 = not set
+    long until;           // 0 = not set
+    int limit;            // 0 = default 500
+    char* search;         // NIP-50 search term, NULL = not set
+} db_event_filter_t;
+
+typedef struct db_result db_result_t;
+
+db_result_t* db_query_events(const db_event_filter_t* filter);
+const char* db_result_next_json(db_result_t* result);  // Returns event_json, NULL when done
+int db_result_row_count(db_result_t* result);
+void db_result_free(db_result_t* result);
+
+int db_count_events(const db_event_filter_t* filter);
+
+// ============================================================
+// Config Operations
+// ============================================================
+char* db_get_config(const char* key);  // Caller must free, NULL if not found
+int db_set_config(const char* key, const char* value, const char* data_type,
+                  const char* description, const char* category, int requires_restart);
+int db_update_config(const char* key, const char* value);
+int db_config_exists(const char* key);
+int db_get_config_count(void);
+
+// ============================================================
+// Auth Rules Operations
+// ============================================================
+int db_add_auth_rule(const char* rule_type, const char* pattern_type, const char* pattern_value);
+int db_remove_auth_rule(const char* rule_type, const char* pattern_type, const char* pattern_value);
+int db_auth_rule_exists(const char* rule_type, const char* pattern_type, const char* pattern_value);
+int db_clear_auth_rules(const char* rule_type);  // NULL = clear all
+int db_is_blacklisted(const char* pubkey);
+int db_is_whitelisted(const char* pubkey);
+int db_has_any_whitelist(void);
+
+// ============================================================
+// Relay Key Storage
+// ============================================================
+int db_store_relay_private_key(const char* privkey_hex);
+char* db_get_relay_private_key(void);  // Caller must free
+
+// ============================================================
+// Subscription Logging
+// ============================================================
+int db_log_subscription_created(const char* sub_id, const char* wsi_ptr, 
+                                 const char* client_ip, const char* filter_json);
+int db_log_subscription_closed(const char* sub_id, const char* client_ip);
+int db_log_subscription_disconnected(const char* client_ip);
+int db_update_subscription_events_sent(const char* sub_id, int events_sent);
+int db_cleanup_orphaned_subscriptions(void);
+
+// ============================================================
+// IP Ban Persistence
+// ============================================================
+int db_ensure_ip_ban_table(void);
+int db_load_ip_bans(void* ban_table, int table_size);  // Populates in-memory table
+int db_save_ip_bans(const void* ban_table, int table_size);
+
+// ============================================================
+// Analytics / Stats - for dashboard
+// ============================================================
+cJSON* db_get_event_kind_distribution(void);
+cJSON* db_get_time_based_stats(void);
+cJSON* db_get_top_pubkeys(int limit);
+cJSON* db_get_subscription_details(void);
+int db_get_total_event_count(void);
+
+// ============================================================
+// Admin SQL Query
+// ============================================================
+cJSON* db_execute_admin_query(const char* sql, char* error_msg, size_t error_size);
+
+#endif // DB_OPS_H
+```
+
+### Migration Strategy for Phase 1
+
+The key principle: **change the interface, not the behavior**. Each function in `db_ops.c` initially just wraps the existing SQLite calls.
+
+**Step-by-step for each file:**
+
+1. **Create `db_ops.h` and `db_ops.c`** with the interface above
+2. **Implement each `db_ops` function** by moving the existing SQLite code from the source files into `db_ops.c`
+3. **Replace direct `sqlite3_*` calls** in each source file with `db_ops_*` calls
+4. **Remove `extern sqlite3* g_db`** from each file — only `db_ops.c` knows about `g_db`
+5. **Remove `#include <sqlite3.h>`** from each file — only `db_ops.c` includes it
+6. **Update Makefile** to compile `db_ops.c`
+
+### Order of Migration (by risk, lowest first)
+
+1. **`src/ip_ban.c`** — Self-contained, simple CRUD. Good warmup.
+2. **`src/subscriptions.c`** — Logging only, no critical path.
+3. **`src/nip009.c`** — Event deletion, small file.
+4. **`src/request_validator.c`** — Auth checks, small file.
+5. **`src/api.c`** — Stats/monitoring queries. Larger but read-only.
+6. **`src/dm_admin.c`** — Auth rules + WoT. Medium complexity.
+7. **`src/config.c`** — Config CRUD. Large but well-structured.
+8. **`src/websockets.c`** — COUNT queries, minimal DB usage.
+9. **`src/main.c`** — Event store/retrieve, REQ queries. The big one — do last.
+
+### Testing Phase 1
+
+After Phase 1, the relay should behave **identically** to before. Run:
+- `tests/run_all_tests.sh` — Full test suite
+- `tests/performance_benchmarks.sh` — Verify no performance regression
+- Manual testing with production-like traffic
+
+---
+
+## Phase 2: SQLite Thread Pool
+
+### Goal
+
+Add a pool of N worker threads, each with its own `sqlite3*` connection to the same database file. SQLite WAL mode (already enabled) supports **concurrent readers**. The event loop dispatches database work to the pool and remains responsive.
+
+### Key Design Points
+
+1. **Read path**: REQ queries dispatched to thread pool. Each worker opens its own `sqlite3*` connection. SQLite WAL allows unlimited concurrent readers.
+
+2. **Write path**: EVENT inserts go through a single dedicated writer thread. SQLite only allows one writer at a time anyway — this serializes writes cleanly.
+
+3. **Result delivery**: Worker threads cannot call `lws_write()` directly (libwebsockets is not thread-safe). Instead, they push results into a per-session message queue and call `lws_cancel_service()` to wake the event loop, which then drains the queue.
+
+4. **Connection lifecycle**: Each thread opens its own connection with `PRAGMA journal_mode=WAL` and `PRAGMA busy_timeout=5000`.
+
+### What Changes in the Codebase
+
+| Component | Current | Thread Pool |
+|-----------|---------|-------------|
+| [`g_db`](../src/main.c:49) | Single global connection | One per thread + writer connection |
+| [`handle_req_message()`](../src/main.c:1101) | Synchronous SQL in callback | Package filter into job, dispatch to pool |
+| [`store_event()`](../src/main.c:787) | Synchronous INSERT in callback | Dispatch to writer thread |
+| [`handle_count_message()`](../src/websockets.c:2863) | Synchronous COUNT in callback | Dispatch to pool |
+| Result delivery | Direct `queue_message()` | Worker pushes to queue + `lws_cancel_service()` |
+| Config reads | Direct `sqlite3_prepare` on `g_db` | Can stay synchronous with own connection or cache |
+
+### New Files
+
+- `src/thread_pool.h` — Thread pool interface
+- `src/thread_pool.c` — Thread pool implementation (job queue, worker lifecycle, result delivery)
+
+### Thread Pool Interface (sketch)
+
+```c
+// src/thread_pool.h
+#ifndef THREAD_POOL_H
+#define THREAD_POOL_H
+
+typedef enum {
+    JOB_TYPE_REQ_QUERY,
+    JOB_TYPE_COUNT_QUERY,
+    JOB_TYPE_STORE_EVENT,
+    JOB_TYPE_DELETE_EVENT,
+} job_type_t;
+
+typedef struct {
+    job_type_t type;
+    void* session;              // lws per-session data pointer
+    db_event_filter_t filter;   // For REQ/COUNT jobs
+    cJSON* event;               // For STORE jobs
+    char event_id[65];          // For DELETE jobs
+} db_job_t;
+
+int thread_pool_init(int num_readers, const char* db_path);
+void thread_pool_shutdown(void);
+int thread_pool_submit_read(db_job_t* job);
+int thread_pool_submit_write(db_job_t* job);
+
+#endif // THREAD_POOL_H
+```
+
+### Performance Characteristics
+
+| Metric | Value |
+|--------|-------|
+| **Concurrent reads** | N readers in parallel (N = thread count, typically 4–8) |
+| **Write throughput** | Same as current — SQLite serializes writes regardless |
+| **Event loop latency** | Near-zero — REQ no longer blocks the loop |
+| **Max theoretical read throughput** | ~4–8x current (limited by disk I/O, not CPU) |
+| **Memory overhead** | ~50–100 MB per connection (page cache) |
+| **Latency per query** | Same as current per-query, but no head-of-line blocking |
+
+### Limitations
+
+- **Write contention**: SQLite still allows only ONE writer at a time. With WAL, readers don't block writers and writers don't block readers, but two simultaneous writes will serialize. At the current write rate (~56 events/hour), this is a non-issue.
+- **Database size**: The 2.7 GB index bloat problem remains. Thread pool doesn't fix the schema — it fixes the concurrency.
+- **Scaling ceiling**: Beyond ~8 reader threads, diminishing returns due to disk I/O contention on a single SQLite file.
+- **Complexity**: Need a proper job queue, thread lifecycle management, and careful handling of the lws ↔ worker thread boundary.
+
+---
+
+## Risk Mitigation
+
+| Risk | Mitigation |
+|------|-----------|
+| Phase 1 introduces bugs | Each file migrated independently, tested after each. Full test suite runs after each file. |
+| Thread pool race conditions | Worker threads only touch their own `sqlite3*` connection. Result delivery uses a mutex-protected queue. `lws_cancel_service()` is documented as thread-safe. |
+| Performance regression from abstraction | Abstraction layer is thin wrappers — no extra allocations or copies. Benchmark before/after. |
+| lws thread safety issues | Workers never call `lws_write()` directly. They push to a queue and wake the event loop. This is the documented pattern for libwebsockets multi-threading. |
+| Rollback needed | Phase 1 is a pure refactor — easy to revert. Phase 2 thread pool is additive — can be disabled with a compile flag. |
+
+---
+
+## Relationship to c-relay-pg
+
+After Phase 1 (abstraction layer) is complete, the codebase is ready to be forked into a separate **c-relay-pg** project that replaces the SQLite backend with PostgreSQL. See [c-relay-pg plan](c_relay_pg_plan.md) for details.
+
+The `db_ops.h` interface is designed to work with any backend:
+- **SQLite** (this plan): `db_result_next_json()` copies from `sqlite3_column_text()`
+- **PostgreSQL** (c-relay-pg): `db_result_next_json()` returns from `PQgetvalue()`
+- **LMDB** (future possibility): `db_result_next_json()` returns a zero-copy pointer into mmap'd memory

plans/memory_leak_investigation_plan.md

@@ -0,0 +1,207 @@
+# C-Relay Memory Leak Investigation & Fix Plan
+
+## Problem Statement
+
+c-relay reached **1.56 GB** of its 1.5 GB `MemoryHigh` cgroup limit after only **1 hour 37 minutes** of runtime. The kernel is actively throttling the process with swap pressure (1.8M swap used). This strongly indicates one or more memory leaks causing unbounded growth.
+
+## Root Cause Analysis
+
+After thorough code review, I identified **three categories** of memory issues:
+
+1. **Confirmed `get_config_value()` leaks** — the most pervasive issue
+2. **Potential structural leaks** in subscription/connection lifecycle
+3. **Stack pressure** from large stack-allocated arrays
+
+---
+
+## Category 1: `get_config_value()` Leaks (HIGH SEVERITY — Most Likely Root Cause)
+
+### The Core Problem
+
+[`get_config_value()`](src/config.c:293) calls [`get_config_value_from_table()`](src/config.c:1690) which returns `strdup(value)` — a **heap-allocated string that the caller must free**. Many call sites treat the return value as a borrowed pointer and never free it.
+
+**Every unfree'd call leaks ~64-256 bytes per invocation.** On a busy relay processing hundreds of events/second, this accumulates to GB-scale leaks within hours.
+
+### Confirmed Leak Sites
+
+#### `websockets.c` — Called on EVERY incoming event
+
+| Line | Code | Frequency | Severity |
+|------|------|-----------|----------|
+| [1527](src/websockets.c:1527) | `get_config_value("relay_pubkey")` — auth bypass check for kind 14 DMs | Every kind-14 event | **HIGH** |
+| [1549](src/websockets.c:1549) | `get_config_value("admin_pubkey")` — auth bypass check for kind 23456 | Every kind-23456 event | **MEDIUM** |
+| [2704](src/websockets.c:2704) | `get_config_value("relay_pubkey")` — DM stats command processing | Every DM to relay | **MEDIUM** |
+| [2742](src/websockets.c:2742) | `get_config_value("admin_pubkey")` — DM admin check | Every DM to relay | **MEDIUM** |
+
+#### `main.c` — Called on EVERY admin event check
+
+| Line | Code | Frequency | Severity |
+|------|------|-----------|----------|
+| [1718](src/main.c:1718) | `get_config_value("relay_pubkey")` — inside a loop iterating tags | Every admin event, per tag | **CRITICAL** |
+| [1742](src/main.c:1742) | `get_config_value("admin_pubkey")` — admin authorization | Every admin event | **HIGH** |
+
+#### `config.c` — Called on EVERY event kind check
+
+| Line | Code | Frequency | Severity |
+|------|------|-----------|----------|
+| [377](src/config.c:377) | `get_config_value("nip42_auth_required_kinds")` — NIP-42 kind check | Every incoming event | **CRITICAL** |
+
+#### `ip_ban.c` — Called on EVERY ban check
+
+| Line | Code | Frequency | Severity |
+|------|------|-----------|----------|
+| [255](src/ip_ban.c:255) | `get_config_value("idle_ban_whitelist")` — whitelist check | Every connection check | **HIGH** |
+
+#### `nip042.c` — Called on every auth verification
+
+| Line | Code | Frequency | Severity |
+|------|------|-----------|----------|
+| [99](src/nip042.c:99) | `get_config_value("relay_url")` — relay URL for auth verification | Every NIP-42 auth | **MEDIUM** |
+
+#### `request_validator.c` — Called on every auth rules check
+
+| Line | Code | Frequency | Severity |
+|------|------|-----------|----------|
+| [208](src/request_validator.c:208) | `get_config_value("auth_enabled")` — properly freed | N/A | OK |
+| [216](src/request_validator.c:216) | `get_config_value("auth_rules_enabled")` — properly freed | N/A | OK |
+| [304](src/request_validator.c:304) | `get_config_value("admin_pubkey")` — NOT freed | Every event validation | **HIGH** |
+| [320](src/request_validator.c:320) | `get_config_value("nip42_auth_enabled")` — NOT freed | Every event validation | **HIGH** |
+
+### Files That DO Free Correctly (for reference)
+
+- [`nip011.c`](src/nip011.c:127) — Properly frees all `get_config_value()` results
+- [`nip013.c`](src/nip013.c:43) — Properly frees `pow_mode`
+- [`request_validator.c`](src/request_validator.c:191) — Properly frees `nip42_timeout` and `nip42_tolerance`
+
+### Estimated Impact
+
+On a relay processing ~100 events/second:
+- `is_nip42_auth_required_for_kind()` leaks ~100-200 bytes × 100/sec = **~10-20 KB/sec**
+- `ip_is_whitelisted()` leaks ~100 bytes × connections/sec
+- `is_authorized_admin_event()` leaks inside tag loop — potentially **multiple leaks per event**
+- Combined: **~50-100 KB/sec → ~180-360 MB/hour** — consistent with the observed 1.56 GB in 97 minutes
+
+---
+
+## Category 2: Structural Lifecycle Leaks (MEDIUM SEVERITY)
+
+### 2a. `LWS_CALLBACK_CLOSED` — Inactive Subscription Skip
+
+In [`websockets.c:2339`](src/websockets.c:2339), the cleanup handler only collects subscription IDs where `sub->active` is true:
+
+```c
+if (sub->active) {  // Only process active subscriptions
+    temp_sub_id_t* temp = malloc(sizeof(temp_sub_id_t));
+```
+
+If a subscription was marked inactive by another thread between the time it was added and the connection close, it will be **skipped** — never removed from the global manager, never freed. The subscription object, its filters, and all cJSON objects within leak permanently.
+
+### 2b. `connection_list_remove` Potential
+
+The `connection_list_remove(wsi)` call at [`websockets.c:2252`](src/websockets.c:2252) happens before pss cleanup. Need to verify the connection list implementation doesn't hold references that prevent cleanup.
+
+### 2c. `ip_connection_info_t` Leak on Disconnect
+
+The per-IP connection tracking in [`subscriptions.h:79`](src/subscriptions.h:79) creates `ip_connection_info_t` nodes via `calloc`. These are only removed by `remove_ip_connection()` — need to verify this is called on every disconnect path.
+
+---
+
+## Category 3: Stack Pressure (LOW SEVERITY but notable)
+
+### 3a. `candidates_to_check` Stack Array
+
+In [`subscriptions.c:810`](src/subscriptions.c:810):
+
+```c
+subscription_t* candidates_to_check[MAX_TOTAL_SUBSCRIPTIONS]; // 5000 × 8 bytes = 40 KB
+```
+
+This allocates **40 KB on the stack** for every `broadcast_event_to_subscriptions()` call. While not a heap leak, it contributes to high memory pressure under concurrent load.
+
+### 3b. `added_kinds` Bitmap
+
+In [`subscriptions.c:68`](src/subscriptions.c:68):
+
+```c
+unsigned char added_kinds[8192] = {0};  // 8 KB on stack
+```
+
+---
+
+## Fix Implementation Plan
+
+### Phase 1: Fix `get_config_value()` Leaks (Highest Impact)
+
+**Strategy A — Preferred: Add a config cache layer**
+
+Instead of fixing 20+ call sites, add a **cached config system** that reads values once and caches them in memory, invalidating on config change events. This eliminates both the leak AND the repeated SQLite queries per event.
+
+```
+Config Cache Architecture:
+- Static hash table of key-value pairs
+- Populated at startup and on config change events
+- get_config_value_cached() returns const pointer to cached value (no allocation)
+- Existing get_config_value() kept for dynamic/rare lookups
+```
+
+**Strategy B — Quick fix: Free at every call site**
+
+Add `free((char*)result)` after every `get_config_value()` call that doesn't already free. This is more error-prone but faster to implement.
+
+**Recommendation: Implement Strategy A for hot-path values (relay_pubkey, admin_pubkey, auth settings), Strategy B for cold-path values.**
+
+### Phase 2: Fix Structural Leaks
+
+1. **Fix inactive subscription skip in CLOSED handler** — Remove the `if (sub->active)` guard, or add a second pass that also collects inactive subscriptions for cleanup
+2. **Verify `remove_ip_connection()` is called on all disconnect paths**
+3. **Add defensive cleanup** — periodic sweep of orphaned subscriptions
+
+### Phase 3: Add Memory Monitoring
+
+1. **Add a `/stats` endpoint** that reports:
+   - Current RSS/VSZ from `/proc/self/status`
+   - Active subscription count
+   - Message queue depth across all sessions
+   - Config cache hit/miss ratio
+2. **Add periodic memory logging** to the service loop
+3. **Consider integrating jemalloc** for better allocation tracking in production
+
+### Phase 4: Reduce Stack Pressure
+
+1. Move `candidates_to_check` to heap allocation with `malloc`/`free`
+2. Consider reducing `MAX_TOTAL_SUBSCRIPTIONS` or using a dynamic array
+
+---
+
+## Verification Strategy
+
+1. **Build with AddressSanitizer** (`-fsanitize=address`) for development testing
+2. **Run under Valgrind** with `--leak-check=full` for comprehensive leak detection
+3. **Monitor RSS over time** after fixes — should plateau rather than grow linearly
+4. **Load test** with `tests/load_tests.sh` while monitoring memory
+
+---
+
+## Immediate Mitigation
+
+While fixes are being implemented:
+1. **Raise `MemoryHigh`** to 2 GB in the systemd unit to prevent throttling
+2. **Add a cron job** to restart the service every 12-24 hours
+3. **Monitor with**: `watch -n 5 'cat /proc/$(pgrep c_relay)/status | grep -E "VmRSS|VmSwap"'`
+
+---
+
+## Implementation Priority Order
+
+| Priority | Task | Impact |
+|----------|------|--------|
+| P0 | Fix `is_nip42_auth_required_for_kind()` leak in config.c:377 | Called on every event |
+| P0 | Fix `ip_is_whitelisted()` leak in ip_ban.c:255 | Called on every connection check |
+| P0 | Fix `is_authorized_admin_event()` leaks in main.c:1718,1742 | Called per admin event, leaks in loop |
+| P1 | Fix websockets.c:1527,1549 auth bypass leaks | Called on every event with auth |
+| P1 | Fix request_validator.c:304,320 leaks | Called on every event validation |
+| P1 | Fix nip042.c:99 relay_url leak | Called on every NIP-42 auth |
+| P2 | Implement config cache for hot-path values | Eliminates leak class entirely |
+| P2 | Fix inactive subscription cleanup in CLOSED handler | Prevents slow subscription leak |
+| P3 | Add memory monitoring endpoint | Ongoing visibility |
+| P3 | Move large stack arrays to heap | Reduces stack pressure |

postgres_relays.md

@@ -0,0 +1,257 @@
+# PostgreSQL Nostr Relay Architecture Analysis
+
+This document summarizes common approaches and best practices for building Nostr relays backed by PostgreSQL, based on industry-standard designs and existing open-source relay implementations.
+
+## Identified Projects
+*   **Nostrss**: High-performance Rust-based relay.
+*   **Nostrgres**: Focused on PostgreSQL integration with complex event filtering.
+*   **Relay-rs (Postgres branch)**: General purpose high-throughput relay.
+*   **Nostream** ([github.com/Cameri/nostream](https://github.com/Cameri/nostream)): Production-ready TypeScript relay backed by PostgreSQL and Redis.
+*   **Nostr-Relay-NestJS** ([github.com/CodyTseng/nostr-relay-nestjs](https://github.com/CodyTseng/nostr-relay-nestjs)): High-performance relay built with NestJS and PostgreSQL, utilizing Kysely for type-safe database interactions.
+
+## Detailed Analysis
+
+### 1. Common Schema Patterns
+*   **Event Storage (JSONB)**: Most PostgreSQL-backed relays store the raw event as a JSONB object in a central `events` table. This provides flexibility for the evolving Nostr spec while allowing efficient extraction of fields.
+*   **Tag Denormalization**: While the raw event is in JSONB, performant relays extract tags (like `p`, `e`, `t`, `d`) into a separate `tags` table with foreign key relationships to the `events` table. This avoids slow JSONB traversal during complex filter queries.
+*   **Author/Publisher Tracking**: A dedicated `authors` or `pubkeys` table is typically used to maintain indexing on the `pubkey` field, enabling quick lookups of user activity.
+
+### 2. Performance Optimization
+*   **GIN Indexes on JSONB**: Crucial for filtering on specific event tags or custom properties stored within the event object. GIN indexes with `jsonb_path_ops` are generally preferred for equality checks.
+*   **Time-Series Partitioning**: Given the append-only nature of Nostr, partitioning the `events` table by time (e.g., daily or weekly chunks) is highly recommended. This significantly improves query performance for recent data and simplifies data expiration/deletion.
+*   **Clustering**: Clustering the `events` table by the timestamp index can reduce disk I/O, as it keeps temporally related events physically adjacent on the disk.
+
+### 3. Schema Management Approaches
+*   **Migrations**: Most mature relays utilize migration tools (like `Flyway`, `Diesel migrations`, or `Golang-migrate`) to version control database schema changes. This is critical for production stability.
+*   **Auto-generation**: Some lightweight prototypes auto-generate schemas at startup. This is generally discouraged for production due to the risk of destructive changes, data loss, or blocking DDL operations on large tables.
+
+## Recommendations for Building a New Relay
+1.  **Prioritize Denormalization**: Do not rely solely on JSONB queries for high-traffic filters. Extract indexed tags into dedicated columns or tables.
+2.  **Use Partitioning from Day One**: Implementing native PostgreSQL partitioning (e.g., using `pg_partman`) is much easier before the dataset grows to millions of rows.
+3.  **Connection Pooling**: PostgreSQL requires aggressive connection management. Use a high-performance pooler like `PgBouncer` to handle the large number of concurrent, short-lived connections common in WebSocket-based relay traffic.
+4.  **Asynchronous Writes**: Decouple the WebSocket ingestion thread from the database writer thread to ensure that slow database writes do not impact the relay's responsiveness.
+
+## Nostream ([github.com/Cameri/nostream](https://github.com/Cameri/nostream))
+
+A production-ready Nostr relay written in TypeScript (Node.js), backed by PostgreSQL 14+ and Redis. Uses Knex.js for versioned migrations.
+
+### PostgreSQL Schema
+
+The schema is fully normalized — no JSONB blob for the whole event. Tags are stored separately and populated by a trigger.
+
+**`events` table** — one row per event, tags kept as a JSONB column for the trigger to process:
+```sql
+CREATE TABLE events (
+    id               UUID     PRIMARY KEY DEFAULT uuid_generate_v4(),
+    event_id         BYTEA    UNIQUE NOT NULL,  -- 32-byte hash
+    event_pubkey     BYTEA    NOT NULL,
+    event_kind       INTEGER  UNSIGNED NOT NULL,
+    event_created_at INTEGER  UNSIGNED NOT NULL,
+    event_content    TEXT     NOT NULL,
+    event_tags       JSONB,                     -- raw tags array, source of truth for trigger
+    event_signature  BYTEA    NOT NULL,
+    remote_address   TEXT,
+    expires_at       INTEGER,
+    deleted_at       TIMESTAMP,
+    event_deduplication JSONB,                 -- used for replaceable event conflict key
+    first_seen       TIMESTAMP DEFAULT now()
+);
+
+-- Indexes
+CREATE INDEX ON events (event_pubkey);
+CREATE INDEX ON events (event_kind);
+CREATE INDEX ON events (event_created_at);
+CREATE INDEX ON events (expires_at);
+CREATE INDEX event_tags_idx ON events USING GIN (event_tags);  -- GIN on raw JSONB
+
+-- Unique index enforcing NIP-16 replaceable event semantics
+CREATE UNIQUE INDEX replaceable_events_idx ON events (event_pubkey, event_kind)
+    WHERE event_kind = 0 OR event_kind = 3
+       OR (event_kind >= 10000 AND event_kind < 20000);
+```
+
+**`event_tags` table** — denormalized single-letter tags, populated by a PostgreSQL trigger on `events`:
+```sql
+CREATE TABLE event_tags (
+    id         UUID  PRIMARY KEY DEFAULT uuid_generate_v4(),
+    event_id   BYTEA NOT NULL,
+    tag_name   TEXT  NOT NULL,   -- single-letter only (e.g. 'e', 'p', 't')
+    tag_value  TEXT  NOT NULL
+);
+
+CREATE INDEX ON event_tags (event_id);
+CREATE INDEX ON event_tags (tag_name, tag_value);
+
+-- Trigger: on INSERT/UPDATE/DELETE to events, repopulate event_tags
+CREATE OR REPLACE FUNCTION process_event_tags() RETURNS TRIGGER AS $$
+DECLARE
+  tag_element jsonb;
+BEGIN
+  DELETE FROM event_tags WHERE event_id = OLD.event_id;
+  IF TG_OP = 'INSERT' OR TG_OP = 'UPDATE' THEN
+    FOR tag_element IN SELECT jsonb_array_elements(NEW.event_tags) LOOP
+      IF length(trim('"' FROM (tag_element->0)::text)) = 1
+         AND (tag_element->1)::text IS NOT NULL THEN
+        INSERT INTO event_tags (event_id, tag_name, tag_value)
+        VALUES (NEW.event_id,
+                trim('"' FROM (tag_element->0)::text),
+                trim('"' FROM (tag_element->1)::text));
+      END IF;
+    END LOOP;
+  END IF;
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER insert_event_tags
+AFTER INSERT OR UPDATE OR DELETE ON events
+FOR EACH ROW EXECUTE FUNCTION process_event_tags();
+```
+
+Tag queries (`#e`, `#p`, etc.) join `event_tags` rather than traversing the JSONB array.
+
+**`users` and `invoices` tables** — for paid relay admission (Lightning payments):
+```sql
+CREATE TABLE users (
+    pubkey          BYTEA    PRIMARY KEY,
+    is_admitted     BOOLEAN  DEFAULT FALSE,
+    balance         BIGINT   DEFAULT 0,      -- in msats
+    tos_accepted_at DATETIME
+);
+
+CREATE TABLE invoices (
+    id               UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+    pubkey           BYTEA NOT NULL,
+    bolt11           TEXT  NOT NULL,
+    amount_requested BIGINT UNSIGNED NOT NULL,
+    amount_paid      BIGINT UNSIGNED,
+    unit             ENUM('msats','sats','btc'),
+    status           ENUM('pending','completed','expired'),
+    description      TEXT,
+    confirmed_at     DATETIME,
+    expires_at       DATETIME
+);
+```
+
+### How Redis Is Used
+
+Redis is **not** used for subscription fan-out. Subscription delivery is handled entirely in-process: each `WebSocketAdapter` holds a `Map<subscriptionId, filters[]>`, and a broadcast event walks all connected clients and filters locally.
+
+Redis has two actual roles:
+
+1. **Sliding-window rate limiting** — The `SlidingWindowRateLimiter` uses Redis sorted sets to track request timestamps per key (pubkey, IP, etc.) within a rolling time window:
+   - `ZREMRANGEBYSCORE key 0 (now - period)` — evict old entries
+   - `ZADD key timestamp member` — record this hit
+   - `ZRANGE key 0 -1` — count hits in window
+   - `EXPIRE key period` — auto-cleanup
+   - Keys follow the pattern `<pubkey>:events:<period>` or `<ip>:message:<period>`
+
+2. **General-purpose cache** — A `RedisAdapter` wraps the client with `get`/`set`/`hasKey` helpers, used for caching admission checks (e.g. `<pubkey>:is-admitted`). The event handler has a `TODO` comment noting that the `userRepository.findByPubkey()` call should be replaced with a cache lookup — meaning this is partially implemented.
+
+---
+
+## Schema Definitions
+
+### Relay-rs (Postgres)
+```sql
+-- Events table
+CREATE TABLE "event" (
+	id bytea NOT NULL,
+	pub_key bytea NOT NULL,
+	created_at timestamp with time zone NOT NULL,
+	kind integer NOT NULL,
+	"content" bytea NOT NULL,
+	hidden bit(1) NOT NULL DEFAULT 0::bit(1),
+	delegated_by bytea NULL,
+	first_seen timestamp with time zone NOT NULL DEFAULT now(),
+	expires_at timestamp(0) with time zone,
+	CONSTRAINT event_pkey PRIMARY KEY (id)
+);
+CREATE INDEX event_created_at_idx ON "event" (created_at,kind);
+CREATE INDEX event_pub_key_idx ON "event" (pub_key);
+CREATE INDEX event_delegated_by_idx ON "event" (delegated_by);
+CREATE INDEX event_expires_at_idx ON "event" (expires_at);
+
+-- Tags table
+CREATE TABLE "tag" (
+	id int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+	event_id bytea NOT NULL,
+	"name" varchar NOT NULL,
+	value bytea NULL,
+	value_hex bytea NULL,
+	CONSTRAINT tag_fk FOREIGN KEY (event_id) REFERENCES "event"(id) ON DELETE CASCADE,
+	CONSTRAINT unique_constraint_name UNIQUE (event_id, "name", value, value_hex)
+);
+CREATE INDEX tag_event_id_idx ON tag USING btree (event_id, name);
+CREATE INDEX tag_value_idx ON tag USING btree (value);
+CREATE INDEX tag_value_hex_idx ON tag USING btree (value_hex);
+
+-- Account table
+CREATE TABLE "account" (
+    pubkey varchar NOT NULL,
+    is_admitted BOOLEAN NOT NULL DEFAULT FALSE,
+    balance BIGINT NOT NULL DEFAULT 0,
+    tos_accepted_at TIMESTAMP,
+    CONSTRAINT account_pkey PRIMARY KEY (pubkey)
+);
+
+-- Invoice table
+CREATE TYPE status AS ENUM ('Paid', 'Unpaid', 'Expired');
+CREATE TABLE "invoice" (
+    payment_hash varchar NOT NULL,
+    pubkey varchar NOT NULL,
+    invoice varchar NOT NULL,
+    amount BIGINT NOT NULL,
+    status status NOT NULL DEFAULT 'Unpaid',
+    description varchar,
+    created_at timestamp,
+    confirmed_at timestamp,
+    CONSTRAINT invoice_payment_hash PRIMARY KEY (payment_hash),
+    CONSTRAINT invoice_pubkey_fkey FOREIGN KEY (pubkey) REFERENCES account (pubkey) ON DELETE CASCADE
+);
+```
+
+### Nostr-Relay-NestJS (PostgreSQL via Kysely)
+```sql
+-- Events table
+CREATE TABLE events (
+    id            CHAR(64) PRIMARY KEY,
+    pubkey        CHAR(64) NOT NULL,
+    created_at    BIGINT   NOT NULL,
+    kind          INTEGER  NOT NULL,
+    tags          JSONB    NOT NULL DEFAULT '[]',
+    generic_tags  TEXT[]   NOT NULL DEFAULT '{}',
+    content       TEXT     NOT NULL DEFAULT '',
+    sig           CHAR(128) NOT NULL,
+    expired_at    BIGINT,
+    d_tag_value   TEXT,
+    delegator     CHAR(64),
+    create_date   TIMESTAMP NOT NULL DEFAULT now(),
+    update_date   TIMESTAMP NOT NULL DEFAULT now(),
+    delete_date   TIMESTAMP
+);
+
+-- Indices
+CREATE EXTENSION IF NOT EXISTS btree_gin;
+CREATE INDEX generic_tags_kind_idx ON events USING gin (generic_tags, kind);
+CREATE INDEX pubkey_kind_created_at_idx ON events (pubkey, kind, created_at);
+CREATE INDEX delegator_kind_created_at_idx ON events (delegator, kind, created_at);
+CREATE INDEX created_at_kind_idx ON events (created_at, kind);
+
+-- Generic tags table (for optimized tag queries)
+CREATE TABLE generic_tags (
+    id         SERIAL PRIMARY KEY,
+    tag        TEXT    NOT NULL,
+    author     CHAR(64) NOT NULL,
+    kind       INTEGER  NOT NULL,
+    event_id   CHAR(64) NOT NULL REFERENCES events(id),
+    created_at BIGINT   NOT NULL
+);
+
+-- Indices for tag filtering
+CREATE UNIQUE INDEX g_tag_event_id_idx ON generic_tags (tag, event_id);
+CREATE INDEX g_tag_kind_created_at_idx ON generic_tags (tag, kind, created_at);
+CREATE INDEX g_tag_created_at_idx ON generic_tags (tag, created_at);
+```
+Nostr-Relay-NestJS features a hybrid storage model where tags are stored both in a JSONB field (for general lookup) and a normalized `generic_tags` table (for optimized tag query performance). The schema uses Kysely for type-safe interaction.
+

projects.txt

@@ -0,0 +1,10 @@
+https://github.com/rushmi0/Fenrir-s
+https://github.com/barkyq/gnost-relay
+https://github.com/lpicanco/knostr
+https://github.com/bezysoftware/netstr
+https://github.com/lebrunel/nex
+https://github.com/CodyTseng/nostr-relay-nestjs
+https://github.com/mattn/nostr-relay
+https://github.com/Cameri/nostream
+https://github.com/Giszmo/NostrPostr/tree/master/NostrRelay
+https://github.com/fiatjaf/relayer/tree/master/examples/basic

relay.pid

@@ -1 +1 @@
-2380224
+513827

src/api.c

@@ -13,7 +13,7 @@ extern void log_query_execution(const char* query_type, const char* sub_id,
 #include <pthread.h>
 #include <libwebsockets.h>
 #include <cjson/cJSON.h>
-#include <sqlite3.h>
+int get_active_connection_count(void);
 #include <time.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -27,6 +27,7 @@ extern void log_query_execution(const char* query_type, const char* sub_id,
 #include "../nostr_core_lib/nostr_core/nip017.h"
 #include "../nostr_core_lib/nostr_core/nip044.h"
 #include "subscriptions.h"
+#include "db_ops.h"
 
 // External subscription manager (from main.c via subscriptions.c)
 extern subscription_manager_t g_subscription_manager;
@@ -61,22 +62,21 @@ int get_monitoring_throttle_seconds(void) {
 
 // Query event kind distribution from database
 cJSON* query_event_kind_distribution(void) {
-    extern sqlite3* g_db;
-    if (!g_db) {
+    if (!db_is_available()) {
         DEBUG_ERROR("Database not available for monitoring query");
         return NULL;
     }
 
-    // Query event kinds distribution with total count
-    sqlite3_stmt* stmt;
     const char* sql = "SELECT kind, COUNT(*) as count FROM events GROUP BY kind ORDER BY count DESC";
 
     // Start timing
     struct timespec query_start, query_end;
     clock_gettime(CLOCK_MONOTONIC, &query_start);
 
-    if (sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL) != SQLITE_OK) {
-        DEBUG_ERROR("Failed to prepare event kind distribution query");
+    long long total_events = 0;
+    cJSON* kinds_array = db_get_event_kind_distribution_rows(&total_events);
+    if (!kinds_array) {
+        DEBUG_ERROR("Failed to query event kind distribution rows");
         return NULL;
     }
 
@@ -84,29 +84,12 @@ cJSON* query_event_kind_distribution(void) {
     cJSON_AddStringToObject(distribution, "data_type", "event_kinds");
     cJSON_AddNumberToObject(distribution, "timestamp", (double)time(NULL));
 
-    cJSON* kinds_array = cJSON_CreateArray();
-    long long total_events = 0;
-    int row_count = 0;
-
-    while (sqlite3_step(stmt) == SQLITE_ROW) {
-        row_count++;
-        int kind = sqlite3_column_int(stmt, 0);
-        long long count = sqlite3_column_int64(stmt, 1);
-        total_events += count;
-
-        cJSON* kind_obj = cJSON_CreateObject();
-        cJSON_AddNumberToObject(kind_obj, "kind", kind);
-        cJSON_AddNumberToObject(kind_obj, "count", count);
-        cJSON_AddItemToArray(kinds_array, kind_obj);
-    }
-
-    sqlite3_finalize(stmt);
-    
     // Stop timing and log
     clock_gettime(CLOCK_MONOTONIC, &query_end);
     long elapsed_us = (query_end.tv_sec - query_start.tv_sec) * 1000000L +
                       (query_end.tv_nsec - query_start.tv_nsec) / 1000L;
-    
+
+    int row_count = cJSON_GetArraySize(kinds_array);
     log_query_execution("MONITOR", "event_kinds", NULL, sql, elapsed_us, row_count);
 
     cJSON_AddNumberToObject(distribution, "total_events", total_events);
@@ -117,8 +100,7 @@ cJSON* query_event_kind_distribution(void) {
 
 // Query time-based statistics from database
 cJSON* query_time_based_statistics(void) {
-    extern sqlite3* g_db;
-    if (!g_db) {
+    if (!db_is_available()) {
         DEBUG_ERROR("Database not available for time stats query");
         return NULL;
     }
@@ -142,38 +124,18 @@ cJSON* query_time_based_statistics(void) {
         {NULL, 0, NULL}
     };
 
-    // Get total events count
-    sqlite3_stmt* total_stmt;
-    const char* total_sql = "SELECT COUNT(*) FROM events";
     long long total_events = 0;
-
-    if (sqlite3_prepare_v2(g_db, total_sql, -1, &total_stmt, NULL) == SQLITE_OK) {
-        if (sqlite3_step(total_stmt) == SQLITE_ROW) {
-            total_events = sqlite3_column_int64(total_stmt, 0);
-        }
-        sqlite3_finalize(total_stmt);
-    }
+    (void)db_get_total_event_count_ll(&total_events);
 
     // Query each time period
     for (int i = 0; periods[i].period != NULL; i++) {
-        sqlite3_stmt* stmt;
-        const char* sql = "SELECT COUNT(*) FROM events WHERE created_at >= ?";
-
-        if (sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL) != SQLITE_OK) {
-            DEBUG_ERROR("Failed to prepare time stats query");
+        time_t cutoff = now - periods[i].seconds;
+        long long count = 0;
+        if (db_get_event_count_since(cutoff, &count) != 0) {
+            DEBUG_ERROR("Failed to query time stats count");
             continue;
         }
 
-        time_t cutoff = now - periods[i].seconds;
-        sqlite3_bind_int64(stmt, 1, cutoff);
-
-        long long count = 0;
-        if (sqlite3_step(stmt) == SQLITE_ROW) {
-            count = sqlite3_column_int64(stmt, 0);
-        }
-
-        sqlite3_finalize(stmt);
-
         cJSON* period_obj = cJSON_CreateObject();
         cJSON_AddStringToObject(period_obj, "period", periods[i].period);
         cJSON_AddNumberToObject(period_obj, "count", count);
@@ -189,51 +151,39 @@ cJSON* query_time_based_statistics(void) {
 
 // Query top pubkeys by event count from database
 cJSON* query_top_pubkeys(void) {
-    extern sqlite3* g_db;
-    if (!g_db) {
+    if (!db_is_available()) {
         DEBUG_ERROR("Database not available for top pubkeys query");
         return NULL;
     }
 
-    // Query top 10 pubkeys by event count
-    sqlite3_stmt* stmt;
-    const char* sql = "SELECT pubkey, COUNT(*) as count FROM events GROUP BY pubkey ORDER BY count DESC LIMIT 10";
-
-    if (sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL) != SQLITE_OK) {
-        DEBUG_ERROR("Failed to prepare top pubkeys query");
-        return NULL;
-    }
-
     cJSON* top_pubkeys = cJSON_CreateObject();
     cJSON_AddStringToObject(top_pubkeys, "data_type", "top_pubkeys");
     cJSON_AddNumberToObject(top_pubkeys, "timestamp", (double)time(NULL));
 
-    cJSON* pubkeys_array = cJSON_CreateArray();
-
-    // Get total events count for percentage calculation
-    sqlite3_stmt* total_stmt;
-    const char* total_sql = "SELECT COUNT(*) FROM events";
-    long long total_events = 0;
-
-    if (sqlite3_prepare_v2(g_db, total_sql, -1, &total_stmt, NULL) == SQLITE_OK) {
-        if (sqlite3_step(total_stmt) == SQLITE_ROW) {
-            total_events = sqlite3_column_int64(total_stmt, 0);
-        }
-        sqlite3_finalize(total_stmt);
+    cJSON* rows = db_get_top_pubkeys_rows(10);
+    if (!rows) {
+        cJSON_Delete(top_pubkeys);
+        DEBUG_ERROR("Failed to query top pubkeys rows");
+        return NULL;
     }
 
-    while (sqlite3_step(stmt) == SQLITE_ROW) {
-        const char* pubkey = (const char*)sqlite3_column_text(stmt, 0);
-        long long count = sqlite3_column_int64(stmt, 1);
-
+    cJSON* pubkeys_array = cJSON_CreateArray();
+    cJSON* row = NULL;
+    cJSON_ArrayForEach(row, rows) {
         cJSON* pubkey_obj = cJSON_CreateObject();
-        cJSON_AddStringToObject(pubkey_obj, "pubkey", pubkey ? pubkey : "");
-        cJSON_AddNumberToObject(pubkey_obj, "event_count", count);
-        // Percentage will be calculated by frontend using total_events
+        cJSON* pubkey_item = cJSON_GetObjectItemCaseSensitive(row, "pubkey");
+        cJSON* count_item = cJSON_GetObjectItemCaseSensitive(row, "count");
+
+        cJSON_AddStringToObject(pubkey_obj, "pubkey",
+                                cJSON_IsString(pubkey_item) ? pubkey_item->valuestring : "");
+        cJSON_AddNumberToObject(pubkey_obj, "event_count",
+                                cJSON_IsNumber(count_item) ? count_item->valuedouble : 0.0);
         cJSON_AddItemToArray(pubkeys_array, pubkey_obj);
     }
+    cJSON_Delete(rows);
 
-    sqlite3_finalize(stmt);
+    long long total_events = 0;
+    (void)db_get_total_event_count_ll(&total_events);
 
     cJSON_AddItemToObject(top_pubkeys, "pubkeys", pubkeys_array);
     cJSON_AddNumberToObject(top_pubkeys, "total_events", total_events);
@@ -245,15 +195,11 @@ cJSON* query_top_pubkeys(void) {
 // Query detailed subscription information from database log (ADMIN ONLY)
 // Uses subscriptions table instead of in-memory iteration to avoid mutex contention
 cJSON* query_subscription_details(void) {
-    extern sqlite3* g_db;
-    if (!g_db) {
+    if (!db_is_available()) {
         DEBUG_ERROR("Database not available for subscription details query");
         return NULL;
     }
 
-    // Query active subscriptions from the active_subscriptions_log view
-    // This view properly handles deduplication of closed/expired subscriptions
-    sqlite3_stmt* stmt;
     const char* sql =
         "SELECT * "
         "FROM active_subscriptions_log "
@@ -267,11 +213,6 @@ cJSON* query_subscription_details(void) {
     struct timespec query_start, query_end;
     clock_gettime(CLOCK_MONOTONIC, &query_start);
 
-    if (sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL) != SQLITE_OK) {
-        DEBUG_ERROR("Failed to prepare subscription details query");
-        return NULL;
-    }
-
     time_t current_time = time(NULL);
     cJSON* subscriptions_data = cJSON_CreateObject();
     cJSON_AddStringToObject(subscriptions_data, "data_type", "subscription_details");
@@ -280,34 +221,51 @@ cJSON* query_subscription_details(void) {
     cJSON* data = cJSON_CreateObject();
     cJSON* subscriptions_array = cJSON_CreateArray();
 
+    cJSON* rows = db_get_subscription_details_rows();
+    if (!rows) {
+        cJSON_Delete(subscriptions_data);
+        cJSON_Delete(data);
+        cJSON_Delete(subscriptions_array);
+        DEBUG_ERROR("Failed to query subscription details rows");
+        return NULL;
+    }
+
     // Iterate through query results
     int row_count = 0;
-    while (sqlite3_step(stmt) == SQLITE_ROW) {
+    cJSON* row = NULL;
+    cJSON_ArrayForEach(row, rows) {
         row_count++;
         cJSON* sub_obj = cJSON_CreateObject();
 
-        // Extract subscription data from database
-        const char* sub_id = (const char*)sqlite3_column_text(stmt, 0);
-        const char* client_ip = (const char*)sqlite3_column_text(stmt, 1);
-        const char* filter_json = (const char*)sqlite3_column_text(stmt, 2);
-        long long events_sent = sqlite3_column_int64(stmt, 3);
-        long long created_at = sqlite3_column_int64(stmt, 4);
-        long long duration_seconds = sqlite3_column_int64(stmt, 5);
-        const char* wsi_pointer = (const char*)sqlite3_column_text(stmt, 6);
+        cJSON* sub_id_item = cJSON_GetObjectItemCaseSensitive(row, "id");
+        cJSON* client_ip_item = cJSON_GetObjectItemCaseSensitive(row, "client_ip");
+        cJSON* filter_json_item = cJSON_GetObjectItemCaseSensitive(row, "filter_json");
+        cJSON* events_sent_item = cJSON_GetObjectItemCaseSensitive(row, "events_sent");
+        cJSON* created_at_item = cJSON_GetObjectItemCaseSensitive(row, "created_at");
+        cJSON* duration_item = cJSON_GetObjectItemCaseSensitive(row, "duration_seconds");
+        cJSON* wsi_pointer_item = cJSON_GetObjectItemCaseSensitive(row, "wsi_pointer");
+
+        const char* sub_id = cJSON_IsString(sub_id_item) ? sub_id_item->valuestring : "";
+        const char* client_ip = cJSON_IsString(client_ip_item) ? client_ip_item->valuestring : "";
+        const char* filter_json = cJSON_IsString(filter_json_item) ? filter_json_item->valuestring : "[]";
+        long long events_sent = cJSON_IsNumber(events_sent_item) ? (long long)events_sent_item->valuedouble : 0;
+        long long created_at = cJSON_IsNumber(created_at_item) ? (long long)created_at_item->valuedouble : 0;
+        long long duration_seconds = cJSON_IsNumber(duration_item) ? (long long)duration_item->valuedouble : 0;
+        const char* wsi_pointer = cJSON_IsString(wsi_pointer_item) ? wsi_pointer_item->valuestring : "";
 
         // DEBUG: Log each subscription found
         DEBUG_LOG("Row %d: sub_id=%s, client_ip=%s, events_sent=%lld, created_at=%lld",
-                  row_count, sub_id ? sub_id : "NULL", client_ip ? client_ip : "NULL",
+                  row_count, sub_id[0] ? sub_id : "NULL", client_ip[0] ? client_ip : "NULL",
                   events_sent, created_at);
 
         // Add basic subscription info
-        cJSON_AddStringToObject(sub_obj, "id", sub_id ? sub_id : "");
-        cJSON_AddStringToObject(sub_obj, "client_ip", client_ip ? client_ip : "");
+        cJSON_AddStringToObject(sub_obj, "id", sub_id);
+        cJSON_AddStringToObject(sub_obj, "client_ip", client_ip);
         cJSON_AddNumberToObject(sub_obj, "created_at", (double)created_at);
         cJSON_AddNumberToObject(sub_obj, "duration_seconds", (double)duration_seconds);
         cJSON_AddNumberToObject(sub_obj, "events_sent", events_sent);
         cJSON_AddBoolToObject(sub_obj, "active", 1);  // All from this view are active
-        cJSON_AddStringToObject(sub_obj, "wsi_pointer", wsi_pointer ? wsi_pointer : "N/A");
+        cJSON_AddStringToObject(sub_obj, "wsi_pointer", wsi_pointer[0] ? wsi_pointer : "N/A");
 
         // Extract query stats from per_session_data if wsi is still valid
         int db_queries = 0;
@@ -316,7 +274,7 @@ cJSON* query_subscription_details(void) {
         double row_rate = 0.0;
         double avg_rows_per_query = 0.0;
 
-        if (wsi_pointer && strlen(wsi_pointer) > 2) {  // Check for valid pointer string
+        if (wsi_pointer[0] != '\0' && strlen(wsi_pointer) > 2) {  // Check for valid pointer string
             // Parse wsi pointer from hex string
             struct lws* wsi = NULL;
             if (sscanf(wsi_pointer, "%p", (void**)&wsi) == 1 && wsi != NULL) {
@@ -325,7 +283,7 @@ cJSON* query_subscription_details(void) {
                 if (pss) {
                     db_queries = pss->db_queries_executed;
                     db_rows = pss->db_rows_returned;
-                    
+
                     // Calculate rates (per minute)
                     time_t connection_duration = current_time - pss->query_tracking_start;
                     if (connection_duration > 0) {
@@ -333,7 +291,7 @@ cJSON* query_subscription_details(void) {
                         query_rate = db_queries / minutes;
                         row_rate = db_rows / minutes;
                     }
-                    
+
                     // Calculate average rows per query
                     if (db_queries > 0) {
                         avg_rows_per_query = (double)db_rows / (double)db_queries;
@@ -364,8 +322,7 @@ cJSON* query_subscription_details(void) {
 
         cJSON_AddItemToArray(subscriptions_array, sub_obj);
     }
-
-    sqlite3_finalize(stmt);
+    cJSON_Delete(rows);
 
     // Add subscriptions array and count to data
     cJSON_AddItemToObject(data, "subscriptions", subscriptions_array);
@@ -377,9 +334,9 @@ cJSON* query_subscription_details(void) {
     clock_gettime(CLOCK_MONOTONIC, &query_end);
     long elapsed_us = (query_end.tv_sec - query_start.tv_sec) * 1000000L +
                       (query_end.tv_nsec - query_start.tv_nsec) / 1000L;
-    
+
     log_query_execution("MONITOR", "subscription_details", NULL, sql, elapsed_us, row_count);
-    
+
     // DEBUG: Log final summary
     DEBUG_LOG("Total subscriptions found: %d", row_count);
     DEBUG_LOG("=== END SUBSCRIPTION_DETAILS QUERY DEBUG ===");
@@ -730,7 +687,6 @@ static const config_definition_t known_configs[] = {
     {NULL, NULL, 0, 0}
 };
 // External database connection (from main.c)
-extern sqlite3* g_db;
 extern char g_database_path[512];
 
 // Forward declarations for database functions
@@ -1035,138 +991,12 @@ char* execute_sql_query(const char* query, const char* request_id, char* error_m
         return NULL;
     }
 
-    if (!g_db) {
+    if (!db_is_available()) {
         snprintf(error_message, error_size, "Database not available");
         return NULL;
     }
 
-    // Set busy timeout to prevent long-running queries (5 seconds)
-    sqlite3_busy_timeout(g_db, 5000);
-
-    // Prepare statement
-    sqlite3_stmt* stmt;
-    int rc = sqlite3_prepare_v2(g_db, query, -1, &stmt, NULL);
-    if (rc != SQLITE_OK) {
-        const char* err_msg = sqlite3_errmsg(g_db);
-        snprintf(error_message, error_size, "SQL prepare failed: %s", err_msg);
-        return NULL;
-    }
-
-    // Execute query and collect results
-    cJSON* response = cJSON_CreateObject();
-    cJSON_AddStringToObject(response, "query_type", "sql_query");
-    cJSON_AddStringToObject(response, "request_id", request_id);
-    cJSON_AddNumberToObject(response, "timestamp", (double)time(NULL));
-    cJSON_AddStringToObject(response, "query", query);
-
-    // Get column information
-    int col_count = sqlite3_column_count(stmt);
-    cJSON* columns = cJSON_CreateArray();
-    for (int i = 0; i < col_count; i++) {
-        const char* col_name = sqlite3_column_name(stmt, i);
-        cJSON_AddItemToArray(columns, cJSON_CreateString(col_name ? col_name : ""));
-    }
-    cJSON_AddItemToObject(response, "columns", columns);
-
-    // Execute and collect rows (with limit)
-    cJSON* rows = cJSON_CreateArray();
-    int row_count = 0;
-    const int MAX_ROWS = 1000; // Configurable limit
-
-    struct timespec start_time;
-    clock_gettime(CLOCK_MONOTONIC, &start_time);
-
-    while ((rc = sqlite3_step(stmt)) == SQLITE_ROW && row_count < MAX_ROWS) {
-        cJSON* row = cJSON_CreateArray();
-
-        for (int i = 0; i < col_count; i++) {
-            int col_type = sqlite3_column_type(stmt, i);
-
-            switch (col_type) {
-                case SQLITE_INTEGER:
-                    cJSON_AddItemToArray(row, cJSON_CreateNumber((double)sqlite3_column_int64(stmt, i)));
-                    break;
-                case SQLITE_FLOAT:
-                    cJSON_AddItemToArray(row, cJSON_CreateNumber(sqlite3_column_double(stmt, i)));
-                    break;
-                case SQLITE_TEXT: {
-                    const char* text = (const char*)sqlite3_column_text(stmt, i);
-                    cJSON_AddItemToArray(row, cJSON_CreateString(text ? text : ""));
-                    break;
-                }
-                case SQLITE_BLOB: {
-                    // Convert blob to hex string for JSON compatibility
-                    const void* blob = sqlite3_column_blob(stmt, i);
-                    int blob_size = sqlite3_column_bytes(stmt, i);
-                    if (blob && blob_size > 0) {
-                        char* hex_str = malloc(blob_size * 2 + 1);
-                        if (hex_str) {
-                            for (int j = 0; j < blob_size; j++) {
-                                sprintf(hex_str + j * 2, "%02x", ((unsigned char*)blob)[j]);
-                            }
-                            hex_str[blob_size * 2] = '\0';
-                            cJSON_AddItemToArray(row, cJSON_CreateString(hex_str));
-                            free(hex_str);
-                        } else {
-                            cJSON_AddItemToArray(row, cJSON_CreateString("[BLOB]"));
-                        }
-                    } else {
-                        cJSON_AddItemToArray(row, cJSON_CreateString(""));
-                    }
-                    break;
-                }
-                case SQLITE_NULL:
-                    cJSON_AddItemToArray(row, cJSON_CreateNull());
-                    break;
-                default:
-                    cJSON_AddItemToArray(row, cJSON_CreateString("[UNKNOWN]"));
-                    break;
-            }
-        }
-
-        cJSON_AddItemToArray(rows, row);
-        row_count++;
-
-        // Check timeout (additional safety check)
-        struct timespec current_time;
-        clock_gettime(CLOCK_MONOTONIC, &current_time);
-        double elapsed = (current_time.tv_sec - start_time.tv_sec) +
-                        (current_time.tv_nsec - start_time.tv_nsec) / 1e9;
-        if (elapsed > 4.5) { // 4.5 seconds to allow for cleanup
-            break;
-        }
-    }
-
-    sqlite3_finalize(stmt);
-
-    // Check for execution errors
-    if (rc != SQLITE_DONE && rc != SQLITE_ROW) {
-        const char* err_msg = sqlite3_errmsg(g_db);
-        snprintf(error_message, error_size, "SQL execution failed: %s", err_msg);
-        cJSON_Delete(response);
-        return NULL;
-    }
-
-    // Check row limit
-    if (row_count >= MAX_ROWS) {
-        cJSON_AddStringToObject(response, "warning", "Result truncated to maximum row limit");
-    }
-
-    // Add metadata
-    cJSON_AddNumberToObject(response, "row_count", row_count);
-    cJSON_AddNumberToObject(response, "execution_time_ms", 0); // Will be set by caller
-    cJSON_AddItemToObject(response, "rows", rows);
-
-    // Convert to JSON string
-    char* json_result = cJSON_Print(response);
-    cJSON_Delete(response);
-
-    if (!json_result) {
-        snprintf(error_message, error_size, "Failed to generate JSON response");
-        return NULL;
-    }
-
-    return json_result;
+    return db_execute_readonly_query_json(query, request_id, error_message, error_size, 1000, 5000);
 }
 
 // Unified handler for SQL query commands
@@ -1292,16 +1122,15 @@ cJSON* query_cpu_metrics(void) {
     cJSON_AddNumberToObject(cpu_stats, "process_id", (double)pid);
 
     // Get active WebSocket connection count
-    extern int g_connection_count;
-    cJSON_AddNumberToObject(cpu_stats, "active_connections", (double)g_connection_count);
+    cJSON_AddNumberToObject(cpu_stats, "active_connections", (double)get_active_connection_count());
 
-    // Get memory usage from /proc/self/status
+    // Get memory usage from /proc/self/status and calculate MEM%
+    unsigned long rss_kb = 0;
     FILE* mem_stat = fopen("/proc/self/status", "r");
     if (mem_stat) {
         char line[256];
         while (fgets(line, sizeof(line), mem_stat)) {
             if (strncmp(line, "VmRSS:", 6) == 0) {
-                unsigned long rss_kb;
                 if (sscanf(line, "VmRSS: %lu kB", &rss_kb) == 1) {
                     double rss_mb = rss_kb / 1024.0;
                     cJSON_AddNumberToObject(cpu_stats, "memory_usage_mb", rss_mb);
@@ -1312,13 +1141,31 @@ cJSON* query_cpu_metrics(void) {
         fclose(mem_stat);
     }
 
+    // Get total system memory from /proc/meminfo for MEM%
+    if (rss_kb > 0) {
+        FILE* meminfo = fopen("/proc/meminfo", "r");
+        if (meminfo) {
+            char line[256];
+            while (fgets(line, sizeof(line), meminfo)) {
+                if (strncmp(line, "MemTotal:", 9) == 0) {
+                    unsigned long total_kb;
+                    if (sscanf(line, "MemTotal: %lu kB", &total_kb) == 1 && total_kb > 0) {
+                        double mem_pct = (rss_kb * 100.0) / total_kb;
+                        cJSON_AddNumberToObject(cpu_stats, "memory_percent", mem_pct);
+                    }
+                    break;
+                }
+            }
+            fclose(meminfo);
+        }
+    }
+
     return cpu_stats;
 }
 
 // Generate stats JSON from database queries
 char* generate_stats_json(void) {
-    extern sqlite3* g_db;
-    if (!g_db) {
+    if (!db_is_available()) {
         DEBUG_ERROR("Database not available for stats generation");
         return NULL;
     }
@@ -1329,10 +1176,10 @@ char* generate_stats_json(void) {
     cJSON_AddNumberToObject(response, "timestamp", (double)time(NULL));
 
     // Get database file size
-    extern char g_database_path[512];
+    const char* db_path = db_get_database_path();
     struct stat db_stat;
     long long db_size = 0;
-    if (stat(g_database_path, &db_stat) == 0) {
+    if (db_path && db_path[0] != '\0' && stat(db_path, &db_stat) == 0) {
         db_size = db_stat.st_size;
     }
     cJSON_AddNumberToObject(response, "database_size_bytes", db_size);
@@ -1343,85 +1190,80 @@ char* generate_stats_json(void) {
     pthread_mutex_unlock(&g_subscription_manager.subscriptions_lock);
     cJSON_AddNumberToObject(response, "active_subscriptions", active_subs);
 
-    // Query total events count
-    sqlite3_stmt* stmt;
-    if (sqlite3_prepare_v2(g_db, "SELECT COUNT(*) FROM events", -1, &stmt, NULL) == SQLITE_OK) {
-        if (sqlite3_step(stmt) == SQLITE_ROW) {
-            cJSON_AddNumberToObject(response, "total_events", sqlite3_column_int64(stmt, 0));
-        }
-        sqlite3_finalize(stmt);
+    long long total_events = 0;
+    if (db_get_total_event_count_ll(&total_events) == 0) {
+        cJSON_AddNumberToObject(response, "total_events", total_events);
     }
 
     // Query event kinds distribution
     cJSON* event_kinds = cJSON_CreateArray();
-    if (sqlite3_prepare_v2(g_db, "SELECT kind, count, percentage FROM event_kinds_view ORDER BY count DESC", -1, &stmt, NULL) == SQLITE_OK) {
-        while (sqlite3_step(stmt) == SQLITE_ROW) {
+    long long kinds_total = 0;
+    cJSON* kind_rows = db_get_event_kind_distribution_rows(&kinds_total);
+    if (kind_rows) {
+        cJSON* kind_row = NULL;
+        cJSON_ArrayForEach(kind_row, kind_rows) {
             cJSON* kind_obj = cJSON_CreateObject();
-            cJSON_AddNumberToObject(kind_obj, "kind", sqlite3_column_int(stmt, 0));
-            cJSON_AddNumberToObject(kind_obj, "count", sqlite3_column_int64(stmt, 1));
-            cJSON_AddNumberToObject(kind_obj, "percentage", sqlite3_column_double(stmt, 2));
+            cJSON* kind = cJSON_GetObjectItemCaseSensitive(kind_row, "kind");
+            cJSON* count = cJSON_GetObjectItemCaseSensitive(kind_row, "count");
+            double count_val = cJSON_IsNumber(count) ? count->valuedouble : 0.0;
+            double pct = (kinds_total > 0) ? ((count_val * 100.0) / (double)kinds_total) : 0.0;
+
+            cJSON_AddNumberToObject(kind_obj, "kind", cJSON_IsNumber(kind) ? kind->valuedouble : 0.0);
+            cJSON_AddNumberToObject(kind_obj, "count", count_val);
+            cJSON_AddNumberToObject(kind_obj, "percentage", pct);
             cJSON_AddItemToArray(event_kinds, kind_obj);
         }
-        sqlite3_finalize(stmt);
+        cJSON_Delete(kind_rows);
     }
     cJSON_AddItemToObject(response, "event_kinds", event_kinds);
 
     // Query time-based statistics
     cJSON* time_stats = cJSON_CreateObject();
-    if (sqlite3_prepare_v2(g_db, "SELECT period, total_events FROM time_stats_view", -1, &stmt, NULL) == SQLITE_OK) {
-        while (sqlite3_step(stmt) == SQLITE_ROW) {
-            const char* period = (const char*)sqlite3_column_text(stmt, 0);
-            sqlite3_int64 count = sqlite3_column_int64(stmt, 1);
-
-            if (strcmp(period, "total") == 0) {
-                cJSON_AddNumberToObject(time_stats, "total", count);
-            } else if (strcmp(period, "24h") == 0) {
-                cJSON_AddNumberToObject(time_stats, "last_24h", count);
-            } else if (strcmp(period, "7d") == 0) {
-                cJSON_AddNumberToObject(time_stats, "last_7d", count);
-            } else if (strcmp(period, "30d") == 0) {
-                cJSON_AddNumberToObject(time_stats, "last_30d", count);
-            }
-        }
-        sqlite3_finalize(stmt);
+    time_t now = time(NULL);
+    long long c24h = 0, c7d = 0, c30d = 0;
+    if (db_get_event_count_since(now - 86400, &c24h) == 0) {
+        cJSON_AddNumberToObject(time_stats, "last_24h", c24h);
     }
+    if (db_get_event_count_since(now - 604800, &c7d) == 0) {
+        cJSON_AddNumberToObject(time_stats, "last_7d", c7d);
+    }
+    if (db_get_event_count_since(now - 2592000, &c30d) == 0) {
+        cJSON_AddNumberToObject(time_stats, "last_30d", c30d);
+    }
+    cJSON_AddNumberToObject(time_stats, "total", total_events);
     cJSON_AddItemToObject(response, "time_stats", time_stats);
 
     // Query top pubkeys
     cJSON* top_pubkeys = cJSON_CreateArray();
-    if (sqlite3_prepare_v2(g_db, "SELECT pubkey, event_count, percentage FROM top_pubkeys_view ORDER BY event_count DESC LIMIT 10", -1, &stmt, NULL) == SQLITE_OK) {
-        while (sqlite3_step(stmt) == SQLITE_ROW) {
+    cJSON* pubkey_rows = db_get_top_pubkeys_rows(10);
+    if (pubkey_rows) {
+        cJSON* row = NULL;
+        cJSON_ArrayForEach(row, pubkey_rows) {
             cJSON* pubkey_obj = cJSON_CreateObject();
-            const char* pubkey = (const char*)sqlite3_column_text(stmt, 0);
-            cJSON_AddStringToObject(pubkey_obj, "pubkey", pubkey ? pubkey : "");
-            cJSON_AddNumberToObject(pubkey_obj, "event_count", sqlite3_column_int64(stmt, 1));
-            cJSON_AddNumberToObject(pubkey_obj, "percentage", sqlite3_column_double(stmt, 2));
+            cJSON* pubkey_item = cJSON_GetObjectItemCaseSensitive(row, "pubkey");
+            cJSON* count_item = cJSON_GetObjectItemCaseSensitive(row, "count");
+            double count_val = cJSON_IsNumber(count_item) ? count_item->valuedouble : 0.0;
+            double pct = (total_events > 0) ? ((count_val * 100.0) / (double)total_events) : 0.0;
+
+            cJSON_AddStringToObject(pubkey_obj, "pubkey", cJSON_IsString(pubkey_item) ? pubkey_item->valuestring : "");
+            cJSON_AddNumberToObject(pubkey_obj, "event_count", count_val);
+            cJSON_AddNumberToObject(pubkey_obj, "percentage", pct);
             cJSON_AddItemToArray(top_pubkeys, pubkey_obj);
         }
-        sqlite3_finalize(stmt);
+        cJSON_Delete(pubkey_rows);
     }
     cJSON_AddItemToObject(response, "top_pubkeys", top_pubkeys);
 
-    // Get database creation timestamp (oldest event)
-    if (sqlite3_prepare_v2(g_db, "SELECT MIN(created_at) FROM events", -1, &stmt, NULL) == SQLITE_OK) {
-        if (sqlite3_step(stmt) == SQLITE_ROW) {
-            sqlite3_int64 oldest_timestamp = sqlite3_column_int64(stmt, 0);
-            if (oldest_timestamp > 0) {
-                cJSON_AddNumberToObject(response, "database_created_at", (double)oldest_timestamp);
-            }
+    // Get database creation/latest timestamps
+    long long min_created_at = 0;
+    long long max_created_at = 0;
+    if (db_get_event_time_bounds(&min_created_at, &max_created_at) == 0) {
+        if (min_created_at > 0) {
+            cJSON_AddNumberToObject(response, "database_created_at", (double)min_created_at);
         }
-        sqlite3_finalize(stmt);
-    }
-
-    // Get latest event timestamp
-    if (sqlite3_prepare_v2(g_db, "SELECT MAX(created_at) FROM events", -1, &stmt, NULL) == SQLITE_OK) {
-        if (sqlite3_step(stmt) == SQLITE_ROW) {
-            sqlite3_int64 latest_timestamp = sqlite3_column_int64(stmt, 0);
-            if (latest_timestamp > 0) {
-                cJSON_AddNumberToObject(response, "latest_event_at", (double)latest_timestamp);
-            }
+        if (max_created_at > 0) {
+            cJSON_AddNumberToObject(response, "latest_event_at", (double)max_created_at);
         }
-        sqlite3_finalize(stmt);
     }
 
     // Convert to JSON string
@@ -1548,8 +1390,7 @@ int send_nip17_response(const char* sender_pubkey, const char* response_content,
 
 // Generate config text from database
 char* generate_config_text(void) {
-    extern sqlite3* g_db;
-    if (!g_db) {
+    if (!db_is_available()) {
         DEBUG_ERROR("NIP-17: Database not available for config query");
         return NULL;
     }
@@ -1568,25 +1409,29 @@ char* generate_config_text(void) {
         "🔧 Relay Configuration\n"
         "━━━━━━━━━━━━━━━━━━━━━━━━\n");
 
-    // Query all config values from database
-    sqlite3_stmt* stmt;
-    if (sqlite3_prepare_v2(g_db, "SELECT key, value FROM config ORDER BY key", -1, &stmt, NULL) == SQLITE_OK) {
-        while (sqlite3_step(stmt) == SQLITE_ROW && offset < 8192 - 200) {
-            const char* key = (const char*)sqlite3_column_text(stmt, 0);
-            const char* value = (const char*)sqlite3_column_text(stmt, 1);
-
-            if (key && value) {
-                offset += snprintf(config_text + offset, 8192 - offset,
-                    "%s: %s\n", key, value);
-            }
-        }
-        sqlite3_finalize(stmt);
-    } else {
+    cJSON* rows = db_get_all_config_rows();
+    if (!rows) {
         free(config_text);
         DEBUG_ERROR("NIP-17: Failed to query config from database");
         return NULL;
     }
 
+    cJSON* row = NULL;
+    cJSON_ArrayForEach(row, rows) {
+        if (offset >= 8192 - 200) break;
+
+        cJSON* key_item = cJSON_GetObjectItemCaseSensitive(row, "key");
+        cJSON* value_item = cJSON_GetObjectItemCaseSensitive(row, "value");
+        const char* key = cJSON_IsString(key_item) ? key_item->valuestring : NULL;
+        const char* value = cJSON_IsString(value_item) ? value_item->valuestring : NULL;
+
+        if (key && value) {
+            offset += snprintf(config_text + offset, 8192 - offset,
+                "%s: %s\n", key, value);
+        }
+    }
+    cJSON_Delete(rows);
+
     // Footer
     offset += snprintf(config_text + offset, 8192 - offset, "\n");
 
@@ -2147,8 +1992,7 @@ int apply_config_change(const char* key, const char* value) {
         return -1;
     }
 
-    extern sqlite3* g_db;
-    if (!g_db) {
+    if (!db_is_available()) {
         DEBUG_ERROR("Database not available for config change");
         return -1;
     }
@@ -2181,30 +2025,11 @@ int apply_config_change(const char* key, const char* value) {
     }
 
     // Update or insert the configuration value
-    sqlite3_stmt* stmt;
-    const char* sql = "INSERT OR REPLACE INTO config (key, value, data_type) VALUES (?, ?, ?)";
-
-    if (sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL) != SQLITE_OK) {
-        DEBUG_ERROR("Failed to prepare config update statement");
-        const char* err_msg = sqlite3_errmsg(g_db);
-        DEBUG_ERROR(err_msg);
-        return -1;
-    }
-
-    sqlite3_bind_text(stmt, 1, key, -1, SQLITE_STATIC);
-    sqlite3_bind_text(stmt, 2, normalized_value, -1, SQLITE_STATIC);
-    sqlite3_bind_text(stmt, 3, data_type, -1, SQLITE_STATIC);
-
-    int result = sqlite3_step(stmt);
-    if (result != SQLITE_DONE) {
+    if (db_upsert_config_value(key, normalized_value, data_type) != 0) {
         DEBUG_ERROR("Failed to update configuration in database");
-        const char* err_msg = sqlite3_errmsg(g_db);
-        DEBUG_ERROR(err_msg);
-        sqlite3_finalize(stmt);
         return -1;
     }
 
-    sqlite3_finalize(stmt);
     return 0;
 }
 

src/config.h

@@ -1,7 +1,6 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include <sqlite3.h>
 #include <cjson/cJSON.h>
 #include <time.h>
 #include <pthread.h>

src/db_ops.h

@@ -0,0 +1,108 @@
+#ifndef DB_OPS_H
+#define DB_OPS_H
+
+#include <stddef.h>
+#include <time.h>
+#include <cjson/cJSON.h>
+
+// Generic helpers
+int db_is_available(void);
+const char* db_last_error(void);
+const char* db_get_database_path(void);
+
+// DB result codes (backend-agnostic)
+#define DB_OK 0
+#define DB_ERROR 1
+#define DB_CONSTRAINT 19
+#define DB_MISUSE 21
+#define DB_ROW 100
+#define DB_DONE 101
+
+typedef struct db_stmt db_stmt_t;
+
+// Generic statement helpers (Phase 1 migration)
+int db_prepare(const char* sql, db_stmt_t** out_stmt);
+int db_bind_text_param(db_stmt_t* stmt, int index, const char* value);
+int db_bind_int_param(db_stmt_t* stmt, int index, int value);
+int db_bind_int64_param(db_stmt_t* stmt, int index, long long value);
+int db_step_stmt(db_stmt_t* stmt);
+int db_reset_stmt(db_stmt_t* stmt);
+const char* db_column_text_value(db_stmt_t* stmt, int col);
+int db_column_int_value(db_stmt_t* stmt, int col);
+long long db_column_int64_value(db_stmt_t* stmt, int col);
+double db_column_double_value(db_stmt_t* stmt, int col);
+void db_finalize_stmt(db_stmt_t* stmt);
+
+// Subscription logging
+int db_log_subscription_created(const char* sub_id, const char* wsi_ptr,
+                                const char* client_ip, const char* filter_json);
+int db_log_subscription_closed(const char* sub_id, const char* client_ip);
+int db_log_subscription_disconnected(const char* client_ip);
+int db_update_subscription_events_sent(const char* sub_id, int events_sent);
+int db_cleanup_orphaned_subscriptions(void);
+
+// NIP-09 event deletion helpers
+int db_get_event_pubkey(const char* event_id, char* pubkey_out, size_t pubkey_out_size);
+int db_delete_event_by_id(const char* event_id, const char* requester_pubkey);
+int db_delete_events_by_address(const char* pubkey, int kind,
+                                const char* d_tag, long before_timestamp);
+
+// Auth rule checks for request validator
+int db_is_pubkey_blacklisted(const char* pubkey);
+int db_is_hash_blacklisted(const char* resource_hash);
+int db_is_pubkey_whitelisted(const char* pubkey);
+int db_count_active_whitelist_rules(void);
+
+// Generic prepared COUNT helper
+int db_count_with_sql(const char* sql, const char** bind_params, int bind_param_count, int* out_count);
+char* db_execute_readonly_query_json(const char* query, const char* request_id,
+                                     char* error_message, size_t error_size,
+                                     int max_rows, int timeout_ms);
+
+// Monitoring/stat helpers (Phase 1 api.c migration)
+int db_get_total_event_count_ll(long long* out_count);
+int db_get_event_count_since(time_t cutoff, long long* out_count);
+cJSON* db_get_event_kind_distribution_rows(long long* out_total_events);
+cJSON* db_get_top_pubkeys_rows(int limit);
+cJSON* db_get_subscription_details_rows(void);
+
+// Config helpers
+cJSON* db_get_all_config_rows(void);
+char* db_get_config_value_dup(const char* key);
+int db_set_config_value_full(const char* key, const char* value, const char* data_type,
+                             const char* description, const char* category, int requires_restart);
+int db_update_config_value_only(const char* key, const char* value);
+int db_upsert_config_value(const char* key, const char* value, const char* data_type);
+int db_store_relay_private_key_hex(const char* relay_privkey_hex);
+char* db_get_relay_private_key_hex_dup(void);
+int db_store_config_event(const cJSON* event);
+
+// Event storage/timestamp/retrieval helpers
+int db_insert_event_with_json(const char* id, const char* pubkey, long long created_at,
+                              int kind, const char* event_type, const char* content,
+                              const char* sig, const char* tags_json, const char* event_json,
+                              int* out_step_rc, int* out_extended_errcode);
+int db_get_event_time_bounds(long long* out_min_created_at, long long* out_max_created_at);
+int db_event_id_exists(const char* event_id, int* out_exists);
+cJSON* db_retrieve_event_by_id(const char* event_id);
+char* db_get_latest_event_pubkey_for_kind_dup(int kind);
+
+// Config table helpers
+int db_get_config_row_count(int* out_count);
+
+// Event tag helpers
+int db_store_event_tags_cjson(const char* event_id, const cJSON* tags);
+int db_populate_event_tags_from_existing(void);
+
+// Auth/WoT rule helpers
+int db_add_auth_rule(const char* rule_type, const char* pattern_type, const char* pattern_value);
+int db_remove_auth_rule(const char* rule_type, const char* pattern_type, const char* pattern_value);
+int db_delete_wot_whitelist_rules(void);
+int db_count_wot_whitelist_rules(void);
+
+// Schema/DDL helpers
+int db_table_exists(const char* table_name, int* out_exists);
+char* db_get_schema_version_dup(void);
+int db_exec_sql(const char* sql);
+
+#endif // DB_OPS_H

src/default_config_event.h

@@ -101,8 +101,8 @@ static const struct {
 
     // Idle Connection Ban Settings
     // Ban IPs that connect but never send REQ or EVENT (idle or early disconnect)
-    {"idle_connection_timeout_sec", "30"},  // Seconds before idle connection is closed (0 = disabled)
-    {"idle_ban_enabled", "true"},           // Whether to ban IPs with idle failures
+    {"idle_connection_timeout_sec", "0"},   // Seconds before idle connection is closed (0 = disabled)
+    {"idle_ban_enabled", "false"},          // Whether to ban IPs with idle failures
     {"idle_ban_threshold", "1"},            // Idle failures before ban (1 = ban on first offense)
     {"idle_ban_window_sec", "30"},          // Window to count idle failures in
     {"idle_ban_duration_sec", "300"},       // Initial ban duration (doubles each time, max 24h)

src/dm_admin.c

@@ -5,6 +5,7 @@
 #include "config.h"
 #include "debug.h"
 #include "api.h"
+#include "db_ops.h"
 #include "../nostr_core_lib/nostr_core/nostr_core.h"
 #include "../nostr_core_lib/nostr_core/nip017.h"
 #include "../nostr_core_lib/nostr_core/nip044.h"
@@ -17,9 +18,6 @@
 #include <cjson/cJSON.h>
 #include <libwebsockets.h>
 
-// External database connection (from main.c)
-extern sqlite3* g_db;
-
 // Forward declarations for unified handlers
 extern int handle_auth_query_unified(cJSON* event, const char* query_type, char* error_message, size_t error_size, struct lws* wsi);
 extern int handle_config_query_unified(cJSON* event, const char* query_type, char* error_message, size_t error_size, struct lws* wsi);
@@ -622,8 +620,7 @@ int process_nip17_admin_command(cJSON* dm_event, char* error_message, size_t err
                         update_config_in_table("nip42_auth_required_subscriptions", "false");
                         
                         // Clear wot_whitelist rules
-                        const char* delete_sql = "DELETE FROM auth_rules WHERE rule_type = 'wot_whitelist'";
-                        sqlite3_exec(g_db, delete_sql, NULL, NULL, NULL);
+                        db_delete_wot_whitelist_rules();
                         
                         snprintf(response_msg, sizeof(response_msg),
                             "🔓 Web of Trust Disabled\n"
@@ -695,16 +692,7 @@ int process_nip17_admin_command(cJSON* dm_event, char* error_message, size_t err
                     else if (strcmp(wot_cmd, "status") == 0 || strlen(wot_cmd) == 0) {
                         // Show status
                         // Count whitelisted pubkeys
-                        sqlite3_stmt* stmt;
-                        const char* count_sql = "SELECT COUNT(*) FROM auth_rules WHERE rule_type = 'wot_whitelist' AND active = 1";
-                        int whitelist_count = 0;
-                        
-                        if (sqlite3_prepare_v2(g_db, count_sql, -1, &stmt, NULL) == SQLITE_OK) {
-                            if (sqlite3_step(stmt) == SQLITE_ROW) {
-                                whitelist_count = sqlite3_column_int(stmt, 0);
-                            }
-                            sqlite3_finalize(stmt);
-                        }
+                        int whitelist_count = db_count_wot_whitelist_rules();
                         
                         const char* level_str;
                         if (wot_level == 0) level_str = "Off (open relay)";

src/ip_ban.c

@@ -2,6 +2,7 @@
 #include "ip_ban.h"
 #include "debug.h"
 #include "config.h"
+#include "db_ops.h"
 #include <string.h>
 #include <stdlib.h>
 #include <pthread.h>
@@ -100,8 +101,8 @@ void ip_ban_init(void) {
     DEBUG_LOG("IP ban table initialized (%d slots)", IP_BAN_TABLE_SIZE);
 }
 
-void ip_ban_load_from_db(sqlite3* db) {
-    if (!db || !g_initialized) return;
+void ip_ban_load_from_db(void) {
+    if (!db_is_available() || !g_initialized) return;
 
     // Create table if it doesn't exist (handles existing databases)
     const char* create_sql =
@@ -119,18 +120,16 @@ void ip_ban_load_from_db(sqlite3* db) {
         "  first_seen INTEGER NOT NULL DEFAULT 0,"
         "  updated_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))"
         ");";
-    char* err = NULL;
-    if (sqlite3_exec(db, create_sql, NULL, NULL, &err) != SQLITE_OK) {
-        DEBUG_ERROR("Failed to create ip_bans table: %s", err ? err : "unknown");
-        if (err) sqlite3_free(err);
+    if (db_exec_sql(create_sql) != 0) {
+        DEBUG_ERROR("Failed to create ip_bans table: %s", db_last_error());
         return;
     }
 
     // Migration: Add idle_* columns if they don't exist (ignore errors if already exists)
-    sqlite3_exec(db, "ALTER TABLE ip_bans ADD COLUMN idle_failure_count INTEGER NOT NULL DEFAULT 0", NULL, NULL, NULL);
-    sqlite3_exec(db, "ALTER TABLE ip_bans ADD COLUMN idle_ban_count INTEGER NOT NULL DEFAULT 0", NULL, NULL, NULL);
-    sqlite3_exec(db, "ALTER TABLE ip_bans ADD COLUMN idle_banned_until INTEGER NOT NULL DEFAULT 0", NULL, NULL, NULL);
-    sqlite3_exec(db, "ALTER TABLE ip_bans ADD COLUMN idle_first_failure INTEGER NOT NULL DEFAULT 0", NULL, NULL, NULL);
+    (void)db_exec_sql("ALTER TABLE ip_bans ADD COLUMN idle_failure_count INTEGER NOT NULL DEFAULT 0");
+    (void)db_exec_sql("ALTER TABLE ip_bans ADD COLUMN idle_ban_count INTEGER NOT NULL DEFAULT 0");
+    (void)db_exec_sql("ALTER TABLE ip_bans ADD COLUMN idle_banned_until INTEGER NOT NULL DEFAULT 0");
+    (void)db_exec_sql("ALTER TABLE ip_bans ADD COLUMN idle_first_failure INTEGER NOT NULL DEFAULT 0");
 
     const char* sql =
         "SELECT ip, failure_count, ban_count, banned_until, first_failure,"
@@ -139,16 +138,16 @@ void ip_ban_load_from_db(sqlite3* db) {
         "       idle_failure_count, idle_ban_count, idle_banned_until, idle_first_failure"
         " FROM ip_bans";
 
-    sqlite3_stmt* stmt;
-    if (sqlite3_prepare_v2(db, sql, -1, &stmt, NULL) != SQLITE_OK) {
+    db_stmt_t* stmt;
+    if (db_prepare(sql, &stmt) != DB_OK) {
         DEBUG_ERROR("Failed to prepare ip_bans load query");
         return;
     }
 
     int loaded = 0;
     pthread_mutex_lock(&g_ban_mutex);
-    while (sqlite3_step(stmt) == SQLITE_ROW) {
-        const char* ip = (const char*)sqlite3_column_text(stmt, 0);
+    while (db_step_stmt(stmt) == DB_ROW) {
+        const char* ip = db_column_text_value(stmt, 0);
         if (!ip) continue;
 
         int idx = find_slot(ip);
@@ -158,25 +157,25 @@ void ip_ban_load_from_db(sqlite3* db) {
         entry->state = IP_BAN_ACTIVE;
         strncpy(entry->ip, ip, sizeof(entry->ip) - 1);
         entry->ip[sizeof(entry->ip) - 1] = '\0';
-        entry->failure_count          = sqlite3_column_int(stmt, 1);
-        entry->ban_count              = sqlite3_column_int(stmt, 2);
-        entry->banned_until           = (time_t)sqlite3_column_int64(stmt, 3);
-        entry->first_failure          = (time_t)sqlite3_column_int64(stmt, 4);
-        entry->has_authed_successfully = sqlite3_column_int(stmt, 5);
-        entry->last_success_at        = (time_t)sqlite3_column_int64(stmt, 6);
-        entry->total_connections      = sqlite3_column_int(stmt, 7);
-        entry->total_failures         = sqlite3_column_int(stmt, 8);
-        entry->total_successes        = sqlite3_column_int(stmt, 9);
-        entry->first_seen             = (time_t)sqlite3_column_int64(stmt, 10);
+        entry->failure_count          = db_column_int_value(stmt, 1);
+        entry->ban_count              = db_column_int_value(stmt, 2);
+        entry->banned_until           = (time_t)db_column_int64_value(stmt, 3);
+        entry->first_failure          = (time_t)db_column_int64_value(stmt, 4);
+        entry->has_authed_successfully = db_column_int_value(stmt, 5);
+        entry->last_success_at        = (time_t)db_column_int64_value(stmt, 6);
+        entry->total_connections      = db_column_int_value(stmt, 7);
+        entry->total_failures         = db_column_int_value(stmt, 8);
+        entry->total_successes        = db_column_int_value(stmt, 9);
+        entry->first_seen             = (time_t)db_column_int64_value(stmt, 10);
         // Load idle tracking fields (default to 0 if columns don't exist yet)
-        entry->idle_failure_count     = sqlite3_column_int(stmt, 11);
-        entry->idle_ban_count         = sqlite3_column_int(stmt, 12);
-        entry->idle_banned_until      = (time_t)sqlite3_column_int64(stmt, 13);
-        entry->idle_first_failure     = (time_t)sqlite3_column_int64(stmt, 14);
+        entry->idle_failure_count     = db_column_int_value(stmt, 11);
+        entry->idle_ban_count         = db_column_int_value(stmt, 12);
+        entry->idle_banned_until      = (time_t)db_column_int64_value(stmt, 13);
+        entry->idle_first_failure     = (time_t)db_column_int64_value(stmt, 14);
         loaded++;
     }
     pthread_mutex_unlock(&g_ban_mutex);
-    sqlite3_finalize(stmt);
+    db_finalize_stmt(stmt);
 
     // Count how many are still actively banned
     time_t now = time(NULL);
@@ -193,8 +192,8 @@ void ip_ban_load_from_db(sqlite3* db) {
     DEBUG_WARN("IP ban table loaded: %d IPs restored (%d still banned)", loaded, still_banned);
 }
 
-void ip_ban_save_to_db(sqlite3* db) {
-    if (!db || !g_initialized) return;
+void ip_ban_save_to_db(void) {
+    if (!db_is_available() || !g_initialized) return;
 
     const char* upsert_sql =
         "INSERT OR REPLACE INTO ip_bans"
@@ -204,13 +203,13 @@ void ip_ban_save_to_db(sqlite3* db) {
         "  idle_failure_count, idle_ban_count, idle_banned_until, idle_first_failure)"
         " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, strftime('%s', 'now'), ?, ?, ?, ?)";
 
-    sqlite3_stmt* stmt;
-    if (sqlite3_prepare_v2(db, upsert_sql, -1, &stmt, NULL) != SQLITE_OK) {
+    db_stmt_t* stmt;
+    if (db_prepare(upsert_sql, &stmt) != DB_OK) {
         DEBUG_ERROR("Failed to prepare ip_bans save query");
         return;
     }
 
-    sqlite3_exec(db, "BEGIN TRANSACTION", NULL, NULL, NULL);
+    (void)db_exec_sql("BEGIN TRANSACTION");
 
     int saved = 0;
     pthread_mutex_lock(&g_ban_mutex);
@@ -218,25 +217,25 @@ void ip_ban_save_to_db(sqlite3* db) {
         ip_ban_entry_t* entry = &g_ban_table[i];
         if (entry->state != IP_BAN_ACTIVE) continue;
 
-        sqlite3_reset(stmt);
-        sqlite3_bind_text(stmt, 1, entry->ip, -1, SQLITE_STATIC);
-        sqlite3_bind_int(stmt, 2, entry->failure_count);
-        sqlite3_bind_int(stmt, 3, entry->ban_count);
-        sqlite3_bind_int64(stmt, 4, (sqlite3_int64)entry->banned_until);
-        sqlite3_bind_int64(stmt, 5, (sqlite3_int64)entry->first_failure);
-        sqlite3_bind_int(stmt, 6, entry->has_authed_successfully);
-        sqlite3_bind_int64(stmt, 7, (sqlite3_int64)entry->last_success_at);
-        sqlite3_bind_int(stmt, 8, entry->total_connections);
-        sqlite3_bind_int(stmt, 9, entry->total_failures);
-        sqlite3_bind_int(stmt, 10, entry->total_successes);
-        sqlite3_bind_int64(stmt, 11, (sqlite3_int64)entry->first_seen);
+        (void)db_reset_stmt(stmt);
+        db_bind_text_param(stmt, 1, entry->ip);
+        db_bind_int_param(stmt, 2, entry->failure_count);
+        db_bind_int_param(stmt, 3, entry->ban_count);
+        db_bind_int64_param(stmt, 4, (long long)entry->banned_until);
+        db_bind_int64_param(stmt, 5, (long long)entry->first_failure);
+        db_bind_int_param(stmt, 6, entry->has_authed_successfully);
+        db_bind_int64_param(stmt, 7, (long long)entry->last_success_at);
+        db_bind_int_param(stmt, 8, entry->total_connections);
+        db_bind_int_param(stmt, 9, entry->total_failures);
+        db_bind_int_param(stmt, 10, entry->total_successes);
+        db_bind_int64_param(stmt, 11, (long long)entry->first_seen);
         // Idle tracking fields
-        sqlite3_bind_int(stmt, 12, entry->idle_failure_count);
-        sqlite3_bind_int(stmt, 13, entry->idle_ban_count);
-        sqlite3_bind_int64(stmt, 14, (sqlite3_int64)entry->idle_banned_until);
-        sqlite3_bind_int64(stmt, 15, (sqlite3_int64)entry->idle_first_failure);
+        db_bind_int_param(stmt, 12, entry->idle_failure_count);
+        db_bind_int_param(stmt, 13, entry->idle_ban_count);
+        db_bind_int64_param(stmt, 14, (long long)entry->idle_banned_until);
+        db_bind_int64_param(stmt, 15, (long long)entry->idle_first_failure);
 
-        if (sqlite3_step(stmt) != SQLITE_DONE) {
+        if (db_step_stmt(stmt) != DB_DONE) {
             DEBUG_WARN("Failed to save ip_ban entry for %s", entry->ip);
         } else {
             saved++;
@@ -244,8 +243,8 @@ void ip_ban_save_to_db(sqlite3* db) {
     }
     pthread_mutex_unlock(&g_ban_mutex);
 
-    sqlite3_finalize(stmt);
-    sqlite3_exec(db, "COMMIT", NULL, NULL, NULL);
+    db_finalize_stmt(stmt);
+    (void)db_exec_sql("COMMIT");
 
     DEBUG_TRACE("IP ban table saved: %d entries written to DB", saved);
 }
@@ -253,23 +252,32 @@ void ip_ban_save_to_db(sqlite3* db) {
 // Check if an IP is in the idle_ban_whitelist config (comma-separated list)
 static int ip_is_whitelisted(const char* ip) {
     const char* whitelist = get_config_value("idle_ban_whitelist");
-    if (!whitelist || whitelist[0] == '\0') return 0;
+    if (!whitelist || whitelist[0] == '\0') {
+        if (whitelist) free((char*)whitelist);
+        return 0;
+    }
 
     // Make a mutable copy to tokenize
     char buf[1024];
     strncpy(buf, whitelist, sizeof(buf) - 1);
     buf[sizeof(buf) - 1] = '\0';
 
+    int is_match = 0;
     char* token = strtok(buf, ",");
     while (token) {
         // Trim leading/trailing spaces
         while (*token == ' ') token++;
         char* end = token + strlen(token) - 1;
         while (end > token && *end == ' ') { *end = '\0'; end--; }
-        if (strcmp(token, ip) == 0) return 1;
+        if (strcmp(token, ip) == 0) {
+            is_match = 1;
+            break;
+        }
         token = strtok(NULL, ",");
     }
-    return 0;
+
+    free((char*)whitelist);
+    return is_match;
 }
 
 int ip_ban_is_banned(const char* ip) {
@@ -538,7 +546,7 @@ int ip_ban_get_tracked_count(void) {
     return count;
 }
 
-void ip_ban_log_stats(sqlite3* db) {
+void ip_ban_log_stats(void) {
     if (!g_initialized) return;
 
     static time_t last_log = 0;
@@ -548,9 +556,7 @@ void ip_ban_log_stats(sqlite3* db) {
     last_log = now;
 
     // Save to DB every 5 minutes
-    if (db) {
-        ip_ban_save_to_db(db);
-    }
+    ip_ban_save_to_db();
 
     pthread_mutex_lock(&g_ban_mutex);
     int auth_banned_count = 0;

src/ip_ban.h

@@ -15,7 +15,6 @@
 //   auth_fail_ban_duration_sec int   default: 300     (initial ban duration, doubles each time)
 
 #include <time.h>
-#include <sqlite3.h>
 
 // Maximum number of IPs tracked simultaneously (fixed-size, no malloc)
 #define IP_BAN_TABLE_SIZE 4096
@@ -25,11 +24,11 @@ void ip_ban_init(void);
 
 // Load ban state from the ip_bans database table.
 // Call after ip_ban_init() and after the database is open.
-void ip_ban_load_from_db(sqlite3* db);
+void ip_ban_load_from_db(void);
 
 // Save current ban state to the ip_bans database table.
 // Called every 5 minutes from the maintenance timer.
-void ip_ban_save_to_db(sqlite3* db);
+void ip_ban_save_to_db(void);
 
 // Check if an IP is currently banned.
 // Returns 1 if banned (connection should be rejected), 0 if allowed.
@@ -57,7 +56,7 @@ void ip_ban_cleanup(void);
 
 // Emit a periodic WARN-level log summary of banned IPs (every 5 minutes).
 // Also saves state to DB.
-void ip_ban_log_stats(sqlite3* db);
+void ip_ban_log_stats(void);
 
 // Get stats for logging/monitoring
 int ip_ban_get_banned_count(void);

src/main.c

@@ -26,6 +26,8 @@
 #include "websockets.h"  // WebSocket protocol implementation
 #include "subscriptions.h"  // Subscription management system
 #include "debug.h"  // Debug system
+#include "thread_pool.h"  // Thread pool scaffold
+#include "db_ops.h"
 
 // Forward declarations for unified request validator
 int nostr_validate_unified_request(const char* json_string, size_t json_length);
@@ -162,9 +164,12 @@ int handle_nip11_http_request(struct lws* wsi, const char* accept_header);
 // Forward declaration for WebSocket relay server
 int start_websocket_relay(int port_override, int strict_port);
 
+// Thread pool wake callback (called by worker threads)
+static void wake_event_loop_from_thread_pool(void* ctx);
+
 // Forward declarations for IP ban system
 void ip_ban_init(void);
-void ip_ban_load_from_db(sqlite3* db);
+void ip_ban_load_from_db(void);
 
 
 // Forward declarations for NIP-13 PoW handling (now in nip013.c)
@@ -186,6 +191,53 @@ int validate_event_expiration(cJSON* event, char* error_message, size_t error_si
 
 // Logging functions - REMOVED (replaced by debug system in debug.c)
 
+static void nostr_log_cb(int level, const char* component, const char* message, void* user_data) {
+    (void)user_data;
+
+    const char* comp = (component && component[0]) ? component : "core";
+    const char* msg = message ? message : "";
+
+    switch (level) {
+        case NOSTR_LOG_LEVEL_ERROR:
+            DEBUG_ERROR("[nostr:%s] %s", comp, msg);
+            break;
+        case NOSTR_LOG_LEVEL_WARN:
+            DEBUG_WARN("[nostr:%s] %s", comp, msg);
+            break;
+        case NOSTR_LOG_LEVEL_INFO:
+            DEBUG_INFO("[nostr:%s] %s", comp, msg);
+            break;
+        case NOSTR_LOG_LEVEL_DEBUG:
+            DEBUG_LOG("[nostr:%s] %s", comp, msg);
+            break;
+        case NOSTR_LOG_LEVEL_TRACE:
+        default:
+            DEBUG_TRACE("[nostr:%s] %s", comp, msg);
+            break;
+    }
+}
+
+static nostr_log_level_t nostr_log_level_from_debug_level(int debug_level) {
+    if (debug_level >= DEBUG_LEVEL_TRACE) {
+        return NOSTR_LOG_LEVEL_TRACE;
+    }
+    if (debug_level >= DEBUG_LEVEL_DEBUG) {
+        return NOSTR_LOG_LEVEL_DEBUG;
+    }
+    if (debug_level >= DEBUG_LEVEL_INFO) {
+        return NOSTR_LOG_LEVEL_INFO;
+    }
+    if (debug_level >= DEBUG_LEVEL_WARN) {
+        return NOSTR_LOG_LEVEL_WARN;
+    }
+    if (debug_level >= DEBUG_LEVEL_ERROR) {
+        return NOSTR_LOG_LEVEL_ERROR;
+    }
+
+    // Production-safe default for systemd/journald deployments.
+    return NOSTR_LOG_LEVEL_INFO;
+}
+
 // Update subscription manager configuration from config system
 void update_subscription_manager_config(void) {
     g_subscription_manager.max_subscriptions_per_client = get_config_int("max_subscriptions_per_client", MAX_SUBSCRIPTIONS_PER_CLIENT);
@@ -205,6 +257,13 @@ void signal_handler(int sig) {
     }
 }
 
+static void wake_event_loop_from_thread_pool(void* ctx) {
+    (void)ctx;
+    if (ws_context) {
+        lws_cancel_service(ws_context);
+    }
+}
+
 /////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////
 //             NOTICE MESSAGE SUPPORT
@@ -367,7 +426,7 @@ int init_database(const char* database_path_override) {
     cleanup_stale_wal_files(db_path);
 
     int rc = sqlite3_open(db_path, &g_db);
-    if (rc != SQLITE_OK) {
+    if (rc != DB_OK) {
         DEBUG_ERROR("Cannot open database");
         DEBUG_TRACE("Exiting init_database() - failed to open database");
         return -1;
@@ -376,99 +435,51 @@ int init_database(const char* database_path_override) {
     // DEBUG_GUARD_START
     if (g_debug_level >= DEBUG_LEVEL_DEBUG) {
         // Check config table row count immediately after database open
-        sqlite3_stmt* stmt;
-        int rc = sqlite3_prepare_v2(g_db, "SELECT COUNT(*) FROM config", -1, &stmt, NULL);
-        if (rc == SQLITE_OK) {
-            if (sqlite3_step(stmt) == SQLITE_ROW) {
-                int row_count = sqlite3_column_int(stmt, 0);
-                DEBUG_LOG("Config table row count immediately after sqlite3_open(): %d", row_count);
-            }
-            sqlite3_finalize(stmt);
+        int row_count = 0;
+        if (db_get_config_row_count(&row_count) == 0) {
+            DEBUG_LOG("Config table row count immediately after sqlite3_open(): %d", row_count);
         } else {
-            // Capture and log the actual SQLite error instead of assuming table doesn't exist
-            const char* err_msg = sqlite3_errmsg(g_db);
-            DEBUG_LOG("Failed to prepare config table query: %s (error code: %d)", err_msg, rc);
-
-            // Check if it's actually a missing table vs other error
-            if (rc == SQLITE_ERROR) {
-                // Try to check if config table exists
-                sqlite3_stmt* check_stmt;
-                int check_rc = sqlite3_prepare_v2(g_db, "SELECT name FROM sqlite_master WHERE type='table' AND name='config'", -1, &check_stmt, NULL);
-                if (check_rc == SQLITE_OK) {
-                    int has_table = (sqlite3_step(check_stmt) == SQLITE_ROW);
-                    sqlite3_finalize(check_stmt);
-                    if (has_table) {
-                        DEBUG_LOG("Config table EXISTS but query failed - possible database corruption or locking issue");
-                    } else {
-                        DEBUG_LOG("Config table does not exist yet (first-time startup)");
-                    }
-                } else {
-                    DEBUG_LOG("Failed to check table existence: %s (error code: %d)", sqlite3_errmsg(g_db), check_rc);
-                }
-            }
+            DEBUG_LOG("Config table count unavailable immediately after sqlite3_open() (table may not exist yet)");
         }
     }
     // DEBUG_GUARD_END
     
     // Check if database is already initialized by looking for the events table
-    const char* check_sql = "SELECT name FROM sqlite_master WHERE type='table' AND name='events'";
-    sqlite3_stmt* check_stmt;
-    rc = sqlite3_prepare_v2(g_db, check_sql, -1, &check_stmt, NULL);
-    if (rc == SQLITE_OK) {
-        int has_events_table = (sqlite3_step(check_stmt) == SQLITE_ROW);
-        sqlite3_finalize(check_stmt);
+    int has_events_table = 0;
+    if (db_table_exists("events", &has_events_table) == 0) {
         
         if (has_events_table) {
             // Check existing schema version and migrate if needed
-            const char* version_sql = "SELECT value FROM schema_info WHERE key = 'version'";
-            sqlite3_stmt* version_stmt;
-            const char* db_version = NULL;
+            char* db_version = db_get_schema_version_dup();
             int needs_migration = 0;
 
-            if (sqlite3_prepare_v2(g_db, version_sql, -1, &version_stmt, NULL) == SQLITE_OK) {
-                if (sqlite3_step(version_stmt) == SQLITE_ROW) {
-                    db_version = (char*)sqlite3_column_text(version_stmt, 0);
-
-                    // Check if migration is needed
-                    if (!db_version || strcmp(db_version, "5") == 0) {
-                        needs_migration = 1;
-                    } else if (strcmp(db_version, "6") == 0) {
-                        // Database is at schema version v6 (compatible)
-                    } else if (strcmp(db_version, "7") == 0) {
-                        // Database is at schema version v7 (compatible)
-                    } else if (strcmp(db_version, "8") == 0) {
-                        // Database is at schema version v8 (compatible)
-                    } else if (strcmp(db_version, "9") == 0) {
-                        // Database is at schema version v9 (compatible)
-                    } else if (strcmp(db_version, "10") == 0) {
-                        // Database is at schema version v10 (compatible)
-                    } else if (strcmp(db_version, EMBEDDED_SCHEMA_VERSION) == 0) {
-                        // Database is at current schema version
-                    } else {
-                        char warning_msg[256];
-                        snprintf(warning_msg, sizeof(warning_msg), "Unknown database schema version: %s (expected %s)",
-                                 db_version, EMBEDDED_SCHEMA_VERSION);
-                        DEBUG_WARN(warning_msg);
-                    }
-                } else {
-                    needs_migration = 1;
-                }
-                sqlite3_finalize(version_stmt);
-            } else {
+            // Check if migration is needed
+            if (!db_version || strcmp(db_version, "5") == 0) {
                 needs_migration = 1;
+            } else if (strcmp(db_version, "6") == 0) {
+                // Database is at schema version v6 (compatible)
+            } else if (strcmp(db_version, "7") == 0) {
+                // Database is at schema version v7 (compatible)
+            } else if (strcmp(db_version, "8") == 0) {
+                // Database is at schema version v8 (compatible)
+            } else if (strcmp(db_version, "9") == 0) {
+                // Database is at schema version v9 (compatible)
+            } else if (strcmp(db_version, "10") == 0) {
+                // Database is at schema version v10 (compatible)
+            } else if (strcmp(db_version, EMBEDDED_SCHEMA_VERSION) == 0) {
+                // Database is at current schema version
+            } else {
+                char warning_msg[256];
+                snprintf(warning_msg, sizeof(warning_msg), "Unknown database schema version: %s (expected %s)",
+                         db_version, EMBEDDED_SCHEMA_VERSION);
+                DEBUG_WARN(warning_msg);
             }
             
             // Perform migration if needed
             if (needs_migration) {
                 // Check if auth_rules table already exists
-                const char* check_auth_rules_sql = "SELECT name FROM sqlite_master WHERE type='table' AND name='auth_rules'";
-                sqlite3_stmt* check_stmt;
                 int has_auth_rules = 0;
-
-                if (sqlite3_prepare_v2(g_db, check_auth_rules_sql, -1, &check_stmt, NULL) == SQLITE_OK) {
-                    has_auth_rules = (sqlite3_step(check_stmt) == SQLITE_ROW);
-                    sqlite3_finalize(check_stmt);
-                }
+                (void)db_table_exists("auth_rules", &has_auth_rules);
 
                 if (!has_auth_rules) {
                     // Add auth_rules table matching sql_schema.h
@@ -485,14 +496,9 @@ int init_database(const char* database_path_override) {
                         "    updated_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))"
                         ");";
                     
-                    char* error_msg = NULL;
-                    int rc = sqlite3_exec(g_db, create_auth_rules_sql, NULL, NULL, &error_msg);
-                    if (rc != SQLITE_OK) {
-                        char error_log[512];
-                        snprintf(error_log, sizeof(error_log), "Failed to create auth_rules table: %s",
-                                 error_msg ? error_msg : "unknown error");
-                        DEBUG_ERROR(error_log);
-                        if (error_msg) sqlite3_free(error_msg);
+                    if (db_exec_sql(create_auth_rules_sql) != 0) {
+                        DEBUG_ERROR("Failed to create auth_rules table");
+                        if (db_version) free(db_version);
                         return -1;
                     }
 
@@ -502,14 +508,9 @@ int init_database(const char* database_path_override) {
                         "CREATE INDEX IF NOT EXISTS idx_auth_rules_type ON auth_rules(rule_type);"
                         "CREATE INDEX IF NOT EXISTS idx_auth_rules_active ON auth_rules(active);";
 
-                    char* index_error_msg = NULL;
-                    int index_rc = sqlite3_exec(g_db, create_auth_rules_indexes_sql, NULL, NULL, &index_error_msg);
-                    if (index_rc != SQLITE_OK) {
-                        char index_error_log[512];
-                        snprintf(index_error_log, sizeof(index_error_log), "Failed to create auth_rules indexes: %s",
-                                 index_error_msg ? index_error_msg : "unknown error");
-                        DEBUG_ERROR(index_error_log);
-                        if (index_error_msg) sqlite3_free(index_error_msg);
+                    if (db_exec_sql(create_auth_rules_indexes_sql) != 0) {
+                        DEBUG_ERROR("Failed to create auth_rules indexes");
+                        if (db_version) free(db_version);
                         return -1;
                     }
                 } else {
@@ -521,32 +522,24 @@ int init_database(const char* database_path_override) {
                     "INSERT OR REPLACE INTO schema_info (key, value, updated_at) "
                     "VALUES ('version', '6', strftime('%s', 'now'))";
                 
-                char* error_msg = NULL;
-                int rc = sqlite3_exec(g_db, update_version_sql, NULL, NULL, &error_msg);
-                if (rc != SQLITE_OK) {
-                    char error_log[512];
-                    snprintf(error_log, sizeof(error_log), "Failed to update schema version: %s",
-                             error_msg ? error_msg : "unknown error");
-                    DEBUG_ERROR(error_log);
-                    if (error_msg) sqlite3_free(error_msg);
+                if (db_exec_sql(update_version_sql) != 0) {
+                    DEBUG_ERROR("Failed to update schema version");
+                    if (db_version) free(db_version);
                     return -1;
                 }
                 
+                if (db_version) {
+                    free(db_version);
+                }
+            } else if (db_version) {
+                free(db_version);
             }
         } else {
             // Initialize database schema using embedded SQL
 
             // Execute the embedded schema SQL
-            char* error_msg = NULL;
-            rc = sqlite3_exec(g_db, EMBEDDED_SCHEMA_SQL, NULL, NULL, &error_msg);
-            if (rc != SQLITE_OK) {
-                char error_log[512];
-                snprintf(error_log, sizeof(error_log), "Failed to initialize database schema: %s",
-                         error_msg ? error_msg : "unknown error");
-                DEBUG_ERROR(error_log);
-                if (error_msg) {
-                    sqlite3_free(error_msg);
-                }
+            if (db_exec_sql(EMBEDDED_SCHEMA_SQL) != 0) {
+                DEBUG_ERROR("Failed to initialize database schema");
                 return -1;
             }
             
@@ -557,14 +550,8 @@ int init_database(const char* database_path_override) {
     }
     
     // Enable WAL mode for better concurrency and crash recovery
-    char* wal_error = NULL;
-    rc = sqlite3_exec(g_db, "PRAGMA journal_mode=WAL;", NULL, NULL, &wal_error);
-    if (rc != SQLITE_OK) {
-        char error_msg[256];
-        snprintf(error_msg, sizeof(error_msg), "Failed to enable WAL mode: %s",
-                  wal_error ? wal_error : "unknown error");
-        DEBUG_WARN(error_msg);
-        if (wal_error) sqlite3_free(wal_error);
+    if (db_exec_sql("PRAGMA journal_mode=WAL;") != 0) {
+        DEBUG_WARN("Failed to enable WAL mode");
         // Continue anyway - WAL mode is optional
     } else {
         DEBUG_LOG("SQLite WAL mode enabled");
@@ -577,11 +564,8 @@ int init_database(const char* database_path_override) {
     if (mmap_size > 0) {
         char mmap_pragma[64];
         snprintf(mmap_pragma, sizeof(mmap_pragma), "PRAGMA mmap_size=%ld;", mmap_size);
-        char* mmap_error = NULL;
-        rc = sqlite3_exec(g_db, mmap_pragma, NULL, NULL, &mmap_error);
-        if (rc != SQLITE_OK) {
-            DEBUG_WARN("Failed to set mmap_size: %s", mmap_error ? mmap_error : "unknown");
-            if (mmap_error) sqlite3_free(mmap_error);
+        if (db_exec_sql(mmap_pragma) != 0) {
+            DEBUG_WARN("Failed to set mmap_size");
         } else {
             DEBUG_LOG("SQLite mmap_size set to %ld bytes", mmap_size);
         }
@@ -594,11 +578,8 @@ int init_database(const char* database_path_override) {
         char cache_pragma[64];
         // Use negative value so SQLite interprets it as KB rather than page count
         snprintf(cache_pragma, sizeof(cache_pragma), "PRAGMA cache_size=-%d;", cache_size_kb > 0 ? cache_size_kb : -cache_size_kb);
-        char* cache_error = NULL;
-        rc = sqlite3_exec(g_db, cache_pragma, NULL, NULL, &cache_error);
-        if (rc != SQLITE_OK) {
-            DEBUG_WARN("Failed to set cache_size: %s", cache_error ? cache_error : "unknown");
-            if (cache_error) sqlite3_free(cache_error);
+        if (db_exec_sql(cache_pragma) != 0) {
+            DEBUG_WARN("Failed to set cache_size");
         } else {
             DEBUG_LOG("SQLite cache_size set to %d KB", cache_size_kb);
         }
@@ -615,14 +596,8 @@ void close_database() {
     if (g_db) {
         // Perform WAL checkpoint to minimize stale files on next startup
         DEBUG_LOG("Performing WAL checkpoint before database close");
-        char* checkpoint_error = NULL;
-        int rc = sqlite3_exec(g_db, "PRAGMA wal_checkpoint(TRUNCATE);", NULL, NULL, &checkpoint_error);
-        if (rc != SQLITE_OK) {
-            char error_msg[256];
-            snprintf(error_msg, sizeof(error_msg), "WAL checkpoint warning: %s",
-                      checkpoint_error ? checkpoint_error : "unknown error");
-            DEBUG_WARN(error_msg);
-            if (checkpoint_error) sqlite3_free(checkpoint_error);
+        if (db_exec_sql("PRAGMA wal_checkpoint(TRUNCATE);") != 0) {
+            DEBUG_WARN("WAL checkpoint warning");
         }
 
         sqlite3_close(g_db);
@@ -697,43 +672,7 @@ const char* extract_d_tag_value(cJSON* tags) {
 
 // Insert denormalized tags into event_tags table for fast indexed lookups
 int store_event_tags(const char* event_id, cJSON* tags) {
-    if (!g_db || !event_id || !tags || !cJSON_IsArray(tags)) {
-        return 0; // Not an error if no tags
-    }
-
-    const char* sql = "INSERT INTO event_tags (event_id, tag_name, tag_value, tag_index) VALUES (?, ?, ?, ?)";
-    sqlite3_stmt* stmt;
-    int rc = sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL);
-    if (rc != SQLITE_OK) {
-        DEBUG_ERROR("Failed to prepare event_tags insert: %s", sqlite3_errmsg(g_db));
-        return -1;
-    }
-
-    int tag_index = 0;
-    cJSON* tag = NULL;
-    cJSON_ArrayForEach(tag, tags) {
-        if (cJSON_IsArray(tag) && cJSON_GetArraySize(tag) >= 2) {
-            cJSON* name = cJSON_GetArrayItem(tag, 0);
-            cJSON* value = cJSON_GetArrayItem(tag, 1);
-
-            if (cJSON_IsString(name) && cJSON_IsString(value)) {
-                sqlite3_reset(stmt);
-                sqlite3_bind_text(stmt, 1, event_id, -1, SQLITE_STATIC);
-                sqlite3_bind_text(stmt, 2, cJSON_GetStringValue(name), -1, SQLITE_STATIC);
-                sqlite3_bind_text(stmt, 3, cJSON_GetStringValue(value), -1, SQLITE_STATIC);
-                sqlite3_bind_int(stmt, 4, tag_index);
-
-                rc = sqlite3_step(stmt);
-                if (rc != SQLITE_DONE) {
-                    DEBUG_ERROR("Failed to insert event tag: %s", sqlite3_errmsg(g_db));
-                }
-            }
-        }
-        tag_index++;
-    }
-
-    sqlite3_finalize(stmt);
-    return 0;
+    return db_store_event_tags_cjson(event_id, tags);
 }
 
 // Store event in database
@@ -787,43 +726,39 @@ int store_event(cJSON* event) {
         return -1;
     }
     
-    // Prepare SQL statement for event insertion
-    const char* sql =
-        "INSERT INTO events (id, pubkey, created_at, kind, event_type, content, sig, tags, event_json) "
-        "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
-    
-    sqlite3_stmt* stmt;
-    int rc = sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL);
-    if (rc != SQLITE_OK) {
-        DEBUG_ERROR("Failed to prepare event insert statement");
+    thread_pool_store_event_payload_t payload;
+    memset(&payload, 0, sizeof(payload));
+    payload.id = (char*)cJSON_GetStringValue(id);
+    payload.pubkey = (char*)cJSON_GetStringValue(pubkey);
+    payload.created_at = (long long)cJSON_GetNumberValue(created_at);
+    payload.kind = (int)cJSON_GetNumberValue(kind);
+    payload.event_type = (char*)event_type_to_string(type);
+    payload.content = (char*)cJSON_GetStringValue(content);
+    payload.sig = (char*)cJSON_GetStringValue(sig);
+    payload.tags_json = tags_json;
+    payload.event_json = event_json;
+
+    thread_pool_store_event_result_t tp_result;
+    memset(&tp_result, 0, sizeof(tp_result));
+    if (thread_pool_execute_store_event_sync(&payload, &tp_result) != 0) {
+        DEBUG_ERROR("Failed to execute event insert operation");
         free(tags_json);
+        free(event_json);
         return -1;
     }
-    
-    // Bind parameters
-    sqlite3_bind_text(stmt, 1, cJSON_GetStringValue(id), -1, SQLITE_STATIC);
-    sqlite3_bind_text(stmt, 2, cJSON_GetStringValue(pubkey), -1, SQLITE_STATIC);
-    sqlite3_bind_int64(stmt, 3, (sqlite3_int64)cJSON_GetNumberValue(created_at));
-    sqlite3_bind_int(stmt, 4, (int)cJSON_GetNumberValue(kind));
-    sqlite3_bind_text(stmt, 5, event_type_to_string(type), -1, SQLITE_STATIC);
-    sqlite3_bind_text(stmt, 6, cJSON_GetStringValue(content), -1, SQLITE_STATIC);
-    sqlite3_bind_text(stmt, 7, cJSON_GetStringValue(sig), -1, SQLITE_STATIC);
-    sqlite3_bind_text(stmt, 8, tags_json, -1, SQLITE_TRANSIENT);
-    sqlite3_bind_text(stmt, 9, event_json, -1, SQLITE_TRANSIENT);
-    
-    // Execute statement
-    rc = sqlite3_step(stmt);
-    if (rc != SQLITE_DONE) {
-        const char* err_msg = sqlite3_errmsg(g_db);
-        int extended_errcode = sqlite3_extended_errcode(g_db);
-        if (rc != SQLITE_CONSTRAINT) {
+
+    int rc = tp_result.step_rc;
+    int extended_errcode = tp_result.extended_errcode;
+
+    if (rc != DB_DONE) {
+        const char* err_msg = db_last_error();
+        if (rc != DB_CONSTRAINT) {
             DEBUG_ERROR("INSERT failed: rc=%d, extended_errcode=%d, msg=%s", rc, extended_errcode, err_msg);
         }
     }
-    sqlite3_finalize(stmt);
     
-    if (rc != SQLITE_DONE) {
-        if (rc == SQLITE_CONSTRAINT) {
+    if (rc != DB_DONE) {
+        if (rc == DB_CONSTRAINT) {
             DEBUG_WARN("Event already exists in database");
 
             // Add TRACE level debug to show both events
@@ -850,7 +785,7 @@ int store_event(cJSON* event) {
             return 0; // Not an error, just duplicate
         }
         char error_msg[256];
-        snprintf(error_msg, sizeof(error_msg), "Failed to insert event: %s", sqlite3_errmsg(g_db));
+        snprintf(error_msg, sizeof(error_msg), "Failed to insert event: %s", db_last_error());
         DEBUG_ERROR(error_msg);
         free(tags_json);
         free(event_json);
@@ -891,60 +826,16 @@ int store_event(cJSON* event) {
 int event_id_exists_in_db(const char* event_id) {
     if (!g_db || !event_id || strlen(event_id) != 64) return 0;
 
-    sqlite3_stmt* stmt;
-    const char* sql = "SELECT 1 FROM events WHERE id=? LIMIT 1";
-    if (sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL) != SQLITE_OK) return 0;
-
-    sqlite3_bind_text(stmt, 1, event_id, 64, SQLITE_STATIC);
-    int exists = (sqlite3_step(stmt) == SQLITE_ROW) ? 1 : 0;
-    sqlite3_finalize(stmt);
+    int exists = 0;
+    if (db_event_id_exists(event_id, &exists) != 0) {
+        return 0;
+    }
     return exists;
 }
 
 // Populate event_tags from existing events (run once at startup)
 int populate_event_tags_from_existing(void) {
-    if (!g_db) return -1;
-
-    // Check if event_tags is already populated
-    sqlite3_stmt* check_stmt;
-    sqlite3_prepare_v2(g_db, "SELECT COUNT(*) FROM event_tags", -1, &check_stmt, NULL);
-    if (sqlite3_step(check_stmt) == SQLITE_ROW && sqlite3_column_int(check_stmt, 0) > 0) {
-        sqlite3_finalize(check_stmt);
-        DEBUG_INFO("event_tags already populated, skipping");
-        return 0;
-    }
-    sqlite3_finalize(check_stmt);
-
-    DEBUG_INFO("Populating event_tags from existing events...");
-
-    const char* sql = "SELECT id, tags FROM events WHERE tags != '[]'";
-    sqlite3_stmt* stmt;
-    int rc = sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL);
-    if (rc != SQLITE_OK) return -1;
-
-    // Use a transaction for bulk insert performance
-    sqlite3_exec(g_db, "BEGIN TRANSACTION", NULL, NULL, NULL);
-
-    int event_count = 0;
-    while (sqlite3_step(stmt) == SQLITE_ROW) {
-        const char* event_id = (const char*)sqlite3_column_text(stmt, 0);
-        const char* tags_json = (const char*)sqlite3_column_text(stmt, 1);
-
-        if (event_id && tags_json) {
-            cJSON* tags = cJSON_Parse(tags_json);
-            if (tags) {
-                store_event_tags(event_id, tags);
-                cJSON_Delete(tags);
-                event_count++;
-            }
-        }
-    }
-
-    sqlite3_finalize(stmt);
-    sqlite3_exec(g_db, "COMMIT", NULL, NULL, NULL);
-
-    DEBUG_INFO("Populated event_tags for %d events", event_count);
-    return 0;
+    return db_populate_event_tags_from_existing();
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -954,48 +845,7 @@ int populate_event_tags_from_existing(void) {
 /////////////////////////////////////////////////////////////////////////////////////////
 
 cJSON* retrieve_event(const char* event_id) {
-    if (!g_db || !event_id) {
-        return NULL;
-    }
-    
-    const char* sql =
-        "SELECT id, pubkey, created_at, kind, content, sig, tags FROM events WHERE id = ?";
-    
-    sqlite3_stmt* stmt;
-    int rc = sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL);
-    if (rc != SQLITE_OK) {
-        return NULL;
-    }
-    
-    sqlite3_bind_text(stmt, 1, event_id, -1, SQLITE_STATIC);
-    
-    cJSON* event = NULL;
-    if (sqlite3_step(stmt) == SQLITE_ROW) {
-        event = cJSON_CreateObject();
-        
-        cJSON_AddStringToObject(event, "id", (char*)sqlite3_column_text(stmt, 0));
-        cJSON_AddStringToObject(event, "pubkey", (char*)sqlite3_column_text(stmt, 1));
-        cJSON_AddNumberToObject(event, "created_at", sqlite3_column_int64(stmt, 2));
-        cJSON_AddNumberToObject(event, "kind", sqlite3_column_int(stmt, 3));
-        cJSON_AddStringToObject(event, "content", (char*)sqlite3_column_text(stmt, 4));
-        cJSON_AddStringToObject(event, "sig", (char*)sqlite3_column_text(stmt, 5));
-        
-        // Parse tags JSON
-        const char* tags_json = (char*)sqlite3_column_text(stmt, 6);
-        if (tags_json) {
-            cJSON* tags = cJSON_Parse(tags_json);
-            if (tags) {
-                cJSON_AddItemToObject(event, "tags", tags);
-            } else {
-                cJSON_AddItemToObject(event, "tags", cJSON_CreateArray());
-            }
-        } else {
-            cJSON_AddItemToObject(event, "tags", cJSON_CreateArray());
-        }
-    }
-    
-    sqlite3_finalize(stmt);
-    return event;
+    return db_retrieve_event_by_id(event_id);
 }
 
 
@@ -1260,6 +1110,13 @@ int handle_req_message(const char* sub_id, cJSON* filters, struct lws *wsi, stru
             continue;
         }
 
+        // NIP-01: limit:0 means return zero stored events — skip SQL entirely, just send EOSE
+        cJSON* limit_check = cJSON_GetObjectItemCaseSensitive(filter, "limit");
+        if (limit_check && cJSON_IsNumber(limit_check) && (int)cJSON_GetNumberValue(limit_check) == 0) {
+            DEBUG_LOG("Filter has limit:0 — skipping query, sending EOSE immediately (NIP-01 compliance)");
+            continue;
+        }
+
         // Reset bind params for this filter
         free_bind_params(bind_params, bind_param_count);
         bind_params = NULL;
@@ -1498,14 +1355,13 @@ int handle_req_message(const char* sub_id, cJSON* filters, struct lws *wsi, stru
         struct timespec query_start, query_end;
         clock_gettime(CLOCK_MONOTONIC, &query_start);
         
-        // Execute query and send events
-        sqlite3_stmt* stmt;
-        int rc = sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL);
-        if (rc != SQLITE_OK) {
+        // Execute query through db thread pool helper and send events
+        thread_pool_req_result_t* req_result = NULL;
+        if (thread_pool_execute_req_sync(sql, (const char**)bind_params, bind_param_count, 5000, &req_result) != 0 || !req_result) {
             char error_msg[256];
-            snprintf(error_msg, sizeof(error_msg), "Failed to prepare subscription query: %s", sqlite3_errmsg(g_db));
+            snprintf(error_msg, sizeof(error_msg), "Failed to execute subscription query: %s", db_last_error());
             DEBUG_ERROR(error_msg);
-            
+
             // Log the failed query so we can see what SQL was generated
             if (g_debug_level >= DEBUG_LEVEL_DEBUG) {
                 time_t now = time(NULL);
@@ -1516,11 +1372,11 @@ int handle_req_message(const char* sub_id, cJSON* filters, struct lws *wsi, stru
                         timestamp,
                         sub_id,
                         pss ? pss->client_ip : "N/A",
-                        sqlite3_errmsg(g_db),
+                        db_last_error(),
                         sql);
                 fflush(stderr);
             }
-            
+
             continue;
         }
 
@@ -1529,38 +1385,32 @@ int handle_req_message(const char* sub_id, cJSON* filters, struct lws *wsi, stru
             pss->db_queries_executed++;
         }
 
-        // Bind parameters
-        for (int i = 0; i < bind_param_count; i++) {
-            sqlite3_bind_text(stmt, i + 1, bind_params[i], -1, SQLITE_TRANSIENT);
-        }
-
         // Cache config values outside the row loop (performance fix)
         int expiration_enabled = get_config_bool("expiration_enabled", 1);
         int filter_responses = get_config_bool("expiration_filter", 1);
 
         int row_count = 0;
-        while (sqlite3_step(stmt) == SQLITE_ROW) {
+        for (int r = 0; r < req_result->row_count; r++) {
+            const char* event_json_str = req_result->event_json_rows[r];
             row_count++;
-            
+
             // Track rows returned for abuse detection
             if (pss) {
                 pss->db_rows_returned++;
             }
-            
-            // Get pre-serialized event JSON (no reconstruction needed!)
-            const char* event_json_str = (char*)sqlite3_column_text(stmt, 0);
+
             if (!event_json_str) {
                 DEBUG_ERROR("Event has NULL event_json field");
                 continue;
             }
-            
+
             // Parse event JSON only for expiration check
             cJSON* event = cJSON_Parse(event_json_str);
             if (!event) {
                 DEBUG_ERROR("Failed to parse event_json from database");
                 continue;
             }
-            
+
             // Check expiration filtering (NIP-40) at application level
             // (expiration_enabled and filter_responses are cached outside the loop)
             if (expiration_enabled && filter_responses) {
@@ -1571,7 +1421,7 @@ int handle_req_message(const char* sub_id, cJSON* filters, struct lws *wsi, stru
                     continue;
                 }
             }
-            
+
             // Build EVENT message using zero-copy path: allocate with LWS_PRE prefix,
             // write directly, transfer ownership to queue — no memcpy.
             // Format: ["EVENT","<sub_id>",<event_json>]
@@ -1596,7 +1446,7 @@ int handle_req_message(const char* sub_id, cJSON* filters, struct lws *wsi, stru
             events_sent++;
         }
 
-        sqlite3_finalize(stmt);
+        thread_pool_free_req_result(req_result);
         
         // Stop query timing and log
         clock_gettime(CLOCK_MONOTONIC, &query_end);
@@ -1650,6 +1500,7 @@ int is_authorized_admin_event(cJSON* event, char* error_buffer, size_t error_buf
     }
 
     int targets_this_relay = 0;
+    const char* relay_pubkey = get_config_value("relay_pubkey");
     cJSON *tag;
     cJSON_ArrayForEach(tag, tags) {
         if (cJSON_IsArray(tag)) {
@@ -1661,7 +1512,6 @@ int is_authorized_admin_event(cJSON* event, char* error_buffer, size_t error_buf
                 strcmp(tag_name->valuestring, "p") == 0) {
 
                 // Compare with our relay pubkey
-                const char* relay_pubkey = get_config_value("relay_pubkey");
                 if (relay_pubkey && strcmp(tag_value->valuestring, relay_pubkey) == 0) {
                     targets_this_relay = 1;
                     break;
@@ -1669,6 +1519,7 @@ int is_authorized_admin_event(cJSON* event, char* error_buffer, size_t error_buf
             }
         }
     }
+    if (relay_pubkey) free((char*)relay_pubkey);
 
     if (!targets_this_relay) {
         // Admin event for different relay - not an error, just not for us
@@ -1689,6 +1540,7 @@ int is_authorized_admin_event(cJSON* event, char* error_buffer, size_t error_buf
     if (!admin_pubkey || strlen(admin_pubkey) == 0) {
         DEBUG_WARN("Unauthorized admin event attempt: no admin pubkey configured");
         snprintf(error_buffer, error_buffer_size, "Unauthorized admin event attempt: no admin configured");
+        if (admin_pubkey) free((char*)admin_pubkey);
         return -1;
     }
 
@@ -1701,6 +1553,7 @@ int is_authorized_admin_event(cJSON* event, char* error_buffer, size_t error_buf
         DEBUG_WARN(warning_msg);
         DEBUG_INFO("DEBUG: Pubkey comparison failed - event pubkey != admin pubkey");
         snprintf(error_buffer, error_buffer_size, "Unauthorized admin event attempt: invalid admin pubkey");
+        free((char*)admin_pubkey);
         return -1;
     }
 
@@ -1709,9 +1562,11 @@ int is_authorized_admin_event(cJSON* event, char* error_buffer, size_t error_buf
     if (nostr_verify_event_signature(event) != 0) {
         DEBUG_WARN("Unauthorized admin event attempt: invalid signature");
         snprintf(error_buffer, error_buffer_size, "Unauthorized admin event attempt: signature verification failed");
+        free((char*)admin_pubkey);
         return -1;
     }
 
+    free((char*)admin_pubkey);
 
     // All checks passed - authorized admin event
     return 0;
@@ -1920,6 +1775,12 @@ int main(int argc, char* argv[]) {
 
     DEBUG_LOG("Nostr library initialized");
 
+    // Route nostr_core_lib logs into relay logging pipeline (stdout/stderr -> journald or relay.log)
+    nostr_set_log_callback(nostr_log_cb, NULL);
+    nostr_log_level_t nostr_level = nostr_log_level_from_debug_level(cli_options.debug_level);
+    nostr_set_log_level(nostr_level);
+    DEBUG_INFO("Nostr callback logging initialized at level %d", (int)nostr_level);
+
     // Check if this is first-time startup or existing relay
     if (is_first_time_startup()) {
         DEBUG_LOG("First-time startup detected");
@@ -1954,13 +1815,9 @@ int main(int argc, char* argv[]) {
         
         // DEBUG_GUARD_START
         if (g_debug_level >= DEBUG_LEVEL_DEBUG) {
-            sqlite3_stmt* stmt;
-            if (sqlite3_prepare_v2(g_db, "SELECT COUNT(*) FROM config", -1, &stmt, NULL) == SQLITE_OK) {
-                if (sqlite3_step(stmt) == SQLITE_ROW) {
-                    int row_count = sqlite3_column_int(stmt, 0);
-                    DEBUG_LOG("Config table row count after init_database() (first-time): %d", row_count);
-                }
-                sqlite3_finalize(stmt);
+            int row_count = 0;
+            if (db_get_config_row_count(&row_count) == 0) {
+                DEBUG_LOG("Config table row count after init_database() (first-time): %d", row_count);
             }
         }
         // DEBUG_GUARD_END
@@ -2068,6 +1925,21 @@ int main(int argc, char* argv[]) {
         }
         DEBUG_LOG("Existing database initialized");
 
+        // Keep relay_version in sync with the compiled binary version on every startup
+        if (update_config_in_table("relay_version", CRELAY_VERSION) != 0) {
+            DEBUG_ERROR("Failed to synchronize relay_version with compiled CRELAY_VERSION");
+            cleanup_configuration_system();
+            free(relay_pubkey);
+            for (int i = 0; existing_files[i]; i++) {
+                free(existing_files[i]);
+            }
+            free(existing_files);
+            nostr_cleanup();
+            close_database();
+            return 1;
+        }
+        DEBUG_INFO("Synchronized relay_version to %s", CRELAY_VERSION);
+
         // Apply CLI overrides atomically (now that database is initialized)
         if (apply_cli_overrides_atomic(&cli_options) != 0) {
             DEBUG_ERROR("Failed to apply CLI overrides for existing relay");
@@ -2084,13 +1956,9 @@ int main(int argc, char* argv[]) {
 
         // DEBUG_GUARD_START
         if (g_debug_level >= DEBUG_LEVEL_DEBUG) {
-            sqlite3_stmt* stmt;
-            if (sqlite3_prepare_v2(g_db, "SELECT COUNT(*) FROM config", -1, &stmt, NULL) == SQLITE_OK) {
-                if (sqlite3_step(stmt) == SQLITE_ROW) {
-                    int row_count = sqlite3_column_int(stmt, 0);
-                    DEBUG_LOG("Config table row count after init_database(): %d", row_count);
-                }
-                sqlite3_finalize(stmt);
+            int row_count = 0;
+            if (db_get_config_row_count(&row_count) == 0) {
+                DEBUG_LOG("Config table row count after init_database(): %d", row_count);
             }
         }
      
@@ -2171,11 +2039,35 @@ int main(int argc, char* argv[]) {
     
     // Initialize IP ban table and load persisted state from database
     ip_ban_init();
-    ip_ban_load_from_db(g_db);
+    ip_ban_load_from_db();
+
+    // Optional thread pool scaffold initialization (execution wiring is future work)
+    int thread_pool_enabled = get_config_bool("thread_pool_enabled", 0);
+    int thread_pool_initialized = 0;
+    if (thread_pool_enabled) {
+        thread_pool_config_t tp_cfg;
+        memset(&tp_cfg, 0, sizeof(tp_cfg));
+        tp_cfg.reader_threads = get_config_int("thread_pool_readers", 4);
+        tp_cfg.max_queue_depth = get_config_int("thread_pool_max_queue_depth", 4096);
+        tp_cfg.db_path = g_database_path;
+        tp_cfg.wake_loop_cb = wake_event_loop_from_thread_pool;
+        tp_cfg.wake_loop_ctx = NULL;
+
+        if (thread_pool_init(&tp_cfg) == 0) {
+            thread_pool_initialized = 1;
+            DEBUG_INFO("Thread pool scaffold enabled (%d readers)", tp_cfg.reader_threads);
+        } else {
+            DEBUG_WARN("Failed to initialize thread pool scaffold; continuing in synchronous mode");
+        }
+    }
 
     // Start WebSocket Nostr relay server (port from CLI override or configuration)
     int result = start_websocket_relay(cli_options.port_override, cli_options.strict_port);  // Use CLI port override if specified, otherwise config
-    
+
+    if (thread_pool_initialized) {
+        thread_pool_shutdown();
+    }
+
     // Cleanup
     cleanup_relay_info();
     ginxsom_request_validator_cleanup();
@@ -2185,6 +2077,7 @@ int main(int argc, char* argv[]) {
     pthread_mutex_destroy(&g_subscription_manager.subscriptions_lock);
     pthread_mutex_destroy(&g_subscription_manager.ip_tracking_lock);
 
+    nostr_set_log_callback(NULL, NULL);
     nostr_cleanup();
     close_database();
     

src/main.h

@@ -11,10 +11,10 @@
 
 // Version information (auto-updated by build system)
 // Using CRELAY_ prefix to avoid conflicts with nostr_core_lib VERSION macros
-#define CRELAY_VERSION_MAJOR 1
-#define CRELAY_VERSION_MINOR 2
-#define CRELAY_VERSION_PATCH 45
-#define CRELAY_VERSION "v1.2.45"
+#define CRELAY_VERSION_MAJOR 2
+#define CRELAY_VERSION_MINOR 1
+#define CRELAY_VERSION_PATCH 1
+#define CRELAY_VERSION "v2.1.1"
 
 // Relay metadata (authoritative source for NIP-11 information)
 #define RELAY_NAME "C-Relay"

src/nip009.c

@@ -7,7 +7,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 #include <cjson/cJSON.h>
 #include "debug.h"
-#include <sqlite3.h>
+#include "db_ops.h"
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
@@ -21,10 +21,6 @@ int store_event(cJSON* event);
 int delete_events_by_id(const char* requester_pubkey, cJSON* event_ids);
 int delete_events_by_address(const char* requester_pubkey, cJSON* addresses, long deletion_timestamp);
 
-// Global database variable
-extern sqlite3* g_db;
-
-
 // Handle NIP-09 deletion request event (kind 5)
 int handle_deletion_request(cJSON* event, char* error_message, size_t error_size) {
     if (!event) {
@@ -146,97 +142,72 @@ int handle_deletion_request(cJSON* event, char* error_message, size_t error_size
 
 // Delete events by ID (with pubkey authorization)
 int delete_events_by_id(const char* requester_pubkey, cJSON* event_ids) {
-    if (!g_db || !requester_pubkey || !event_ids || !cJSON_IsArray(event_ids)) {
+    if (!db_is_available() || !requester_pubkey || !event_ids || !cJSON_IsArray(event_ids)) {
         return 0;
     }
-    
+
     int deleted_count = 0;
-    
+
     cJSON* event_id = NULL;
     cJSON_ArrayForEach(event_id, event_ids) {
         if (!cJSON_IsString(event_id)) {
             continue;
         }
-        
+
         const char* id = cJSON_GetStringValue(event_id);
-        
-        // First check if event exists and if requester is authorized
-        const char* check_sql = "SELECT pubkey FROM events WHERE id = ?";
-        sqlite3_stmt* check_stmt;
-        
-        int rc = sqlite3_prepare_v2(g_db, check_sql, -1, &check_stmt, NULL);
-        if (rc != SQLITE_OK) {
+        char event_pubkey[65] = {0};
+        int exists = db_get_event_pubkey(id, event_pubkey, sizeof(event_pubkey));
+        if (exists <= 0) {
             continue;
         }
-        
-        sqlite3_bind_text(check_stmt, 1, id, -1, SQLITE_STATIC);
-        
-        if (sqlite3_step(check_stmt) == SQLITE_ROW) {
-            const char* event_pubkey = (char*)sqlite3_column_text(check_stmt, 0);
-            
-            // Only delete if the requester is the author
-            if (event_pubkey && strcmp(event_pubkey, requester_pubkey) == 0) {
-                sqlite3_finalize(check_stmt);
-                
-                // Delete the event
-                const char* delete_sql = "DELETE FROM events WHERE id = ? AND pubkey = ?";
-                sqlite3_stmt* delete_stmt;
-                
-                rc = sqlite3_prepare_v2(g_db, delete_sql, -1, &delete_stmt, NULL);
-                if (rc == SQLITE_OK) {
-                    sqlite3_bind_text(delete_stmt, 1, id, -1, SQLITE_STATIC);
-                    sqlite3_bind_text(delete_stmt, 2, requester_pubkey, -1, SQLITE_STATIC);
-                    
-                    if (sqlite3_step(delete_stmt) == SQLITE_DONE && sqlite3_changes(g_db) > 0) {
-                        deleted_count++;
-                    }
-                    sqlite3_finalize(delete_stmt);
-                }
-            } else {
-                sqlite3_finalize(check_stmt);
-                char warning_msg[128];
-                snprintf(warning_msg, sizeof(warning_msg), "Unauthorized deletion attempt for event: %.16s...", id);
-                DEBUG_WARN(warning_msg);
+
+        // Only delete if the requester is the author
+        if (strcmp(event_pubkey, requester_pubkey) == 0) {
+            int changes = db_delete_event_by_id(id, requester_pubkey);
+            if (changes > 0) {
+                deleted_count += changes;
             }
         } else {
-            sqlite3_finalize(check_stmt);
+            char warning_msg[128];
+            snprintf(warning_msg, sizeof(warning_msg), "Unauthorized deletion attempt for event: %.16s...", id);
+            DEBUG_WARN(warning_msg);
         }
     }
-    
+
     return deleted_count;
 }
 
 // Delete events by addressable reference (kind:pubkey:d-identifier)
 int delete_events_by_address(const char* requester_pubkey, cJSON* addresses, long deletion_timestamp) {
-    if (!g_db || !requester_pubkey || !addresses || !cJSON_IsArray(addresses)) {
+    if (!db_is_available() || !requester_pubkey || !addresses || !cJSON_IsArray(addresses)) {
         return 0;
     }
-    
+
     int deleted_count = 0;
-    
+
     cJSON* address = NULL;
     cJSON_ArrayForEach(address, addresses) {
         if (!cJSON_IsString(address)) {
             continue;
         }
-        
+
         const char* addr = cJSON_GetStringValue(address);
-        
+
         // Parse address format: kind:pubkey:d-identifier
         char* addr_copy = strdup(addr);
         if (!addr_copy) continue;
-        
+
         char* kind_str = strtok(addr_copy, ":");
         char* pubkey_str = strtok(NULL, ":");
         char* d_identifier = strtok(NULL, ":");
-        
+
         if (!kind_str || !pubkey_str) {
             free(addr_copy);
             continue;
         }
-        
+
         int kind = atoi(kind_str);
-        
+
         // Only delete if the requester is the author
         if (strcmp(pubkey_str, requester_pubkey) != 0) {
             free(addr_copy);
@@ -245,42 +216,15 @@ int delete_events_by_address(const char* requester_pubkey, cJSON* addresses, lon
             DEBUG_WARN(warning_msg);
             continue;
         }
-        
-        // Build deletion query based on whether we have d-identifier
-        const char* delete_sql;
-        sqlite3_stmt* delete_stmt;
-        
-        if (d_identifier && strlen(d_identifier) > 0) {
-            // Delete specific addressable event with d-tag
-            delete_sql = "DELETE FROM events WHERE kind = ? AND pubkey = ? AND created_at <= ? "
-                        "AND json_extract(tags, '$[*]') LIKE '%[\"d\",\"' || ? || '\"]%'";
-        } else {
-            // Delete all events of this kind by this author up to deletion timestamp
-            delete_sql = "DELETE FROM events WHERE kind = ? AND pubkey = ? AND created_at <= ?";
+
+        int changes = db_delete_events_by_address(requester_pubkey, kind, d_identifier, deletion_timestamp);
+        if (changes > 0) {
+            deleted_count += changes;
         }
-        
-        int rc = sqlite3_prepare_v2(g_db, delete_sql, -1, &delete_stmt, NULL);
-        if (rc == SQLITE_OK) {
-            sqlite3_bind_int(delete_stmt, 1, kind);
-            sqlite3_bind_text(delete_stmt, 2, requester_pubkey, -1, SQLITE_STATIC);
-            sqlite3_bind_int64(delete_stmt, 3, deletion_timestamp);
-            
-            if (d_identifier && strlen(d_identifier) > 0) {
-                sqlite3_bind_text(delete_stmt, 4, d_identifier, -1, SQLITE_STATIC);
-            }
-            
-            if (sqlite3_step(delete_stmt) == SQLITE_DONE) {
-                int changes = sqlite3_changes(g_db);
-                if (changes > 0) {
-                    deleted_count += changes;
-                }
-            }
-            sqlite3_finalize(delete_stmt);
-        }
-        
+
         free(addr_copy);
     }
-    
+
     return deleted_count;
 }
 

src/nip042.c

@@ -12,6 +12,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
+#include <stdio.h>
 #include "websockets.h"
 #include "ip_ban.h"
 
@@ -94,8 +95,17 @@ void handle_nip42_auth_signed_event(struct lws* wsi, struct per_session_data* ps
     
     // Verify authentication using existing request_validator function
     // Note: nostr_nip42_verify_auth_event doesn't extract pubkey, we need to do that separately
+    char relay_url[RELAY_URL_MAX_LENGTH];
+    const char* configured_relay_url = get_config_value("relay_url");
+    if (configured_relay_url && configured_relay_url[0] != '\0') {
+        snprintf(relay_url, sizeof(relay_url), "%s", configured_relay_url);
+    } else {
+        int relay_port = (g_relay_port > 0) ? g_relay_port : get_config_int("relay_port", DEFAULT_PORT);
+        snprintf(relay_url, sizeof(relay_url), "ws://127.0.0.1:%d", relay_port);
+    }
+
     int result = nostr_nip42_verify_auth_event(auth_event, challenge_copy,
-                                               "ws://localhost:8888", 600); // 10 minutes tolerance
+                                               relay_url, 600); // 10 minutes tolerance
     
     char authenticated_pubkey[65] = {0};
     if (result == 0) {

src/request_validator.c

@@ -17,17 +17,13 @@
 #include "../nostr_core_lib/nostr_core/utils.h"
 #include "debug.h"  // C-relay debug system
 #include "config.h"  // C-relay configuration system
-#include <sqlite3.h>
+#include "db_ops.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 #include <time.h>
 
-// External references to C-relay global state
-extern sqlite3* g_db;
-extern char g_database_path[512];
-
 // Forward declaration for C-relay event storage function
 extern int store_event(cJSON* event);
 
@@ -304,9 +300,11 @@ int nostr_validate_unified_request(const char* json_string, size_t json_length)
     const char* admin_pubkey = get_config_value("admin_pubkey");
     if (admin_pubkey && strcmp(event_pubkey, admin_pubkey) == 0) {
       // Valid admin event - bypass remaining validation
+      free((char*)admin_pubkey);
       cJSON_Delete(event);
       return NOSTR_SUCCESS;
     }
+    if (admin_pubkey) free((char*)admin_pubkey);
     // Not from admin - continue with normal validation
   }
 
@@ -528,112 +526,40 @@ static int reload_auth_config(void) {
  */
 int check_database_auth_rules(const char *pubkey, const char *operation __attribute__((unused)),
                               const char *resource_hash) {
-  sqlite3 *db = NULL;
-  sqlite3_stmt *stmt = NULL;
-  int rc;
-
   DEBUG_TRACE("Checking auth rules for pubkey: %s", pubkey);
 
   if (!pubkey) {
     return NOSTR_ERROR_INVALID_INPUT;
   }
 
-  // Open database using global database path
-  if (strlen(g_database_path) == 0) {
-    return NOSTR_SUCCESS; // Default allow on DB error
-  }
-
-  rc = sqlite3_open_v2(g_database_path, &db, SQLITE_OPEN_READONLY, NULL);
-  if (rc != SQLITE_OK) {
-    return NOSTR_SUCCESS; // Default allow on DB error
-  }
-
   // Step 1: Check pubkey blacklist (highest priority)
-  const char *blacklist_sql =
-      "SELECT rule_type FROM auth_rules WHERE rule_type = "
-      "'blacklist' AND pattern_type = 'pubkey' AND pattern_value = ? AND active = 1 LIMIT 1";
-  DEBUG_TRACE("Blacklist SQL: %s", blacklist_sql);
-  rc = sqlite3_prepare_v2(db, blacklist_sql, -1, &stmt, NULL);
-  if (rc == SQLITE_OK) {
-    sqlite3_bind_text(stmt, 1, pubkey, -1, SQLITE_STATIC);
-
-    int step_result = sqlite3_step(stmt);
-    DEBUG_TRACE("Blacklist query result: %s", step_result == SQLITE_ROW ? "FOUND" : "NOT_FOUND");
-
-    if (step_result == SQLITE_ROW) {
-      DEBUG_TRACE("BLACKLIST HIT: Denying access for pubkey: %s", pubkey);
-      // Set specific violation details for status code mapping
-      strcpy(g_last_rule_violation.violation_type, "pubkey_blacklist");
-      sprintf(g_last_rule_violation.reason, "Public key blacklisted");
-
-      sqlite3_finalize(stmt);
-      sqlite3_close(db);
-      return NOSTR_ERROR_AUTH_REQUIRED;
-    }
-    sqlite3_finalize(stmt);
+  if (db_is_pubkey_blacklisted(pubkey)) {
+    DEBUG_TRACE("BLACKLIST HIT: Denying access for pubkey: %s", pubkey);
+    strcpy(g_last_rule_violation.violation_type, "pubkey_blacklist");
+    sprintf(g_last_rule_violation.reason, "Public key blacklisted");
+    return NOSTR_ERROR_AUTH_REQUIRED;
   }
 
   // Step 2: Check hash blacklist
-  if (resource_hash) {
-    const char *hash_blacklist_sql =
-        "SELECT rule_type FROM auth_rules WHERE rule_type = "
-        "'blacklist' AND pattern_type = 'hash' AND pattern_value = ? AND active = 1 LIMIT 1";
-    rc = sqlite3_prepare_v2(db, hash_blacklist_sql, -1, &stmt, NULL);
-    if (rc == SQLITE_OK) {
-      sqlite3_bind_text(stmt, 1, resource_hash, -1, SQLITE_STATIC);
-
-      if (sqlite3_step(stmt) == SQLITE_ROW) {
-        // Set specific violation details for status code mapping
-        strcpy(g_last_rule_violation.violation_type, "hash_blacklist");
-        sprintf(g_last_rule_violation.reason, "File hash blacklisted");
-
-        sqlite3_finalize(stmt);
-        sqlite3_close(db);
-        return NOSTR_ERROR_AUTH_REQUIRED;
-      }
-      sqlite3_finalize(stmt);
-    }
+  if (resource_hash && db_is_hash_blacklisted(resource_hash)) {
+    strcpy(g_last_rule_violation.violation_type, "hash_blacklist");
+    sprintf(g_last_rule_violation.reason, "File hash blacklisted");
+    return NOSTR_ERROR_AUTH_REQUIRED;
   }
 
   // Step 3: Check pubkey whitelist (includes wot_whitelist)
-  const char *whitelist_sql =
-      "SELECT rule_type FROM auth_rules WHERE rule_type IN "
-      "('whitelist', 'wot_whitelist') AND pattern_type = 'pubkey' AND pattern_value = ? AND active = 1 LIMIT 1";
-  rc = sqlite3_prepare_v2(db, whitelist_sql, -1, &stmt, NULL);
-  if (rc == SQLITE_OK) {
-    sqlite3_bind_text(stmt, 1, pubkey, -1, SQLITE_STATIC);
-
-    if (sqlite3_step(stmt) == SQLITE_ROW) {
-      sqlite3_finalize(stmt);
-      sqlite3_close(db);
-      return NOSTR_SUCCESS; // Allow whitelisted pubkey
-    }
-    sqlite3_finalize(stmt);
+  if (db_is_pubkey_whitelisted(pubkey)) {
+    return NOSTR_SUCCESS; // Allow whitelisted pubkey
   }
 
-  // Step 4: Check if any whitelist rules exist - if yes, deny by default (includes wot_whitelist)
-  const char *whitelist_exists_sql =
-      "SELECT COUNT(*) FROM auth_rules WHERE rule_type IN ('whitelist', 'wot_whitelist') "
-      "AND pattern_type = 'pubkey' AND active = 1 LIMIT 1";
-  rc = sqlite3_prepare_v2(db, whitelist_exists_sql, -1, &stmt, NULL);
-  if (rc == SQLITE_OK) {
-    if (sqlite3_step(stmt) == SQLITE_ROW) {
-      int whitelist_count = sqlite3_column_int(stmt, 0);
-      if (whitelist_count > 0) {
-        // Set specific violation details for status code mapping
-        strcpy(g_last_rule_violation.violation_type, "whitelist_violation");
-        strcpy(g_last_rule_violation.reason,
-               "Public key not whitelisted for this operation");
-
-        sqlite3_finalize(stmt);
-        sqlite3_close(db);
-        return NOSTR_ERROR_AUTH_REQUIRED;
-      }
-    }
-    sqlite3_finalize(stmt);
+  // Step 4: If any whitelist rules exist, deny by default
+  if (db_count_active_whitelist_rules() > 0) {
+    strcpy(g_last_rule_violation.violation_type, "whitelist_violation");
+    strcpy(g_last_rule_violation.reason,
+           "Public key not whitelisted for this operation");
+    return NOSTR_ERROR_AUTH_REQUIRED;
   }
 
-  sqlite3_close(db);
   return NOSTR_SUCCESS; // Default allow if no restrictive rules matched
 }
 

src/subscriptions.c

@@ -1,7 +1,7 @@
 #define _GNU_SOURCE
 #include <cjson/cJSON.h>
 #include "debug.h"
-#include <sqlite3.h>
+#include "db_ops.h"
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
@@ -28,9 +28,6 @@ int validate_search_term(const char* search_term, char* error_message, size_t er
 // Forward declaration for monitoring function
 void monitoring_on_subscription_change(void);
 
-// Global database variable
-extern sqlite3* g_db;
-
 // Configuration functions from config.c
 extern int get_config_bool(const char* key, int default_value);
 
@@ -991,21 +988,21 @@ int has_subscriptions_for_kind(int event_kind) {
 
 // Log subscription creation to database
 void log_subscription_created(const subscription_t* sub) {
-    if (!g_db || !sub) return;
-    
+    if (!sub) return;
+
     // Convert wsi pointer to string
     char wsi_str[32];
     snprintf(wsi_str, sizeof(wsi_str), "%p", (void*)sub->wsi);
-    
+
     // Create filter JSON for logging
     char* filter_json = NULL;
     if (sub->filters) {
         cJSON* filters_array = cJSON_CreateArray();
         subscription_filter_t* filter = sub->filters;
-        
+
         while (filter) {
             cJSON* filter_obj = cJSON_CreateObject();
-            
+
             if (filter->kinds) {
                 cJSON_AddItemToObject(filter_obj, "kinds", cJSON_Duplicate(filter->kinds, 1));
             }
@@ -1034,100 +1031,33 @@ void log_subscription_created(const subscription_t* sub) {
                 }
                 cJSON_Delete(tags_obj);
             }
-            
+
             cJSON_AddItemToArray(filters_array, filter_obj);
             filter = filter->next;
         }
-        
+
         filter_json = cJSON_Print(filters_array);
         cJSON_Delete(filters_array);
     }
-    
-    // Use INSERT OR REPLACE to handle duplicates automatically
-    const char* sql =
-        "INSERT OR REPLACE INTO subscriptions (subscription_id, wsi_pointer, client_ip, event_type, filter_json) "
-        "VALUES (?, ?, ?, 'created', ?)";
-    
-    sqlite3_stmt* stmt;
-    int rc = sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL);
-    if (rc == SQLITE_OK) {
-        sqlite3_bind_text(stmt, 1, sub->id, -1, SQLITE_STATIC);
-        sqlite3_bind_text(stmt, 2, wsi_str, -1, SQLITE_TRANSIENT);
-        sqlite3_bind_text(stmt, 3, sub->client_ip, -1, SQLITE_STATIC);
-        sqlite3_bind_text(stmt, 4, filter_json ? filter_json : "[]", -1, SQLITE_TRANSIENT);
-        
-        sqlite3_step(stmt);
-        sqlite3_finalize(stmt);
-    }
-    
+
+    db_log_subscription_created(sub->id, wsi_str, sub->client_ip, filter_json ? filter_json : "[]");
+
     if (filter_json) free(filter_json);
 }
 
 // Log subscription closure to database
 void log_subscription_closed(const char* sub_id, const char* client_ip, const char* reason) {
     (void)reason; // Mark as intentionally unused
-    if (!g_db || !sub_id) return;
-    
-    const char* sql =
-        "INSERT INTO subscriptions (subscription_id, wsi_pointer, client_ip, event_type) "
-        "VALUES (?, '', ?, 'closed')";
-    
-    sqlite3_stmt* stmt;
-    int rc = sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL);
-    if (rc == SQLITE_OK) {
-        sqlite3_bind_text(stmt, 1, sub_id, -1, SQLITE_STATIC);
-        sqlite3_bind_text(stmt, 2, client_ip ? client_ip : "unknown", -1, SQLITE_STATIC);
-        
-        sqlite3_step(stmt);
-        sqlite3_finalize(stmt);
-    }
-    
-    // Update the corresponding 'created' entry with end time and events sent
-    const char* update_sql =
-        "UPDATE subscriptions "
-        "SET ended_at = strftime('%s', 'now') "
-        "WHERE subscription_id = ? AND event_type = 'created' AND ended_at IS NULL";
-    
-    rc = sqlite3_prepare_v2(g_db, update_sql, -1, &stmt, NULL);
-    if (rc == SQLITE_OK) {
-        sqlite3_bind_text(stmt, 1, sub_id, -1, SQLITE_STATIC);
-        sqlite3_step(stmt);
-        sqlite3_finalize(stmt);
-    }
+    if (!sub_id) return;
+
+    db_log_subscription_closed(sub_id, client_ip);
 }
 
 // Log subscription disconnection to database
 void log_subscription_disconnected(const char* client_ip) {
-    if (!g_db || !client_ip) return;
-    
-    // Mark all active subscriptions for this client as disconnected
-    const char* sql =
-        "UPDATE subscriptions "
-        "SET ended_at = strftime('%s', 'now') "
-        "WHERE client_ip = ? AND event_type = 'created' AND ended_at IS NULL";
-    
-    sqlite3_stmt* stmt;
-    int rc = sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL);
-    if (rc == SQLITE_OK) {
-        sqlite3_bind_text(stmt, 1, client_ip, -1, SQLITE_STATIC);
-        int changes = sqlite3_changes(g_db);
-        sqlite3_step(stmt);
-        sqlite3_finalize(stmt);
-        
-        if (changes > 0) {
-            // Log a disconnection event
-            const char* insert_sql =
-                "INSERT INTO subscriptions (subscription_id, wsi_pointer, client_ip, event_type) "
-                "VALUES ('disconnect', '', ?, 'disconnected')";
-            
-            rc = sqlite3_prepare_v2(g_db, insert_sql, -1, &stmt, NULL);
-            if (rc == SQLITE_OK) {
-                sqlite3_bind_text(stmt, 1, client_ip, -1, SQLITE_STATIC);
-                sqlite3_step(stmt);
-                sqlite3_finalize(stmt);
-            }
-        }
-    }
+    if (!client_ip) return;
+
+    db_log_subscription_disconnected(client_ip);
 }
 
 // Log event broadcast to database (optional, can be resource intensive)
@@ -1153,55 +1083,26 @@ void log_subscription_disconnected(const char* client_ip) {
 
 // Update events sent counter for a subscription
 void update_subscription_events_sent(const char* sub_id, int events_sent) {
-    if (!g_db || !sub_id) return;
+    if (!sub_id) return;
 
-    const char* sql =
-        "UPDATE subscriptions "
-        "SET events_sent = ? "
-        "WHERE subscription_id = ? AND event_type = 'created'";
-
-    sqlite3_stmt* stmt;
-    int rc = sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL);
-    if (rc == SQLITE_OK) {
-        sqlite3_bind_int(stmt, 1, events_sent);
-        sqlite3_bind_text(stmt, 2, sub_id, -1, SQLITE_STATIC);
-
-        sqlite3_step(stmt);
-        sqlite3_finalize(stmt);
-    }
+    db_update_subscription_events_sent(sub_id, events_sent);
 }
 
 // Cleanup all subscriptions on startup
 void cleanup_all_subscriptions_on_startup(void) {
-    if (!g_db) {
+    if (!db_is_available()) {
         DEBUG_ERROR("Database not available for startup cleanup");
         return;
     }
-    
+
     DEBUG_LOG("Performing startup subscription cleanup");
-    
-    // Mark all active subscriptions as disconnected
-    const char* sql =
-        "UPDATE subscriptions "
-        "SET ended_at = strftime('%s', 'now') "
-        "WHERE event_type = 'created' AND ended_at IS NULL";
-    
-    sqlite3_stmt* stmt;
-    int rc = sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL);
-    if (rc != SQLITE_OK) {
-        DEBUG_ERROR("Failed to prepare startup cleanup query");
-        return;
-    }
-    
-    rc = sqlite3_step(stmt);
-    int changes = sqlite3_changes(g_db);
-    sqlite3_finalize(stmt);
-    
-    if (rc != SQLITE_DONE) {
+
+    int changes = db_cleanup_orphaned_subscriptions();
+    if (changes < 0) {
         DEBUG_ERROR("Failed to execute startup cleanup");
         return;
     }
-    
+
     if (changes > 0) {
         DEBUG_LOG("Startup cleanup: marked %d orphaned subscriptions as disconnected", changes);
     } else {

src/thread_pool.c

@@ -0,0 +1,778 @@
+#define _GNU_SOURCE
+
+#include "thread_pool.h"
+#include "debug.h"
+#include "db_ops.h"
+
+#include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
+
+typedef struct thread_pool_job_node {
+    uint64_t job_id;
+    thread_pool_job_t job;
+    struct thread_pool_job_node* next;
+} thread_pool_job_node_t;
+
+typedef struct {
+    thread_pool_job_node_t* head;
+    thread_pool_job_node_t* tail;
+    int size;
+    int max_size;
+    pthread_mutex_t mutex;
+    pthread_cond_t cond;
+} thread_pool_queue_t;
+
+typedef struct {
+    int running;
+    uint64_t next_job_id;
+
+    int reader_count;
+    pthread_t* readers;
+    pthread_t writer;
+
+    thread_pool_queue_t read_q;
+    thread_pool_queue_t write_q;
+
+    thread_pool_wake_loop_cb wake_loop_cb;
+    void* wake_loop_ctx;
+
+    pthread_mutex_t state_mutex;
+} thread_pool_state_t;
+
+static thread_pool_state_t g_pool = {0};
+
+typedef struct {
+    pthread_mutex_t mutex;
+    pthread_cond_t cond;
+    int done;
+    thread_pool_status_t status;
+    void* result_data;
+    size_t result_size;
+} thread_pool_wait_ctx_t;
+
+static void wait_ctx_init(thread_pool_wait_ctx_t* ctx) {
+    memset(ctx, 0, sizeof(*ctx));
+    pthread_mutex_init(&ctx->mutex, NULL);
+    pthread_cond_init(&ctx->cond, NULL);
+}
+
+static void wait_ctx_destroy(thread_pool_wait_ctx_t* ctx) {
+    pthread_mutex_destroy(&ctx->mutex);
+    pthread_cond_destroy(&ctx->cond);
+}
+
+static void wait_ctx_result_cb(const thread_pool_result_t* result, void* user_ctx) {
+    thread_pool_wait_ctx_t* ctx = (thread_pool_wait_ctx_t*)user_ctx;
+    if (!ctx || !result) return;
+
+    pthread_mutex_lock(&ctx->mutex);
+    ctx->status = result->status;
+    ctx->result_data = result->result_data;
+    ctx->result_size = result->result_size;
+    ctx->done = 1;
+    pthread_cond_signal(&ctx->cond);
+    pthread_mutex_unlock(&ctx->mutex);
+}
+
+static void wait_ctx_wait(thread_pool_wait_ctx_t* ctx) {
+    pthread_mutex_lock(&ctx->mutex);
+    while (!ctx->done) {
+        pthread_cond_wait(&ctx->cond, &ctx->mutex);
+    }
+    pthread_mutex_unlock(&ctx->mutex);
+}
+
+static void free_count_payload(void* p) {
+    thread_pool_count_payload_t* payload = (thread_pool_count_payload_t*)p;
+    if (!payload) return;
+    free(payload->sql);
+    if (payload->bind_params) {
+        for (int i = 0; i < payload->bind_param_count; i++) {
+            free(payload->bind_params[i]);
+        }
+        free(payload->bind_params);
+    }
+    free(payload);
+}
+
+static void free_req_payload(void* p) {
+    thread_pool_req_payload_t* payload = (thread_pool_req_payload_t*)p;
+    if (!payload) return;
+    free(payload->sql);
+    if (payload->bind_params) {
+        for (int i = 0; i < payload->bind_param_count; i++) {
+            free(payload->bind_params[i]);
+        }
+        free(payload->bind_params);
+    }
+    free(payload);
+}
+
+static void free_store_event_payload(void* p) {
+    thread_pool_store_event_payload_t* payload = (thread_pool_store_event_payload_t*)p;
+    if (!payload) return;
+    free(payload->id);
+    free(payload->pubkey);
+    free(payload->event_type);
+    free(payload->content);
+    free(payload->sig);
+    free(payload->tags_json);
+    free(payload->event_json);
+    free(payload);
+}
+
+static void queue_init(thread_pool_queue_t* q, int max_size) {
+    memset(q, 0, sizeof(*q));
+    q->max_size = (max_size > 0) ? max_size : 4096;
+    pthread_mutex_init(&q->mutex, NULL);
+    pthread_cond_init(&q->cond, NULL);
+}
+
+static void queue_destroy(thread_pool_queue_t* q) {
+    pthread_mutex_lock(&q->mutex);
+    thread_pool_job_node_t* cur = q->head;
+    while (cur) {
+        thread_pool_job_node_t* next = cur->next;
+        if (cur->job.payload_free && cur->job.payload) {
+            cur->job.payload_free(cur->job.payload);
+        }
+        free(cur);
+        cur = next;
+    }
+    q->head = q->tail = NULL;
+    q->size = 0;
+    pthread_mutex_unlock(&q->mutex);
+
+    pthread_mutex_destroy(&q->mutex);
+    pthread_cond_destroy(&q->cond);
+}
+
+static int queue_push(thread_pool_queue_t* q, thread_pool_job_node_t* node) {
+    pthread_mutex_lock(&q->mutex);
+    if (q->size >= q->max_size) {
+        pthread_mutex_unlock(&q->mutex);
+        return 0;
+    }
+
+    node->next = NULL;
+    if (!q->tail) {
+        q->head = q->tail = node;
+    } else {
+        q->tail->next = node;
+        q->tail = node;
+    }
+    q->size++;
+    pthread_cond_signal(&q->cond);
+    pthread_mutex_unlock(&q->mutex);
+    return 1;
+}
+
+static thread_pool_job_node_t* queue_pop(thread_pool_queue_t* q) {
+    pthread_mutex_lock(&q->mutex);
+    while (g_pool.running && q->size == 0) {
+        pthread_cond_wait(&q->cond, &q->mutex);
+    }
+
+    if (!g_pool.running && q->size == 0) {
+        pthread_mutex_unlock(&q->mutex);
+        return NULL;
+    }
+
+    thread_pool_job_node_t* node = q->head;
+    q->head = node->next;
+    if (!q->head) q->tail = NULL;
+    q->size--;
+    pthread_mutex_unlock(&q->mutex);
+    return node;
+}
+
+static void wake_event_loop(void) {
+    if (g_pool.wake_loop_cb) {
+        g_pool.wake_loop_cb(g_pool.wake_loop_ctx);
+    }
+}
+
+static void complete_job_with_result(thread_pool_job_node_t* node,
+                                     thread_pool_status_t status,
+                                     const char* message,
+                                     void* result_data,
+                                     size_t result_size) {
+    thread_pool_result_t result;
+    memset(&result, 0, sizeof(result));
+    result.job_id = node->job_id;
+    result.type = node->job.type;
+    result.status = status;
+    result.session = node->job.session;
+    result.result_data = result_data;
+    result.result_size = result_size;
+    result.message = message;
+
+    if (node->job.result_cb) {
+        node->job.result_cb(&result, node->job.result_cb_ctx);
+    }
+    wake_event_loop();
+
+    if (node->job.payload_free && node->job.payload) {
+        node->job.payload_free(node->job.payload);
+    }
+    free(node);
+}
+
+static void execute_count_job(thread_pool_job_node_t* node) {
+    thread_pool_count_payload_t* payload = (thread_pool_count_payload_t*)node->job.payload;
+    if (!payload || !payload->sql) {
+        complete_job_with_result(node, THREAD_POOL_STATUS_INTERNAL_ERROR,
+                                 "COUNT payload missing", NULL, 0);
+        return;
+    }
+
+    int count = 0;
+    if (db_count_with_sql(payload->sql, (const char**)payload->bind_params,
+                          payload->bind_param_count, &count) != 0) {
+        complete_job_with_result(node, THREAD_POOL_STATUS_INTERNAL_ERROR,
+                                 "COUNT query failed", NULL, 0);
+        return;
+    }
+
+    thread_pool_count_result_t* out = calloc(1, sizeof(*out));
+    if (!out) {
+        complete_job_with_result(node, THREAD_POOL_STATUS_INTERNAL_ERROR,
+                                 "COUNT result allocation failed", NULL, 0);
+        return;
+    }
+    out->count = count;
+
+    complete_job_with_result(node, THREAD_POOL_STATUS_OK,
+                             "COUNT query completed", out, sizeof(*out));
+}
+
+static void execute_req_job(thread_pool_job_node_t* node) {
+    thread_pool_req_payload_t* payload = (thread_pool_req_payload_t*)node->job.payload;
+    if (!payload || !payload->sql) {
+        complete_job_with_result(node, THREAD_POOL_STATUS_INTERNAL_ERROR,
+                                 "REQ payload missing", NULL, 0);
+        return;
+    }
+
+    db_stmt_t* stmt = NULL;
+    if (db_prepare(payload->sql, &stmt) != DB_OK) {
+        complete_job_with_result(node, THREAD_POOL_STATUS_INTERNAL_ERROR,
+                                 "REQ prepare failed", NULL, 0);
+        return;
+    }
+
+    for (int i = 0; i < payload->bind_param_count; i++) {
+        const char* v = (payload->bind_params && payload->bind_params[i]) ? payload->bind_params[i] : "";
+        (void)db_bind_text_param(stmt, i + 1, v);
+    }
+
+    int cap = (payload->row_limit > 0) ? payload->row_limit : 500;
+    if (cap < 1) cap = 1;
+
+    thread_pool_req_result_t* out = calloc(1, sizeof(*out));
+    if (!out) {
+        db_finalize_stmt(stmt);
+        complete_job_with_result(node, THREAD_POOL_STATUS_INTERNAL_ERROR,
+                                 "REQ result allocation failed", NULL, 0);
+        return;
+    }
+
+    out->event_json_rows = calloc((size_t)cap, sizeof(char*));
+    if (!out->event_json_rows) {
+        db_finalize_stmt(stmt);
+        free(out);
+        complete_job_with_result(node, THREAD_POOL_STATUS_INTERNAL_ERROR,
+                                 "REQ row array allocation failed", NULL, 0);
+        return;
+    }
+
+    int rc = DB_OK;
+    while ((rc = db_step_stmt(stmt)) == DB_ROW) {
+        if (out->row_count >= cap) break;
+        const char* row = db_column_text_value(stmt, 0);
+        if (!row) continue;
+
+        out->event_json_rows[out->row_count] = strdup(row);
+        if (!out->event_json_rows[out->row_count]) {
+            break;
+        }
+        out->row_count++;
+    }
+
+    db_finalize_stmt(stmt);
+
+    complete_job_with_result(node, THREAD_POOL_STATUS_OK,
+                             "REQ query completed", out, sizeof(*out));
+}
+
+static void execute_store_event_job(thread_pool_job_node_t* node) {
+    thread_pool_store_event_payload_t* payload = (thread_pool_store_event_payload_t*)node->job.payload;
+    if (!payload || !payload->id || !payload->pubkey || !payload->content || !payload->sig) {
+        complete_job_with_result(node, THREAD_POOL_STATUS_INTERNAL_ERROR,
+                                 "STORE_EVENT payload missing required fields", NULL, 0);
+        return;
+    }
+
+    thread_pool_store_event_result_t* out = calloc(1, sizeof(*out));
+    if (!out) {
+        complete_job_with_result(node, THREAD_POOL_STATUS_INTERNAL_ERROR,
+                                 "STORE_EVENT result allocation failed", NULL, 0);
+        return;
+    }
+
+    int step_rc = DB_ERROR;
+    int extended_errcode = 0;
+    if (db_insert_event_with_json(payload->id,
+                                  payload->pubkey,
+                                  payload->created_at,
+                                  payload->kind,
+                                  payload->event_type ? payload->event_type : "regular",
+                                  payload->content,
+                                  payload->sig,
+                                  payload->tags_json ? payload->tags_json : "[]",
+                                  payload->event_json ? payload->event_json : "{}",
+                                  &step_rc,
+                                  &extended_errcode) != 0) {
+        free(out);
+        complete_job_with_result(node, THREAD_POOL_STATUS_INTERNAL_ERROR,
+                                 "STORE_EVENT execution failed", NULL, 0);
+        return;
+    }
+
+    out->step_rc = step_rc;
+    out->extended_errcode = extended_errcode;
+    complete_job_with_result(node, THREAD_POOL_STATUS_OK,
+                             "STORE_EVENT completed", out, sizeof(*out));
+}
+
+static void execute_read_job(thread_pool_job_node_t* node) {
+    switch (node->job.type) {
+        case THREAD_POOL_JOB_REQ_QUERY:
+            execute_req_job(node);
+            break;
+        case THREAD_POOL_JOB_COUNT_QUERY:
+            execute_count_job(node);
+            break;
+        default:
+            complete_job_with_result(node, THREAD_POOL_STATUS_NOT_IMPLEMENTED,
+                                     "Read job type not implemented", NULL, 0);
+            break;
+    }
+}
+
+static void execute_write_job(thread_pool_job_node_t* node) {
+    switch (node->job.type) {
+        case THREAD_POOL_JOB_STORE_EVENT:
+            execute_store_event_job(node);
+            break;
+        default:
+            complete_job_with_result(node, THREAD_POOL_STATUS_NOT_IMPLEMENTED,
+                                     "Write job type not implemented", NULL, 0);
+            break;
+    }
+}
+
+static void* reader_worker_main(void* arg) {
+    (void)arg;
+    while (g_pool.running) {
+        thread_pool_job_node_t* node = queue_pop(&g_pool.read_q);
+        if (!node) break;
+
+        execute_read_job(node);
+    }
+    return NULL;
+}
+
+static void* writer_worker_main(void* arg) {
+    (void)arg;
+    while (g_pool.running) {
+        thread_pool_job_node_t* node = queue_pop(&g_pool.write_q);
+        if (!node) break;
+
+        execute_write_job(node);
+    }
+    return NULL;
+}
+
+int thread_pool_init(const thread_pool_config_t* config) {
+    if (!config) return -1;
+
+    pthread_mutex_lock(&g_pool.state_mutex);
+    if (g_pool.running) {
+        pthread_mutex_unlock(&g_pool.state_mutex);
+        return 0;
+    }
+
+    g_pool.reader_count = (config->reader_threads > 0) ? config->reader_threads : 4;
+    g_pool.readers = calloc((size_t)g_pool.reader_count, sizeof(pthread_t));
+    if (!g_pool.readers) {
+        pthread_mutex_unlock(&g_pool.state_mutex);
+        return -1;
+    }
+
+    queue_init(&g_pool.read_q, config->max_queue_depth);
+    queue_init(&g_pool.write_q, config->max_queue_depth);
+
+    g_pool.next_job_id = 1;
+    g_pool.wake_loop_cb = config->wake_loop_cb;
+    g_pool.wake_loop_ctx = config->wake_loop_ctx;
+    g_pool.running = 1;
+
+    for (int i = 0; i < g_pool.reader_count; i++) {
+        if (pthread_create(&g_pool.readers[i], NULL, reader_worker_main, NULL) != 0) {
+            g_pool.running = 0;
+            pthread_cond_broadcast(&g_pool.read_q.cond);
+            pthread_cond_broadcast(&g_pool.write_q.cond);
+            pthread_mutex_unlock(&g_pool.state_mutex);
+            return -1;
+        }
+    }
+
+    if (pthread_create(&g_pool.writer, NULL, writer_worker_main, NULL) != 0) {
+        g_pool.running = 0;
+        pthread_cond_broadcast(&g_pool.read_q.cond);
+        pthread_cond_broadcast(&g_pool.write_q.cond);
+        pthread_mutex_unlock(&g_pool.state_mutex);
+        return -1;
+    }
+
+    pthread_mutex_unlock(&g_pool.state_mutex);
+    DEBUG_LOG("Thread pool initialized: %d readers + 1 writer", g_pool.reader_count);
+    return 0;
+}
+
+void thread_pool_shutdown(void) {
+    pthread_mutex_lock(&g_pool.state_mutex);
+    if (!g_pool.running) {
+        pthread_mutex_unlock(&g_pool.state_mutex);
+        return;
+    }
+
+    g_pool.running = 0;
+    pthread_cond_broadcast(&g_pool.read_q.cond);
+    pthread_cond_broadcast(&g_pool.write_q.cond);
+    pthread_mutex_unlock(&g_pool.state_mutex);
+
+    for (int i = 0; i < g_pool.reader_count; i++) {
+        pthread_join(g_pool.readers[i], NULL);
+    }
+    pthread_join(g_pool.writer, NULL);
+
+    free(g_pool.readers);
+    g_pool.readers = NULL;
+    g_pool.reader_count = 0;
+
+    queue_destroy(&g_pool.read_q);
+    queue_destroy(&g_pool.write_q);
+
+    DEBUG_LOG("Thread pool shutdown complete");
+}
+
+int thread_pool_is_running(void) {
+    return g_pool.running;
+}
+
+static thread_pool_status_t submit_to_queue(thread_pool_queue_t* q, const thread_pool_job_t* job, uint64_t* out_job_id) {
+    if (!g_pool.running) return THREAD_POOL_STATUS_SHUTTING_DOWN;
+    if (!job) return THREAD_POOL_STATUS_INTERNAL_ERROR;
+
+    thread_pool_job_node_t* node = calloc(1, sizeof(*node));
+    if (!node) return THREAD_POOL_STATUS_INTERNAL_ERROR;
+
+    node->job = *job;
+
+    pthread_mutex_lock(&g_pool.state_mutex);
+    node->job_id = g_pool.next_job_id++;
+    pthread_mutex_unlock(&g_pool.state_mutex);
+
+    if (out_job_id) *out_job_id = node->job_id;
+
+    if (!queue_push(q, node)) {
+        if (job->payload_free && job->payload) {
+            job->payload_free(job->payload);
+        }
+        free(node);
+        return THREAD_POOL_STATUS_QUEUE_FULL;
+    }
+
+    return THREAD_POOL_STATUS_OK;
+}
+
+thread_pool_status_t thread_pool_submit_read(const thread_pool_job_t* job, uint64_t* out_job_id) {
+    return submit_to_queue(&g_pool.read_q, job, out_job_id);
+}
+
+thread_pool_status_t thread_pool_submit_write(const thread_pool_job_t* job, uint64_t* out_job_id) {
+    return submit_to_queue(&g_pool.write_q, job, out_job_id);
+}
+
+int thread_pool_execute_count_sync(const char* sql, const char** bind_params, int bind_param_count, int* out_count) {
+    if (!sql || !out_count) {
+        return -1;
+    }
+
+    if (!thread_pool_is_running()) {
+        return db_count_with_sql(sql, bind_params, bind_param_count, out_count);
+    }
+
+    thread_pool_count_payload_t* payload = calloc(1, sizeof(*payload));
+    if (!payload) return -1;
+
+    payload->sql = strdup(sql);
+    payload->bind_param_count = bind_param_count;
+    if (!payload->sql) {
+        free_count_payload(payload);
+        return -1;
+    }
+
+    if (bind_param_count > 0) {
+        payload->bind_params = calloc((size_t)bind_param_count, sizeof(char*));
+        if (!payload->bind_params) {
+            free_count_payload(payload);
+            return -1;
+        }
+        for (int i = 0; i < bind_param_count; i++) {
+            const char* v = (bind_params && bind_params[i]) ? bind_params[i] : "";
+            payload->bind_params[i] = strdup(v);
+            if (!payload->bind_params[i]) {
+                free_count_payload(payload);
+                return -1;
+            }
+        }
+    }
+
+    thread_pool_wait_ctx_t wait_ctx;
+    wait_ctx_init(&wait_ctx);
+
+    thread_pool_job_t job;
+    memset(&job, 0, sizeof(job));
+    job.type = THREAD_POOL_JOB_COUNT_QUERY;
+    job.payload = payload;
+    job.payload_free = free_count_payload;
+    job.result_cb = wait_ctx_result_cb;
+    job.result_cb_ctx = &wait_ctx;
+
+    thread_pool_status_t submit_rc = thread_pool_submit_read(&job, NULL);
+    if (submit_rc != THREAD_POOL_STATUS_OK) {
+        free_count_payload(payload);
+        wait_ctx_destroy(&wait_ctx);
+        return -1;
+    }
+
+    wait_ctx_wait(&wait_ctx);
+
+    int rc = -1;
+    if (wait_ctx.status == THREAD_POOL_STATUS_OK && wait_ctx.result_data) {
+        thread_pool_count_result_t* result = (thread_pool_count_result_t*)wait_ctx.result_data;
+        *out_count = result->count;
+        free(result);
+        rc = 0;
+    }
+
+    wait_ctx_destroy(&wait_ctx);
+    return rc;
+}
+
+int thread_pool_execute_req_sync(const char* sql, const char** bind_params, int bind_param_count,
+                                 int row_limit, thread_pool_req_result_t** out_result) {
+    if (!sql || !out_result) {
+        return -1;
+    }
+
+    if (!thread_pool_is_running()) {
+        db_stmt_t* stmt = NULL;
+        if (db_prepare(sql, &stmt) != DB_OK) {
+            return -1;
+        }
+
+        for (int i = 0; i < bind_param_count; i++) {
+            const char* v = (bind_params && bind_params[i]) ? bind_params[i] : "";
+            (void)db_bind_text_param(stmt, i + 1, v);
+        }
+
+        int cap = (row_limit > 0) ? row_limit : 500;
+        if (cap < 1) cap = 1;
+
+        thread_pool_req_result_t* result = calloc(1, sizeof(*result));
+        if (!result) {
+            db_finalize_stmt(stmt);
+            return -1;
+        }
+
+        result->event_json_rows = calloc((size_t)cap, sizeof(char*));
+        if (!result->event_json_rows) {
+            free(result);
+            db_finalize_stmt(stmt);
+            return -1;
+        }
+
+        int step_rc = DB_OK;
+        while ((step_rc = db_step_stmt(stmt)) == DB_ROW) {
+            if (result->row_count >= cap) break;
+            const char* row = db_column_text_value(stmt, 0);
+            if (!row) continue;
+
+            result->event_json_rows[result->row_count] = strdup(row);
+            if (!result->event_json_rows[result->row_count]) {
+                break;
+            }
+            result->row_count++;
+        }
+
+        db_finalize_stmt(stmt);
+        *out_result = result;
+        return 0;
+    }
+
+    thread_pool_req_payload_t* payload = calloc(1, sizeof(*payload));
+    if (!payload) return -1;
+
+    payload->sql = strdup(sql);
+    payload->bind_param_count = bind_param_count;
+    payload->row_limit = row_limit;
+    if (!payload->sql) {
+        free_req_payload(payload);
+        return -1;
+    }
+
+    if (bind_param_count > 0) {
+        payload->bind_params = calloc((size_t)bind_param_count, sizeof(char*));
+        if (!payload->bind_params) {
+            free_req_payload(payload);
+            return -1;
+        }
+        for (int i = 0; i < bind_param_count; i++) {
+            const char* v = (bind_params && bind_params[i]) ? bind_params[i] : "";
+            payload->bind_params[i] = strdup(v);
+            if (!payload->bind_params[i]) {
+                free_req_payload(payload);
+                return -1;
+            }
+        }
+    }
+
+    thread_pool_wait_ctx_t wait_ctx;
+    wait_ctx_init(&wait_ctx);
+
+    thread_pool_job_t job;
+    memset(&job, 0, sizeof(job));
+    job.type = THREAD_POOL_JOB_REQ_QUERY;
+    job.payload = payload;
+    job.payload_free = free_req_payload;
+    job.result_cb = wait_ctx_result_cb;
+    job.result_cb_ctx = &wait_ctx;
+
+    thread_pool_status_t submit_rc = thread_pool_submit_read(&job, NULL);
+    if (submit_rc != THREAD_POOL_STATUS_OK) {
+        free_req_payload(payload);
+        wait_ctx_destroy(&wait_ctx);
+        return -1;
+    }
+
+    wait_ctx_wait(&wait_ctx);
+
+    int rc = -1;
+    if (wait_ctx.status == THREAD_POOL_STATUS_OK && wait_ctx.result_data) {
+        *out_result = (thread_pool_req_result_t*)wait_ctx.result_data;
+        rc = 0;
+    }
+
+    wait_ctx_destroy(&wait_ctx);
+    return rc;
+}
+
+void thread_pool_free_req_result(thread_pool_req_result_t* result) {
+    if (!result) return;
+    if (result->event_json_rows) {
+        for (int i = 0; i < result->row_count; i++) {
+            free(result->event_json_rows[i]);
+        }
+        free(result->event_json_rows);
+    }
+    free(result);
+}
+
+int thread_pool_execute_store_event_sync(const thread_pool_store_event_payload_t* payload,
+                                         thread_pool_store_event_result_t* out_result) {
+    if (!payload || !out_result || !payload->id || !payload->pubkey || !payload->content || !payload->sig) {
+        return -1;
+    }
+
+    if (!thread_pool_is_running()) {
+        int step_rc = DB_ERROR;
+        int extended_errcode = 0;
+        if (db_insert_event_with_json(payload->id,
+                                      payload->pubkey,
+                                      payload->created_at,
+                                      payload->kind,
+                                      payload->event_type ? payload->event_type : "regular",
+                                      payload->content,
+                                      payload->sig,
+                                      payload->tags_json ? payload->tags_json : "[]",
+                                      payload->event_json ? payload->event_json : "{}",
+                                      &step_rc,
+                                      &extended_errcode) != 0) {
+            return -1;
+        }
+        out_result->step_rc = step_rc;
+        out_result->extended_errcode = extended_errcode;
+        return 0;
+    }
+
+    thread_pool_store_event_payload_t* payload_copy = calloc(1, sizeof(*payload_copy));
+    if (!payload_copy) return -1;
+
+    payload_copy->id = payload->id ? strdup(payload->id) : NULL;
+    payload_copy->pubkey = payload->pubkey ? strdup(payload->pubkey) : NULL;
+    payload_copy->created_at = payload->created_at;
+    payload_copy->kind = payload->kind;
+    payload_copy->event_type = payload->event_type ? strdup(payload->event_type) : strdup("regular");
+    payload_copy->content = payload->content ? strdup(payload->content) : NULL;
+    payload_copy->sig = payload->sig ? strdup(payload->sig) : NULL;
+    payload_copy->tags_json = payload->tags_json ? strdup(payload->tags_json) : strdup("[]");
+    payload_copy->event_json = payload->event_json ? strdup(payload->event_json) : strdup("{}");
+
+    if (!payload_copy->id || !payload_copy->pubkey || !payload_copy->event_type ||
+        !payload_copy->content || !payload_copy->sig || !payload_copy->tags_json || !payload_copy->event_json) {
+        free_store_event_payload(payload_copy);
+        return -1;
+    }
+
+    thread_pool_wait_ctx_t wait_ctx;
+    wait_ctx_init(&wait_ctx);
+
+    thread_pool_job_t job;
+    memset(&job, 0, sizeof(job));
+    job.type = THREAD_POOL_JOB_STORE_EVENT;
+    job.payload = payload_copy;
+    job.payload_free = free_store_event_payload;
+    job.result_cb = wait_ctx_result_cb;
+    job.result_cb_ctx = &wait_ctx;
+
+    thread_pool_status_t submit_rc = thread_pool_submit_write(&job, NULL);
+    if (submit_rc != THREAD_POOL_STATUS_OK) {
+        free_store_event_payload(payload_copy);
+        wait_ctx_destroy(&wait_ctx);
+        return -1;
+    }
+
+    wait_ctx_wait(&wait_ctx);
+
+    int rc = -1;
+    if (wait_ctx.status == THREAD_POOL_STATUS_OK && wait_ctx.result_data) {
+        thread_pool_store_event_result_t* result = (thread_pool_store_event_result_t*)wait_ctx.result_data;
+        out_result->step_rc = result->step_rc;
+        out_result->extended_errcode = result->extended_errcode;
+        free(result);
+        rc = 0;
+    }
+
+    wait_ctx_destroy(&wait_ctx);
+    return rc;
+}
+
+__attribute__((constructor))
+static void thread_pool_state_init_once(void) {
+    pthread_mutex_init(&g_pool.state_mutex, NULL);
+}

src/thread_pool.h

@@ -0,0 +1,116 @@
+#ifndef THREAD_POOL_H
+#define THREAD_POOL_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    THREAD_POOL_JOB_REQ_QUERY = 0,
+    THREAD_POOL_JOB_COUNT_QUERY,
+    THREAD_POOL_JOB_STORE_EVENT,
+    THREAD_POOL_JOB_DELETE_EVENT,
+    THREAD_POOL_JOB_CUSTOM
+} thread_pool_job_type_t;
+
+typedef enum {
+    THREAD_POOL_STATUS_OK = 0,
+    THREAD_POOL_STATUS_NOT_IMPLEMENTED,
+    THREAD_POOL_STATUS_QUEUE_FULL,
+    THREAD_POOL_STATUS_SHUTTING_DOWN,
+    THREAD_POOL_STATUS_INTERNAL_ERROR
+} thread_pool_status_t;
+
+typedef struct {
+    uint64_t job_id;
+    thread_pool_job_type_t type;
+    thread_pool_status_t status;
+    void* session;
+    void* result_data;
+    size_t result_size;
+    const char* message;
+} thread_pool_result_t;
+
+typedef void (*thread_pool_result_cb)(const thread_pool_result_t* result, void* user_ctx);
+typedef void (*thread_pool_payload_free_cb)(void* payload);
+typedef void (*thread_pool_wake_loop_cb)(void* wake_ctx);
+
+typedef struct {
+    thread_pool_job_type_t type;
+    void* session;
+    void* payload;
+    size_t payload_size;
+    thread_pool_payload_free_cb payload_free;
+    thread_pool_result_cb result_cb;
+    void* result_cb_ctx;
+} thread_pool_job_t;
+
+typedef struct {
+    int reader_threads;
+    int max_queue_depth;
+    const char* db_path;
+    thread_pool_wake_loop_cb wake_loop_cb;
+    void* wake_loop_ctx;
+} thread_pool_config_t;
+
+typedef struct {
+    char* sql;
+    char** bind_params;
+    int bind_param_count;
+} thread_pool_count_payload_t;
+
+typedef struct {
+    char* sql;
+    char** bind_params;
+    int bind_param_count;
+    int row_limit;
+} thread_pool_req_payload_t;
+
+typedef struct {
+    char* id;
+    char* pubkey;
+    long long created_at;
+    int kind;
+    char* event_type;
+    char* content;
+    char* sig;
+    char* tags_json;
+    char* event_json;
+} thread_pool_store_event_payload_t;
+
+typedef struct {
+    int count;
+} thread_pool_count_result_t;
+
+typedef struct {
+    char** event_json_rows;
+    int row_count;
+} thread_pool_req_result_t;
+
+typedef struct {
+    int step_rc;
+    int extended_errcode;
+} thread_pool_store_event_result_t;
+
+int thread_pool_init(const thread_pool_config_t* config);
+void thread_pool_shutdown(void);
+int thread_pool_is_running(void);
+
+thread_pool_status_t thread_pool_submit_read(const thread_pool_job_t* job, uint64_t* out_job_id);
+thread_pool_status_t thread_pool_submit_write(const thread_pool_job_t* job, uint64_t* out_job_id);
+
+int thread_pool_execute_count_sync(const char* sql, const char** bind_params, int bind_param_count, int* out_count);
+int thread_pool_execute_req_sync(const char* sql, const char** bind_params, int bind_param_count,
+                                 int row_limit, thread_pool_req_result_t** out_result);
+void thread_pool_free_req_result(thread_pool_req_result_t* result);
+int thread_pool_execute_store_event_sync(const thread_pool_store_event_payload_t* payload,
+                                         thread_pool_store_event_result_t* out_result);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // THREAD_POOL_H

src/websockets.c

@@ -10,7 +10,6 @@
 #include <signal.h>
 #include <time.h>
 #include <pthread.h>
-#include <sqlite3.h>
 
 // Include libwebsockets after pthread.h to ensure pthread_rwlock_t is defined
 #include <libwebsockets.h>
@@ -31,6 +30,8 @@
 #include "api.h"  // API for embedded files
 #include "dm_admin.h"  // DM admin functions including NIP-17
 #include "ip_ban.h"  // IP auth failure ban system
+#include "thread_pool.h"  // Thread pool scaffold
+#include "db_ops.h"  // DB abstraction wrappers
 
 // Forward declarations for logging functions
 
@@ -107,7 +108,6 @@ void send_notice_message(struct lws* wsi, struct per_session_data* pss, const ch
 extern int get_config_bool(const char* key, int default_value);
 
 // Forward declarations for global state
-extern sqlite3* g_db;
 extern int g_server_running;
 extern volatile sig_atomic_t g_shutdown_flag;
 extern int g_restart_requested;
@@ -116,6 +116,9 @@ extern struct lws_context *ws_context;
 // Global subscription manager
 struct subscription_manager g_subscription_manager;
 
+// Actual relay port bound by libwebsockets at runtime (after fallback/retry logic)
+int g_relay_port = DEFAULT_PORT;
+
 // Global connection list for idle connection tracking
 // Tracks ALL WebSocket connections (not just subscribed ones)
 // so the periodic timer can find and close idle connections
@@ -130,6 +133,8 @@ static tracked_connection_t g_connections[MAX_TRACKED_CONNECTIONS];
 static int g_connection_count = 0;
 static pthread_mutex_t g_connections_lock = PTHREAD_MUTEX_INITIALIZER;
 
+int get_active_connection_count(void) { return g_connection_count; }
+
 static void connection_list_add(struct lws* wsi, struct per_session_data* pss) {
     pthread_mutex_lock(&g_connections_lock);
     for (int i = 0; i < MAX_TRACKED_CONNECTIONS; i++) {
@@ -345,43 +350,55 @@ int process_message_queue(struct lws* wsi, struct per_session_data* pss) {
         return -1;
     }
 
-    // Get next message from queue (thread-safe)
-    pthread_mutex_lock(&pss->session_lock);
+    // Drain as many queued messages as possible in one writeable callback.
+    // This avoids short-lived clients timing out before receiving all EVENT/EOSE frames.
+    int processed = 0;
+    while (1) {
+        pthread_mutex_lock(&pss->session_lock);
+
+        struct message_queue_node* node = pss->message_queue_head;
+        if (!node) {
+            // Queue is empty
+            pss->writeable_requested = 0;
+            pthread_mutex_unlock(&pss->session_lock);
+            break;
+        }
+
+        // Remove from queue
+        pss->message_queue_head = node->next;
+        if (!pss->message_queue_head) {
+            pss->message_queue_tail = NULL;
+        }
+        pss->message_queue_count--;
 
-    struct message_queue_node* node = pss->message_queue_head;
-    if (!node) {
-        // Queue is empty
-        pss->writeable_requested = 0;
         pthread_mutex_unlock(&pss->session_lock);
-        return 0;
+
+        // Write message (libwebsockets handles partial writes internally)
+        int write_result = lws_write(wsi, node->data + LWS_PRE, node->length, node->type);
+
+        // Free node resources
+        free(node->data);
+        free(node);
+
+        if (write_result < 0) {
+            DEBUG_ERROR("process_message_queue: write failed, result=%d", write_result);
+            return -1;
+        }
+
+        processed++;
+
+        // If socket is currently choked, stop and continue later.
+        if (lws_send_pipe_choked(wsi)) {
+            break;
+        }
     }
 
-    // Remove from queue
-    pss->message_queue_head = node->next;
-    if (!pss->message_queue_head) {
-        pss->message_queue_tail = NULL;
-    }
-    pss->message_queue_count--;
+    DEBUG_TRACE("Processed %d queued messages", processed);
 
-    pthread_mutex_unlock(&pss->session_lock);
-
-    // Write message (libwebsockets handles partial writes internally)
-    int write_result = lws_write(wsi, node->data + LWS_PRE, node->length, node->type);
-
-    // Free node resources
-    free(node->data);
-    free(node);
-
-    if (write_result < 0) {
-        DEBUG_ERROR("process_message_queue: write failed, result=%d", write_result);
-        return -1;
-    }
-
-    DEBUG_TRACE("Processed message: wrote %d bytes, remaining in queue: %d", write_result, pss->message_queue_count);
-
-    // If queue not empty, request another callback
+    // If queue still has pending messages, ensure we request another callback.
     pthread_mutex_lock(&pss->session_lock);
     if (pss->message_queue_head) {
+        pss->writeable_requested = 1;
         lws_callback_on_writable(wsi);
     } else {
         pss->writeable_requested = 0;
@@ -453,33 +470,27 @@ static int nostr_relay_callback(struct lws *wsi, enum lws_callback_reasons reaso
                         }
                     }
 
-                    // Not a WebSocket upgrade, check for NIP-11 request
+                    // Not a WebSocket upgrade: treat root path as NIP-11 endpoint.
+                    // NIP-11 handler will return 200 for proper Accept header and 406 otherwise.
                     char accept_header[256] = {0};
                     int header_len = lws_hdr_copy(wsi, accept_header, sizeof(accept_header) - 1, WSI_TOKEN_HTTP_ACCEPT);
+                    const char* accept_ptr = NULL;
 
                     if (header_len > 0) {
                         accept_header[header_len] = '\0';
-
-                        // Check if this is a NIP-11 request
-                        int is_nip11_request = (strstr(accept_header, "application/nostr+json") != NULL);
-
-                        if (is_nip11_request) {
-                            // Mark session as active so HTTP requests don't trigger idle ban
-                            if (pss) {
-                                pthread_mutex_lock(&pss->session_lock);
-                                pss->session_active = 1;
-                                pthread_mutex_unlock(&pss->session_lock);
-                            }
-                            // Handle NIP-11 request
-                            if (handle_nip11_http_request(wsi, accept_header) == 0) {
-                                return 0; // Successfully handled
-                            }
-                        }
+                        accept_ptr = accept_header;
                     }
 
-                    // Root path without NIP-11 Accept header and not WebSocket - return 404
-                    DEBUG_WARN("Rejecting root path request - not WebSocket upgrade and not NIP-11");
-                    lws_return_http_status(wsi, HTTP_STATUS_NOT_FOUND, NULL);
+                    // Mark session as active so HTTP requests don't trigger idle ban
+                    if (pss) {
+                        pthread_mutex_lock(&pss->session_lock);
+                        pss->session_active = 1;
+                        pthread_mutex_unlock(&pss->session_lock);
+                    }
+
+                    if (handle_nip11_http_request(wsi, accept_ptr) == 0) {
+                        return 0; // Successfully handled
+                    }
                     return -1;
                 }
 
@@ -1535,6 +1546,7 @@ static int nostr_relay_callback(struct lws *wsi, enum lws_callback_reasons reaso
                                                         }
                                                     }
                                                 }
+                                                free((char*)relay_pubkey);
                                             }
                                         }
                                     }
@@ -1547,6 +1559,7 @@ static int nostr_relay_callback(struct lws *wsi, enum lws_callback_reasons reaso
                                         } else {
                                             DEBUG_INFO("DEBUG: Kind 23456 event but pubkey mismatch or no admin pubkey");
                                         }
+                                        if (admin_pubkey) free((char*)admin_pubkey);
                                     }
 
                                     if (pss && auth_required && !pss->authenticated && !bypass_auth) {
@@ -2447,8 +2460,7 @@ static void check_connection_age(int max_connection_seconds) {
 
     // Periodic IP ban maintenance: cleanup expired entries, log stats, save to DB
     ip_ban_cleanup();
-    extern sqlite3* g_db;
-    ip_ban_log_stats(g_db);
+    ip_ban_log_stats();
 }
 
 // WebSocket protocol definition
@@ -2607,6 +2619,9 @@ int start_websocket_relay(int port_override, int strict_port) {
         return -1;
     }
 
+    // Persist the actual bound port for components that need the runtime relay URL
+    g_relay_port = actual_port;
+
     char startup_msg[256];
     if (actual_port != configured_port) {
         snprintf(startup_msg, sizeof(startup_msg),
@@ -2666,8 +2681,7 @@ int start_websocket_relay(int port_override, int strict_port) {
             } else {
                 // Even when connection age limit is disabled, run IP ban maintenance
                 ip_ban_cleanup();
-                extern sqlite3* g_db;
-                ip_ban_log_stats(g_db);
+                ip_ban_log_stats();
             }
         }
     }
@@ -2716,6 +2730,7 @@ int process_dm_stats_command(cJSON* dm_event, char* error_message, size_t error_
             }
         }
     }
+    free((char*)relay_pubkey);
 
     if (!addressed_to_relay) {
         // Not addressed to relay, allow normal processing
@@ -2734,9 +2749,11 @@ int process_dm_stats_command(cJSON* dm_event, char* error_message, size_t error_
     const char* admin_pubkey = get_config_value("admin_pubkey");
     if (!admin_pubkey || strlen(admin_pubkey) == 0 ||
         strcmp(sender_pubkey, admin_pubkey) != 0) {
+        if (admin_pubkey) free((char*)admin_pubkey);
         strncpy(error_message, "Unauthorized: not admin", error_size - 1);
         return -1;
     }
+    free((char*)admin_pubkey);
 
     // Get relay private key for decryption
     char* relay_privkey_hex = get_relay_private_key();
@@ -3111,29 +3128,12 @@ int handle_count_message(const char* sub_id, cJSON* filters, struct lws *wsi, st
         struct timespec query_start, query_end;
         clock_gettime(CLOCK_MONOTONIC, &query_start);
 
-        // Execute count query
-        sqlite3_stmt* stmt;
-        int rc = sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL);
-        if (rc != SQLITE_OK) {
-            char error_msg[256];
-            snprintf(error_msg, sizeof(error_msg), "Failed to prepare COUNT query: %s", sqlite3_errmsg(g_db));
-            DEBUG_ERROR(error_msg);
+        // Execute count query via thread pool helper
+        int filter_count = 0;
+        if (thread_pool_execute_count_sync(sql, (const char**)bind_params, bind_param_count, &filter_count) != 0) {
+            DEBUG_ERROR("Failed to execute COUNT query via db_ops/thread_pool");
             continue;
         }
-
-        // Bind parameters
-        for (int i = 0; i < bind_param_count; i++) {
-            sqlite3_bind_text(stmt, i + 1, bind_params[i], -1, SQLITE_TRANSIENT);
-        }
-
-        int filter_count = 0;
-        if (sqlite3_step(stmt) == SQLITE_ROW) {
-            filter_count = sqlite3_column_int(stmt, 0);
-        }
-
-        // Filter count calculated
-
-        sqlite3_finalize(stmt);
         
         // Stop query timing and log
         clock_gettime(CLOCK_MONOTONIC, &query_end);

src/websockets.h

@@ -96,6 +96,12 @@ struct per_session_data {
     int is_websocket;                         // 1 if this is a WebSocket connection, 0 for HTTP
 };
 
+// Get current active WebSocket connection count
+int get_active_connection_count(void);
+
+// Actual relay port bound by libwebsockets at runtime (after fallback/retry logic)
+extern int g_relay_port;
+
 // NIP-11 HTTP session data structure for managing buffer lifetime
 struct nip11_session_data {
     int type; // 0 for NIP-11

test_results_20260401_091057.log

@@ -0,0 +1,18 @@
+2026-04-01 09:10:57 - ==========================================
+2026-04-01 09:10:57 - C-Relay Comprehensive Test Suite Runner
+2026-04-01 09:10:57 - ==========================================
+2026-04-01 09:10:57 - Relay URL: ws://127.0.0.1:8888
+2026-04-01 09:10:57 - Log file: test_results_20260401_091057.log
+2026-04-01 09:10:57 - Report file: test_report_20260401_091057.html
+2026-04-01 09:10:57 - 
+2026-04-01 09:10:57 - Checking relay status at ws://127.0.0.1:8888...
+2026-04-01 09:10:57 - \033[0;32m✓ Relay HTTP endpoint is accessible\033[0m
+2026-04-01 09:10:57 - 
+2026-04-01 09:10:57 - Starting comprehensive test execution...
+2026-04-01 09:10:57 - 
+2026-04-01 09:10:57 - \033[0;34m=== SECURITY TEST SUITES ===\033[0m
+2026-04-01 09:10:57 - ==========================================
+2026-04-01 09:10:57 - Running Test Suite: SQL Injection Tests
+2026-04-01 09:10:57 - Description: Comprehensive SQL injection vulnerability testing
+2026-04-01 09:10:57 - ==========================================
+2026-04-01 09:10:57 - \033[0;31mERROR: Test script sql_injection_tests.sh not found\033[0m

test_results_20260401_093238.log

@@ -0,0 +1,18 @@
+2026-04-01 09:32:38 - ==========================================
+2026-04-01 09:32:38 - C-Relay Comprehensive Test Suite Runner
+2026-04-01 09:32:38 - ==========================================
+2026-04-01 09:32:38 - Relay URL: ws://127.0.0.1:8888
+2026-04-01 09:32:38 - Log file: test_results_20260401_093238.log
+2026-04-01 09:32:38 - Report file: test_report_20260401_093238.html
+2026-04-01 09:32:38 - 
+2026-04-01 09:32:38 - Checking relay status at ws://127.0.0.1:8888...
+2026-04-01 09:32:38 - \033[0;32m✓ Relay HTTP endpoint is accessible\033[0m
+2026-04-01 09:32:38 - 
+2026-04-01 09:32:38 - Starting comprehensive test execution...
+2026-04-01 09:32:38 - 
+2026-04-01 09:32:38 - \033[0;34m=== SECURITY TEST SUITES ===\033[0m
+2026-04-01 09:32:38 - ==========================================
+2026-04-01 09:32:38 - Running Test Suite: SQL Injection Tests
+2026-04-01 09:32:38 - Description: Comprehensive SQL injection vulnerability testing
+2026-04-01 09:32:38 - ==========================================
+2026-04-01 09:32:38 - \033[0;31mERROR: Test script sql_injection_tests.sh not found\033[0m

tests/45_nip_test.sh

@@ -54,6 +54,8 @@ BASELINE_KIND1=0
 BASELINE_KIND0=0
 BASELINE_KIND30001=0
 BASELINE_AUTHOR=0
+BASELINE_AUTHOR_KIND0=0
+BASELINE_AUTHOR_KIND30001=0
 BASELINE_TYPE_REGULAR=0
 BASELINE_TEST_NIP45=0
 BASELINE_KINDS_01=0
@@ -253,9 +255,11 @@ run_count_test() {
 
     publish_event "$regular1" "regular" "Regular event #1"
 
-    # Now that we have the pubkey, get the author baseline
+    # Now that we have the pubkey, get author baselines
     local test_pubkey=$(echo "$regular1" | jq -r '.pubkey' 2>/dev/null)
     BASELINE_AUTHOR=$(get_baseline_count "{\"authors\":[\"$test_pubkey\"]}" "events by test author")
+    BASELINE_AUTHOR_KIND0=$(get_baseline_count "{\"authors\":[\"$test_pubkey\"],\"kinds\":[0]}" "kind 0 events by test author")
+    BASELINE_AUTHOR_KIND30001=$(get_baseline_count "{\"authors\":[\"$test_pubkey\"],\"kinds\":[30001]}" "kind 30001 events by test author")
 
     publish_event "$regular2" "regular" "Regular event #2"
     publish_event "$regular3" "regular" "Regular event #3"
@@ -314,10 +318,13 @@ run_count_test() {
     fi
 
     # Test 3: Count events by author (pubkey)
-    # BASELINE_AUTHOR includes the first regular event, we add 2 more regular
-    # Replaceable and addressable replace existing events from this author
+    # BASELINE_AUTHOR is measured after regular1 is already published.
+    # Net additions after baseline:
+    #   +2 regular (regular2, regular3)
+    #   +(1 - BASELINE_AUTHOR_KIND0) from replaceable upsert behavior
+    #   +(1 - BASELINE_AUTHOR_KIND30001) from addressable replacement behavior
     local test_pubkey=$(echo "$regular1" | jq -r '.pubkey' 2>/dev/null)
-    local expected_author=$((2 + BASELINE_AUTHOR))
+    local expected_author=$((BASELINE_AUTHOR + 2 + (1 - BASELINE_AUTHOR_KIND0) + (1 - BASELINE_AUTHOR_KIND30001)))
     if ! test_count "count_author" "{\"authors\":[\"$test_pubkey\"]}" "Count events by specific author" "$expected_author"; then
         ((test_failures++))
     fi
@@ -340,8 +347,10 @@ run_count_test() {
     fi
 
     # Test 6: Count multiple kinds
-    # BASELINE_KINDS_01 + 3 regular events = total for kinds 0+1
-    local expected_kinds_01=$((3 + BASELINE_KINDS_01))
+    # Net additions for kinds 0+1 after baseline:
+    #   +3 kind-1 regular events
+    #   +(1 - BASELINE_AUTHOR_KIND0) for kind-0 replaceable upsert behavior
+    local expected_kinds_01=$((BASELINE_KINDS_01 + 3 + (1 - BASELINE_AUTHOR_KIND0)))
     if ! test_count "count_multi_kinds" '{"kinds":[0,1]}' "Count multiple kinds (0,1)" "$expected_kinds_01"; then
         ((test_failures++))
     fi

tests/filter_validation_test.sh

@@ -8,7 +8,7 @@ set -e
 # Configuration
 RELAY_HOST="127.0.0.1"
 RELAY_PORT="8888"
-TEST_TIMEOUT=5
+TEST_TIMEOUT=10
 
 # Colors for output
 RED='\033[0;31m'
@@ -34,7 +34,7 @@ test_websocket_message() {
 
     # Send message via websocat and capture response
     local response
-    response=$(echo "$message" | timeout $TEST_TIMEOUT websocat -B 1048576 ws://$RELAY_HOST:$RELAY_PORT 2>/dev/null || echo 'CONNECTION_FAILED')
+    response=$(echo "$message" | timeout $TEST_TIMEOUT websocat -B 1048576 ws://$RELAY_HOST:$RELAY_PORT 2>/dev/null | head -1 || echo 'CONNECTION_FAILED')
 
     if [[ "$response" == "CONNECTION_FAILED" ]]; then
         echo -e "${RED}FAILED${NC} - Could not connect to relay"
@@ -42,8 +42,8 @@ test_websocket_message() {
         return 1
     fi
 
-    if [[ "$response" == "TIMEOUT" ]]; then
-        echo -e "${RED}FAILED${NC} - Connection timeout"
+    if [[ -z "$response" ]]; then
+        echo -e "${RED}FAILED${NC} - Empty response"
         FAILED_TESTS=$((FAILED_TESTS + 1))
         return 1
     fi
@@ -119,8 +119,9 @@ test_websocket_message "Invalid author type" '["REQ","sub1",{"authors":[123]}]'
 # Test 6: Invalid author hex
 test_websocket_message "Invalid author hex" '["REQ","sub1",{"authors":["invalid-hex"]}]' "error: invalid author hex string"
 
-# Test 7: Too many authors
-test_websocket_message "Too many authors" '["REQ","sub1",{"authors":["a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a"]}]' "error: too many authors"
+# Test 7: Too many authors (exceed MAX_AUTHORS_PER_FILTER with compact payload)
+too_many_authors=$(yes '"a"' | head -n 1001 | paste -sd, -)
+test_websocket_message "Too many authors" "[\"REQ\",\"sub1\",{\"authors\":[${too_many_authors}]}]" "error: too many authors"
 
 echo
 echo "=== Testing IDs Validation ==="
@@ -131,8 +132,9 @@ test_websocket_message "Invalid ID type" '["REQ","sub1",{"ids":[123]}]' "error:
 # Test 9: Invalid ID hex
 test_websocket_message "Invalid ID hex" '["REQ","sub1",{"ids":["invalid-hex"]}]' "error: invalid id hex string"
 
-# Test 10: Too many IDs
-test_websocket_message "Too many IDs" '["REQ","sub1",{"ids":["a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a","a"]}]' "error: too many ids"
+# Test 10: Too many IDs (exceed MAX_IDS_PER_FILTER with compact payload)
+too_many_ids=$(yes '"a"' | head -n 1001 | paste -sd, -)
+test_websocket_message "Too many IDs" "[\"REQ\",\"sub1\",{\"ids\":[${too_many_ids}]}]" "error: too many ids"
 
 echo
 echo "=== Testing Kinds Validation ==="
@@ -146,8 +148,9 @@ test_websocket_message "Negative kind" '["REQ","sub1",{"kinds":[-1]}]' "error: i
 # Test 13: Too large kind
 test_websocket_message "Too large kind" '["REQ","sub1",{"kinds":[70000]}]' "error: invalid kind value"
 
-# Test 14: Too many kinds
-test_websocket_message "Too many kinds" '["REQ","sub1",{"kinds":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52]}]' "error: too many kinds"
+# Test 14: Too many kinds (exceed MAX_KINDS_PER_FILTER=500)
+too_many_kinds=$(seq -s, 1 501)
+test_websocket_message "Too many kinds" "[\"REQ\",\"sub1\",{\"kinds\":[${too_many_kinds}]}]" "error: too many kinds"
 
 echo
 echo "=== Testing Timestamp Validation ==="
@@ -194,8 +197,9 @@ echo "=== Testing Tag Filter Validation ==="
 # Test 25: Invalid tag filter type
 test_websocket_message "Invalid tag filter type" '["REQ","sub1",{"#e":"not-an-array"}]' "error: #e must be an array"
 
-# Test 26: Too many tag values
-test_websocket_message "Too many tag values" '["REQ","sub1",{"#e":['$(printf '"a%.0s",' {1..101})'"a"]}]' "error: too many #e values"
+# Test 26: Too many tag values (exceed MAX_TAG_VALUES_PER_FILTER=1000)
+too_many_tag_values=$(yes '"a"' | head -n 1001 | paste -sd, -)
+test_websocket_message "Too many tag values" "[\"REQ\",\"sub1\",{\"#e\":[${too_many_tag_values}]}]" "error: too many #e values"
 
 # Test 27: Tag value too long
 test_websocket_message "Tag value too long" '["REQ","sub1",{"#e":["'$(printf 'a%.0s' {1..1025})'"]}]' "error: #e value too long"

tests/kind4_disconnect_probe.mjs

@@ -0,0 +1,272 @@
+#!/usr/bin/env node
+
+import WebSocket from 'ws';
+import {
+  finalizeEvent,
+  generateSecretKey,
+  getPublicKey,
+  nip19,
+  nip42,
+} from 'nostr-tools';
+
+const RELAY_URL = process.env.RELAY_URL || 'ws://127.0.0.1:7777';
+const EVENT_COUNT = Number(process.env.EVENT_COUNT || 5);
+const DELAY_MS = Number(process.env.DELAY_MS || 2000);
+const RECIPIENT_PUBKEY_ENV = process.env.RECIPIENT_PUBKEY || '';
+const SECRET_INPUT = process.env.NOSTR_SECRET_KEY || '';
+const OVERALL_TIMEOUT_MS = Number(process.env.OVERALL_TIMEOUT_MS || 120000);
+
+function now() {
+  return new Date().toISOString();
+}
+
+function log(msg, extra = null) {
+  if (extra !== null) {
+    console.log(`[${now()}] ${msg}`, extra);
+  } else {
+    console.log(`[${now()}] ${msg}`);
+  }
+}
+
+function normalizeHexSecret(secretInput) {
+  if (!secretInput) return null;
+
+  const raw = secretInput.trim();
+  if (/^[0-9a-fA-F]{64}$/.test(raw)) {
+    return raw.toLowerCase();
+  }
+
+  if (raw.startsWith('nsec1')) {
+    const decoded = nip19.decode(raw);
+    if (decoded.type !== 'nsec') {
+      throw new Error('NOSTR_SECRET_KEY is nsec-like but did not decode as nsec');
+    }
+    if (typeof decoded.data === 'string') {
+      return decoded.data.toLowerCase();
+    }
+    if (decoded.data instanceof Uint8Array) {
+      return Buffer.from(decoded.data).toString('hex').toLowerCase();
+    }
+    throw new Error('Unsupported nsec decoded payload type');
+  }
+
+  throw new Error('NOSTR_SECRET_KEY must be 64-char hex or nsec1...');
+}
+
+const hexSecret = normalizeHexSecret(SECRET_INPUT) || Buffer.from(generateSecretKey()).toString('hex');
+const secretKey = Buffer.from(hexSecret, 'hex');
+const senderPubkey = getPublicKey(secretKey);
+const recipientPubkey = RECIPIENT_PUBKEY_ENV || senderPubkey;
+
+let ws;
+let currentChallenge = null;
+let authenticated = false;
+let authAttempts = 0;
+let sentAccepted = 0;
+let nextSeq = 1;
+let pendingEvent = null;
+let waitingForAuth = false;
+let finished = false;
+let overallTimer = null;
+
+function makeKind4Event(seq) {
+  const eventTemplate = {
+    kind: 4,
+    created_at: Math.floor(Date.now() / 1000),
+    tags: [['p', recipientPubkey]],
+    content: `kind4 disconnect probe seq=${seq} ts=${Date.now()}`,
+    pubkey: senderPubkey,
+  };
+  return finalizeEvent(eventTemplate, secretKey);
+}
+
+function sendJson(arr) {
+  const payload = JSON.stringify(arr);
+  ws.send(payload);
+}
+
+function sendAuth(challenge) {
+  const authTemplate = nip42.makeAuthEvent(RELAY_URL, challenge);
+  const signedAuth = finalizeEvent(authTemplate, secretKey);
+  authAttempts += 1;
+  log(`Sending AUTH attempt #${authAttempts} with challenge ${challenge}`);
+  sendJson(['AUTH', signedAuth]);
+}
+
+function scheduleNext() {
+  if (nextSeq > EVENT_COUNT) {
+    log(`All ${EVENT_COUNT} kind-4 events were accepted without disconnect`);
+    cleanupAndExit(0);
+    return;
+  }
+  setTimeout(() => {
+    if (!finished) {
+      publishNext();
+    }
+  }, DELAY_MS);
+}
+
+function publishNext() {
+  if (waitingForAuth) {
+    log('Still waiting for auth completion, postponing publish');
+    return;
+  }
+
+  const ev = makeKind4Event(nextSeq);
+  pendingEvent = ev;
+  log(`Publishing kind-4 seq=${nextSeq} id=${ev.id.slice(0, 12)}...`);
+  sendJson(['EVENT', ev]);
+}
+
+function retryPendingAfterAuth() {
+  if (!pendingEvent) return;
+  waitingForAuth = false;
+  log(`Retrying pending kind-4 id=${pendingEvent.id.slice(0, 12)}... after auth`);
+  sendJson(['EVENT', pendingEvent]);
+}
+
+function handleAuthRequiredSignal(source, msg) {
+  waitingForAuth = true;
+  log(`Relay signaled auth-required via ${source}: ${msg}`);
+  if (currentChallenge) {
+    sendAuth(currentChallenge);
+  } else {
+    log('No AUTH challenge received yet; waiting for relay AUTH challenge message');
+  }
+}
+
+function cleanupAndExit(code) {
+  if (finished) return;
+  finished = true;
+  if (overallTimer) clearTimeout(overallTimer);
+
+  const summary = {
+    relay: RELAY_URL,
+    sentAccepted,
+    expected: EVENT_COUNT,
+    authAttempts,
+    authenticated,
+    senderPubkey,
+    recipientPubkey,
+  };
+
+  if (code === 0) {
+    log('PASS: Connection remained stable through repeated kind-4 publish cycle', summary);
+  } else {
+    log('FAIL: Relay disconnected or test did not complete successfully', summary);
+  }
+
+  try {
+    if (ws && ws.readyState === WebSocket.OPEN) {
+      ws.close();
+    }
+  } catch (_) {}
+
+  process.exit(code);
+}
+
+function main() {
+  log('Starting kind-4 disconnect probe', {
+    relay: RELAY_URL,
+    eventCount: EVENT_COUNT,
+    delayMs: DELAY_MS,
+    senderPubkey,
+    recipientPubkey,
+  });
+
+  ws = new WebSocket(RELAY_URL);
+
+  overallTimer = setTimeout(() => {
+    log(`Overall timeout reached (${OVERALL_TIMEOUT_MS}ms)`);
+    cleanupAndExit(1);
+  }, OVERALL_TIMEOUT_MS);
+
+  ws.on('open', () => {
+    log('WebSocket connected');
+    publishNext();
+  });
+
+  ws.on('message', (raw) => {
+    const text = raw.toString();
+    let msg;
+    try {
+      msg = JSON.parse(text);
+    } catch {
+      log(`Non-JSON relay message: ${text}`);
+      return;
+    }
+
+    const t = msg?.[0];
+
+    if (t === 'AUTH') {
+      currentChallenge = msg?.[1] || null;
+      log(`Received AUTH challenge: ${currentChallenge}`);
+      if (currentChallenge) sendAuth(currentChallenge);
+      return;
+    }
+
+    if (t === 'NOTICE') {
+      const notice = String(msg?.[1] || '');
+      log(`NOTICE: ${notice}`);
+
+      if (notice.toLowerCase().includes('auth-required')) {
+        handleAuthRequiredSignal('NOTICE', notice);
+        return;
+      }
+
+      if (notice.toLowerCase().includes('authentication successful')) {
+        authenticated = true;
+        log('Relay confirmed NIP-42 authentication success');
+        retryPendingAfterAuth();
+      }
+      return;
+    }
+
+    if (t === 'OK') {
+      const eventId = msg?.[1];
+      const ok = !!msg?.[2];
+      const reason = String(msg?.[3] || '');
+      log(`OK for ${String(eventId).slice(0, 12)}... accepted=${ok} reason=${reason}`);
+
+      if (!ok && reason.toLowerCase().includes('auth-required')) {
+        handleAuthRequiredSignal('OK', reason);
+        return;
+      }
+
+      if (pendingEvent && eventId === pendingEvent.id) {
+        if (ok) {
+          sentAccepted += 1;
+          nextSeq += 1;
+          pendingEvent = null;
+          waitingForAuth = false;
+          scheduleNext();
+        } else {
+          log(`Pending event rejected: ${reason}`);
+          cleanupAndExit(1);
+        }
+      }
+      return;
+    }
+
+    log('Relay message', msg);
+  });
+
+  ws.on('close', (code, reasonBuf) => {
+    const reason = reasonBuf?.toString?.() || '';
+    log(`WebSocket closed code=${code} reason=${reason}`);
+    if (!finished) {
+      if (sentAccepted >= EVENT_COUNT) {
+        cleanupAndExit(0);
+      } else {
+        cleanupAndExit(1);
+      }
+    }
+  });
+
+  ws.on('error', (err) => {
+    log(`WebSocket error: ${err.message}`);
+    cleanupAndExit(1);
+  });
+}
+
+main();

tests/nip42_test.log

@@ -1,11 +1,13 @@
 === NIP-42 Authentication Test Started ===
-2026-02-24 09:45:30 - Starting NIP-42 authentication tests
+2026-04-01 05:46:11 - Starting NIP-42 authentication tests
 [INFO] === Starting NIP-42 Authentication Tests ===
 [INFO] Checking dependencies...
+[WARNING] wscat not found. Some manual WebSocket tests will be skipped
+[WARNING] Install with: npm install -g wscat
 [SUCCESS] Dependencies check complete
 [INFO] Test 1: Checking NIP-42 support in relay info
 [SUCCESS] NIP-42 is advertised in supported NIPs
-2026-02-24 09:45:30 - Supported NIPs: 1,2,4,9,11,12,13,15,16,20,22,33,40,42,50,70
+2026-04-01 05:46:11 - Supported NIPs: 1,2,4,9,11,12,13,15,16,20,22,33,40,42,50,70
 [INFO] Test 2: Testing AUTH challenge generation
 [WARNING] Could not extract admin private key from relay.log - using manual test approach
 [INFO] Manual test: Connect to relay and send an event without auth to trigger challenge
@@ -13,64 +15,61 @@
 [INFO] Generated test keypair: test_pubkey
 [INFO] Attempting to publish event without authentication...
 [INFO] Publishing test event to relay...
-2026-02-24 09:45:31 - Event publish result: connecting to ws://localhost:8888... ok.
-{"kind":1,"id":"74a0b723797569b2483d47457d2f6e2378aed6ccd4cca0f553038e0431ade0e8","pubkey":"7a2f213c220c46a194c5730e5bb2fe9b27304f0c27226f380086d93ff10bf7da","created_at":1771940731,"tags":[],"content":"NIP-42 test event - should require auth","sig":"319466df2167cd7f33c83d41b09bdd06f23c961380fd205a0a5dc5a923f11e45b6d158d79e251239bef364430c5d45e6a9e43fe93fd629864a88de00e6766a44"}
+2026-04-01 05:46:12 - Event publish result: connecting to localhost:8888... ok.
+{"kind":1,"id":"334754e42c2bd54bdf733fb2c9a28c1e0f33d2275ca2c70f26062187793b37fe","pubkey":"40d9f28055baeba6a9bcac1942a17370add58a95a46985f66c5c14d485573983","created_at":1775036772,"tags":[],"content":"NIP-42 test event - should require auth","sig":"6e81c7335d34a770c72566250ac363aa5a126383a1efe2effe5b4b7e84bf600c4d9531b26e9be188fe884e9bd32aa384d49739815c7fba4594174277b90cbf7d"}
 publishing to ws://localhost:8888... success.
 [SUCCESS] Relay requested authentication as expected
 [INFO] Test 4: Testing WebSocket AUTH message handling
-[INFO] Testing WebSocket connection and AUTH message...
-[INFO] Sending test message via WebSocket...
-2026-02-24 09:45:31 - WebSocket response: 
-[INFO] No AUTH challenge in WebSocket response
+[WARNING] Skipping WebSocket tests - wscat not available
 [INFO] Test 5: Testing NIP-42 configuration options
 [INFO] Retrieving current relay configuration...
 [WARNING] Could not retrieve configuration events
 [INFO] Test 6: Testing NIP-42 performance and stability
 [INFO] Testing multiple authentication attempts...
-2026-02-24 09:45:33 - Attempt 1: .264126491s - connecting to ws://localhost:8888... ok.
-{"kind":1,"id":"9cb8f626ced97e8fc406bd2d2358074fe33542d983d11a7f039a26919ded6039","pubkey":"7c098dbaeeaca6fb27798625835dfc5c13fb31096eed76c6d77269a2a08cd22b","created_at":1771940733,"tags":[],"content":"Performance test event 1","sig":"87025c881004a7936589785bbba6171542135348e4f798c490c033eb462c9a0322882cfe1a2b742e3644b6c69ee4fee76feb3cffecd6d64c096fa8038bcd84c4"}
+2026-04-01 05:46:13 - Attempt 1: .187311847s - connecting to localhost:8888... ok.
+{"kind":1,"id":"470a74d32e1b739e6bfd275c0d03ab1508fb5908c0fa01523e4a3bdce6a95db3","pubkey":"59d792f5cfd57b3a284ce769b5d4b1e8a6eb231c63239cdad7f07d791433e79a","created_at":1775036773,"tags":[],"content":"Performance test event 1","sig":"0c30a125cb67d336413f006a5dfa422d788e177254e496b966854bf45183238d23f6575dba37dec6fa46b6f6b906a25afafcbbcaa7d0c15add89dd7fd1a80c22"}
 publishing to ws://localhost:8888... success.
-2026-02-24 09:45:33 - Attempt 2: .262980094s - connecting to ws://localhost:8888... ok.
-{"kind":1,"id":"bb1b3da4cccbcdc6be73646e29ecf060b68d8cb9340f8b23da0f167ffac0831d","pubkey":"7c098dbaeeaca6fb27798625835dfc5c13fb31096eed76c6d77269a2a08cd22b","created_at":1771940733,"tags":[],"content":"Performance test event 2","sig":"1349f7af97edb9f507081782cfb2d055eb810ec96056b97692920060091ccf39b8d1ba8590d25e1b3c92f4b785f6362ac0d734373d29d4159e5778f8982b086f"}
+2026-04-01 05:46:13 - Attempt 2: .185565503s - connecting to localhost:8888... ok.
+{"kind":1,"id":"e4f9db77d30d8e71ef01b16dcb1179d03462aaf368aae30120898f3758a9d0b9","pubkey":"59d792f5cfd57b3a284ce769b5d4b1e8a6eb231c63239cdad7f07d791433e79a","created_at":1775036773,"tags":[],"content":"Performance test event 2","sig":"24a8f38c2cb230d95120e60a246a1a03ac17d4d195d25f2ae0b2f674c3383287eca53cd7fc61bc3cdc58433a3d2c2108558f4f1a98dcfc02a97b4ec8c537cdde"}
 publishing to ws://localhost:8888... success.
-2026-02-24 09:45:34 - Attempt 3: .296311100s - connecting to ws://localhost:8888... ok.
-{"kind":1,"id":"3b171de7c00e918ad0bcbedea4c07c69f59a9d20c31b0de957488c919fa5c116","pubkey":"7c098dbaeeaca6fb27798625835dfc5c13fb31096eed76c6d77269a2a08cd22b","created_at":1771940734,"tags":[],"content":"Performance test event 3","sig":"a1699f12064d4da7ba15519eb7666cd2801f333ee837df70ce1298ac97477e900d095dce8fed0bade8f3e3e2e2b68e22800d10ba213a1de6cd1537112d6a6c2a"}
+2026-04-01 05:46:14 - Attempt 3: .185110183s - connecting to localhost:8888... ok.
+{"kind":1,"id":"4a85e466756452e90358fe5d98fa41bda93b6bc77cb079bb1616ca8873f4fca1","pubkey":"59d792f5cfd57b3a284ce769b5d4b1e8a6eb231c63239cdad7f07d791433e79a","created_at":1775036774,"tags":[],"content":"Performance test event 3","sig":"72ab716ff3b4786309fd4cef27ae8cd9df1e3c1746b5e49ba45c070cafcfb72a5b7ba045e7d798f23b5d82989526b4d3c818509f0eec639c8ad265be85a4728e"}
 publishing to ws://localhost:8888... success.
-2026-02-24 09:45:35 - Attempt 4: .300140904s - connecting to ws://localhost:8888... ok.
-{"kind":1,"id":"f3587b9955204284ec65f2b171d1fa3f330e0bbfc2d95fe7ad0550a63a6aabe6","pubkey":"7c098dbaeeaca6fb27798625835dfc5c13fb31096eed76c6d77269a2a08cd22b","created_at":1771940734,"tags":[],"content":"Performance test event 4","sig":"fb78cd3bce49097eea1c67c0a1ee92bf4cdf5bf6396ce20519481d0e4d09b03dca05c70da2ddf5ba51d23aa3253b21ec3b57bc41d000f274bb1123a4c3d64c45"}
+2026-04-01 05:46:14 - Attempt 4: .185725746s - connecting to localhost:8888... ok.
+{"kind":1,"id":"4c05b6359da88f85c0aa4c94a296a465f71bddaa10d849ed0923f972ac0628a9","pubkey":"59d792f5cfd57b3a284ce769b5d4b1e8a6eb231c63239cdad7f07d791433e79a","created_at":1775036774,"tags":[],"content":"Performance test event 4","sig":"3b0c8bd1f3d965a259a0ab228ea4c47defef3ad563ebce860ec65ab0ee341c5305c0988ac88651664d3090ce2ff282a0fe4913231448158c423a74b6e3b2a7a9"}
 publishing to ws://localhost:8888... success.
-2026-02-24 09:45:35 - Attempt 5: .373738147s - connecting to ws://localhost:8888... ok.
-{"kind":1,"id":"e1fdf2d0579f0e2b446bdd9dbe5f5e53913b7d328d6f527ac7142636979c1ff2","pubkey":"7c098dbaeeaca6fb27798625835dfc5c13fb31096eed76c6d77269a2a08cd22b","created_at":1771940735,"tags":[],"content":"Performance test event 5","sig":"a11a11991434511737092d8cf2806a700a207c81c08e341f8d98c8b3369845df35adb9247ff094378e6712d68e5b2657d628e809b17bc9f838f6f5d9c21ce96c"}
+2026-04-01 05:46:15 - Attempt 5: .184467365s - connecting to localhost:8888... ok.
+{"kind":1,"id":"0902e868c5e7909f0143fde7738d5e8f4c42ea0ced2c69a404cfeb6cd686ceaa","pubkey":"59d792f5cfd57b3a284ce769b5d4b1e8a6eb231c63239cdad7f07d791433e79a","created_at":1775036774,"tags":[],"content":"Performance test event 5","sig":"a0754e774e5bc3514dc4cf04ec51cab077413251cfce480e80badccc7660bfe8d1eac87d43c6e332d936cc171d24e8318e1ef5df7425a8218e01af661f291c47"}
 publishing to ws://localhost:8888... success.
 [SUCCESS] Performance test completed: 5/5 successful responses
 [INFO] Test 7: Testing kind-specific NIP-42 authentication requirements
 [INFO] Generated test keypair for kind-specific tests: test_pubkey
 [INFO] Testing kind 1 event (regular note) - should work without authentication...
-2026-02-24 09:45:36 - Kind 1 event result: connecting to ws://localhost:8888... ok.
-{"kind":1,"id":"85430aa1bb17e0aa7f5f05568448e35570a0d8446a79600f033e2683b17f8902","pubkey":"1cee941c80f1fa0037047151cf577503a1243cbef748f572b9fd6062a36807db","created_at":1771940736,"tags":[],"content":"Regular note - should not require auth","sig":"118a2dec1256aca39b22b9027c8f56e0b8f60bae1d95f38408ac9d9a6eb6590c48e4a37bf561e29f993b435ceecc1ff2218fcc9dec3e2dcf305cd456ac6a0ee4"}
+2026-04-01 05:46:15 - Kind 1 event result: connecting to localhost:8888... ok.
+{"kind":1,"id":"a1d9545c4ac16c2ab1fae4d5d77cabd368d765533b6f6d1f4dbb3c7859696a5e","pubkey":"06ff6b7ca3c72cc7cebb9fe70ea76b6f79b6226c4dc5adc4ebcc59220c23c9bf","created_at":1775036775,"tags":[],"content":"Regular note - should not require auth","sig":"520796b21690bf03b20da28f30ffc84c9c198d0a908c07540f232f789c7a0327861e1f580d499be15b244bdf66c5c4b1cdf621bfdc5f60b1313d7f40036ffab8"}
 publishing to ws://localhost:8888... success.
 [SUCCESS] Kind 1 event accepted without authentication (correct behavior)
 [INFO] Testing kind 4 event (direct message) - should require authentication...
-2026-02-24 09:45:47 - Kind 4 event result: connecting to ws://localhost:8888... ok.
-{"kind":4,"id":"32f20767dd83d6f1ee5e70f72c33c7caa8a5a03acbfbb4de5899f6b27b850be4","pubkey":"1cee941c80f1fa0037047151cf577503a1243cbef748f572b9fd6062a36807db","created_at":1771940737,"tags":[["p,test_pubkey"]],"content":"This is a direct message - should require auth","sig":"cee96adf8c266120d98579734134cca652eeefa5f090d119b794a964bae4d2568e3aa39d648e5a897bb7f8d65be19f338291af3ffe87accdbf502f5eaae453ab"}
+2026-04-01 05:46:25 - Kind 4 event result: connecting to localhost:8888... ok.
+{"kind":4,"id":"c047f5a9fb6ff46828d0bb862e4bcc32120e50fc7804d651485e2cdbddaf993a","pubkey":"06ff6b7ca3c72cc7cebb9fe70ea76b6f79b6226c4dc5adc4ebcc59220c23c9bf","created_at":1775036775,"tags":[["p,test_pubkey"]],"content":"This is a direct message - should require auth","sig":"a7a027c302faf75e269d866a1b0137f2fbc02643d76435dc68707d2ba6560af95df709787f4a1a1bc7c1b9951615ad081a97cd7f694da94d5606d17100f0b0dc"}
 publishing to ws://localhost:8888... 
 [SUCCESS] Kind 4 event requested authentication (correct behavior for DMs)
 [INFO] Testing kind 14 event (chat message) - should require authentication...
-2026-02-24 09:45:57 - Kind 14 event result: connecting to ws://localhost:8888... ok.
-{"kind":14,"id":"0a6d37f32fc10dae793b61d8f3afb9d28bdf12d59cf25d73eb90461d8efaa117","pubkey":"1cee941c80f1fa0037047151cf577503a1243cbef748f572b9fd6062a36807db","created_at":1771940747,"tags":[["p,test_pubkey"]],"content":"Chat message - should require auth","sig":"5337ded22499a8c361445d6c660f297e636cc5adf2735a85bb7d629e5771e0c47176b2afde02f4af9645198d441fb0aedd78931d0200d8b5ed8f721e6460d5c9"}
+2026-04-01 05:46:36 - Kind 14 event result: connecting to localhost:8888... ok.
+{"kind":14,"id":"73e50afdaefdbb01ed021f8c888a87b00aa59e4d68c124101353fabcdfa59ae1","pubkey":"06ff6b7ca3c72cc7cebb9fe70ea76b6f79b6226c4dc5adc4ebcc59220c23c9bf","created_at":1775036786,"tags":[["p,test_pubkey"]],"content":"Chat message - should require auth","sig":"ec2c713e2add876856e6cb0d1d9790c43525c5139a0fe06fbee71898f1042173dc3af9187e6fbccfef7406c1af2f218631a1cdcb7ad73e34553cdf3aecc4f209"}
 publishing to ws://localhost:8888... 
 [SUCCESS] Kind 14 event requested authentication (correct behavior for DMs)
 [INFO] Testing other event kinds - should work without authentication...
-2026-02-24 09:45:58 - Kind 0 event result: connecting to ws://localhost:8888... ok.
-{"kind":0,"id":"5836e2da48eb458c8faca084afc3827ee6e481574d0295dc7bfdc50d9495891a","pubkey":"1cee941c80f1fa0037047151cf577503a1243cbef748f572b9fd6062a36807db","created_at":1771940757,"tags":[],"content":"Test event kind 0 - should not require auth","sig":"e454d5990a157b6211b655a9219ad494c58d49a59d61c4e1fb0aa91b96e5ff2368efc57e2acd0a24c7198b1181c37d0ab535f608289ec83afdc0b68e076def7c"}
+2026-04-01 05:46:36 - Kind 0 event result: connecting to localhost:8888... ok.
+{"kind":0,"id":"51fe1630721cfa3472ba7c3af911a3164c788a48c6a678179c62be48ac3d1f1c","pubkey":"06ff6b7ca3c72cc7cebb9fe70ea76b6f79b6226c4dc5adc4ebcc59220c23c9bf","created_at":1775036796,"tags":[],"content":"Test event kind 0 - should not require auth","sig":"d72d827742fdc86daf1389c8dad40efc56c22b9744ad23547ea0b0a37598e5c18ccdac20b9ef2e6adf46d7683bff19f2cbc11fb00a252903efc1076c8f613b38"}
 publishing to ws://localhost:8888... success.
 [SUCCESS] Kind 0 event accepted without authentication (correct)
-2026-02-24 09:45:58 - Kind 3 event result: connecting to ws://localhost:8888... ok.
-{"kind":3,"id":"d11a038044f9ea859338c6ab879c4628aece258f2cad0ed7ca88808b35ec899c","pubkey":"1cee941c80f1fa0037047151cf577503a1243cbef748f572b9fd6062a36807db","created_at":1771940758,"tags":[],"content":"Test event kind 3 - should not require auth","sig":"9fbf410cd609f9f7a6bf3118ecfe554776bb647d5ed988c0d4df06f83c1283c8baeaa0b62da900934cc8f617c73572fbce9f7232c77bb87942e4471228b06c73"}
+2026-04-01 05:46:36 - Kind 3 event result: connecting to localhost:8888... ok.
+{"kind":3,"id":"bf4155eb8b54bdd73a0b64365666caf886433634693cc3c4ab1d586187fc6bae","pubkey":"06ff6b7ca3c72cc7cebb9fe70ea76b6f79b6226c4dc5adc4ebcc59220c23c9bf","created_at":1775036796,"tags":[],"content":"Test event kind 3 - should not require auth","sig":"d27f654ccc9f95e76aacafcce7d42528545fa90b77d422a17301de6931883d8c00a0a84af56ab5d37a0f425140dbfc227458557f9050597beec42cacd0a15864"}
 publishing to ws://localhost:8888... success.
 [SUCCESS] Kind 3 event accepted without authentication (correct)
-2026-02-24 09:45:59 - Kind 7 event result: connecting to ws://localhost:8888... ok.
-{"kind":7,"id":"b819482f287f6370fac7804c2cdcdac8340eafd86799b24af0a11f74c6190fed","pubkey":"1cee941c80f1fa0037047151cf577503a1243cbef748f572b9fd6062a36807db","created_at":1771940758,"tags":[],"content":"Test event kind 7 - should not require auth","sig":"f197c7c072af111dd92220c489472473f5b4fb30e908501e4d2d0037f1a0064960550a4e51af4168572a192295d870f6a6c49473308a25dacbc0deb703003547"}
+2026-04-01 05:46:37 - Kind 7 event result: connecting to localhost:8888... ok.
+{"kind":7,"id":"658e0caf1c4b52062363849d55312070005124e8a10202df285078222e523132","pubkey":"06ff6b7ca3c72cc7cebb9fe70ea76b6f79b6226c4dc5adc4ebcc59220c23c9bf","created_at":1775036797,"tags":[],"content":"Test event kind 7 - should not require auth","sig":"50361b3aa6b85747befe20e50e317d8f905128930cec0263494434ec9029089d880ff23cdf071c5b63b8417eff216658f1229c0f0dc5174a9a16a6d5fe38fd4d"}
 publishing to ws://localhost:8888... success.
 [SUCCESS] Kind 7 event accepted without authentication (correct)
 [INFO] Kind-specific authentication test completed

tests/test_results_20260401_091107.log

@@ -0,0 +1,392 @@
+2026-04-01 09:11:07 - ==========================================
+2026-04-01 09:11:07 - C-Relay Comprehensive Test Suite Runner
+2026-04-01 09:11:07 - ==========================================
+2026-04-01 09:11:07 - Relay URL: ws://127.0.0.1:8888
+2026-04-01 09:11:07 - Log file: test_results_20260401_091107.log
+2026-04-01 09:11:07 - Report file: test_report_20260401_091107.html
+2026-04-01 09:11:07 - 
+2026-04-01 09:11:07 - Checking relay status at ws://127.0.0.1:8888...
+2026-04-01 09:11:07 - \033[0;32m✓ Relay HTTP endpoint is accessible\033[0m
+2026-04-01 09:11:07 - 
+2026-04-01 09:11:07 - Starting comprehensive test execution...
+2026-04-01 09:11:07 - 
+2026-04-01 09:11:07 - \033[0;34m=== SECURITY TEST SUITES ===\033[0m
+2026-04-01 09:11:07 - ==========================================
+2026-04-01 09:11:07 - Running Test Suite: SQL Injection Tests
+2026-04-01 09:11:07 - Description: Comprehensive SQL injection vulnerability testing
+2026-04-01 09:11:07 - ==========================================
+==========================================
+C-Relay SQL Injection Test Suite
+==========================================
+Testing against relay at ws://127.0.0.1:8888
+
+=== Basic Connectivity Test ===
+Testing Basic connectivity... PASSED - Valid query works
+
+=== Authors Filter SQL Injection Tests ===
+Testing Authors filter with payload: '; DROP TABLE events; --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: 1' OR '1'='1... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: 1; SELECT * FROM sqlite_master; --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: ' OR 1=1 --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: admin'--... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: 1' UNION SELECT password FROM users --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: 1' AND SLEEP(5) --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: 1' AND 1=1 WAITFOR DELAY '0:0:5' --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: 1' AND 1=CAST((SELECT version()) AS INT) --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: 1' AND 1=CONVERT(INT, (SELECT @@VERSION)) --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: ' UNION SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: ' UNION SELECT 1,2,3 --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: ' UNION ALL SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: '; SELECT * FROM events; --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: '; DELETE FROM events; --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: '; UPDATE events SET content='hacked' WHERE 1=1; --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: /*... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: */... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: /**/... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: #... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: 0x53514C5F494E4A454354494F4E... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: J1NSTCBJTkpFQ1RJT04gLS0=... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: '))); DROP TABLE events; --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: ')) UNION SELECT NULL; --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: ' AND 1=1 --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: ' AND 1=2 --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: ' AND (SELECT COUNT(*) FROM events) > 0 --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: '; EXEC master..xp_cmdshell 'net user' --... PASSED - SQL injection blocked (rejected with error)
+Testing Authors filter with payload: '; DECLARE @host varchar(1024); SELECT @host=(SELECT TOP 1 master..sys.fn_varbintohexstr(password_hash) FROM sys.sql_logins WHERE name='sa'); --... PASSED - SQL injection blocked (rejected with error)
+
+=== IDs Filter SQL Injection Tests ===
+Testing IDs filter with payload: '; DROP TABLE events; --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: 1' OR '1'='1... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: 1; SELECT * FROM sqlite_master; --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: ' OR 1=1 --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: admin'--... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: 1' UNION SELECT password FROM users --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: 1' AND SLEEP(5) --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: 1' AND 1=1 WAITFOR DELAY '0:0:5' --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: 1' AND 1=CAST((SELECT version()) AS INT) --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: 1' AND 1=CONVERT(INT, (SELECT @@VERSION)) --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: ' UNION SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: ' UNION SELECT 1,2,3 --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: ' UNION ALL SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: '; SELECT * FROM events; --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: '; DELETE FROM events; --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: '; UPDATE events SET content='hacked' WHERE 1=1; --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: /*... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: */... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: /**/... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: #... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: 0x53514C5F494E4A454354494F4E... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: J1NSTCBJTkpFQ1RJT04gLS0=... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: '))); DROP TABLE events; --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: ')) UNION SELECT NULL; --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: ' AND 1=1 --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: ' AND 1=2 --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: ' AND (SELECT COUNT(*) FROM events) > 0 --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: '; EXEC master..xp_cmdshell 'net user' --... PASSED - SQL injection blocked (rejected with error)
+Testing IDs filter with payload: '; DECLARE @host varchar(1024); SELECT @host=(SELECT TOP 1 master..sys.fn_varbintohexstr(password_hash) FROM sys.sql_logins WHERE name='sa'); --... PASSED - SQL injection blocked (rejected with error)
+
+=== Kinds Filter SQL Injection Tests ===
+Testing Kinds filter with string injection... PASSED - SQL injection blocked (rejected with error)
+Testing Kinds filter with negative value... PASSED - SQL injection blocked (rejected with error)
+Testing Kinds filter with very large value... PASSED - SQL injection blocked (rejected with error)
+
+=== Search Filter SQL Injection Tests ===
+Testing Search filter with payload: '; DROP TABLE events; --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: 1' OR '1'='1... PASSED - SQL injection blocked (query sanitized)
+Testing Search filter with payload: 1; SELECT * FROM sqlite_master; --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: ' OR 1=1 --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: admin'--... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: 1' UNION SELECT password FROM users --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: 1' AND SLEEP(5) --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: 1' AND 1=1 WAITFOR DELAY '0:0:5' --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: 1' AND 1=CAST((SELECT version()) AS INT) --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: 1' AND 1=CONVERT(INT, (SELECT @@VERSION)) --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: ' UNION SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: ' UNION SELECT 1,2,3 --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: ' UNION ALL SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: '; SELECT * FROM events; --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: '; DELETE FROM events; --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: '; UPDATE events SET content='hacked' WHERE 1=1; --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: /*... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: */... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: /**/... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: #... PASSED - SQL injection blocked (query sanitized)
+Testing Search filter with payload: 0x53514C5F494E4A454354494F4E... PASSED - SQL injection blocked (query sanitized)
+Testing Search filter with payload: J1NSTCBJTkpFQ1RJT04gLS0=... PASSED - SQL injection blocked (query sanitized)
+Testing Search filter with payload: '))); DROP TABLE events; --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: ')) UNION SELECT NULL; --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: ' AND 1=1 --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: ' AND 1=2 --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: ' AND (SELECT COUNT(*) FROM events) > 0 --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: '; EXEC master..xp_cmdshell 'net user' --... PASSED - SQL injection blocked (rejected with error)
+Testing Search filter with payload: '; DECLARE @host varchar(1024); SELECT @host=(SELECT TOP 1 master..sys.fn_varbintohexstr(password_hash) FROM sys.sql_logins WHERE name='sa'); --... PASSED - SQL injection blocked (rejected with error)
+
+=== Tag Filter SQL Injection Tests ===
+Testing #e tag filter with payload: '; DROP TABLE events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: 1' OR '1'='1... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: 1; SELECT * FROM sqlite_master; --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: ' OR 1=1 --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: admin'--... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: 1' UNION SELECT password FROM users --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: 1' AND SLEEP(5) --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: 1' AND 1=1 WAITFOR DELAY '0:0:5' --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: 1' AND 1=CAST((SELECT version()) AS INT) --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: 1' AND 1=CONVERT(INT, (SELECT @@VERSION)) --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: ' UNION SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: ' UNION SELECT 1,2,3 --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: ' UNION ALL SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: '; SELECT * FROM events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: '; DELETE FROM events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: '; UPDATE events SET content='hacked' WHERE 1=1; --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: /*... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: */... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: /**/... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: #... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: 0x53514C5F494E4A454354494F4E... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: J1NSTCBJTkpFQ1RJT04gLS0=... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: '))); DROP TABLE events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: ')) UNION SELECT NULL; --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: ' AND 1=1 --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: ' AND 1=2 --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: ' AND (SELECT COUNT(*) FROM events) > 0 --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: '; EXEC master..xp_cmdshell 'net user' --... PASSED - SQL injection blocked (query sanitized)
+Testing #e tag filter with payload: '; DECLARE @host varchar(1024); SELECT @host=(SELECT TOP 1 master..sys.fn_varbintohexstr(password_hash) FROM sys.sql_logins WHERE name='sa'); --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: '; DROP TABLE events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: 1' OR '1'='1... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: 1; SELECT * FROM sqlite_master; --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: ' OR 1=1 --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: admin'--... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: 1' UNION SELECT password FROM users --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: 1' AND SLEEP(5) --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: 1' AND 1=1 WAITFOR DELAY '0:0:5' --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: 1' AND 1=CAST((SELECT version()) AS INT) --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: 1' AND 1=CONVERT(INT, (SELECT @@VERSION)) --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: ' UNION SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: ' UNION SELECT 1,2,3 --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: ' UNION ALL SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: '; SELECT * FROM events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: '; DELETE FROM events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: '; UPDATE events SET content='hacked' WHERE 1=1; --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: /*... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: */... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: /**/... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: #... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: 0x53514C5F494E4A454354494F4E... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: J1NSTCBJTkpFQ1RJT04gLS0=... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: '))); DROP TABLE events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: ')) UNION SELECT NULL; --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: ' AND 1=1 --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: ' AND 1=2 --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: ' AND (SELECT COUNT(*) FROM events) > 0 --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: '; EXEC master..xp_cmdshell 'net user' --... PASSED - SQL injection blocked (query sanitized)
+Testing #p tag filter with payload: '; DECLARE @host varchar(1024); SELECT @host=(SELECT TOP 1 master..sys.fn_varbintohexstr(password_hash) FROM sys.sql_logins WHERE name='sa'); --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: '; DROP TABLE events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: 1' OR '1'='1... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: 1; SELECT * FROM sqlite_master; --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: ' OR 1=1 --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: admin'--... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: 1' UNION SELECT password FROM users --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: 1' AND SLEEP(5) --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: 1' AND 1=1 WAITFOR DELAY '0:0:5' --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: 1' AND 1=CAST((SELECT version()) AS INT) --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: 1' AND 1=CONVERT(INT, (SELECT @@VERSION)) --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: ' UNION SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: ' UNION SELECT 1,2,3 --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: ' UNION ALL SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: '; SELECT * FROM events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: '; DELETE FROM events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: '; UPDATE events SET content='hacked' WHERE 1=1; --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: /*... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: */... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: /**/... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: #... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: 0x53514C5F494E4A454354494F4E... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: J1NSTCBJTkpFQ1RJT04gLS0=... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: '))); DROP TABLE events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: ')) UNION SELECT NULL; --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: ' AND 1=1 --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: ' AND 1=2 --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: ' AND (SELECT COUNT(*) FROM events) > 0 --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: '; EXEC master..xp_cmdshell 'net user' --... PASSED - SQL injection blocked (query sanitized)
+Testing #t tag filter with payload: '; DECLARE @host varchar(1024); SELECT @host=(SELECT TOP 1 master..sys.fn_varbintohexstr(password_hash) FROM sys.sql_logins WHERE name='sa'); --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: '; DROP TABLE events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: 1' OR '1'='1... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: 1; SELECT * FROM sqlite_master; --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: ' OR 1=1 --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: admin'--... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: 1' UNION SELECT password FROM users --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: 1' AND SLEEP(5) --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: 1' AND 1=1 WAITFOR DELAY '0:0:5' --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: 1' AND 1=CAST((SELECT version()) AS INT) --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: 1' AND 1=CONVERT(INT, (SELECT @@VERSION)) --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: ' UNION SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: ' UNION SELECT 1,2,3 --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: ' UNION ALL SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: '; SELECT * FROM events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: '; DELETE FROM events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: '; UPDATE events SET content='hacked' WHERE 1=1; --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: /*... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: */... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: /**/... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: #... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: 0x53514C5F494E4A454354494F4E... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: J1NSTCBJTkpFQ1RJT04gLS0=... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: '))); DROP TABLE events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: ')) UNION SELECT NULL; --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: ' AND 1=1 --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: ' AND 1=2 --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: ' AND (SELECT COUNT(*) FROM events) > 0 --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: '; EXEC master..xp_cmdshell 'net user' --... PASSED - SQL injection blocked (query sanitized)
+Testing #r tag filter with payload: '; DECLARE @host varchar(1024); SELECT @host=(SELECT TOP 1 master..sys.fn_varbintohexstr(password_hash) FROM sys.sql_logins WHERE name='sa'); --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: '; DROP TABLE events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: 1' OR '1'='1... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: 1; SELECT * FROM sqlite_master; --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: ' OR 1=1 --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: admin'--... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: 1' UNION SELECT password FROM users --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: 1' AND SLEEP(5) --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: 1' AND 1=1 WAITFOR DELAY '0:0:5' --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: 1' AND 1=CAST((SELECT version()) AS INT) --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: 1' AND 1=CONVERT(INT, (SELECT @@VERSION)) --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: ' UNION SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: ' UNION SELECT 1,2,3 --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: ' UNION ALL SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: '; SELECT * FROM events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: '; DELETE FROM events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: '; UPDATE events SET content='hacked' WHERE 1=1; --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: /*... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: */... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: /**/... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: #... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: 0x53514C5F494E4A454354494F4E... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: J1NSTCBJTkpFQ1RJT04gLS0=... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: '))); DROP TABLE events; --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: ')) UNION SELECT NULL; --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: ' AND 1=1 --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: ' AND 1=2 --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: ' AND (SELECT COUNT(*) FROM events) > 0 --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: '; EXEC master..xp_cmdshell 'net user' --... PASSED - SQL injection blocked (query sanitized)
+Testing #d tag filter with payload: '; DECLARE @host varchar(1024); SELECT @host=(SELECT TOP 1 master..sys.fn_varbintohexstr(password_hash) FROM sys.sql_logins WHERE name='sa'); --... PASSED - SQL injection blocked (query sanitized)
+
+=== Timestamp Filter SQL Injection Tests ===
+Testing Since parameter injection... PASSED - SQL injection blocked (rejected with error)
+Testing Until parameter injection... PASSED - SQL injection blocked (rejected with error)
+
+=== Limit Parameter SQL Injection Tests ===
+Testing Limit parameter injection... PASSED - SQL injection blocked (rejected with error)
+Testing Limit with UNION... PASSED - SQL injection blocked (rejected with error)
+
+=== Complex Multi-Filter SQL Injection Tests ===
+Testing Multi-filter with authors injection... PASSED - SQL injection blocked (rejected with error)
+Testing Multi-filter with search injection... PASSED - SQL injection blocked (rejected with error)
+Testing Multi-filter with tag injection... PASSED - SQL injection blocked (query sanitized)
+
+=== COUNT Message SQL Injection Tests ===
+Testing COUNT with authors payload: '; DROP TABLE events; --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: '; DROP TABLE events; --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: 1' OR '1'='1... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: 1' OR '1'='1... PASSED - SQL injection blocked (query sanitized)
+Testing COUNT with authors payload: 1; SELECT * FROM sqlite_master; --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: 1; SELECT * FROM sqlite_master; --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: ' OR 1=1 --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: ' OR 1=1 --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: admin'--... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: admin'--... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: 1' UNION SELECT password FROM users --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: 1' UNION SELECT password FROM users --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: 1' AND SLEEP(5) --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: 1' AND SLEEP(5) --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: 1' AND 1=1 WAITFOR DELAY '0:0:5' --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: 1' AND 1=1 WAITFOR DELAY '0:0:5' --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: 1' AND 1=CAST((SELECT version()) AS INT) --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: 1' AND 1=CAST((SELECT version()) AS INT) --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: 1' AND 1=CONVERT(INT, (SELECT @@VERSION)) --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: 1' AND 1=CONVERT(INT, (SELECT @@VERSION)) --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: ' UNION SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: ' UNION SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: ' UNION SELECT 1,2,3 --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: ' UNION SELECT 1,2,3 --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: ' UNION ALL SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: ' UNION ALL SELECT NULL,NULL,NULL --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: '; SELECT * FROM events; --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: '; SELECT * FROM events; --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: '; DELETE FROM events; --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: '; DELETE FROM events; --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: '; UPDATE events SET content='hacked' WHERE 1=1; --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: '; UPDATE events SET content='hacked' WHERE 1=1; --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: /*... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: /*... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: */... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: */... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: /**/... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: /**/... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: #... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: #... PASSED - SQL injection blocked (query sanitized)
+Testing COUNT with authors payload: 0x53514C5F494E4A454354494F4E... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: 0x53514C5F494E4A454354494F4E... PASSED - SQL injection blocked (query sanitized)
+Testing COUNT with authors payload: J1NSTCBJTkpFQ1RJT04gLS0=... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: J1NSTCBJTkpFQ1RJT04gLS0=... PASSED - SQL injection blocked (query sanitized)
+Testing COUNT with authors payload: '))); DROP TABLE events; --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: '))); DROP TABLE events; --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: ')) UNION SELECT NULL; --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: ')) UNION SELECT NULL; --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: ' AND 1=1 --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: ' AND 1=1 --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: ' AND 1=2 --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: ' AND 1=2 --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: ' AND (SELECT COUNT(*) FROM events) > 0 --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: ' AND (SELECT COUNT(*) FROM events) > 0 --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: '; EXEC master..xp_cmdshell 'net user' --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: '; EXEC master..xp_cmdshell 'net user' --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with authors payload: '; DECLARE @host varchar(1024); SELECT @host=(SELECT TOP 1 master..sys.fn_varbintohexstr(password_hash) FROM sys.sql_logins WHERE name='sa'); --... PASSED - SQL injection blocked (rejected with error)
+Testing COUNT with search payload: '; DECLARE @host varchar(1024); SELECT @host=(SELECT TOP 1 master..sys.fn_varbintohexstr(password_hash) FROM sys.sql_logins WHERE name='sa'); --... PASSED - SQL injection blocked (rejected with error)
+
+=== Edge Case SQL Injection Tests ===
+Testing Empty string injection... PASSED - SQL injection blocked (rejected with error)
+Testing Null byte injection... PASSED - SQL injection blocked (silently rejected)
+Testing Unicode injection... PASSED - SQL injection blocked (rejected with error)
+Testing Very long injection payload... PASSED - SQL injection blocked (rejected with error)
+
+=== Subscription ID SQL Injection Tests ===
+Testing Subscription ID injection... PASSED - SQL injection blocked (rejected with error)
+Testing Subscription ID with quotes... PASSED - SQL injection blocked (silently rejected)
+
+=== CLOSE Message SQL Injection Tests ===
+Testing CLOSE with injection... PASSED - SQL injection blocked (rejected with error)
+
+=== Test Results ===
+Total tests: 318
+Passed: 318
+Failed: 0
+✓ All SQL injection tests passed!
+The relay appears to be protected against SQL injection attacks.
+2026-04-01 09:11:14 - \033[0;32m✓ SQL Injection Tests PASSED\033[0m (Duration: 7s)
+2026-04-01 09:11:14 - ==========================================
+2026-04-01 09:11:14 - Running Test Suite: Filter Validation Tests
+2026-04-01 09:11:14 - Description: Input validation for REQ and COUNT messages
+2026-04-01 09:11:14 - ==========================================
+=== C-Relay Filter Validation Tests ===
+Testing against relay at ws://127.0.0.1:8888
+
+Testing Valid REQ message... PASSED
+Testing Valid COUNT message... PASSED
+
+=== Testing Filter Array Validation ===
+Testing Non-object filter... PASSED
+Testing Too many filters... PASSED
+
+=== Testing Authors Validation ===
+Testing Invalid author type... PASSED
+Testing Invalid author hex... PASSED
+Testing Too many authors... FAILED - Expected error 'error: too many authors', got: ["NOTICE", "error: invalid author hex string"]
+2026-04-01 09:11:14 - \033[0;31m✗ Filter Validation Tests FAILED\033[0m (Duration: 0s)