pyg90alarm 2.7.0__py3-none-any.whl → 2.7.1__py3-none-any.whl

pyg90alarm/alarm.py

@@ -64,9 +64,9 @@ from .const import (
     REMOTE_PORT,
     REMOTE_TARGETED_DISCOVERY_PORT,
     LOCAL_TARGETED_DISCOVERY_PORT,
-    LOCAL_NOTIFICATIONS_HOST,
+    LOCAL_NOTIFICATIONS_IP,
     LOCAL_NOTIFICATIONS_PORT,
-    LOCAL_CLOUD_NOTIFICATIONS_HOST,
+    LOCAL_CLOUD_NOTIFICATIONS_IP,
     LOCAL_CLOUD_NOTIFICATIONS_PORT,
     REMOTE_CLOUD_PORT,
     DEVICE_REGISTRATION_TIMEOUT,
@@ -1379,7 +1379,7 @@ class G90Alarm(G90NotificationProtocol):
             await asyncio.sleep(interval)
 
     async def use_local_notifications(
-        self, notifications_local_host: str = LOCAL_NOTIFICATIONS_HOST,
+        self, notifications_local_ip: str = LOCAL_NOTIFICATIONS_IP,
         notifications_local_port: int = LOCAL_NOTIFICATIONS_PORT
     ) -> None:
         """
@@ -1391,16 +1391,16 @@ class G90Alarm(G90NotificationProtocol):
             protocol_factory=lambda: self,
             host=self._host,
             port=self._port,
-            local_host=notifications_local_host,
+            local_ip=notifications_local_ip,
             local_port=notifications_local_port
         )
 
     # pylint: disable=too-many-positional-arguments
     async def use_cloud_notifications(
         self,
-        cloud_host: str,
+        cloud_ip: str,
         cloud_port: int,
-        cloud_local_host: str = LOCAL_CLOUD_NOTIFICATIONS_HOST,
+        cloud_local_ip: str = LOCAL_CLOUD_NOTIFICATIONS_IP,
         cloud_local_port: int = LOCAL_CLOUD_NOTIFICATIONS_PORT,
         upstream_host: Optional[str] = None,
         upstream_port: Optional[int] = REMOTE_CLOUD_PORT,
@@ -1415,11 +1415,11 @@ class G90Alarm(G90NotificationProtocol):
         of that is configuring cloud server address on the panel is one-time
         operation, while the method will be called multiple times.
 
-        :param cloud_host: The cloud server host to connect to, should be
-         reachable from the panel
+        :param cloud_ip: The IP address of cloud server to connect to, should
+         be reachable from the panel
         :param cloud_port: The cloud server port to connect to, should be
          reachable from the panel
-        :param cloud_local_host: Local host to bind cloud notifications
+        :param cloud_local_ip: Local IP address to bind cloud notifications
          listener to
         :param cloud_local_port: Local port to bind cloud notifications
          listener to, should match `cloud_port` above unless network setup
@@ -1437,9 +1437,9 @@ class G90Alarm(G90NotificationProtocol):
             protocol_factory=lambda: self,
             upstream_host=upstream_host,
             upstream_port=upstream_port,
-            local_host=cloud_local_host,
+            local_ip=cloud_local_ip,
             local_port=cloud_local_port,
-            cloud_host=cloud_host,
+            cloud_ip=cloud_ip,
             cloud_port=cloud_port,
             keep_single_connection=keep_single_connection
         )

pyg90alarm/cloud/messages.py

@@ -226,7 +226,7 @@ class G90CloudHelloDiscoveryRespMessage(G90CloudMessage):
         _LOGGER.debug(
             "%s: Timestamp added: %s", type(self).__name__, str(self)
         )
-        self.ip_addr = context.cloud_host.encode()
+        self.ip_addr = context.cloud_ip.encode()
         self.port = context.cloud_port
 
     @property

pyg90alarm/cloud/notifications.py

@@ -61,7 +61,9 @@ class G90CloudNotifications(G90NotificationsBase, asyncio.Protocol):
 
     :param protocol_factory: Factory function to create notification
      protocol handlers
-    :param local_host: Local host to bind the server to
+    :param cloud_ip: Cloud IP address to announce to the panel
+    :param cloud_port: Cloud port to announce to the panel
+    :param local_ip: Local IP to bind the server to
     :param local_port: Local port to bind the server to
     :param upstream_host: Optional upstream host to forward messages to
     :param upstream_port: Optional upstream port to forward messages to
@@ -73,8 +75,8 @@ class G90CloudNotifications(G90NotificationsBase, asyncio.Protocol):
     def __init__(
         self,
         protocol_factory: Callable[[], G90NotificationProtocol],
-        local_host: str, local_port: int,
-        cloud_host: str, cloud_port: int,
+        local_ip: str, local_port: int,
+        cloud_ip: str, cloud_port: int,
         upstream_host: Optional[str] = None,
         upstream_port: Optional[int] = None,
         keep_single_connection: bool = True,
@@ -82,9 +84,9 @@ class G90CloudNotifications(G90NotificationsBase, asyncio.Protocol):
         super().__init__(protocol_factory)
         self._transport: Optional[Transport] = None
         self._server: Optional[asyncio.Server] = None
-        self._local_host = local_host
+        self._local_ip = local_ip
         self._local_port = local_port
-        self._cloud_host = cloud_host
+        self._cloud_ip = cloud_ip
         self._cloud_port = cloud_port
         self._upstream_host = upstream_host
         self._upstream_port = upstream_port
@@ -164,9 +166,9 @@ class G90CloudNotifications(G90NotificationsBase, asyncio.Protocol):
                 # Instantiate a context for the messages
                 ctx = G90CloudMessageContext(
                     device_id=self.device_id,
-                    local_host=self._local_host,
+                    local_ip=self._local_ip,
                     local_port=self._local_port,
-                    cloud_host=self._cloud_host,
+                    cloud_ip=self._cloud_ip,
                     cloud_port=self._cloud_port,
                     upstream_host=self._upstream_host,
                     upstream_port=self._upstream_port,
@@ -373,11 +375,11 @@ class G90CloudNotifications(G90NotificationsBase, asyncio.Protocol):
         loop = asyncio.get_running_loop()
 
         _LOGGER.debug('Creating cloud endpoint for %s:%s',
-                      self._local_host,
+                      self._local_ip,
                       self._local_port)
         self._server = await loop.create_server(
             lambda: self,
-            self._local_host, self._local_port
+            self._local_ip, self._local_port
         )
 
     async def close(self) -> None:
@@ -406,7 +408,7 @@ class G90CloudNotifications(G90NotificationsBase, asyncio.Protocol):
         if self._server:
             _LOGGER.debug(
                 'No longer listening for cloud connections on %s:%s',
-                self._local_host, self._local_port
+                self._local_ip, self._local_port
             )
             self._server.close()
             self._server = None

pyg90alarm/cloud/protocol.py

@@ -73,11 +73,11 @@ class G90CloudMessageContext:  # pylint:disable=too-many-instance-attributes
     This class holds information about the local and remote hosts and ports,
     as well as the cloud server and upstream connection details.
     """
-    local_host: str
+    local_ip: str
     local_port: int
     remote_host: str
     remote_port: int
-    cloud_host: str
+    cloud_ip: str
     cloud_port: int
     upstream_host: Optional[str]
     upstream_port: Optional[int]

pyg90alarm/const.py

@@ -28,9 +28,9 @@ from typing import Optional
 REMOTE_PORT = 12368
 REMOTE_TARGETED_DISCOVERY_PORT = 12900
 LOCAL_TARGETED_DISCOVERY_PORT = 12901
-LOCAL_NOTIFICATIONS_HOST = '0.0.0.0'
+LOCAL_NOTIFICATIONS_IP = '0.0.0.0'
 LOCAL_NOTIFICATIONS_PORT = 12901
-LOCAL_CLOUD_NOTIFICATIONS_HOST = '0.0.0.0'
+LOCAL_CLOUD_NOTIFICATIONS_IP = '0.0.0.0'
 LOCAL_CLOUD_NOTIFICATIONS_PORT = 5678
 REMOTE_CLOUD_PORT = 5678
 DEVICE_REGISTRATION_TIMEOUT = 30

pyg90alarm/local/notifications.py

@@ -52,19 +52,19 @@ class G90LocalNotifications(G90NotificationsBase, DatagramProtocol):
     :param host: The host on which the device is listening for notifications.
     :param local_port: The port on which the local host is listening for
      notifications.
-    :param local_host: The host on which the local host is listening for
+    :param local_ip: The IP address on which the local host is listening for
      notifications.
     """
     # pylint:disable=too-many-positional-arguments,too-many-arguments
     def __init__(
         self, protocol_factory: Callable[[], G90NotificationProtocol],
-        port: int, host: str, local_port: int, local_host: str,
+        port: int, host: str, local_port: int, local_ip: str,
     ):
         super().__init__(protocol_factory)
 
         self._host = host
         self._port = port
-        self._notifications_local_host = local_host
+        self._notifications_local_ip = local_ip
         self._notifications_local_port = local_port
 
     # Implementation of datagram protocol,
@@ -107,11 +107,11 @@ class G90LocalNotifications(G90NotificationsBase, DatagramProtocol):
         loop = asyncio.get_running_loop()
 
         _LOGGER.debug('Creating UDP endpoint for %s:%s',
-                      self._notifications_local_host,
+                      self._notifications_local_ip,
                       self._notifications_local_port)
         (self._transport,
          _protocol) = await loop.create_datagram_endpoint(
             lambda: self,
             local_addr=(
-                self._notifications_local_host, self._notifications_local_port
+                self._notifications_local_ip, self._notifications_local_port
             ))

{pyg90alarm-2.7.0.dist-info → pyg90alarm-2.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyg90alarm
-Version: 2.7.0
+Version: 2.7.1
 Summary: G90 Alarm system protocol
 Home-page: https://github.com/hostcc/pyg90alarm
 Author: Ilia Sotnikov
@@ -224,7 +224,7 @@ The code fragments below demonstrate how to utilize both modes - please note tho
    await alarm.use_cloud_notifications(
       # The host/port the package will listen on for the cloud notifications,
       # should match ones above.
-      cloud_host='<host IP address running the package>',
+      cloud_ip='<host IP address running the package>',
       cloud_port=5678,
       cloud_local_port=5678,
       upstream_host=None
@@ -252,7 +252,7 @@ The code fragments below demonstrate how to utilize both modes - please note tho
    await alarm.use_cloud_notifications(
       # The host/port the package will listen on for the cloud notifications,
       # should match ones above.
-      cloud_host='<host IP address running the package>',
+      cloud_ip='<host IP address running the package>',
       cloud_port=5678,
       cloud_local_port=5678,
       # Upstream cloud server address the package should forward the

{pyg90alarm-2.7.0.dist-info → pyg90alarm-2.7.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
 pyg90alarm/__init__.py,sha256=Z1Y5bwYmtY5iycIv6IDQ464o4Q-sU7fo9S3f94NGOpg,3786
-pyg90alarm/alarm.py,sha256=1Gj19HJVhqGv0ftpOYI7udOsa89Sswb5Fil63YAUYw4,54162
+pyg90alarm/alarm.py,sha256=3ct1UbLKSnazVKRxQvAi1N1cazT-EoEcp_ttHJu8L-g,54147
 pyg90alarm/callback.py,sha256=9PVtjRs2MLn80AgiM-UJNL8ZJF4_PxcopJIpxMmB3vc,4707
-pyg90alarm/const.py,sha256=ysGYgpxqQnHXwUS2n29WAnikzJFN7ZO97qnFejJnNrI,8678
+pyg90alarm/const.py,sha256=DKM1c3meX0kPnCm8g9b65o5UYm-89mgBv1we8ypLVFI,8674
 pyg90alarm/event_mapping.py,sha256=hSmRWkkuA5hlauGvYakdOrw8QFt0TMNfUuDQ4J3vHpQ,3438
 pyg90alarm/exceptions.py,sha256=9rSd5zIKALHtRHBBLD-R5zxW-5OBkHK04uVupCnAK8s,1937
 pyg90alarm/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyg90alarm/cloud/__init__.py,sha256=u7ZzrIwCsdgmBmgtpCe6c_Kipdo8nG8PEOEcaAHXCxI,1407
 pyg90alarm/cloud/const.py,sha256=FYUxkj0DSI7nnXZHsJMfv8RNQiXKV3TYKGHSdfHdMjg,2113
-pyg90alarm/cloud/messages.py,sha256=dlsPBcEHKkjtEIS4UJwXa23WkmU9WQrK-Qo8pR6L_wY,17676
-pyg90alarm/cloud/notifications.py,sha256=bCsz27TAwgtTKBArq-yfv4NSWsaoNtqlYhD5BuRrw68,15726
-pyg90alarm/cloud/protocol.py,sha256=82l2IXSM12tv_iWkTrAQZ-aw5UR4tmWFQJKVcgBfIww,16159
+pyg90alarm/cloud/messages.py,sha256=kpaEPagzsK_fQZmNNIliz3F3KXi-xLXzR0AYze4CMKI,17674
+pyg90alarm/cloud/notifications.py,sha256=yW9ye2qgoE3djKFN-y6UKScBkmzaCm5wKFbovjoLFPU,15818
+pyg90alarm/cloud/protocol.py,sha256=pr7jwukZr8jKUApqAsTfX9U8mZS8DXlVNRPcdio3lqI,16155
 pyg90alarm/dataclass/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyg90alarm/dataclass/load_save.py,sha256=I2WDeW4GingN8AEiwZm9Epf1gVL_Ynkise2h781Dn3I,8604
 pyg90alarm/dataclass/validation.py,sha256=yd3Q86S0L5NekzoiVFW5SwpefbIhWpwvsS-S15X4Sf8,19107
@@ -35,7 +35,7 @@ pyg90alarm/local/host_config.py,sha256=RSvg2UXPTCzzwDW6Iz3CyFtjxPUzSSdlxRMqGpWA6
 pyg90alarm/local/host_info.py,sha256=gdneg2XxxMNSFfNTjXCqsBsLZgZr_wg38sudKJ24RD8,3550
 pyg90alarm/local/host_status.py,sha256=WHGtw-A0wHILqVWP4DnZhXj8DPRGyS26AV0bL1isTz4,1863
 pyg90alarm/local/net_config.py,sha256=Y4-SUVSukk-h5x3LK-HH3IlM72dP_46nj1H8lN9rTfo,5998
-pyg90alarm/local/notifications.py,sha256=Vs6NQJciYqDALV-WwzH6wIcTGdX_UD4XBuHWjSOpCDY,4591
+pyg90alarm/local/notifications.py,sha256=T9Tfi_e_q0yIJEU_6A1XpBUhLVORWfNnlilQRwLx5n4,4585
 pyg90alarm/local/paginated_cmd.py,sha256=mgk46Xz7vJP9qv2YZlUIzGhxRKReuydKVgcj-f8DkvE,4300
 pyg90alarm/local/paginated_result.py,sha256=p_e8QAVznp1Q5Xi9ifjb9Bx-S3ZiAkVlPKrY6r0bYLs,5483
 pyg90alarm/local/system_cmd.py,sha256=LtkrGlBEjZKaNsycWDLS2lt8NLasWgRAMpMtpAD7AOk,8770
@@ -44,8 +44,8 @@ pyg90alarm/local/user_data_crc.py,sha256=JQBOPY3RlOgVtvR55R-rM8OuKjYW-BPXQ0W4pi6
 pyg90alarm/notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyg90alarm/notifications/base.py,sha256=d3N_zNPa_jcTX4QpA78jdgMHDhmrgwqyM3HdvuO14Jk,16682
 pyg90alarm/notifications/protocol.py,sha256=TlZQ3P8-N-E2X5bzkGefz432x4lBYyIBF9VriwYn9ds,4790
-pyg90alarm-2.7.0.dist-info/licenses/LICENSE,sha256=f884inRbeNv-O-hbwz62Ro_1J8xiHRTnJ2cCx6A0WvU,1070
-pyg90alarm-2.7.0.dist-info/METADATA,sha256=RpRAJB14iz-B6k5WGzjsjdk6Lhf90fHMgQ8zjfpIQjQ,11959
-pyg90alarm-2.7.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pyg90alarm-2.7.0.dist-info/top_level.txt,sha256=czHiGxYMyTk5QEDTDb0EpPiKqUMRa8zI4zx58Ii409M,11
-pyg90alarm-2.7.0.dist-info/RECORD,,
+pyg90alarm-2.7.1.dist-info/licenses/LICENSE,sha256=f884inRbeNv-O-hbwz62Ro_1J8xiHRTnJ2cCx6A0WvU,1070
+pyg90alarm-2.7.1.dist-info/METADATA,sha256=vQ43pgpWnoP3zPamoD0IgtDrDPZ8lY5C-B8l2dNyUsg,11955
+pyg90alarm-2.7.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pyg90alarm-2.7.1.dist-info/top_level.txt,sha256=czHiGxYMyTk5QEDTDb0EpPiKqUMRa8zI4zx58Ii409M,11
+pyg90alarm-2.7.1.dist-info/RECORD,,