feat(browser-chat): udpate to [email protected]

Author: dignifiedquire

browser-chat/Cargo.lock

@@ -4,6 +4,9 @@ members = ["shared", "cli", "browser-wasm"]
 
 [workspace.dependencies]
 # we define iroh dependencies here to make upgrading easier.
-iroh = { version = "0.93", default-features = false }
-iroh-base = { version = "0.93", default-features = false, features = ["ticket"] }
-iroh-gossip = { version = "0.93", default-features = false, features = ["net"] }
+iroh = { version = "0.94", default-features = false }
+iroh-tickets = "0.1"
+iroh-gossip = { version = "0.94", default-features = false, features = ["net"] }
+
+[patch.crates-io]
+iroh-base = { path = "../../iroh/iroh-base" }

browser-chat/Cargo.toml

@@ -10,8 +10,8 @@ crate-type = ["cdylib", "rlib"]
 anyhow = "1.0.86"
 chat-shared = { version = "0.1.0", path = "../shared" }
 console_error_panic_hook = "0.1.7"
-getrandom = { version = "0.2", features = ["js"] }
-n0-future = "0.1.2"
+getrandom = { version = "0.3", features = [] }
+n0-future = "0.3"
 serde = "1.0.217"
 serde-wasm-bindgen = "0.6.5"
 tracing = "0.1.40"

browser-chat/browser-wasm/Cargo.toml

@@ -4,7 +4,7 @@ use std::{
 };
 
 use anyhow::Result;
-use chat_shared::{ChatSender, ChatTicket, NodeId, TopicId};
+use chat_shared::{ChatSender, ChatTicket, EndpointId, TopicId};
 use n0_future::{StreamExt, time::Duration};
 use serde::{Deserialize, Serialize};
 use tracing::level_filters::LevelFilter;
@@ -44,9 +44,9 @@ impl ChatNode {
         Ok(Self(inner))
     }
 
