Handle asynchronous cancellations for HTTPConnection instances

CHANGELOG.md

@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
+- Handle asynchronous cancellations for the HTTPConnection instances. (#802)
 - Fix pool timeout to account for the total time spent retrying. (#823)
 
 ## 1.0.0 (October 6th, 2023)

httpcore/_async/connection.py

@@ -63,6 +63,7 @@ def __init__(
         self._connect_failed: bool = False
         self._request_lock = AsyncLock()
         self._socket_options = socket_options
+        self._is_new = True
 
     async def handle_async_request(self, request: Request) -> Response:
         if not self.can_handle_request(request.url.origin):
@@ -73,6 +74,7 @@ async def handle_async_request(self, request: Request) -> Response:
         async with self._request_lock:
             if self._connection is None:
                 try:
+                    self._is_new = False
                     stream = await self._connect(request)
 
                     ssl_object = stream.get_extra_info("ssl_object")
@@ -94,7 +96,7 @@ async def handle_async_request(self, request: Request) -> Response:
                             stream=stream,
                             keepalive_expiry=self._keepalive_expiry,
                         )
-                except Exception as exc:
+                except BaseException as exc:
                     self._connect_failed = True
                     raise exc
             elif not self._connection.is_available():
@@ -174,10 +176,12 @@ async def aclose(self) -> None:
 
     def is_available(self) -> bool:
         if self._connection is None:
+            if self._is_new:
+                return True
             # If HTTP/2 support is enabled, and the resulting connection could
             # end up as HTTP/2 then we should indicate the connection as being
             # available to service multiple requests.
-            return (
+            return (  # pragma: no cover
                 self._http2
                 and (self._origin.scheme == b"https" or not self._http1)
                 and not self._connect_failed
@@ -201,7 +205,11 @@ def is_closed(self) -> bool:
 
     def info(self) -> str:
         if self._connection is None:
-            return "CONNECTION FAILED" if self._connect_failed else "CONNECTING"
+            if self._is_new:
+                return "NEW CONNECTION"
+            return (
+                "CONNECTION FAILED" if self._connect_failed else "CONNECTING"
+            )  # pragma: no cover
         return self._connection.info()
 
     def __repr__(self) -> str:

httpcore/_sync/connection.py

@@ -63,6 +63,7 @@ def __init__(
         self._connect_failed: bool = False
         self._request_lock = Lock()
         self._socket_options = socket_options
+        self._is_new = True
 
     def handle_request(self, request: Request) -> Response:
         if not self.can_handle_request(request.url.origin):
@@ -73,6 +74,7 @@ def handle_request(self, request: Request) -> Response:
         with self._request_lock:
             if self._connection is None:
                 try:
+                    self._is_new = False
                     stream = self._connect(request)
 
                     ssl_object = stream.get_extra_info("ssl_object")
@@ -94,7 +96,7 @@ def handle_request(self, request: Request) -> Response:
                             stream=stream,
                             keepalive_expiry=self._keepalive_expiry,
                         )
-                except Exception as exc:
+                except BaseException as exc:
                     self._connect_failed = True
                     raise exc
             elif not self._connection.is_available():
@@ -174,10 +176,12 @@ def close(self) -> None:
 
     def is_available(self) -> bool:
         if self._connection is None:
+            if self._is_new:
+                return True
             # If HTTP/2 support is enabled, and the resulting connection could
             # end up as HTTP/2 then we should indicate the connection as being
             # available to service multiple requests.
-            return (
+            return (  # pragma: no cover
                 self._http2
                 and (self._origin.scheme == b"https" or not self._http1)
                 and not self._connect_failed
@@ -201,7 +205,11 @@ def is_closed(self) -> bool:
 
     def info(self) -> str:
         if self._connection is None:
-            return "CONNECTION FAILED" if self._connect_failed else "CONNECTING"
+            if self._is_new:
+                return "NEW CONNECTION"
+            return (
+                "CONNECTION FAILED" if self._connect_failed else "CONNECTING"
+            )  # pragma: no cover
         return self._connection.info()
 
     def __repr__(self) -> str:

tests/_async/test_connection.py

@@ -37,9 +37,9 @@ async def test_http_connection():
     ) as conn:
         assert not conn.is_idle()
         assert not conn.is_closed()
-        assert not conn.is_available()
+        assert conn.is_available()
         assert not conn.has_expired()
-        assert repr(conn) == "<AsyncHTTPConnection [CONNECTING]>"
+        assert repr(conn) == "<AsyncHTTPConnection [NEW CONNECTION]>"
 
         async with conn.stream("GET", "https://example.com/") as response:
             assert (

tests/_sync/test_connection.py

@@ -37,9 +37,9 @@ def test_http_connection():
     ) as conn:
         assert not conn.is_idle()
         assert not conn.is_closed()
-        assert not conn.is_available()
+        assert conn.is_available()
         assert not conn.has_expired()
-        assert repr(conn) == "<HTTPConnection [CONNECTING]>"
+        assert repr(conn) == "<HTTPConnection [NEW CONNECTION]>"
 
         with conn.stream("GET", "https://example.com/") as response:
             assert (