code refactor

Author: paulocoutinhox

include/bitchat/runners/cleanup_runner.h

@@ -18,8 +18,8 @@ class CleanupRunner
     CleanupRunner();
     ~CleanupRunner();
 
-    // Set the network service
-    void setNetworkService(std::shared_ptr<NetworkService> networkService);
+    // Initialize the cleanup runner
+    bool initialize(std::shared_ptr<NetworkService> networkService);
 
     // Start the cleanup loop
     bool start();

include/bitchat/services/network_service.h

@@ -27,7 +27,7 @@ class NetworkService
     ~NetworkService();
 
     // Initialize the network service
-    bool initialize(std::shared_ptr<BluetoothInterface> bluetooth);
+    bool initialize(std::shared_ptr<BluetoothInterface> bluetoothInterface, std::shared_ptr<BluetoothAnnounceRunner> announceRunner, std::shared_ptr<CleanupRunner> cleanupRunner);
 
     // Start network operations
     bool start();
@@ -53,10 +53,6 @@ class NetworkService
     // Check if network is ready
     bool isReady() const;
 
-    // Set runner instances
-    void setAnnounceRunner(std::shared_ptr<BluetoothAnnounceRunner> runner);
-    void setCleanupRunner(std::shared_ptr<CleanupRunner> runner);
-
 private:
     // Bluetooth interface
     std::shared_ptr<BluetoothInterface> bluetoothInterface;

src/bitchat/core/bitchat_manager.cpp

@@ -77,19 +77,8 @@ bool BitchatManager::initialize(
             return false;
         }
 
-        // Set runners in NetworkService before initialization
-        if (announceRunner)
-        {
-            networkService->setAnnounceRunner(announceRunner);
-        }
-
-        if (cleanupRunner)
-        {
-            networkService->setCleanupRunner(cleanupRunner);
-        }
-
         // Initialize services
-        if (!networkService->initialize(bluetoothInterface))
+        if (!networkService->initialize(bluetoothInterface, announceRunner, cleanupRunner))
         {
             spdlog::error("Failed to initialize NetworkService");
             return false;
@@ -123,6 +112,7 @@ bool BitchatManager::initialize(
         // Set initialization state
         BitchatData::shared()->setInitialized(true);
         spdlog::info("BitchatManager initialized successfully");
+
         return true;
     }
     catch (const std::exception &e)

src/bitchat/runners/bluetooth_announce_runner.cpp

@@ -13,6 +13,7 @@ BluetoothAnnounceRunner::BluetoothAnnounceRunner()
     : shouldExit(false)
     , running(false)
 {
+    // Pass
 }
 
 BluetoothAnnounceRunner::~BluetoothAnnounceRunner()

src/bitchat/runners/cleanup_runner.cpp

@@ -11,16 +11,21 @@ CleanupRunner::CleanupRunner()
     : shouldExit(false)
     , running(false)
 {
+    // Pass
 }
 
 CleanupRunner::~CleanupRunner()
 {
     stop();
 }
 
-void CleanupRunner::setNetworkService(std::shared_ptr<NetworkService> networkService)
+bool CleanupRunner::initialize(std::shared_ptr<NetworkService> networkService)
 {
     this->networkService = networkService;
+
+    spdlog::info("CleanupRunner initialized");
+
+    return true;
 }
 
 bool CleanupRunner::start()

src/bitchat/services/crypto_service.cpp

@@ -13,6 +13,7 @@ namespace bitchat
 CryptoService::CryptoService()
     : signingPrivateKey(nullptr)
 {
+    // Pass
 }
 
 CryptoService::~CryptoService()
@@ -24,6 +25,7 @@ bool CryptoService::initialize()
 {
     OpenSSL_add_all_algorithms();
     ERR_load_crypto_strings();
+
     return true;
 }
 

src/bitchat/services/message_service.cpp

@@ -21,6 +21,7 @@ MessageService::MessageService()
 
 bool MessageService::initialize(std::shared_ptr<NetworkService> networkService, std::shared_ptr<CryptoService> cryptoService, std::shared_ptr<NoiseService> noiseService)
 {
+    // Set services
     this->networkService = networkService;
     this->cryptoService = cryptoService;
     this->noiseService = noiseService;

src/bitchat/services/network_service.cpp

@@ -26,16 +26,21 @@ NetworkService::~NetworkService()
     stop();
 }
 
-bool NetworkService::initialize(std::shared_ptr<BluetoothInterface> bluetooth)
+bool NetworkService::initialize(std::shared_ptr<BluetoothInterface> bluetoothInterface, std::shared_ptr<BluetoothAnnounceRunner> announceRunner, std::shared_ptr<CleanupRunner> cleanupRunner)
 {
-    bluetoothInterface = bluetooth;
+    // Set Bluetooth interface
+    this->bluetoothInterface = bluetoothInterface;
 
     if (!bluetoothInterface)
     {
         spdlog::error("NetworkService: Bluetooth interface is null");
         return false;
     }
 
+    // Set runners
+    this->announceRunner = announceRunner;
+    this->cleanupRunner = cleanupRunner;
+
     // Set up Bluetooth callbacks
     // clang-format off
     bluetoothInterface->setPacketReceivedCallback([this](const BitchatPacket &packet, const std::string &peripheralID) {
@@ -167,16 +172,6 @@ bool NetworkService::isReady() const
     return bluetoothInterface && bluetoothInterface->isReady();
 }
 
-void NetworkService::setAnnounceRunner(std::shared_ptr<BluetoothAnnounceRunner> runner)
-{
-    announceRunner = runner;
-}
-
-void NetworkService::setCleanupRunner(std::shared_ptr<CleanupRunner> runner)
-{
-    cleanupRunner = runner;
-}
-
 void NetworkService::onPeerConnected(const std::string &peripheralID)
 {
     spdlog::info("Peer connected with UUID: {}", peripheralID);