ffi(nostr-sdk): convert ClientSigner from enum to struct

Author: yukibtc

bindings/nostr-sdk-ffi/bindings-python/README.md

@@ -29,13 +29,13 @@ init_logger(LogLevel.INFO)
 
 # Or, initialize with Keys signer
 keys = Keys.generate()
-signer = ClientSigner.KEYS(keys)
+signer = ClientSigner.keys(keys)
 client = Client(signer)
 
 # Or, initialize with NIP46 signer
 # app_keys = Keys.generate()
 # nip46 = Nip46Signer("wss://relay.damus.io", app_keys, None)
-#signer = ClientSigner.NIP46(nip46)
+#signer = ClientSigner.nip46(nip46)
 # client = Client(signer)
 
 # Add a single relay

bindings/nostr-sdk-ffi/bindings-python/examples/bot.py

@@ -13,7 +13,7 @@
 pk = keys.public_key()
 print(f"Bot public key: {pk.to_bech32()}")
 
-signer = ClientSigner.KEYS(keys)
+signer = ClientSigner.keys(keys)
 client = Client(signer)
 
 client.add_relay("wss://relay.damus.io")

bindings/nostr-sdk-ffi/bindings-python/examples/client.py

@@ -10,13 +10,13 @@
 
 # Or, initialize with Keys signer
 keys = Keys.generate()
-signer = ClientSigner.KEYS(keys)
+signer = ClientSigner.keys(keys)
 client = Client(signer)
 
 # Or, initialize with NIP46 signer
 # app_keys = Keys.generate()
 # nip46 = Nip46Signer("wss://relay.damus.io", app_keys, None)
-#signer = ClientSigner.NIP46(nip46)
+#signer = ClientSigner.nip46(nip46)
 # client = Client(signer)
 
 # Add a single relay

bindings/nostr-sdk-ffi/bindings-python/examples/metadata.py

@@ -3,7 +3,7 @@
 
 keys = Keys.generate()
 
-signer = ClientSigner.KEYS(keys)
+signer = ClientSigner.keys(keys)
 client = Client(signer)
 
 client.add_relay("wss://relay.damus.io")

bindings/nostr-sdk-ffi/bindings-python/examples/nip94.py

@@ -3,7 +3,7 @@
 keys = Keys.generate()
 print(keys.public_key().to_bech32())
 
-signer = ClientSigner.KEYS(keys)
+signer = ClientSigner.keys(keys)
 client = Client(signer)
 
 client.add_relay("wss://relay.damus.io")

bindings/nostr-sdk-ffi/src/client/builder.rs

@@ -33,27 +33,27 @@ impl ClientBuilder {
         }
     }
 
