Mitigate TLS fingerprinting

discord/__main__.py

@@ -24,16 +24,18 @@
 
 from __future__ import annotations
 
-from typing import Optional, Tuple, Dict
-
 import argparse
+import importlib.metadata
+import platform
 import sys
 from pathlib import Path
+from typing import Dict, Optional, Tuple
 
-import discord
-import importlib.metadata
 import aiohttp
-import platform
+import curl_cffi
+import discord_protos
+
+import discord
 
 
 def show_version() -> None:
@@ -47,6 +49,8 @@
         if version:
             entries.append(f'    - discord.py-self metadata: v{version}')
 
+    entries.append(f'- discord-protos v{discord_protos.__version__}')
+    entries.append(f'- curl_cffi v{curl_cffi.__version__} (curl v{curl_cffi.__curl_version__})')
     entries.append(f'- aiohttp v{aiohttp.__version__}')
     uname = platform.uname()
     entries.append('- system info: {0.system} {0.release} {0.version}'.format(uname))

discord/client.py

@@ -155,6 +155,10 @@ class Client:
 
     A number of options can be passed to the :class:`Client`.
 
+    .. versionchanged:: 2.1
+
+        Removed the ``http_trace`` parameter.
+
     Parameters
     -----------
     max_messages: Optional[:class:`int`]
@@ -215,12 +219,6 @@ class Client:
         Whether to keep presences up-to-date across clients.
         The default behavior is ``True`` (what the client does).
 
-        .. versionadded:: 2.0
-    http_trace: :class:`aiohttp.TraceConfig`
-        The trace configuration to use for tracking HTTP requests the library does using ``aiohttp``.
-        This allows you to check requests the library is using. For more information, check the
-        `aiohttp documentation <https://docs.aiohttp.org/en/stable/client_advanced.html#client-tracing>`_.
-
         .. versionadded:: 2.0
     captcha_handler: Optional[Callable[[:class:`.CaptchaRequired`, :class:`.Client`], Awaitable[:class:`str`]]
         A function that solves captcha challenges.
@@ -254,7 +252,6 @@ def __init__(self, **options: Any) -> None:
         proxy: Optional[str] = options.pop('proxy', None)
         proxy_auth: Optional[aiohttp.BasicAuth] = options.pop('proxy_auth', None)
         unsync_clock: bool = options.pop('assume_unsync_clock', True)
-        http_trace: Optional[aiohttp.TraceConfig] = options.pop('http_trace', None)
         max_ratelimit_timeout: Optional[float] = options.pop('max_ratelimit_timeout', None)
         self.captcha_handler: Optional[Callable[[CaptchaRequired, Client], Awaitable[str]]] = options.pop(
             'captcha_handler', None
@@ -263,7 +260,6 @@ def __init__(self, **options: Any) -> None:
             proxy=proxy,
             proxy_auth=proxy_auth,
             unsync_clock=unsync_clock,
-            http_trace=http_trace,
             captcha=self.handle_captcha,
             max_ratelimit_timeout=max_ratelimit_timeout,
             locale=lambda: self._connection.locale,

discord/errors.py

@@ -29,7 +29,8 @@
 from .utils import _get_as_snowflake
 
 if TYPE_CHECKING:
-    from aiohttp import ClientResponse, ClientWebSocketResponse
+    from aiohttp import ClientResponse
+    from curl_cffi.requests import Response as CurlResponse, WebSocket
     from requests import Response
     from typing_extensions import TypeGuard
 
@@ -41,7 +42,7 @@
         FormErrorWrapper as FormErrorWrapperPayload,
     )
 
-    _ResponseType = Union[ClientResponse, Response]
+    _ResponseType = Union[ClientResponse, CurlResponse, Response]
 
 __all__ = (
     'DiscordException',
@@ -116,10 +117,10 @@
 
     Attributes
     ------------
-    response: :class:`aiohttp.ClientResponse`
-        The response of the failed HTTP request. This is an
-        instance of :class:`aiohttp.ClientResponse`. In some cases
-        this could also be a :class:`requests.Response`.
+    response: Union[:class:`curl_cffi.requests.Response`, :class:`aiohttp.ClientResponse`]
+        The response of the failed HTTP request. This is an instance of
+        :class:`curl_cffi.requests.Response` or :class:`aiohttp.ClientResponse`.
+        In some cases this could also be a :class:`requests.Response`.
     text: :class:`str`
         The text of the error. Could be an empty string.
     status: :class:`int`
@@ -300,10 +301,9 @@
 
     __slots__ = ('code', 'reason')
 
-    def __init__(self, socket: ClientWebSocketResponse, *, code: Optional[int] = None):
+    def __init__(self, code: Optional[int] = None, reason: Optional[str] = None):
         # This exception is just the same exception except
         # reconfigured to subclass ClientException for users
-        self.code: int = code or socket.close_code or -1
-        # aiohttp doesn't seem to consistently provide close reason
-        self.reason: str = ''
-        super().__init__(f'WebSocket closed with {self.code}')
+        self.code: int = code or -1
+        self.reason: str = reason or 'unknown'
+        super().__init__(f'WebSocket closed with {self.code} (reason: {self.reason!r})')