From fb9dc9997a354127f3e8b789e14c969b1095b46e Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Wed, 18 Sep 2019 23:24:56 +0200
Subject: [PATCH] Update MQTT client plugin

---
 mqttclient/devicepluginmqttclient.cpp | 35 ++++++++++++---------------
 mqttclient/devicepluginmqttclient.h   |  8 ++----
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/mqttclient/devicepluginmqttclient.cpp b/mqttclient/devicepluginmqttclient.cpp
index c71f7784..a0d25fb6 100644
--- a/mqttclient/devicepluginmqttclient.cpp
+++ b/mqttclient/devicepluginmqttclient.cpp
@@ -32,8 +32,10 @@ DevicePluginMqttClient::DevicePluginMqttClient()
 
 }
 
-Device::DeviceSetupStatus DevicePluginMqttClient::setupDevice(Device *device)
+void DevicePluginMqttClient::setupDevice(DeviceSetupInfo *info)
 {
+    Device *device = info->device();
+
     MqttClient *client = nullptr;
     if (device->deviceClassId() == internalMqttClientDeviceClassId) {
         client = hardwareManager()->mqttProvider()->createInternalClient(device->id());
@@ -48,23 +50,22 @@ Device::DeviceSetupStatus DevicePluginMqttClient::setupDevice(Device *device)
     connect(client, &MqttClient::connected, this, [this, device](){
         subscribe(device);
     });
-    connect(client, &MqttClient::subscribeResult, this, [this, device](quint16 packetId, const Mqtt::SubscribeReturnCodes returnCodes){
-        Q_UNUSED(packetId)
-        emit deviceSetupFinished(device, returnCodes.first() == Mqtt::SubscribeReturnCodeFailure ? Device::DeviceSetupStatusFailure : Device::DeviceSetupStatusSuccess);
+    connect(client, &MqttClient::subscribeResult, info, [info](quint16 /*packetId*/, const Mqtt::SubscribeReturnCodes returnCodes){
+        info->finish(returnCodes.first() == Mqtt::SubscribeReturnCodeFailure ? Device::DeviceErrorHardwareFailure : Device::DeviceErrorNoError);
     });
     connect(client, &MqttClient::publishReceived, this, &DevicePluginMqttClient::publishReceived);
-    connect(client, &MqttClient::published, this, &DevicePluginMqttClient::published);
     // In case we're already connected, manually call subscribe now
     if (client->isConnected()) {
         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 payloadParamTypeId = internalMqttClientTriggerActionDataParamTypeId;
     ParamTypeId qosParamTypeId = internalMqttClientTriggerActionQosParamTypeId;
@@ -80,7 +81,7 @@ Device::DeviceError DevicePluginMqttClient::executeAction(Device *device, const
     MqttClient *client = m_clients.value(device);
     if (!client) {
         qCWarning(dcMqttclient) << "No valid MQTT client for device" << device->name();
-        return Device::DeviceErrorDeviceNotFound;
+        return info->finish(Device::DeviceErrorDeviceNotFound);
     }
     Mqtt::QoS qos = Mqtt::QoS0;
     switch (action.param(qosParamTypeId).value().toInt()) {
@@ -98,9 +99,12 @@ Device::DeviceError DevicePluginMqttClient::executeAction(Device *device, const
                     action.param(payloadParamTypeId).value().toByteArray(),
                     qos,
                     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)
@@ -140,15 +144,6 @@ void DevicePluginMqttClient::publishReceived(const QString &topic, const QByteAr
     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)
 {
     qCDebug(dcMqttclient) << device;
diff --git a/mqttclient/devicepluginmqttclient.h b/mqttclient/devicepluginmqttclient.h
index 20c5403c..19465b4c 100644
--- a/mqttclient/devicepluginmqttclient.h
+++ b/mqttclient/devicepluginmqttclient.h
@@ -40,22 +40,18 @@ class DevicePluginMqttClient: public DevicePlugin
 public:
     explicit DevicePluginMqttClient();
 
-    Device::DeviceSetupStatus setupDevice(Device *device) override;
+    void setupDevice(DeviceSetupInfo *info) override;
     void deviceRemoved(Device *device) override;
 
-    Device::DeviceError executeAction(Device *device, const Action &action) override;
+    void executeAction(DeviceActionInfo *info) override;
 
 private slots:
     void subscribe(Device *device);
 
     void publishReceived(const QString &topic, const QByteArray &payload, bool retained);
-    void published(quint16 packetId);
-
 
 private:
     QHash<Device*, MqttClient*> m_clients;
-
-    QHash<quint16, Action> m_pendingPublishes;
 };
 
 #endif // DEVICEPLUGINMQTTCLIENT_H