andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-04-29 12:05:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

http-client to heap

Browse Source
This commit is contained in:
MichaelDvP
2026-04-10 14:20:17 +02:00
parent e9e3759db3
commit ac143d607a
4 changed files with 159 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/shuntingYard.cpp
View File

@@ -700,8 +700,8 @@ std::string compute(const std::string & expr) {
std::string cmd = expr_new.substr(f, e - f).c_str();
JsonDocument doc;
if (DeserializationError::Ok == deserializeJson(doc, cmd)) {
HTTPClient http;
std::string url, header_s, value_s, method_s, key_s, keys_s;
HTTPClient * http = new HTTPClient;
std::string url, header_s, value_s, method_s, key_s, keys_s;
// search keys lower case
for (JsonPair p : doc.as<JsonObject>()) {
if (Helpers::toLower(p.key().c_str()) == "url") {
@@ -720,10 +720,10 @@ std::string compute(const std::string & expr) {
keys_s = p.key().c_str();
}
}
if (http.begin(url.c_str())) {
if (http->begin(url.c_str())) {
int httpResult = 0;
for (JsonPair p : doc[header_s].as<JsonObject>()) {
http.addHeader(p.key().c_str(), p.value().as<std::string>().c_str());
http->addHeader(p.key().c_str(), p.value().as<std::string>().c_str());
}
std::string value = doc[value_s] | "";
std::string method = doc[method_s] | "get";
@@ -731,15 +731,15 @@ std::string compute(const std::string & expr) {
// if there is data, force a POST
if (value.length() || Helpers::toLower(method) == "post") {
if (value.find_first_of('{') != std::string::npos) {
http.addHeader(asyncsrv::T_Content_Type, asyncsrv::T_application_json, false); // auto-set to JSON
http->addHeader(asyncsrv::T_Content_Type, asyncsrv::T_application_json, false); // auto-set to JSON
}
httpResult = http.POST(value.c_str());
httpResult = http->POST(value.c_str());
} else {
httpResult = http.GET(); // normal GET
httpResult = http->GET(); // normal GET
}
if (httpResult > 0) {
std::string result = http.getString().c_str();
std::string result = http->getString().c_str();
std::string key = doc[key_s] | "";
JsonDocument keys_doc; // JsonDocument to hold "keys" after doc is parsed with HTTP body
if (doc[keys_s].is<JsonArray>()) {
@@ -769,7 +769,8 @@ std::string compute(const std::string & expr) {
}
expr_new.replace(f, e - f, result.c_str());
}
http.end();
http->end();
delete http;
}
}
f = expr_new.find_first_of('{', e);

15
src/web/WebSchedulerService.cpp
View File

@@ -352,7 +352,7 @@ bool WebSchedulerService::command(const char * name, const std::string & command
// parse json
JsonDocument doc;
if (deserializeJson(doc, cmd) == DeserializationError::Ok) {
HTTPClient http;
HTTPClient * http = new HTTPClient;
std::string url = doc["url"] | "";
// for a GET with parameters replace commands with values
// don't search the complete url, it may contain a devicename in path
@@ -363,10 +363,10 @@ bool WebSchedulerService::command(const char * name, const std::string & command
commands(s, false);
url.replace(q + 1, l, s);
}
if (http.begin(url.c_str())) {
if (http->begin(url.c_str())) {
// add any given headers
for (JsonPair p : doc["header"].as<JsonObject>()) {
http.addHeader(p.key().c_str(), p.value().as<String>().c_str());
http->addHeader(p.key().c_str(), p.value().as<String>().c_str());
}
std::string value = doc["value"] | data.c_str(); // extract value if its in the command, or take the data
std::string method = doc["method"] | "GET"; // default GET
@@ -376,14 +376,15 @@ bool WebSchedulerService::command(const char * name, const std::string & command
int httpResult = 0;
if (value.length() || method == "post") { // we have all lowercase
if (value.find_first_of('{') != std::string::npos) {
http.addHeader(asyncsrv::T_Content_Type, asyncsrv::T_application_json, false); // auto-set to JSON
http->addHeader(asyncsrv::T_Content_Type, asyncsrv::T_application_json, false); // auto-set to JSON
}
httpResult = http.POST(value.c_str());
httpResult = http->POST(value.c_str());
} else {
httpResult = http.GET(); // normal GET
httpResult = http->GET(); // normal GET
}
http.end();
http->end();
delete http;
// check HTTP return code
if (httpResult != 200) {