zigpy-zboss 2.0.2__tar.gz → 2.0.3__tar.gz

{zigpy_zboss-2.0.2/zigpy_zboss.egg-info → zigpy_zboss-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zigpy-zboss
-Version: 2.0.2
+Version: 2.0.3
 Summary: A library for zigpy which communicates with Nordic nRF52 radios running ZBOSS NCP
 Author-email: Damien Kastner <damien.kastner@kardia.no>
 License: GPL-3.0

{zigpy_zboss-2.0.2 → zigpy_zboss-2.0.3}/tests/test_uart.py

@@ -280,6 +280,42 @@ async def test_connection_lost(dummy_serial_conn, mocker, event_loop):
     assert (await conn_lost_fut) == exception
 
 
+@pytest.mark.asyncio
+async def test_connect_url_port_skips_path_check(mocker, event_loop):
+    """A URL-style port (``socket://``/``tcp://``) has no filesystem path.
+
+    ``connect()`` must not gate on ``os.path.exists`` for such ports, otherwise
+    it spins in the retry loop until the timeout and never opens the connection
+    (regression for ser2net bridges and native-TCP NCPs).
+    """
+    target_url = "socket://127.0.0.1:6638"
+
+    def create_serial_conn(loop, protocol_factory, url, *args, **kwargs):
+        assert url == target_url
+        fut = event_loop.create_future()
+        protocol = protocol_factory()
+        event_loop.add_writer = lambda *a, **k: None
+        event_loop.add_reader = lambda *a, **k: None
+        event_loop.remove_writer = lambda *a, **k: None
+        event_loop.remove_reader = lambda *a, **k: None
+        transport = mocker.Mock()
+        transport.serial = mocker.Mock()
+        protocol.connection_made(transport)
+        fut.set_result((transport, protocol))
+        return fut
+
+    mocker.patch("serialx.create_serial_connection", new=create_serial_conn)
+    # A socket:// path never exists on disk; the check must be skipped for it.
+    exists = mocker.patch("zigpy_zboss.uart.os.path.exists", return_value=False)
+
+    protocol = await zboss_uart.connect(
+        conf.SCHEMA_DEVICE({conf.CONF_DEVICE_PATH: target_url}), api=mocker.Mock()
+    )
+
+    assert protocol is not None
+    exists.assert_not_called()
+
+
 # ToFix: this is not testing the uart test_connection_made method
 # @pytest.mark.asyncio
 # async def test_connection_made(dummy_serial_conn, mocker):

{zigpy_zboss-2.0.2 → zigpy_zboss-2.0.3}/zigpy_zboss/__init__.py

@@ -2,7 +2,7 @@
 
 MAJOR_VERSION = 2
 MINOR_VERSION = 0
-PATCH_VERSION = 2
+PATCH_VERSION = 3
 
 __short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__ = f"{__short_version__}.{PATCH_VERSION}"

{zigpy_zboss-2.0.2 → zigpy_zboss-2.0.3}/zigpy_zboss/uart.py

@@ -288,8 +288,14 @@ async def connect(config: conf.ConfigType, api) -> ZbossNcpProtocol:
     last_exc: OSError | None = None
     protocol = None
 
+    # URL-style ports (``socket://``, ``tcp://``, ``rfc2217://``, …) are not
+    # filesystem paths, so the local-device existence check below must be
+    # skipped for them; otherwise the loop spins until the timeout and the
+    # connection is never opened (e.g. ser2net or a native TCP NCP).
+    is_local_device = "://" not in port
+
     while loop.time() < deadline:
-        if not os.path.exists(port):
+        if is_local_device and not os.path.exists(port):
             await asyncio.sleep(CONNECT_OPEN_RETRY_DELAY)
             continue
 

{zigpy_zboss-2.0.2 → zigpy_zboss-2.0.3}/zigpy_zboss/zigbee/device.py

@@ -73,7 +73,7 @@ class ZbossZDO(ZigpyZDO):
             )
         )
         if res.StatusCode != 0:
-            return (res.StatusCode % 0xFF, dst_address, cluster)
+            return (res.StatusCode, dst_address, cluster)
 
         return (zdo_t.Status.SUCCESS, dst_address, cluster)
 
@@ -81,7 +81,7 @@ class ZbossZDO(ZigpyZDO):
         """Unbinding request."""
         if dst_address.addrmode == t.AddrMode.IEEE:
             addr_mode = t_zboss.BindAddrMode.IEEE
-            dst_eui64 = t.Addressing.IEEE
+            dst_eui64 = dst_address.ieee
         # ZBOSS does not support the NWK mode for binding
         elif dst_address.addrmode == t.AddrMode.NWK:
             self.log(
@@ -114,7 +114,7 @@ class ZbossZDO(ZigpyZDO):
             )
         )
         if res.StatusCode != 0:
-            return (res.StatusCode % 0xFF, dst_address, cluster)
+            return (res.StatusCode, dst_address, cluster)
 
         return (zdo_t.Status.SUCCESS, dst_address, cluster)
 

{zigpy_zboss-2.0.2 → zigpy_zboss-2.0.3/zigpy_zboss.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zigpy-zboss
-Version: 2.0.2
+Version: 2.0.3
 Summary: A library for zigpy which communicates with Nordic nRF52 radios running ZBOSS NCP
 Author-email: Damien Kastner <damien.kastner@kardia.no>
 License: GPL-3.0