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

fix mqtt commands with base path #2339

Browse Source
This commit is contained in:
MichaelDvP
2025-01-10 15:14:48 +01:00
parent df9d20ad88
commit 59a806ac8c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/command.cpp
View File

@@ -31,13 +31,17 @@ std::vector<Command::CmdFunction> Command::cmdfunctions_;
// the entry point will be either via the Web API (api/) or MQTT (<base>/) // the entry point will be either via the Web API (api/) or MQTT (<base>/)
// returns a return code and json output // returns a return code and json output
uint8_t Command::process(const char * path, const bool is_admin, const JsonObject input, JsonObject output) { uint8_t Command::process(const char * path, const bool is_admin, const JsonObject input, JsonObject output) {
// check for MQTT, if so strip the "<base>" from the path
if (!strncmp(path, Mqtt::base().c_str(), Mqtt::base().length())) {
path += Mqtt::base().length();
}
SUrlParser p; // parse URL for the path names SUrlParser p; // parse URL for the path names
p.parse(path); p.parse(path);
// check first if it's from API or MQTT, if so strip the "api/" or "<base>/" from the path // check if it's from API
if (p.paths().size() && ((p.paths().front() == "api") || (p.paths().front() == Mqtt::base()))) { if (p.paths().size() && ((p.paths().front() == "api"))) {
p.paths().erase(p.paths().begin()); p.paths().erase(p.paths().begin());
} else { } else if (!p.paths().size()) {
return json_message(CommandRet::ERROR, "invalid path", output, path); // error return json_message(CommandRet::ERROR, "invalid path", output, path); // error
} }