v0.2.10 - Clean versioning

.gitignore

@@ -3,3 +3,4 @@ nips/
 build/
 relay.log
 Trash/
+src/version.h

Makefile

@@ -36,19 +36,69 @@ $(NOSTR_CORE_LIB):
 	@echo "Building nostr_core_lib..."
 	cd nostr_core_lib && ./build.sh
 
+# Generate version.h from git tags
+src/version.h:
+	@if [ -d .git ]; then \
+		echo "Generating version.h from git tags..."; \
+		RAW_VERSION=$$(git describe --tags --always 2>/dev/null || echo "unknown"); \
+		if echo "$$RAW_VERSION" | grep -q "^v[0-9]"; then \
+			CLEAN_VERSION=$$(echo "$$RAW_VERSION" | sed 's/^v//' | cut -d- -f1); \
+			VERSION="v$$CLEAN_VERSION"; \
+			MAJOR=$$(echo "$$CLEAN_VERSION" | cut -d. -f1); \
+			MINOR=$$(echo "$$CLEAN_VERSION" | cut -d. -f2); \
+			PATCH=$$(echo "$$CLEAN_VERSION" | cut -d. -f3); \
+		else \
+			VERSION="v0.0.0"; \
+			MAJOR=0; MINOR=0; PATCH=0; \
+		fi; \
+		echo "/* Auto-generated version information */" > src/version.h; \
+		echo "#ifndef VERSION_H" >> src/version.h; \
+		echo "#define VERSION_H" >> src/version.h; \
+		echo "" >> src/version.h; \
+		echo "#define VERSION \"$$VERSION\"" >> src/version.h; \
+		echo "#define VERSION_MAJOR $$MAJOR" >> src/version.h; \
+		echo "#define VERSION_MINOR $$MINOR" >> src/version.h; \
+		echo "#define VERSION_PATCH $$PATCH" >> src/version.h; \
+		echo "" >> src/version.h; \
+		echo "#endif /* VERSION_H */" >> src/version.h; \
+		echo "Generated version.h with clean version: $$VERSION"; \
+	elif [ ! -f src/version.h ]; then \
+		echo "Git not available and version.h missing, creating fallback version.h..."; \
+		VERSION="v0.0.0"; \
+		echo "/* Auto-generated version information */" > src/version.h; \
+		echo "#ifndef VERSION_H" >> src/version.h; \
+		echo "#define VERSION_H" >> src/version.h; \
+		echo "" >> src/version.h; \
+		echo "#define VERSION \"$$VERSION\"" >> src/version.h; \
+		echo "#define VERSION_MAJOR 0" >> src/version.h; \
+		echo "#define VERSION_MINOR 0" >> src/version.h; \
+		echo "#define VERSION_PATCH 0" >> src/version.h; \
+		echo "" >> src/version.h; \
+		echo "#endif /* VERSION_H */" >> src/version.h; \
+		echo "Created fallback version.h with version: $$VERSION"; \
+	else \
+		echo "Git not available, preserving existing version.h"; \
+	fi
+
+# Force version.h regeneration (useful for development)
+force-version:
+	@echo "Force regenerating version.h..."
+	@rm -f src/version.h
+	@$(MAKE) src/version.h
+
 # Build the relay
-$(TARGET): $(BUILD_DIR) $(MAIN_SRC) $(NOSTR_CORE_LIB)
+$(TARGET): $(BUILD_DIR) src/version.h src/sql_schema.h $(MAIN_SRC) $(NOSTR_CORE_LIB)
 	@echo "Compiling C-Relay for architecture: $(ARCH)"
 	$(CC) $(CFLAGS) $(INCLUDES) $(MAIN_SRC) -o $(TARGET) $(NOSTR_CORE_LIB) $(LIBS)
 	@echo "Build complete: $(TARGET)"
 
 # Build for specific architectures
-x86: $(BUILD_DIR) $(MAIN_SRC) $(NOSTR_CORE_LIB)
+x86: $(BUILD_DIR) src/version.h src/sql_schema.h $(MAIN_SRC) $(NOSTR_CORE_LIB)
 	@echo "Building C-Relay for x86_64..."
 	$(CC) $(CFLAGS) $(INCLUDES) $(MAIN_SRC) -o $(BUILD_DIR)/c_relay_x86 $(NOSTR_CORE_LIB) $(LIBS)
 	@echo "Build complete: $(BUILD_DIR)/c_relay_x86"
 
-arm64: $(BUILD_DIR) $(MAIN_SRC) $(NOSTR_CORE_LIB)
+arm64: $(BUILD_DIR) src/version.h src/sql_schema.h $(MAIN_SRC) $(NOSTR_CORE_LIB)
 	@echo "Cross-compiling C-Relay for ARM64..."
 	@if ! command -v aarch64-linux-gnu-gcc >/dev/null 2>&1; then \
 		echo "ERROR: ARM64 cross-compiler not found."; \
@@ -112,14 +162,16 @@ test: $(TARGET)
 	@echo "Running tests..."
 	./tests/1_nip_test.sh
 
-# Initialize database
+# Initialize database (now handled automatically when server starts)
 init-db:
-	@echo "Initializing database..."
+	@echo "Database initialization is now handled automatically when the server starts."
-	./db/init.sh --force
+	@echo "The schema is embedded in the binary - no external files needed."
+	@echo "To manually recreate database: rm -f db/c_nostr_relay.db && ./build/c_relay_x86"
 
 # Clean build artifacts
 clean:
 	rm -rf $(BUILD_DIR)
+	rm -f src/version.h
 	@echo "Clean complete"
 
 # Clean everything including nostr_core_lib
@@ -158,5 +210,6 @@ help:
 	@echo "  make check-toolchain     # Check what compilers are available"
 	@echo "  make test                # Run tests"
 	@echo "  make init-db             # Set up database"
+	@echo "  make force-version       # Force regenerate version.h from git"
 
-.PHONY: all x86 arm64 test init-db clean clean-all install-deps install-cross-tools install-arm64-deps check-toolchain help
+.PHONY: all x86 arm64 test init-db clean clean-all install-deps install-cross-tools install-arm64-deps check-toolchain help force-version

build_and_push.sh

