mqtt v2

aivclab · May 27, 2024 · 2d73448 · 2d73448
1 parent 44accb7
commit 2d73448
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/heimdallr/configuration/heimdallr_config.py b/heimdallr/configuration/heimdallr_config.py
@@ -52,9 +52,9 @@
     vision="https://travis-ci.com/aivclab/vision.svg?branch=master",
     RayKarsten="https://github.com/aivclab/RayKarstenWebAsm.svg",
     dmr="https://github.com/aivclab/dmr.svg",
-).as_dict()
+)  # .as_dict()
 BUILD_STATUS_INTERVAL = "build-status-interval"
 
 DEBUG = True
 
-ALL_CONSTANTS = NOD(locals()).as_dict()
+ALL_CONSTANTS = NOD(locals())  # .as_dict()
diff --git a/heimdallr/entry_points/publisher.py b/heimdallr/entry_points/publisher.py
@@ -69,18 +69,26 @@ def main(setting_scope: SettingScopeEnum = SettingScopeEnum.user) -> None:
             / f"{PROJECT_NAME}_publisher.log"
         )
     LOG_WRITER.open()
-    client = mqtt.Client(HOSTNAME)
+    client = mqtt.Client(
+        client_id=HOSTNAME,
+        # userdata=None,
+        protocol=mqtt.MQTTv5,
+    )
     client.on_publish = on_publish
-    client.on_disconnect = on_disconnect
+    # client.on_disconnect = on_disconnect
 
     heimdallr_settings = HeimdallrSettings(setting_scope)
 
+    client.tls_set(tls_version=mqtt.ssl.PROTOCOL_TLS)
+
     client.username_pw_set(
         heimdallr_settings.mqtt_username, heimdallr_settings.mqtt_password
     )
     try:
         client.connect(
-            heimdallr_settings.mqtt_broker, heimdallr_settings.mqtt_port, keepalive=60
+            heimdallr_settings.mqtt_broker,
+            int(heimdallr_settings.mqtt_port),
+            keepalive=60,
         )
     except ValueError as ve:
         raise ValueError(
@@ -105,7 +113,6 @@ def job():
             sensor_data[HOSTNAME]["du_stats"] = pull_disk_usage_info()
 
             a = sensor_data.as_dict()
-            assert a is dict
             client.publish(
                 ALL_CONSTANTS.MQTT_TOPIC,
                 json.dumps(a),

diff --git a/heimdallr/entry_points/server.py b/heimdallr/entry_points/server.py
@@ -23,8 +23,7 @@
 from draugr.writers import LogWriter, MockWriter, Writer
 from flask import Response
 from paho import mqtt
-from paho.mqtt.client import Client
-from paho.mqtt.enums import CallbackAPIVersion
+from paho.mqtt.client import Client, MQTTv5
 from pandas import DataFrame
 from waitress import serve
 from warg import NOD, default_datetime_repr, ensure_existence
@@ -80,10 +79,11 @@
 HOSTNAME = socket.gethostname()
 CLIENT_ID = HOSTNAME
 MQTT_CLIENT = Client(
-    CallbackAPIVersion.VERSION1,
-    CLIENT_ID,
+    client_id=CLIENT_ID,
+    protocol=MQTTv5,
     # clean_session=True
 )
+MQTT_CLIENT.tls_set(tls_version=mqtt.ssl.PROTOCOL_TLS)
 DASH_APP = Dash(
     __name__,
     external_scripts=external_scripts,
@@ -361,7 +361,7 @@ def main(
         )
     LOG_WRITER.open()
     MQTT_CLIENT.on_message = on_message
-    MQTT_CLIENT.on_disconnect = on_disconnect
+    # MQTT_CLIENT.on_disconnect = on_disconnect
 
     if True:
         crystallised_heimdallr_settings = HeimdallrSettings(setting_scope)