nostr-sdk: add wait_for_subscription option

Author: yukibtc

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

@@ -458,13 +458,15 @@ impl Client {
     /// ```
     pub async fn subscribe(&self, filters: Vec<Filter>) {
         self.pool
-            .subscribe(filters, self.opts.get_wait_for_send())
+            .subscribe(filters, self.opts.get_wait_for_subscription())
             .await;
     }
 
     /// Unsubscribe
     pub async fn unsubscribe(&self) {
-        self.pool.unsubscribe(self.opts.get_wait_for_send()).await;
+        self.pool
+            .unsubscribe(self.opts.get_wait_for_subscription())
+            .await;
     }
 
     /// Get events of filters

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

@@ -14,6 +14,8 @@ pub struct Options {
     wait_for_connection: Arc<AtomicBool>,
     /// Wait for the msg to be sent (default: true)
     wait_for_send: Arc<AtomicBool>,
+    /// Wait for the subscription msg to be sent (default: false)
+    wait_for_subscription: Arc<AtomicBool>,
     /// POW difficulty for all events (default: 0)
     difficulty: Arc<AtomicU8>,
     /// REQ filters chunk size (default: 10)
@@ -30,6 +32,7 @@ impl Default for Options {
         Self {
             wait_for_connection: Arc::new(AtomicBool::new(false)),
             wait_for_send: Arc::new(AtomicBool::new(true)),
+            wait_for_subscription: Arc::new(AtomicBool::new(false)),
             difficulty: Arc::new(AtomicU8::new(0)),
             req_filters_chunk_size: Arc::new(AtomicU8::new(10)),
             timeout: None,
@@ -69,6 +72,18 @@ impl Options {
         self.wait_for_send.load(Ordering::SeqCst)
     }
 
+    /// If set to `true`, `Client` wait that a subscription msg is sent before continue (`subscribe` and `unsubscribe` methods)
+    pub fn wait_for_subscription(self, wait: bool) -> Self {
+        Self {
+            wait_for_subscription: Arc::new(AtomicBool::new(wait)),
+            ..self
+        }
+    }
+
+    pub(crate) fn get_wait_for_subscription(&self) -> bool {
+        self.wait_for_subscription.load(Ordering::SeqCst)
+    }
+
     /// Set default POW diffficulty for `Event`
     pub fn difficulty(self, difficulty: u8) -> Self {
         Self {