Rework mDNS configuration

Author: dshil

components/ocs_pipeline/config/mdns_config.cpp

@@ -67,6 +67,15 @@ status::StatusCode MdnsConfig::configure(const char* hostname) {
     return status::StatusCode::NotModified;
 }
 
+status::StatusCode MdnsConfig::reset() {
+    auto code = storage_->erase(hostname_key_);
+    if (code == status::StatusCode::NoData) {
+        code = status::StatusCode::NotModified;
+    }
+
+    return code;
+}
+
 } // namespace config
 } // namespace pipeline
 } // namespace ocs

components/ocs_pipeline/config/mdns_config.h

@@ -32,6 +32,9 @@ class MdnsConfig : public core::NonCopyable<> {
     //! Update mDNS configuration.
     status::StatusCode configure(const char* hostname);
 
+    //! Reset mDNS configuration.
+    status::StatusCode reset();
+
 private:
     static constexpr const char* hostname_key_ = "host";
 

components/ocs_pipeline/httpserver/mdns_handler.cpp

@@ -8,9 +8,6 @@
 
 #include <cstring>
 
-#include "ocs_fmt/json/cjson_builder.h"
-#include "ocs_fmt/json/cjson_object_formatter.h"
-#include "ocs_fmt/json/dynamic_formatter.h"
 #include "ocs_pipeline/httpserver/mdns_handler.h"
 
 namespace ocs {
@@ -22,62 +19,44 @@ MdnsHandler::MdnsHandler(http::Server& server,
                          scheduler::ITask& reboot_task)
     : config_(config)
     , reboot_task_(reboot_task) {
-    server.add_GET("/api/v1/system/mdns", [this](httpd_req_t* req) {
+    server.add_GET("/api/v1/config/mdns", [this](httpd_req_t* req) {
         const auto values = algo::UriOps::parse_query(req->uri);
         if (!values.size()) {
-            return handle_mdns_get_(req);
+            return status::StatusCode::InvalidArg;
         }
 
-        return handle_mdns_set_(req, values);
+        return handle_update_(req, values);
     });
 }
 
-status::StatusCode MdnsHandler::handle_mdns_get_(httpd_req_t* req) {
-    fmt::json::CjsonUniqueBuilder builder;
+status::StatusCode MdnsHandler::handle_update_(httpd_req_t* req,
+                                               const algo::UriOps::Values& values) {
+    status::StatusCode code = status::StatusCode::OK;
 
-    auto json = builder.make_object();
-    if (!json) {
-        return status::StatusCode::NoMem;
-    }
-
-    fmt::json::CjsonObjectFormatter formatter(json.get());
-    if (!formatter.add_string_ref_cs("hostname", config_.get_hostname())) {
-        return status::StatusCode::NoMem;
-    }
-
-    fmt::json::DynamicFormatter json_formatter(64);
-    const auto code = json_formatter.format(json.get());
-    if (code != status::StatusCode::OK) {
-        return code;
-    }
-
-    auto err = httpd_resp_set_type(req, HTTPD_TYPE_JSON);
-    if (err != ESP_OK) {
-        return status::StatusCode::Error;
-    }
-
-    err = httpd_resp_send(req, json_formatter.c_str(), HTTPD_RESP_USE_STRLEN);
-    if (err != ESP_OK) {
-        return status::StatusCode::Error;
-    }
-
-    return status::StatusCode::OK;
-}
+    const auto reset = values.find("reset");
+    if (reset != values.end()) {
+        if (reset->second != "1") {
+            return status::StatusCode::InvalidArg;
+        }
 
-status::StatusCode MdnsHandler::handle_mdns_set_(httpd_req_t* req,
-                                                 const algo::UriOps::Values& values) {
-    const auto hostname = values.find("hostname");
-    if (hostname == values.end()) {
-        return status::StatusCode::InvalidArg;
-    }
+        code = config_.reset();
+        if (code != status::StatusCode::OK && code != status::StatusCode::NotModified) {
+            return code;
+        }
+    } else {
+        const auto hostname = values.find("hostname");
+        if (hostname == values.end()) {
+            return status::StatusCode::InvalidArg;
+        }
 
-    char hostname_buf[hostname->second.size() + 1];
-    memset(hostname_buf, 0, sizeof(hostname_buf));
-    memcpy(hostname_buf, hostname->second.data(), hostname->second.size());
+        char hostname_buf[hostname->second.size() + 1];
+        memset(hostname_buf, 0, sizeof(hostname_buf));
+        memcpy(hostname_buf, hostname->second.data(), hostname->second.size());
 
-    const auto code = config_.configure(hostname_buf);
-    if (code != status::StatusCode::OK && code != status::StatusCode::NotModified) {
-        return code;
+        code = config_.configure(hostname_buf);
+        if (code != status::StatusCode::OK && code != status::StatusCode::NotModified) {
+            return code;
+        }
     }
 
     auto err = httpd_resp_set_type(req, HTTPD_TYPE_TEXT);

components/ocs_pipeline/httpserver/mdns_handler.h

@@ -31,8 +31,7 @@ class MdnsHandler : public core::NonCopyable<> {
                 scheduler::ITask& reboot_task);
 
 private:
-    status::StatusCode handle_mdns_get_(httpd_req_t*);
-    status::StatusCode handle_mdns_set_(httpd_req_t*, const algo::UriOps::Values&);
+    status::StatusCode handle_update_(httpd_req_t*, const algo::UriOps::Values&);
 
     config::MdnsConfig& config_;
     scheduler::ITask& reboot_task_;

docs/httpserver.md

@@ -169,19 +169,17 @@ http "bonsai-firmware.local/api/v1/system/time?value=1733233869"
 OK
 ```
 
-**Get mDNS configuration**
+**Set mDNS configuration**
 
-http "bonsai-firmware.local/api/v1/system/mdns"
+http "bonsai-firmware.local/api/v1/config/mdns?hostname=test-lab"
 
-```json
-{
-    "hostname": "bonsai-firmware"
-}
+```txt
+OK
 ```
 
-**Set mDNS configuration**
+**Reset mDNS configuration**
 
-http "bonsai-firmware.local/api/v1/system/mdns?hostname=test-lab"
+http "bonsai-firmware.local/api/v1/config/mdns?reset=1
 
 ```txt
 OK