make connection_store a PeerStore component

Author: diegomrsantos

Cargo.lock

@@ -65,7 +65,7 @@ members = [
     "transports/websocket-websys",
     "transports/websocket",
     "transports/webtransport-websys",
-    "wasm-tests/webtransport-tests", "misc/connection-tracker",
+    "wasm-tests/webtransport-tests",
 ]
 resolver = "2"
 

Cargo.toml

@@ -13,6 +13,7 @@ libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 lru = "0.12.3"
 libp2p-identity = { workspace = true, optional = true }
+tracing = { workspace = true }
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }

misc/connection-tracker/Cargo.toml

@@ -1,6 +1,23 @@
-use libp2p_core::PeerId;
-use libp2p_swarm::ConnectionId;
 use std::collections::{HashMap, HashSet};
+use libp2p_core::{ConnectedPoint, PeerId};
+use libp2p_swarm::ConnectionId;
+
+/// Events emitted by the connection tracker behaviour.
+#[derive(Debug, Clone)]
+pub enum Event {
+    /// A peer connected (first connection established).
+    PeerConnected {
+        peer_id: PeerId,
+        connection_id: ConnectionId,
+        endpoint: ConnectedPoint,
+    },
+
+    /// A peer disconnected (last connection closed).
+    PeerDisconnected {
+        peer_id: PeerId,
+        connection_id: ConnectionId,
+    },
+}
 
 /// Simple storage for connected peers.
 #[derive(Debug, Default)]
@@ -19,25 +36,29 @@ impl ConnectionStore {
 
     /// Add a new connection for a peer.
     /// Returns `true` if this is the first connection to the peer.
-    pub fn connection_established(&mut self, peer_id: PeerId, connection_id: ConnectionId) -> bool {
-        let connections = self.connected.entry(peer_id).or_insert_with(HashSet::new);
+    pub fn connection_established(
+        &mut self,
+        peer_id: &PeerId,
+        connection_id: &ConnectionId,
+    ) -> bool {
+        let connections = self.connected.entry(*peer_id).or_insert_with(HashSet::new);
         let is_first_connection = connections.is_empty();
-        connections.insert(connection_id);
+        connections.insert(*connection_id);
         is_first_connection
     }
 
     /// Remove a connection for a peer.
     /// Returns `true` if this was the last connection to the peer.
     pub fn connection_closed(
         &mut self,
-        peer_id: PeerId,
-        connection_id: ConnectionId,
-        remaining_established: usize,
+        peer_id: &PeerId,
+        connection_id: &ConnectionId,
+        remaining_established: &usize,
     ) -> bool {
         if let Some(connections) = self.connected.get_mut(&peer_id) {
             connections.remove(&connection_id);
 
-            if remaining_established == 0 {
+            if *remaining_established == 0 {
                 self.connected.remove(&peer_id);
                 return true;
             }
@@ -67,4 +88,4 @@ impl ConnectionStore {
             .map(|connections| connections.len())
             .unwrap_or(0)
     }
-}
+}

misc/connection-tracker/src/behavior.rs

@@ -20,6 +20,7 @@
 mod behaviour;
 pub mod memory_store;
 mod store;
+pub mod connection_store;
 
 pub use behaviour::Behaviour;
 pub use store::Store;