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

🪄 Formats HttpEndpoint

Browse Source
This commit is contained in:
Rune Harlyk
2024-07-09 20:07:06 +02:00
committed by Rune Harlyk
parent 6a6fb74229
commit 6ee9100fdc
1 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esp32/lib/ESP32-sveltekit/HttpEndpoint.h
+30 -40
View File
@@ -12,7 +12,7 @@
template <class T> template <class T>
class HttpEndpoint { class HttpEndpoint {
protected: protected:
JsonStateReader<T> _stateReader; JsonStateReader<T> _stateReader;
JsonStateUpdater<T> _stateUpdater; JsonStateUpdater<T> _stateUpdater;
StatefulService<T> *_statefulService; StatefulService<T> *_statefulService;
@@ -22,13 +22,10 @@ class HttpEndpoint {
PsychicHttpServer *_server; PsychicHttpServer *_server;
const char *_servicePath; const char *_servicePath;
public: public:
HttpEndpoint(JsonStateReader<T> stateReader, HttpEndpoint(JsonStateReader<T> stateReader, JsonStateUpdater<T> stateUpdater, StatefulService<T> *statefulService,
JsonStateUpdater<T> stateUpdater, PsychicHttpServer *server, const char *servicePath, SecurityManager *securityManager,
StatefulService<T> *statefulService, PsychicHttpServer *server, AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN)
const char *servicePath, SecurityManager *securityManager,
AuthenticationPredicate authenticationPredicate =
AuthenticationPredicates::IS_ADMIN)
: _stateReader(stateReader), : _stateReader(stateReader),
_stateUpdater(stateUpdater), _stateUpdater(stateUpdater),
_statefulService(statefulService), _statefulService(statefulService),
@@ -41,19 +38,16 @@ class HttpEndpoint {
void begin() { void begin() {
// OPTIONS (for CORS preflight) // OPTIONS (for CORS preflight)
#ifdef ENABLE_CORS #ifdef ENABLE_CORS
_server->on( _server->on(_servicePath, HTTP_OPTIONS,
_servicePath, HTTP_OPTIONS, _securityManager->wrapRequest([this](PsychicRequest *request) { return request->reply(200); },
_securityManager->wrapRequest( AuthenticationPredicates::IS_AUTHENTICATED));
[this](PsychicRequest *request) { return request->reply(200); },
AuthenticationPredicates::IS_AUTHENTICATED));
#endif #endif
// GET // GET
_server->on(_servicePath, HTTP_GET, _server->on(_servicePath, HTTP_GET,
_securityManager->wrapRequest( _securityManager->wrapRequest(
[this](PsychicRequest *request) { [this](PsychicRequest *request) {
PsychicJsonResponse response = PsychicJsonResponse response = PsychicJsonResponse(request, false);
PsychicJsonResponse(request, false);
JsonObject jsonObject = response.getRoot(); JsonObject jsonObject = response.getRoot();
_statefulService->read(jsonObject, _stateReader); _statefulService->read(jsonObject, _stateReader);
return response.send(); return response.send();
@@ -62,36 +56,32 @@ class HttpEndpoint {
ESP_LOGV("HttpEndpoint", "Registered GET endpoint: %s", _servicePath); ESP_LOGV("HttpEndpoint", "Registered GET endpoint: %s", _servicePath);
// POST // POST
_server->on( _server->on(_servicePath, HTTP_POST,
_servicePath, HTTP_POST, _securityManager->wrapCallback(
_securityManager->wrapCallback( [this](PsychicRequest *request, JsonVariant &json) {
[this](PsychicRequest *request, JsonVariant &json) { if (!json.is<JsonObject>()) {
if (!json.is<JsonObject>()) { return request->reply(400);
return request->reply(400); }
}
JsonObject jsonObject = json.as<JsonObject>(); JsonObject jsonObject = json.as<JsonObject>();
StateUpdateResult outcome = StateUpdateResult outcome =
_statefulService->updateWithoutPropagation( _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
jsonObject, _stateUpdater);
if (outcome == StateUpdateResult::ERROR) { if (outcome == StateUpdateResult::ERROR) {
return request->reply(400); return request->reply(400);
} else if ((outcome == StateUpdateResult::CHANGED)) { } else if ((outcome == StateUpdateResult::CHANGED)) {
// persist the changes to the FS // persist the changes to the FS
_statefulService->callUpdateHandlers( _statefulService->callUpdateHandlers(HTTP_ENDPOINT_ORIGIN_ID);
HTTP_ENDPOINT_ORIGIN_ID); }
}
PsychicJsonResponse response = PsychicJsonResponse response = PsychicJsonResponse(request, false);
PsychicJsonResponse(request, false); jsonObject = response.getRoot();
jsonObject = response.getRoot();
_statefulService->read(jsonObject, _stateReader); _statefulService->read(jsonObject, _stateReader);
return response.send(); return response.send();
}, },
_authenticationPredicate)); _authenticationPredicate));
ESP_LOGV("HttpEndpoint", "Registered POST endpoint: %s", _servicePath); ESP_LOGV("HttpEndpoint", "Registered POST endpoint: %s", _servicePath);
} }