-    /// Returns the node id of this node.
-    pub fn node_id(&self) -> String {
-        self.0.node_id().to_string()
+    /// Returns the endpoint id of this node.
+    pub fn endpoint_id(&self) -> String {
+        self.0.endpoint_id().to_string()
     }
 
     /// Opens a chat.
@@ -73,11 +73,11 @@ impl ChatNode {
                     chat_shared::Event::Joined { neighbors } => {
                         neighbors2.lock().unwrap().extend(neighbors.iter().cloned());
                     }
-                    chat_shared::Event::NeighborUp { node_id } => {
-                        neighbors2.lock().unwrap().insert(*node_id);
+                    chat_shared::Event::NeighborUp { endpoint_id } => {
+                        neighbors2.lock().unwrap().insert(*endpoint_id);
                     }
-                    chat_shared::Event::NeighborDown { node_id } => {
-                        neighbors2.lock().unwrap().remove(node_id);
+                    chat_shared::Event::NeighborDown { endpoint_id } => {
+                        neighbors2.lock().unwrap().remove(endpoint_id);
                     }
                     _ => {}
                 }
@@ -90,14 +90,14 @@ impl ChatNode {
 
         // Add ourselves to the ticket.
         let mut ticket = ticket;
-        ticket.bootstrap.insert(self.0.node_id());
-        // ticket.bootstrap = [self.0.node_id()].into_iter().collect();
+        ticket.bootstrap.insert(self.0.endpoint_id());
+        // ticket.bootstrap = [self.0.endpoint_id()].into_iter().collect();
 
         let topic = Channel {
             topic_id: ticket.topic_id,
             bootstrap: ticket.bootstrap,
             neighbors,
-            me: self.0.node_id(),
+            me: self.0.endpoint_id(),
             sender,
             receiver,
         };
@@ -110,9 +110,9 @@ type ChannelReceiver = wasm_streams::readable::sys::ReadableStream;
 #[wasm_bindgen]
 pub struct Channel {
     topic_id: TopicId,
-    me: NodeId,
-    bootstrap: BTreeSet<NodeId>,
-    neighbors: Arc<Mutex<BTreeSet<NodeId>>>,
+    me: EndpointId,
+    bootstrap: BTreeSet<EndpointId>,
+    neighbors: Arc<Mutex<BTreeSet<EndpointId>>>,
     sender: ChannelSender,
     receiver: ChannelReceiver,
 }
@@ -162,7 +162,7 @@ impl Channel {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct PeerInfo {
-    pub node_id: NodeId,
+    pub endpoint_id: EndpointId,
     pub nickname: String,
     pub last_active: Duration,
 }

browser-chat/browser-wasm/src/lib.rs

@@ -7,7 +7,7 @@ edition = "2024"
 anyhow = "1.0.95"
 clap = { version = "4.5.29", features = ["derive"] }
 iroh = { workspace = true, default-features = false }
-n0-future = "0.1.2"
+n0-future = "0.3"
 rand = "0.9.2"
 chat-shared = { version = "0.1.0", path = "../shared" }
 tokio = { version = "1.43.0", features = ["rt", "macros"] }

browser-chat/cli/Cargo.toml

@@ -48,15 +48,15 @@ async fn main() -> Result<()> {
     };
 
     let node = ChatNode::spawn(Some(secret_key)).await?;
-    println!("node id: {}", node.node_id());
+    println!("endpoint id: {}", node.endpoint_id());
 
     let ticket = match args.command {
         Command::Create => ChatTicket::new_random(),
         Command::Join { ticket } => ChatTicket::deserialize(&ticket)?,
     };
 
     let mut our_ticket = ticket.clone();
-    our_ticket.bootstrap = [node.node_id()].into_iter().collect();
+    our_ticket.bootstrap = [node.endpoint_id()].into_iter().collect();
     println!("* ticket to join this chat:");
     println!("{}", our_ticket.serialize());
 
@@ -69,8 +69,8 @@ async fn main() -> Result<()> {
             match event {
                 Event::Joined { neighbors } => {
                     println!("* swarm joined");
-                    for node_id in neighbors {
-                        println!("* neighbor up: {node_id}")
+                    for endpoint_id in neighbors {
+                        println!("* neighbor up: {endpoint_id}")
                     }
                 }
                 Event::Presence {
@@ -102,11 +102,11 @@ async fn main() -> Result<()> {
                     }
                     println!("<{from_short}> {nickname}: {text}");
                 }
-                Event::NeighborUp { node_id } => {
-                    println!("* neighbor up: {node_id}")
+                Event::NeighborUp { endpoint_id } => {
+                    println!("* neighbor up: {endpoint_id}")
                 }
-                Event::NeighborDown { node_id } => {
-                    println!("* neighbor down: {node_id}")
+                Event::NeighborDown { endpoint_id } => {
+                    println!("* neighbor down: {endpoint_id}")
                 }
                 Event::Lagged => {
                     println!("* warn: gossip stream lagged")

browser-chat/cli/src/main.rs

@@ -253,8 +253,8 @@ function MyselfInfo({ peer }: PeerProps) {
     <div className="space-y-2">
       This is us :)
       <div>
-        <strong>Node ID:</strong>
-        <NodeId nodeId={peer.id} />
+        <strong>Endpoint ID:</strong>
+        <EndpointId endpointId={peer.id} />
       </div>
     </div>
   )
@@ -267,22 +267,22 @@ function RemotePeerInfo({ peer }: PeerProps) {
         <strong>Last seen:</strong> <TimeAgo date={peer.lastSeen} />
       </p>
       <div>
-        <strong>Node ID:</strong>
-        <NodeId nodeId={peer.id} />
+        <strong>Endpoint ID:</strong>
+        <EndpointId endpointId={peer.id} />
       </div>
     </div>
   )
 }
 
-interface NodeIdProps {
-  nodeId: string
+interface EndpointIdProps {
+  endpointId: string
 }
 
-function NodeId({ nodeId }: NodeIdProps) {
+function EndpointId({ endpointId }: EndpointIdProps) {
   return (
     <>
-      <span className="ml-2 font-mono">{nodeId.substring(0, 8)}…</span>
-      <Button size="sm" onClick={() => copyToClipboard(nodeId)} className="ml-2 inline" variant="outline">
+      <span className="ml-2 font-mono">{endpointId.substring(0, 8)}…</span>
+      <Button size="sm" onClick={() => copyToClipboard(endpointId)} className="ml-2 inline" variant="outline">
         Copy
       </Button>
     </>

browser-chat/frontend/src/components/chatview.tsx

@@ -27,7 +27,7 @@ export class IrohAPI implements API {
   static async create(): Promise<IrohAPI> {
     log.info("Spawning iroh node")
     const chatNode = await ChatNode.spawn()
-    log.info(`Iroh node spawned. our node id: ${chatNode.node_id()}`)
+    log.info(`Iroh node spawned. our endpoint id: ${chatNode.endpoint_id()}`)
     return new IrohAPI(chatNode)
   }
 
@@ -49,9 +49,9 @@ export class IrohAPI implements API {
     let onClosePromise = new Promise<void>(resolve => {
       onClose = resolve
     })
-    const nodeId = this.chatNode.node_id()
+    const endpointId = this.chatNode.endpoint_id()
     const myself: PeerInfo = {
-      id: nodeId,
+      id: endpointId,
       name: nickname,
       lastSeen: new Date(),
       status: "online",
@@ -70,7 +70,7 @@ export class IrohAPI implements API {
       myself,
       onClose: onClose!
     }
-    state.peers.set(nodeId, myself)
+    state.peers.set(endpointId, myself)
     this.channels.set(id, state)
 
     const subscribe = async () => {
@@ -130,7 +130,7 @@ export class IrohAPI implements API {
       while (true) {
         const now = new Date()
         for (const peer of state.peers.values()) {
-          if (peer.id === nodeId) {
+          if (peer.id === endpointId) {
             peer.lastSeen = now
             continue
           }
@@ -188,7 +188,7 @@ export class IrohAPI implements API {
       throw new Error("Channel not found")
     }
     await state.channel.sender.broadcast(text)
-    const me = this.chatNode.node_id();
+    const me = this.chatNode.endpoint_id();
     const message = {
       sender: me,
       id: nextId(state),
@@ -313,12 +313,12 @@ type PresenceEvent = {
 
 type NeighborUpEvent = {
   type: "neighborUp"
-  nodeId: string
+  endpointId: string
 }
 
 type NeighborDownEvent = {
   type: "neighborDown"
-  nodeId: string
+  endpointId: string
 }
 
 type LaggedEvent = {

browser-chat/frontend/src/lib/iroh.ts

@@ -8,9 +8,9 @@ anyhow = "1"
 blake3 = { version = "1", package = "iroh-blake3" }
 hex = "0.4"
 iroh = { workspace = true }
-iroh-base = { workspace = true, default-features = false, features = ["ticket"] }
+iroh-tickets = { workspace = true }
 iroh-gossip = { workspace = true, default-features = false, features = ["net"] }
-n0-future = "0.1.2"
+n0-future = "0.3"
 postcard = "1.1.1"
 rand = "0.9.2"
 serde = "1"

browser-chat/shared/Cargo.toml

@@ -4,14 +4,14 @@ use std::{
 };
 
 use anyhow::{Context, Result};
-pub use iroh::NodeId;
-use iroh::{PublicKey, SecretKey, protocol::Router};
-use iroh_base::{Signature, ticket::Ticket};
+pub use iroh::EndpointId;
+use iroh::{PublicKey, SecretKey, Signature, protocol::Router};
 pub use iroh_gossip::proto::TopicId;
 use iroh_gossip::{
     api::{Event as GossipEvent, GossipSender},
     net::{GOSSIP_ALPN, Gossip},
 };
+use iroh_tickets::Ticket;
 use n0_future::{
     StreamExt,
     boxed::BoxStream,
@@ -28,7 +28,7 @@ pub const PRESENCE_INTERVAL: Duration = Duration::from_secs(5);
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct ChatTicket {
     pub topic_id: TopicId,
-    pub bootstrap: BTreeSet<NodeId>,
+    pub bootstrap: BTreeSet<EndpointId>,
 }
 
 impl ChatTicket {
@@ -58,7 +58,7 @@ impl Ticket for ChatTicket {
         postcard::to_stdvec(&self).unwrap()
     }
 
-    fn from_bytes(bytes: &[u8]) -> Result<Self, iroh_base::ticket::ParseError> {
+    fn from_bytes(bytes: &[u8]) -> Result<Self, iroh_tickets::ParseError> {
         let ticket = postcard::from_bytes(bytes)?;
         Ok(ticket)
     }
@@ -76,14 +76,13 @@ impl ChatNode {
         let secret_key = secret_key.unwrap_or_else(|| SecretKey::generate(&mut rand::rng()));
         let endpoint = iroh::Endpoint::builder()
             .secret_key(secret_key.clone())
-            .discovery_n0()
             .alpns(vec![GOSSIP_ALPN.to_vec()])
             .bind()
             .await?;
 
-        let node_id = endpoint.node_id();
+        let endpoint_id = endpoint.id();
         info!("endpoint bound");
-        info!("node id: {node_id:#?}");
+        info!("endpoint id: {endpoint_id:#?}");
 
         let gossip = Gossip::builder().spawn(endpoint.clone());
         info!("gossip spawned");
@@ -98,9 +97,9 @@ impl ChatNode {
         })
     }
 
-    /// Returns the node id of this node.
-    pub fn node_id(&self) -> NodeId {
-        self.router.endpoint().node_id()
+    /// Returns the endpoint id of this endpoint.
+    pub fn endpoint_id(&self) -> EndpointId {
+        self.router.endpoint().id()
     }
 
     /// Joins a chat channel from a ticket.
@@ -239,28 +238,28 @@ impl ChatSender {
 pub enum Event {
     #[serde(rename_all = "camelCase")]
     Joined {
-        neighbors: Vec<NodeId>,
+        neighbors: Vec<EndpointId>,
     },
     #[serde(rename_all = "camelCase")]
     MessageReceived {
-        from: NodeId,
+        from: EndpointId,
         text: String,
         nickname: String,
         sent_timestamp: u64,
     },
     #[serde(rename_all = "camelCase")]
     Presence {
-        from: NodeId,
+        from: EndpointId,
         nickname: String,
         sent_timestamp: u64,
     },
     #[serde(rename_all = "camelCase")]
     NeighborUp {
-        node_id: NodeId,
+        endpoint_id: EndpointId,
     },
     #[serde(rename_all = "camelCase")]
     NeighborDown {
-        node_id: NodeId,
+        endpoint_id: EndpointId,
     },
     Lagged,
 }
@@ -269,8 +268,8 @@ impl TryFrom<GossipEvent> for Event {
     type Error = anyhow::Error;
     fn try_from(event: GossipEvent) -> Result<Self, Self::Error> {
         let converted = match event {
-            GossipEvent::NeighborUp(node_id) => Self::NeighborUp { node_id },
-            GossipEvent::NeighborDown(node_id) => Self::NeighborDown { node_id },
+            GossipEvent::NeighborUp(endpoint_id) => Self::NeighborUp { endpoint_id },
+            GossipEvent::NeighborDown(endpoint_id) => Self::NeighborDown { endpoint_id },
             GossipEvent::Received(message) => {
                 let message = SignedMessage::verify_and_decode(&message.content)
                     .context("failed to parse and verify signed message")?;
@@ -348,6 +347,6 @@ pub enum Message {
 #[derive(Debug, Serialize, Deserialize)]
 pub struct ReceivedMessage {
     timestamp: u64,
-    from: NodeId,
+    from: EndpointId,
     message: Message,
 }