Enable force route discovery on retries (#674)

Author: puddly

bellows/zigbee/application.py

@@ -836,11 +836,15 @@ async def send_packet(self, packet: zigpy.types.ZigbeePacket) -> None:
         else:
             aps_frame.groupId = t.uint16_t(0x0000)
 
-        if not self.config[zigpy.config.CONF_SOURCE_ROUTING]:
-            aps_frame.options |= t.EmberApsOption.APS_OPTION_ENABLE_ROUTE_DISCOVERY
-        else:
+        if self.config[zigpy.config.CONF_SOURCE_ROUTING]:
             # Source routing uses address discovery to discover routes
             aps_frame.options |= t.EmberApsOption.APS_OPTION_ENABLE_ADDRESS_DISCOVERY
+        elif zigpy.types.TransmitOptions.FORCE_ROUTE_DISCOVERY in packet.tx_options:
+            # Forcing route discovery requires retrying
+            aps_frame.options |= t.EmberApsOption.APS_OPTION_FORCE_ROUTE_DISCOVERY
+            aps_frame.options |= t.EmberApsOption.APS_OPTION_RETRY
+        else:
+            aps_frame.options |= t.EmberApsOption.APS_OPTION_ENABLE_ROUTE_DISCOVERY
 
         extended_timeout = packet.extended_timeout
 

pyproject.toml

@@ -17,7 +17,7 @@ dependencies = [
     "click",
     "click-log>=0.2.1",
     "voluptuous",
-    "zigpy>=0.78.0",
+    "zigpy>=0.79.0",
     'async-timeout; python_version<"3.11"',
 ]
 

tests/test_application.py

@@ -941,6 +941,17 @@ async def test_send_packet_unicast_extended_timeout_without_acks(app, ieee, pack
     ]
 
 
+async def test_send_packet_unicast_force_route_discovery(app, packet):
+    await _test_send_packet_unicast(
+        app,
+        packet.replace(tx_options=zigpy.types.TransmitOptions.FORCE_ROUTE_DISCOVERY),
+        options=(
+            t.EmberApsOption.APS_OPTION_RETRY
+            | t.EmberApsOption.APS_OPTION_FORCE_ROUTE_DISCOVERY
+        ),
+    )
+
+
 async def test_send_packet_unicast_unexpected_failure(app, packet):
     with pytest.raises(zigpy.exceptions.DeliveryError):
         await _test_send_packet_unicast(app, packet, status=t.EmberStatus.ERR_FATAL)