Rediscover the route and retry once on APS_NO_ACK in send_packet

tests/application/test_requests.py

@@ -48,7 +48,7 @@
 @pytest.mark.parametrize("device", FORMED_DEVICES)
 async def test_zigpy_request(device, make_application):
     app, znp_server = make_application(device)
     await app.startup(auto_form=False)
 
     TSN = 1
 
@@ -108,7 +108,7 @@
 @pytest.mark.parametrize("device", FORMED_DEVICES)
 async def test_zigpy_request_failure(device, make_application, mocker):
     app, znp_server = make_application(device)
     await app.startup(auto_form=False)
 
     TSN = 1
 
@@ -534,7 +534,10 @@
 
 
 @pytest.mark.parametrize("device", [FormedLaunchpadCC26X2R1])
-async def test_request_recovery_route_rediscovery_af(device, make_application, mocker):
+@pytest.mark.parametrize("failure", [t.Status.NWK_NO_ROUTE, t.Status.APS_NO_ACK])
+async def test_request_recovery_route_rediscovery_af(
+    device, failure, make_application, mocker
+):
     app, znp_server = make_application(server_cls=device)
 
     await app.startup(auto_form=False)
@@ -552,7 +555,7 @@
         nonlocal route_discovered
 
         return c.AF.DataConfirm.Callback(
-            Status=t.Status.SUCCESS if route_discovered else t.Status.NWK_NO_ROUTE,
+            Status=t.Status.SUCCESS if route_discovered else failure,
             Endpoint=1,
             TSN=1,
         )

zigpy_znp/zigbee/application.py

@@ -986,9 +986,12 @@ async def send_packet(self, packet: zigpy.types.ZigbeePacket) -> None:
                                 continue
 
                         # Perform route discovery explicitly if the stack fails and
-                        # then retry the request
+                        # then retry the request. `APS_NO_ACK` is included because a
+                        # stale next hop can still MAC-ACK without forwarding, and the
+                        # stack reports no `NWK_NO_ROUTE` in that case.
                         if (
-                            e.response.Status == t.Status.NWK_NO_ROUTE
+                            e.response.Status
+                            in (t.Status.NWK_NO_ROUTE, t.Status.APS_NO_ACK)
                             and device is not None
                             and retry_attempt < 1
                         ):