feat: enhance the robustness of WebSocket error handling and remove the HTTP version restriction

Author: WSH032

src/fastapi_proxy_lib/core/_tool.py

@@ -1,13 +1,11 @@
 """The utils tools for both http proxy and websocket proxy."""
 
 import ipaddress
-import logging
 import warnings
 from functools import lru_cache
 from textwrap import dedent
 from typing import (
     Any,
-    Iterable,
     Mapping,
     Optional,
     Protocol,
@@ -17,7 +15,6 @@
 )
 
 import httpx
-from starlette import status
 from starlette.background import BackgroundTask as BackgroundTask_t
 from starlette.datastructures import (
     Headers as StarletteHeaders,
@@ -26,13 +23,11 @@
     MutableHeaders as StarletteMutableHeaders,
 )
 from starlette.responses import JSONResponse
-from starlette.types import Scope
 from typing_extensions import deprecated, overload
 
 __all__ = (
     "check_base_url",
     "return_err_msg_response",
-    "check_http_version",
     "BaseURLError",
     "ErrMsg",
     "ErrRseponseJson",
@@ -129,10 +124,6 @@ class _RejectedProxyRequestError(RuntimeError):
     """Should be raised when reject proxy request."""
 
 
-class _UnsupportedHttpVersionError(RuntimeError):
-    """Unsupported http version."""
-
-
 #################### Tools ####################
 
 
@@ -337,35 +328,6 @@ def return_err_msg_response(
     )
 
 
-def check_http_version(
-    scope: Scope, supported_versions: Iterable[str]
-) -> Union[JSONResponse, None]:
-    """Check whether the http version of scope is in supported_versions.
-
-    Args:
-        scope: asgi scope dict.
-        supported_versions: The supported http versions.
-
-    Returns:
-        If the http version of scope is not in supported_versions, return a JSONResponse with status_code=505,
-        else return None.
-    """
-    # https://asgi.readthedocs.io/en/latest/specs/www.html#http-connection-scope
-    # https://asgi.readthedocs.io/en/latest/specs/www.html#websocket-connection-scope
-    http_version: str = scope.get("http_version", "")
-    # 如果明确指定了http版本（即不是""），但不在支持的版本内，则返回505
-    if http_version not in supported_versions and http_version != "":
-        error = _UnsupportedHttpVersionError(
-            f"The request http version is {http_version}, but we only support {supported_versions}."
-        )
-        # TODO: 或许可以logging记录下 scope.get("client") 的值
-        return return_err_msg_response(
-            error,
-            status_code=status.HTTP_505_HTTP_VERSION_NOT_SUPPORTED,
-            logger=logging.info,
-        )
-
-
 def default_proxy_filter(url: httpx.URL) -> Union[None, str]:
     """Filter by host.
 

src/fastapi_proxy_lib/core/http.py

@@ -31,7 +31,6 @@
     _RejectedProxyRequestError,  # pyright: ignore [reportPrivateUsage]  # 允许使用本项目内部的私有成员
     change_necessary_client_header_for_httpx,
     check_base_url,
-    check_http_version,
     return_err_msg_response,
     warn_for_none_filter,
 )
@@ -81,10 +80,6 @@ class _ReverseProxyServerError(RuntimeError):
 _NON_REQUEST_BODY_METHODS = ("GET", "HEAD", "OPTIONS", "TRACE")
 """The http methods that should not contain request body."""
 
-# https://asgi.readthedocs.io/en/latest/specs/www.html#http-connection-scope
-SUPPORTED_HTTP_VERSIONS = ("1.0", "1.1")
-"""The http versions that we supported now. It depends on `httpx`."""
-
 # https://www.python-httpx.org/exceptions/
 _400_ERROR_NEED_TO_BE_CATCHED_IN_FORWARD_PROXY = (
     httpx.InvalidURL,  # 解析url时出错
@@ -227,8 +222,6 @@ async def send_request_to_target(  # pyright: ignore [reportIncompatibleMethodOv
     ) -> StarletteResponse:
         """Change request headers and send request to target url.
 
-        - The http version of request must be in [`SUPPORTED_HTTP_VERSIONS`][fastapi_proxy_lib.core.http.SUPPORTED_HTTP_VERSIONS].
-
         Args:
             request: the original client request.
             target_url: target url that request will be sent to.
@@ -239,10 +232,6 @@ async def send_request_to_target(  # pyright: ignore [reportIncompatibleMethodOv
         client = self.client
         follow_redirects = self.follow_redirects
 
-        check_result = check_http_version(request.scope, SUPPORTED_HTTP_VERSIONS)
-        if check_result is not None:
-            return check_result
-
         # 将请求头中的host字段改为目标url的host
         # 同时强制移除"keep-alive"字段和添加"keep-alive"值到"connection"字段中保持连接
         require_close, proxy_header = _change_client_header(