2 files changed, 31 insertions(+), 1 deletions(-)

M module-services/service-bluetooth/ServiceBluetooth.cpp
M module-services/service-bluetooth/service-bluetooth/ServiceBluetooth.hpp

@@ 28,13 28,14 @@
 #include <service-desktop/endpoints/bluetooth/BluetoothHelper.hpp>
 #include <BtCommand.hpp>
 #include <BtKeysStorage.hpp>
-
+#include <Timers/TimerFactory.hpp>
 #include <typeinfo>
 
 namespace
 {
     constexpr auto BluetoothServiceStackDepth = 2560U;
     inline constexpr auto nameSettingsNew     = "ApplicationSettingsNew";
+    inline constexpr auto connectionTimeout   = std::chrono::minutes{30};
 } // namespace
 
 ServiceBluetooth::ServiceBluetooth() : sys::Service(service::name::bluetooth, "", BluetoothServiceStackDepth)


@@ 62,6 63,12 @@ sys::ReturnCodes ServiceBluetooth::InitHandler()
     auto sentinelRegistrationMsg = std::make_shared<sys::SentinelRegistrationMessage>(cpuSentinel);
     bus.sendUnicast(sentinelRegistrationMsg, service::name::system_manager);
 
+    connectionTimeoutTimer =
+        sys::TimerFactory::createSingleShotTimer(this, "btTimeoutTimer", connectionTimeout, [this](sys::Timer &_) {
+            sendWorkerCommand(bluetooth::Command(bluetooth::Command::Type::DisconnectAudio));
+            LOG_ERROR("Disconnecting from timeout timer!");
+        });
+
     connect(message::bluetooth::RequestBondedDevices(), [&](sys::Message *msg) {
         auto request = static_cast<message::bluetooth::RequestBondedDevices *>(msg);
         return handle(request);


@@ 246,6 253,7 @@ auto ServiceBluetooth::handle(message::bluetooth::ConnectResult *msg) -> std::sh
 {
     if (msg->isSucceed()) {
         settingsHolder->setValue(bluetooth::Settings::ConnectedDevice, msg->getAddr());
+        startTimeoutTimer();
     }
     bus.sendUnicast(std::make_shared<message::bluetooth::ConnectResult>(*msg), nameSettingsNew);
     return sys::MessageNone{};


@@ 265,6 273,8 @@ auto ServiceBluetooth::handle(message::bluetooth::DisconnectResult *msg) -> std:
     bus.sendUnicast(std::make_shared<message::bluetooth::ResponseBondedDevices>(
                         SettingsSerializer::fromString(bondedDevicesStr), std::string()),
                     nameSettingsNew);
+    stopTimeoutTimer();
+
     return sys::MessageNone{};
 }
 


@@ 306,6 316,8 @@ auto ServiceBluetooth::handle(BluetoothMessage *msg) -> std::shared_ptr<sys::Mes
     } break;
     case BluetoothMessage::Play:
         sendWorkerCommand(bluetooth::Command(bluetooth::Command::Type::StartStream));
+        stopTimeoutTimer();
+
         break;
     case BluetoothMessage::SwitchProfile:
         sendWorkerCommand(bluetooth::Command(bluetooth::Command::Type::SwitchProfile));


@@ 315,6 327,7 @@ auto ServiceBluetooth::handle(BluetoothMessage *msg) -> std::shared_ptr<sys::Mes
         break;
     case BluetoothMessage::Stop:
         sendWorkerCommand(bluetooth::Command(bluetooth::Command::Type::StopStream));
+        startTimeoutTimer();
         break;
     default:
         break;


@@ 338,3 351,15 @@ auto ServiceBluetooth::handle(sdesktop::developerMode::DeveloperModeRequest *msg
     }
     return sys::MessageNone{};
 }
+void ServiceBluetooth::startTimeoutTimer()
+{
+    if (connectionTimeoutTimer.isValid()) {
+        connectionTimeoutTimer.start();
+    }
+}
+void ServiceBluetooth::stopTimeoutTimer()
+{
+    if (connectionTimeoutTimer.isValid()) {
+        connectionTimeoutTimer.stop();
+    }
+}

@@ 13,6 13,7 @@
 #include <module-bluetooth/Bluetooth/CommandHandler.hpp>
 #include "ProfileManager.hpp"
 #include <Service/CpuSentinel.hpp>
+#include <Timers/TimerHandle.hpp>
 
 #include <memory> // for unique_ptr
 


@@ 66,6 67,10 @@ class ServiceBluetooth : public sys::Service
   private:
     std::unique_ptr<BluetoothWorker> worker;
     std::shared_ptr<sys::CpuSentinel> cpuSentinel;
+    sys::TimerHandle connectionTimeoutTimer;
+
+    void startTimeoutTimer();
+    void stopTimeoutTimer();
 
     [[nodiscard]] auto handle(message::bluetooth::RequestBondedDevices *msg) -> std::shared_ptr<sys::Message>;
     [[nodiscard]] auto handle(message::bluetooth::RequestStatus *msg) -> std::shared_ptr<sys::Message>;