refactor(http-protocol): merge announce_builder::Query into announce::Announce

- Merged `announce_builder::Query` and its builder into `announce::Announce`
- Added `peer_addr: Option<IpAddr>` field per BEP 3
- Added `Display` impl for URL query string serialization
- Added `AnnounceBuilder` with ergonomic construction (u64→NumberOfBytes conversion)
- Added `extract_peer_addr()` — invalid peer_addr values are silently ignored (BEP 3 optional)
- Removed `announce_builder` module (deleted announce_builder.rs and mod.rs reference)
- Updated ~54 call sites across 7 files
- All linters and tests pass

Author: josecelano

console/tracker-client/src/console/clients/checker/checks/http.rs

@@ -4,7 +4,8 @@ use std::time::Duration;
 use serde::Serialize;
 use torrust_info_hash::InfoHash;
 use torrust_tracker_client::http::client::Client;
-use torrust_tracker_http_protocol::v1::requests::{announce_builder, scrape_builder};
+use torrust_tracker_http_protocol::v1::requests::announce::AnnounceBuilder;
+use torrust_tracker_http_protocol::v1::requests::scrape_builder;
 use torrust_tracker_http_protocol::v1::responses::announce_deserialization::Announce;
 use torrust_tracker_http_protocol::v1::responses::scrape_deserialization;
 use url::Url;
@@ -68,11 +69,7 @@ async fn check_http_announce(url: &Url, timeout: Duration) -> Result<Announce, E
     let client = Client::new(url.clone(), timeout).map_err(|err| Error::HttpClientError { err })?;
 
     let response = client
-        .announce(
-            &announce_builder::QueryBuilder::with_default_values()
-                .with_info_hash(&info_hash)
-                .query(),
-        )
+        .announce(&AnnounceBuilder::with_default_values().with_info_hash(&info_hash).query())
         .await
         .map_err(|err| Error::HttpClientError { err })?;
 

console/tracker-client/src/console/clients/http/app.rs

@@ -79,7 +79,7 @@ use reqwest::Url;
 use torrust_info_hash::InfoHash;
 use torrust_peer_id::PeerId;
 use torrust_tracker_client::http::client::Client;
-use torrust_tracker_http_protocol::v1::requests::announce_builder::{Compact, Event, QueryBuilder};
+use torrust_tracker_http_protocol::v1::requests::announce::{AnnounceBuilder, Compact, Event};
 use torrust_tracker_http_protocol::v1::requests::scrape_builder;
 use torrust_tracker_http_protocol::v1::responses::announce_deserialization::{Announce, DeserializedCompact};
 use torrust_tracker_http_protocol::v1::responses::scrape_deserialization;
@@ -238,7 +238,7 @@ async fn announce_command(options: AnnounceOptions, timeout: Duration) -> anyhow
         )
     })?;
 
-    let mut query_builder = QueryBuilder::with_default_values().with_info_hash(&info_hash);
+    let mut query_builder = AnnounceBuilder::with_default_values().with_info_hash(&info_hash);
 
     if let Some(event) = options.event {
         query_builder = query_builder.with_event(event.into());
@@ -256,7 +256,7 @@ async fn announce_command(options: AnnounceOptions, timeout: Duration) -> anyhow
         query_builder = query_builder.with_port(port);
     }
     if let Some(peer_addr) = options.peer_addr {
-        query_builder = query_builder.with_peer_addr(&peer_addr);
+        query_builder = query_builder.with_peer_addr(peer_addr);
     }
     if let Some(peer_id) = options.peer_id {
         query_builder = query_builder.with_peer_id(&peer_id);

console/tracker-client/src/console/clients/unified/http.rs

@@ -9,7 +9,7 @@ use reqwest::Url;
 use torrust_info_hash::InfoHash;
 use torrust_peer_id::PeerId;
 use torrust_tracker_client::http::client::Client;
-use torrust_tracker_http_protocol::v1::requests::announce_builder::{Compact, Event, QueryBuilder};
+use torrust_tracker_http_protocol::v1::requests::announce::{AnnounceBuilder, Compact, Event};
 use torrust_tracker_http_protocol::v1::requests::scrape_builder;
 use torrust_tracker_http_protocol::v1::responses::announce_deserialization::{Announce, DeserializedCompact};
 use torrust_tracker_http_protocol::v1::responses::scrape_deserialization;
@@ -154,7 +154,7 @@ async fn announce_command(options: AnnounceOptions, timeout: Duration) -> anyhow
         )
     })?;
 
