replace gmqtt with aiomqtt

Author: bj00rn

poetry.lock

@@ -18,10 +18,10 @@ requires-python = '>=3.12,<4.0'
 dependencies = [
     "saic-ismart-client-ng (>=0.9.2,<0.10.0)",
     'httpx (>=0.28.1,<0.29.0)',
-    'gmqtt (>=0.7.0,<0.8.0)',
     'inflection (>=0.5.1,<0.6.0)',
     'apscheduler (>=3.11.0,<4.0.0)',
     'python-dotenv (>=1.1.1,<2.0.0)',
+    "aiomqtt (>=2.4.0,<3.0.0)",
 ]
 
 [project.urls]

pyproject.toml

@@ -1,14 +1,17 @@
 from __future__ import annotations
 
 from enum import Enum
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Literal
 
 if TYPE_CHECKING:
     from integrations.openwb.charging_station import ChargingStation
 
 
+Transport = Literal["tcp", "websockets"]
+
+
 class TransportProtocol(Enum):
-    def __init__(self, transport_mechanism: str, with_tls: bool) -> None:
+    def __init__(self, transport_mechanism: Transport, with_tls: bool) -> None:
         self.transport_mechanism = transport_mechanism
         self.with_tls = with_tls
 

src/configuration/__init__.py

@@ -102,7 +102,7 @@ def __parse_mqtt_transport(args: Namespace, config: Configuration) -> None:
                     args.tls_server_cert_check_hostname
                 )
         else:
-            msg = f"Invalid MQTT URI scheme: {parse_result.scheme}, use tcp or ws"
+            msg = f"Invalid MQTT URI scheme: {parse_result.scheme}, use tls, tcp or ws"
             raise SystemExit(msg)
 
         if parse_result.port:

src/configuration/parser.py

@@ -7,7 +7,7 @@
 
 MODULES_DEFAULT_LOG_LEVEL = {
     "asyncio": "WARNING",
-    "gmqtt": "WARNING",
+    "aiomqtt": "WARNING",
     "httpcore": "WARNING",
     "httpx": "WARNING",
     "saic_ismart_client_ng": "WARNING",

src/log_config.py

@@ -5,9 +5,15 @@
 import signal
 import sys
 
-from configuration.parser import process_command_line
+from configuration import Configuration, parser
 from mqtt_gateway import MqttGateway
 
+
+async def run(config: Configuration) -> None:
+    mqtt_gateway = MqttGateway(config)
+    await mqtt_gateway.run()
+
+
 if __name__ == "__main__":
     # Keep this at the top!
     from log_config import debug_log_enabled, setup_logging
@@ -18,7 +24,6 @@
     faulthandler.enable(file=sys.stderr, all_threads=True)
     if hasattr(faulthandler, "register") and hasattr(signal, "SIGQUIT"):
         faulthandler.register(signal.SIGQUIT, chain=False)
-    configuration = process_command_line()
+    configuration = parser.process_command_line()
 
-    mqtt_gateway = MqttGateway(configuration)
-    asyncio.run(mqtt_gateway.run(), debug=debug_log_enabled())
+    asyncio.run(run(configuration), debug=debug_log_enabled())