-    pub fn signer(self: Arc<Self>, signer: ClientSigner) -> Self {
-        let signer: nostr_sdk::ClientSigner = signer.into();
+    pub fn signer(self: Arc<Self>, signer: Arc<ClientSigner>) -> Self {
+        let signer: nostr_sdk::ClientSigner = signer.as_ref().deref().clone();
         let mut builder = unwrap_or_clone_arc(self);
         builder.inner = builder.inner.signer(signer);
         builder
     }
 
-    pub fn database(self: Arc<Self>, database: Arc<NostrDatabase>) -> Arc<Self> {
+    pub fn database(self: Arc<Self>, database: Arc<NostrDatabase>) -> Self {
         let database: Arc<DynNostrDatabase> = database.as_ref().into();
         let mut builder = unwrap_or_clone_arc(self);
         builder.inner = builder.inner.database(database);
-        Arc::new(builder)
+        builder
     }
 
     /// Set opts
-    pub fn opts(self: Arc<Self>, opts: Arc<Options>) -> Arc<Self> {
+    pub fn opts(self: Arc<Self>, opts: Arc<Options>) -> Self {
         let mut builder = unwrap_or_clone_arc(self);
         builder.inner = builder
             .inner
             .opts(opts.as_ref().deref().clone().shutdown_on_drop(true));
-        Arc::new(builder)
+        builder
     }
 
     /// Build [`Client`]

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

@@ -41,16 +41,16 @@ impl From<ClientSdk> for Client {
 #[uniffi::export]
 impl Client {
     #[uniffi::constructor]
-    pub fn new(signer: Option<ClientSigner>) -> Self {
+    pub fn new(signer: Option<Arc<ClientSigner>>) -> Self {
         Self::with_opts(signer, Arc::new(Options::new()))
     }
 
     #[uniffi::constructor]
-    pub fn with_opts(signer: Option<ClientSigner>, opts: Arc<Options>) -> Self {
+    pub fn with_opts(signer: Option<Arc<ClientSigner>>, opts: Arc<Options>) -> Self {
         let opts: OptionsSdk = opts.as_ref().deref().clone().shutdown_on_drop(true);
         let mut builder = nostr_sdk::ClientBuilder::new().opts(opts);
         if let Some(signer) = signer {
-            let signer: nostr_sdk::ClientSigner = signer.into();
+            let signer: nostr_sdk::ClientSigner = signer.as_ref().deref().clone();
             builder = builder.signer(signer);
         }
         Self {

bindings/nostr-sdk-ffi/src/client/signer/mod.rs

@@ -7,51 +7,43 @@ use std::sync::Arc;
 
 use nostr_ffi::Keys;
 use nostr_sdk::client::signer;
-use uniffi::Enum;
+use uniffi::Object;
 
 pub mod nip46;
 
-#[derive(Enum)]
-pub enum ClientSigner {
-    #[cfg(target_os = "android")]
-    PrivateKeys {
-        signer: Arc<Keys>,
-    },
-    #[cfg(not(target_os = "android"))]
-    Keys {
-        signer: Arc<Keys>,
-    },
-    NIP46 {
-        signer: Arc<nip46::Nip46Signer>,
-    },
+use self::nip46::Nip46Signer;
+
+#[derive(Object)]
+pub struct ClientSigner {
+    inner: signer::ClientSigner,
 }
 
-impl From<ClientSigner> for signer::ClientSigner {
-    fn from(value: ClientSigner) -> Self {
-        match value {
-            #[cfg(target_os = "android")]
-            ClientSigner::PrivateKeys { signer } => Self::Keys(signer.as_ref().deref().clone()),
-            #[cfg(not(target_os = "android"))]
-            ClientSigner::Keys { signer } => Self::Keys(signer.as_ref().deref().clone()),
-            ClientSigner::NIP46 { signer } => Self::NIP46(signer.as_ref().deref().clone()),
-        }
+impl Deref for ClientSigner {
+    type Target = signer::ClientSigner;
+    fn deref(&self) -> &Self::Target {
+        &self.inner
     }
 }
 
 impl From<signer::ClientSigner> for ClientSigner {
-    fn from(value: signer::ClientSigner) -> Self {
-        match value {
-            #[cfg(target_os = "android")]
-            signer::ClientSigner::Keys(keys) => Self::PrivateKeys {
-                signer: Arc::new(keys.into()),
-            },
-            #[cfg(not(target_os = "android"))]
-            signer::ClientSigner::Keys(keys) => Self::Keys {
-                signer: Arc::new(keys.into()),
-            },
-            signer::ClientSigner::NIP46(signer) => Self::NIP46 {
-                signer: Arc::new(signer.into()),
-            },
+    fn from(inner: signer::ClientSigner) -> Self {
+        Self { inner }
+    }
+}
+
+#[uniffi::export]
+impl ClientSigner {
+    #[uniffi::constructor]
+    pub fn keys(keys: Arc<Keys>) -> Self {
+        Self {
+            inner: signer::ClientSigner::Keys(keys.as_ref().deref().clone()),
+        }
+    }
+
+    #[uniffi::constructor]
+    pub fn nip46(nip46: Arc<Nip46Signer>) -> Self {
+        Self {
+            inner: signer::ClientSigner::NIP46(nip46.as_ref().deref().clone()),
         }
     }
 }