feat: update to [email protected]

Author: dignifiedquire

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "iroh-ffi"
-version = "0.31.0"
+version = "0.35.0"
 edition = "2021"
 publish = false
 readme = "README.md"
@@ -11,7 +11,7 @@ repository = "https://github.com/n0-computer/iroh-ffi"
 homepage = "https://iroh.computer"
 documentation = "https://iroh.computer/docs"
 
-rust-version = "1.81"
+rust-version = "1.83"
 
 [workspace]
 members = ["iroh-js"]
@@ -33,14 +33,14 @@ async-trait = "0.1.80"
 blake3 = "1.3.3"
 bytes = "1"
 data-encoding = { version = "2.3.3" }
-iroh = { version = "0.31" }
-iroh-base = { version = "0.31", features = ["ticket"] }
+iroh = { version = "0.35" }
+iroh-base = { version = "0.35", features = ["ticket"] }
 iroh-io = { version = "0.6" }
-iroh-gossip = { version = "0.31", features = ["rpc"] }
-iroh-docs = { version = "0.31", features = ["rpc"] }
-iroh-blobs = { version = "0.31", features = ["rpc"] }
-iroh-metrics = { version = "0.31" }
-iroh-node-util = { version = "0.31", features = [] }
+iroh-gossip = { version = "0.35", features = ["rpc"] }
+iroh-docs = { version = "0.35", features = ["rpc"] }
+iroh-blobs = { version = "0.35", features = ["rpc"] }
+iroh-metrics = { version = "0.34" }
+iroh-node-util = { version = "0.35", features = [] }
 libc = "0.2.141"
 num_cpus = { version = "1.15.0" }
 range-collections = "0.4.0"
@@ -56,7 +56,7 @@ serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.113"
 futures-lite = "2.3.0"
 derive_more = { version = "1.0.0", features = ["debug"] }
-quic-rpc = "0.17"
+quic-rpc = "0.20"
 rand = "0.8"
 
 

Cargo.toml

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = "IrohLib"
-  spec.version      = "0.31.0"
+  spec.version      = "0.35.0"
   spec.summary      = "iroh is a toolkit for building distributed apps"
   spec.description  = <<-DESC
                       Build distributed apps that raise the status quo for your users.

IrohLib.podspec

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "number0_iroh"
-version = "0.31.0"
+version = "0.35.0"
 license = "MIT OR Apache-2.0"
 authors = ["n0 team"]
 repository = "https://github.com/n0-computer/iroh-ffi"
@@ -10,20 +10,20 @@ repository = "https://github.com/n0-computer/iroh-ffi"
 crate-type = ["cdylib"]
 
 [dependencies]
-napi = { version = "=3.0.0-alpha.22", default-features = false, features = ["napi8", "error_anyhow", "async", "chrono_date"] }
-napi-derive = "=3.0.0-alpha.21"
+napi = { version = "=3.0.0-beta.2", default-features = false, features = ["napi8", "error_anyhow", "async", "chrono_date"] }
+napi-derive = "=3.0.0-beta.2"
 anyhow = "1.0.69"
 async-trait = "0.1.80"
 blake3 = "1.3.3"
 bytes = "1"
 data-encoding = { version = "2.3.3" }
-iroh-base = { version = "0.31", features = ["ticket"] }
-iroh-gossip = { version = "0.31", features = ["rpc"] }
-iroh-docs = { version = "0.31", features = ["rpc"] }
-iroh-blobs = { version = "0.31", features = ["rpc"] }
-iroh-metrics = { version = "0.31" }
-iroh-node-util = { version = "0.31", features = [] }
-iroh = "0.31"
+iroh-base = { version = "0.35", features = ["ticket"] }
+iroh-gossip = { version = "0.35", features = ["rpc"] }
+iroh-docs = { version = "0.35", features = ["rpc"] }
+iroh-blobs = { version = "0.35", features = ["rpc"] }
+iroh-metrics = { version = "0.34" }
+iroh-node-util = { version = "0.35", features = [] }
+iroh = "0.35"
 iroh-io = { version = "0.6" }
 libc = "0.2.141"
 num_cpus = { version = "1.15.0" }
@@ -38,8 +38,8 @@ tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.17" }
 chrono = "0.4.38"
 derive_more = { version = "1.0.0", features = ["debug"] }
-quic-rpc = "0.17"
+quic-rpc = "0.20"
 
 
 [build-dependencies]
-napi-build = "2"
+napi-build = "2.2"

iroh-js/Cargo.toml

