pyg90alarm 1.15.0__py3-none-any.whl → 1.15.2__py3-none-any.whl

pyg90alarm/alarm.py

@@ -60,7 +60,8 @@ from .const import (
     G90Commands, REMOTE_PORT,
     REMOTE_TARGETED_DISCOVERY_PORT,
     LOCAL_TARGETED_DISCOVERY_PORT,
-    NOTIFICATIONS_PORT,
+    LOCAL_NOTIFICATIONS_HOST,
+    LOCAL_NOTIFICATIONS_PORT,
     G90ArmDisarmTypes,
 )
 from .base_cmd import (G90BaseCommand, G90BaseCommandData)
@@ -100,22 +101,25 @@ if TYPE_CHECKING:
         Callable[[int, str, bool], None],
         Callable[[int, str, bool], Coroutine[None, None, None]]
     ]
-    SensorStateCallback = Union[
-        Callable[[bool], None],
-        Callable[[bool], Coroutine[None, None, None]]
-    ]
     LowBatteryCallback = Union[
         Callable[[int, str], None],
         Callable[[int, str], Coroutine[None, None, None]]
     ]
-    SensorLowBatteryCallback = Union[
-        Callable[[bool], None],
-        Callable[[bool], Coroutine[None, None, None]]
-    ]
     ArmDisarmCallback = Union[
         Callable[[G90ArmDisarmTypes], None],
         Callable[[G90ArmDisarmTypes], Coroutine[None, None, None]]
     ]
+    # Sensor-related callbacks for `G90Sensor` class - despite that class
+    # stores them, the invication is done by the `G90Alarm` class hence these
+    # are defined here
+    SensorStateCallback = Union[
+        Callable[[bool], None],
+        Callable[[bool], Coroutine[None, None, None]]
+    ]
+    SensorLowBatteryCallback = Union[
+        Callable[[], None],
+        Callable[[], Coroutine[None, None, None]]
+    ]
 
 
 # pylint: disable=too-many-public-methods
@@ -137,11 +141,14 @@ class G90Alarm(G90DeviceNotifications):
     # pylint: disable=too-many-instance-attributes,too-many-arguments
     def __init__(self, host: str, port: int = REMOTE_PORT,
                  reset_occupancy_interval: float = 3.0,
-                 notifications_host: str = '0.0.0.0',
-                 notifications_port: int = NOTIFICATIONS_PORT):
-        super().__init__(host=notifications_host, port=notifications_port)
-        self._host = host
-        self._port = port
+                 notifications_local_host: str = LOCAL_NOTIFICATIONS_HOST,
+                 notifications_local_port: int = LOCAL_NOTIFICATIONS_PORT):
+        super().__init__(
+            local_host=notifications_local_host,
+            local_port=notifications_local_port
+        )
+        self._host: str = host
+        self._port: int = port
         self._sensors: List[G90Sensor] = []
         self._devices: List[G90Device] = []
         self._notifications: Optional[G90DeviceNotifications] = None
@@ -333,7 +340,9 @@ class G90Alarm(G90DeviceNotifications):
         :return: Device information
         """
         res = await self.command(G90Commands.GETHOSTINFO)
-        return G90HostInfo(*res)
+        info = G90HostInfo(*res)
+        self.device_id = info.host_guid
+        return info
 
     @property
     async def host_status(self) -> G90HostStatus:
@@ -810,7 +819,7 @@ class G90Alarm(G90DeviceNotifications):
                         # code as alert, as if it came from the device and its
                         # notifications port
                         self._handle_alert(
-                            (self._host, self._notifications_port),
+                            (self._host, self._notifications_local_port),
                             item.as_device_alert()
                         )
 

pyg90alarm/const.py

@@ -28,7 +28,8 @@ from typing import Optional
 REMOTE_PORT = 12368
 REMOTE_TARGETED_DISCOVERY_PORT = 12900
 LOCAL_TARGETED_DISCOVERY_PORT = 12901
-NOTIFICATIONS_PORT = 12901
+LOCAL_NOTIFICATIONS_HOST = '0.0.0.0'
+LOCAL_NOTIFICATIONS_PORT = 12901
 
 CMD_PAGE_SIZE = 10
 

pyg90alarm/device_notifications.py

@@ -41,7 +41,6 @@ from .const import (
     G90AlertStates,
 )
 
-
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -107,12 +106,29 @@ class G90DeviceAlert:  # pylint: disable=too-many-instance-attributes
 class G90DeviceNotifications(DatagramProtocol):
     """
     Implements support for notifications/alerts sent by alarm panel.
