ETM-Schurig
/
powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MqttClient: Add keep alive timeout parameter

master
Michael Zanetti 2023-09-11 17:36:46 +02:00
parent 10c54614d6
commit c0211133e4
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mqttclient/integrationpluginmqttclient.cpp
View File

@ -56,9 +56,10 @@ void IntegrationPluginMqttClient::setupThing(ThingSetupInfo *info)
} }
} else if (thing->thingClassId() == mqttClientThingClassId){ } else if (thing->thingClassId() == mqttClientThingClassId){
client = new MqttClient(thing->paramValue(mqttClientThingClientIdParamTypeId).toString(), this); client = new MqttClient(thing->paramValue(mqttClientThingClientIdParamTypeId).toString(), thing);
client->setUsername(thing->paramValue(mqttClientThingUsernameParamTypeId).toString()); client->setUsername(thing->paramValue(mqttClientThingUsernameParamTypeId).toString());
client->setPassword(thing->paramValue(mqttClientThingPasswordParamTypeId).toString()); client->setPassword(thing->paramValue(mqttClientThingPasswordParamTypeId).toString());
client->setKeepAlive(thing->paramValue(mqttClientThingKeepAliveParamTypeId).toUInt());
QString willTopic = thing->paramValue(mqttClientThingWillTopicParamTypeId).toString(); QString willTopic = thing->paramValue(mqttClientThingWillTopicParamTypeId).toString();
if (!willTopic.isEmpty()) { if (!willTopic.isEmpty()) {
client->setWillTopic(willTopic); client->setWillTopic(willTopic);
@ -66,6 +67,7 @@ void IntegrationPluginMqttClient::setupThing(ThingSetupInfo *info)
client->setWillQoS(static_cast<Mqtt::QoS>(thing->paramValue(mqttClientThingWillQoSParamTypeId).toInt())); client->setWillQoS(static_cast<Mqtt::QoS>(thing->paramValue(mqttClientThingWillQoSParamTypeId).toInt()));
client->setWillRetain(thing->paramValue(mqttClientThingWillRetainParamTypeId).toBool()); client->setWillRetain(thing->paramValue(mqttClientThingWillRetainParamTypeId).toBool());
} }
qCDebug(dcMqttclient()) << "Connecting to" << thing->paramValue(mqttClientThingServerAddressParamTypeId).toString() << thing->paramValue(mqttClientThingServerPortParamTypeId).toInt() << "SSL:" << thing->paramValue(mqttClientThingUseSslParamTypeId).toBool() << "user:" << thing->paramValue(mqttClientThingUsernameParamTypeId).toString() << "Client ID:" << thing->paramValue(mqttClientThingClientIdParamTypeId).toString();
client->connectToHost(thing->paramValue(mqttClientThingServerAddressParamTypeId).toString(), client->connectToHost(thing->paramValue(mqttClientThingServerAddressParamTypeId).toString(),
thing->paramValue(mqttClientThingServerPortParamTypeId).toInt(), thing->paramValue(mqttClientThingServerPortParamTypeId).toInt(),
true, true,
@ -77,7 +79,7 @@ void IntegrationPluginMqttClient::setupThing(ThingSetupInfo *info)
qCWarning(dcMqttclient()) << "An error happened during setup:" << 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.")); 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](){ connect(client, &MqttClient::connected, thing, [this, thing](){
subscribe(thing); subscribe(thing);
}); });
connect(client, &MqttClient::subscribeResult, info, [info](quint16 /*packetId*/, const Mqtt::SubscribeReturnCodes returnCodes){ connect(client, &MqttClient::subscribeResult, info, [info](quint16 /*packetId*/, const Mqtt::SubscribeReturnCodes returnCodes){

10
mqttclient/integrationpluginmqttclient.json
View File

@ -171,6 +171,16 @@
"minValue": 0, "minValue": 0,
"maxValue": 2, "maxValue": 2,
"defaultValue": 0 "defaultValue": 0
},
{
"id": "85dd719a-06f6-4104-9f7a-c7feabd34fbe",
"name": "keepAlive",
"displayName": "Keep alive",
"unit": "Seconds",
"type": "uint",
"minValue": 0,
"maxValue": 65535,
"defaultValue": 60
} }
], ],
"eventTypes": [ "eventTypes": [