@@ -139,6 +139,13 @@ compile_project() {
         print_warning "Clean failed or no Makefile found"
     fi
     
+    # Force regenerate version.h to pick up new tags
+    if make force-version > /dev/null 2>&1; then
+        print_success "Regenerated version.h"
+    else
+        print_warning "Failed to regenerate version.h"
+    fi
+    
     # Compile the project
     if make > /dev/null 2>&1; then
         print_success "C-Relay compiled successfully"
@@ -229,10 +236,65 @@ git_commit_and_push() {
         exit 1
     fi
     
-    if git push --tags > /dev/null 2>&1; then
+    # Push only the new tag to avoid conflicts with existing tags
-        print_success "Pushed tags"
+    if git push origin "$NEW_VERSION" > /dev/null 2>&1; then
+        print_success "Pushed tag: $NEW_VERSION"
     else
-        print_warning "Failed to push tags"
+        print_warning "Tag push failed, trying force push..."
+        if git push --force origin "$NEW_VERSION" > /dev/null 2>&1; then
+            print_success "Force-pushed updated tag: $NEW_VERSION"
+        else
+            print_error "Failed to push tag: $NEW_VERSION"
+            exit 1
+        fi
+    fi
+}
+
+# Function to commit and push changes without creating a tag (tag already created)
+git_commit_and_push_no_tag() {
+    print_status "Preparing git commit..."
+    
+    # Stage all changes
+    if git add . > /dev/null 2>&1; then
+        print_success "Staged all changes"
+    else
+        print_error "Failed to stage changes"
+        exit 1
+    fi
+    
+    # Check if there are changes to commit
+    if git diff --staged --quiet; then
+        print_warning "No changes to commit"
+    else
+        # Commit changes
+        if git commit -m "$NEW_VERSION - $COMMIT_MESSAGE" > /dev/null 2>&1; then
+            print_success "Committed changes"
+        else
+            print_error "Failed to commit changes"
+            exit 1
+        fi
+    fi
+    
+    # Push changes and tags
+    print_status "Pushing to remote repository..."
+    if git push > /dev/null 2>&1; then
+        print_success "Pushed changes"
+    else
+        print_error "Failed to push changes"
+        exit 1
+    fi
+    
+    # Push only the new tag to avoid conflicts with existing tags
+    if git push origin "$NEW_VERSION" > /dev/null 2>&1; then
+        print_success "Pushed tag: $NEW_VERSION"
+    else
+        print_warning "Tag push failed, trying force push..."
+        if git push --force origin "$NEW_VERSION" > /dev/null 2>&1; then
+            print_success "Force-pushed updated tag: $NEW_VERSION"
+        else
+            print_error "Failed to push tag: $NEW_VERSION"
+            exit 1
+        fi
     fi
 }
 
@@ -352,14 +414,23 @@ main() {
         # Increment minor version for releases
         increment_version "minor"
         
-        # Compile project first
+        # Create new git tag BEFORE compilation so version.h picks it up
+        if git tag "$NEW_VERSION" > /dev/null 2>&1; then
+            print_success "Created tag: $NEW_VERSION"
+        else
+            print_warning "Tag $NEW_VERSION already exists, removing and recreating..."
+            git tag -d "$NEW_VERSION" > /dev/null 2>&1
+            git tag "$NEW_VERSION" > /dev/null 2>&1
+        fi
+        
+        # Compile project first (will now pick up the new tag)
         compile_project
         
         # Build release binaries
         build_release_binaries
         
-        # Commit and push
+        # Commit and push (but skip tag creation since we already did it)
-        git_commit_and_push
+        git_commit_and_push_no_tag
         
         # Create Gitea release with binaries
         create_gitea_release
@@ -376,11 +447,20 @@ main() {
         # Increment patch version for regular commits
         increment_version "patch"
         
-        # Compile project
+        # Create new git tag BEFORE compilation so version.h picks it up
+        if git tag "$NEW_VERSION" > /dev/null 2>&1; then
+            print_success "Created tag: $NEW_VERSION"
+        else
+            print_warning "Tag $NEW_VERSION already exists, removing and recreating..."
+            git tag -d "$NEW_VERSION" > /dev/null 2>&1
+            git tag "$NEW_VERSION" > /dev/null 2>&1
+        fi
+        
+        # Compile project (will now pick up the new tag)
         compile_project
         
-        # Commit and push
+        # Commit and push (but skip tag creation since we already did it)
-        git_commit_and_push
+        git_commit_and_push_no_tag
         
         print_success "Build and push completed successfully!"
         print_status "Version $NEW_VERSION pushed to repository"

build_output.log

@@ -1,28 +0,0 @@
-=== C Nostr Relay Build and Restart Script ===
-Removing old configuration file to trigger regeneration...
-✓ Configuration file removed - will be regenerated with latest database values
-Building project...
-rm -rf build
-Clean complete
-mkdir -p build
-Compiling C-Relay for architecture: x86_64
-gcc -Wall -Wextra -std=c99 -g -O2 -I. -Inostr_core_lib -Inostr_core_lib/nostr_core -Inostr_core_lib/cjson -Inostr_core_lib/nostr_websocket src/main.c src/config.c -o build/c_relay_x86 nostr_core_lib/libnostr_core_x64.a -lsqlite3 -lwebsockets -lz -ldl -lpthread -lm -L/usr/local/lib -lsecp256k1 -lssl -lcrypto -L/usr/local/lib -lcurl
-Build complete: build/c_relay_x86
-Build successful. Proceeding with relay restart...
-Stopping any existing relay servers...
-No existing relay found
-Starting relay server...
-Debug: Current processes: None
-Started with PID: 786684
-Relay started successfully!
-PID: 786684
-WebSocket endpoint: ws://127.0.0.1:8888
-Log file: relay.log
-
-=== Relay server running in background ===
-To kill relay: pkill -f 'c_relay_'
-To check status: ps aux | grep c_relay_
-To view logs: tail -f relay.log
-Binary: ./build/c_relay_x86
-Ready for Nostr client connections!
-

db/README.md

@@ -1,228 +1 @@
-# C Nostr Relay Database
+Only README.md will remain
-
-This directory contains the SQLite database schema and initialization scripts for the C Nostr Relay implementation.
-
-## Files
-
-- **`schema.sql`** - Complete database schema based on nostr-rs-relay v18
-- **`init.sh`** - Database initialization script
-- **`c_nostr_relay.db`** - SQLite database file (created after running init.sh)
-
-## Quick Start
-
-1. **Initialize the database:**
-   ```bash
-   cd db
-   ./init.sh
-   ```
-
-2. **Force reinitialize (removes existing database):**
-   ```bash
-   ./init.sh --force
-   ```
-
-3. **Initialize with optimization and info:**
-   ```bash
-   ./init.sh --info --optimize
-   ```
-
-## Database Schema
-
-The schema is fully compatible with the Nostr protocol and includes:
-
-### Core Tables
-
-- **`event`** - Main event storage with all Nostr event data
-- **`tag`** - Denormalized tag index for efficient queries
-- **`user_verification`** - NIP-05 verification tracking
-- **`account`** - User account management (optional)
-- **`invoice`** - Lightning payment tracking (optional)
-
-### Key Features
-
-- ✅ **NIP-01 compliant** - Full basic protocol support
-- ✅ **Replaceable events** - Supports kinds 0, 3, 10000-19999
-- ✅ **Parameterized replaceable** - Supports kinds 30000-39999 with `d` tags
-- ✅ **Event deletion** - NIP-09 soft deletion with `hidden` column
-- ✅ **Event expiration** - NIP-40 automatic cleanup
-- ✅ **Authentication** - NIP-42 client authentication
-- ✅ **NIP-05 verification** - Domain-based identity verification
-- ✅ **Performance optimized** - Comprehensive indexing strategy
-
-### Schema Version
-
-Current version: **v18** (compatible with nostr-rs-relay v18)
-
-## Database Structure
-
-### Event Storage
-```sql
-CREATE TABLE event (
-    id INTEGER PRIMARY KEY,
-    event_hash BLOB NOT NULL,        -- 32-byte SHA256 hash
-    first_seen INTEGER NOT NULL,     -- relay receive timestamp
-    created_at INTEGER NOT NULL,     -- event creation timestamp
-    expires_at INTEGER,              -- NIP-40 expiration
-    author BLOB NOT NULL,            -- 32-byte pubkey
-    delegated_by BLOB,               -- NIP-26 delegator
-    kind INTEGER NOT NULL,           -- event kind
-    hidden INTEGER DEFAULT FALSE,   -- soft deletion flag
-    content TEXT NOT NULL            -- complete JSON event
-);
-```
-
-### Tag Indexing
-```sql
-CREATE TABLE tag (
-    id INTEGER PRIMARY KEY,
-    event_id INTEGER NOT NULL,
-    name TEXT,                       -- tag name ("e", "p", etc.)
-    value TEXT,                      -- tag value
-    created_at INTEGER NOT NULL,     -- denormalized for performance
-    kind INTEGER NOT NULL            -- denormalized for performance
-);
-```
-
-## Performance Features
-
-### Optimized Indexes
-- **Hash-based lookups** - `event_hash_index` for O(1) event retrieval
-- **Author queries** - `author_index`, `author_created_at_index`
-- **Kind filtering** - `kind_index`, `kind_created_at_index`
-- **Tag searching** - `tag_covering_index` for efficient tag queries
-- **Composite queries** - Multi-column indexes for complex filters
-
-### Query Optimization
-- **Denormalized tags** - Includes `kind` and `created_at` in tag table
-- **Binary storage** - BLOBs for hex data (pubkeys, hashes)
-- **WAL mode** - Write-Ahead Logging for concurrent access
-- **Automatic cleanup** - Triggers for data integrity
-
-## Usage Examples
-
-### Basic Operations
-
-1. **Insert an event:**
-   ```sql
-   INSERT INTO event (event_hash, first_seen, created_at, author, kind, content)
-   VALUES (?, ?, ?, ?, ?, ?);
-   ```
-
-2. **Query by author:**
-   ```sql
-   SELECT content FROM event 
-   WHERE author = ? AND hidden != TRUE
-   ORDER BY created_at DESC;
-   ```
-
-3. **Filter by tags:**
-   ```sql
-   SELECT e.content FROM event e
-   JOIN tag t ON e.id = t.event_id
-   WHERE t.name = 'p' AND t.value = ? AND e.hidden != TRUE;
-   ```
-
-### Advanced Queries
-
-1. **Get replaceable event (latest only):**
-   ```sql
-   SELECT content FROM event
-   WHERE author = ? AND kind = ? AND hidden != TRUE
-   ORDER BY created_at DESC LIMIT 1;
-   ```
-
-2. **Tag-based filtering (NIP-01 filters):**
-   ```sql
-   SELECT e.content FROM event e
-   WHERE e.id IN (
-     SELECT t.event_id FROM tag t
-     WHERE t.name = ? AND t.value IN (?, ?, ?)
-   ) AND e.hidden != TRUE;
-   ```
-
-## Maintenance
-
-### Regular Operations
-
-1. **Check database integrity:**
-   ```bash
-   sqlite3 c_nostr_relay.db "PRAGMA integrity_check;"
-   ```
-
-2. **Optimize database:**
-   ```bash
-   sqlite3 c_nostr_relay.db "PRAGMA optimize; VACUUM; ANALYZE;"
-   ```
-
-3. **Clean expired events:**
-   ```sql
-   DELETE FROM event WHERE expires_at <= strftime('%s', 'now');
-   ```
-
-### Monitoring
-
-1. **Database size:**
-   ```bash
-   ls -lh c_nostr_relay.db
-   ```
-
-2. **Table statistics:**
-   ```sql
-   SELECT name, COUNT(*) as count FROM (
-     SELECT 'events' as name FROM event UNION ALL
-     SELECT 'tags' as name FROM tag UNION ALL
-     SELECT 'verifications' as name FROM user_verification
-   ) GROUP BY name;
-   ```
-
-## Migration Support
-
-The schema includes a migration system for future updates:
-
-```sql
-CREATE TABLE schema_info (
-    version INTEGER PRIMARY KEY,
-    applied_at INTEGER NOT NULL,
-    description TEXT
-);
-```
-
-## Security Considerations
-
-1. **Input validation** - Always validate event JSON and signatures
-2. **Rate limiting** - Implement at application level
-3. **Access control** - Use `account` table for permissions
-4. **Backup strategy** - Regular database backups recommended
-
-## Compatibility
-
-- **SQLite version** - Requires SQLite 3.8.0+
-- **nostr-rs-relay** - Schema compatible with v18
-- **NIPs supported** - 01, 02, 05, 09, 10, 11, 26, 40, 42
-- **C libraries** - Compatible with sqlite3 C API
-
-## Troubleshooting
-
-### Common Issues
-
-1. **Database locked error:**
-   - Ensure proper connection closing in your C code
-   - Check for long-running transactions
-
-2. **Performance issues:**
-   - Run `PRAGMA optimize;` regularly
-   - Consider `VACUUM` if database grew significantly
-
-3. **Schema errors:**
-   - Verify SQLite version compatibility
-   - Check foreign key constraints
-
-### Getting Help
-
-- Check the main project README for C implementation details
-- Review nostr-rs-relay documentation for reference implementation
-- Consult Nostr NIPs for protocol specifications
-
-## License
-
-This database schema is part of the C Nostr Relay project and follows the same license terms.

db/init.sh

@@ -1,234 +0,0 @@
-#!/bin/bash
-
-# C Nostr Relay Database Initialization Script
-# Creates and initializes the SQLite database with proper schema
-
-set -e  # Exit on any error
-
-# Configuration
-DB_DIR="$(dirname "$0")"
-DB_NAME="c_nostr_relay.db"
-DB_PATH="${DB_DIR}/${DB_NAME}"
-SCHEMA_FILE="${DB_DIR}/schema.sql"
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-# Logging functions
-log_info() {
-    echo -e "${BLUE}[INFO]${NC} $1"
-}
-
-log_success() {
-    echo -e "${GREEN}[SUCCESS]${NC} $1"
-}
-
-log_warning() {
-    echo -e "${YELLOW}[WARNING]${NC} $1"
-}
-
-log_error() {
-    echo -e "${RED}[ERROR]${NC} $1"
-}
-
-# Check if SQLite3 is installed
-check_sqlite() {
-    if ! command -v sqlite3 &> /dev/null; then
-        log_error "sqlite3 is not installed. Please install it first:"
-        echo "  Ubuntu/Debian: sudo apt-get install sqlite3"
-        echo "  CentOS/RHEL:   sudo yum install sqlite"
-        echo "  macOS:         brew install sqlite3"
-        exit 1
-    fi
-    
-    local version=$(sqlite3 --version | cut -d' ' -f1)
-    log_info "Using SQLite version: $version"
-}
-
-# Create database directory if it doesn't exist
-create_db_directory() {
-    if [ ! -d "$DB_DIR" ]; then
-        log_info "Creating database directory: $DB_DIR"
-        mkdir -p "$DB_DIR"
-    fi
-}
-
-# Backup existing database if it exists
-backup_existing_db() {
-    if [ -f "$DB_PATH" ]; then
-        local backup_path="${DB_PATH}.backup.$(date +%Y%m%d_%H%M%S)"
-        log_warning "Existing database found. Creating backup: $backup_path"
-        cp "$DB_PATH" "$backup_path"
-    fi
-}
-
-# Initialize the database with schema
-init_database() {
-    log_info "Initializing database: $DB_PATH"
-    
-    if [ ! -f "$SCHEMA_FILE" ]; then
-        log_error "Schema file not found: $SCHEMA_FILE"
-        exit 1
-    fi
-    
-    # Remove existing database if --force flag is used
-    if [ "$1" = "--force" ] && [ -f "$DB_PATH" ]; then
-        log_warning "Force flag detected. Removing existing database."
-        rm -f "$DB_PATH"
-    fi
-    
-    # Create the database and apply schema
-    log_info "Applying schema from: $SCHEMA_FILE"
-    if sqlite3 "$DB_PATH" < "$SCHEMA_FILE"; then
-        log_success "Database schema applied successfully"
-    else
-        log_error "Failed to apply database schema"
-        exit 1
-    fi
-}
-
-# Verify database integrity
-verify_database() {
-    log_info "Verifying database integrity..."
-    
-    # Check if database file exists and is not empty
-    if [ ! -s "$DB_PATH" ]; then
-        log_error "Database file is empty or doesn't exist"
-        exit 1
-    fi
-    
-    # Run SQLite integrity check
-    local integrity_result=$(sqlite3 "$DB_PATH" "PRAGMA integrity_check;")
-    if [ "$integrity_result" = "ok" ]; then
-        log_success "Database integrity check passed"
-    else
-        log_error "Database integrity check failed: $integrity_result"
-        exit 1
-    fi
-    
-    # Verify schema version
-    local schema_version=$(sqlite3 "$DB_PATH" "PRAGMA user_version;")
-    log_info "Database schema version: $schema_version"
-    
-    # Check that main tables exist (including configuration tables)
-    local table_count=$(sqlite3 "$DB_PATH" "SELECT count(*) FROM sqlite_master WHERE type='table' AND name IN ('events', 'schema_info', 'server_config');")
-    if [ "$table_count" -eq 3 ]; then
-        log_success "Core tables created successfully (including configuration tables)"
-    else
-        log_error "Missing core tables (expected 3, found $table_count)"
-        exit 1
-    fi
-}
-
-# Display database information
-show_db_info() {
-    log_info "Database Information:"
-    echo "  Location: $DB_PATH"
-    echo "  Size: $(du -h "$DB_PATH" | cut -f1)"
-    
-    log_info "Database Tables:"
-    sqlite3 "$DB_PATH" "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name;" | sed 's/^/  - /'
-    
-    log_info "Database Indexes:"
-    sqlite3 "$DB_PATH" "SELECT name FROM sqlite_master WHERE type='index' AND name NOT LIKE 'sqlite_%' ORDER BY name;" | sed 's/^/  - /'
-    
-    log_info "Database Views:"
-    sqlite3 "$DB_PATH" "SELECT name FROM sqlite_master WHERE type='view' ORDER BY name;" | sed 's/^/  - /'
-}
-
-# Run database optimization
-optimize_database() {
-    log_info "Running database optimization..."
-    sqlite3 "$DB_PATH" "PRAGMA optimize; VACUUM; ANALYZE;"
-    log_success "Database optimization completed"
-}
-
-# Print usage information
-print_usage() {
-    echo "Usage: $0 [OPTIONS]"
-    echo ""
-    echo "Initialize SQLite database for C Nostr Relay"
-    echo ""
-    echo "Options:"
-    echo "  --force     Remove existing database before initialization"
-    echo "  --info      Show database information after initialization"
-    echo "  --optimize  Run database optimization after initialization"
-    echo "  --help      Show this help message"
-    echo ""
-    echo "Examples:"
-    echo "  $0                    # Initialize database (with backup if exists)"
-    echo "  $0 --force           # Force reinitialize database"
-    echo "  $0 --info --optimize # Initialize with info and optimization"
-}
-
-# Main execution
-main() {
-    local force_flag=false
-    local show_info=false
-    local optimize=false
-    
-    # Parse command line arguments
-    while [[ $# -gt 0 ]]; do
-        case $1 in
-            --force)
-                force_flag=true
-                shift
-                ;;
-            --info)
-                show_info=true
-                shift
-                ;;
-            --optimize)
-                optimize=true
-                shift
-                ;;
-            --help)
-                print_usage
-                exit 0
-                ;;
-            *)
-                log_error "Unknown option: $1"
-                print_usage
-                exit 1
-                ;;
-        esac
-    done
-    
-    log_info "Starting C Nostr Relay database initialization..."
-    
-    # Execute initialization steps
-    check_sqlite
-    create_db_directory
-    
-    if [ "$force_flag" = false ]; then
-        backup_existing_db
-    fi
-    
-    if [ "$force_flag" = true ]; then
-        init_database --force
-    else
-        init_database
-    fi
-    
-    verify_database
-    
-    if [ "$optimize" = true ]; then
-        optimize_database
-    fi
-    
-    if [ "$show_info" = true ]; then
-        show_db_info
-    fi
-    
-    log_success "Database initialization completed successfully!"
-    echo ""
-    echo "Database ready at: $DB_PATH"
-    echo "You can now start your C Nostr Relay application."
-}
-
-# Execute main function with all arguments
-main "$@"

