pyg90alarm 1.10.0__py3-none-any.whl → 1.11.0__py3-none-any.whl

pyg90alarm/alarm.py

@@ -54,6 +54,7 @@ from .const import (
     G90Commands, REMOTE_PORT,
     REMOTE_TARGETED_DISCOVERY_PORT,
     LOCAL_TARGETED_DISCOVERY_PORT,
+    NOTIFICATIONS_PORT,
     G90ArmDisarmTypes,
 )
 from .base_cmd import G90BaseCommand
@@ -87,23 +88,18 @@ class G90Alarm:  # pylint: disable=too-many-public-methods
      protocol commands on WiFi interface, currently the devices don't allow it
      to be customized
     :type port: int, optional
-    :param sock: The existing socket to operate on, instead of
-     creating one internally. Primarily used by the tests to mock the network
-     traffic
-    :type sock: socket.socket or None, optional
     :param reset_occupancy_interval: The interval upon that the sensors are
      simulated to go into inactive state.
     :type reset_occupancy_interval: int, optional
     """
     # pylint: disable=too-many-instance-attributes
-    def __init__(self, host, port=REMOTE_PORT, sock=None,
+    def __init__(self, host, port=REMOTE_PORT,
                  reset_occupancy_interval=3):
         self._host = host
         self._port = port
         self._sensors = []
         self._devices = []
         self._notifications = None
-        self._sock = sock
         self._sensor_cb = None
         self._armdisarm_cb = None
         self._door_open_close_cb = None
@@ -124,7 +120,7 @@ class G90Alarm:  # pylint: disable=too-many-public-methods
          command invocation
         """
         cmd = await G90BaseCommand(
-            self._host, self._port, code, data, sock=self._sock).process()
+            self._host, self._port, code, data).process()
         return cmd.result
 
     def paginated_result(self, code, start=1, end=None):
@@ -141,7 +137,7 @@ class G90Alarm:  # pylint: disable=too-many-public-methods
           yields :class:`.G90PaginatedResponse` instance
         """
         return G90PaginatedResult(
-            self._host, self._port, code, start, end, sock=self._sock
+            self._host, self._port, code, start, end
         ).process()
 
     @classmethod
@@ -585,19 +581,19 @@ class G90Alarm:  # pylint: disable=too-many-public-methods
     def alarm_callback(self, value):
         self._alarm_cb = value
 
-    async def listen_device_notifications(self, sock=None):
+    async def listen_device_notifications(
+        self, host='0.0.0.0', port=NOTIFICATIONS_PORT
+    ):
         """
         Starts internal listener for device notifications/alerts.
 
