qolsys-controller 0.0.35__tar.gz → 0.0.36__tar.gz

{qolsys_controller-0.0.35 → qolsys_controller-0.0.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qolsys-controller
-Version: 0.0.35
+Version: 0.0.36
 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

{qolsys_controller-0.0.35 → qolsys_controller-0.0.36}/pyproject.toml

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

{qolsys_controller-0.0.35 → qolsys_controller-0.0.36}/qolsys_controller/plugin_remote.py

@@ -7,8 +7,8 @@ import logging
 import random
 import ssl
 import uuid
-from pathlib import Path
 
+import aiofiles
 import aiomqtt
 
 from .enum import PartitionAlarmState, PartitionSystemStatus
@@ -359,6 +359,7 @@ class QolsysPluginRemote(QolsysPlugin):
 
                 except asyncio.CancelledError:
                     LOGGER.debug("Stoping Certificate Exchange Server")
+                    await self.certificate_exchange_server.wait_closed()
                     LOGGER.debug("Stoping mDNS Service Discovery")
                     await mdns_server.stop_mdns()
 
@@ -402,8 +403,8 @@ class QolsysPluginRemote(QolsysPlugin):
                     await writer.drain()
 
                     # Sending CSR File to panel
-                    with Path.open(self._pki.csr_file_path, "rb") as file:
-                        content = file.read()
+                    async with aiofiles.open(self._pki.csr_file_path, mode='rb') as f:
+                        content = await f.read()
                         LOGGER.debug("Sending to Panel: [CSR File Content]")
                         writer.write(content)
                         writer.write(b"sent")
@@ -415,22 +416,22 @@ class QolsysPluginRemote(QolsysPlugin):
                 if (received_panel_mac and not received_signed_client_certificate and not received_qolsys_cer):
                     request = await reader.readuntil(b"sent")
                     if request.endswith(b"sent"):
-                        request = request[:-5]
+                        request = request[:-4]
 
                     LOGGER.debug("Saving [Signed Client Certificate]")
-                    with Path.open(self._pki.secure_file_path, "wb") as f:
-                        f.write(request)
+                    async with aiofiles.open(self._pki.secure_file_path, mode="wb") as f:
+                        await f.write(request)
                         received_signed_client_certificate = True
 
                 # Read qolsys certificate data
                 if (received_panel_mac and received_signed_client_certificate and not received_qolsys_cer):
                     request = await reader.readuntil(b"sent")
                     if request.endswith(b"sent"):
-                        request = request[:-5]
+                        request = request[:-4]
 
                     LOGGER.debug("Saving [Qolsys Certificate]")
-                    with Path.open(self._pki.qolsys_cer_file_path, "wb") as f:
-                        f.write(request)
+                    async with aiofiles.open(self._pki.qolsys_cer_file_path, mode="wb") as f:
+                        await f.write(request)
                         received_qolsys_cer = True
                         continue_pairing = False
 

qolsys_controller-0.0.36/requirements.txt

@@ -0,0 +1,7 @@
+aiofiles==25.1.0
+aiomqtt==2.4.0
+cffi==1.17.1
+cryptography==45.0.3
+ifaddr==0.2.0
+paho-mqtt==2.1.0
+zeroconf==0.147.0

qolsys_controller-0.0.35/requirements.txt

@@ -1,3 +0,0 @@
-aiomqtt==2.4.0
-cryptography==45.0.6
-zeroconf==0.147.0