sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-29 22:24:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'webserver_reduce_defer_calls' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-08-18 20:02:53 -05:00
parent 63cd279cd4 1786934242
commit 0c0e8491d2
1 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
esphome/components/web_server/web_server.cpp
View File

@@ -507,14 +507,37 @@ void WebServer::handle_switch_request(AsyncWebServerRequest *request, const UrlM
auto detail = get_request_detail(request);
std::string data = this->switch_json(obj, obj->state, detail);
request->send(200, "application/json", data.c_str());
} else if (match.method_equals("toggle")) {
this->defer([obj]() { obj->toggle(); });
request->send(200);
return;
}
// Handle action methods with single defer and response
enum SwitchAction { NONE, TOGGLE, TURN_ON, TURN_OFF };
SwitchAction action = NONE;
if (match.method_equals("toggle")) {
action = TOGGLE;
} else if (match.method_equals("turn_on")) {
this->defer([obj]() { obj->turn_on(); });
request->send(200);
action = TURN_ON;
} else if (match.method_equals("turn_off")) {
this->defer([obj]() { obj->turn_off(); });
action = TURN_OFF;
}
if (action != NONE) {
this->defer([obj, action]() {
switch (action) {
case TOGGLE:
obj->toggle();
break;
case TURN_ON:
obj->turn_on();
break;
case TURN_OFF:
obj->turn_off();
break;
default:
break;
}
});
request->send(200);
} else {
request->send(404);
@@ -1332,14 +1355,37 @@ void WebServer::handle_lock_request(AsyncWebServerRequest *request, const UrlMat
auto detail = get_request_detail(request);
std::string data = this->lock_json(obj, obj->state, detail);
request->send(200, "application/json", data.c_str());
} else if (match.method_equals("lock")) {
this->defer([obj]() { obj->lock(); });
request->send(200);
return;
}
// Handle action methods with single defer and response
enum LockAction { NONE, LOCK, UNLOCK, OPEN };
LockAction action = NONE;
if (match.method_equals("lock")) {
action = LOCK;
} else if (match.method_equals("unlock")) {
this->defer([obj]() { obj->unlock(); });
request->send(200);
action = UNLOCK;
} else if (match.method_equals("open")) {
this->defer([obj]() { obj->open(); });
action = OPEN;
}
if (action != NONE) {
this->defer([obj, action]() {
switch (action) {
case LOCK:
obj->lock();
break;
case UNLOCK:
obj->unlock();
break;
case OPEN:
obj->open();
break;
default:
break;
}
});
request->send(200);
} else {
request->send(404);