@@ -181,14 +181,13 @@ export declare class Blobs {
  * It is a single item which can be easily serialized and deserialized.
  */
 export declare class BlobTicket {
-  /** The provider to get a file from. */
-  readonly nodeAddr: NodeAddr
   /** The format of the blob. */
   readonly format: BlobFormat
   /** The hash to retrieve. */
   readonly hash: string
   constructor(nodeAddr: NodeAddr, hash: string, format: BlobFormat)
   static fromString(str: string): BlobTicket
+  get nodeAddr(): NodeAddr
   /** Checks if the two tickets are equal */
   isEqual(other: BlobTicket): boolean
   toString(): string
@@ -219,12 +218,11 @@ export declare class Collection {
 export declare class Connecting {
   connect(): Promise<Connection>
   alpn(): Promise<Buffer>
-  localIp(): Promise<string | null>
-  remoteAddress(): Promise<string>
 }
 
 export declare class Connection {
-  getRemoteNodeId(): PublicKey
+  alpn(): Buffer | null
+  remoteNodeId(): PublicKey
   openUni(): Promise<SendStream>
   acceptUni(): Promise<RecvStream>
   openBi(): Promise<BiStream>
@@ -234,11 +232,8 @@ export declare class Connection {
   closeReason(): string | null
   close(errorCode: bigint, reason: Uint8Array): void
   sendDatagram(data: Uint8Array): void
-  sendDatagramWait(data: Uint8Array): Promise<void>
   maxDatagramSize(): bigint | null
   datagramSendBufferSpace(): bigint
-  remoteAddress(): string
-  localIp(): string | null
   rtt(): bigint
   stableId(): bigint
   setMaxConcurrentUniStream(count: bigint): void
@@ -330,10 +325,9 @@ export declare class DocTicket {
   readonly capability: string
   /** The capabillity kind */
   readonly capabilityKind: CapabilityKind
-  /** A list of nodes to contact. */
-  readonly nodes: Array<NodeAddr>
   static fromString(str: string): DocTicket
   toString(): string
+  get nodes(): Array<NodeAddr>
 }
 
 /** Download policy to decide which content blobs shall be downloaded. */
@@ -1365,7 +1359,7 @@ export declare const enum Origin {
 export declare function pathToKey(path: string, prefix?: string | undefined | null, root?: string | undefined | null): Array<number>
 
 export interface ProtocolHandler {
-  accept: ((err: Error | null, arg: Connecting) => void)
+  accept: ((err: Error | null, arg: Connection) => void)
   shutdown?: ((err: Error | null, ) => void)
 }
 
@@ -1456,9 +1450,6 @@ export declare const enum SortDirection {
   Desc = 'Desc'
 }
 
-/** Initialize the global metrics collection. */
-export declare function startMetricsCollection(): void
-
 /** Outcome of a sync operation */
 export interface SyncEvent {
   /** Peer we synced with */

iroh-js/index.d.ts

@@ -35,7 +35,11 @@ const isMuslFromFilesystem = () => {
 }
 
 const isMuslFromReport = () => {
-  const report = typeof process.report.getReport === 'function' ? process.report.getReport() : null
+  let report = null
+  if (typeof process.report?.getReport === 'function') {
+    process.report.excludeNetwork = true
+    report = process.report.getReport()
+  }
   if (!report) {
     return null
   }
@@ -60,7 +64,13 @@ const isMuslFromChildProcess = () => {
 }
 
 function requireNative() {
-  if (process.platform === 'android') {
+  if (process.env.NAPI_RS_NATIVE_LIBRARY_PATH) {
+    try {
+      nativeBinding = require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH);
+    } catch (err) {
+      loadErrors.push(err)
+    }
+  } else if (process.platform === 'android') {
     if (process.arch === 'arm64') {
       try {
         return require('./iroh.android-arm64.node')
@@ -364,6 +374,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
+module.exports = nativeBinding
 module.exports.Author = nativeBinding.Author
 module.exports.AuthorId = nativeBinding.AuthorId
 module.exports.Authors = nativeBinding.Authors
@@ -412,6 +423,5 @@ module.exports.setLogLevel = nativeBinding.setLogLevel
 module.exports.ShareMode = nativeBinding.ShareMode
 module.exports.SortBy = nativeBinding.SortBy
 module.exports.SortDirection = nativeBinding.SortDirection
-module.exports.startMetricsCollection = nativeBinding.startMetricsCollection
 module.exports.SyncReason = nativeBinding.SyncReason
 module.exports.verifyNodeAddr = nativeBinding.verifyNodeAddr

iroh-js/index.js

@@ -12,7 +12,7 @@
     "network",
     "protocol"
   ],
-  "version": "0.31.0",
+  "version": "0.35.0",
   "type": "commonjs",
   "main": "iroh-js/index.js",
   "types": "iroh-js/index.d.ts",
@@ -42,7 +42,7 @@
   },
   "license": "MIT OR Apache-2.0",
   "devDependencies": {
-    "@napi-rs/cli": "^3.0.0-alpha.64"
+    "@napi-rs/cli": "^3.0.0-alpha.80"
   },
   "scripts": {
     "artifacts": "napi artifacts",

iroh-js/package.json

@@ -63,38 +63,27 @@ impl Connecting {
             None => Err(anyhow::anyhow!("already used").into()),
         }
     }
-
-    #[napi]
-    pub async fn local_ip(&self) -> Result<Option<String>> {
-        match &*self.0.lock().await {
-            Some(conn) => {
-                let ip = conn.local_ip();
-                Ok(ip.map(|ip| ip.to_string()))
-            }
-            None => Err(anyhow::anyhow!("already used").into()),
-        }
-    }
-
-    #[napi]
-    pub async fn remote_address(&self) -> Result<String> {
-        match &*self.0.lock().await {
-            Some(conn) => {
-                let addr = conn.remote_address();
-                Ok(addr.to_string())
-            }
-            None => Err(anyhow::anyhow!("already used").into()),
-        }
-    }
 }
 
 #[napi]
 pub struct Connection(endpoint::Connection);
 
+impl From<endpoint::Connection> for Connection {
+    fn from(value: endpoint::Connection) -> Self {
+        Self(value)
+    }
+}
+
 #[napi]
 impl Connection {
     #[napi]
-    pub fn get_remote_node_id(&self) -> Result<PublicKey> {
-        let id = endpoint::get_remote_node_id(&self.0)?;
+    pub fn alpn(&self) -> Option<Buffer> {
+        self.0.alpn().map(Into::into)
+    }
+
+    #[napi]
+    pub fn remote_node_id(&self) -> Result<PublicKey> {
+        let id = self.0.remote_node_id()?;
         Ok(id.into())
     }
 
@@ -162,15 +151,6 @@ impl Connection {
         Ok(())
     }
 
-    #[napi]
-    pub async fn send_datagram_wait(&self, data: Uint8Array) -> Result<()> {
-        self.0
-            .send_datagram_wait(data.to_vec().into())
-            .await
-            .map_err(anyhow::Error::from)?;
-        Ok(())
-    }
-
     #[napi]
     pub fn max_datagram_size(&self) -> Option<usize> {
         self.0.max_datagram_size()
@@ -181,16 +161,6 @@ impl Connection {
         self.0.datagram_send_buffer_space()
     }
 
-    #[napi]
-    pub fn remote_address(&self) -> String {
-        self.0.remote_address().to_string()
-    }
-
-    #[napi]
-    pub fn local_ip(&self) -> Option<String> {
-        self.0.local_ip().map(|s| s.to_string())
-    }
-
     #[napi]
     pub fn rtt(&self) -> BigInt {
         self.0.rtt().as_millis().into()
@@ -327,14 +297,18 @@ impl RecvStream {
     #[napi]
     pub async fn read(&self, mut buf: Uint8Array) -> Result<Option<usize>> {
         let mut r = self.0.lock().await;
-        let res = r.read(&mut buf).await.map_err(anyhow::Error::from)?;
+        let buffer_mut_ref: &mut [u8] = unsafe { buf.as_mut() };
+        let res = r.read(buffer_mut_ref).await.map_err(anyhow::Error::from)?;
         Ok(res)
     }
 
     #[napi]
     pub async fn read_exact(&self, mut buf: Uint8Array) -> Result<()> {
         let mut r = self.0.lock().await;
-        r.read_exact(&mut buf).await.map_err(anyhow::Error::from)?;
+        let buffer_mut_ref: &mut [u8] = unsafe { buf.as_mut() };
+        r.read_exact(buffer_mut_ref)
+            .await
+            .map_err(anyhow::Error::from)?;
         Ok(())
     }
 

iroh-js/src/endpoint.rs

@@ -1,4 +1,3 @@
-use iroh_metrics::core::Metric;
 use napi::bindgen_prelude::*;
 use napi_derive::napi;
 use tracing_subscriber::filter::LevelFilter;
@@ -64,20 +63,6 @@ pub fn set_log_level(level: LogLevel) {
         .init();
 }
 
-/// Initialize the global metrics collection.
-#[napi]
-pub fn start_metrics_collection() -> Result<()> {
-    iroh_metrics::core::Core::try_init(|reg, metrics| {
-        metrics.insert(iroh::metrics::MagicsockMetrics::new(reg));
-        metrics.insert(iroh::metrics::NetReportMetrics::new(reg));
-        metrics.insert(iroh::metrics::PortmapMetrics::default());
-        metrics.insert(iroh_blobs::metrics::Metrics::new(reg));
-        metrics.insert(iroh_gossip::metrics::Metrics::new(reg));
-        metrics.insert(iroh_docs::metrics::Metrics::new(reg));
-    })
-    .map_err(|e| anyhow::Error::from(e).into())
-}
-
 /// Helper function that translates a key that was derived from the [`path_to_key`] function back
 /// into a path.
 ///