qolsys-controller 0.0.35__py3-none-any.whl → 0.0.37__py3-none-any.whl

qolsys_controller/controller.py

@@ -9,7 +9,6 @@ from .state import QolsysState
 
 LOGGER = logging.getLogger(__name__)
 
-
 class QolsysController:
 
     def __init__(self) -> None:

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
 
@@ -851,7 +852,7 @@ class QolsysPluginRemote(QolsysPlugin):
         LOGGER.debug("MQTT: Sending zwave_doorlock_set command: EXPERIMENTAL")
         LOGGER.debug("MQTT: Sending zwave_doorlock_set command - Node(%s) - Locked(%s)",node_id,locked)
 
-        command = 68
+        command = 98
 
         # 0 unlocked
         # 255 lockeck

{qolsys_controller-0.0.35.dist-info → qolsys_controller-0.0.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qolsys-controller
-Version: 0.0.35
+Version: 0.0.37
 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.dist-info → qolsys_controller-0.0.37.dist-info}/RECORD

@@ -1,5 +1,5 @@
 qolsys_controller/__init__.py,sha256=TkjMFBP9VNyGLC84JQZ_tTeD8nJImkGgPMkQFGr2428,88
-qolsys_controller/controller.py,sha256=rLjMMZBJCPqrE9oY_vZRMFZAsIm5UlXyRtUao3F4Qr0,1309
+qolsys_controller/controller.py,sha256=ssmuRSXXmNW2lGh_G0rzJMqdjBzg1T0gdIo3TFFWjIQ,1308
 qolsys_controller/enum.py,sha256=nxlZEfKqbYFGzqiZnSV81jnNDajzioDcpWXUoZup8nQ,3463
 qolsys_controller/enum_zwave.py,sha256=q10YtzOXW3wfYORU1o7_WhTfb3GpC_xstjHzQAitHJ0,740
 qolsys_controller/errors.py,sha256=Z_eVJ4XqWucdn1lu_83DPnEKEG4L3FMfjhz5iO6RuBM,1176
@@ -11,7 +11,7 @@ qolsys_controller/partition.py,sha256=ZRSWDqXE1aPlTvxwSbvp28OyOXgTYOUH73zOtZFHII
 qolsys_controller/pki.py,sha256=_e0tiNF8Hypb37cHr7x8yqUZDaqbzRzP45AitTtmzk4,8663
 qolsys_controller/plugin.py,sha256=Qh0irFbuw9R2QF3jOFTJw70ceVxK1ld5_sW7VnpOrA8,819
 qolsys_controller/plugin_c4.py,sha256=71o5Y7Y13GO0vWCPIsCtpqXxrplryyqt8ua5L8F4StQ,382
-qolsys_controller/plugin_remote.py,sha256=EBOI6RzwtpCRDllsJRL2kR5z784YjmZh7rHMBoCeVgs,49505
+qolsys_controller/plugin_remote.py,sha256=r0B8VG4UXMENW2Vq-hRGvhUiDFwGVSp7bEIcHiTjwtA,49626
 qolsys_controller/scene.py,sha256=b_8pzAJ08L7Nc-vouzkDxZKkcDQ239pLnvSDnN4g_oQ,1899
 qolsys_controller/settings.py,sha256=Drv2Vg84h8ZVWzOIex9xs96AZmWZkBT7cM4yvPJB4zc,6113
 qolsys_controller/state.py,sha256=JncrEQbJxV-fXbP31guTkWiA9rclwTok12vuK9YzUBo,17091
@@ -62,7 +62,7 @@ qolsys_controller/database/table_zwave_association_group.py,sha256=B8SHPU335a2wh
 qolsys_controller/database/table_zwave_history.py,sha256=iLCkRZOsQmc5TQT0-IngyNkrG78kQrEhITPChmNt1bM,942
 qolsys_controller/database/table_zwave_node.py,sha256=5YDHwG139qLUx9BwzCJaqovMgdCcXng0dWOTTa75kQs,2568
 qolsys_controller/database/table_zwave_other.py,sha256=RzWuWMQA3czUNRWAP8SaAk6tiTeUgGl3J97npzW6AA0,573
-qolsys_controller-0.0.35.dist-info/METADATA,sha256=UckR0h2VMw5UiJz5bB8B3ZCWDx85RFqQ_Kx6ywW8bLU,4329
-qolsys_controller-0.0.35.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qolsys_controller-0.0.35.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
-qolsys_controller-0.0.35.dist-info/RECORD,,
+qolsys_controller-0.0.37.dist-info/METADATA,sha256=A9GeFw7WIf1e80E17CEi9h3LJRY_oqREe_vG29mO9fU,4329
+qolsys_controller-0.0.37.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qolsys_controller-0.0.37.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
+qolsys_controller-0.0.37.dist-info/RECORD,,