db/schema.sql

@@ -1,299 +0,0 @@
--- C Nostr Relay Database Schema
--- SQLite schema for storing Nostr events with JSON tags support
-
--- Schema version tracking
-PRAGMA user_version = 3;
-
--- Enable foreign key support
-PRAGMA foreign_keys = ON;
-
--- Optimize for performance
-PRAGMA journal_mode = WAL;
-PRAGMA synchronous = NORMAL;
-PRAGMA cache_size = 10000;
-
--- Core events table with hybrid single-table design
-CREATE TABLE events (
-    id TEXT PRIMARY KEY,                -- Nostr event ID (hex string)
-    pubkey TEXT NOT NULL,               -- Public key of event author (hex string)
-    created_at INTEGER NOT NULL,       -- Event creation timestamp (Unix timestamp)
-    kind INTEGER NOT NULL,              -- Event kind (0-65535)
-    event_type TEXT NOT NULL CHECK (event_type IN ('regular', 'replaceable', 'ephemeral', 'addressable')),
-    content TEXT NOT NULL,              -- Event content (text content only)
-    sig TEXT NOT NULL,                  -- Event signature (hex string)
-    tags JSON NOT NULL DEFAULT '[]',   -- Event tags as JSON array
-    first_seen INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))  -- When relay received event
-);
-
--- Core performance 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_event_type ON events(event_type);
-
--- Composite indexes for common query patterns
-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);
-
--- Schema information table
-CREATE TABLE schema_info (
-    key TEXT PRIMARY KEY,
-    value TEXT NOT NULL,
-    updated_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))
-);
-
--- Insert schema metadata
-INSERT INTO schema_info (key, value) VALUES
-    ('version', '3'),
-    ('description', 'Hybrid single-table Nostr relay schema with JSON tags and configuration management'),
-    ('created_at', strftime('%s', 'now'));
-
--- Helper views for common queries
-CREATE VIEW recent_events AS
-SELECT id, pubkey, created_at, kind, event_type, content
-FROM events
-WHERE event_type != 'ephemeral'
-ORDER BY created_at DESC
-LIMIT 1000;
-
-CREATE VIEW event_stats AS
-SELECT 
-    event_type,
-    COUNT(*) as count,
-    AVG(length(content)) as avg_content_length,
-    MIN(created_at) as earliest,
-    MAX(created_at) as latest
-FROM events
-GROUP BY event_type;
-
--- Optimization: Trigger for automatic cleanup of ephemeral events older than 1 hour
-CREATE TRIGGER cleanup_ephemeral_events
-    AFTER INSERT ON events
-    WHEN NEW.event_type = 'ephemeral'
-BEGIN
-    DELETE FROM events 
-    WHERE event_type = 'ephemeral' 
-    AND first_seen < (strftime('%s', 'now') - 3600);
-END;
-
--- Replaceable event handling trigger
-CREATE TRIGGER handle_replaceable_events
-    AFTER INSERT ON events
-    WHEN NEW.event_type = 'replaceable'
-BEGIN
-    DELETE FROM events 
-    WHERE pubkey = NEW.pubkey 
-    AND kind = NEW.kind 
-    AND event_type = 'replaceable'
-    AND id != NEW.id;
-END;
-
--- Persistent Subscriptions Logging Tables (Phase 2)
--- Optional database logging for subscription analytics and debugging
-
--- Subscription events log
-CREATE TABLE subscription_events (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    subscription_id TEXT NOT NULL,           -- Subscription ID from client
-    client_ip TEXT NOT NULL,                 -- Client IP address
-    event_type TEXT NOT NULL CHECK (event_type IN ('created', 'closed', 'expired', 'disconnected')),
-    filter_json TEXT,                        -- JSON representation of filters (for created events)
-    events_sent INTEGER DEFAULT 0,           -- Number of events sent to this subscription
-    created_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now')),
-    ended_at INTEGER,                        -- When subscription ended (for closed/expired/disconnected)
-    duration INTEGER                         -- Computed: ended_at - created_at
-);
-
--- Subscription metrics summary
-CREATE TABLE subscription_metrics (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    date TEXT NOT NULL,                      -- Date (YYYY-MM-DD)
-    total_created INTEGER DEFAULT 0,         -- Total subscriptions created
-    total_closed INTEGER DEFAULT 0,          -- Total subscriptions closed
-    total_events_broadcast INTEGER DEFAULT 0, -- Total events broadcast
-    avg_duration REAL DEFAULT 0,            -- Average subscription duration
-    peak_concurrent INTEGER DEFAULT 0,       -- Peak concurrent subscriptions
-    updated_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now')),
-    UNIQUE(date)
-);
-
--- Event broadcasting log (optional, for detailed analytics)
-CREATE TABLE event_broadcasts (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    event_id TEXT NOT NULL,                  -- Event ID that was broadcast
-    subscription_id TEXT NOT NULL,           -- Subscription that received it
-    client_ip TEXT NOT NULL,                 -- Client IP
-    broadcast_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now')),
-    FOREIGN KEY (event_id) REFERENCES events(id)
-);
-
--- Indexes for subscription logging performance
-CREATE INDEX idx_subscription_events_id ON subscription_events(subscription_id);
-CREATE INDEX idx_subscription_events_type ON subscription_events(event_type);
-CREATE INDEX idx_subscription_events_created ON subscription_events(created_at DESC);
-CREATE INDEX idx_subscription_events_client ON subscription_events(client_ip);
-
-CREATE INDEX idx_subscription_metrics_date ON subscription_metrics(date DESC);
-
-CREATE INDEX idx_event_broadcasts_event ON event_broadcasts(event_id);
-CREATE INDEX idx_event_broadcasts_sub ON event_broadcasts(subscription_id);
-CREATE INDEX idx_event_broadcasts_time ON event_broadcasts(broadcast_at DESC);
-
--- Trigger to update subscription duration when ended
-CREATE TRIGGER update_subscription_duration
-    AFTER UPDATE OF ended_at ON subscription_events
-    WHEN NEW.ended_at IS NOT NULL AND OLD.ended_at IS NULL
-BEGIN
-    UPDATE subscription_events
-    SET duration = NEW.ended_at - NEW.created_at
-    WHERE id = NEW.id;
-END;
-
--- View for subscription analytics
-CREATE VIEW subscription_analytics AS
-SELECT
-    date(created_at, 'unixepoch') as date,
-    COUNT(*) as subscriptions_created,
-    COUNT(CASE WHEN ended_at IS NOT NULL THEN 1 END) as subscriptions_ended,
-    AVG(CASE WHEN duration IS NOT NULL THEN duration END) as avg_duration_seconds,
-    MAX(events_sent) as max_events_sent,
-    AVG(events_sent) as avg_events_sent,
-    COUNT(DISTINCT client_ip) as unique_clients
-FROM subscription_events
-GROUP BY date(created_at, 'unixepoch')
-ORDER BY date DESC;
-
--- View for current active subscriptions (from log perspective)
-CREATE VIEW active_subscriptions_log AS
-SELECT
-    subscription_id,
-    client_ip,
-    filter_json,
-    events_sent,
-    created_at,
-    (strftime('%s', 'now') - created_at) as duration_seconds
-FROM subscription_events
-WHERE event_type = 'created'
-AND subscription_id NOT IN (
-    SELECT subscription_id FROM subscription_events
-    WHERE event_type IN ('closed', 'expired', 'disconnected')
-);
-
--- ================================
--- CONFIGURATION MANAGEMENT TABLES
--- ================================
-
--- Core server configuration table
-CREATE TABLE server_config (
-    key TEXT PRIMARY KEY,                    -- Configuration key (unique identifier)
-    value TEXT NOT NULL,                     -- Configuration value (stored as string)
-    description TEXT,                        -- Human-readable description
-    config_type TEXT DEFAULT 'user' CHECK (config_type IN ('system', 'user', 'runtime')),
-    data_type TEXT DEFAULT 'string' CHECK (data_type IN ('string', 'integer', 'boolean', 'json')),
-    validation_rules TEXT,                   -- JSON validation rules (optional)
-    is_sensitive INTEGER DEFAULT 0,          -- 1 if value should be masked in logs
-    requires_restart INTEGER DEFAULT 0,      -- 1 if change requires server restart
-    created_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now')),
-    updated_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))
-);
-
--- Configuration change history table
-CREATE TABLE config_history (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    config_key TEXT NOT NULL,               -- Key that was changed
-    old_value TEXT,                         -- Previous value (NULL for new keys)
-    new_value TEXT NOT NULL,                -- New value
-    changed_by TEXT DEFAULT 'system',       -- Who made the change (system/admin/user)
-    change_reason TEXT,                     -- Optional reason for change
-    changed_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now')),
-    FOREIGN KEY (config_key) REFERENCES server_config(key)
-);
-
--- Configuration validation errors log
-CREATE TABLE config_validation_log (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    config_key TEXT NOT NULL,
-    attempted_value TEXT,
-    validation_error TEXT NOT NULL,
-    error_source TEXT DEFAULT 'validation',  -- validation/parsing/constraint
-    attempted_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))
-);
-
--- Cache for file-based configuration events
-CREATE TABLE config_file_cache (
-    file_path TEXT PRIMARY KEY,             -- Full path to config file
-    file_hash TEXT NOT NULL,                -- SHA256 hash of file content
-    event_id TEXT,                          -- Nostr event ID from file
-    event_pubkey TEXT,                      -- Admin pubkey that signed event
-    loaded_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now')),
-    validation_status TEXT CHECK (validation_status IN ('valid', 'invalid', 'unverified')),
-    validation_error TEXT                   -- Error details if invalid
-);
-
--- Performance indexes for configuration tables
-CREATE INDEX idx_server_config_type ON server_config(config_type);
-CREATE INDEX idx_server_config_updated ON server_config(updated_at DESC);
-CREATE INDEX idx_config_history_key ON config_history(config_key);
-CREATE INDEX idx_config_history_time ON config_history(changed_at DESC);
-CREATE INDEX idx_config_validation_key ON config_validation_log(config_key);
-CREATE INDEX idx_config_validation_time ON config_validation_log(attempted_at DESC);
-
--- Trigger to update timestamp on configuration changes
-CREATE TRIGGER update_config_timestamp
-    AFTER UPDATE ON server_config
-BEGIN
-    UPDATE server_config SET updated_at = strftime('%s', 'now') WHERE key = NEW.key;
-END;
-
--- Trigger to log configuration changes to history
-CREATE TRIGGER log_config_changes
-    AFTER UPDATE ON server_config
-    WHEN OLD.value != NEW.value
-BEGIN
-    INSERT INTO config_history (config_key, old_value, new_value, changed_by, change_reason)
-    VALUES (NEW.key, OLD.value, NEW.value, 'system', 'configuration update');
-END;
-
--- Active Configuration View
-CREATE VIEW active_config AS
-SELECT
-    key,
-    value,
-    description,
-    config_type,
-    data_type,
-    requires_restart,
-    updated_at
-FROM server_config
-WHERE config_type IN ('system', 'user')
-ORDER BY config_type, key;
-
--- Runtime Statistics View
-CREATE VIEW runtime_stats AS
-SELECT
-    key,
-    value,
-    description,
-    updated_at
-FROM server_config
-WHERE config_type = 'runtime'
-ORDER BY key;
-
--- Configuration Change Summary
-CREATE VIEW recent_config_changes AS
-SELECT
-    ch.config_key,
-    sc.description,
-    ch.old_value,
-    ch.new_value,
-    ch.changed_by,
-    ch.change_reason,
-    ch.changed_at
-FROM config_history ch
-JOIN server_config sc ON ch.config_key = sc.key
-ORDER BY ch.changed_at DESC
-LIMIT 50;
-
--- Runtime Statistics (initialized by server on startup)
--- These will be populated when configuration system initializes

