Shared Binding Objects uniffi

Author: ntheile

bindings/lni_nodejs/index.d.ts

@@ -10,6 +10,10 @@ export interface PhoenixdConfig {
   url: string
   password: string
 }
+export interface PhoenixdNode {
+  url: string
+  password: string
+}
 export declare class Fetcher {
   constructor()
   getIpAddress(): Promise<Ip>

bindings/lni_uniffi/Cargo.toml

@@ -6,27 +6,21 @@ license = "MPL-2.0"
 publish = false
 
 [lib]
-crate-type = ["lib", "cdylib", "staticlib"]
+crate-type = ["cdylib", "staticlib"]
 name = "lni_uniffi"
 
 [dependencies]
-lni = { path = "../../crates/lni" }
+lni = { path = "../../crates/lni", features = ["uniffi_rs"] }
 async-trait = "0.1"
-uniffi = { version = "0.28" }
+uniffi = { version = "0.28", features = ["cli"] }
 thiserror = "1.0"
 serde = { version = "1", features=["derive"] }
 serde_json = "1"
 reqwest = { version = "0.10", default-features = false, features = ["json", "rustls-tls", "blocking"] }
 tokio = { version = "1", features = ["full"] }
-napi = { version = "2.12.2", default-features = false, features = ["napi4"] }
-napi-derive = "2.12.2"
 
 [build-dependencies]
 uniffi = { version = "0.28", features = ["build"] }
 
 [dev-dependencies]
 uniffi = { version = "0.28", features = ["bindgen-tests"] }
-
-[features]
-napi_rs = []
-default = []

bindings/lni_uniffi/build.rs

@@ -1,5 +1,7 @@
+uniffi::setup_scaffolding!("lni");
 mod api_client;
+mod phoenixd;
 
-pub use lni::{ApiError, Ip, Result};
 pub use api_client::Fetcher;
-uniffi::include_scaffolding!("lni");
+pub use lni::phoenixd::lib::PhoenixdNode;
+pub use lni::{ApiError, Ip, Result};

bindings/lni_uniffi/src/lib.rs

@@ -0,0 +1,39 @@
+use lni::phoenixd::lib::PhoenixdConfig;
+use std::sync::Arc;
+
+#[derive(uniffi::Object)]
+pub struct PhoenixdNode {
+    inner: PhoenixdConfig,
+}
+
+#[uniffi::export]
+impl PhoenixdNode {
+    #[uniffi::constructor]
+    pub fn new(config: PhoenixdConfig) -> Self {
+        Self { inner: config }
+    }
+
+    pub fn get_url(&self) -> String {
+        self.inner.url.clone()
+    }
+
+    pub fn get_password(&self) -> String {
+        self.inner.password.clone()
+    }
+
+    pub fn get_config(&self) -> PhoenixdConfig {
+        PhoenixdConfig {
+            url: self.inner.url.clone(),
+            password: self.inner.password.clone(),
+        }
+    }
+
+    pub async fn get_offer(&self) {
+        match lni::phoenixd::api::get_offer(self.inner.url.clone(), self.inner.password.clone())
+            .await
+        {
+            Ok(offer) => Ok(offer),
+            Err(e) => Err(e),
+        };
+    }
+}

bindings/lni_uniffi/src/lni.udl

@@ -8,18 +8,31 @@ name = "lni"
 path = "lib.rs"
 
 [dependencies]
-reqwest = { version = "0.10", default-features = false, features = ["json", "rustls-tls", "blocking"] }
+reqwest = { version = "0.10", default-features = false, features = [
+    "json",
+    "rustls-tls",
+    "blocking",
+] }
 async-trait = "0.1"
 thiserror = "1.0"
-serde = { version = "1", features=["derive"] }
+serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 napi = { version = "2.12.2", default-features = false, features = ["napi4"] }
 napi-derive = "2.12.2"
+uniffi = { version = "0.28", optional = true }
+uniffi_macros = { version = "0.28", optional = true }
+
+[build-dependencies]
+uniffi = { version = "0.28", features = ["build"], optional = true }
+
+[dev-dependencies]
+uniffi = { version = "0.28", features = ["bindgen-tests"] }
 
 [profile.release]
 lto = true
 strip = "symbols"
 
 [features]
 napi_rs = []
-default = []
+uniffi_rs = ["uniffi", "uniffi_macros"]
+default = []

bindings/lni_uniffi/src/phoenixd.rs

@@ -3,6 +3,8 @@ use reqwest;
 use napi_derive::napi;
 #[cfg(feature = "napi_rs")]
 use napi::bindgen_prelude::*;
+#[cfg(feature = "uniffi_rs")]
+uniffi::setup_scaffolding!();
 
 #[derive(Debug, thiserror::Error)]
 pub enum ApiError {

crates/lni/Cargo.toml

@@ -2,11 +2,14 @@
 use napi_derive::napi;
 
 #[cfg_attr(feature = "napi_rs", napi(object))]
+#[cfg_attr(feature = "uniffi_rs", derive(uniffi::Record))]
 pub struct PhoenixdConfig {
     pub url: String,
     pub password: String,
 }
 
+#[cfg_attr(feature = "napi_rs", napi(object))]
+#[cfg_attr(feature = "uniffi_rs", derive(uniffi::Record))]
 pub struct PhoenixdNode {
     pub url: String,
     pub password: String,

crates/lni/lib.rs

@@ -129,6 +129,30 @@ Bindings
     - https://mozilla.github.io/uniffi-rs/latest/
     - `cd bindings/lni_uniffi && cargo build`
 
+Shared Binding Objects
+====================
+If you do not want to copy objects to the foreign language bindings we can simply use the features `napi_rs` or `uniffi_rs`
+to turn on or off language specific decorators and then implement them in their respective bindings project.
+
+Example:
+```
+#[cfg(feature = "napi_rs")]
+use napi_derive::napi;
+
+#[cfg_attr(feature = "napi_rs", napi(object))]
+#[cfg_attr(feature = "uniffi_rs", derive(uniffi::Record))]
+pub struct PhoenixdConfig {
+    pub url: String,
+    pub password: String,
+}
+
+#[cfg_attr(feature = "napi_rs", napi(object))]
+#[cfg_attr(feature = "uniffi_rs", derive(uniffi::Record))]
+pub struct PhoenixdNode {
+    pub url: String,
+    pub password: String,
+}
+```
 
 Tor
 ===