chore: release prep (#55)

Updates the following dependencies:

- `iroh`
- `iroh-base`

Author: ramfox

Cargo.toml

@@ -19,10 +19,10 @@ required-features = ["headers"]  # Do not build unless generating headers.
 [dependencies]
 anyhow = "1"
 bytes = "1.10"
-iroh = { version = "0.92", features = ["discovery-local-network"] }
-iroh-base = { version = "0.92", features = ["ticket"] }
+iroh = { version = "0.93", features = ["discovery-local-network"] }
+iroh-base = { version = "0.93", features = ["ticket"] }
 once_cell = "1.21"
-rand = "0.8"
+rand = "0.9.2"
 safer-ffi = { version = "0.1.13" }
 socket2 = "0.5.10"
 tokio = { version = "1.45.1", features = ["rt-multi-thread"] }

irohnet.h

@@ -634,14 +634,6 @@ void
 endpoint_free (
     Endpoint_t * ep);
 
-/** \brief
- *  Get the home relay of this iroh endpoint.
- */
-EndpointResult_t
-endpoint_home_relay (
-    Endpoint_t * const * ep,
-    Url_t * out);
-
 /** \brief
  *  Let the endpoint know that the underlying network conditions might have changed.
  *
@@ -660,6 +652,19 @@ endpoint_node_addr (
     Endpoint_t * const * ep,
     NodeAddr_t * out);
 
+/** \brief
+ *  Returns once the endpoint is online.
+ *
+ *  We are considered online if we have a home relay and at least one
+ *  direct address.
+ *
+ *  Will block at most `timeout` milliseconds.
+ */
+EndpointResult_t
+endpoint_online (
+    Endpoint_t * const * ep,
+    uint64_t timeout_ms);
+
 /** \brief
  *  Enables tracing for iroh.
  *

main.c

@@ -25,6 +25,13 @@ run_server (EndpointConfig_t * config, slice_ref_uint8_t alpn_slice, bool json_o
     return -1;
   }
 
+  // Ensure we are online, waiting 5 seconds max
+  int timeout_res = endpoint_online(&ep, 5000);
+  if (timeout_res != 0) {
+    fprintf(stderr, "failed to get a home relay\n");
+    return -1;
+  }
+
   // Print details
   NodeAddr_t node_addr = node_addr_default();
   int addr_res = endpoint_node_addr(&ep, &node_addr);
@@ -35,11 +42,7 @@ run_server (EndpointConfig_t * config, slice_ref_uint8_t alpn_slice, bool json_o
   char * node_id_str = public_key_as_base32(&node_addr.node_id);
 
   Url_t * relay_url = url_default();
-  int relay_url_res = endpoint_home_relay(&ep, relay_url);
-  if (relay_url_res != 0) {
-    fprintf(stderr, "failed to get my home relay");
-    return -1;
-  }
+  relay_url = node_addr.relay_url;
 
   char * relay_url_str = url_as_str(relay_url);
 

src/endpoint.rs

@@ -18,7 +18,7 @@ use snafu::GenerateImplicitData;
 use tokio::sync::RwLock;
 use tracing::{debug, error, warn};
 
-use crate::addr::{NodeAddr, SocketAddrV4, SocketAddrV6, Url};
+use crate::addr::{NodeAddr, SocketAddrV4, SocketAddrV6};
 use crate::key::{secret_key_generate, PublicKey, SecretKey};
 use crate::stream::{RecvStream, SendStream};
 use crate::util::TOKIO_EXECUTOR;
@@ -318,7 +318,7 @@ fn make_dns_discovery(secret_key: &iroh::SecretKey) -> Vec<Box<dyn Discovery>> {
 }
 
 fn make_mdns_discovery(node_id: NodeId, advertise: bool) -> Option<Box<dyn Discovery>> {
-    match MdnsDiscovery::new(node_id, advertise) {
+    match MdnsDiscovery::builder().advertise(advertise).build(node_id) {
         Err(e) => {
             error!("unable to start MdnsDiscovery service: {e:?}");
             None
@@ -985,9 +985,7 @@ pub fn endpoint_node_addr(ep: &repr_c::Box<Endpoint>, out: &mut NodeAddr) -> End
             .await
             .as_ref()
             .expect("endpoint not initialized")
-            .node_addr()
-            .initialized()
-            .await;
+            .node_addr();
         anyhow::Ok(addr)
     });
 
@@ -1003,30 +1001,32 @@ pub fn endpoint_node_addr(ep: &repr_c::Box<Endpoint>, out: &mut NodeAddr) -> End
     }
 }
 
-/// Get the home relay of this iroh endpoint.
+/// Returns once the endpoint is online.
+///
+/// We are considered online if we have a home relay and at least one
+/// direct address.
+///
+/// Will block at most `timeout` milliseconds.
 #[ffi_export]
-pub fn endpoint_home_relay(ep: &repr_c::Box<Endpoint>, out: &mut Url) -> EndpointResult {
+pub fn endpoint_online(ep: &repr_c::Box<Endpoint>, timeout_ms: u64) -> EndpointResult {
+    let timeout = Duration::from_millis(timeout_ms);
     let res = TOKIO_EXECUTOR.block_on(async move {
-        let relay_url = ep
-            .ep
-            .read()
-            .await
-            .as_ref()
-            .expect("endpoint not initialized")
-            .home_relay()
-            .initialized()
-            .await;
-        anyhow::Ok(relay_url)
+        tokio::time::timeout(timeout, async move {
+            ep.ep
+                .read()
+                .await
+                .as_ref()
+                .expect("endpoint not initialized")
+                .online()
+                .await;
+        })
+        .await
     });
-
     match res {
-        Ok(relay_url) => {
-            *out = relay_url.into();
-            EndpointResult::Ok
-        }
-        Err(err) => {
-            warn!("failed to retrieve relay_url: {err:?}");
-            EndpointResult::AddrError
+        Ok(()) => EndpointResult::Ok,
+        Err(_err) => {
+            warn!("online failed timeout");
+            EndpointResult::Timeout
         }
     }
 }

src/key.rs

@@ -97,7 +97,7 @@ pub fn secret_key_free(key: repr_c::Box<SecretKey>) {
 #[ffi_export]
 pub fn secret_key_default() -> repr_c::Box<SecretKey> {
     Box::new(SecretKey {
-        key: iroh::SecretKey::generate(rand::rngs::OsRng),
+        key: iroh::SecretKey::generate(&mut rand::rng()),
     })
     .into()
 }
@@ -125,7 +125,7 @@ pub fn secret_key_from_base32(
 #[ffi_export]
 pub fn secret_key_generate() -> repr_c::Box<SecretKey> {
     Box::new(SecretKey {
-        key: iroh::SecretKey::generate(rand::rngs::OsRng),
+        key: iroh::SecretKey::generate(&mut rand::rng()),
     })
     .into()
 }