andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

optimized

Browse Source
This commit is contained in:
Proddy
2023-12-29 12:05:47 +01:00
parent 20d747330c
commit fd48fb63d8
2 changed files with 27 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
lib/framework/HttpEndpoint.h
View File

@@ -14,33 +14,37 @@
using namespace std::placeholders; // for `_1` etc using namespace std::placeholders; // for `_1` etc
template <class T> template <class T>
class HttpGetEndpoint { class HttpEndpoint {
protected:
JsonStateReader<T> _stateReader;
JsonStateUpdater<T> _stateUpdater;
StatefulService<T> * _statefulService;
size_t _bufferSize;
SecurityManager * _securityManager;
AuthenticationPredicate _authenticationPredicate;
PsychicHttpServer * _server;
const char * _servicePath;
public: public:
HttpGetEndpoint(JsonStateReader<T> stateReader, HttpEndpoint(JsonStateReader<T> stateReader,
StatefulService<T> * statefulService, JsonStateUpdater<T> stateUpdater,
PsychicHttpServer * server, StatefulService<T> * statefulService,
const char * servicePath, PsychicHttpServer * server,
SecurityManager * securityManager, const char * servicePath,
AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN, SecurityManager * securityManager,
size_t bufferSize = DEFAULT_BUFFER_SIZE) AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
size_t bufferSize = DEFAULT_BUFFER_SIZE)
: _stateReader(stateReader) : _stateReader(stateReader)
, _stateUpdater(stateUpdater)
, _statefulService(statefulService) , _statefulService(statefulService)
, _bufferSize(bufferSize)
, _server(server) , _server(server)
, _servicePath(servicePath) , _servicePath(servicePath)
, _securityManager(securityManager) , _securityManager(securityManager)
, _authenticationPredicate(authenticationPredicate) { , _authenticationPredicate(authenticationPredicate)
, _bufferSize(bufferSize) {
} }
protected: // register the web server on() endpoints
JsonStateReader<T> _stateReader;
StatefulService<T> * _statefulService;
size_t _bufferSize;
PsychicHttpServer * _server;
const char * _servicePath;
SecurityManager * _securityManager;
AuthenticationPredicate _authenticationPredicate;
void registerURI() { void registerURI() {
_server->on(_servicePath, _server->on(_servicePath,
HTTP_GET, HTTP_GET,
@@ -52,42 +56,7 @@ class HttpGetEndpoint {
return response.send(); return response.send();
}, },
_authenticationPredicate)); _authenticationPredicate));
}
};
template <class T>
class HttpPostEndpoint {
public:
HttpPostEndpoint(JsonStateReader<T> stateReader,
JsonStateUpdater<T> stateUpdater,
StatefulService<T> * statefulService,
PsychicHttpServer * server,
const char * servicePath,
SecurityManager * securityManager,
AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
size_t bufferSize = DEFAULT_BUFFER_SIZE)
: _stateReader(stateReader)
, _stateUpdater(stateUpdater)
, _statefulService(statefulService)
, _server(server)
, _servicePath(servicePath)
, _securityManager(securityManager)
, _authenticationPredicate(authenticationPredicate)
, _bufferSize(bufferSize) {
}
protected:
JsonStateReader<T> _stateReader;
JsonStateUpdater<T> _stateUpdater;
StatefulService<T> * _statefulService;
size_t _bufferSize;
SecurityManager * _securityManager;
AuthenticationPredicate _authenticationPredicate;
PsychicHttpServer * _server;
const char * _servicePath;
void registerURI() {
_server->on(_servicePath, _server->on(_servicePath,
HTTP_POST, HTTP_POST,
_securityManager->wrapCallback( _securityManager->wrapCallback(
@@ -102,10 +71,8 @@ class HttpPostEndpoint {
if (outcome == StateUpdateResult::ERROR) { if (outcome == StateUpdateResult::ERROR) {
return request->reply(400); return request->reply(400);
} else if ((outcome == StateUpdateResult::CHANGED) || (outcome == StateUpdateResult::CHANGED_RESTART)) { } else if ((outcome == StateUpdateResult::CHANGED) || (outcome == StateUpdateResult::CHANGED_RESTART)) {
// TODO see if this works as intended. Before the stat was updated on an onDisconnect // persist the changes to the FS
// request->onDisconnect([this]() { _statefulService->callUpdateHandlers(HTTP_ENDPOINT_ORIGIN_ID); }); _statefulService->callUpdateHandlers(HTTP_ENDPOINT_ORIGIN_ID);
// TODO add support for https
_statefulService->callUpdateHandlers(HTTP_ENDPOINT_ORIGIN_ID); // persist the changes to the FS
} }
PsychicJsonResponse response = PsychicJsonResponse(request, false, _bufferSize); PsychicJsonResponse response = PsychicJsonResponse(request, false, _bufferSize);
@@ -114,34 +81,13 @@ class HttpPostEndpoint {
_statefulService->read(jsonObject, _stateReader); _statefulService->read(jsonObject, _stateReader);
if (outcome == StateUpdateResult::CHANGED_RESTART) { if (outcome == StateUpdateResult::CHANGED_RESTART) {
return request->reply(205); // reboot required response.setCode(205); // reboot required
} }
return response.send(); return response.send();
}, },
_authenticationPredicate)); _authenticationPredicate));
} }
}; };
template <class T>
class HttpEndpoint : public HttpGetEndpoint<T>, public HttpPostEndpoint<T> {
public:
HttpEndpoint(JsonStateReader<T> stateReader,
JsonStateUpdater<T> stateUpdater,
StatefulService<T> * statefulService,
PsychicHttpServer * server,
const char * servicePath,
SecurityManager * securityManager,
AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
size_t bufferSize = DEFAULT_BUFFER_SIZE)
: HttpGetEndpoint<T>(stateReader, statefulService, server, servicePath, securityManager, authenticationPredicate, bufferSize)
, HttpPostEndpoint<T>(stateReader, stateUpdater, statefulService, server, servicePath, securityManager, authenticationPredicate, bufferSize) {
}
// register the web server on() endpoints
void registerURI() {
HttpGetEndpoint<T>::registerURI();
HttpPostEndpoint<T>::registerURI();
}
};
#endif #endif

3
lib_standalone/HttpEndpoint.h
View File

@@ -102,9 +102,6 @@ class HttpPostEndpoint {
if (outcome == StateUpdateResult::ERROR) { if (outcome == StateUpdateResult::ERROR) {
return request->reply(400); return request->reply(400);
} else if ((outcome == StateUpdateResult::CHANGED) || (outcome == StateUpdateResult::CHANGED_RESTART)) { } else if ((outcome == StateUpdateResult::CHANGED) || (outcome == StateUpdateResult::CHANGED_RESTART)) {
// TODO see if this works as intended. Before the stat was updated on an onDisconnect
// request->onDisconnect([this]() { _statefulService->callUpdateHandlers(HTTP_ENDPOINT_ORIGIN_ID); });
// TODO add support for https
_statefulService->callUpdateHandlers(HTTP_ENDPOINT_ORIGIN_ID); // persist the changes to the FS _statefulService->callUpdateHandlers(HTTP_ENDPOINT_ORIGIN_ID); // persist the changes to the FS
} }