Fix DownloadManager timeout kwarg compatibility with desktop aiohttp (#107)

bitcoin3us · Richard Taylor · claude · web-flow · commit fe5144784790 · 2026-03-31T12:12:07.000+02:00
* Fix DownloadManager timeout kwarg compatibility with desktop aiohttp The desktop aiohttp implementation doesn't support the timeout keyword argument added in #98. Fall back to calling session.get() without timeout when TypeError is raised, so downloads work on both ESP32 (with timeout) and desktop (without). Fixes test_custom_headers and test_json_download failures on desktop builds. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Add connection timeout support to aiohttp and restore in DownloadManager The MicroPython aiohttp library had no timeout support (marked as TODO). Add a timeout parameter to request_raw(), _request(), and request() that wraps asyncio.open_connection() with asyncio.wait_for(). This allows DownloadManager to use session.get(timeout=...) to prevent connections from hanging indefinitely on stalled TCP/TLS handshakes, which was the original fix in #98. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Richard Taylor <RT@MacBookPro.lan> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
diff --git a/internal_filesystem/lib/aiohttp/__init__.py b/internal_filesystem/lib/aiohttp/__init__.py
@@ -109,12 +109,12 @@ async def __aenter__(self):
     async def __aexit__(self, *args):
         return await asyncio.sleep(0)
 
-    # TODO: Implement timeouts
+    # Connection timeout is supported via the timeout parameter on request methods
 
-    async def _request(self, method, url, data=None, json=None, ssl=None, params=None, headers={}):
+    async def _request(self, method, url, data=None, json=None, ssl=None, params=None, headers={}, timeout=None):
         redir_cnt = 0
         while redir_cnt < 2:
-            reader = await self.request_raw(method, url, data, json, ssl, params, headers)
+            reader = await self.request_raw(method, url, data, json, ssl, params, headers, timeout=timeout)
             _headers = []
             sline = await reader.readline()
             sline = sline.split(None, 2)
@@ -167,6 +167,7 @@ async def request_raw(
         headers={},
         is_handshake=False,
         version=None,
+        timeout=None,
     ):
         if json and isinstance(json, dict):
             data = _json.dumps(json)
@@ -193,7 +194,12 @@ async def request_raw(
             host, port = host.split(":", 1)
             port = int(port)
 
-        reader, writer = await asyncio.open_connection(host, port, ssl=ssl)
+        if timeout is not None:
+            reader, writer = await asyncio.wait_for(
+                asyncio.open_connection(host, port, ssl=ssl), timeout
+            )
+        else:
+            reader, writer = await asyncio.open_connection(host, port, ssl=ssl)
 
         # Use protocol 1.0, because 1.1 always allows to use chunked transfer-encoding
         # But explicitly set Connection: close, even though this should be default for 1.0,
@@ -232,7 +238,7 @@ async def request_raw(
             await writer.awrite(query)
             return reader, writer
 
-    def request(self, method, url, data=None, json=None, ssl=None, params=None, headers={}):
+    def request(self, method, url, data=None, json=None, ssl=None, params=None, headers={}, timeout=None):
         return _RequestContextManager(
             self,
             self._request(
@@ -243,6 +249,7 @@ def request(self, method, url, data=None, json=None, ssl=None, params=None, head
                 ssl=ssl,
                 params=params,
                 headers=dict(**self._base_headers, **headers),
+                timeout=timeout,
             ),
         )
 
