From fa065ad128882755f2a988d6203b59a2ab5e38ff Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Wed, 19 Nov 2025 11:55:32 +0000
Subject: add landing page and nostr-relay-builder relay on same port

---
 src/main.rs | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index 7da4c73..38a3b95 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,8 +3,8 @@ use tracing::{info, Level};
 use tracing_subscriber::FmtSubscriber;
 
 mod config;
+mod http;
 mod nostr;
-mod storage;
 
 use config::Config;
 
@@ -16,21 +16,23 @@ async fn main() -> Result<()> {
         .finish();
     tracing::subscriber::set_global_default(subscriber)?;
 
-    info!("Starting ngit-grasp...");
+    info!("Starting ngit-grasp with nostr-relay-builder...");
 
     // Load configuration
     let config = Config::from_env()?;
     info!("Configuration loaded: {}", config.bind_address);
 
-    // Initialize storage
-    let storage = storage::Storage::new(&config)?;
-    info!("Storage initialized at: {}", config.relay_data_path);
-
-    // Start Nostr relay
-    let relay = nostr::relay::RelayServer::new(config.clone(), storage)?;
-    
-    info!("Starting Nostr relay on {}", config.bind_address);
-    relay.run().await?;
+    // Create Nostr relay with NIP-34 validation
+    if let Ok(relay) = nostr::builder::create_relay(&config) {
+        info!(
+            "Relay created with NIP-34 validation for domain: {}",
+            config.domain
+        );
+
+        // Start HTTP server with integrated relay
+        info!("Starting HTTP server on {}", config.bind_address);
+        http::run_server(config, relay).await?;
+    }
 
     Ok(())
 }
-- 
cgit v1.2.3