omlish 0.0.0.dev423__py3-none-any.whl → 0.0.0.dev484__py3-none-any.whl

omlish/http/coro/client/{client.py → connection.py}

@@ -47,9 +47,9 @@ import typing as ta
 import urllib.parse
 
 from ....lite.check import check
+from ..io import CoroHttpIo
 from .errors import CoroHttpClientErrors
 from .headers import CoroHttpClientHeaders
-from .io import CoroHttpClientIo
 from .response import CoroHttpClientResponse
 from .status import CoroHttpClientStatusLine
 from .validation import CoroHttpClientValidation
@@ -58,10 +58,7 @@ from .validation import CoroHttpClientValidation
 ##
 
 
-class CoroHttpClientConnection(
-    CoroHttpClientErrors,
-    CoroHttpClientIo,
-):
+class CoroHttpClientConnection:
     """
     HTTPConnection goes through a number of "states", which define when a client may legally make another request or
     fetch the response for a particular request. This diagram details these state transitions:
@@ -119,10 +116,10 @@ class CoroHttpClientConnection(
     _http_version = 11
     _http_version_str = 'HTTP/1.1'
 
-    http_port: ta.ClassVar[int] = 80
-    https_port: ta.ClassVar[int] = 443
+    HTTP_PORT: ta.ClassVar[int] = 80
+    HTTPS_PORT: ta.ClassVar[int] = 443
 
-    default_port = http_port
+    DEFAULT_PORT: ta.ClassVar[int] = HTTP_PORT
 
     class _NOT_SET:  # noqa
         def __new__(cls, *args, **kwargs):  # noqa
@@ -142,6 +139,7 @@ class CoroHttpClientConnection(
             source_address: ta.Optional[str] = None,
             block_size: int = 8192,
             auto_open: bool = True,
+            default_port: ta.Optional[int] = None,
     ) -> None:
         super().__init__()
 
@@ -149,6 +147,9 @@ class CoroHttpClientConnection(
         self._source_address = source_address
         self._block_size = block_size
         self._auto_open = auto_open
+        if default_port is None:
+            default_port = self.DEFAULT_PORT
+        self._default_port = default_port
 
         self._connected = False
         self._buffer: ta.List[bytes] = []
@@ -165,6 +166,10 @@ class CoroHttpClientConnection(
 
         CoroHttpClientValidation.validate_host(self._host)
 
+    @property
+    def http_version(self) -> int:
+        return self._http_version
+
     #
 
     def _get_hostport(self, host: str, port: ta.Optional[int]) -> ta.Tuple[str, int]:
@@ -176,12 +181,12 @@ class CoroHttpClientConnection(
                     port = int(host[i + 1:])
                 except ValueError:
                     if host[i + 1:] == '':  # http://foo.com:/ == http://foo.com/
-                        port = self.default_port
+                        port = self._default_port
                     else:
-                        raise self.InvalidUrlError(f"non-numeric port: '{host[i + 1:]}'") from None
+                        raise CoroHttpClientErrors.InvalidUrlError(f"non-numeric port: '{host[i + 1:]}'") from None
                 host = host[:i]
             else:
-                port = self.default_port
+                port = self._default_port
 
         if host and host[0] == '[' and host[-1] == ']':
             host = host[1:-1]
@@ -232,7 +237,7 @@ class CoroHttpClientConnection(
             encoded_host = self._tunnel_host.encode('idna').decode('ascii')
             self._tunnel_headers['Host'] = f'{encoded_host}:{self._tunnel_port:d}'
 
-    def _tunnel(self) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], None]:
+    def _tunnel(self) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], None]:
         connect = b'CONNECT %s:%d %s\r\n' % (
             self._wrap_ipv6(check.not_none(self._tunnel_host).encode('idna')),
             check.not_none(self._tunnel_port),
@@ -251,7 +256,7 @@ class CoroHttpClientConnection(
 
         try:
             (version, code, message) = (yield from CoroHttpClientStatusLine.read())
-        except self.BadStatusLineError:  # noqa
+        except CoroHttpClientErrors.BadStatusLineError:  # noqa
             # self._close_conn()
             raise
 
@@ -277,18 +282,19 @@ class CoroHttpClientConnection(
 
     #
 
-    def connect(self) -> ta.Generator[CoroHttpClientIo.Io, None, None]:
+    def connect(self) -> ta.Generator[CoroHttpIo.Io, None, None]:
         """Connect to the host and port specified in __init__."""
 
         if self._connected:
             return
 
-        check.none((yield self.ConnectIo(
+        check.none((yield CoroHttpIo.ConnectIo(
             ((self._host, self._port),),
             dict(
                 source_address=self._source_address,
                 **(dict(timeout=self._timeout) if self._timeout is not self._NOT_SET else {}),
             ),
+            server_hostname=self._tunnel_host if self._tunnel_host else self._host,
         )))
 
         self._connected = True
@@ -298,14 +304,14 @@ class CoroHttpClientConnection(
 
     #
 
-    def close(self) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], None]:
+    def close(self) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], None]:
         """Close the connection to the HTTP server."""
 
         self._state = self._State.IDLE
 
         try:
             if self._connected:
-                yield self.CloseIo()  # Close it manually... there may be other refs
+                yield CoroHttpIo.CloseIo()  # Close it manually... there may be other refs
                 self._connected = False
 
         finally:
@@ -322,9 +328,9 @@ class CoroHttpClientConnection(
 
         return isinstance(stream, io.TextIOBase)
 
-    def send(self, data: ta.Any) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], None]:
+    def send(self, data: ta.Any) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], None]:
         """
