Darkages/SpotMicroESP32-Leika
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎨 Renames webserver and websocket

Browse Source
This commit is contained in:
Rune Harlyk
2026-01-24 13:11:53 +01:00
committed by Rune Harlyk
parent eb8b83736a
commit f033e8b0ae
15 changed files with 131 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esp32/include/communication/native_server.h → esp32/include/communication/webserver.h
+4 -4
View File
@@ -21,10 +21,10 @@ struct HttpRoute {
bool isWebsocket;
};
class NativeServer {
class WebServer {
public:
NativeServer();
~NativeServer();
WebServer();
~WebServer();
void config(size_t maxUriHandlers, size_t stackSize);
esp_err_t listen(uint16_t port);
@@ -72,4 +72,4 @@ class NativeServer {
esp_err_t registerRoute(const HttpRoute& route);
};
extern NativeServer nativeServer;
extern WebServer server;
esp32/include/communication/native_websocket.h → esp32/include/communication/websocket.h
+4 -4
View File
@@ -1,17 +1,17 @@
#pragma once
#include <Arduino.h>
#include <communication/native_server.h>
#include <communication/webserver.h>
#include <communication/comm_base.hpp>
class NativeWebsocket : public CommAdapterBase {
class Websocket : public CommAdapterBase {
public:
NativeWebsocket(NativeServer& server, const char* route = "/api/ws");
Websocket(WebServer& server, const char* route = "/api/ws");
void begin() override;
private:
NativeServer& server_;
WebServer& server_;
const char* route_;
void onWsOpen(httpd_req_t* req);
esp32/include/template/stateful_endpoint.h
+4 -4
View File
@@ -3,7 +3,7 @@
#include <esp_http_server.h>
#include <ArduinoJson.h>
#include <template/stateful_service.h>
#include <communication/native_server.h>
#include <communication/webserver.h>
#include <functional>
@@ -27,7 +27,7 @@ class StatefulHttpEndpoint {
StateUpdateResult outcome = _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
if (outcome == StateUpdateResult::ERROR) {
return NativeServer::sendError(request, 400, "Invalid state");
return WebServer::sendError(request, 400, "Invalid state");
} else if ((outcome == StateUpdateResult::CHANGED)) {
_statefulService->callUpdateHandlers(HTTP_ENDPOINT_ORIGIN_ID);
}
@@ -35,13 +35,13 @@ class StatefulHttpEndpoint {
JsonDocument doc;
JsonVariant root = doc.to<JsonVariant>();
_statefulService->read(root, _stateReader);
return NativeServer::sendJson(request, 200, doc);
return WebServer::sendJson(request, 200, doc);
}
esp_err_t getState(httpd_req_t *request) {
JsonDocument doc;
JsonVariant root = doc.to<JsonVariant>();
_statefulService->read(root, _stateReader);
return NativeServer::sendJson(request, 200, doc);
return WebServer::sendJson(request, 200, doc);
}
};
esp32/include/www_mount.hpp
+2 -2
View File
@@ -1,5 +1,5 @@
#pragma once
#include <communication/native_server.h>
#include <communication/webserver.h>
#include "WWWData.h"
void mountStaticAssets(NativeServer& s);
void mountStaticAssets(WebServer& s);
esp32/src/ap_service.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
#include <ap_service.h>
#include <communication/native_server.h>
#include <communication/webserver.h>
static const char *TAG = "APService";
@@ -17,7 +17,7 @@ esp_err_t APService::getStatus(httpd_req_t *request) {
JsonDocument doc;
JsonObject root = doc.to<JsonObject>();
status(root);
return NativeServer::sendJson(request, 200, doc);
return WebServer::sendJson(request, 200, doc);
}
void APService::status(JsonObject &root) {
esp32/src/communication/native_server.cpp → esp32/src/communication/webserver.cpp
+30 -30
View File
@@ -1,30 +1,30 @@
#include <communication/native_server.h>
#include <communication/webserver.h>
#include <esp_log.h>
#include <cstring>
#include <algorithm>
static const char* TAG = "NativeServer";
static const char* TAG = "WebServer";
NativeServer nativeServer;
WebServer server;
NativeServer::NativeServer() {
WebServer::WebServer() {
config_ = HTTPD_DEFAULT_CONFIG();
wsMutex_ = xSemaphoreCreateMutex();
}
NativeServer::~NativeServer() {
WebServer::~WebServer() {
stop();
vSemaphoreDelete(wsMutex_);
}
void NativeServer::config(size_t maxUriHandlers, size_t stackSize) {
void WebServer::config(size_t maxUriHandlers, size_t stackSize) {
config_.max_uri_handlers = maxUriHandlers;
config_.stack_size = stackSize;
config_.max_resp_headers = 16;
config_.lru_purge_enable = true;
}
esp_err_t NativeServer::listen(uint16_t port) {
esp_err_t WebServer::listen(uint16_t port) {
config_.server_port = port;
config_.ctrl_port = port + 32768;
@@ -38,23 +38,23 @@ esp_err_t NativeServer::listen(uint16_t port) {
return ESP_OK;
}
void NativeServer::stop() {
void WebServer::stop() {
if (server_) {
httpd_stop(server_);
server_ = nullptr;
}
}
void NativeServer::applyDefaultHeaders(httpd_req_t* req) {
void WebServer::applyDefaultHeaders(httpd_req_t* req) {
for (const auto& [key, value] : defaultHeaders_) {
httpd_resp_set_hdr(req, key.c_str(), value.c_str());
}
}
void NativeServer::addDefaultHeader(const char* key, const char* value) { defaultHeaders_[key] = value; }
void WebServer::addDefaultHeader(const char* key, const char* value) { defaultHeaders_[key] = value; }
esp_err_t NativeServer::httpHandler(httpd_req_t* req) {
NativeServer* self = static_cast<NativeServer*>(req->user_ctx);
esp_err_t WebServer::httpHandler(httpd_req_t* req) {
WebServer* self = static_cast<WebServer*>(req->user_ctx);
self->applyDefaultHeaders(req);
for (const auto& route : self->routes_) {
@@ -120,8 +120,8 @@ esp_err_t NativeServer::httpHandler(httpd_req_t* req) {
return ESP_FAIL;
}
esp_err_t NativeServer::wsHandler(httpd_req_t* req) {
NativeServer* self = static_cast<NativeServer*>(req->user_ctx);
esp_err_t WebServer::wsHandler(httpd_req_t* req) {
WebServer* self = static_cast<WebServer*>(req->user_ctx);
if (req->method == HTTP_GET) {
int sockfd = httpd_req_to_sockfd(req);
@@ -181,7 +181,7 @@ esp_err_t NativeServer::wsHandler(httpd_req_t* req) {
return result;
}
void NativeServer::on(const char* uri, httpd_method_t method, HttpGetHandler handler) {
void WebServer::on(const char* uri, httpd_method_t method, HttpGetHandler handler) {
HttpRoute route;
route.uri = uri;
route.method = method;
@@ -195,7 +195,7 @@ void NativeServer::on(const char* uri, httpd_method_t method, HttpGetHandler han
}
}
void NativeServer::on(const char* uri, httpd_method_t method, HttpPostHandler handler) {
void WebServer::on(const char* uri, httpd_method_t method, HttpPostHandler handler) {
HttpRoute route;
route.uri = uri;
route.method = method;
@@ -209,7 +209,7 @@ void NativeServer::on(const char* uri, httpd_method_t method, HttpPostHandler ha
}
}
esp_err_t NativeServer::registerRoute(const HttpRoute& route) {
esp_err_t WebServer::registerRoute(const HttpRoute& route) {
httpd_uri_t httpd_route = {.uri = route.uri.c_str(),
.method = route.method,
.handler = route.isWebsocket ? wsHandler : httpHandler,
@@ -220,7 +220,7 @@ esp_err_t NativeServer::registerRoute(const HttpRoute& route) {
return httpd_register_uri_handler(server_, &httpd_route);
}
void NativeServer::registerWebsocket(const char* uri) {
void WebServer::registerWebsocket(const char* uri) {
HttpRoute route;
route.uri = uri;
route.method = HTTP_GET;
@@ -234,32 +234,32 @@ void NativeServer::registerWebsocket(const char* uri) {
}
}
void NativeServer::onWsFrame(WsFrameHandler handler) { wsFrameHandler_ = handler; }
void WebServer::onWsFrame(WsFrameHandler handler) { wsFrameHandler_ = handler; }
void NativeServer::onWsOpen(WsOpenHandler handler) { wsOpenHandler_ = handler; }
void WebServer::onWsOpen(WsOpenHandler handler) { wsOpenHandler_ = handler; }
void NativeServer::onWsClose(WsCloseHandler handler) { wsCloseHandler_ = handler; }
void WebServer::onWsClose(WsCloseHandler handler) { wsCloseHandler_ = handler; }
void NativeServer::addWsClient(int sockfd) {
void WebServer::addWsClient(int sockfd) {
xSemaphoreTake(wsMutex_, portMAX_DELAY);
wsClients_.push_back(sockfd);
xSemaphoreGive(wsMutex_);
}
void NativeServer::removeWsClient(int sockfd) {
void WebServer::removeWsClient(int sockfd) {
xSemaphoreTake(wsMutex_, portMAX_DELAY);
wsClients_.erase(std::remove(wsClients_.begin(), wsClients_.end(), sockfd), wsClients_.end());
xSemaphoreGive(wsMutex_);
}
std::vector<int> NativeServer::getWsClients() {
std::vector<int> WebServer::getWsClients() {
xSemaphoreTake(wsMutex_, portMAX_DELAY);
std::vector<int> clients = wsClients_;
xSemaphoreGive(wsMutex_);
return clients;
}
esp_err_t NativeServer::wsSend(int sockfd, const uint8_t* data, size_t len) {
esp_err_t WebServer::wsSend(int sockfd, const uint8_t* data, size_t len) {
httpd_ws_frame_t frame = {.final = true,
.fragmented = false,
.type = HTTPD_WS_TYPE_BINARY,
@@ -268,7 +268,7 @@ esp_err_t NativeServer::wsSend(int sockfd, const uint8_t* data, size_t len) {
return httpd_ws_send_frame_async(server_, sockfd, &frame);
}
esp_err_t NativeServer::wsSendAll(const uint8_t* data, size_t len) {
esp_err_t WebServer::wsSendAll(const uint8_t* data, size_t len) {
xSemaphoreTake(wsMutex_, portMAX_DELAY);
for (int sockfd : wsClients_) {
wsSend(sockfd, data, len);
@@ -277,7 +277,7 @@ esp_err_t NativeServer::wsSendAll(const uint8_t* data, size_t len) {
return ESP_OK;
}
esp_err_t NativeServer::sendJson(httpd_req_t* req, int status, const char* json) {
esp_err_t WebServer::sendJson(httpd_req_t* req, int status, const char* json) {
httpd_resp_set_status(req, status == 200 ? "200 OK"
: status == 400 ? "400 Bad Request"
: status == 404 ? "404 Not Found"
@@ -287,16 +287,16 @@ esp_err_t NativeServer::sendJson(httpd_req_t* req, int status, const char* json)
return httpd_resp_send(req, json, strlen(json));
}
esp_err_t NativeServer::sendJson(httpd_req_t* req, int status, JsonDocument& doc) {
esp_err_t WebServer::sendJson(httpd_req_t* req, int status, JsonDocument& doc) {
std::string json;
serializeJson(doc, json);
return sendJson(req, status, json.c_str());
}
esp_err_t NativeServer::sendError(httpd_req_t* req, int status, const char* message) {
esp_err_t WebServer::sendError(httpd_req_t* req, int status, const char* message) {
JsonDocument doc;
doc["error"] = message;
return sendJson(req, status, doc);
}
esp_err_t NativeServer::sendOk(httpd_req_t* req) { return sendJson(req, 200, "{\"status\":\"ok\"}"); }
esp_err_t WebServer::sendOk(httpd_req_t* req) { return sendJson(req, 200, "{\"status\":\"ok\"}"); }
esp32/src/communication/native_websocket.cpp → esp32/src/communication/websocket.cpp
+8 -8
View File
@@ -1,29 +1,29 @@
#include <communication/native_websocket.h>
#include <communication/websocket.h>
#include <esp_log.h>
static const char* TAG = "NativeWebsocket";
static const char* TAG = "Websocket";
NativeWebsocket::NativeWebsocket(NativeServer& server, const char* route) : server_(server), route_(route) {}
Websocket::Websocket(WebServer& server, const char* route) : server_(server), route_(route) {}
void NativeWebsocket::begin() {
void Websocket::begin() {
server_.onWsOpen([this](httpd_req_t* req) { onWsOpen(req); });
server_.onWsClose([this](int sockfd) { onWsClose(sockfd); });
server_.onWsFrame([this](httpd_req_t* req, httpd_ws_frame_t* frame) { return onFrame(req, frame); });
server_.registerWebsocket(route_);
}
void NativeWebsocket::onWsOpen(httpd_req_t* req) {
void Websocket::onWsOpen(httpd_req_t* req) {
int sockfd = httpd_req_to_sockfd(req);
ESP_LOGI(TAG, "Client connected: %d", sockfd);
sendPong(sockfd);
}
void NativeWebsocket::onWsClose(int sockfd) {
void Websocket::onWsClose(int sockfd) {
ESP_LOGI(TAG, "Client disconnected: %d", sockfd);
removeClient(sockfd);
}
esp_err_t NativeWebsocket::onFrame(httpd_req_t* req, httpd_ws_frame_t* frame) {
esp_err_t Websocket::onFrame(httpd_req_t* req, httpd_ws_frame_t* frame) {
if (frame->type != HTTPD_WS_TYPE_BINARY) {
ESP_LOGW(TAG, "Expected binary frame, got type %d", frame->type);
return ESP_OK;
@@ -34,7 +34,7 @@ esp_err_t NativeWebsocket::onFrame(httpd_req_t* req, httpd_ws_frame_t* frame) {
return ESP_OK;
}
void NativeWebsocket::send(const uint8_t* data, size_t len, int cid) {
void Websocket::send(const uint8_t* data, size_t len, int cid) {
if (cid >= 0) {
esp_err_t err = server_.wsSend(cid, data, len);
if (err != ESP_OK) {
esp32/src/features.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
#include <features.h>
#include <communication/native_server.h>
#include <communication/webserver.h>
namespace feature_service {
@@ -61,7 +61,7 @@ esp_err_t getFeatures(httpd_req_t* request) {
JsonDocument doc;
JsonObject root = doc.to<JsonObject>();
features(root);
return NativeServer::sendJson(request, 200, doc);
return WebServer::sendJson(request, 200, doc);
}
} // namespace feature_service
esp32/src/filesystem.cpp
+9 -10
View File
@@ -1,5 +1,5 @@
#include <filesystem.h>
#include <communication/native_server.h>
#include <communication/webserver.h>
static const char *TAG = "FileService";
@@ -15,11 +15,11 @@ esp_err_t getConfigFile(httpd_req_t *request) {
const char *uri = request->uri;
std::string path = "/config" + std::string(uri).substr(11);
if (!ESP_FS.exists(path.c_str())) {
return NativeServer::sendError(request, 404, "File not found");
return WebServer::sendError(request, 404, "File not found");
}
File file = ESP_FS.open(path.c_str(), "r");
if (!file) {
return NativeServer::sendError(request, 500, "Failed to open file");
return WebServer::sendError(request, 500, "Failed to open file");
}
String content = file.readString();
file.close();
@@ -31,10 +31,9 @@ esp_err_t handleDelete(httpd_req_t *request, JsonVariant &json) {
if (json.is<JsonObject>()) {
const char *filename = json["file"].as<const char *>();
ESP_LOGI(TAG, "Deleting file: %s", filename);
return deleteFile(filename) ? NativeServer::sendOk(request)
: NativeServer::sendError(request, 500, "Delete failed");
return deleteFile(filename) ? WebServer::sendOk(request) : WebServer::sendError(request, 500, "Delete failed");
}
return NativeServer::sendError(request, 400, "Invalid request");
return WebServer::sendError(request, 400, "Invalid request");
}
esp_err_t handleEdit(httpd_req_t *request, JsonVariant &json) {
@@ -42,10 +41,10 @@ esp_err_t handleEdit(httpd_req_t *request, JsonVariant &json) {
const char *filename = json["file"].as<const char *>();
const char *content = json["content"].as<const char *>();
ESP_LOGI(TAG, "Editing file: %s", filename);
return editFile(filename, content) ? NativeServer::sendOk(request)
: NativeServer::sendError(request, 500, "Edit failed");
return editFile(filename, content) ? WebServer::sendOk(request)
: WebServer::sendError(request, 500, "Edit failed");
}
return NativeServer::sendError(request, 400, "Invalid request");
return WebServer::sendError(request, 400, "Invalid request");
}
bool deleteFile(const char *filename) { return ESP_FS.remove(filename); }
@@ -92,7 +91,7 @@ bool editFile(const char *filename, const char *content) {
esp_err_t mkdir(httpd_req_t *request, JsonVariant &json) {
const char *path = json["path"].as<const char *>();
ESP_LOGI(TAG, "Creating directory: %s", path);
return ESP_FS.mkdir(path) ? NativeServer::sendOk(request) : NativeServer::sendError(request, 500, "mkdir failed");
return ESP_FS.mkdir(path) ? WebServer::sendOk(request) : WebServer::sendError(request, 500, "mkdir failed");
}
} // namespace FileSystem
esp32/src/main.cpp
+53 -57
View File
@@ -10,8 +10,8 @@
#include <peripherals/servo_controller.h>
#include <peripherals/led_service.h>
#include <peripherals/camera_service.h>
#include <communication/native_server.h>
#include <communication/native_websocket.h>
#include <communication/webserver.h>
#include <communication/websocket.h>
#include <features.h>
#include <motion.h>
#include <wifi_service.h>
@@ -21,7 +21,7 @@
#include <www_mount.hpp>
NativeWebsocket socket {nativeServer, "/api/ws"};
Websocket socket {server, "/api/ws"};
Peripherals peripherals;
ServoController servoController;
@@ -40,87 +40,83 @@ WiFiService wifiService;
APService apService;
void setupServer() {
nativeServer.config(50 + WWW_ASSETS_COUNT, 32768);
nativeServer.listen(80);
server.config(50 + WWW_ASSETS_COUNT, 32768);
server.listen(80);
nativeServer.on("/api/system/reset", HTTP_POST,
[&](httpd_req_t *request, JsonVariant &json) { return system_service::handleReset(request); });
nativeServer.on("/api/system/restart", HTTP_POST,
[&](httpd_req_t *request, JsonVariant &json) { return system_service::handleRestart(request); });
nativeServer.on("/api/system/sleep", HTTP_POST,
[&](httpd_req_t *request, JsonVariant &json) { return system_service::handleSleep(request); });
server.on("/api/system/reset", HTTP_POST,
[&](httpd_req_t *request, JsonVariant &json) { return system_service::handleReset(request); });
server.on("/api/system/restart", HTTP_POST,
[&](httpd_req_t *request, JsonVariant &json) { return system_service::handleRestart(request); });
server.on("/api/system/sleep", HTTP_POST,
[&](httpd_req_t *request, JsonVariant &json) { return system_service::handleSleep(request); });
#if USE_CAMERA
nativeServer.on("/api/camera/still", HTTP_GET,
[&](httpd_req_t *request) { return cameraService.cameraStill(request); });
nativeServer.on("/api/camera/stream", HTTP_GET,
[&](httpd_req_t *request) { return cameraService.cameraStream(request); });
nativeServer.on("/api/camera/settings", HTTP_GET,
[&](httpd_req_t *request) { return cameraService.endpoint.getState(request); });
nativeServer.on("/api/camera/settings", HTTP_POST, [&](httpd_req_t *request, JsonVariant &json) {
server.on("/api/camera/still", HTTP_GET, [&](httpd_req_t *request) { return cameraService.cameraStill(request); });
server.on("/api/camera/stream", HTTP_GET,
[&](httpd_req_t *request) { return cameraService.cameraStream(request); });
server.on("/api/camera/settings", HTTP_GET,
[&](httpd_req_t *request) { return cameraService.endpoint.getState(request); });
server.on("/api/camera/settings", HTTP_POST, [&](httpd_req_t *request, JsonVariant &json) {
return cameraService.endpoint.handleStateUpdate(request, json);
});
#endif
nativeServer.on("/api/servo/config", HTTP_GET,
[&](httpd_req_t *request) { return servoController.endpoint.getState(request); });
nativeServer.on("/api/servo/config", HTTP_POST, [&](httpd_req_t *request, JsonVariant &json) {
server.on("/api/servo/config", HTTP_GET,
[&](httpd_req_t *request) { return servoController.endpoint.getState(request); });
server.on("/api/servo/config", HTTP_POST, [&](httpd_req_t *request, JsonVariant &json) {
return servoController.endpoint.handleStateUpdate(request, json);
});
nativeServer.on("/api/wifi/sta/settings", HTTP_GET,
[&](httpd_req_t *request) { return wifiService.endpoint.getState(request); });
nativeServer.on("/api/wifi/sta/settings", HTTP_POST, [&](httpd_req_t *request, JsonVariant &json) {
server.on("/api/wifi/sta/settings", HTTP_GET,
[&](httpd_req_t *request) { return wifiService.endpoint.getState(request); });
server.on("/api/wifi/sta/settings", HTTP_POST, [&](httpd_req_t *request, JsonVariant &json) {
return wifiService.endpoint.handleStateUpdate(request, json);
});
nativeServer.on("/api/wifi/scan", HTTP_GET, [&](httpd_req_t *request) { return wifiService.handleScan(request); });
nativeServer.on("/api/wifi/networks", HTTP_GET,
[&](httpd_req_t *request) { return wifiService.getNetworks(request); });
nativeServer.on("/api/wifi/sta/status", HTTP_GET,
[&](httpd_req_t *request) { return wifiService.getNetworkStatus(request); });
server.on("/api/wifi/scan", HTTP_GET, [&](httpd_req_t *request) { return wifiService.handleScan(request); });
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); });
nativeServer.on("/api/ap/status", HTTP_GET, [&](httpd_req_t *request) { return apService.getStatus(request); });
nativeServer.on("/api/ap/settings", HTTP_GET,
[&](httpd_req_t *request) { return apService.endpoint.getState(request); });
nativeServer.on("/api/ap/settings", HTTP_POST, [&](httpd_req_t *request, JsonVariant &json) {
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);
});
nativeServer.on("/api/peripherals", HTTP_GET,
[&](httpd_req_t *request) { return peripherals.endpoint.getState(request); });
nativeServer.on("/api/peripherals", HTTP_POST, [&](httpd_req_t *request, JsonVariant &json) {
server.on("/api/peripherals", HTTP_GET,
[&](httpd_req_t *request) { return peripherals.endpoint.getState(request); });
server.on("/api/peripherals", HTTP_POST, [&](httpd_req_t *request, JsonVariant &json) {
return peripherals.endpoint.handleStateUpdate(request, json);
});
#if FT_ENABLED(USE_MDNS)
nativeServer.on("/api/mdns", HTTP_GET,
[&](httpd_req_t *request) { return mdnsService.endpoint.getState(request); });
nativeServer.on("/api/mdns", HTTP_POST, [&](httpd_req_t *request, JsonVariant &json) {
server.on("/api/mdns", HTTP_GET, [&](httpd_req_t *request) { return mdnsService.endpoint.getState(request); });
server.on("/api/mdns", HTTP_POST, [&](httpd_req_t *request, JsonVariant &json) {
return mdnsService.endpoint.handleStateUpdate(request, json);
});
nativeServer.on("/api/mdns/status", HTTP_GET, [&](httpd_req_t *request) { return mdnsService.getStatus(request); });
nativeServer.on("/api/mdns/query", HTTP_POST,
[&](httpd_req_t *request, JsonVariant &json) { return mdnsService.queryServices(request, json); });
server.on("/api/mdns/status", HTTP_GET, [&](httpd_req_t *request) { return mdnsService.getStatus(request); });
server.on("/api/mdns/query", HTTP_POST,
[&](httpd_req_t *request, JsonVariant &json) { return mdnsService.queryServices(request, json); });
#endif
nativeServer.on("/api/config/*", HTTP_GET, [](httpd_req_t *request) { return FileSystem::getConfigFile(request); });
nativeServer.on("/api/files", HTTP_GET, [&](httpd_req_t *request) { return FileSystem::getFiles(request); });
nativeServer.on("/api/files/delete", HTTP_POST,
[&](httpd_req_t *request, JsonVariant &json) { return FileSystem::handleDelete(request, json); });
nativeServer.on("/api/files/edit", HTTP_POST,
[&](httpd_req_t *request, JsonVariant &json) { return FileSystem::handleEdit(request, json); });
nativeServer.on("/api/files/mkdir", HTTP_POST,
[&](httpd_req_t *request, JsonVariant &json) { return FileSystem::mkdir(request, json); });
server.on("/api/config/*", HTTP_GET, [](httpd_req_t *request) { return FileSystem::getConfigFile(request); });
server.on("/api/files", HTTP_GET, [&](httpd_req_t *request) { return FileSystem::getFiles(request); });
server.on("/api/files/delete", HTTP_POST,
[&](httpd_req_t *request, JsonVariant &json) { return FileSystem::handleDelete(request, json); });
server.on("/api/files/edit", HTTP_POST,
[&](httpd_req_t *request, JsonVariant &json) { return FileSystem::handleEdit(request, json); });
server.on("/api/files/mkdir", HTTP_POST,
[&](httpd_req_t *request, JsonVariant &json) { return FileSystem::mkdir(request, json); });
#if EMBED_WEBAPP
mountStaticAssets(nativeServer);
mountStaticAssets(server);
#endif
nativeServer.on("/*", HTTP_OPTIONS, [](httpd_req_t *request) {
server.on("/*", HTTP_OPTIONS, [](httpd_req_t *request) {
httpd_resp_set_status(request, "200 OK");
return httpd_resp_send(request, nullptr, 0);
});
nativeServer.addDefaultHeader("Server", APP_NAME);
nativeServer.addDefaultHeader("Access-Control-Allow-Origin", "*");
nativeServer.addDefaultHeader("Access-Control-Allow-Headers", "Accept, Content-Type, Authorization");
nativeServer.addDefaultHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
nativeServer.addDefaultHeader("Access-Control-Max-Age", "86400");
server.addDefaultHeader("Server", APP_NAME);
server.addDefaultHeader("Access-Control-Allow-Origin", "*");
server.addDefaultHeader("Access-Control-Allow-Headers", "Accept, Content-Type, Authorization");
server.addDefaultHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
server.addDefaultHeader("Access-Control-Max-Age", "86400");
}
void setupEventSocket() {
esp32/src/mdns_service.cpp
+3 -3
View File
@@ -1,5 +1,5 @@
#include <mdns_service.h>
#include <communication/native_server.h>
#include <communication/webserver.h>
static const char *TAG = "MDNSService";
@@ -69,7 +69,7 @@ esp_err_t MDNSService::getStatus(httpd_req_t *request) {
JsonDocument doc;
JsonVariant root = doc.to<JsonVariant>();
getStatus(root);
return NativeServer::sendJson(request, 200, doc);
return WebServer::sendJson(request, 200, doc);
}
void MDNSService::getStatus(JsonVariant &root) {
@@ -97,5 +97,5 @@ esp_err_t MDNSService::queryServices(httpd_req_t *request, JsonVariant &json) {
serviceObj["port"] = MDNS.port(i);
}
return NativeServer::sendJson(request, 200, doc);
return WebServer::sendJson(request, 200, doc);
}
esp32/src/peripherals/camera_service.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
#include <peripherals/camera_service.h>
#include <communication/native_server.h>
#include <communication/webserver.h>
namespace Camera {
@@ -88,7 +88,7 @@ esp_err_t CameraService::cameraStill(httpd_req_t *request) {
camera_fb_t *fb = safe_camera_fb_get();
if (!fb) {
ESP_LOGE(TAG, "Camera capture failed");
return NativeServer::sendError(request, 500, "Camera capture failed");
return WebServer::sendError(request, 500, "Camera capture failed");
}
httpd_resp_set_type(request, "image/jpeg");
esp32/src/system_service.cpp
+4 -4
View File
@@ -1,5 +1,5 @@
#include "system_service.h"
#include <communication/native_server.h>
#include <communication/webserver.h>
namespace system_service {
@@ -7,17 +7,17 @@ static const char *TAG = "SystemService";
esp_err_t handleReset(httpd_req_t *request) {
reset();
return NativeServer::sendOk(request);
return WebServer::sendOk(request);
}
esp_err_t handleRestart(httpd_req_t *request) {
restart();
return NativeServer::sendOk(request);
return WebServer::sendOk(request);
}
esp_err_t handleSleep(httpd_req_t *request) {
sleep();
return NativeServer::sendOk(request);
return WebServer::sendOk(request);
}
void reset() {
esp32/src/wifi_service.cpp
+3 -3
View File
@@ -1,5 +1,5 @@
#include <wifi_service.h>
#include <communication/native_server.h>
#include <communication/webserver.h>
WiFiService::WiFiService()
: _persistence(WiFiSettings::read, WiFiSettings::update, this, WIFI_SETTINGS_FILE),
@@ -60,7 +60,7 @@ esp_err_t WiFiService::getNetworks(httpd_req_t *request) {
JsonDocument doc;
JsonObject root = doc.to<JsonObject>();
getNetworks(root);
return NativeServer::sendJson(request, 200, doc);
return WebServer::sendJson(request, 200, doc);
}
void WiFiService::setupMDNS(const char *hostname) {
@@ -88,7 +88,7 @@ esp_err_t WiFiService::getNetworkStatus(httpd_req_t *request) {
JsonDocument doc;
JsonObject root = doc.to<JsonObject>();
getNetworkStatus(root);
return NativeServer::sendJson(request, 200, doc);
return WebServer::sendJson(request, 200, doc);
}
void WiFiService::getNetworkStatus(JsonObject &root) {
esp32/src/www_mount.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ static esp_err_t web_send(httpd_req_t* req, const WebAsset& asset) {
return httpd_resp_send(req, (const char*)asset.data, asset.len);
}
void mountStaticAssets(NativeServer& server) {
void mountStaticAssets(WebServer& server) {
for (size_t i = 0; i < WWW_ASSETS_COUNT; i++) {
const WebAsset* a = &WWW_ASSETS[i];
server.on(a->uri, HTTP_GET, [a](httpd_req_t* req) { return web_send(req, *a); });