ffi(nostr): add missing #[uniffi::export]

`Request::from_value` to `Request::parse`

`Response::from_value` to `Response::parse`

Author: rustedmoon

bindings/nostr-ffi/src/nips/nip01.rs

@@ -5,12 +5,12 @@ use std::str::FromStr;
 use std::sync::Arc;
 
 use nostr::nips::nip01;
-use nostr::nips::nip19::ToBech32;
+use nostr::nips::nip19::{FromBech32, ToBech32};
 use nostr::nips::nip21::NostrURI;
-use nostr::FromBech32;
 use uniffi::Object;
 
-use crate::{error::Result, PublicKey};
+use crate::error::Result;
+use crate::PublicKey;
 
 /// Coordinate for event (`a` tag)
 #[derive(Object)]

bindings/nostr-ffi/src/nips/nip11.rs

@@ -7,9 +7,7 @@ use std::sync::Arc;
 
 use nostr::nips::nip11;
 use nostr::Url;
-use uniffi::Enum;
-use uniffi::Object;
-use uniffi::Record;
+use uniffi::{Enum, Object, Record};
 
 use crate::error::Result;
 use crate::Timestamp;

bindings/nostr-ffi/src/nips/nip13.rs

@@ -4,13 +4,15 @@
 use nostr::nips::nip13;
 
 /// Gets the number of leading zero bits. Result is between 0 and 255.
+#[uniffi::export]
 pub fn get_leading_zero_bits(bytes: Vec<u8>) -> u8 {
     nip13::get_leading_zero_bits(bytes)
 }
 
 /// Returns all possible ID prefixes (hex) that have the specified number of leading zero bits.
 ///
 /// Possible values: 0-255
+#[uniffi::export]
 pub fn get_prefixes_for_difficulty(leading_zero_bits: u8) -> Vec<String> {
     nip13::get_prefixes_for_difficulty(leading_zero_bits)
 }

bindings/nostr-ffi/src/nips/nip19.rs

@@ -6,8 +6,7 @@ use std::sync::Arc;
 
 use nostr::nips::nip19::{self, FromBech32, ToBech32};
 use nostr::nips::nip21::NostrURI;
-use uniffi::Enum;
-use uniffi::Object;
+use uniffi::{Enum, Object};
 
 use super::nip01::Coordinate;
 use crate::error::Result;

bindings/nostr-ffi/src/nips/nip21.rs

@@ -4,8 +4,7 @@
 use std::sync::Arc;
 
 use nostr::nips::nip21;
-use uniffi::Enum;
-use uniffi::Object;
+use uniffi::{Enum, Object};
 
 use crate::error::Result;
 use crate::nips::nip01::Coordinate;

bindings/nostr-ffi/src/nips/nip26.rs

@@ -63,13 +63,11 @@ pub fn verify_delegation_signature(
 ) -> Result<bool> {
     let conditions = Conditions::from_str(&conditions)?;
     let signature_struct = Signature::from_str(&signature)?;
-    match nip26::verify_delegation_signature(
+    Ok(nip26::verify_delegation_signature(
         **delegator_public_key,
         signature_struct,
         **delegatee_public_key,
         conditions,
-    ) {
-        Ok(_) => Ok(true),
-        Err(_) => Ok(false),
-    }
+    )
+    .is_ok())
 }

bindings/nostr-ffi/src/nips/nip47.rs

@@ -5,11 +5,11 @@ use std::str::FromStr;
 use std::sync::Arc;
 
 use nostr::nips::nip47;
-use nostr::Url;
+use nostr::{JsonUtil, Url};
 use uniffi::{Enum, Record};
 
 use crate::error::Result;
-use crate::{JsonValue, PublicKey, SecretKey};
+use crate::{PublicKey, SecretKey};
 
 /// NIP47 Response Error codes
 #[derive(Enum)]
@@ -332,8 +332,8 @@ impl From<nip47::Request> for Request {
 #[uniffi::export]
 impl Request {
     #[uniffi::constructor]
-    pub fn from_value(value: JsonValue) -> Result<Self> {
-        Ok(nip47::Request::from_value(value.try_into()?)?.into())
+    pub fn parse(json: String) -> Result<Self> {
+        Ok(nip47::Request::from_json(json)?.into())
     }
 }
 
@@ -554,8 +554,8 @@ impl From<nip47::Response> for Response {
 impl Response {
     /// Deserialize from JSON string
     #[uniffi::constructor]
-    pub fn from_value(value: JsonValue) -> Result<Self> {
-        Ok(nip47::Response::from_value(value.try_into()?)?.into())
+    pub fn parse(json: String) -> Result<Self> {
+        Ok(nip47::Response::from_json(json)?.into())
     }
 }
 

bindings/nostr-ffi/src/nips/nip65.rs

@@ -1,14 +1,17 @@
 // Copyright (c) 2023-2024 Rust Nostr Developers
 // Distributed under the MIT software license
 
-use std::{ops::Deref, sync::Arc};
+use std::collections::HashMap;
+use std::ops::Deref;
+use std::sync::Arc;
 
 use nostr::nips::nip65;
 
 use crate::{Event, RelayMetadata};
 
 /// Extracts the relay info (url, optional read/write flag) from the event
-pub fn extract_relay_list(event: Arc<Event>) -> Vec<(String, Option<RelayMetadata>)> {
+#[uniffi::export]
+pub fn extract_relay_list(event: Arc<Event>) -> HashMap<String, Option<RelayMetadata>> {
     nip65::extract_relay_list(event.deref())
         .into_iter()
         .map(|(s, r)| (s.to_string(), r.map(|r| r.into())))

bindings/nostr-ffi/src/nips/nip98.rs

@@ -1,13 +1,6 @@
 // Copyright (c) 2023-2024 Rust Nostr Developers
 // Distributed under the MIT software license
 
-//! NIP98
-//!
-//! This NIP defines an ephemerial event used to authorize requests to HTTP servers using nostr events.
-//! This is useful for HTTP services which are build for Nostr and deal with Nostr user accounts.
-//!
-//! <https://github.com/nostr-protocol/nips/blob/master/98.md>
-
 use std::str::FromStr;
 
 use nostr::hashes::sha256::Hash as Sha256Hash;

crates/nostr/src/nips/nip58.rs

@@ -47,15 +47,15 @@ impl fmt::Display for Error {
 }
 
 /// Helper function to filter events for a specific [`Kind`]
-pub fn filter_for_kind(events: Vec<Event>, kind_needed: &Kind) -> Vec<Event> {
+pub(crate) fn filter_for_kind(events: Vec<Event>, kind_needed: &Kind) -> Vec<Event> {
     events
         .into_iter()
         .filter(|e| e.kind == *kind_needed)
         .collect()
 }
 
 /// Helper function to extract the awarded public key from an array of PubKey tags
-pub fn extract_awarded_public_key(
+pub(crate) fn extract_awarded_public_key(
     tags: &[Tag],
     awarded_public_key: &XOnlyPublicKey,
 ) -> Option<(XOnlyPublicKey, Option<UncheckedUrl>)> {