refactor: [#1411] remove duplicate code for UdpTrackerCoreServices initialization

Author: josecelano

packages/axum-rest-tracker-api-server/src/environment.rs

@@ -175,7 +175,8 @@ impl EnvContainer {
         let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(&core_config));
         let http_tracker_core_container =
             HttpTrackerCoreContainer::initialize_from_tracker_core(&tracker_core_container, &http_tracker_config);
-        let udp_tracker_core_container = UdpTrackerCoreContainer::initialize_from(&tracker_core_container, &udp_tracker_config);
+        let udp_tracker_core_container =
+            UdpTrackerCoreContainer::initialize_from_tracker_core(&tracker_core_container, &udp_tracker_config);
         let udp_tracker_server_container = UdpTrackerServerContainer::initialize(&core_config);
 
         let tracker_http_api_core_container = TrackerHttpApiCoreContainer::initialize_from(

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

@@ -29,7 +29,8 @@ impl TrackerHttpApiCoreContainer {
         let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(core_config));
         let http_tracker_core_container =
             HttpTrackerCoreContainer::initialize_from_tracker_core(&tracker_core_container, http_tracker_config);
-        let udp_tracker_core_container = UdpTrackerCoreContainer::initialize_from(&tracker_core_container, udp_tracker_config);
+        let udp_tracker_core_container =
+            UdpTrackerCoreContainer::initialize_from_tracker_core(&tracker_core_container, udp_tracker_config);
         let udp_tracker_server_container = UdpTrackerServerContainer::initialize(core_config);
 
         Self::initialize_from(

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

@@ -8,11 +8,14 @@ use crate::services::announce::AnnounceService;
 use crate::services::banning::BanService;
 use crate::services::connect::ConnectService;
 use crate::services::scrape::ScrapeService;
-use crate::{event, statistics, MAX_CONNECTION_ID_ERRORS_PER_IP};
+use crate::{event, services, statistics, MAX_CONNECTION_ID_ERRORS_PER_IP};
 
 pub struct UdpTrackerCoreContainer {
-    pub tracker_core_container: Arc<TrackerCoreContainer>,
     pub udp_tracker_config: Arc<UdpTracker>,
+
+    pub tracker_core_container: Arc<TrackerCoreContainer>,
+
+    // `UdpTrackerCoreServices`
     pub udp_core_stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
     pub udp_core_stats_repository: Arc<statistics::repository::Repository>,
     pub ban_service: Arc<RwLock<BanService>>,
@@ -25,14 +28,52 @@ impl UdpTrackerCoreContainer {
     #[must_use]
     pub fn initialize(core_config: &Arc<Core>, udp_tracker_config: &Arc<UdpTracker>) -> Arc<UdpTrackerCoreContainer> {
         let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(core_config));
-        Self::initialize_from(&tracker_core_container, udp_tracker_config)
+        Self::initialize_from_tracker_core(&tracker_core_container, udp_tracker_config)
     }
 
     #[must_use]
-    pub fn initialize_from(
+    pub fn initialize_from_tracker_core(
         tracker_core_container: &Arc<TrackerCoreContainer>,
         udp_tracker_config: &Arc<UdpTracker>,
     ) -> Arc<UdpTrackerCoreContainer> {
+        let udp_tracker_core_services = UdpTrackerCoreServices::initialize_from(tracker_core_container);
+        Self::initialize_from_services(tracker_core_container, &udp_tracker_core_services, udp_tracker_config)
+    }
+
+    #[must_use]
+    pub fn initialize_from_services(
+        tracker_core_container: &Arc<TrackerCoreContainer>,
+        udp_tracker_core_services: &Arc<UdpTrackerCoreServices>,
+        udp_tracker_config: &Arc<UdpTracker>,
+    ) -> Arc<Self> {
+        Arc::new(Self {
+            udp_tracker_config: udp_tracker_config.clone(),
+
+            tracker_core_container: tracker_core_container.clone(),
+
+            // `UdpTrackerCoreServices`
+            udp_core_stats_event_sender: udp_tracker_core_services.udp_core_stats_event_sender.clone(),
+            udp_core_stats_repository: udp_tracker_core_services.udp_core_stats_repository.clone(),
+            ban_service: udp_tracker_core_services.udp_ban_service.clone(),
+            connect_service: udp_tracker_core_services.udp_connect_service.clone(),
+            announce_service: udp_tracker_core_services.udp_announce_service.clone(),
+            scrape_service: udp_tracker_core_services.udp_scrape_service.clone(),
+        })
+    }
+}
+
+pub struct UdpTrackerCoreServices {
+    pub udp_core_stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
+    pub udp_core_stats_repository: Arc<statistics::repository::Repository>,
+    pub udp_ban_service: Arc<RwLock<services::banning::BanService>>,
+    pub udp_connect_service: Arc<services::connect::ConnectService>,
+    pub udp_announce_service: Arc<services::announce::AnnounceService>,
+    pub udp_scrape_service: Arc<services::scrape::ScrapeService>,
+}
+
+impl UdpTrackerCoreServices {
+    #[must_use]
+    pub fn initialize_from(tracker_core_container: &Arc<TrackerCoreContainer>) -> Arc<Self> {
         let (udp_core_stats_event_sender, udp_core_stats_repository) =
             statistics::setup::factory(tracker_core_container.core_config.tracker_usage_statistics);
         let udp_core_stats_event_sender = Arc::new(udp_core_stats_event_sender);
@@ -49,15 +90,13 @@ impl UdpTrackerCoreContainer {
             udp_core_stats_event_sender.clone(),
         ));
 
-        Arc::new(UdpTrackerCoreContainer {
-            tracker_core_container: tracker_core_container.clone(),
-            udp_tracker_config: udp_tracker_config.clone(),
-            udp_core_stats_event_sender: udp_core_stats_event_sender.clone(),
-            udp_core_stats_repository: udp_core_stats_repository.clone(),
-            ban_service: ban_service.clone(),
-            connect_service: connect_service.clone(),
-            announce_service: announce_service.clone(),
-            scrape_service: scrape_service.clone(),
+        Arc::new(Self {
+            udp_core_stats_event_sender,
+            udp_core_stats_repository,
+            udp_ban_service: ban_service,
+            udp_connect_service: connect_service,
+            udp_announce_service: announce_service,
+            udp_scrape_service: scrape_service,
         })
     }
 }

packages/udp-tracker-server/src/environment.rs

@@ -131,7 +131,8 @@ impl EnvContainer {
         let udp_tracker_config = Arc::new(udp_tracker_configurations[0].clone());
 
         let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(&core_config));
-        let udp_tracker_core_container = UdpTrackerCoreContainer::initialize_from(&tracker_core_container, &udp_tracker_config);
+        let udp_tracker_core_container =
+            UdpTrackerCoreContainer::initialize_from_tracker_core(&tracker_core_container, &udp_tracker_config);
         let udp_tracker_server_container = UdpTrackerServerContainer::initialize(&core_config);
 
         Self {

src/container.rs

@@ -4,10 +4,8 @@ use std::sync::Arc;
 
 use bittorrent_http_tracker_core::container::{HttpTrackerCoreContainer, HttpTrackerCoreServices};
 use bittorrent_tracker_core::container::TrackerCoreContainer;
-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 bittorrent_udp_tracker_core::container::{UdpTrackerCoreContainer, UdpTrackerCoreServices};
+use bittorrent_udp_tracker_core::{self};
 use torrust_rest_tracker_api_core::container::TrackerHttpApiCoreContainer;
 use torrust_tracker_configuration::{Configuration, HttpApi};
 use torrust_udp_tracker_server::container::UdpTrackerServerContainer;
@@ -26,14 +24,7 @@ pub struct AppContainer {
     pub tracker_core_container: Arc<TrackerCoreContainer>,
     pub http_api_config: Arc<Option<HttpApi>>,
     pub http_tracker_core_services: Arc<HttpTrackerCoreServices>,
-
-    // UDP Tracker Core Services
-    pub udp_core_stats_event_sender: Arc<Option<Box<dyn bittorrent_udp_tracker_core::event::sender::Sender>>>,
-    pub udp_core_stats_repository: Arc<bittorrent_udp_tracker_core::statistics::repository::Repository>,
-    pub udp_ban_service: Arc<RwLock<BanService>>,
-    pub udp_connect_service: Arc<bittorrent_udp_tracker_core::services::connect::ConnectService>,
-    pub udp_announce_service: Arc<bittorrent_udp_tracker_core::services::announce::AnnounceService>,
-    pub udp_scrape_service: Arc<bittorrent_udp_tracker_core::services::scrape::ScrapeService>,
+    pub udp_tracker_core_services: Arc<UdpTrackerCoreServices>,
 
     // UDP Tracker Server Services
     pub udp_server_stats_event_sender: Arc<Option<Box<dyn torrust_udp_tracker_server::event::sender::Sender>>>,
@@ -58,24 +49,7 @@ impl AppContainer {
 
         let http_tracker_core_services = HttpTrackerCoreServices::initialize_from(&tracker_core_container);
 
-        // UDP Tracker Core Services
-        let (udp_core_stats_event_sender, udp_core_stats_repository) =
-            bittorrent_udp_tracker_core::statistics::setup::factory(configuration.core.tracker_usage_statistics);
-        let udp_core_stats_event_sender = Arc::new(udp_core_stats_event_sender);
-        let udp_core_stats_repository = Arc::new(udp_core_stats_repository);
-        let udp_ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
-        let udp_connect_service = Arc::new(bittorrent_udp_tracker_core::services::connect::ConnectService::new(
-            udp_core_stats_event_sender.clone(),
-        ));
-        let udp_announce_service = Arc::new(bittorrent_udp_tracker_core::services::announce::AnnounceService::new(
-            tracker_core_container.announce_handler.clone(),
-            tracker_core_container.whitelist_authorization.clone(),
-            udp_core_stats_event_sender.clone(),
-        ));
-        let udp_scrape_service = Arc::new(bittorrent_udp_tracker_core::services::scrape::ScrapeService::new(
-            tracker_core_container.scrape_handler.clone(),
-            udp_core_stats_event_sender.clone(),
-        ));
+        let udp_tracker_core_services = UdpTrackerCoreServices::initialize_from(&tracker_core_container);
 
         // UDP Tracker Server Services
         let (udp_server_stats_event_sender, udp_server_stats_repository) =
@@ -114,16 +88,11 @@ impl AppContainer {
             for udp_tracker_config in udp_trackers {
                 udp_tracker_containers.insert(
                     udp_tracker_config.bind_address,
-                    Arc::new(UdpTrackerCoreContainer {
-                        tracker_core_container: tracker_core_container.clone(),
-                        udp_tracker_config: Arc::new(udp_tracker_config.clone()),
-                        udp_core_stats_event_sender: udp_core_stats_event_sender.clone(),
-                        udp_core_stats_repository: udp_core_stats_repository.clone(),
-                        ban_service: udp_ban_service.clone(),
-                        connect_service: udp_connect_service.clone(),
-                        announce_service: udp_announce_service.clone(),
-                        scrape_service: udp_scrape_service.clone(),
-                    }),
+                    UdpTrackerCoreContainer::initialize_from_services(
+                        &tracker_core_container,
+                        &udp_tracker_core_services,
+                        &Arc::new(udp_tracker_config.clone()),
+                    ),
                 );
             }
         }
@@ -134,14 +103,7 @@ impl AppContainer {
             tracker_core_container,
             http_api_config,
             http_tracker_core_services,
-
-            // UDP Tracker Core Services
-            udp_core_stats_event_sender,
-            udp_core_stats_repository,
-            udp_ban_service,
-            udp_connect_service,
-            udp_announce_service,
-            udp_scrape_service,
+            udp_tracker_core_services,
 
             // UDP Tracker Server Services
             udp_server_stats_event_sender,
@@ -188,9 +150,9 @@ impl AppContainer {
         TrackerHttpApiCoreContainer {
             tracker_core_container: self.tracker_core_container.clone(),
             http_api_config: http_api_config.clone(),
-            ban_service: self.udp_ban_service.clone(),
+            ban_service: self.udp_tracker_core_services.udp_ban_service.clone(),
             http_stats_repository: self.http_tracker_core_services.http_stats_repository.clone(),
-            udp_core_stats_repository: self.udp_core_stats_repository.clone(),
+            udp_core_stats_repository: self.udp_tracker_core_services.udp_core_stats_repository.clone(),
             udp_server_stats_repository: self.udp_server_stats_repository.clone(),
         }
         .into()