-        :param sock: socket instance to listen on, mostly used by tests
-        :type: socket.socket
         """
         self._notifications = G90DeviceNotifications(
+            host=host, port=port,
             sensor_cb=self._internal_sensor_cb,
             door_open_close_cb=self._internal_door_open_close_cb,
             armdisarm_cb=self._internal_armdisarm_cb,
-            alarm_cb=self._internal_alarm_cb,
-            sock=sock)
+            alarm_cb=self._internal_alarm_cb)
         await self._notifications.listen()
 
     def close_device_notifications(self):

pyg90alarm/base_cmd.py

@@ -110,7 +110,7 @@ class G90BaseCommand:
 
     def __init__(self, host, port, code,
                  data=None, local_port=None,
-                 timeout=3.0, retries=3, sock=None):
+                 timeout=3.0, retries=3):
         """
         tbd
         """
@@ -130,9 +130,8 @@ class G90BaseCommand:
                                     # No whitespace around entities
                                     separators=(',', ':'))
         self._resp = G90Header()
-        self._sock = sock
 
-    def _proto_factory(self):  # pylint: disable=no-self-use
+    def _proto_factory(self):
         """
         tbd
         """
@@ -147,23 +146,17 @@ class G90BaseCommand:
         except AttributeError:
             loop = asyncio.get_event_loop()
 
-        if self._sock:
-            _LOGGER.debug('Using provided socket %s', self._sock)
-            transport, protocol = await loop.create_datagram_endpoint(
-                self._proto_factory,
-                sock=self._sock)
-        else:
-            _LOGGER.debug('Creating UDP endpoint for %s:%s',
-                          self.host, self.port)
-            extra_kwargs = {}
-            if self._local_port:
-                extra_kwargs['local_addr'] = ('0.0.0.0', self._local_port)
-
-            transport, protocol = await loop.create_datagram_endpoint(
-                self._proto_factory,
-                remote_addr=(self.host, self.port),
-                **extra_kwargs,
-                allow_broadcast=True)
+        _LOGGER.debug('Creating UDP endpoint for %s:%s',
+                      self.host, self.port)
+        extra_kwargs = {}
+        if self._local_port:
+            extra_kwargs['local_addr'] = ('0.0.0.0', self._local_port)
+
+        transport, protocol = await loop.create_datagram_endpoint(
+            self._proto_factory,
+            remote_addr=(self.host, self.port),
+            **extra_kwargs,
+            allow_broadcast=True)
 
         return transport, protocol
 

pyg90alarm/const.py

@@ -27,6 +27,7 @@ from enum import IntEnum
 REMOTE_PORT = 12368
 REMOTE_TARGETED_DISCOVERY_PORT = 12900
 LOCAL_TARGETED_DISCOVERY_PORT = 12901
+NOTIFICATIONS_PORT = 12901
 
 CMD_PAGE_SIZE = 10
 

pyg90alarm/definitions/sensors.py

@@ -475,6 +475,16 @@ SENSOR_DEFINITIONS = [
         rwMode=SensorRwMode.READ,
         matchMode=SensorMatchMode.ONLY20BITS
     ),
+    # Door Sensor WRDS01
+    SensorDefinition(
+        type=1,
+        subtype=3,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
     # Door Sensor
     SensorDefinition(
         type=1,
@@ -485,6 +495,96 @@ SENSOR_DEFINITIONS = [
         rwMode=SensorRwMode.READ,
         matchMode=SensorMatchMode.ONLY16BITS
     ),
+    # Glass Break Sensor BLPS
+    SensorDefinition(
+        type=2,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Gas Detector WGD01
+    SensorDefinition(
+        type=3,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Smoke Detector WSD02
+    SensorDefinition(
+        type=4,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Smoke Detector WSD04
+    SensorDefinition(
+        type=4,
+        subtype=1,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Panic Button WEB01
+    SensorDefinition(
+        type=5,
+        subtype=1,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Panic Button WEB03
+    SensorDefinition(
+        type=5,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Shock Sensor WSS01
+    SensorDefinition(
+        type=6,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Water Detector LSTC02
+    SensorDefinition(
+        type=7,
+        subtype=1,
+        rx=0,
+        tx=0,
+        private_data='',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Water Detector LSTC01
+    SensorDefinition(
+        type=7,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
     # PIR motion sensor WMS08
     SensorDefinition(
         type=8,
@@ -505,6 +605,66 @@ SENSOR_DEFINITIONS = [
         rwMode=SensorRwMode.READ,
         matchMode=SensorMatchMode.ONLY20BITS
     ),
+    # PIR motion sensor ODPIR
+    SensorDefinition(
+        type=8,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # PIR motion sensor N650
+    SensorDefinition(
+        type=8,
+        subtype=5,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # PIR motion sensor WPD02
+    SensorDefinition(
+        type=8,
+        subtype=6,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # PIR motion sensor WCMS02
+    SensorDefinition(
+        type=8,
+        subtype=8,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # PIR motion sensor CWMS01
+    SensorDefinition(
+        type=8,
+        subtype=9,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # PIR motion sensor WMS04
+    SensorDefinition(
+        type=8,
+        subtype=11,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
     # PIR motion sensor WMS07
     SensorDefinition(
         type=8,
@@ -515,6 +675,66 @@ SENSOR_DEFINITIONS = [
         rwMode=SensorRwMode.READ,
         matchMode=SensorMatchMode.ONLY20BITS
     ),
+    # PIR motion sensor ODPIR03
+    SensorDefinition(
+        type=8,
+        subtype=4,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # PIR motion sensor WPD01
+    SensorDefinition(
+        type=8,
+        subtype=7,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # PIR motion sensor PIR Ceiling
+    SensorDefinition(
+        type=8,
+        subtype=1,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Beams ABT
+    SensorDefinition(
+        type=9,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Beams ABE
+    SensorDefinition(
+        type=9,
+        subtype=1,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Beams ABH
+    SensorDefinition(
+        type=9,
+        subtype=2,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
     # Remote RMC08
     SensorDefinition(
         type=10,
@@ -565,6 +785,16 @@ SENSOR_DEFINITIONS = [
         rwMode=SensorRwMode.READ,
         matchMode=SensorMatchMode.ONLY20BITS
     ),
+    # Door Bell WDB
+    SensorDefinition(
+        type=12,
+        subtype=1,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
     # TouchID Detector
     SensorDefinition(
         type=13,
@@ -595,7 +825,17 @@ SENSOR_DEFINITIONS = [
         rwMode=SensorRwMode.READ,
         matchMode=SensorMatchMode.ONLY16BITS
     ),
-    # Gas Detector WGD02
+    # Sub Host SS08S
+    SensorDefinition(
+        type=16,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Gas Valve Detector WGD02
     SensorDefinition(
         type=18,
         subtype=0,

pyg90alarm/device_notifications.py

@@ -36,6 +36,7 @@ from .const import (
     G90AlertSources,
 )
 
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -232,16 +233,17 @@ class G90DeviceNotifications:
     """
     tbd
     """
-    def __init__(self, port=12901, armdisarm_cb=None, sensor_cb=None,
-                 door_open_close_cb=None, alarm_cb=None, sock=None):
+    def __init__(self, port, host,
+                 armdisarm_cb=None, sensor_cb=None,
+                 door_open_close_cb=None, alarm_cb=None):
         # pylint: disable=too-many-arguments
         self._notification_transport = None
+        self._host = host
         self._port = port
         self._armdisarm_cb = armdisarm_cb
         self._sensor_cb = sensor_cb
         self._door_open_close_cb = door_open_close_cb
         self._alarm_cb = alarm_cb
-        self._sock = sock
 
     def proto_factory(self):
         """
