database: downcasting WIP

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

crates/nostr-database/src/events/mod.rs

@@ -63,35 +63,6 @@ impl SaveEventStatus {
     }
 }
 
-#[doc(hidden)]
-pub trait IntoNostrEventsDatabase {
-    fn into_database(self) -> Arc<dyn NostrEventsDatabase>;
-}
-
-impl IntoNostrEventsDatabase for Arc<dyn NostrEventsDatabase> {
-    fn into_database(self) -> Arc<dyn NostrEventsDatabase> {
-        self
-    }
-}
-
-impl<T> IntoNostrEventsDatabase for T
-where
-    T: NostrEventsDatabase + Sized + 'static,
-{
-    fn into_database(self) -> Arc<dyn NostrEventsDatabase> {
-        Arc::new(self)
-    }
-}
-
-impl<T> IntoNostrEventsDatabase for Arc<T>
-where
-    T: NostrEventsDatabase + 'static,
-{
-    fn into_database(self) -> Arc<dyn NostrEventsDatabase> {
-        self
-    }
-}
-
 /// Nostr Events Database
 ///
 /// Store for the nostr events.
@@ -149,6 +120,67 @@ pub trait NostrEventsDatabase: Any + Debug + Send + Sync {
     fn delete(&self, filter: Filter) -> BoxedFuture<Result<(), DatabaseError>>;
 }
 
+impl<T> NostrEventsDatabase for Arc<T> 
+where
+    T: NostrEventsDatabase
+{
+    #[inline]
+    fn save_event<'a>(
+        &'a self,
+        event: &'a Event,
+    ) -> BoxedFuture<'a, Result<SaveEventStatus, DatabaseError>> {
+        self.as_ref().save_event(event)
+    }
+    
+    #[inline]
+    fn check_id<'a>(
+        &'a self,
+        event_id: &'a EventId,
+    ) -> BoxedFuture<'a, Result<DatabaseEventStatus, DatabaseError>> {
+        self.as_ref().check_id(event_id)
+    }
+    
+    #[inline]
+    fn has_coordinate_been_deleted<'a>(
+        &'a self,
+        coordinate: &'a CoordinateBorrow<'a>,
+        timestamp: &'a Timestamp,
+    ) -> BoxedFuture<'a, Result<bool, DatabaseError>> {
+        self.as_ref().has_coordinate_been_deleted(coordinate, timestamp)
+    }
+    
+    #[inline]
+    fn event_by_id<'a>(
+        &'a self,
+        event_id: &'a EventId,
+    ) -> BoxedFuture<'a, Result<Option<Event>, DatabaseError>> {
+        self.as_ref().event_by_id(event_id)
+    }
+    
+    #[inline]
+    fn count(&self, filter: Filter) -> BoxedFuture<Result<usize, DatabaseError>> {
+        self.as_ref().count(filter)
+    }
+    
+    #[inline]
+    fn query(&self, filter: Filter) -> BoxedFuture<Result<Events, DatabaseError>> {
+        self.as_ref().query(filter)
+    }
+
+    #[inline]
+    fn negentropy_items(
+        &self,
+        filter: Filter,
+    ) -> BoxedFuture<Result<Vec<(EventId, Timestamp)>, DatabaseError>> {
+        self.as_ref().negentropy_items(filter)
+    }
+
+    #[inline]
+    fn delete(&self, filter: Filter) -> BoxedFuture<Result<(), DatabaseError>> {
+        self.as_ref().delete(filter)
+    }
+}
+
 /// Nostr Event Store Extension
 pub trait NostrEventsDatabaseExt: NostrEventsDatabase {
     /// Get public key metadata

crates/nostr-database/src/lib.rs

@@ -27,7 +27,7 @@ pub use self::collections::events::Events;
 pub use self::error::DatabaseError;
 pub use self::events::helper::{DatabaseEventResult, DatabaseHelper};
 pub use self::events::{
-    DatabaseEventStatus, IntoNostrEventsDatabase, NostrEventsDatabase, NostrEventsDatabaseExt,
+    DatabaseEventStatus, NostrEventsDatabase, NostrEventsDatabaseExt,
     RejectedReason, SaveEventStatus,
 };
 #[cfg(feature = "flatbuf")]
@@ -62,41 +62,21 @@ impl Backend {
     }
 }
 
-#[doc(hidden)]
-pub trait IntoNostrDatabase {
-    fn into_nostr_database(self) -> Arc<dyn NostrDatabase>;
-}
-
-impl IntoNostrDatabase for Arc<dyn NostrDatabase> {
-    fn into_nostr_database(self) -> Arc<dyn NostrDatabase> {
-        self
-    }
-}
-
-impl<T> IntoNostrDatabase for T
-where
-    T: NostrDatabase + Sized + 'static,
-{
-    fn into_nostr_database(self) -> Arc<dyn NostrDatabase> {
-        Arc::new(self)
-    }
-}
-
-impl<T> IntoNostrDatabase for Arc<T>
-where
-    T: NostrDatabase + 'static,
-{
-    fn into_nostr_database(self) -> Arc<dyn NostrDatabase> {
-        self
-    }
-}
-
 /// Nostr Database
 pub trait NostrDatabase: NostrEventsDatabase + NostrDatabaseWipe {
     /// Name of the backend database used
     fn backend(&self) -> Backend;
 }
 
