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

Update MQTT client plugin

Browse Source
This commit is contained in:
Michael Zanetti 2019-09-18 23:24:56 +02:00
parent 68ddae487b
commit fb9dc9997a
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mqttclient/devicepluginmqttclient.cpp
View File

@ -32,8 +32,10 @@ DevicePluginMqttClient::DevicePluginMqttClient()
} }
Device::DeviceSetupStatus DevicePluginMqttClient::setupDevice(Device *device) void DevicePluginMqttClient::setupDevice(DeviceSetupInfo *info)
{ {
Device *device = info->device();
MqttClient *client = nullptr; MqttClient *client = nullptr;
if (device->deviceClassId() == internalMqttClientDeviceClassId) { if (device->deviceClassId() == internalMqttClientDeviceClassId) {
client = hardwareManager()->mqttProvider()->createInternalClient(device->id()); client = hardwareManager()->mqttProvider()->createInternalClient(device->id());
@ -48,23 +50,22 @@ Device::DeviceSetupStatus DevicePluginMqttClient::setupDevice(Device *device)
connect(client, &MqttClient::connected, this, [this, device](){ connect(client, &MqttClient::connected, this, [this, device](){
subscribe(device); subscribe(device);
}); });
connect(client, &MqttClient::subscribeResult, this, [this, device](quint16 packetId, const Mqtt::SubscribeReturnCodes returnCodes){ connect(client, &MqttClient::subscribeResult, info, [info](quint16 /*packetId*/, const Mqtt::SubscribeReturnCodes returnCodes){
Q_UNUSED(packetId) info->finish(returnCodes.first() == Mqtt::SubscribeReturnCodeFailure ? Device::DeviceErrorHardwareFailure : Device::DeviceErrorNoError);
emit deviceSetupFinished(device, returnCodes.first() == Mqtt::SubscribeReturnCodeFailure ? Device::DeviceSetupStatusFailure : Device::DeviceSetupStatusSuccess);
}); });
connect(client, &MqttClient::publishReceived, this, &DevicePluginMqttClient::publishReceived); connect(client, &MqttClient::publishReceived, this, &DevicePluginMqttClient::publishReceived);
connect(client, &MqttClient::published, this, &DevicePluginMqttClient::published);
// In case we're already connected, manually call subscribe now // In case we're already connected, manually call subscribe now
if (client->isConnected()) { if (client->isConnected()) {
subscribe(device); subscribe(device);
} }
return Device::DeviceSetupStatusAsync;
} }
Device::DeviceError DevicePluginMqttClient::executeAction(Device *device, const Action &action) void DevicePluginMqttClient::executeAction(DeviceActionInfo *info)
{ {
Device *device = info->device();
Action action = info->action();
ParamTypeId topicParamTypeId = internalMqttClientTriggerActionTopicParamTypeId; ParamTypeId topicParamTypeId = internalMqttClientTriggerActionTopicParamTypeId;
ParamTypeId payloadParamTypeId = internalMqttClientTriggerActionDataParamTypeId; ParamTypeId payloadParamTypeId = internalMqttClientTriggerActionDataParamTypeId;
ParamTypeId qosParamTypeId = internalMqttClientTriggerActionQosParamTypeId; ParamTypeId qosParamTypeId = internalMqttClientTriggerActionQosParamTypeId;
@ -80,7 +81,7 @@ Device::DeviceError DevicePluginMqttClient::executeAction(Device *device, const
MqttClient *client = m_clients.value(device); MqttClient *client = m_clients.value(device);
if (!client) { if (!client) {
qCWarning(dcMqttclient) << "No valid MQTT client for device" << device->name(); qCWarning(dcMqttclient) << "No valid MQTT client for device" << device->name();
return Device::DeviceErrorDeviceNotFound; return info->finish(Device::DeviceErrorDeviceNotFound);
} }
Mqtt::QoS qos = Mqtt::QoS0; Mqtt::QoS qos = Mqtt::QoS0;
switch (action.param(qosParamTypeId).value().toInt()) { switch (action.param(qosParamTypeId).value().toInt()) {
@ -98,9 +99,12 @@ Device::DeviceError DevicePluginMqttClient::executeAction(Device *device, const
action.param(payloadParamTypeId).value().toByteArray(), action.param(payloadParamTypeId).value().toByteArray(),
qos, qos,
action.param(retainParamTypeId).value().toBool()); action.param(retainParamTypeId).value().toBool());
m_pendingPublishes.insert(packetId, action);
return Device::DeviceErrorAsync; connect(client, &MqttClient::published, info, [info, packetId](quint16 packetIdResult){
if (packetId == packetIdResult) {
info->finish(Device::DeviceErrorNoError);
}
});
} }
void DevicePluginMqttClient::subscribe(Device *device) void DevicePluginMqttClient::subscribe(Device *device)
@ -140,15 +144,6 @@ void DevicePluginMqttClient::publishReceived(const QString &topic, const QByteAr
emitEvent(Event(eventTypeId, device->id(), ParamList() << Param(topicParamTypeId, topic) << Param(payloadParamTypeId, payload))); emitEvent(Event(eventTypeId, device->id(), ParamList() << Param(topicParamTypeId, topic) << Param(payloadParamTypeId, payload)));
} }
void DevicePluginMqttClient::published(quint16 packetId)
{
if (!m_pendingPublishes.contains(packetId)) {
return;
}
emit actionExecutionFinished(m_pendingPublishes.take(packetId).id(), Device::DeviceErrorNoError);
}
void DevicePluginMqttClient::deviceRemoved(Device *device) void DevicePluginMqttClient::deviceRemoved(Device *device)
{ {
qCDebug(dcMqttclient) << device; qCDebug(dcMqttclient) << device;

8
mqttclient/devicepluginmqttclient.h
View File

@ -40,22 +40,18 @@ class DevicePluginMqttClient: public DevicePlugin
public: public:
explicit DevicePluginMqttClient(); explicit DevicePluginMqttClient();
Device::DeviceSetupStatus setupDevice(Device *device) override; void setupDevice(DeviceSetupInfo *info) override;
void deviceRemoved(Device *device) override; void deviceRemoved(Device *device) override;
Device::DeviceError executeAction(Device *device, const Action &action) override; void executeAction(DeviceActionInfo *info) override;
private slots: private slots:
void subscribe(Device *device); void subscribe(Device *device);
void publishReceived(const QString &topic, const QByteArray &payload, bool retained); void publishReceived(const QString &topic, const QByteArray &payload, bool retained);
void published(quint16 packetId);
private: private:
QHash<Device*, MqttClient*> m_clients; QHash<Device*, MqttClient*> m_clients;
QHash<quint16, Action> m_pendingPublishes;
}; };
#endif // DEVICEPLUGINMQTTCLIENT_H #endif // DEVICEPLUGINMQTTCLIENT_H