qolsys-controller 0.0.7__tar.gz → 0.0.9__tar.gz

{qolsys_controller-0.0.7 → qolsys_controller-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qolsys-controller
-Version: 0.0.7
+Version: 0.0.9
 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.7 → qolsys_controller-0.0.9}/pyproject.toml

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

{qolsys_controller-0.0.7 → qolsys_controller-0.0.9}/qolsys_controller/panel.py

@@ -818,7 +818,6 @@ class QolsysPanel(QolsysObservable):
         LOGGER.debug("Android Version: %s", self.ANDROID_VERSION)
         LOGGER.debug("Hardware Version: %s", self.HARDWARE_VERSION)
         LOGGER.debug("MAC Address: %s", self.MAC_ADDRESS)
-        LOGGER.debug("MQTT remoteClientID: %s", self._settings.mqtt_remote_client_id)
         LOGGER.debug("Unique ID: %s", self.unique_id)
         LOGGER.debug("Panel Tamper State: %s", self.PANEL_TAMPER_STATE)
         LOGGER.debug("AC Status: %s", self.AC_STATUS)

{qolsys_controller-0.0.7 → qolsys_controller-0.0.9}/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.7 → qolsys_controller-0.0.9}/qolsys_controller/plugin_remote.py

@@ -112,6 +112,7 @@ class QolsysPluginRemote(QolsysPlugin):
 
         # 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():
@@ -207,7 +208,6 @@ class QolsysPluginRemote(QolsysPlugin):
                 self.panel.imei = response_connect.get("master_imei", "")
                 self.panel.product_type = response_connect.get("primary_product_type", "")
 
-                await self.command_pairing_request()
                 await self.command_pingevent()
                 await self.command_timesync()
                 await self.command_pair_status_request()
@@ -490,11 +490,12 @@ class QolsysPluginRemote(QolsysPlugin):
 
         payload = {
             "eventName": eventName,
+            "pairing_request": True,
             "ipAddress": ipAddress,
             "macAddress": macAddress,
             "remoteClientID": remoteClientID,
             "softwareVersion": softwareVersion,
-            "producType": producType,
+            "productType": producType,
             "bssid": bssid,
             "dhcpInfo": json.dumps(dhcpInfo),
             "lastUpdateChecksum": lastUpdateChecksum,
@@ -689,9 +690,9 @@ class QolsysPluginRemote(QolsysPlugin):
         pairing_request = True
         ipAddress = self.settings.plugin_ip
         macAddress = self.settings.random_mac
-        remoteClientID = "QolsysController"
+        remoteClientID = self.settings.mqtt_remote_client_id
         softwareVersion = "4.4.1"
-        producType = "tab07_rk68"
+        productType = "tab07_rk68"
         bssid = ""
         lastUpdateChecksum = "2132501716"
         dealerIconsCheckSum = ""
@@ -717,7 +718,7 @@ class QolsysPluginRemote(QolsysPlugin):
             "macAddress": macAddress,
             "remoteClientID": remoteClientID,
             "softwareVersion": softwareVersion,
-            "producType": producType,
+            "producType": productType,
             "bssid": bssid,
             "dhcpInfo": json.dumps(dhcpInfo),
             "lastUpdateChecksum": lastUpdateChecksum,

{qolsys_controller-0.0.7 → qolsys_controller-0.0.9}/qolsys_controller/settings.py

@@ -24,7 +24,7 @@ class QolsysSettings:
 
         # MQTT
         self._mqtt_timeout: int = 30
-        self._mqtt_ping: int = 15
+        self._mqtt_ping: int = 600
         self._mqtt_remote_client_id = ""
 
     @property
@@ -33,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:
@@ -90,6 +90,10 @@ 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