patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better handling of empty MQTT client id

Browse Source 
If the configured client id is empty, the default value (auto generated) will be used
This commit is contained in:
Thomas Basler 2024-06-29 11:05:04 +02:00
parent a667042977
commit 4640ddfba0
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/MqttSettings.h
View File

@ -20,6 +20,7 @@ public:
void unsubscribe(const String& topic); void unsubscribe(const String& topic);
String getPrefix() const; String getPrefix() const;
String getClientId();
private: private:
void NetworkEvent(network_event event); void NetworkEvent(network_event event);
@ -39,4 +40,4 @@ private:
std::mutex _clientLock; std::mutex _clientLock;
}; };
extern MqttSettingsClass MqttSettings; extern MqttSettingsClass MqttSettings;

11
src/MqttSettings.cpp
View File

@ -115,7 +115,7 @@ void MqttSettingsClass::performConnect()
MessageOutput.println("Connecting to MQTT..."); MessageOutput.println("Connecting to MQTT...");
const CONFIG_T& config = Configuration.get(); const CONFIG_T& config = Configuration.get();
const String willTopic = getPrefix() + config.Mqtt.Lwt.Topic; const String willTopic = getPrefix() + config.Mqtt.Lwt.Topic;
const String clientId = config.Mqtt.ClientId; String clientId = getClientId();
if (config.Mqtt.Tls.Enabled) { if (config.Mqtt.Tls.Enabled) {
static_cast<espMqttClientSecure*>(_mqttClient)->setCACert(config.Mqtt.Tls.RootCaCert); static_cast<espMqttClientSecure*>(_mqttClient)->setCACert(config.Mqtt.Tls.RootCaCert);
static_cast<espMqttClientSecure*>(_mqttClient)->setServer(config.Mqtt.Hostname, config.Mqtt.Port); static_cast<espMqttClientSecure*>(_mqttClient)->setServer(config.Mqtt.Hostname, config.Mqtt.Port);
@ -180,6 +180,15 @@ String MqttSettingsClass::getPrefix() const
return Configuration.get().Mqtt.Topic; return Configuration.get().Mqtt.Topic;
} }
String MqttSettingsClass::getClientId()
{
String clientId = Configuration.get().Mqtt.ClientId;
if (clientId == "") {
clientId = NetworkSettings.getApName();
}
return clientId;
}
void MqttSettingsClass::publish(const String& subtopic, const String& payload) void MqttSettingsClass::publish(const String& subtopic, const String& payload)
{ {
String topic = getPrefix(); String topic = getPrefix();

2
src/WebApi_mqtt.cpp
View File

@ -34,7 +34,7 @@ void WebApiMqttClass::onMqttStatus(AsyncWebServerRequest* request)
root["mqtt_enabled"] = config.Mqtt.Enabled; root["mqtt_enabled"] = config.Mqtt.Enabled;
root["mqtt_hostname"] = config.Mqtt.Hostname; root["mqtt_hostname"] = config.Mqtt.Hostname;
root["mqtt_port"] = config.Mqtt.Port; root["mqtt_port"] = config.Mqtt.Port;
root["mqtt_clientid"] = config.Mqtt.ClientId; root["mqtt_clientid"] = MqttSettings.getClientId();
root["mqtt_username"] = config.Mqtt.Username; root["mqtt_username"] = config.Mqtt.Username;
root["mqtt_topic"] = config.Mqtt.Topic; root["mqtt_topic"] = config.Mqtt.Topic;
root["mqtt_connected"] = MqttSettings.getConnected(); root["mqtt_connected"] = MqttSettings.getConnected();