-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move MQTT command handling out of client
- Loading branch information
Showing
7 changed files
with
167 additions
and
138 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #pragma once | ||
|
|
||
| // CA certificate for MQTT TLS and OTA updates | ||
| extern const char caPemStart[] asm("_binary_ca_pem_start"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| #include "ca.hh" | ||
| #include "common.hh" | ||
| #include "mqtt.hh" | ||
| #include "settings.hh" | ||
| #include "utils.hh" | ||
| #include <algorithm> | ||
| #include <esp_http_client.h> | ||
| #include <esp_https_ota.h> | ||
| #include <freertos/FreeRTOS.h> | ||
| #include <freertos/task.h> | ||
|
|
||
| static bool handlePing(mqtt::Client &client, const mqtt::Message &msg) { | ||
| return client.send(msg.respTopic, appSettings.devName); | ||
| } | ||
|
|
||
| [[noreturn]] static bool handleRestart(mqtt::Client &client, | ||
| const mqtt::Message &msg) { | ||
| client.send(msg.respTopic, "restarting"); | ||
| esp_restart(); | ||
| } | ||
|
|
||
| static bool handleWriteSetting(mqtt::Client &client, const mqtt::Message &msg, | ||
| const std::vector<std::string> &args) { | ||
| if (args.size() != 3) { | ||
| client.send(msg.respTopic, "usage: setting/set name_spaces value_also"); | ||
| return false; | ||
| } | ||
| const esp_err_t err = appSettings.write(args[1].c_str(), args[2].c_str()); | ||
| if (err == ESP_OK) { | ||
| client.send(msg.respTopic, "setting set"); | ||
| } else { | ||
| client.send(msg.respTopic, "setting write failed"); | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| static bool handleOta(mqtt::Client &client, const mqtt::Message &msg, | ||
| const std::vector<std::string> &args) { | ||
| if (args.size() != 2) { | ||
| client.send(msg.respTopic, "usage: ota https://server/path.bin"); | ||
| return false; | ||
| } | ||
|
|
||
| const esp_http_client_config_t config{ | ||
| .url = args[1].c_str(), | ||
| .cert_pem = caPemStart, | ||
| }; | ||
|
|
||
| const esp_err_t ret = esp_https_ota(&config); | ||
|
|
||
| if (ret == ESP_OK) { | ||
| ESP_LOGI(logTag, "OTA update finished"); | ||
| client.send(msg.respTopic, "OTA success"); | ||
| esp_restart(); | ||
| } | ||
|
|
||
| ESP_LOGE(logTag, "could not perform OTA update: 0x%x", ret); | ||
| client.send(msg.respTopic, "OTA failed"); | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| static bool handleUnknown(mqtt::Client &client, const mqtt::Message &msg) { | ||
| client.send(msg.respTopic, "unknown command"); | ||
| return false; | ||
| } | ||
|
|
||
| static bool handleMessage(mqtt::Client &client, const mqtt::Message &msg) { | ||
| std::vector<std::string> tokens; | ||
|
|
||
| const auto end = msg.data.cend(); | ||
| for (auto begin = msg.data.cbegin(); begin != end;) { | ||
| const auto nextSpace = std::find_if(begin, end, isspace); | ||
| if (nextSpace != begin) { | ||
| tokens.push_back(std::string{begin, nextSpace}); | ||
| if (nextSpace == end) { | ||
| break; | ||
| } | ||
| } | ||
| begin = std::find_if(nextSpace, end, [](char c) { return !isspace(c); }); | ||
| } | ||
|
|
||
| if (tokens.empty()) { | ||
| client.send(msg.topic, "no command specified"); | ||
| return false; | ||
| } | ||
|
|
||
| const std::string &command = tokens.front(); | ||
|
|
||
| if (command == "ota") { | ||
| return handleOta(client, msg, tokens); | ||
| } | ||
| if (command == "ping") { | ||
| return handlePing(client, msg); | ||
| } | ||
| if (command == "restart") { | ||
| return handleRestart(client, msg); | ||
| } | ||
| if (command == "setting/set") { | ||
| return handleWriteSetting(client, msg, tokens); | ||
| } | ||
| return handleUnknown(client, msg); | ||
| } | ||
|
|
||
| [[noreturn]] void taskCommandHandler(void *const arg) { | ||
| mqtt::Client &client = *reinterpret_cast<mqtt::Client *>(arg); | ||
|
|
||
| while (true) { | ||
| const mqtt::Message msg = client.receive(); | ||
| if (!handleMessage(client, msg)) { | ||
| ESP_LOGE(logTag, "could not handle message"); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| void initCommandHandler(mqtt::Client &client) { | ||
| xTaskCreate(taskCommandHandler, "mqtt_cmd_handler", KiB(2), &client, 4, | ||
| nullptr); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #pragma once | ||
|
|
||
| #include "mqtt.hh" | ||
|
|
||
| void initCommandHandler(mqtt::Client &client); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.