-    let mut query_builder = QueryBuilder::with_default_values().with_info_hash(&info_hash);
+    let mut query_builder = AnnounceBuilder::with_default_values().with_info_hash(&info_hash);
 
     if let Some(event) = options.event {
         query_builder = query_builder.with_event(event.into());
@@ -172,7 +172,7 @@ async fn announce_command(options: AnnounceOptions, timeout: Duration) -> anyhow
         query_builder = query_builder.with_port(port);
     }
     if let Some(peer_addr) = options.peer_addr {
-        query_builder = query_builder.with_peer_addr(&peer_addr);
+        query_builder = query_builder.with_peer_addr(peer_addr);
     }
     if let Some(peer_id) = options.peer_id {
         query_builder = query_builder.with_peer_id(&peer_id);

packages/axum-http-server/src/v1/extractors/announce_request.rs

@@ -84,6 +84,7 @@ fn extract_announce_from(maybe_raw_query: Option<&str>) -> Result<Announce, resp
 
 #[cfg(test)]
 mod tests {
+    use std::net::{IpAddr, Ipv4Addr};
     use std::str::FromStr;
 
     use torrust_info_hash::InfoHash;
@@ -112,6 +113,7 @@ mod tests {
                 info_hash: InfoHash::from_str("3b245504cf5f11bbdbe1201cea6a6bf45aee1bc0").unwrap(), // DevSkim: ignore DS173237
                 peer_id: PeerId(*b"-qB00000000000000001"),
                 port: 17548,
+                peer_addr: Some(IpAddr::V4(Ipv4Addr::new(2, 137, 87, 41))),
                 downloaded: Some(NumberOfBytes::new(0)),
                 uploaded: Some(NumberOfBytes::new(0)),
                 left: Some(NumberOfBytes::new(0)),

packages/axum-http-server/src/v1/handlers/announce.rs

@@ -220,6 +220,7 @@ mod tests {
             info_hash: sample_info_hash(),
             peer_id: PeerId(*b"-qB00000000000000001"),
             port: 17548,
+            peer_addr: None,
             downloaded: None,
             uploaded: None,
             left: None,

packages/axum-http-server/tests/server/client.rs

@@ -2,7 +2,8 @@ use std::net::IpAddr;
 
 use reqwest::{Client as ReqwestClient, Response};
 use torrust_tracker_core::authentication::Key;
-use torrust_tracker_http_protocol::v1::requests::{announce_builder, scrape_builder};
+use torrust_tracker_http_protocol::v1::requests::announce::Announce;
+use torrust_tracker_http_protocol::v1::requests::scrape_builder;
 
 /// HTTP Tracker Client
 pub struct Client {
@@ -45,15 +46,15 @@ impl Client {
         }
     }
 
-    pub async fn announce(&self, query: &announce_builder::Query) -> Response {
+    pub async fn announce(&self, query: &Announce) -> Response {
         self.get(&self.build_announce_path_and_query(query)).await
     }
 
     pub async fn scrape(&self, query: &scrape_builder::Query) -> Response {
         self.get(&self.build_scrape_path_and_query(query)).await
     }
 
-    pub async fn announce_with_header(&self, query: &announce_builder::Query, key: &str, value: &str) -> Response {
+    pub async fn announce_with_header(&self, query: &Announce, key: &str, value: &str) -> Response {
         self.get_with_header(&self.build_announce_path_and_query(query), key, value)
             .await
     }
@@ -75,7 +76,7 @@ impl Client {
             .unwrap()
     }
 
-    fn build_announce_path_and_query(&self, query: &announce_builder::Query) -> String {
+    fn build_announce_path_and_query(&self, query: &Announce) -> String {
         format!("{}?{query}", self.build_path("announce"))
     }