docs/config_schema_design.md

@@ -142,7 +142,7 @@ INSERT OR IGNORE INTO server_config (key, value, description, config_type, data_
 ('relay_description', 'High-performance C Nostr relay with SQLite storage', 'Relay description', 'user', 'string', 0),
 ('relay_contact', '', 'Contact information', 'user', 'string', 0),
 ('relay_pubkey', '', 'Relay public key', 'user', 'string', 0),
-('relay_software', 'https://github.com/laantungir/c-relay', 'Software URL', 'user', 'string', 0),
+('relay_software', 'https://git.laantungir.net/laantungir/c-relay.git', 'Software URL', 'user', 'string', 0),
 ('relay_version', '0.2.0', 'Software version', 'user', 'string', 0),
 
 -- NIP-13 Proof of Work

docs/file_config_design.md

@@ -66,7 +66,7 @@ The configuration file contains a signed Nostr event (kind 33334) with relay con
     
     ["relay_contact", ""],
     ["relay_pubkey", ""],
-    ["relay_software", "https://github.com/laantungir/c-relay"],
+    ["relay_software", "https://git.laantungir.net/laantungir/c-relay.git"],
     ["relay_version", "0.2.0"],
     
     ["max_event_tags", "100"],

relay.log

@@ -1,50 +0,0 @@
-=== C Nostr Relay Server ===
-[SUCCESS] Database connection established
-[INFO] Initializing configuration system...
-[INFO] Configuration directory: %s
-  /home/teknari/.config/c-relay
-[INFO] Configuration file: %s
-  /home/teknari/.config/c-relay/c_relay_config_event.json
-[INFO] Initializing configuration database statements...
-[SUCCESS] Configuration database statements initialized
-[INFO] Generating missing configuration file...
-[INFO] Using private key from environment variable
-[INFO] Creating configuration Nostr event...
-[SUCCESS] Configuration Nostr event created successfully
-  Event ID: 03021d58b91941a3bb9284ee704e069c50c9ac09a20eb049d8de676757dde83a
-  Public Key: 8d8fbfb027872f13ed09e9e61f1d09473f3bec24bcfa9183e76cc1ceb789eb5e
-[INFO] Stored admin public key in configuration database
-  Admin Public Key: 8d8fbfb027872f13ed09e9e61f1d09473f3bec24bcfa9183e76cc1ceb789eb5e
-[SUCCESS] Configuration file written successfully
-  File: /home/teknari/.config/c-relay/c_relay_config_event.json
-[SUCCESS] Configuration file generated successfully
-[INFO] Loading configuration from all sources...
-[INFO] Configuration file found, attempting to load...
-[INFO] Loading configuration from file...
-[INFO] Validating configuration event...
-[INFO] Configuration event structure validation passed
-[INFO] Configuration tags validation passed (%d tags)
-  Found 27 configuration tags
-[WARNING] Signature verification not yet implemented - accepting event
-[SUCCESS] Applied configuration from file
-  Applied 27 configuration values
-[SUCCESS] Configuration event validation and application completed
-[SUCCESS] Configuration loaded from file successfully
-[SUCCESS] File configuration loaded successfully
-[INFO] Loading configuration from database...
-[SUCCESS] Database configuration validated (%d entries)
-  Found 27 configuration entries
-[SUCCESS] Database configuration loaded
-[INFO] Applying configuration to global variables...
-[SUCCESS] Configuration applied to global variables
-[SUCCESS] Configuration system initialized successfully
-[SUCCESS] Relay information initialized with default values
-[INFO] Initializing NIP-13 Proof of Work configuration
-[INFO] PoW configured in basic validation mode
-[INFO] PoW Configuration: enabled=true, min_difficulty=0, validation_flags=0x1, mode=full
-[INFO] Initializing NIP-40 Expiration Timestamp configuration
-[INFO] Expiration Configuration: enabled=true, strict_mode=true, filter_responses=true, grace_period=300 seconds
-[INFO] Subscription limits: max_per_client=25, max_total=5000
-[INFO] Starting relay server...
-[INFO] Starting libwebsockets-based Nostr relay server...
-[SUCCESS] WebSocket relay started on ws://127.0.0.1:8888

relay.pid

@@ -1 +1 @@
-793733
+891896

src/config.c

@@ -1,4 +1,5 @@
 #include "config.h"
+#include "version.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -24,6 +25,7 @@ extern void log_error(const char* message);
 // ================================
 // CORE CONFIGURATION FUNCTIONS
 // ================================
+//
 
 int init_configuration_system(void) {
     log_info("Initializing configuration system...");
@@ -721,7 +723,6 @@ cJSON* create_config_nostr_event(const char* privkey_hex) {
     
     static const default_config_t defaults[] = {
         // Administrative settings
-        {"admin_pubkey", ""},
         {"admin_enabled", "false"},
         
         // Server core settings
@@ -734,8 +735,8 @@ cJSON* create_config_nostr_event(const char* privkey_hex) {
         {"relay_description", "High-performance C Nostr relay with SQLite storage"},
         {"relay_contact", ""},
         {"relay_pubkey", ""},
-        {"relay_software", "https://github.com/teknari/c-relay"},
+        {"relay_software", "https://git.laantungir.net/laantungir/c-relay.git"},
-        {"relay_version", "0.2.0"},
+        {"relay_version", VERSION},
         
         // NIP-13 Proof of Work
         {"pow_enabled", "true"},
@@ -776,7 +777,8 @@ cJSON* create_config_nostr_event(const char* privkey_hex) {
             const char* key = (const char*)sqlite3_column_text(stmt, 0);
             const char* value = (const char*)sqlite3_column_text(stmt, 1);
             
-            if (key && value) {
+            // Skip admin_pubkey since it's redundant (already in event.pubkey)
+            if (key && value && strcmp(key, "admin_pubkey") != 0) {
                 cJSON* tag = cJSON_CreateArray();
                 cJSON_AddItemToArray(tag, cJSON_CreateString(key));
                 cJSON_AddItemToArray(tag, cJSON_CreateString(value));
@@ -978,7 +980,7 @@ int generate_config_file_if_missing(void) {
     cJSON* pubkey_obj = cJSON_GetObjectItem(event, "pubkey");
     if (pubkey_obj && cJSON_IsString(pubkey_obj)) {
         const char* admin_pubkey = cJSON_GetStringValue(pubkey_obj);
-        if (set_database_config("relay_admin_pubkey", admin_pubkey, "system") == 0) {
+        if (set_database_config("admin_pubkey", admin_pubkey, "system") == 0) {
             log_info("Stored admin public key in configuration database");
             printf("  Admin Public Key: %s\n", admin_pubkey);
         } else {

src/config.h

@@ -26,9 +26,9 @@
 #define RELAY_URL_MAX_LENGTH 256
 #define RELAY_CONTACT_MAX_LENGTH 128
 #define RELAY_PUBKEY_MAX_LENGTH 65
-#define DATABASE_PATH "db/c_nostr_relay.db"
 
 // Default configuration values (used as fallbacks if database config fails)
+#define DEFAULT_DATABASE_PATH "db/c_nostr_relay.db"
 #define DEFAULT_PORT 8888
 #define DEFAULT_HOST "127.0.0.1"
 #define MAX_CLIENTS 100

src/main.c

@@ -16,6 +16,7 @@
 #include "../nostr_core_lib/nostr_core/nostr_core.h"
 #include "../nostr_core_lib/nostr_core/nip013.h"  // NIP-13: Proof of Work
 #include "config.h"  // Configuration management system
+#include "sql_schema.h"  // Embedded database schema
 
 // Color constants for logging
 #define RED     "\033[31m"
@@ -1306,7 +1307,7 @@ void init_relay_info() {
     if (relay_software) {
         strncpy(g_relay_info.software, relay_software, sizeof(g_relay_info.software) - 1);
     } else {
-        strncpy(g_relay_info.software, "https://github.com/laantungir/c-relay", sizeof(g_relay_info.software) - 1);
+        strncpy(g_relay_info.software, "https://git.laantungir.net/laantungir/c-relay.git", sizeof(g_relay_info.software) - 1);
     }
     
     const char* relay_version = get_config_value("relay_version");
@@ -1938,15 +1939,81 @@ int validate_event_expiration(cJSON* event, char* error_message, size_t error_si
 /////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////
 
-// Initialize database connection
+// Initialize database connection and schema
 int init_database() {
-    int rc = sqlite3_open(DATABASE_PATH, &g_db);
+    // Use configurable database path, falling back to default
+    const char* db_path = get_config_value("database_path");
+    if (!db_path) {
+        db_path = DEFAULT_DATABASE_PATH;
+    }
+    
+    int rc = sqlite3_open(db_path, &g_db);
     if (rc != SQLITE_OK) {
         log_error("Cannot open database");
         return -1;
     }
     
-    log_success("Database connection established");
+    char success_msg[256];
+    snprintf(success_msg, sizeof(success_msg), "Database connection established: %s", db_path);
+    log_success(success_msg);
+    
+    // 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);
+        
+        if (has_events_table) {
+            log_info("Database schema already exists, skipping initialization");
+            
+            // Log existing schema version if available
+            const char* version_sql = "SELECT value FROM schema_info WHERE key = 'version'";
+            sqlite3_stmt* version_stmt;
+            if (sqlite3_prepare_v2(g_db, version_sql, -1, &version_stmt, NULL) == SQLITE_OK) {
+                if (sqlite3_step(version_stmt) == SQLITE_ROW) {
+                    const char* db_version = (char*)sqlite3_column_text(version_stmt, 0);
+                    char version_msg[256];
+                    snprintf(version_msg, sizeof(version_msg), "Existing database schema version: %s",
+                             db_version ? db_version : "unknown");
+                    log_info(version_msg);
+                } else {
+                    log_info("Database exists but no version information found");
+                }
+                sqlite3_finalize(version_stmt);
+            }
+        } else {
+            // Initialize database schema using embedded SQL
+            log_info("Initializing database schema from 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");
+                log_error(error_log);
+                if (error_msg) {
+                    sqlite3_free(error_msg);
+                }
+                return -1;
+            }
+            
+            log_success("Database schema initialized successfully");
+            
+            // Log schema version information
+            char version_msg[256];
+            snprintf(version_msg, sizeof(version_msg), "Database schema version: %s",
+                     EMBEDDED_SCHEMA_VERSION);
+            log_info(version_msg);
+        }
+    } else {
+        log_error("Failed to check existing database schema");
+        return -1;
+    }
+    
     return 0;
 }
 

src/sql_schema.h

@@ -0,0 +1,313 @@
+/* Embedded SQL Schema for C Nostr Relay
+ * Generated from db/schema.sql - Do not edit manually
+ * Schema Version: 3
+ */
+#ifndef SQL_SCHEMA_H
+#define SQL_SCHEMA_H
+
+/* Schema version constant */
+#define EMBEDDED_SCHEMA_VERSION "3"
+
+/* Embedded SQL schema as C string literal */
+static const char* const EMBEDDED_SCHEMA_SQL = 
+"-- C Nostr Relay Database Schema\n\
+-- SQLite schema for storing Nostr events with JSON tags support\n\
+\n\
+-- Schema version tracking\n\
+PRAGMA user_version = 3;\n\
+\n\
+-- Enable foreign key support\n\
+PRAGMA foreign_keys = ON;\n\
+\n\
+-- Optimize for performance\n\
+PRAGMA journal_mode = WAL;\n\
+PRAGMA synchronous = NORMAL;\n\
+PRAGMA cache_size = 10000;\n\
+\n\
+-- Core events table with hybrid single-table design\n\
+CREATE TABLE events (\n\
+    id TEXT PRIMARY KEY,                -- Nostr event ID (hex string)\n\
+    pubkey TEXT NOT NULL,               -- Public key of event author (hex string)\n\
+    created_at INTEGER NOT NULL,       -- Event creation timestamp (Unix timestamp)\n\
+    kind INTEGER NOT NULL,              -- Event kind (0-65535)\n\
+    event_type TEXT NOT NULL CHECK (event_type IN ('regular', 'replaceable', 'ephemeral', 'addressable')),\n\
+    content TEXT NOT NULL,              -- Event content (text content only)\n\
+    sig TEXT NOT NULL,                  -- Event signature (hex string)\n\
+    tags JSON NOT NULL DEFAULT '[]',   -- Event tags as JSON array\n\
+    first_seen INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))  -- When relay received event\n\
+);\n\
+\n\
+-- Core performance indexes\n\
+CREATE INDEX idx_events_pubkey ON events(pubkey);\n\
+CREATE INDEX idx_events_kind ON events(kind);\n\
+CREATE INDEX idx_events_created_at ON events(created_at DESC);\n\
+CREATE INDEX idx_events_event_type ON events(event_type);\n\
+\n\
+-- Composite indexes for common query patterns\n\
+CREATE INDEX idx_events_kind_created_at ON events(kind, created_at DESC);\n\
+CREATE INDEX idx_events_pubkey_created_at ON events(pubkey, created_at DESC);\n\
+CREATE INDEX idx_events_pubkey_kind ON events(pubkey, kind);\n\
+\n\
+-- Schema information table\n\
+CREATE TABLE schema_info (\n\
+    key TEXT PRIMARY KEY,\n\
+    value TEXT NOT NULL,\n\
+    updated_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))\n\
+);\n\
+\n\
+-- Insert schema metadata\n\
+INSERT INTO schema_info (key, value) VALUES\n\
+    ('version', '3'),\n\
+    ('description', 'Hybrid single-table Nostr relay schema with JSON tags and configuration management'),\n\
+    ('created_at', strftime('%s', 'now'));\n\
+\n\
+-- Helper views for common queries\n\
+CREATE VIEW recent_events AS\n\
+SELECT id, pubkey, created_at, kind, event_type, content\n\
+FROM events\n\
+WHERE event_type != 'ephemeral'\n\
+ORDER BY created_at DESC\n\
+LIMIT 1000;\n\
+\n\
+CREATE VIEW event_stats AS\n\
+SELECT \n\
+    event_type,\n\
+    COUNT(*) as count,\n\
+    AVG(length(content)) as avg_content_length,\n\
+    MIN(created_at) as earliest,\n\
+    MAX(created_at) as latest\n\
+FROM events\n\
+GROUP BY event_type;\n\
+\n\
+-- Optimization: Trigger for automatic cleanup of ephemeral events older than 1 hour\n\
+CREATE TRIGGER cleanup_ephemeral_events\n\
+    AFTER INSERT ON events\n\
+    WHEN NEW.event_type = 'ephemeral'\n\
+BEGIN\n\
+    DELETE FROM events \n\
+    WHERE event_type = 'ephemeral' \n\
+    AND first_seen < (strftime('%s', 'now') - 3600);\n\
+END;\n\
+\n\
+-- Replaceable event handling trigger\n\
+CREATE TRIGGER handle_replaceable_events\n\
+    AFTER INSERT ON events\n\
+    WHEN NEW.event_type = 'replaceable'\n\
+BEGIN\n\
+    DELETE FROM events \n\
+    WHERE pubkey = NEW.pubkey \n\
+    AND kind = NEW.kind \n\
+    AND event_type = 'replaceable'\n\
+    AND id != NEW.id;\n\
+END;\n\
+\n\
+-- Persistent Subscriptions Logging Tables (Phase 2)\n\
+-- Optional database logging for subscription analytics and debugging\n\
+\n\
+-- Subscription events log\n\
+CREATE TABLE subscription_events (\n\
+    id INTEGER PRIMARY KEY AUTOINCREMENT,\n\
+    subscription_id TEXT NOT NULL,           -- Subscription ID from client\n\
+    client_ip TEXT NOT NULL,                 -- Client IP address\n\
+    event_type TEXT NOT NULL CHECK (event_type IN ('created', 'closed', 'expired', 'disconnected')),\n\
+    filter_json TEXT,                        -- JSON representation of filters (for created events)\n\
+    events_sent INTEGER DEFAULT 0,           -- Number of events sent to this subscription\n\
+    created_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now')),\n\
+    ended_at INTEGER,                        -- When subscription ended (for closed/expired/disconnected)\n\
+    duration INTEGER                         -- Computed: ended_at - created_at\n\
+);\n\
+\n\
+-- Subscription metrics summary\n\
+CREATE TABLE subscription_metrics (\n\
+    id INTEGER PRIMARY KEY AUTOINCREMENT,\n\
+    date TEXT NOT NULL,                      -- Date (YYYY-MM-DD)\n\
+    total_created INTEGER DEFAULT 0,         -- Total subscriptions created\n\
+    total_closed INTEGER DEFAULT 0,          -- Total subscriptions closed\n\
+    total_events_broadcast INTEGER DEFAULT 0, -- Total events broadcast\n\
+    avg_duration REAL DEFAULT 0,            -- Average subscription duration\n\
+    peak_concurrent INTEGER DEFAULT 0,       -- Peak concurrent subscriptions\n\
+    updated_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now')),\n\
+    UNIQUE(date)\n\
+);\n\
+\n\
+-- Event broadcasting log (optional, for detailed analytics)\n\
+CREATE TABLE event_broadcasts (\n\
+    id INTEGER PRIMARY KEY AUTOINCREMENT,\n\
+    event_id TEXT NOT NULL,                  -- Event ID that was broadcast\n\
+    subscription_id TEXT NOT NULL,           -- Subscription that received it\n\
+    client_ip TEXT NOT NULL,                 -- Client IP\n\
+    broadcast_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now')),\n\
+    FOREIGN KEY (event_id) REFERENCES events(id)\n\
+);\n\
+\n\
+-- Indexes for subscription logging performance\n\
+CREATE INDEX idx_subscription_events_id ON subscription_events(subscription_id);\n\
+CREATE INDEX idx_subscription_events_type ON subscription_events(event_type);\n\
+CREATE INDEX idx_subscription_events_created ON subscription_events(created_at DESC);\n\
+CREATE INDEX idx_subscription_events_client ON subscription_events(client_ip);\n\
+\n\
+CREATE INDEX idx_subscription_metrics_date ON subscription_metrics(date DESC);\n\
+\n\
+CREATE INDEX idx_event_broadcasts_event ON event_broadcasts(event_id);\n\
+CREATE INDEX idx_event_broadcasts_sub ON event_broadcasts(subscription_id);\n\
+CREATE INDEX idx_event_broadcasts_time ON event_broadcasts(broadcast_at DESC);\n\
+\n\
+-- Trigger to update subscription duration when ended\n\
+CREATE TRIGGER update_subscription_duration\n\
+    AFTER UPDATE OF ended_at ON subscription_events\n\
+    WHEN NEW.ended_at IS NOT NULL AND OLD.ended_at IS NULL\n\
+BEGIN\n\
+    UPDATE subscription_events\n\
+    SET duration = NEW.ended_at - NEW.created_at\n\
+    WHERE id = NEW.id;\n\
+END;\n\
+\n\
+-- View for subscription analytics\n\
+CREATE VIEW subscription_analytics AS\n\
+SELECT\n\
+    date(created_at, 'unixepoch') as date,\n\
+    COUNT(*) as subscriptions_created,\n\
+    COUNT(CASE WHEN ended_at IS NOT NULL THEN 1 END) as subscriptions_ended,\n\
+    AVG(CASE WHEN duration IS NOT NULL THEN duration END) as avg_duration_seconds,\n\
+    MAX(events_sent) as max_events_sent,\n\
+    AVG(events_sent) as avg_events_sent,\n\
+    COUNT(DISTINCT client_ip) as unique_clients\n\
+FROM subscription_events\n\
+GROUP BY date(created_at, 'unixepoch')\n\
+ORDER BY date DESC;\n\
+\n\
+-- View for current active subscriptions (from log perspective)\n\
+CREATE VIEW active_subscriptions_log AS\n\
+SELECT\n\
+    subscription_id,\n\
+    client_ip,\n\
+    filter_json,\n\
+    events_sent,\n\
+    created_at,\n\
+    (strftime('%s', 'now') - created_at) as duration_seconds\n\
+FROM subscription_events\n\
+WHERE event_type = 'created'\n\
+AND subscription_id NOT IN (\n\
+    SELECT subscription_id FROM subscription_events\n\
+    WHERE event_type IN ('closed', 'expired', 'disconnected')\n\
+);\n\
+\n\
+-- ================================\n\
+-- CONFIGURATION MANAGEMENT TABLES\n\
+-- ================================\n\
+\n\
+-- Core server configuration table\n\
+CREATE TABLE server_config (\n\
+    key TEXT PRIMARY KEY,                    -- Configuration key (unique identifier)\n\
+    value TEXT NOT NULL,                     -- Configuration value (stored as string)\n\
+    description TEXT,                        -- Human-readable description\n\
+    config_type TEXT DEFAULT 'user' CHECK (config_type IN ('system', 'user', 'runtime')),\n\
+    data_type TEXT DEFAULT 'string' CHECK (data_type IN ('string', 'integer', 'boolean', 'json')),\n\
+    validation_rules TEXT,                   -- JSON validation rules (optional)\n\
+    is_sensitive INTEGER DEFAULT 0,          -- 1 if value should be masked in logs\n\
+    requires_restart INTEGER DEFAULT 0,      -- 1 if change requires server restart\n\
+    created_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now')),\n\
+    updated_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))\n\
+);\n\
+\n\
+-- Configuration change history table\n\
+CREATE TABLE config_history (\n\
+    id INTEGER PRIMARY KEY AUTOINCREMENT,\n\
+    config_key TEXT NOT NULL,               -- Key that was changed\n\
+    old_value TEXT,                         -- Previous value (NULL for new keys)\n\
+    new_value TEXT NOT NULL,                -- New value\n\
+    changed_by TEXT DEFAULT 'system',       -- Who made the change (system/admin/user)\n\
+    change_reason TEXT,                     -- Optional reason for change\n\
+    changed_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now')),\n\
+    FOREIGN KEY (config_key) REFERENCES server_config(key)\n\
+);\n\
+\n\
+-- Configuration validation errors log\n\
+CREATE TABLE config_validation_log (\n\
+    id INTEGER PRIMARY KEY AUTOINCREMENT,\n\
+    config_key TEXT NOT NULL,\n\
+    attempted_value TEXT,\n\
+    validation_error TEXT NOT NULL,\n\
+    error_source TEXT DEFAULT 'validation',  -- validation/parsing/constraint\n\
+    attempted_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))\n\
+);\n\
+\n\
+-- Cache for file-based configuration events\n\
+CREATE TABLE config_file_cache (\n\
+    file_path TEXT PRIMARY KEY,             -- Full path to config file\n\
+    file_hash TEXT NOT NULL,                -- SHA256 hash of file content\n\
+    event_id TEXT,                          -- Nostr event ID from file\n\
+    event_pubkey TEXT,                      -- Admin pubkey that signed event\n\
+    loaded_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now')),\n\
+    validation_status TEXT CHECK (validation_status IN ('valid', 'invalid', 'unverified')),\n\
+    validation_error TEXT                   -- Error details if invalid\n\
+);\n\
+\n\
+-- Performance indexes for configuration tables\n\
+CREATE INDEX idx_server_config_type ON server_config(config_type);\n\
+CREATE INDEX idx_server_config_updated ON server_config(updated_at DESC);\n\
+CREATE INDEX idx_config_history_key ON config_history(config_key);\n\
+CREATE INDEX idx_config_history_time ON config_history(changed_at DESC);\n\
+CREATE INDEX idx_config_validation_key ON config_validation_log(config_key);\n\
+CREATE INDEX idx_config_validation_time ON config_validation_log(attempted_at DESC);\n\
+\n\
+-- Trigger to update timestamp on configuration changes\n\
+CREATE TRIGGER update_config_timestamp\n\
+    AFTER UPDATE ON server_config\n\
+BEGIN\n\
+    UPDATE server_config SET updated_at = strftime('%s', 'now') WHERE key = NEW.key;\n\
+END;\n\
+\n\
+-- Trigger to log configuration changes to history\n\
+CREATE TRIGGER log_config_changes\n\
+    AFTER UPDATE ON server_config\n\
+    WHEN OLD.value != NEW.value\n\
+BEGIN\n\
+    INSERT INTO config_history (config_key, old_value, new_value, changed_by, change_reason)\n\
+    VALUES (NEW.key, OLD.value, NEW.value, 'system', 'configuration update');\n\
+END;\n\
+\n\
+-- Active Configuration View\n\
+CREATE VIEW active_config AS\n\
+SELECT\n\
+    key,\n\
+    value,\n\
+    description,\n\
+    config_type,\n\
+    data_type,\n\
+    requires_restart,\n\
+    updated_at\n\
+FROM server_config\n\
+WHERE config_type IN ('system', 'user')\n\
+ORDER BY config_type, key;\n\
+\n\
+-- Runtime Statistics View\n\
+CREATE VIEW runtime_stats AS\n\
+SELECT\n\
+    key,\n\
+    value,\n\
+    description,\n\
+    updated_at\n\
+FROM server_config\n\
+WHERE config_type = 'runtime'\n\
+ORDER BY key;\n\
+\n\
+-- Configuration Change Summary\n\
+CREATE VIEW recent_config_changes AS\n\
+SELECT\n\
+    ch.config_key,\n\
+    sc.description,\n\
+    ch.old_value,\n\
+    ch.new_value,\n\
+    ch.changed_by,\n\
+    ch.change_reason,\n\
+    ch.changed_at\n\
+FROM config_history ch\n\
+JOIN server_config sc ON ch.config_key = sc.key\n\
+ORDER BY ch.changed_at DESC\n\
+LIMIT 50;\n\
+\n\
+-- Runtime Statistics (initialized by server on startup)\n\
+-- These will be populated when configuration system initializes";
+
+#endif /* SQL_SCHEMA_H */