+impl<T> NostrDatabase for Arc<T> 
+where 
+    T: NostrDatabase + 'static
+{
+    fn backend(&self) -> Backend {
+        self.as_ref().backend()
+    }   
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

crates/nostr-database/src/wipe.rs

@@ -4,6 +4,8 @@
 
 //! Wipe trait
 
+use std::sync::Arc;
+
 use nostr::util::BoxedFuture;
 
 use crate::error::DatabaseError;
@@ -13,3 +15,12 @@ pub trait NostrDatabaseWipe {
     /// Wipe all data
     fn wipe(&self) -> BoxedFuture<Result<(), DatabaseError>>;
 }
+
+impl<T> NostrDatabaseWipe for Arc<T>
+where
+    T: NostrDatabaseWipe,
+{
+    fn wipe(&self) -> BoxedFuture<Result<(), DatabaseError>> {
+        self.as_ref().wipe()
+    }
+}

crates/nostr-lmdb/src/lib.rs

@@ -10,6 +10,7 @@
 #![warn(rustdoc::bare_urls)]
 #![allow(clippy::mutable_key_type)]
 
+use std::any::Any;
 use std::path::Path;
 
 use nostr_database::prelude::*;
@@ -19,7 +20,7 @@ mod store;
 use self::store::Store;
 
 /// LMDB Nostr Database
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct NostrLMDB {
     db: Store,
 }
@@ -35,6 +36,15 @@ impl NostrLMDB {
             db: Store::open(path).map_err(DatabaseError::backend)?,
         })
     }
+    
+    /// Downcast [`NostrDatabase`] to [`NostrLMDB`]
+    pub fn downcast<T>(database: &T) -> Option<&Self> 
+    where
+        T: NostrDatabase,
+    {
+        let any: &dyn Any = database as &dyn Any;
+        any.downcast_ref()
+    }
 }
 
 impl NostrDatabase for NostrLMDB {

crates/nostr-lmdb/src/store/mod.rs

@@ -20,7 +20,7 @@ use self::error::Error;
 use self::ingester::{Ingester, IngesterItem};
 use self::lmdb::Lmdb;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Store {
     db: Lmdb,
     ingester: Sender<IngesterItem>,

crates/nostr-relay-builder/src/builder.rs

@@ -236,9 +236,9 @@ impl RelayBuilder {
     #[inline]
     pub fn database<D>(mut self, database: D) -> Self
     where
-        D: IntoNostrEventsDatabase,
+        D: NostrEventsDatabase,
     {
-        self.database = database.into_database();
+        self.database = Arc::new(database);
         self
     }
 

crates/nostr-relay-pool/src/shared.rs

@@ -12,7 +12,7 @@ use std::sync::{Arc, Mutex};
 use lru::LruCache;
 use nostr::prelude::IntoNostrSigner;
 use nostr::{EventId, NostrSigner};
-use nostr_database::{IntoNostrDatabase, MemoryDatabase, NostrDatabase};
+use nostr_database::{MemoryDatabase, NostrDatabase};
 use tokio::sync::RwLock;
 
 use crate::policy::AdmitPolicy;
@@ -52,7 +52,7 @@ pub struct SharedState {
 impl Default for SharedState {
     fn default() -> Self {
         Self::new(
-            MemoryDatabase::new().into_nostr_database(),
+            Arc::new(MemoryDatabase::new()),
             Arc::new(DefaultWebsocketTransport),
             None,
             None,

crates/nostr-sdk/examples/lmdb.rs

@@ -2,6 +2,8 @@
 // Copyright (c) 2023-2025 Rust Nostr Developers
 // Distributed under the MIT software license
 
+use std::any::Any;
+use std::sync::Arc;
 use nostr_sdk::prelude::*;
 
 #[tokio::main]
@@ -21,6 +23,10 @@ async fn main() -> Result<()> {
     client.add_relay("wss://nostr.oxtr.dev").await?;
 
     client.connect().await;
+    
+    let database = client.database();
+    let lmdb = NostrLMDB::downcast(database).unwrap();
+    
 
     // Publish a text note
     let builder = EventBuilder::text_note("Hello world");

crates/nostr-sdk/src/client/builder.rs

@@ -8,7 +8,7 @@ use std::sync::Arc;
 
 use nostr::signer::{IntoNostrSigner, NostrSigner};
 use nostr_database::memory::MemoryDatabase;
-use nostr_database::{IntoNostrDatabase, NostrDatabase};
+use nostr_database::NostrDatabase;
 use nostr_relay_pool::policy::AdmitPolicy;
 use nostr_relay_pool::transport::websocket::{
     DefaultWebsocketTransport, IntoWebSocketTransport, WebSocketTransport,
@@ -95,9 +95,9 @@ impl ClientBuilder {
     #[inline]
     pub fn database<D>(mut self, database: D) -> Self
     where
-        D: IntoNostrDatabase,
+        D: NostrDatabase,
     {
-        self.database = database.into_nostr_database();
+        self.database = Arc::new(database);
         self
     }