Add cleanup on Connection destruction

xapi/Connection.cpp

@@ -23,6 +23,11 @@ Connection::Connection(Connection &&other) noexcept
 {
 }
 
+Connection::~Connection()
+{
+    cancelAsyncOperations();
+}
+
 boost::asio::awaitable<void> Connection::connect(const boost::url &url)
 {
     const auto executor = co_await boost::asio::this_coro::executor;
@@ -74,10 +79,7 @@ boost::asio::awaitable<void> Connection::establishSSLConnection(
 
 boost::asio::awaitable<void> Connection::disconnect()
 {
-    m_cancellationSignal.emit(boost::asio::cancellation_type::all);
-    // Cancel all pending asynchronous operations
-    m_websocket.next_layer().next_layer().cancel();
-
+    cancelAsyncOperations();
     try
     {
         co_await m_websocket.async_close(boost::beast::websocket::close_code::normal, boost::asio::use_awaitable);
@@ -177,5 +179,14 @@ boost::asio::awaitable<void> Connection::startKeepAlive(boost::asio::cancellatio
     }
 }
 
+void Connection::cancelAsyncOperations() noexcept
+{
+    m_cancellationSignal.emit(boost::asio::cancellation_type::all);
+    if (m_websocket.is_open())
+    {
+        m_websocket.next_layer().next_layer().cancel();
+    }
+}
+
 } // namespace internals
 } // namespace xapi

xapi/Connection.hpp

@@ -34,8 +34,8 @@ class Connection
   public:
     Connection() = delete;
 
-    Connection(const Connection &) = delete;
-    Connection &operator=(const Connection &) = delete;
+    Connection(const Connection &other) = delete;
+    Connection &operator=(const Connection &other) = delete;
 
     Connection(Connection &&other) noexcept;
     // Move assignment operator is not supported because of boost::beast::websocket::stream
@@ -47,7 +47,7 @@ class Connection
      */
     explicit Connection(boost::asio::io_context &ioContext);
 
-    virtual ~Connection() = default;
+    virtual ~Connection();
 
     /**
      * @brief Asynchronously establishes secure WebSocket connection to the server.
@@ -101,6 +101,12 @@ class Connection
      */
     boost::asio::awaitable<void> startKeepAlive(boost::asio::cancellation_slot cancellationSlot);
 
+    /**
+     * @brief Cancels all pending asynchronous operations and stops the keep-alive coroutine.
+     * @return void.
+     */
+    void cancelAsyncOperations() noexcept;
+
     // SSL context, stores certificates.
     boost::asio::ssl::context m_sslContext;