From 66399a034ffa40044680167f24517edf9cb4b5b3 Mon Sep 17 00:00:00 2001 From: Mal Harwood Date: Fri, 9 Dec 2022 11:29:43 +0800 Subject: [PATCH 1/3] QOS & Retain variables --- devices/tuya-device.js | 10 +++++++++- tuya-mqtt.js | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/devices/tuya-device.js b/devices/tuya-device.js index c92adda..db20dba 100644 --- a/devices/tuya-device.js +++ b/devices/tuya-device.js @@ -11,6 +11,8 @@ class TuyaDevice { this.config = deviceInfo.configDevice this.mqttClient = deviceInfo.mqttClient this.topic = deviceInfo.topic + this.qos = deviceInfo.qos + this.retain = deviceInfo.retain // Build TuyAPI device options from device config info this.options = { @@ -634,8 +636,14 @@ class TuyaDevice { // Publish MQTT publishMqtt(topic, message, isDebug) { + var options = { + qos: this.qos, + retain: this.retain + } + if (isDebug) { debugState(topic, message) } - this.mqttClient.publish(topic, message, { qos: 1 }); + #this.mqttClient.publish(topic, message, { qos: 1 }); + this.mqttClient.publish(topic, message, options); } } diff --git a/tuya-mqtt.js b/tuya-mqtt.js index 47a6dde..087ab26 100644 --- a/tuya-mqtt.js +++ b/tuya-mqtt.js @@ -35,7 +35,9 @@ function getDevice(configDevice, mqttClient) { const deviceInfo = { configDevice: configDevice, mqttClient: mqttClient, - topic: CONFIG.topic + topic: CONFIG.topic, + qos: CONFIG.qos, + retain: CONFIG.retain } switch (configDevice.type) { case 'SimpleSwitch': From b7ee44e708ba96d763964fd3d667d5ba1960e9a7 Mon Sep 17 00:00:00 2001 From: Mal Harwood Date: Fri, 9 Dec 2022 11:37:38 +0800 Subject: [PATCH 2/3] Fixed up typo! --- devices/tuya-device.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/tuya-device.js b/devices/tuya-device.js index db20dba..9adae11 100644 --- a/devices/tuya-device.js +++ b/devices/tuya-device.js @@ -642,7 +642,7 @@ class TuyaDevice { } if (isDebug) { debugState(topic, message) } - #this.mqttClient.publish(topic, message, { qos: 1 }); + //this.mqttClient.publish(topic, message, { qos: 1 }); this.mqttClient.publish(topic, message, options); } } From 376398644e61952cea4b6ff4268befc1b4bfe80a Mon Sep 17 00:00:00 2001 From: Mal Harwood Date: Fri, 9 Dec 2022 11:40:24 +0800 Subject: [PATCH 3/3] removed old code --- devices/tuya-device.js | 1 - 1 file changed, 1 deletion(-) diff --git a/devices/tuya-device.js b/devices/tuya-device.js index 9adae11..9892c64 100644 --- a/devices/tuya-device.js +++ b/devices/tuya-device.js @@ -642,7 +642,6 @@ class TuyaDevice { } if (isDebug) { debugState(topic, message) } - //this.mqttClient.publish(topic, message, { qos: 1 }); this.mqttClient.publish(topic, message, options); } }