Comments/updates based on feedback

Signed-off-by: AssemblyJohn <[email protected]>

include/ocpp/common/websocket/websocket_libwebsockets.hpp

@@ -7,11 +7,8 @@
 #include <ocpp/common/safe_queue.hpp>
 #include <ocpp/common/websocket/websocket_base.hpp>
 
-#include <condition_variable>
 #include <memory>
-#include <mutex>
 #include <optional>
-#include <queue>
 #include <string>
 
 struct ssl_ctx_st;
@@ -32,29 +29,19 @@ class WebsocketLibwebsockets final : public WebsocketBase {
 
     void set_connection_options(const WebsocketConnectionOptions& connection_options) override;
 
-    /// \brief Starts the connection attempts. It will init the websocket processing thread
-    /// \returns true if the websocket is successfully initialized, false otherwise. Does
-    ///          not wait for a successful connection
     bool start_connecting() override;
 
-    /// \brief Reconnects the websocket after the delay. Will stop the current connection attempts
-    ///        and will call the 'start_connecting' after the delay
-    /// \param reason parameter
-    /// \param delay delay of the reconnect attempt
     void reconnect(long delay) override;
 
-    /// \brief closes the websocket
     void close(const WebsocketCloseReason code, const std::string& reason) override;
 
-    /// \brief send a \p message over the websocket
-    /// \returns true if the message was sent successfully
     bool send(const std::string& message) override;
 
-    /// \brief send a websocket ping
     void ping() override;
 
     /// \brief Indicates if the websocket has a valid connection data and is trying to
     ///        connect/reconnect internally even if for the moment it might not be connected
+    /// \return True if the websocket is connected or trying to connect, false otherwise
     bool is_trying_to_connect();
 
 public:

lib/ocpp/common/websocket/websocket_libwebsockets.cpp

@@ -8,8 +8,10 @@
 #include <libwebsockets.h>
 
 #include <atomic>
+#include <condition_variable>
 #include <fstream>
 #include <memory>
+#include <mutex>
 #include <stdexcept>
 #include <string>
 
@@ -797,7 +799,6 @@ void WebsocketLibwebsockets::thread_websocket_client_loop(std::shared_ptr<Connec
         if (local_data->is_interupted() || local_data->get_state() == EConnectionState::FINALIZED) {
             EVLOG_info << "Connection interrupted or cleanly finalized, exiting websocket loop";
             try_reconnect = false;
-            // TODO:
         } else if (local_data->get_state() != EConnectionState::CONNECTED) {
             // Any other failure than a successful connect