thor/esphome-dev
1
0
Fork 0
mirror of https://github.com/Threnklyn/esphome-dev.git synced 2026-05-28 16:58:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve 'body' handling in http_request on_response triggers (#6968)

Browse Source
This commit is contained in:
Kevin P. Fleming
2024-06-25 19:50:54 -04:00
committed by Jesse Hills
parent d8a6d8594a
commit 1579dfeb80
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/http_request/http_request.h
+14 -5
View File
@@ -43,10 +43,10 @@ class HttpContainer : public Parented<HttpRequestComponent> {
bool secure_{false};
};
class HttpRequestResponseTrigger : public Trigger<std::shared_ptr<HttpContainer>, std::string> {
class HttpRequestResponseTrigger : public Trigger<std::shared_ptr<HttpContainer>, std::string &> {
public:
void process(std::shared_ptr<HttpContainer> container, std::string response_body) {
this->trigger(std::move(container), std::move(response_body));
void process(std::shared_ptr<HttpContainer> container, std::string &response_body) {
this->trigger(std::move(container), response_body);
}
};
@@ -153,8 +153,17 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
}
}
for (auto *trigger : this->response_triggers_) {
trigger->process(container, response_body);
if (this->response_triggers_.size() == 1) {
// if there is only one trigger, no need to copy the response body
this->response_triggers_[0]->process(container, response_body);
} else {
for (auto *trigger : this->response_triggers_) {
// with multiple triggers, pass a copy of the response body to each
// one so that modifications made in one trigger are not visible to
// the others
auto response_body_copy = std::string(response_body);
trigger->process(container, response_body_copy);
}
}
container->end();
}