+
+    There is a basic check to ensure only notifications/alerts from the correct
+    device are processed - the check uses the host and port of the device, and
+    the device ID (GUID) that is set by the ancestor class that implements the
+    commands (e.g. :class:`G90Alarm`). The latter to work correctly needs a
+    command to be performed first, one that fetches device GUID and then stores
+    it using :attr:`.device_id` (e.g. :meth:`G90Alarm.get_host_info`).
     """
-    def __init__(self, port: int, host: str):
+    def __init__(self, local_port: int, local_host: str):
         # pylint: disable=too-many-arguments
         self._notification_transport: Optional[BaseTransport] = None
-        self._notifications_host = host
-        self._notifications_port = port
+        self._notifications_local_host = local_host
+        self._notifications_local_port = local_port
+        # Host/port of the device is configured to communicating via commands.
+        # Inteded to validate if notifications/alert are received from the
+        # correct device.
+        self._host: Optional[str] = None
+        self._port: Optional[int] = None
+        # Same but for device ID (GUID) - the notifications logic uses it to
+        # perform validation, but doesn't set it from messages received (it
+        # will diminish the purpose of the validation, should be done by an
+        # ancestor class).
+        self._device_id: Optional[str] = None
 
     def _handle_notification(
         self, addr: Tuple[str, int], notification: G90Notification
@@ -145,6 +161,15 @@ class G90DeviceNotifications(DatagramProtocol):
     def _handle_alert(
         self, addr: Tuple[str, int], alert: G90DeviceAlert
     ) -> None:
+        # Stop processing when alert is received from the device with different
+        # GUID
+        if self.device_id and alert.device_id != self.device_id:
+            _LOGGER.error(
+                "Received alert from wrong device: expected '%s', got '%s'",
+                self.device_id, alert.device_id
+            )
+            return
+
         if alert.type == G90AlertTypes.DOOR_OPEN_CLOSE:
             if alert.state in (
                 G90AlertStates.DOOR_OPEN, G90AlertStates.DOOR_CLOSE
@@ -219,10 +244,17 @@ class G90DeviceNotifications(DatagramProtocol):
     def datagram_received(  # pylint:disable=R0911
         self, data: bytes, addr: Tuple[str, int]
     ) -> None:
-
         """
