Remove rest api service call timeout (#104709)

homeassistant/components/api/__init__.py

@@ -390,17 +390,14 @@ class APIDomainServicesView(HomeAssistantView):
         )
 
         try:
-            async with timeout(SERVICE_WAIT_TIMEOUT):
+            # shield the service call from cancellation on connection drop
-                # shield the service call from cancellation on connection drop
+            await shield(
-                await shield(
+                hass.services.async_call(
-                    hass.services.async_call(
+                    domain, service, data, blocking=True, context=context
-                        domain, service, data, blocking=True, context=context
-                    )
                 )
+            )
         except (vol.Invalid, ServiceNotFound) as ex:
             raise HTTPBadRequest() from ex
-        except TimeoutError:
-            pass
         finally:
             cancel_listen()
 

tests/components/api/test_init.py

@@ -1,9 +1,10 @@
 """The tests for the Home Assistant API component."""
+import asyncio
 from http import HTTPStatus
 import json
 from unittest.mock import patch
 
-from aiohttp import web
+from aiohttp import ServerDisconnectedError, web
 from aiohttp.test_utils import TestClient
 import pytest
 import voluptuous as vol
@@ -352,26 +353,41 @@ async def test_api_call_service_with_data(
     assert state["attributes"] == {"data": 1}
 
 
-async def test_api_call_service_timeout(
+async def test_api_call_service_client_closed(
     hass: HomeAssistant, mock_api_client: TestClient
 ) -> None:
-    """Test if the API does not fail on long running services."""
+    """Test that services keep running if client is closed."""
     test_value = []
 
     fut = hass.loop.create_future()
+    service_call_started = asyncio.Event()
 
     async def listener(service_call):
         """Wait and return after mock_api_client.post finishes."""
+        service_call_started.set()
         value = await fut
         test_value.append(value)
 
     hass.services.async_register("test_domain", "test_service", listener)
 
-    with patch("homeassistant.components.api.SERVICE_WAIT_TIMEOUT", 0):
+    api_task = hass.async_create_task(
-        await mock_api_client.post("/api/services/test_domain/test_service")
+        mock_api_client.post("/api/services/test_domain/test_service")
-        assert len(test_value) == 0
+    )
-        fut.set_result(1)
+
-        await hass.async_block_till_done()
+    await service_call_started.wait()
+
+    assert len(test_value) == 0
+
+    await mock_api_client.close()
+
+    assert len(test_value) == 0
+    assert api_task.done()
+
+    with pytest.raises(ServerDisconnectedError):
+        await api_task
+
+    fut.set_result(1)
+    await hass.async_block_till_done()
 
     assert len(test_value) == 1
     assert test_value[0] == 1