✨ Adds native http wrapper to replace psychic
This commit is contained in:
Rune Harlyk
@@ -0,0 +1,75 @@
|
||||
#pragma once
|
||||
|
||||
#include <esp_http_server.h>
|
||||
#include <functional>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <map>
|
||||
#include <ArduinoJson.h>
|
||||
|
||||
using HttpGetHandler = std::function<esp_err_t(httpd_req_t*)>;
|
||||
using HttpPostHandler = std::function<esp_err_t(httpd_req_t*, JsonVariant&)>;
|
||||
using WsFrameHandler = std::function<esp_err_t(httpd_req_t*, httpd_ws_frame_t*)>;
|
||||
using WsOpenHandler = std::function<void(httpd_req_t*)>;
|
||||
using WsCloseHandler = std::function<void(int)>;
|
||||
|
||||
struct HttpRoute {
|
||||
std::string uri;
|
||||
httpd_method_t method;
|
||||
HttpGetHandler getHandler;
|
||||
HttpPostHandler postHandler;
|
||||
bool isWebsocket;
|
||||
};
|
||||
|
||||
class NativeServer {
|
||||
public:
|
||||
NativeServer();
|
||||
~NativeServer();
|
||||
|
||||
void config(size_t maxUriHandlers, size_t stackSize, size_t maxUploadSize);
|
||||
esp_err_t listen(uint16_t port);
|
||||
void stop();
|
||||
|
||||
void on(const char* uri, httpd_method_t method, HttpGetHandler handler);
|
||||
void on(const char* uri, httpd_method_t method, HttpPostHandler handler);
|
||||
|
||||
void onWsFrame(WsFrameHandler handler);
|
||||
void onWsOpen(WsOpenHandler handler);
|
||||
void onWsClose(WsCloseHandler handler);
|
||||
void registerWebsocket(const char* uri);
|
||||
|
||||
esp_err_t wsSend(int sockfd, const uint8_t* data, size_t len);
|
||||
esp_err_t wsSendAll(const uint8_t* data, size_t len);
|
||||
void addWsClient(int sockfd);
|
||||
void removeWsClient(int sockfd);
|
||||
std::vector<int>& getWsClients();
|
||||
|
||||
void addDefaultHeader(const char* key, const char* value);
|
||||
|
||||
httpd_handle_t getHandle() { return server_; }
|
||||
|
||||
static esp_err_t sendJson(httpd_req_t* req, int status, const char* json);
|
||||
static esp_err_t sendJson(httpd_req_t* req, int status, JsonDocument& doc);
|
||||
static esp_err_t sendError(httpd_req_t* req, int status, const char* message);
|
||||
static esp_err_t sendOk(httpd_req_t* req);
|
||||
|
||||
private:
|
||||
httpd_handle_t server_ = nullptr;
|
||||
httpd_config_t config_;
|
||||
std::vector<HttpRoute> routes_;
|
||||
std::map<std::string, std::string> defaultHeaders_;
|
||||
std::vector<int> wsClients_;
|
||||
SemaphoreHandle_t wsMutex_;
|
||||
|
||||
WsFrameHandler wsFrameHandler_;
|
||||
WsOpenHandler wsOpenHandler_;
|
||||
WsCloseHandler wsCloseHandler_;
|
||||
|
||||
static esp_err_t httpHandler(httpd_req_t* req);
|
||||
static esp_err_t wsHandler(httpd_req_t* req);
|
||||
|
||||
void applyDefaultHeaders(httpd_req_t* req);
|
||||
esp_err_t registerRoute(const HttpRoute& route);
|
||||
};
|
||||
|
||||
extern NativeServer nativeServer;
|
||||
@@ -0,0 +1,22 @@
|
||||
#pragma once
|
||||
|
||||
#include <Arduino.h>
|
||||
#include <communication/native_server.h>
|
||||
#include <communication/comm_base.hpp>
|
||||
|
||||
class NativeWebsocket : public CommAdapterBase {
|
||||
public:
|
||||
NativeWebsocket(NativeServer& server, const char* route = "/api/ws");
|
||||
|
||||
void begin() override;
|
||||
|
||||
private:
|
||||
NativeServer& server_;
|
||||
const char* route_;
|
||||
|
||||
void onWsOpen(httpd_req_t* req);
|
||||
void onWsClose(int sockfd);
|
||||
esp_err_t onFrame(httpd_req_t* req, httpd_ws_frame_t* frame);
|
||||
|
||||
void send(const uint8_t* data, size_t len, int cid = -1) override;
|
||||
};
|
||||
@@ -0,0 +1,297 @@
|
||||
#include <communication/native_server.h>
|
||||
#include <esp_log.h>
|
||||
#include <cstring>
|
||||
#include <algorithm>
|
||||
|
||||
static const char* TAG = "NativeServer";
|
||||
|
||||
NativeServer nativeServer;
|
||||
|
||||
NativeServer::NativeServer() {
|
||||
config_ = HTTPD_DEFAULT_CONFIG();
|
||||
wsMutex_ = xSemaphoreCreateMutex();
|
||||
}
|
||||
|
||||
NativeServer::~NativeServer() {
|
||||
stop();
|
||||
vSemaphoreDelete(wsMutex_);
|
||||
}
|
||||
|
||||
void NativeServer::config(size_t maxUriHandlers, size_t stackSize, size_t maxUploadSize) {
|
||||
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) {
|
||||
config_.server_port = port;
|
||||
config_.ctrl_port = port + 32768;
|
||||
|
||||
esp_err_t ret = httpd_start(&server_, &config_);
|
||||
if (ret != ESP_OK) {
|
||||
ESP_LOGE(TAG, "Failed to start server: %s", esp_err_to_name(ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
ESP_LOGI(TAG, "Server started on port %d", port);
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
void NativeServer::stop() {
|
||||
if (server_) {
|
||||
httpd_stop(server_);
|
||||
server_ = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
void NativeServer::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; }
|
||||
|
||||
esp_err_t NativeServer::httpHandler(httpd_req_t* req) {
|
||||
NativeServer* self = static_cast<NativeServer*>(req->user_ctx);
|
||||
self->applyDefaultHeaders(req);
|
||||
|
||||
for (const auto& route : self->routes_) {
|
||||
if (route.isWebsocket) continue;
|
||||
|
||||
bool uriMatch = false;
|
||||
if (route.uri.back() == '*') {
|
||||
std::string prefix = route.uri.substr(0, route.uri.length() - 1);
|
||||
uriMatch = strncmp(req->uri, prefix.c_str(), prefix.length()) == 0;
|
||||
} else {
|
||||
uriMatch = strcmp(req->uri, route.uri.c_str()) == 0;
|
||||
}
|
||||
|
||||
if (uriMatch && route.method == req->method) {
|
||||
if (route.getHandler) {
|
||||
return route.getHandler(req);
|
||||
}
|
||||
if (route.postHandler) {
|
||||
char* content = nullptr;
|
||||
size_t contentLen = req->content_len;
|
||||
|
||||
if (contentLen > 0) {
|
||||
content = (char*)malloc(contentLen + 1);
|
||||
if (!content) {
|
||||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Memory allocation failed");
|
||||
return ESP_FAIL;
|
||||
}
|
||||
|
||||
int received = 0;
|
||||
int remaining = contentLen;
|
||||
while (remaining > 0) {
|
||||
int ret = httpd_req_recv(req, content + received, remaining);
|
||||
if (ret <= 0) {
|
||||
free(content);
|
||||
if (ret == HTTPD_SOCK_ERR_TIMEOUT) {
|
||||
httpd_resp_send_err(req, HTTPD_408_REQ_TIMEOUT, "Request timeout");
|
||||
}
|
||||
return ESP_FAIL;
|
||||
}
|
||||
received += ret;
|
||||
remaining -= ret;
|
||||
}
|
||||
content[contentLen] = '\0';
|
||||
}
|
||||
|
||||
JsonDocument doc;
|
||||
if (content && contentLen > 0) {
|
||||
DeserializationError error = deserializeJson(doc, content, contentLen);
|
||||
free(content);
|
||||
if (error) {
|
||||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "Invalid JSON");
|
||||
return ESP_FAIL;
|
||||
}
|
||||
}
|
||||
|
||||
JsonVariant json = doc.as<JsonVariant>();
|
||||
return route.postHandler(req, json);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, "Not found");
|
||||
return ESP_FAIL;
|
||||
}
|
||||
|
||||
esp_err_t NativeServer::wsHandler(httpd_req_t* req) {
|
||||
NativeServer* self = static_cast<NativeServer*>(req->user_ctx);
|
||||
|
||||
if (req->method == HTTP_GET) {
|
||||
int sockfd = httpd_req_to_sockfd(req);
|
||||
self->addWsClient(sockfd);
|
||||
if (self->wsOpenHandler_) {
|
||||
self->wsOpenHandler_(req);
|
||||
}
|
||||
ESP_LOGI(TAG, "WebSocket client connected: %d", sockfd);
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
httpd_ws_frame_t frame;
|
||||
memset(&frame, 0, sizeof(httpd_ws_frame_t));
|
||||
frame.type = HTTPD_WS_TYPE_BINARY;
|
||||
|
||||
esp_err_t ret = httpd_ws_recv_frame(req, &frame, 0);
|
||||
if (ret != ESP_OK) {
|
||||
ESP_LOGE(TAG, "Failed to get frame len: %s", esp_err_to_name(ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (frame.len > 0) {
|
||||
frame.payload = (uint8_t*)malloc(frame.len);
|
||||
if (!frame.payload) {
|
||||
ESP_LOGE(TAG, "Failed to allocate frame payload");
|
||||
return ESP_ERR_NO_MEM;
|
||||
}
|
||||
|
||||
ret = httpd_ws_recv_frame(req, &frame, frame.len);
|
||||
if (ret != ESP_OK) {
|
||||
ESP_LOGE(TAG, "Failed to receive frame: %s", esp_err_to_name(ret));
|
||||
free(frame.payload);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
if (frame.type == HTTPD_WS_TYPE_CLOSE) {
|
||||
int sockfd = httpd_req_to_sockfd(req);
|
||||
self->removeWsClient(sockfd);
|
||||
if (self->wsCloseHandler_) {
|
||||
self->wsCloseHandler_(sockfd);
|
||||
}
|
||||
ESP_LOGI(TAG, "WebSocket client disconnected: %d", sockfd);
|
||||
if (frame.payload) free(frame.payload);
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
esp_err_t result = ESP_OK;
|
||||
if (self->wsFrameHandler_) {
|
||||
result = self->wsFrameHandler_(req, &frame);
|
||||
}
|
||||
|
||||
if (frame.payload) {
|
||||
free(frame.payload);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
void NativeServer::on(const char* uri, httpd_method_t method, HttpGetHandler handler) {
|
||||
HttpRoute route;
|
||||
route.uri = uri;
|
||||
route.method = method;
|
||||
route.getHandler = handler;
|
||||
route.postHandler = nullptr;
|
||||
route.isWebsocket = false;
|
||||
routes_.push_back(route);
|
||||
|
||||
if (server_) {
|
||||
registerRoute(route);
|
||||
}
|
||||
}
|
||||
|
||||
void NativeServer::on(const char* uri, httpd_method_t method, HttpPostHandler handler) {
|
||||
HttpRoute route;
|
||||
route.uri = uri;
|
||||
route.method = method;
|
||||
route.getHandler = nullptr;
|
||||
route.postHandler = handler;
|
||||
route.isWebsocket = false;
|
||||
routes_.push_back(route);
|
||||
|
||||
if (server_) {
|
||||
registerRoute(route);
|
||||
}
|
||||
}
|
||||
|
||||
esp_err_t NativeServer::registerRoute(const HttpRoute& route) {
|
||||
httpd_uri_t httpd_route = {.uri = route.uri.c_str(),
|
||||
.method = route.method,
|
||||
.handler = route.isWebsocket ? wsHandler : httpHandler,
|
||||
.user_ctx = this,
|
||||
.is_websocket = route.isWebsocket,
|
||||
.handle_ws_control_frames = route.isWebsocket,
|
||||
.supported_subprotocol = nullptr};
|
||||
return httpd_register_uri_handler(server_, &httpd_route);
|
||||
}
|
||||
|
||||
void NativeServer::registerWebsocket(const char* uri) {
|
||||
HttpRoute route;
|
||||
route.uri = uri;
|
||||
route.method = HTTP_GET;
|
||||
route.getHandler = nullptr;
|
||||
route.postHandler = nullptr;
|
||||
route.isWebsocket = true;
|
||||
routes_.push_back(route);
|
||||
|
||||
if (server_) {
|
||||
registerRoute(route);
|
||||
}
|
||||
}
|
||||
|
||||
void NativeServer::onWsFrame(WsFrameHandler handler) { wsFrameHandler_ = handler; }
|
||||
|
||||
void NativeServer::onWsOpen(WsOpenHandler handler) { wsOpenHandler_ = handler; }
|
||||
|
||||
void NativeServer::onWsClose(WsCloseHandler handler) { wsCloseHandler_ = handler; }
|
||||
|
||||
void NativeServer::addWsClient(int sockfd) {
|
||||
xSemaphoreTake(wsMutex_, portMAX_DELAY);
|
||||
wsClients_.push_back(sockfd);
|
||||
xSemaphoreGive(wsMutex_);
|
||||
}
|
||||
|
||||
void NativeServer::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() { return wsClients_; }
|
||||
|
||||
esp_err_t NativeServer::wsSend(int sockfd, const uint8_t* data, size_t len) {
|
||||
httpd_ws_frame_t frame = {.final = true,
|
||||
.fragmented = false,
|
||||
.type = HTTPD_WS_TYPE_BINARY,
|
||||
.payload = const_cast<uint8_t*>(data),
|
||||
.len = len};
|
||||
return httpd_ws_send_frame_async(server_, sockfd, &frame);
|
||||
}
|
||||
|
||||
esp_err_t NativeServer::wsSendAll(const uint8_t* data, size_t len) {
|
||||
xSemaphoreTake(wsMutex_, portMAX_DELAY);
|
||||
for (int sockfd : wsClients_) {
|
||||
wsSend(sockfd, data, len);
|
||||
}
|
||||
xSemaphoreGive(wsMutex_);
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
esp_err_t NativeServer::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"
|
||||
: status == 500 ? "500 Internal Server Error"
|
||||
: "200 OK");
|
||||
httpd_resp_set_type(req, "application/json");
|
||||
return httpd_resp_send(req, json, strlen(json));
|
||||
}
|
||||
|
||||
esp_err_t NativeServer::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) {
|
||||
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\"}"); }
|
||||
@@ -0,0 +1,46 @@
|
||||
#include <communication/native_websocket.h>
|
||||
#include <esp_log.h>
|
||||
|
||||
static const char* TAG = "NativeWebsocket";
|
||||
|
||||
NativeWebsocket::NativeWebsocket(NativeServer& server, const char* route) : server_(server), route_(route) {}
|
||||
|
||||
void NativeWebsocket::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) {
|
||||
int sockfd = httpd_req_to_sockfd(req);
|
||||
ESP_LOGI(TAG, "Client connected: %d", sockfd);
|
||||
sendPong(sockfd);
|
||||
}
|
||||
|
||||
void NativeWebsocket::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) {
|
||||
if (frame->type != HTTPD_WS_TYPE_BINARY) {
|
||||
ESP_LOGW(TAG, "Expected binary frame, got type %d", frame->type);
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
int sockfd = httpd_req_to_sockfd(req);
|
||||
handleIncoming(frame->payload, frame->len, sockfd);
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
void NativeWebsocket::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) {
|
||||
ESP_LOGE(TAG, "Failed to send message to client %d: %s (len=%u)", cid, esp_err_to_name(err), len);
|
||||
}
|
||||
} else {
|
||||
server_.wsSendAll(data, len);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user