nwc: allow usage of multiple relays

Use `RelayPool` instead of `Relay`.

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

Author: yukibtc

CHANGELOG.md

@@ -64,6 +64,7 @@
 * ndb: avoid event clone when calling `NostrEventsDatabase::save_event` ([Yuki Kishimoto])
 * sdk: auto-update the gossip data when sending an event ([Yuki Kishimoto])
 * sdk: avoid full clone of relays when only urls are needed ([Yuki Kishimoto])
+* nwc: allow usage of multiple relays ([Yuki Kishimoto])
 * ffi: improve `Events::merge` and `Events::to_vec` performance ([Yuki Kishimoto])
 * ci: release wheels also for python `3.13` ([Yuki Kishimoto])
 

bindings/nostr-sdk-ffi/src/nwc/mod.rs

@@ -2,6 +2,7 @@
 // Copyright (c) 2023-2025 Rust Nostr Developers
 // Distributed under the MIT software license
 
+use std::collections::HashMap;
 use std::ops::Deref;
 
 use uniffi::Object;
@@ -49,9 +50,14 @@ impl NWC {
         }
     }
 
-    /// Get relay status
-    pub fn status(&self) -> RelayStatus {
-        self.inner.status().into()
+    /// Get relays status
+    pub async fn status(&self) -> HashMap<String, RelayStatus> {
+        self.inner
+            .status()
+            .await
+            .into_iter()
+            .map(|(k, v)| (k.to_string(), v.into()))
+            .collect()
     }
 
     /// Pay invoice

bindings/nostr-sdk-js/src/nwc/mod.rs

@@ -17,7 +17,6 @@ use crate::protocol::nips::nip47::{
     JsMakeInvoiceRequest, JsMakeInvoiceResponse, JsNostrWalletConnectURI, JsPayInvoiceRequest,
     JsPayInvoiceResponse, JsPayKeysendRequest, JsPayKeysendResponse,
 };
-use crate::relay::JsRelayStatus;
 
 #[wasm_bindgen]
 extern "C" {
@@ -58,11 +57,6 @@ impl JsNwc {
         }
     }
 
-    /// Get relay status
-    pub fn status(&self) -> JsRelayStatus {
-        self.inner.status().into()
-    }
-
     /// Pay invoice
     #[wasm_bindgen(js_name = payInvoice)]
     pub async fn pay_invoice(&self, params: &JsPayInvoiceRequest) -> Result<JsPayInvoiceResponse> {

crates/nwc/src/error.rs

@@ -7,15 +7,15 @@
 use std::fmt;
 
 use nostr::nips::nip47;
-use nostr_relay_pool::relay;
+use nostr_relay_pool::pool;
 
 /// NWC error
 #[derive(Debug)]
 pub enum Error {
     /// NIP47 error
     NIP47(nip47::Error),
-    /// Relay
-    Relay(relay::Error),
+    /// Relay Pool
+    Pool(pool::Error),
     /// Premature exit
     PrematureExit,
     /// Request timeout
@@ -28,7 +28,7 @@ impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::NIP47(e) => write!(f, "{e}"),
-            Self::Relay(e) => write!(f, "{e}"),
+            Self::Pool(e) => write!(f, "{e}"),
             Self::PrematureExit => write!(f, "premature exit"),
             Self::Timeout => write!(f, "timeout"),
         }
@@ -41,8 +41,8 @@ impl From<nip47::Error> for Error {
     }
 }
 
-impl From<relay::Error> for Error {
-    fn from(e: relay::Error) -> Self {
-        Self::Relay(e)
+impl From<pool::Error> for Error {
+    fn from(e: pool::Error) -> Self {
+        Self::Pool(e)
     }
 }

crates/nwc/src/lib.rs

@@ -11,6 +11,7 @@
 #![allow(unknown_lints)] // TODO: remove when MSRV >= 1.72.0, required for `clippy::arc_with_non_send_sync`
 #![allow(clippy::arc_with_non_send_sync)]
 
+use std::collections::HashMap;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 
@@ -35,7 +36,7 @@ const ID: &str = "nwc";
 #[derive(Debug, Clone)]
 pub struct NWC {
     uri: NostrWalletConnectURI,
-    relay: Relay,
+    pool: RelayPool,
     opts: NostrWalletConnectOptions,
     bootstrapped: Arc<AtomicBool>,
 }
@@ -50,17 +51,17 @@ impl NWC {
     /// New `NWC` client with custom [`NostrWalletConnectOptions`].
     pub fn with_opts(uri: NostrWalletConnectURI, opts: NostrWalletConnectOptions) -> Self {
         Self {
-            relay: Relay::with_opts(uri.relays.first().cloned().unwrap(), opts.relay.clone()),
             uri,
+            pool: RelayPool::default(),
             opts,
             bootstrapped: Arc::new(AtomicBool::new(false)),
         }
     }
 
-    /// Get relay status
-    #[inline]
-    pub fn status(&self) -> RelayStatus {
-        self.relay.status()
+    /// Get relays status
+    pub async fn status(&self) -> HashMap<RelayUrl, RelayStatus> {
+        let relays = self.pool.relays().await;
+        relays.into_iter().map(|(u, r)| (u, r.status())).collect()
     }
 
     /// Connect and subscribe
@@ -70,16 +71,21 @@ impl NWC {
             return Ok(());
         }
 
-        // Connect
-        self.relay.connect();
+        // Add relays
+        for url in self.uri.relays.iter() {
+            self.pool.add_relay(url, self.opts.relay.clone()).await?;
+        }
+
+        // Connect to relays
+        self.pool.connect().await;
 
         let filter = Filter::new()
             .author(self.uri.public_key)
             .kind(Kind::WalletConnectResponse)
             .limit(0); // Limit to 0 means give me 0 events until EOSE
 
         // Subscribe
-        self.relay
+        self.pool
             .subscribe_with_id(SubscriptionId::new(ID), filter, SubscribeOptions::default())
             .await?;
 
@@ -96,16 +102,16 @@ impl NWC {
         // Convert request to event
         let event: Event = req.to_event(&self.uri)?;
 
-        let mut notifications = self.relay.notifications();
+        let mut notifications = self.pool.notifications();
 
         // Send request
-        let id: EventId = self.relay.send_event(&event).await?;
+        let output: Output<EventId> = self.pool.send_event(&event).await?;
 
         time::timeout(Some(self.opts.timeout), async {
             while let Ok(notification) = notifications.recv().await {
-                if let RelayNotification::Event { event, .. } = notification {
+                if let RelayPoolNotification::Event { event, .. } = notification {
                     if event.kind == Kind::WalletConnectResponse
-                        && event.tags.event_ids().next().copied() == Some(id)
+                        && event.tags.event_ids().next() == Some(output.id())
                     {
                         return Ok(Response::from_event(&self.uri, &event)?);
                     }
@@ -185,7 +191,7 @@ impl NWC {
 
     /// Completely shutdown [NWC] client
     #[inline]
-    pub fn shutdown(self) {
-        self.relay.disconnect()
+    pub async fn shutdown(self) {
+        self.pool.disconnect().await
     }
 }