Dynamic reply timeout. (#54)

Author: Adminiuga

tests/test_application.py

@@ -8,14 +8,22 @@
 from zigpy.types import EUI64
 import zigpy.zdo.types as zdo_t
 from zigpy_deconz.api import Deconz
-from zigpy_deconz.zigbee.application import ControllerApplication
+import zigpy_deconz.zigbee.application
 from zigpy_deconz.zigbee import application
 from zigpy_deconz import types as t
 
 
 @pytest.fixture
-def app(database_file=None):
-    return ControllerApplication(Deconz(), database_file=database_file)
+def app(monkeypatch, database_file=None):
+    app = zigpy_deconz.zigbee.application.ControllerApplication(
+        Deconz(), database_file=database_file)
+    monkeypatch.setattr(zigpy_deconz.zigbee.application,
+                        'TIMEOUT_REPLY_ENDDEV',
+                        .1)
+    monkeypatch.setattr(zigpy_deconz.zigbee.application,
+                        'TIMEOUT_REPLY_ROUTER',
+                        .1)
+    return app
 
 
 @pytest.fixture
@@ -176,6 +184,10 @@ def aps_data_request(req_id, dst_addr_ep, profile, cluster, src_ep, data):
 
     app._api.aps_data_request = mock.MagicMock(
         side_effect=asyncio.coroutine(aps_data_request))
+    app.get_device = mock.MagicMock(
+        return_value=zigpy.device.Device(app,
+                                         mock.sentinel.ieee,
+                                         mock.sentinel.nwk))
 
     return await app.request(nwk, 0x0260, 1, 2, 3, seq, b'\x01\x02\x03', expect_reply=expect_reply, **kwargs)
 

zigpy_deconz/zigbee/application.py

@@ -16,6 +16,8 @@
 
 CHANGE_NETWORK_WAIT = 1
 SEND_CONFIRM_TIMEOUT = 30
+TIMEOUT_REPLY_ROUTER = 6
+TIMEOUT_REPLY_ENDDEV = 29
 
 
 class ControllerApplication(zigpy.application.ControllerApplication):
@@ -82,7 +84,8 @@ async def form_network(self, channel=15, pan_id=None, extended_pan_id=None):
         raise Exception("Could not form network.")
 
     @zigpy.util.retryable_request
-    async def request(self, nwk, profile, cluster, src_ep, dst_ep, sequence, data, expect_reply=True, timeout=10):
+    async def request(self, nwk, profile, cluster, src_ep, dst_ep, sequence, data, expect_reply=True,
+                      timeout=TIMEOUT_REPLY_ROUTER):
         LOGGER.debug("Zigbee request with id %s, data: %s", sequence, binascii.hexlify(data))
         assert sequence not in self._pending
         dst_addr_ep = t.DeconzAddressEndpoint()
@@ -111,6 +114,10 @@ async def request(self, nwk, profile, cluster, src_ep, dst_ep, sequence, data, e
             if not expect_reply:
                 return
 
+            dev = self.get_device(nwk=nwk)
+            if dev.node_desc.is_end_device in (True, None):
+                LOGGER.debug("Extending timeout for %s/0x%04x", dev.ieee, nwk)
+                timeout = TIMEOUT_REPLY_ENDDEV
             return await asyncio.wait_for(req.reply, timeout)
 
     async def broadcast(self, profile, cluster, src_ep, dst_ep, grpid, radius,