-        Invoked from datagram is received from the device.
+        Invoked when datagram is received from the device.
         """
+        if self._host and self._host != addr[0]:
+            _LOGGER.error(
+                "Received notification/alert from wrong host '%s',"
+                " expected from '%s'",
+                addr[0], self._host
+            )
+            return
+
         s_data = data.decode('utf-8')
         if not s_data.endswith('\0'):
             _LOGGER.error('Missing end marker in data')
@@ -304,13 +336,13 @@ class G90DeviceNotifications(DatagramProtocol):
             loop = asyncio.get_event_loop()
 
         _LOGGER.debug('Creating UDP endpoint for %s:%s',
-                      self._notifications_host,
-                      self._notifications_port)
+                      self._notifications_local_host,
+                      self._notifications_local_port)
         (self._notification_transport,
          _protocol) = await loop.create_datagram_endpoint(
             lambda: self,
             local_addr=(
-                self._notifications_host, self._notifications_port
+                self._notifications_local_host, self._notifications_local_port
             ))
 
     @property
@@ -328,3 +360,17 @@ class G90DeviceNotifications(DatagramProtocol):
             _LOGGER.debug('No longer listening for device notifications')
             self._notification_transport.close()
             self._notification_transport = None
+
+    @property
+    def device_id(self) -> Optional[str]:
+        """
+        The ID (GUID) of the panel being communicated with thru commands.
+
+        Available when any panel command receives it from the device
+        (:meth:`G90Alarm.get_host_info` currently).
+        """
+        return self._device_id
+
+    @device_id.setter
+    def device_id(self, device_id: str) -> None:
+        self._device_id = device_id

{pyg90alarm-1.15.0.dist-info → pyg90alarm-1.15.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyg90alarm
-Version: 1.15.0
+Version: 1.15.2
 Summary: G90 Alarm system protocol
 Home-page: https://github.com/hostcc/pyg90alarm
 Author: Ilia Sotnikov

{pyg90alarm-1.15.0.dist-info → pyg90alarm-1.15.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 pyg90alarm/__init__.py,sha256=5AITRm5jZSzuQaL7PS8fZZMZb4-IuGRhSqyAdfTt0Cs,2236
-pyg90alarm/alarm.py,sha256=jCxNzyjfnCUfJl6bSvXih-0YoNtz66EbsYhUvlElFxs,32044
+pyg90alarm/alarm.py,sha256=VssyGxYXb-r-fb8TdN2NfLaIPr1Zq8ogdGUV521bjsQ,32414
 pyg90alarm/base_cmd.py,sha256=wu2v_RKpcPHxUW4HBDLWcUFMzPsGooY4o2Rc0LgcanU,9754
 pyg90alarm/callback.py,sha256=3JsD_JChmZD24OyjaCP-PxxuBDBX7myGYhkM4RN7bk4,3742
 pyg90alarm/config.py,sha256=2YtIgdT7clQXmYvkdn_fhIdS05CY8E1Yc90R8_tAmRI,1961
-pyg90alarm/const.py,sha256=4eJyEZpUE5XZkNL1sePKnuPloIvcjKIAJJ4g2e1cXVA,6054
-pyg90alarm/device_notifications.py,sha256=I5K8IsyYTe0XDJT8XiQoC8a2xY1XLjaGx4QFrEsaixg,11135
+pyg90alarm/const.py,sha256=1nzx2rueRdAdv1J5nsfS-c_9a4tcM4_z5sWwCNG7tiQ,6097
+pyg90alarm/device_notifications.py,sha256=1nOeG-YrtaoD5wsJUfUM1kV7JIXv3KwnN2QuJ-C--kQ,13238
 pyg90alarm/discovery.py,sha256=fwyBHDCKGej06OwhpbVCHYTRU9WWkeYysAFgv3FiwqI,3575
 pyg90alarm/exceptions.py,sha256=eiOcRe7D18EIPyPFDNU9DdFgbnkwPmkiLl8lGPOhBNw,1475
 pyg90alarm/history.py,sha256=GnCVRsQNV2x9g6KngBBvvIUnTAIyXKX2nVKF_aFA0oM,7160
@@ -20,8 +20,8 @@ pyg90alarm/definitions/sensors.py,sha256=rKOu21ZpI44xk6aMh_vBjniFqnsNTc1CKwAvnv4
 pyg90alarm/entities/__init__.py,sha256=hHb6AOiC4Tz--rOWiiICMdLaZDs1Tf_xpWk_HeS_gO4,66
 pyg90alarm/entities/device.py,sha256=f_LHvKCAqTEebZ4mrRh3CpPUI7o-OvpvOfyTRCbftJs,2818
 pyg90alarm/entities/sensor.py,sha256=4r8ouAYTZB8ih8I4ncWdQOaifYsRxaC-ukY9jvnrRvk,16139
-pyg90alarm-1.15.0.dist-info/LICENSE,sha256=f884inRbeNv-O-hbwz62Ro_1J8xiHRTnJ2cCx6A0WvU,1070
-pyg90alarm-1.15.0.dist-info/METADATA,sha256=-NPVNpOmAXyptTOMERM1rWW81EtU0BnXMsklnSsbaqg,7663
-pyg90alarm-1.15.0.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-pyg90alarm-1.15.0.dist-info/top_level.txt,sha256=czHiGxYMyTk5QEDTDb0EpPiKqUMRa8zI4zx58Ii409M,11
-pyg90alarm-1.15.0.dist-info/RECORD,,
+pyg90alarm-1.15.2.dist-info/LICENSE,sha256=f884inRbeNv-O-hbwz62Ro_1J8xiHRTnJ2cCx6A0WvU,1070
+pyg90alarm-1.15.2.dist-info/METADATA,sha256=8aflU3AAg8Jb3a0wsqqyumSJPnO_HokLb3ZM3z3coNk,7663
+pyg90alarm-1.15.2.dist-info/WHEEL,sha256=ixB2d4u7mugx_bCBycvM9OzZ5yD7NmPXFRtKlORZS2Y,91
+pyg90alarm-1.15.2.dist-info/top_level.txt,sha256=czHiGxYMyTk5QEDTDb0EpPiKqUMRa8zI4zx58Ii409M,11
+pyg90alarm-1.15.2.dist-info/RECORD,,

{pyg90alarm-1.15.0.dist-info → pyg90alarm-1.15.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (74.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any