-        Send `data' to the server. ``data`` can be a string object, a bytes object, an array object, a file-like object
+        Send 'data' to the server. ``data`` can be a string object, a bytes object, an array object, a file-like object
         that supports a .read() method, or an iterable object.
         """
 
@@ -332,7 +338,7 @@ class CoroHttpClientConnection(
             if self._auto_open:
                 yield from self.connect()
             else:
-                raise self.NotConnectedError
+                raise CoroHttpClientErrors.NotConnectedError
 
         check.state(self._connected)
 
@@ -341,15 +347,15 @@ class CoroHttpClientConnection(
             while data_block := data.read(self._block_size):
                 if encode:
                     data_block = data_block.encode('iso-8859-1')
-                check.none((yield self.WriteIo(data_block)))
+                check.none((yield CoroHttpIo.WriteIo(data_block)))
             return
 
         if isinstance(data, (bytes, bytearray)):
-            check.none((yield self.WriteIo(data)))
+            check.none((yield CoroHttpIo.WriteIo(data)))
 
         elif isinstance(data, collections.abc.Iterable):
             for d in data:
-                check.none((yield self.WriteIo(d)))
+                check.none((yield CoroHttpIo.WriteIo(d)))
 
         else:
             raise TypeError(f'data should be a bytes-like object or an iterable, got {type(data)!r}') from None
@@ -374,7 +380,7 @@ class CoroHttpClientConnection(
             self,
             message_body: ta.Optional[ta.Any] = None,
             encode_chunked: bool = False,
-    ) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], None]:
+    ) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], None]:
         """
         Send the currently buffered request and clear the buffer.
 
@@ -448,10 +454,10 @@ class CoroHttpClientConnection(
         """
         Send a request to the server.
 
-        `method' specifies an HTTP request method, e.g. 'GET'.
-        `url' specifies the object being requested, e.g. '/index.html'.
-        `skip_host' if True does not add automatically a 'Host:' header
-        `skip_accept_encoding' if True does not add automatically an 'Accept-Encoding:' header
+        'method' specifies an HTTP request method, e.g. 'GET'.
+        'url' specifies the object being requested, e.g. '/index.html'.
+        'skip_host' if True does not add automatically a 'Host:' header
+        'skip_accept_encoding' if True does not add automatically an 'Accept-Encoding:' header
         """
 
         # If a prior response has been completed, then forget about it.
@@ -476,7 +482,7 @@ class CoroHttpClientConnection(
         if self._state == self._State.IDLE:
             self._state = self._State.REQ_STARTED
         else:
-            raise self.CannotSendRequestError(self._state)
+            raise CoroHttpClientErrors.CannotSendRequestError(self._state)
 
         CoroHttpClientValidation.validate_method(method)
 
@@ -529,7 +535,7 @@ class CoroHttpClientConnection(
                     if ':' in host:
                         host_enc = self._strip_ipv6_iface(host_enc)
 
-                    if port == self.default_port:
+                    if port == self._default_port:
                         self.put_header('Host', host_enc)
                     else:
                         self.put_header('Host', f"{host_enc.decode('ascii')}:{port}")
@@ -568,7 +574,7 @@ class CoroHttpClientConnection(
         """
 
         if self._state != self._State.REQ_STARTED:
-            raise self.CannotSendHeaderError
+            raise CoroHttpClientErrors.CannotSendHeaderError
 
         if hasattr(header, 'encode'):
             bh = header.encode('ascii')
@@ -598,7 +604,7 @@ class CoroHttpClientConnection(
             message_body: ta.Optional[ta.Any] = None,
             *,
             encode_chunked: bool = False,
-    ) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], None]:
+    ) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], None]:
         """
         Indicate that the last header line has been sent to the server.
 
@@ -609,7 +615,7 @@ class CoroHttpClientConnection(
         if self._state == self._State.REQ_STARTED:
             self._state = self._State.REQ_SENT
         else:
-            raise self.CannotSendHeaderError
+            raise CoroHttpClientErrors.CannotSendHeaderError
 
         yield from self._send_output(message_body, encode_chunked=encode_chunked)
 
@@ -623,7 +629,7 @@ class CoroHttpClientConnection(
             headers: ta.Optional[ta.Mapping[str, str]] = None,
             *,
             encode_chunked: bool = False,
-    ) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], None]:
+    ) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], None]:
         """Send a complete request to the server."""
 
         yield from self._send_request(method, url, body, dict(headers or {}), encode_chunked)
@@ -693,7 +699,7 @@ class CoroHttpClientConnection(
             body: ta.Optional[ta.Any],
             headers: ta.Mapping[str, str],
             encode_chunked: bool,
-    ) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], None]:
+    ) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], None]:
         # Honor explicitly requested Host: and Accept-Encoding: headers.
         header_names = frozenset(k.lower() for k in headers)
         skips = {}
@@ -740,7 +746,7 @@ class CoroHttpClientConnection(
     def _new_response(self) -> CoroHttpClientResponse:
         return CoroHttpClientResponse(check.not_none(self._method))
 
-    def get_response(self) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], CoroHttpClientResponse]:
+    def get_response(self) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], CoroHttpClientResponse]:
         """
         Get the response from the server.
 
@@ -766,7 +772,7 @@ class CoroHttpClientConnection(
         #  1) will_close: this connection was reset and the prior socket and response operate independently
         #  2) persistent: the response was retained and we await its is_closed() status to become true.
         if self._state != self._State.REQ_SENT or self._response:
-            raise self.ResponseNotReadyError(self._state)
+            raise CoroHttpClientErrors.ResponseNotReadyError(self._state)
 
         resp = self._new_response()
         resp_state = resp._state  # noqa

omlish/http/coro/client/headers.py

@@ -40,8 +40,8 @@ import email.parser
 import typing as ta
 
 from ....lite.check import check
+from ..io import CoroHttpIo
 from .errors import CoroHttpClientErrors
-from .io import CoroHttpClientIo
 
 
 ##
@@ -56,7 +56,7 @@ class CoroHttpClientHeaders:
     MAX_HEADERS: ta.ClassVar[int] = 100
 
     @classmethod
-    def read_headers(cls) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], ta.List[bytes]]:
+    def read_headers(cls) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], ta.List[bytes]]:
         """
         Reads potential header lines into a list from a file pointer.
 
@@ -65,8 +65,8 @@ class CoroHttpClientHeaders:
 
         headers = []
         while True:
-            line = check.isinstance((yield CoroHttpClientIo.ReadLineIo(CoroHttpClientIo.MAX_LINE + 1)), bytes)
-            if len(line) > CoroHttpClientIo.MAX_LINE:
+            line = check.isinstance((yield CoroHttpIo.ReadLineIo(CoroHttpIo.MAX_LINE + 1)), bytes)
+            if len(line) > CoroHttpIo.MAX_LINE:
                 raise CoroHttpClientErrors.LineTooLongError(CoroHttpClientErrors.LineTooLongError.LineType.HEADER)
 
             headers.append(line)
@@ -92,7 +92,7 @@ class CoroHttpClientHeaders:
         return email.parser.Parser().parsestr(text)
 
     @classmethod
-    def parse_headers(cls) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], email.message.Message]:
+    def parse_headers(cls) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], email.message.Message]:
         """Parses only RFC2822 headers from a file pointer."""
 
         headers = yield from cls.read_headers()

omlish/http/coro/client/response.py

@@ -40,19 +40,16 @@ import http
 import typing as ta
 
 from ....lite.check import check
+from ..io import CoroHttpIo
 from .errors import CoroHttpClientErrors
 from .headers import CoroHttpClientHeaders
-from .io import CoroHttpClientIo
 from .status import CoroHttpClientStatusLine
 
 
 ##
 
 
-class CoroHttpClientResponse(
-    CoroHttpClientErrors,
-    CoroHttpClientIo,
-):
+class CoroHttpClientResponse:
     # See RFC 2616 sec 19.6 and RFC 1945 sec 6 for details.
 
     # The bytes from the socket object are iso-8859-1 strings. See RFC 2616 sec 2.2 which notes an exception for
@@ -91,14 +88,14 @@ class CoroHttpClientResponse(
 
     #
 
-    def _read_status(self) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], CoroHttpClientStatusLine]:
+    def _read_status(self) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], CoroHttpClientStatusLine]:
         try:
             return (yield from CoroHttpClientStatusLine.read())
-        except self.BadStatusLineError:
+        except CoroHttpClientErrors.BadStatusLineError:
             self._close_conn()
             raise
 
-    def _begin(self) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], None]:
+    def _begin(self) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], None]:
         state = self._state
 
         check.state(not hasattr(state, 'headers'))
@@ -123,7 +120,7 @@ class CoroHttpClientResponse(
             # Use HTTP/1.1 code for HTTP/1.x where x>=1
             state.version = 11
         else:
-            raise self.UnknownProtocolError(version)
+            raise CoroHttpClientErrors.UnknownProtocolError(version)
 
         state.headers = yield from CoroHttpClientHeaders.parse_headers()
 
@@ -217,7 +214,7 @@ class CoroHttpClientResponse(
 
     #
 
-    def read(self, amt: ta.Optional[int] = None) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], bytes]:
+    def read(self, amt: ta.Optional[int] = None) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], bytes]:
         """Read and return the response body, or up to the next amt bytes."""
 
         if self._state.closed:
@@ -230,12 +227,12 @@ class CoroHttpClientResponse(
         if self._state.chunked:
             return (yield from self._read_chunked(amt))
 
-        if amt is not None:
+        if amt is not None and amt >= 0:
             if self._state.length is not None and amt > self._state.length:
                 # Clip the read to the "end of response"
                 amt = self._state.length
 
-            s = check.isinstance((yield self.ReadIo(amt)), bytes)
+            s = check.isinstance((yield CoroHttpIo.ReadIo(amt)), bytes)
 
             if not s and amt:
                 # Ideally, we would raise IncompleteRead if the content-length wasn't satisfied, but it might break
@@ -252,12 +249,12 @@ class CoroHttpClientResponse(
         else:
             # Amount is not given (unbounded read) so we must check self.length
             if self._state.length is None:
-                s = check.isinstance((yield self.ReadIo(None)), bytes)
+                s = check.isinstance((yield CoroHttpIo.ReadIo(None)), bytes)
 
             else:
                 try:
                     s = yield from self._safe_read(self._state.length)
-                except self.IncompleteReadError:
+                except CoroHttpClientErrors.IncompleteReadError:
                     self._close_conn()
                     raise
 
@@ -266,11 +263,11 @@ class CoroHttpClientResponse(
             self._close_conn()  # We read everything
             return s
 
-    def _read_next_chunk_size(self) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], int]:
+    def _read_next_chunk_size(self) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], int]:
         # Read the next chunk size from the file
-        line = check.isinstance((yield self.ReadLineIo(self.MAX_LINE + 1)), bytes)
-        if len(line) > self.MAX_LINE:
-            raise self.LineTooLongError(self.LineTooLongError.LineType.CHUNK_SIZE)
+        line = check.isinstance((yield CoroHttpIo.ReadLineIo(CoroHttpIo.MAX_LINE + 1)), bytes)
+        if len(line) > CoroHttpIo.MAX_LINE:
+            raise CoroHttpClientErrors.LineTooLongError(CoroHttpClientErrors.LineTooLongError.LineType.CHUNK_SIZE)
 
         i = line.find(b';')
         if i >= 0:
@@ -283,13 +280,13 @@ class CoroHttpClientResponse(
             self._close_conn()
             raise
 
-    def _read_and_discard_trailer(self) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], None]:
+    def _read_and_discard_trailer(self) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], None]:
         # Read and discard trailer up to the CRLF terminator
         # NOTE: we shouldn't have any trailers!
         while True:
-            line = check.isinstance((yield self.ReadLineIo(self.MAX_LINE + 1)), bytes)
-            if len(line) > self.MAX_LINE:
-                raise self.LineTooLongError(self.LineTooLongError.LineType.TRAILER)
+            line = check.isinstance((yield CoroHttpIo.ReadLineIo(CoroHttpIo.MAX_LINE + 1)), bytes)
+            if len(line) > CoroHttpIo.MAX_LINE:
+                raise CoroHttpClientErrors.LineTooLongError(CoroHttpClientErrors.LineTooLongError.LineType.TRAILER)
 
             if not line:
                 # A vanishingly small number of sites EOF without sending the trailer
@@ -298,7 +295,7 @@ class CoroHttpClientResponse(
             if line in (b'\r\n', b'\n', b''):
                 break
 
-    def _get_chunk_left(self) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], ta.Optional[int]]:
+    def _get_chunk_left(self) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], ta.Optional[int]]:
         # Return self.chunk_left, reading a new chunk if necessary. chunk_left == 0: at the end of the current chunk,
         # need to close it chunk_left == None: No current chunk, should read next. This function returns non-zero or
         # None if the last chunk has been read.
@@ -311,7 +308,7 @@ class CoroHttpClientResponse(
             try:
                 chunk_left = yield from self._read_next_chunk_size()
             except ValueError:
-                raise self.IncompleteReadError(b'') from None
+                raise CoroHttpClientErrors.IncompleteReadError(b'') from None
 
             if chunk_left == 0:
                 # Last chunk: 1*('0') [ chunk-extension ] CRLF
@@ -329,8 +326,10 @@ class CoroHttpClientResponse(
     def _read_chunked(
             self,
             amt: ta.Optional[int] = None,
-    ) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], bytes]:
+    ) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], bytes]:
         check.state(hasattr(self._state, 'chunked'))
+        if amt is not None and amt < 0:
+            amt = None
         value = []
         try:
             while (chunk_left := (yield from self._get_chunk_left())) is not None:
@@ -346,10 +345,10 @@ class CoroHttpClientResponse(
 
             return b''.join(value)
 
-        except self.IncompleteReadError as exc:
-            raise self.IncompleteReadError(b''.join(value)) from exc
+        except CoroHttpClientErrors.IncompleteReadError as exc:
+            raise CoroHttpClientErrors.IncompleteReadError(b''.join(value)) from exc
 
-    def _safe_read(self, amt: int) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], bytes]:
+    def _safe_read(self, amt: int) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], bytes]:
         """
         Read the number of bytes requested.
 
@@ -357,12 +356,12 @@ class CoroHttpClientResponse(
         available (due to EOF), then the IncompleteRead exception can be used to detect the problem.
         """
 
-        data = check.isinstance((yield self.ReadIo(amt)), bytes)
+        data = check.isinstance((yield CoroHttpIo.ReadIo(amt)), bytes)
         if len(data) < amt:
-            raise self.IncompleteReadError(data, amt - len(data))
+            raise CoroHttpClientErrors.IncompleteReadError(data, amt - len(data))
         return data
 
-    def peek(self, n: int = -1) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], bytes]:
+    def peek(self, n: int = -1) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], bytes]:
         # Having this enables IOBase.readline() to read more than one byte at a time
         if self._state.closed or self._state.method == 'HEAD':
             return b''
@@ -370,12 +369,12 @@ class CoroHttpClientResponse(
         if self._state.chunked:
             return (yield from self._peek_chunked(n))
 
-        return check.isinstance((yield self.PeekIo(n)), bytes)
+        return check.isinstance((yield CoroHttpIo.PeekIo(n)), bytes)
 
     def _readline(
             self,
             size: ta.Optional[int] = -1,
-    ) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], bytes]:
+    ) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], bytes]:
         if size is None:
             size = -1
         else:
@@ -407,7 +406,7 @@ class CoroHttpClientResponse(
 
         return bytes(res)
 
-    def readline(self, limit: int = -1) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], bytes]:
+    def readline(self, limit: int = -1) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], bytes]:
         if self._state.closed or self._state.method == 'HEAD':
             return b''
 
@@ -418,7 +417,7 @@ class CoroHttpClientResponse(
         if self._state.length is not None and (limit < 0 or limit > self._state.length):
             limit = self._state.length
 
-        result = check.isinstance((yield self.ReadLineIo(limit)), bytes)
+        result = check.isinstance((yield CoroHttpIo.ReadLineIo(limit)), bytes)
 
         if not result and limit:
             self._close_conn()
@@ -430,16 +429,16 @@ class CoroHttpClientResponse(
 
         return result
 
-    def _peek_chunked(self, n: int) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], bytes]:
+    def _peek_chunked(self, n: int) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], bytes]:
         # Strictly speaking, _get_chunk_left() may cause more than one read, but that is ok, since that is to satisfy
         # the chunked protocol.
         try:
             chunk_left = yield from self._get_chunk_left()
-        except self.IncompleteReadError:
+        except CoroHttpClientErrors.IncompleteReadError:
             return b''  # Peek doesn't worry about protocol
 
         if chunk_left is None:
             return b''  # Eof
 
         # Peek is allowed to return more than requested. Just request the entire chunk, and truncate what we get.
-        return check.isinstance((yield self.PeekIo(chunk_left)), bytes)[:chunk_left]
+        return check.isinstance((yield CoroHttpIo.PeekIo(chunk_left)), bytes)[:chunk_left]

omlish/http/coro/client/status.py

@@ -38,8 +38,8 @@
 import typing as ta
 
 from ....lite.check import check
+from ..io import CoroHttpIo
 from .errors import CoroHttpClientErrors
-from .io import CoroHttpClientIo
 
 
 #
@@ -51,9 +51,9 @@ class CoroHttpClientStatusLine(ta.NamedTuple):
     reason: str
 
     @classmethod
-    def read(cls) -> ta.Generator[CoroHttpClientIo.Io, ta.Optional[bytes], 'CoroHttpClientStatusLine']:
-        line = str(check.isinstance((yield CoroHttpClientIo.ReadLineIo(CoroHttpClientIo.MAX_LINE + 1)), bytes), 'iso-8859-1')  # noqa
-        if len(line) > CoroHttpClientIo.MAX_LINE:
+    def read(cls) -> ta.Generator[CoroHttpIo.Io, ta.Optional[bytes], 'CoroHttpClientStatusLine']:
+        line = str(check.isinstance((yield CoroHttpIo.ReadLineIo(CoroHttpIo.MAX_LINE + 1)), bytes), 'iso-8859-1')
+        if len(line) > CoroHttpIo.MAX_LINE:
             raise CoroHttpClientErrors.LineTooLongError(CoroHttpClientErrors.LineTooLongError.LineType.STATUS)
         if not line:
             # Presumably, the server closed the connection before sending a valid response.

omlish/http/coro/{client/io.py → io.py}

@@ -3,13 +3,21 @@
 import dataclasses as dc
 import typing as ta
 
-from ....lite.abstract import Abstract
+from ...lite.abstract import Abstract
 
 
 ##
 
 
-class CoroHttpClientIo:
+class CoroHttpIo:
+    def __new__(cls, *args, **kwargs):  # noqa
+        raise TypeError
+
+    def __init_subclass__(cls, **kwargs):  # noqa
+        raise TypeError
+
+    #
+
     MAX_LINE: ta.ClassVar[int] = 65536
 
     #
@@ -19,11 +27,20 @@ class CoroHttpClientIo:
 
     #
 
+    class AnyLogIo(Io, Abstract):
+        pass
+
+    #
+
     @dc.dataclass(frozen=True)
     class ConnectIo(Io):
         args: ta.Tuple[ta.Any, ...]
         kwargs: ta.Optional[ta.Dict[str, ta.Any]] = None
 
+        server_hostname: ta.Optional[str] = None
+
+    #
+
     class CloseIo(Io):
         pass