[wip] Add a future return for the configure network connection callback

Signed-off-by: Soumya Subramanya <s.subramanya@alfen.com>

Author: SNSubramanya

include/ocpp/v201/charge_point.hpp

@@ -174,8 +174,10 @@ struct Callbacks {
     std::optional<std::function<SetNetworkProfileStatusEnum(
         const int32_t configuration_slot, const NetworkConnectionProfile& network_connection_profile)>>
         validate_network_profile_callback;
-    std::optional<std::function<bool(const NetworkConnectionProfile& network_connection_profile,
-                                     std::promise<int>& network_promise)>>
+
+    /// @brief register a \p cllback that is called when the network connection profile is to be configured.
+    std::optional<
+        std::function<std::future<ConfigNetworkResult>(const NetworkConnectionProfile& network_connection_profile)>>
         configure_network_connection_profile_callback;
 };
 

include/ocpp/v201/ocpp_types.hpp

@@ -861,6 +861,10 @@ void from_json(const json& j, NetworkConnectionProfile& k);
 /// \returns an output stream with the NetworkConnectionProfile written to
 std::ostream& operator<<(std::ostream& os, const NetworkConnectionProfile& k);
 
+struct ConfigNetworkResult {
+    std::optional<CiString<32>> interface_adress;
+    bool success;
+};
 struct SetMonitoringData {
     float value;
     MonitorEnum type;

lib/ocpp/v201/charge_point.cpp

@@ -648,9 +648,6 @@ bool ChargePoint::send(CallError call_error) {
 }
 
 void ChargePoint::init_websocket() {
-
-    std::promise<int> network_promise;
-
     if (this->device_model->get_value<std::string>(ControllerComponentVariables::ChargePointId).find(':') !=
         std::string::npos) {
         EVLOG_AND_THROW(std::runtime_error("ChargePointId must not contain \':\'"));
@@ -663,10 +660,28 @@ void ChargePoint::init_websocket() {
     const auto connection_options = this->get_ws_connection_options(std::stoi(configuration_slot));
     const auto network_connection_profile = this->get_network_connection_profile(std::stoi(configuration_slot));
 
-    if (!network_connection_profile.has_value() or
-        (this->callbacks.configure_network_connection_profile_callback.has_value() and
-         !this->callbacks.configure_network_connection_profile_callback.value()(network_connection_profile.value(),
-                                                                                network_promise))) {
+    if (this->callbacks.configure_network_connection_profile_callback.has_value() and network_connection_profile) {
+        auto config_status = this->callbacks.configure_network_connection_profile_callback.value()(
+            network_connection_profile.value()); /*  */
+
+        if (config_status.wait_for(5s) == std::future_status::timeout) {
+            EVLOG_info << " timeout!!!";
+            EVLOG_warning
+                << "NetworkConnectionProfile could not be retrieved or configuration of network with the given "
+                   "profile failed";
+            this->websocket_timer.timeout(
+                [this]() {
+                    this->next_network_configuration_priority();
+                    this->start_websocket();
+                },
+                WEBSOCKET_INIT_DELAY);
+            return;
+        } else if (config_status.wait_for(5s) == std::future_status::timeout) {
+            ; // do nothing?
+        } else {
+            EVLOG_info << "config status -------> :  " << config_status.get().success;
+        }
+    } else {
         EVLOG_warning << "NetworkConnectionProfile could not be retrieved or configuration of network with the given "
                          "profile failed";
         this->websocket_timer.timeout(
@@ -677,9 +692,6 @@ void ChargePoint::init_websocket() {
             WEBSOCKET_INIT_DELAY);
         return;
     }
-
-    EVLOG_info << "connection profile value: -> " << network_promise.get_future().get();
-    
     const auto& security_profile_cv = ControllerComponentVariables::SecurityProfile;
     if (security_profile_cv.variable.has_value()) {
         this->device_model->set_read_only_value(security_profile_cv.component, security_profile_cv.variable.value(),
@@ -698,8 +710,7 @@ void ChargePoint::init_websocket() {
         }
 
         // call the registered websocket connected callback if it exists
-        if(this->callbacks.websocket_connected_callback.has_value())
-        {
+        if (this->callbacks.websocket_connected_callback.has_value()) {
             this->callbacks.websocket_connected_callback.value()(network_connection_profile);
         }
 
@@ -735,9 +746,8 @@ void ChargePoint::init_websocket() {
             // Get the current time point using steady_clock
             this->time_disconnected = std::chrono::steady_clock::now();
         }
-        //call the disconnected callback if it exists
-        if(this->callbacks.websocket_disconnected_callback.has_value())
-        {
+        // call the disconnected callback if it exists
+        if (this->callbacks.websocket_disconnected_callback.has_value()) {
             this->callbacks.websocket_disconnected_callback.value();
         }
         this->client_certificate_expiration_check_timer.stop();