feat: [#1376] add peer info to TcpAnnounce event

Author: josecelano

packages/http-tracker-core/src/event/mod.rs

@@ -2,15 +2,29 @@ use std::net::{IpAddr, SocketAddr};
 
 use torrust_tracker_metrics::label::{LabelSet, LabelValue};
 use torrust_tracker_metrics::label_name;
+use torrust_tracker_primitives::peer::Peer;
 use torrust_tracker_primitives::service_binding::ServiceBinding;
 
 pub mod sender;
 
 /// A HTTP core event.
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum Event {
-    TcpAnnounce { connection: ConnectionContext },
-    TcpScrape { connection: ConnectionContext },
+    TcpAnnounce {
+        connection: ConnectionContext,
+
+        /// The peer that is announcing itself to the tracker.
+        announced_peer: Peer,
+
+        /// The peer that is added to the tracker.
+        ///
+        /// It might not be the same as the `announced_peer` because the tracker
+        /// can change the peer's IP address.
+        added_peer: Peer,
+    },
+    TcpScrape {
+        connection: ConnectionContext,
+    },
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]

packages/http-tracker-core/src/lib.rs

@@ -20,7 +20,11 @@ pub const HTTP_TRACKER_LOG_TARGET: &str = "HTTP TRACKER";
 
 #[cfg(test)]
 pub(crate) mod tests {
+    use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
+
+    use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes, PeerId};
     use bittorrent_primitives::info_hash::InfoHash;
+    use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch};
 
     /// # Panics
     ///
@@ -31,4 +35,29 @@ pub(crate) mod tests {
             .parse::<InfoHash>()
             .expect("String should be a valid info hash")
     }
+
+    pub fn sample_peer_using_ipv4() -> peer::Peer {
+        sample_peer()
+    }
+
+    pub fn sample_peer_using_ipv6() -> peer::Peer {
+        let mut peer = sample_peer();
+        peer.peer_addr = SocketAddr::new(
+            IpAddr::V6(Ipv6Addr::new(0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969)),
+            8080,
+        );
+        peer
+    }
+
+    pub fn sample_peer() -> peer::Peer {
+        peer::Peer {
+            peer_id: PeerId(*b"-qB00000000000000000"),
+            peer_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(126, 0, 0, 1)), 8080),
+            updated: DurationSinceUnixEpoch::new(1_669_397_478_934, 0),
+            uploaded: NumberOfBytes::new(0),
+            downloaded: NumberOfBytes::new(0),
+            left: NumberOfBytes::new(0),
+            event: AnnounceEvent::Started,
+        }
+    }
 }