refactor: move things around, use intermediate broadcast channel for events to track closed channels

Author: Frando

Cargo.lock

@@ -70,8 +70,19 @@ tokio-util = { version = "0.7.12", optional = true, features = ["codec"] }
 tracing = "0.1"
 data-encoding = { version = "2.6.0", optional = true }
 thiserror = { version = "2.0", optional = true }
-irpc = { git = "https://github.com/n0-computer/irpc", branch = "Frando/wasm" }
-irpc-derive = { git = "https://github.com/n0-computer/irpc", branch = "Frando/wasm" }
+irpc = { git = "https://github.com/n0-computer/irpc", optional = true, default-features = false, features = [
+    "stream",
+    "message_spans",
+] }
+irpc-derive = { git = "https://github.com/n0-computer/irpc", optional = true }
+# irpc = { path = "../irpc", optional = true, default-features = false, features = [
+#     "stream",
+#     "message_spans",
+# ] }
+# irpc-derive = { path = "../irpc/irpc-derive", optional = true }
+
+# rpc dependencies
+quinn = { package = "iroh-quinn", version = "0.13.0", optional = true }
 
 # test-utils dependencies (optional)
 rand_chacha = { version = "0.3.1", optional = true }
@@ -87,6 +98,7 @@ serde_json = { version = "1", optional = true }
 rayon = { version = "1.10.0", optional = true }
 comfy-table = { version = "7.1.4", optional = true }
 
+
 [dev-dependencies]
 tokio = { version = "1", features = [
     "io-util",
@@ -111,6 +123,8 @@ url = "2.4.0"
 [features]
 default = ["net"]
 net = [
+    "dep:irpc",
+    "dep:irpc-derive",
     "dep:futures-lite",
     "dep:iroh",
     "dep:tokio",
@@ -121,6 +135,7 @@ net = [
     "dep:anyhow",
     "dep:thiserror",
 ]
+rpc = ["net", "dep:quinn", "irpc/rpc", "irpc/quinn_endpoint_setup"]
 test-utils = ["dep:rand_chacha", "dep:humantime-serde"]
 simulator = [
     "test-utils",
@@ -132,6 +147,7 @@ simulator = [
     "dep:comfy-table",
 ]
 examples = ["net", "dep:data-encoding"]
+quinn = ["dep:quinn"]
 
 [[test]]
 name = "sim"
@@ -158,4 +174,4 @@ rustdoc-args = ["--cfg", "iroh_docsrs"]
 debug = true
 
 [profile.release]
-debug = true
+debug = true

Cargo.toml

@@ -12,7 +12,8 @@ use ed25519_dalek::Signature;
 use futures_lite::StreamExt;
 use iroh::{Endpoint, NodeAddr, PublicKey, RelayMap, RelayMode, RelayUrl, SecretKey};
 use iroh_gossip::{
-    net::{Event, Gossip, GossipEvent, GossipReceiver, GOSSIP_ALPN},
+    api::{Event, GossipEvent, GossipReceiver},
+    net::{Gossip, GOSSIP_ALPN},
     proto::TopicId,
 };
 use n0_future::task;
@@ -138,7 +139,7 @@ async fn main() -> Result<()> {
             endpoint.add_node_addr(peer)?;
         }
     };
-    let (sender, receiver) = gossip.subscribe_and_join(topic, peer_ids).await?.split();
+    let (mut sender, receiver) = gossip.subscribe_and_join(topic, peer_ids).await?.split();
     println!("> connected!");
 
     // broadcast our name, if set