Redo ap settings to rest and proto

esp32/src/ap_service.cpp

@@ -5,6 +5,9 @@ static const char *TAG = "APService";
 
 APService::APService()
     : endpoint(APSettings::read, APSettings::update, this),
+      protoEndpoint(APSettings::readProto, APSettings::updateProto, this,
+                    API_REQUEST_EXTRACTOR(ap_settings, api_APSettings),
+                    API_RESPONSE_ASSIGNER(ap_settings, api_APSettings)),
       _persistence(APSettings::read, APSettings::update, this, AP_SETTINGS_FILE) {
     addUpdateHandler([&](const std::string &originId) { reconfigureAP(); }, false);
 }
@@ -27,6 +30,23 @@ void APService::status(JsonObject &root) {
     root["station_num"] = WiFi.softAPgetStationNum();
 }
 
+esp_err_t APService::getStatusProto(httpd_req_t *request) {
+    api_Response res = api_Response_init_zero;
+    res.status_code = 200;
+    res.which_payload = api_Response_ap_status_tag;
+    statusProto(res.payload.ap_status);
+    return NativeServer::sendProto(request, 200, res, api_Response_fields);
+}
+
+void APService::statusProto(api_APStatus &proto) {
+    proto.status = static_cast<api_APNetworkStatus>(getAPNetworkStatus());
+    proto.ip_address = static_cast<uint32_t>(WiFi.softAPIP());
+    String mac = WiFi.softAPmacAddress();
+    strncpy(proto.mac_address, mac.c_str(), sizeof(proto.mac_address) - 1);
+    proto.mac_address[sizeof(proto.mac_address) - 1] = '\0';
+    proto.station_num = WiFi.softAPgetStationNum();
+}
+
 APNetworkStatus APService::getAPNetworkStatus() {
     WiFiMode_t currentWiFiMode = WiFi.getMode();
     bool apActive = currentWiFiMode == WIFI_AP || currentWiFiMode == WIFI_AP_STA;

esp32/src/communication/webserver.cpp

@@ -72,6 +72,9 @@ esp_err_t WebServer::httpHandler(httpd_req_t* req) {
             if (route.getHandler) {
                 return route.getHandler(req);
             }
+            if (route.rawHandler) {
+                return route.rawHandler(req);
+            }
             if (route.postHandler) {
                 char* content = nullptr;
                 size_t contentLen = req->content_len;
@@ -187,6 +190,7 @@ void WebServer::on(const char* uri, httpd_method_t method, HttpGetHandler handle
     route.method = method;
     route.getHandler = handler;
     route.postHandler = nullptr;
+    route.rawHandler = nullptr;
     route.isWebsocket = false;
     routes_.push_back(route);
 
@@ -201,6 +205,22 @@ void WebServer::on(const char* uri, httpd_method_t method, HttpPostHandler handl
     route.method = method;
     route.getHandler = nullptr;
     route.postHandler = handler;
+    route.rawHandler = nullptr;
+    route.isWebsocket = false;
+    routes_.push_back(route);
+
+    if (server_) {
+        registerRoute(route);
+    }
+}
+
+void NativeServer::onRaw(const char* uri, httpd_method_t method, HttpRawHandler handler) {
+    HttpRoute route;
+    route.uri = uri;
+    route.method = method;
+    route.getHandler = nullptr;
+    route.postHandler = nullptr;
+    route.rawHandler = handler;
     route.isWebsocket = false;
     routes_.push_back(route);
 
@@ -226,6 +246,7 @@ void WebServer::registerWebsocket(const char* uri) {
     route.method = HTTP_GET;
     route.getHandler = nullptr;
     route.postHandler = nullptr;
+    route.rawHandler = nullptr;
     route.isWebsocket = true;
     routes_.push_back(route);
 
@@ -300,3 +321,13 @@ esp_err_t WebServer::sendError(httpd_req_t* req, int status, const char* message
 }
 
 esp_err_t WebServer::sendOk(httpd_req_t* req) { return sendJson(req, 200, "{\"status\":\"ok\"}"); }
+
+esp_err_t WebServer::sendProto(httpd_req_t* req, int status, const uint8_t* data, size_t len) {
+    httpd_resp_set_status(req, status == 200   ? "200 OK"
+                               : status == 400 ? "400 Bad Request"
+                               : status == 404 ? "404 Not Found"
+                               : status == 500 ? "500 Internal Server Error"
+                                               : "200 OK");
+    httpd_resp_set_type(req, "application/x-protobuf");
+    return httpd_resp_send(req, (const char*)data, len);
+}

esp32/src/main.cpp

@@ -73,12 +73,12 @@ void setupServer() {
     server.on("/api/wifi/networks", HTTP_GET, [&](httpd_req_t *request) { return wifiService.getNetworks(request); });
     server.on("/api/wifi/sta/status", HTTP_GET,
               [&](httpd_req_t *request) { return wifiService.getNetworkStatus(request); });
-
-    server.on("/api/ap/status", HTTP_GET, [&](httpd_req_t *request) { return apService.getStatus(request); });
-    server.on("/api/ap/settings", HTTP_GET, [&](httpd_req_t *request) { return apService.endpoint.getState(request); });
-    server.on("/api/ap/settings", HTTP_POST, [&](httpd_req_t *request, JsonVariant &json) {
-        return apService.endpoint.handleStateUpdate(request, json);
-    });
+	
+    server.on("/api/ap/status", HTTP_GET, [&](httpd_req_t *request) { return apService.getStatusProto(request); });
+    server.on("/api/ap/settings", HTTP_GET,
+                    [&](httpd_req_t *request) { return apService.protoEndpoint.getState(request); });
+    server.onRaw("/api/ap/settings", HTTP_POST,
+                       [&](httpd_req_t *request) { return apService.protoEndpoint.handleStateUpdate(request); });
 
     server.on("/api/peripherals", HTTP_GET,
               [&](httpd_req_t *request) { return peripherals.endpoint.getState(request); });