Add parser and writer factories to prepare for future http protocols

aiohttp/client_proto.py

@@ -1,6 +1,6 @@
 import asyncio
 from contextlib import suppress
-from typing import Any
+from typing import Any, Callable
 
 from .base_protocol import BaseProtocol
 from .client_exceptions import (
@@ -25,7 +25,11 @@
 class ResponseHandler(BaseProtocol, DataQueue[tuple[RawResponseMessage, StreamReader]]):
     """Helper class to adapt between Protocol and StreamReader."""
 
-    def __init__(self, loop: asyncio.AbstractEventLoop) -> None:
+    def __init__(
+        self,
+        loop: asyncio.AbstractEventLoop,
+        parser_factory: type[HttpResponseParser] = HttpResponseParser,
+    ) -> None:
         BaseProtocol.__init__(self, loop=loop)
         DataQueue.__init__(self, loop)
 
@@ -39,6 +43,9 @@
 
         self._tail = b""
         self._upgraded = False
+        # parser_factory is important because it will
+        # allow for other protocols to be added in the future.
+        self._parser_factory = parser_factory
         self._parser: HttpResponseParser | None = None
 
         self._read_timeout: float | None = None
@@ -237,7 +244,7 @@
 
         self._timeout_ceil_threshold = timeout_ceil_threshold
 
-        self._parser = HttpResponseParser(
+        self._parser = self._parser_factory(
             self,
             self._loop,
             read_bufsize,

aiohttp/client_reqrep.py

@@ -705,7 +705,7 @@
     method = "GET"
 
     _writer_task: asyncio.Task[None] | None = None  # async task for streaming data
-
+    _writer_factory: type[StreamWriter] = StreamWriter  # allowing http/2 and http/3
     _skip_auto_headers: "CIMultiDict[None] | None" = None
 
     # N.B.
@@ -723,6 +723,8 @@
         loop: asyncio.AbstractEventLoop,
         ssl: SSLContext | bool | Fingerprint,
         trust_env: bool = False,
+        writer_factory: type[StreamWriter] | None = None,
+        version: HttpVersion | None = None,
     ):
         if match := _CONTAINS_CONTROL_CHAR_RE.search(method):
             raise ValueError(
@@ -744,6 +746,13 @@
         self._update_headers(headers)
         self._update_auth(auth, trust_env)
 
+        # setup incase of newer protocols.
+        if version:
+            self.version = version
+
+        if writer_factory:
+            self._writer_factory = writer_factory
+
     def _reset_writer(self, _: object = None) -> None:
         self._writer_task = None
 
@@ -848,11 +857,12 @@
         )
 
     def _create_writer(self, protocol: BaseProtocol) -> StreamWriter:
-        return StreamWriter(protocol, self.loop)
+        return self._writer_factory(protocol, self.loop)
 
     def _should_write(self, protocol: BaseProtocol) -> bool:
         return protocol.writing_paused
 
+    # TODO: Make _send swappable for http/2 or http/3 ?
     async def _send(self, conn: "Connection") -> ClientResponse:
         # Specify request target:
         # - CONNECT request must send authority form URI
@@ -1016,7 +1026,7 @@
         self.response_class = response_class
         self._timer = timer
         self.server_hostname = server_hostname
         self.version = version
 
         self._update_auto_headers(skip_auto_headers)
         self._update_cookies(cookies)