From 7c6fc0311f302d7174008dab3c00525a82936ca1 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 15 Dec 2021 13:31:58 +0100 Subject: [PATCH 1/2] MQTT client: Add more parameters to thing class (for SSL and will) --- mqttclient/integrationpluginmqttclient.cpp | 16 ++++++++- mqttclient/integrationpluginmqttclient.h | 2 ++ mqttclient/integrationpluginmqttclient.json | 37 +++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/mqttclient/integrationpluginmqttclient.cpp b/mqttclient/integrationpluginmqttclient.cpp index 3101c0c1..dafed041 100644 --- a/mqttclient/integrationpluginmqttclient.cpp +++ b/mqttclient/integrationpluginmqttclient.cpp @@ -51,10 +51,24 @@ void IntegrationPluginMqttClient::setupThing(ThingSetupInfo *info) client = new MqttClient("nymea-" + thing->id().toString().remove(QRegExp("[{}]")).left(8), this); client->setUsername(thing->paramValue(mqttClientThingUsernameParamTypeId).toString()); client->setPassword(thing->paramValue(mqttClientThingPasswordParamTypeId).toString()); - client->connectToHost(thing->paramValue(mqttClientThingServerAddressParamTypeId).toString(), thing->paramValue(mqttClientThingServerPortParamTypeId).toInt()); + QString willTopic = thing->paramValue(mqttClientThingWillTopicParamTypeId).toString(); + if (!willTopic.isEmpty()) { + client->setWillTopic(willTopic); + client->setWillMessage(thing->paramValue(mqttClientThingWillMessageParamTypeId).toByteArray()); + client->setWillQoS(static_cast(thing->paramValue(mqttClientThingWillQoSParamTypeId).toInt())); + client->setWillRetain(thing->paramValue(mqttClientThingWillRetainParamTypeId).toBool()); + } + client->connectToHost(thing->paramValue(mqttClientThingServerAddressParamTypeId).toString(), + thing->paramValue(mqttClientThingServerPortParamTypeId).toInt(), + true, + thing->paramValue(mqttClientThingUseSslParamTypeId).toBool()); } m_clients.insert(thing, client); + connect(client, &MqttClient::error, info, [info](QAbstractSocket::SocketError socketError){ + qCWarning(dcMqttclient()) << "An error happened during setup:" << socketError; + info->finish(Thing::ThingErrorHardwareFailure, QT_TR_NOOP("An error happened connecting to the MQTT broker. Please make sure the login credentials are correct and your user has apprpriate permissions to subscribe to the given topic filter.")); + }); connect(client, &MqttClient::connected, this, [this, thing](){ subscribe(thing); }); diff --git a/mqttclient/integrationpluginmqttclient.h b/mqttclient/integrationpluginmqttclient.h index 4b3bb7ba..6ddf12ef 100644 --- a/mqttclient/integrationpluginmqttclient.h +++ b/mqttclient/integrationpluginmqttclient.h @@ -37,6 +37,8 @@ #include #include +#include "extern-plugininfo.h" + class MqttClient; class IntegrationPluginMqttClient: public IntegrationPlugin diff --git a/mqttclient/integrationpluginmqttclient.json b/mqttclient/integrationpluginmqttclient.json index ff200c6a..b3449eb6 100644 --- a/mqttclient/integrationpluginmqttclient.json +++ b/mqttclient/integrationpluginmqttclient.json @@ -127,6 +127,43 @@ "displayName": "Subscription topic filter", "type": "QString", "defaultValue": "#" + }, + { + "id": "714074bd-1ab1-4ee6-b6db-7594b3dbf56f", + "name": "useSsl", + "displayName": "Use SSL", + "type": "bool", + "defaultValue": false + }, + { + "id": "04aa1f25-4ee9-4bce-9844-a9860642c938", + "name": "willTopic", + "displayName": "Will topic", + "type": "QString", + "defaultValue": "" + }, + { + "id": "acb19fba-d140-4ff1-b4ec-3b933c04417e", + "name": "willMessage", + "displayName": "Will message", + "type": "QString", + "defaultValue": "" + }, + { + "id": "c7fba1f0-a7b0-4162-8b50-fb85697fe678", + "name": "willRetain", + "displayName": "Retain will", + "type": "bool", + "defaultValue": false + }, + { + "id": "470b600d-e1c1-4ae7-83d4-0179600e4187", + "name": "willQoS", + "displayName": "Will QoS", + "type": "uint", + "minValue": 0, + "maxValue": 2, + "defaultValue": 0 } ], "eventTypes": [ From 567a3c9ac8502ebb40d981ed414ac43758d8dc14 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 4 Mar 2022 13:43:31 +0100 Subject: [PATCH 2/2] Add clientId param and fix reconfigure leak --- mqttclient/integrationpluginmqttclient.cpp | 5 ++++- mqttclient/integrationpluginmqttclient.json | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mqttclient/integrationpluginmqttclient.cpp b/mqttclient/integrationpluginmqttclient.cpp index dafed041..37fe5b71 100644 --- a/mqttclient/integrationpluginmqttclient.cpp +++ b/mqttclient/integrationpluginmqttclient.cpp @@ -45,10 +45,13 @@ void IntegrationPluginMqttClient::setupThing(ThingSetupInfo *info) Thing *thing = info->thing(); MqttClient *client = nullptr; + if (m_clients.contains(thing)) { + delete m_clients.take(thing); + } if (thing->thingClassId() == internalMqttClientThingClassId) { client = hardwareManager()->mqttProvider()->createInternalClient(thing->id().toString()); } else if (thing->thingClassId() == mqttClientThingClassId){ - client = new MqttClient("nymea-" + thing->id().toString().remove(QRegExp("[{}]")).left(8), this); + client = new MqttClient(thing->paramValue(mqttClientThingClientIdParamTypeId).toString(), this); client->setUsername(thing->paramValue(mqttClientThingUsernameParamTypeId).toString()); client->setPassword(thing->paramValue(mqttClientThingPasswordParamTypeId).toString()); QString willTopic = thing->paramValue(mqttClientThingWillTopicParamTypeId).toString(); diff --git a/mqttclient/integrationpluginmqttclient.json b/mqttclient/integrationpluginmqttclient.json index b3449eb6..05fc103d 100644 --- a/mqttclient/integrationpluginmqttclient.json +++ b/mqttclient/integrationpluginmqttclient.json @@ -114,6 +114,13 @@ "type": "QString", "defaultValue": "" }, + { + "id": "621f9054-2b64-4de9-93d2-65bba96a14a3", + "name": "clientId", + "displayName": "Client Id", + "type": "QString", + "defaultValue": "nymea" + }, { "id": "d8211599-52f7-46f6-a741-a7204b987309", "name": "password",