qolsys-controller 0.0.5__tar.gz → 0.0.8__tar.gz

{qolsys_controller-0.0.5 → qolsys_controller-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qolsys-controller
-Version: 0.0.5
+Version: 0.0.8
 Summary: A Python module that emulates a virtual IQ Remote device, enabling full local control of a Qolsys IQ Panel
 Project-URL: Homepage, https://github.com/EHylands/QolsysController
 Project-URL: Issues, https://github.com/EHylands/QolsysController/issues
@@ -16,7 +16,7 @@ Description-Content-Type: text/markdown
 
 # Qolsys Controller - qolsys-controller
 
-[![Build](https://github.com/EHylands/QolsysController/actions/workflows/python-app.yml/badge.svg)](https://github.com/EHylands/QolsysController/actions/workflows/python-app.yml)
+[![Build](https://github.com/EHylands/QolsysController/actions/workflows/build.yml/badge.svg)](https://github.com/EHylands/QolsysController/actions/workflows/build.yml)
 
 A Python module that emulates a virtual IQ Remote device, enabling full **local control** of a Qolsys IQ Panel over MQTT — no cloud access required.
 

{qolsys_controller-0.0.5 → qolsys_controller-0.0.8}/README.md

@@ -1,6 +1,6 @@
 # Qolsys Controller - qolsys-controller
 
-[![Build](https://github.com/EHylands/QolsysController/actions/workflows/python-app.yml/badge.svg)](https://github.com/EHylands/QolsysController/actions/workflows/python-app.yml)
+[![Build](https://github.com/EHylands/QolsysController/actions/workflows/build.yml/badge.svg)](https://github.com/EHylands/QolsysController/actions/workflows/build.yml)
 
 A Python module that emulates a virtual IQ Remote device, enabling full **local control** of a Qolsys IQ Panel over MQTT — no cloud access required.
 

{qolsys_controller-0.0.5 → qolsys_controller-0.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "qolsys-controller"
-version = "0.0.5"
+version = "0.0.8"
 authors = [
   { name="Eric Hylands", email="" },
 ]

{qolsys_controller-0.0.5 → qolsys_controller-0.0.8}/qolsys_controller/pki.py

@@ -36,7 +36,7 @@ class QolsysPKI:
         return ":".join(self.id[i:i+2] for i in range(0, len(self.id), 2))
 
     def set_id(self, pki_id: str) -> None:
-        self._id = pki_id.replace(":", "").upper()
+        self._id = pki_id.replace(":", "").lower()
         LOGGER.debug("Using PKI: %s", self.formatted_id())
         self._subkeys_directory = self._settings.pki_directory.joinpath(Path(self.id))
 

{qolsys_controller-0.0.5 → qolsys_controller-0.0.8}/qolsys_controller/plugin_remote.py

@@ -110,6 +110,10 @@ class QolsysPluginRemote(QolsysPlugin):
         else:
             self._pki.set_id(self.settings.random_mac)
 
+        # Set mqtt_remote_client_id
+        self.settings.mqtt_remote_client_id = "qolsys-controller-" + self._pki.formatted_id()
+        LOGGER.debug("Using MQTT remoteClientID: %s", self.settings.mqtt_remote_client_id)
+
         # Check if plugin is paired
         if self.is_paired():
             LOGGER.debug("Panel is Paired")
@@ -133,6 +137,24 @@ class QolsysPluginRemote(QolsysPlugin):
     async def start_operation(self) -> None:
         await self._task_manager.run(self.mqtt_connect_task(reconnect=True), self._mqtt_task_connect_label)
 
+    async def stop_operation(self) -> None:
+        LOGGER.debug("Stopping Plugin Operation")
+
+        if self.certificate_exchange_server is not None:
+            self.certificate_exchange_server.close()
+
+        if self.aiomqtt is not None:
+            await self.aiomqtt.__aexit__(None, None, None)
+            self.aiomqtt = None
+
+        self._task_manager.cancel(self._mqtt_task_connect_label)
+        self._task_manager.cancel(self._mqtt_task_listen_label)
+        self._task_manager.cancel(self._mqtt_task_ping_label)
+        self._task_manager.cancel(self._mqtt_task_config_label)
+
+        self.connected = False
+        self.connected_observer.notify()
+
     async def mqtt_connect_task(self, reconnect: bool) -> None:
         # Configure TLS parameters for MQTT connection
         tls_params = aiomqtt.TLSParameters(
@@ -228,6 +250,7 @@ class QolsysPluginRemote(QolsysPlugin):
         while True:
             if self.aiomqtt is not None and self.connected:
                 await self.command_pingevent()
+
             await asyncio.sleep(self.settings.mqtt_ping)
 
     async def mqtt_listen_task(self) -> None:
@@ -434,7 +457,7 @@ class QolsysPluginRemote(QolsysPlugin):
         ipAddress = self.settings.plugin_ip
         eventName = "connect_v204"
         macAddress = self.settings.random_mac
-        remoteClientID = "QolsysController"
+        remoteClientID = self.settings.mqtt_remote_client_id
         softwareVersion = "4.4.1"
         producType = "tab07_rk68"
         bssid = ""
@@ -646,7 +669,7 @@ class QolsysPluginRemote(QolsysPlugin):
 
         topic = "mastermeid"
         eventName = "disconnect"
-        remoteClientID = "QolsysRemote"
+        remoteClientID = self.settings.mqtt_remote_client_id
         requestID = str(uuid.uuid4())
         remoteMacAddress = self.settings.random_mac
 

{qolsys_controller-0.0.5 → qolsys_controller-0.0.8}/qolsys_controller/settings.py

@@ -25,6 +25,7 @@ class QolsysSettings:
         # MQTT
         self._mqtt_timeout: int = 30
         self._mqtt_ping: int = 600
+        self._mqtt_remote_client_id = ""
 
     @property
     def random_mac(self) -> str:
@@ -32,7 +33,7 @@ class QolsysSettings:
 
     @random_mac.setter
     def random_mac(self, random_mac: str) -> None:
-        self._random_mac = random_mac
+        self._random_mac = random_mac.lower()
 
     @property
     def plugin_ip(self) -> str:
@@ -89,6 +90,18 @@ class QolsysSettings:
     def mqtt_ping(self) -> int:
         return self._mqtt_ping
 
+    @mqtt_ping.setter
+    def mqtt_ping(self, ping:int) -> None:
+        self._mqtt_ping = ping
+
+    @property
+    def mqtt_remote_client_id(self) -> str:
+        return self._mqtt_remote_client_id
+
+    @mqtt_remote_client_id.setter
+    def mqtt_remote_client_id(self,client_id:str) -> None:
+        self._mqtt_remote_client_id = client_id
+
     def check_panel_ip(self) -> bool:
         if self._panel_ip == "":
             LOGGER.debug("Invalid Panel IP:  %s", self._panel_ip)