refactor: [#1298] remove duplicate code

Author: josecelano

packages/tracker-api-core/src/container.rs

@@ -1,15 +1,17 @@
 use std::sync::Arc;
 
+use bittorrent_http_tracker_core::container::HttpTrackerCoreContainer;
 use bittorrent_tracker_core::authentication::handler::KeysHandler;
 use bittorrent_tracker_core::container::TrackerCoreContainer;
 use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
 use bittorrent_tracker_core::whitelist::manager::WhitelistManager;
+use bittorrent_udp_tracker_core::container::UdpTrackerCoreContainer;
 use bittorrent_udp_tracker_core::services::banning::BanService;
-use bittorrent_udp_tracker_core::{self, MAX_CONNECTION_ID_ERRORS_PER_IP};
+use bittorrent_udp_tracker_core::{self};
 use tokio::sync::RwLock;
-use torrust_tracker_configuration::{Core, HttpApi};
+use torrust_tracker_configuration::{Core, HttpApi, HttpTracker, UdpTracker};
 
-pub struct HttpApiContainer {
+pub struct TrackerHttpApiCoreContainer {
     // todo: replace with TrackerCoreContainer
     pub core_config: Arc<Core>,
     pub in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
@@ -26,40 +28,43 @@ pub struct HttpApiContainer {
     pub http_api_config: Arc<HttpApi>,
 }
 
-impl HttpApiContainer {
+impl TrackerHttpApiCoreContainer {
     #[must_use]
-    pub fn initialize(core_config: &Arc<Core>, http_api_config: &Arc<HttpApi>) -> Arc<HttpApiContainer> {
+    pub fn initialize(
+        core_config: &Arc<Core>,
+        http_tracker_config: &Arc<HttpTracker>,
+        udp_tracker_config: &Arc<UdpTracker>,
+        http_api_config: &Arc<HttpApi>,
+    ) -> Arc<TrackerHttpApiCoreContainer> {
         let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(core_config));
-        Self::initialize_from(&tracker_core_container, http_api_config)
+        let http_tracker_core_container = HttpTrackerCoreContainer::initialize_from(&tracker_core_container, http_tracker_config);
+        let udp_tracker_core_container = UdpTrackerCoreContainer::initialize_from(&tracker_core_container, udp_tracker_config);
+
+        Self::initialize_from(
+            &tracker_core_container,
+            &http_tracker_core_container,
+            &udp_tracker_core_container,
+            http_api_config,
+        )
     }
 
     #[must_use]
     pub fn initialize_from(
         tracker_core_container: &Arc<TrackerCoreContainer>,
+        http_tracker_core_container: &Arc<HttpTrackerCoreContainer>,
+        udp_tracker_core_container: &Arc<UdpTrackerCoreContainer>,
         http_api_config: &Arc<HttpApi>,
-    ) -> Arc<HttpApiContainer> {
-        // HTTP stats
-        let (_http_stats_event_sender, http_stats_repository) =
-            bittorrent_http_tracker_core::statistics::setup::factory(tracker_core_container.core_config.tracker_usage_statistics);
-        let http_stats_repository = Arc::new(http_stats_repository);
-
-        // UDP stats
-        let (_udp_stats_event_sender, udp_stats_repository) =
-            bittorrent_udp_tracker_core::statistics::setup::factory(tracker_core_container.core_config.tracker_usage_statistics);
-        let udp_stats_repository = Arc::new(udp_stats_repository);
-
-        let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
-
-        Arc::new(HttpApiContainer {
+    ) -> Arc<TrackerHttpApiCoreContainer> {
+        Arc::new(TrackerHttpApiCoreContainer {
             core_config: tracker_core_container.core_config.clone(),
             in_memory_torrent_repository: tracker_core_container.in_memory_torrent_repository.clone(),
             keys_handler: tracker_core_container.keys_handler.clone(),
             whitelist_manager: tracker_core_container.whitelist_manager.clone(),
 
-            http_stats_repository: http_stats_repository.clone(),
+            http_stats_repository: http_tracker_core_container.http_stats_repository.clone(),
 
-            ban_service: ban_service.clone(),
-            udp_stats_repository: udp_stats_repository.clone(),
+            ban_service: udp_tracker_core_container.ban_service.clone(),
+            udp_stats_repository: udp_tracker_core_container.udp_stats_repository.clone(),
 
             http_api_config: http_api_config.clone(),
         })

src/bootstrap/jobs/tracker_apis.rs

@@ -27,7 +27,7 @@ use axum_server::tls_rustls::RustlsConfig;
 use tokio::task::JoinHandle;
 use torrust_axum_server::tsl::make_rust_tls;
 use torrust_server_lib::registar::ServiceRegistrationForm;
-use torrust_tracker_api_core::container::HttpApiContainer;
+use torrust_tracker_api_core::container::TrackerHttpApiCoreContainer;
 use torrust_tracker_configuration::AccessTokens;
 use tracing::instrument;
 
@@ -56,7 +56,7 @@ pub struct ApiServerJobStarted();
 ///
 #[instrument(skip(http_api_container, form))]
 pub async fn start_job(
-    http_api_container: Arc<HttpApiContainer>,
+    http_api_container: Arc<TrackerHttpApiCoreContainer>,
     form: ServiceRegistrationForm,
     version: Version,
 ) -> Option<JoinHandle<()>> {
@@ -78,7 +78,7 @@ pub async fn start_job(
 async fn start_v1(
     socket: SocketAddr,
     tls: Option<RustlsConfig>,
-    http_api_container: Arc<HttpApiContainer>,
+    http_api_container: Arc<TrackerHttpApiCoreContainer>,
     form: ServiceRegistrationForm,
     access_tokens: Arc<AccessTokens>,
 ) -> JoinHandle<()> {
@@ -98,7 +98,7 @@ mod tests {
     use std::sync::Arc;
 
     use torrust_server_lib::registar::Registar;
-    use torrust_tracker_api_core::container::HttpApiContainer;
+    use torrust_tracker_api_core::container::TrackerHttpApiCoreContainer;
     use torrust_tracker_test_helpers::configuration::ephemeral_public;
 
     use crate::bootstrap::app::initialize_global_services;
@@ -108,12 +108,21 @@ mod tests {
     #[tokio::test]
     async fn it_should_start_http_tracker() {
         let cfg = Arc::new(ephemeral_public());
+
         let core_config = Arc::new(cfg.core.clone());
-        let http_api_config = Arc::new(cfg.http_api.clone().unwrap());
+
+        let http_tracker_config = cfg.http_trackers.clone().expect("missing HTTP tracker configuration");
+        let http_tracker_config = Arc::new(http_tracker_config[0].clone());
+
+        let udp_tracker_configurations = cfg.udp_trackers.clone().expect("missing UDP tracker configuration");
+        let udp_tracker_config = Arc::new(udp_tracker_configurations[0].clone());
+
+        let http_api_config = Arc::new(cfg.http_api.clone().expect("missing HTTP API configuration").clone());
 
         initialize_global_services(&cfg);
 
-        let http_api_container = HttpApiContainer::initialize(&core_config, &http_api_config);
+        let http_api_container =
+            TrackerHttpApiCoreContainer::initialize(&core_config, &http_tracker_config, &udp_tracker_config, &http_api_config);
 
         let version = Version::V1;
 

src/container.rs

@@ -17,7 +17,7 @@ use bittorrent_udp_tracker_core::container::UdpTrackerCoreContainer;
 use bittorrent_udp_tracker_core::services::banning::BanService;
 use bittorrent_udp_tracker_core::{self, MAX_CONNECTION_ID_ERRORS_PER_IP};
 use tokio::sync::RwLock;
-use torrust_tracker_api_core::container::HttpApiContainer;
+use torrust_tracker_api_core::container::TrackerHttpApiCoreContainer;
 use torrust_tracker_configuration::{Configuration, Core, HttpApi, HttpTracker, UdpTracker};
 use tracing::instrument;
 
@@ -78,8 +78,8 @@ impl AppContainer {
     }
 
     #[must_use]
-    pub fn http_api_container(&self, http_api_config: &Arc<HttpApi>) -> HttpApiContainer {
-        HttpApiContainer {
+    pub fn http_api_container(&self, http_api_config: &Arc<HttpApi>) -> TrackerHttpApiCoreContainer {
+        TrackerHttpApiCoreContainer {
             http_api_config: http_api_config.clone(),
             core_config: self.core_config.clone(),
             in_memory_torrent_repository: self.in_memory_torrent_repository.clone(),

src/servers/apis/routes.rs

@@ -16,7 +16,7 @@ use axum::routing::get;
 use axum::{middleware, BoxError, Router};
 use hyper::{Request, StatusCode};
 use torrust_server_lib::logging::Latency;
-use torrust_tracker_api_core::container::HttpApiContainer;
+use torrust_tracker_api_core::container::TrackerHttpApiCoreContainer;
 use torrust_tracker_configuration::{AccessTokens, DEFAULT_TIMEOUT};
 use tower::timeout::TimeoutLayer;
 use tower::ServiceBuilder;
@@ -36,7 +36,7 @@ use crate::servers::apis::API_LOG_TARGET;
 /// Add all API routes to the router.
 #[instrument(skip(http_api_container, access_tokens))]
 pub fn router(
-    http_api_container: Arc<HttpApiContainer>,
+    http_api_container: Arc<TrackerHttpApiCoreContainer>,
     access_tokens: Arc<AccessTokens>,
     server_socket_addr: SocketAddr,
 ) -> Router {

src/servers/apis/server.rs

@@ -38,7 +38,7 @@ use torrust_axum_server::signals::graceful_shutdown;
 use torrust_server_lib::logging::STARTED_ON;
 use torrust_server_lib::registar::{ServiceHealthCheckJob, ServiceRegistration, ServiceRegistrationForm};
 use torrust_server_lib::signals::{Halted, Started};
-use torrust_tracker_api_core::container::HttpApiContainer;
+use torrust_tracker_api_core::container::TrackerHttpApiCoreContainer;
 use torrust_tracker_configuration::AccessTokens;
 use tracing::{instrument, Level};
 
@@ -125,7 +125,7 @@ impl ApiServer<Stopped> {
     #[instrument(skip(self, http_api_container, form, access_tokens), err, ret(Display, level = Level::INFO))]
     pub async fn start(
         self,
-        http_api_container: Arc<HttpApiContainer>,
+        http_api_container: Arc<TrackerHttpApiCoreContainer>,
         form: ServiceRegistrationForm,
         access_tokens: Arc<AccessTokens>,
     ) -> Result<ApiServer<Running>, Error> {
@@ -238,7 +238,7 @@ impl Launcher {
     #[instrument(skip(self, http_api_container, access_tokens, tx_start, rx_halt))]
     pub fn start(
         &self,
-        http_api_container: Arc<HttpApiContainer>,
+        http_api_container: Arc<TrackerHttpApiCoreContainer>,
         access_tokens: Arc<AccessTokens>,
         tx_start: Sender<Started>,
         rx_halt: Receiver<Halted>,
@@ -296,7 +296,7 @@ mod tests {
 
     use torrust_axum_server::tsl::make_rust_tls;
     use torrust_server_lib::registar::Registar;
-    use torrust_tracker_api_core::container::HttpApiContainer;
+    use torrust_tracker_api_core::container::TrackerHttpApiCoreContainer;
     use torrust_tracker_test_helpers::configuration::ephemeral_public;
 
     use crate::bootstrap::app::initialize_global_services;
@@ -306,7 +306,11 @@ mod tests {
     async fn it_should_be_able_to_start_and_stop() {
         let cfg = Arc::new(ephemeral_public());
         let core_config = Arc::new(cfg.core.clone());
-        let http_api_config = Arc::new(cfg.http_api.clone().unwrap());
+        let http_tracker_config = cfg.http_trackers.clone().expect("missing HTTP tracker configuration");
+        let http_tracker_config = Arc::new(http_tracker_config[0].clone());
+        let udp_tracker_configurations = cfg.udp_trackers.clone().expect("missing UDP tracker configuration");
+        let udp_tracker_config = Arc::new(udp_tracker_configurations[0].clone());
+        let http_api_config = Arc::new(cfg.http_api.clone().expect("missing HTTP API configuration").clone());
 
         initialize_global_services(&cfg);
 
@@ -322,7 +326,8 @@ mod tests {
 
         let register = &Registar::default();
 
-        let http_api_container = HttpApiContainer::initialize(&core_config, &http_api_config);
+        let http_api_container =
+            TrackerHttpApiCoreContainer::initialize(&core_config, &http_tracker_config, &udp_tracker_config, &http_api_config);
 
         let started = stopped
             .start(http_api_container, register.give_form(), access_tokens)

src/servers/apis/v1/context/stats/routes.rs

@@ -7,12 +7,12 @@ use std::sync::Arc;
 
 use axum::routing::get;
 use axum::Router;
-use torrust_tracker_api_core::container::HttpApiContainer;
+use torrust_tracker_api_core::container::TrackerHttpApiCoreContainer;
 
 use super::handlers::get_stats_handler;
 
 /// It adds the routes to the router for the [`stats`](crate::servers::apis::v1::context::stats) API context.
-pub fn add(prefix: &str, router: Router, http_api_container: &Arc<HttpApiContainer>) -> Router {
+pub fn add(prefix: &str, router: Router, http_api_container: &Arc<TrackerHttpApiCoreContainer>) -> Router {
     router.route(
         &format!("{prefix}/stats"),
         get(get_stats_handler).with_state((

src/servers/apis/v1/routes.rs

@@ -2,12 +2,12 @@
 use std::sync::Arc;
 
 use axum::Router;
-use torrust_tracker_api_core::container::HttpApiContainer;
+use torrust_tracker_api_core::container::TrackerHttpApiCoreContainer;
 
 use super::context::{auth_key, stats, torrent, whitelist};
 
 /// Add the routes for the v1 API.
-pub fn add(prefix: &str, router: Router, http_api_container: &Arc<HttpApiContainer>) -> Router {
+pub fn add(prefix: &str, router: Router, http_api_container: &Arc<TrackerHttpApiCoreContainer>) -> Router {
     let v1_prefix = format!("{prefix}/v1");
 
     let router = auth_key::routes::add(&v1_prefix, router, &http_api_container.keys_handler.clone());