lib: ocpp/v2/charge_point: move time disconnected detection to connectivity manager

Signed-off-by: Jan Bruchhaus <jan.bruchhaus@compleo-cs.com>

Author: JB-CompleoCS

lib/everest/ocpp/include/ocpp/v2/charge_point.hpp

@@ -399,8 +399,6 @@ class ChargePoint : public ChargePointInterface, private ocpp::ChargingStationBa
         }
     };
 
-    std::chrono::time_point<std::chrono::steady_clock> time_disconnected;
-
     // callback struct
     Callbacks callbacks;
 

lib/everest/ocpp/include/ocpp/v2/connectivity_manager.hpp

@@ -7,9 +7,11 @@
 #include <ocpp/v2/messages/SetNetworkProfile.hpp>
 #include <ocpp/v2/ocpp_types.hpp>
 
+#include <chrono>
 #include <functional>
 #include <future>
 #include <optional>
+
 namespace ocpp {
 namespace v2 {
 
@@ -84,6 +86,11 @@ class ConnectivityManagerInterface {
     ///
     virtual bool is_websocket_connected() = 0;
 
+    /// @brief Get the time the websocket has been disconnected.
+    /// @return The time the websocket has been disconnected
+    ///
+    virtual std::optional<std::chrono::time_point<std::chrono::steady_clock>> get_time_disconnected() const = 0;
+
     /// \brief Connect to the websocket
     /// \param configuration_slot Optional the network_profile_slot to connect to. std::nullopt will select the slot
     /// internally.
@@ -168,6 +175,7 @@ class ConnectivityManager : public ConnectivityManagerInterface {
     std::optional<std::int32_t> get_priority_from_configuration_slot(const int configuration_slot) const override;
     const std::vector<int>& get_network_connection_slots() const override;
     bool is_websocket_connected() override;
+    std::optional<std::chrono::time_point<std::chrono::steady_clock>> get_time_disconnected() const;
     void connect(std::optional<std::int32_t> network_profile_slot = std::nullopt) override;
     void disconnect() override;
     bool send_to_websocket(const std::string& message) override;
@@ -176,6 +184,8 @@ class ConnectivityManager : public ConnectivityManagerInterface {
     void confirm_successful_connection() override;
 
 private:
+    std::optional<std::chrono::time_point<std::chrono::steady_clock>> time_disconnected{};
+
     /// \brief Initializes the websocket and tries to connect
     ///
     void try_connect_websocket();

lib/everest/ocpp/lib/ocpp/v2/charge_point.cpp

@@ -1092,10 +1092,11 @@ void ChargePoint::websocket_connected_callback(const int configuration_slot,
     if (this->registration_status == RegistrationStatusEnum::Accepted) {
         this->connectivity_manager->confirm_successful_connection();
 
-        if (this->time_disconnected.time_since_epoch() != 0s) {
+        if (const auto time_disconnected = this->connectivity_manager->get_time_disconnected();
+            time_disconnected.has_value()) {
             // handle offline threshold
             //  Get the current time point using steady_clock
-            auto offline_duration = std::chrono::steady_clock::now() - this->time_disconnected;
+            const auto offline_duration = std::chrono::steady_clock::now() - *time_disconnected;
 
             // B04.FR.01
             // If offline period exceeds offline threshold then send the status notification for all connectors
@@ -1113,7 +1114,6 @@ void ChargePoint::websocket_connected_callback(const int configuration_slot,
             this->security->init_certificate_expiration_check_timers(); // re-init as timers are stopped on disconnect
         }
     }
-    this->time_disconnected = std::chrono::time_point<std::chrono::steady_clock>();
 
     // We have a connection again so next time it fails we should send the notification again
     this->skip_invalid_csms_certificate_notifications = false;
@@ -1128,12 +1128,6 @@ void ChargePoint::websocket_disconnected_callback(const int configuration_slot,
                                                   const NetworkConnectionProfile& network_connection_profile) {
     this->message_queue->pause();
 
-    // check if offline threshold has been defined
-    if (this->device_model->get_value<int>(ControllerComponentVariables::OfflineThreshold) != 0) {
-        // Get the current time point using steady_clock
-        this->time_disconnected = std::chrono::steady_clock::now();
-    }
-
     this->security->stop_certificate_expiration_check_timers();
     if (this->callbacks.connection_state_changed_callback.has_value()) {
         this->callbacks.connection_state_changed_callback.value()(false, configuration_slot, network_connection_profile,

lib/everest/ocpp/lib/ocpp/v2/connectivity_manager.cpp

@@ -122,6 +122,10 @@ bool ConnectivityManager::is_websocket_connected() {
     return this->websocket != nullptr && this->websocket->is_connected();
 }
 
+std::optional<std::chrono::time_point<std::chrono::steady_clock>> ConnectivityManager::get_time_disconnected() const {
+    return this->time_disconnected;
+}
+
 void ConnectivityManager::connect(std::optional<std::int32_t> network_profile_slot) {
     if (this->network_connection_slots.empty()) {
         EVLOG_warning << "No network connection profiles configured, aborting websocket connection.";
@@ -401,6 +405,7 @@ void ConnectivityManager::on_websocket_connected(OcppProtocolVersion protocol) {
     const int actual_configuration_slot = get_active_network_configuration_slot();
     std::optional<NetworkConnectionProfile> network_connection_profile =
         this->get_network_connection_profile(actual_configuration_slot);
+    this->time_disconnected = std::nullopt;
 
     if (this->websocket_connected_callback.has_value() and network_connection_profile.has_value()) {
         this->websocket_connected_callback.value()(actual_configuration_slot, network_connection_profile.value(),
@@ -411,6 +416,9 @@ void ConnectivityManager::on_websocket_connected(OcppProtocolVersion protocol) {
 void ConnectivityManager::on_websocket_disconnected() {
     std::optional<NetworkConnectionProfile> network_connection_profile =
         this->get_network_connection_profile(this->get_active_network_configuration_slot());
+    if (!this->time_disconnected.has_value()) {
+        this->time_disconnected = std::chrono::steady_clock::now();
+    }
 
     if (this->websocket_disconnected_callback.has_value() and network_connection_profile.has_value()) {
         this->websocket_disconnected_callback.value()(this->get_active_network_configuration_slot(),

lib/everest/ocpp/tests/lib/ocpp/v2/mocks/connectivity_manager_mock.hpp

@@ -24,6 +24,7 @@ class ConnectivityManagerMock : public ConnectivityManagerInterface {
                 (const));
     MOCK_METHOD(const std::vector<int>&, get_network_connection_slots, (), (const));
     MOCK_METHOD(bool, is_websocket_connected, ());
+    MOCK_METHOD(std::optional<std::chrono::time_point<std::chrono::steady_clock>>, get_time_disconnected, (), (const));
     MOCK_METHOD(void, connect, (std::optional<std::int32_t> network_profile_slot));
     MOCK_METHOD(void, disconnect, ());
     MOCK_METHOD(bool, send_to_websocket, (const std::string& message));