@@ -263,19 +265,12 @@ class G90DeviceNotifications:
         except AttributeError:
             loop = asyncio.get_event_loop()
 
-        if self._sock:
-            _LOGGER.debug('Using provided socket %s', self._sock)
-            (self._notification_transport,
-             _protocol) = await loop.create_datagram_endpoint(
-                self.proto_factory,
-                sock=self._sock)
-        else:
-            _LOGGER.debug('Creating UDP endpoint for 0.0.0.0:%s',
-                          self._port)
-            (self._notification_transport,
-             _protocol) = await loop.create_datagram_endpoint(
-                self.proto_factory,
-                local_addr=('0.0.0.0', self._port))
+        _LOGGER.debug('Creating UDP endpoint for %s:%s',
+                      self._host, self._port)
+        (self._notification_transport,
+         _protocol) = await loop.create_datagram_endpoint(
+            self.proto_factory,
+            local_addr=(self._host, self._port))
 
     def close(self):
         """

pyg90alarm/targeted_discovery.py

@@ -119,7 +119,7 @@ class G90TargetedDiscovery(G90Discovery):
         super().__init__(**kwargs)
         self._device_id = device_id
 
-    def to_wire(self):  # pylint: disable=no-self-use
+    def to_wire(self):
         """
         tbd
         """

{pyg90alarm-1.10.0.dist-info → pyg90alarm-1.11.0.dist-info}/METADATA

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

{pyg90alarm-1.10.0.dist-info → pyg90alarm-1.11.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 pyg90alarm/__init__.py,sha256=zidYApReScSFZCpC9Tk7pdsBNPMql6XiUtt-O7l3D5M,1381
-pyg90alarm/alarm.py,sha256=sxcs7prR_kMuZk-z6tBIWRNmEUPYQkfH4-bH1TWV9hY,23823
-pyg90alarm/base_cmd.py,sha256=PR-QjtGKe9eKnW1FR1ZlUQyifBCw0ciVxf73Hqpjq74,9120
+pyg90alarm/alarm.py,sha256=0SMGPe9J1550j_Yq-KxoFlKPjzVIZ5Z-RhsjUusUS9U,23528
+pyg90alarm/base_cmd.py,sha256=xuW-jjuScag1kAVPKNa2GUmL99UYeyu2n-C9ppLmOMo,8768
 pyg90alarm/callback.py,sha256=zg698TCjjYhjAMk770J9CZp8-dDbX0Zj5wtoC6axq6w,4033
 pyg90alarm/config.py,sha256=FiYjiz_WrDH2OEqHyUJXZDDK7v1fLAUpZcQ3JRMmmX0,1974
-pyg90alarm/const.py,sha256=x42ro0Tisg1z8Haw8FPzRIdABUQoIZZkxUgXQNSopOY,5199
-pyg90alarm/device_notifications.py,sha256=kxKcj5lW2h_k1xlnPr-4KUwp9-bSkWSlfZjqy9tPOYI,9602
+pyg90alarm/const.py,sha256=nhqrP9GqsU4VeEYHSW4NJTh6QO20L7uDea2reqDnqO4,5226
+pyg90alarm/device_notifications.py,sha256=wxDf0m_LOt6Sj_jG8cfTFZM3LNry2xrPwkFPa4lVscI,9315
 pyg90alarm/discovery.py,sha256=07TZIIGgPsRcW_iYpS-82lG18rotuykYqfGV-cE2eHc,3474
 pyg90alarm/exceptions.py,sha256=eiOcRe7D18EIPyPFDNU9DdFgbnkwPmkiLl8lGPOhBNw,1475
 pyg90alarm/history.py,sha256=E8c8ucy5cscPSawIz4nXxV4HKdyhsoJda4Akvvt3k6I,1836
@@ -12,15 +12,15 @@ pyg90alarm/host_info.py,sha256=fGGI2ZH6GVD0WhYT72rIELTbiIAmmPiT31eZkyVugwY,2571
 pyg90alarm/host_status.py,sha256=PEPgpkfGNkUzKUgRpfPKldz5qq3_9lqBwX86Ld613vk,1406
 pyg90alarm/paginated_cmd.py,sha256=7pXLAgFQHheByBpwRV-I1yEdZnm8hk6j2OMPZ_Wn-vE,3768
 pyg90alarm/paginated_result.py,sha256=xweFfPLn1a2yYm5h0AxGoDCyDIoy0JkUC_tI80vsrLc,5246
-pyg90alarm/targeted_discovery.py,sha256=s8jIk2-pApEE6McdvBgGy6zwBHDkZuJj6ufMY9uswkg,3766
+pyg90alarm/targeted_discovery.py,sha256=_SR_pBZxDkLNL5WA8LfGboQw2AH09G65ASn9EEtxlDs,3735
 pyg90alarm/user_data_crc.py,sha256=RsQlbuXC4baD88hX4y0XdysmxEMtQkqkNVX_FhTLSmw,1467
 pyg90alarm/definitions/__init__.py,sha256=s0NZnkW_gMH718DJbgez28z9WA231CyszUf1O_ojUiI,68
-pyg90alarm/definitions/sensors.py,sha256=htarrXk46u9RwFR_JLdsLJiZi0ilQSZdfWaCc5TydEQ,14697
+pyg90alarm/definitions/sensors.py,sha256=2Liap0stTT5qNmvsbP_7UscA21IYXQcSAKQLLm7YfHQ,19921
 pyg90alarm/entities/__init__.py,sha256=hHb6AOiC4Tz--rOWiiICMdLaZDs1Tf_xpWk_HeS_gO4,66
 pyg90alarm/entities/device.py,sha256=QbsQyIq2wFLjIH389zyD3d0CyME_rpG_ciD3srAdqXQ,2772
 pyg90alarm/entities/sensor.py,sha256=2d_671Kefx7wM6mWRQR79XyScEkkp3bk7HsA1Qnx75I,13354
-pyg90alarm-1.10.0.dist-info/LICENSE,sha256=f884inRbeNv-O-hbwz62Ro_1J8xiHRTnJ2cCx6A0WvU,1070
-pyg90alarm-1.10.0.dist-info/METADATA,sha256=gNyDIAVQpAiumyBMl1YzM2PZHQxx26OKVfF74Avgboc,7211
-pyg90alarm-1.10.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-pyg90alarm-1.10.0.dist-info/top_level.txt,sha256=czHiGxYMyTk5QEDTDb0EpPiKqUMRa8zI4zx58Ii409M,11
-pyg90alarm-1.10.0.dist-info/RECORD,,
+pyg90alarm-1.11.0.dist-info/LICENSE,sha256=f884inRbeNv-O-hbwz62Ro_1J8xiHRTnJ2cCx6A0WvU,1070
+pyg90alarm-1.11.0.dist-info/METADATA,sha256=4TEvcDDcPQcq7E0bHPGZ83NWBxl56gDL7I98goAmHvU,7211
+pyg90alarm-1.11.0.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+pyg90alarm-1.11.0.dist-info/top_level.txt,sha256=czHiGxYMyTk5QEDTDb0EpPiKqUMRa8zI4zx58Ii409M,11
+pyg90alarm-1.11.0.dist-info/RECORD,,

{pyg90alarm-1.10.0.dist-info → pyg90alarm-1.11.0.dist-info}/WHEEL

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