config: add support for qos and retain in mqtt

mqtt:
    # ip/dns for the mqtt broker
    host: <broker_ip_or_dns_name>
    # uncomment to publish with retain
    retain: true
    # specify qos value (default is 0)
    qos: 1

Fixes: #7
Signed-off-by: Flavio Fernandes <[email protected]>

README.md

@@ -13,6 +13,8 @@ mqtt:
     host: 192.168.1.250
     username: <optional mqtt username>
     password: <optional mqtt password>
+    # retain: false
+    # qos: 0
 globals:
     # every location will be managed using a unique mqtt topic
     # unless explicitly specified, this format will be used

data/config.yaml

@@ -8,6 +8,10 @@ knobs:
 mqtt:
     # ip/dns for the mqtt broker
     host: 192.168.1.250
+    # uncomment to publish with retain
+    # retain: true
+    # specify qos value (default is 0)
+    # qos: 1
 globals:
     # every location will be managed using a unique mqtt topic
     # unless explicitly specified, this format will be used

mqtt2kasa/config.py

@@ -47,6 +47,20 @@ def mqtt_password(self):
             return attr.get("password", None)
         return None
 
+    @property
+    def mqtt_retain(self):
+        attr = self._get_info().mqtt
+        if isinstance(attr, collections.abc.Mapping):
+            return attr.get("retain", False)
+        return False
+
+    @property
+    def mqtt_qos(self):
+        attr = self._get_info().mqtt
+        if isinstance(attr, collections.abc.Mapping):
+            return attr.get("qos", 0)
+        return 0
+
     @property
     def reconnect_interval(self):
         attr = self._get_info().mqtt

mqtt2kasa/mqtt.py

@@ -1,18 +1,27 @@
 import asyncio
 
 from mqtt2kasa import log
+from mqtt2kasa.config import Cfg
 from mqtt2kasa.events import MqttMsgEvent
 
 logger = log.getLogger()
 
 
 async def handle_mqtt_publish(client, mqtt_send_q: asyncio.Queue):
+    c = Cfg()
+    mqtt_qos = c.mqtt_qos
+    mqtt_retain = c.mqtt_retain
+    logger.info(
+        f"handle_mqtt_publish task started. Using retain:{mqtt_retain} and qos:{mqtt_qos}"
+    )
     while True:
         mqtt_msg = await mqtt_send_q.get()
         topic, payload = mqtt_msg.topic, mqtt_msg.payload
         # logger.debug(f"Publishing: {topic} {payload}")
         try:
-            await client.publish(topic, payload, timeout=15)
+            await client.publish(
+                topic, payload, timeout=15, qos=mqtt_qos, retain=mqtt_retain
+            )
             logger.debug(f"Published: {topic} {payload}")
         except Exception as e:
             logger.error("client failed publish mqtt %s %s : %s", topic, payload, e)