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

Merge pull request #2620 from nename0/scheduler-nested-json

Browse Source 
Nested JSON structured in Scheduler HTTP fetch
This commit is contained in:
Proddy
2025-09-11 13:14:37 +02:00
committed by GitHub
parent dc46dac02a 995ab7233d
commit aef6b6e92d
1 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/core/shuntingYard.hpp
View File

@@ -697,7 +697,7 @@ std::string compute(const std::string & expr) {
JsonDocument doc; JsonDocument doc;
if (DeserializationError::Ok == deserializeJson(doc, cmd)) { if (DeserializationError::Ok == deserializeJson(doc, cmd)) {
HTTPClient http; HTTPClient http;
std::string url, header_s, value_s, method_s, key_s; std::string url, header_s, value_s, method_s, key_s, keys_s;
// search keys lower case // search keys lower case
for (JsonPair p : doc.as<JsonObject>()) { for (JsonPair p : doc.as<JsonObject>()) {
if (emsesp::Helpers::toLower(p.key().c_str()) == "url") { if (emsesp::Helpers::toLower(p.key().c_str()) == "url") {
@@ -709,7 +709,11 @@ std::string compute(const std::string & expr) {
} else if (emsesp::Helpers::toLower(p.key().c_str()) == "method") { } else if (emsesp::Helpers::toLower(p.key().c_str()) == "method") {
method_s = p.key().c_str(); method_s = p.key().c_str();
} else if (emsesp::Helpers::toLower(p.key().c_str()) == "key") { } else if (emsesp::Helpers::toLower(p.key().c_str()) == "key") {
key_s = p.key().c_str(); keys_s = "";
key_s = p.key().c_str();
} else if (emsesp::Helpers::toLower(p.key().c_str()) == "keys") {
key_s = "";
keys_s = p.key().c_str();
} }
} }
if (http.begin(url.c_str())) { if (http.begin(url.c_str())) {
@@ -731,12 +735,33 @@ std::string compute(const std::string & expr) {
} }
if (httpResult > 0) { if (httpResult > 0) {
std::string result = http.getString().c_str(); std::string result = http.getString().c_str();
std::string key = doc[key_s] | ""; 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>()) {
keys_doc.set(doc[keys_s].as<JsonArray>());
}
JsonArray keys = keys_doc.as<JsonArray>();
doc.clear(); if (key.length() || !keys.isNull()) {
if (key.length() && DeserializationError::Ok == deserializeJson(doc, result)) { doc.clear();
result = doc[key.c_str()].as<std::string>(); if (DeserializationError::Ok == deserializeJson(doc, result)) {
if (key.length()) {
result = doc[key.c_str()].as<std::string>();
} else {
JsonVariant json = doc.as<JsonVariant>();
for (JsonVariant keys_key : keys) {
if (keys_key.is<std::string>() && json.is<JsonObject>()) {
json = json[keys_key.as<std::string>()].as<JsonVariant>();
} else if (keys_key.is<int>() && json.is<JsonArray>()) {
json = json[keys_key.as<int>()].as<JsonVariant>();
} else {
break; // type mismatch
}
}
result = json.as<std::string>();
}
}
} }
expr_new.replace(f, e - f, result.c_str()); expr_new.replace(f, e - f, result.c_str());
} }