test: do not use deprecated and removed APIs of httpx (#47)

* test: do not use deprecated and removed APIs of `httpx`

- `proxies` => `mounts`
- `app` => `transport`

* docs(CHANGELOG): update `CHANGELOG.md`

Author: WSH032

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Fixed` for any bug fixes.
 - `Security` in case of vulnerabilities.
 - `[YANKED]` for deprecated releases.
+- `Internal` for internal changes. Only for maintainers.
 
 <!-- Refer to: https://github.com/olivierlacan/keep-a-changelog/blob/main/CHANGELOG.md -->
 <!-- Refer to: https://github.com/gradio-app/gradio/blob/main/CHANGELOG.md -->
@@ -26,6 +27,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - [#30](https://github.com/WSH032/fastapi-proxy-lib/pull/30) - fix(internal): use `websocket` in favor of `websocket_route`. Thanks [@WSH032](https://github.com/WSH032)!
 
+### Internal
+
+- [#47](https://github.com/WSH032/fastapi-proxy-lib/pull/47) - test: do not use deprecated and removed APIs of httpx. Thanks [@WSH032](https://github.com/WSH032)!
+
 ## [0.1.0] - 2023-12-01
 
 ### Security

tests/test_core_lib.py

@@ -13,6 +13,7 @@
 from fastapi_proxy_lib.core.http import ReverseHttpProxy
 from fastapi_proxy_lib.fastapi.app import forward_http_app, reverse_http_app
 from fastapi_proxy_lib.fastapi.router import RouterHelper
+from httpx import ASGITransport
 from starlette.responses import JSONResponse
 
 from .tool import DEFAULT_URL
@@ -70,7 +71,9 @@ async def _() -> JSONResponse:
     #     }
     # }
 
-    client = httpx.AsyncClient(app=app, base_url="http://www.example.com")
+    client = httpx.AsyncClient(
+        transport=ASGITransport(app), base_url="http://www.example.com"
+    )
     resp = await client.get("http://www.example.com/exception")
     assert resp.status_code == 0
     assert resp.json()["detail"] == test_err_msg

tests/test_http.py

@@ -4,6 +4,7 @@
 import httpx
 import pytest
 from fastapi_proxy_lib.core.tool import default_proxy_filter
+from httpx import ASGITransport
 from typing_extensions import override
 
 from .conftest import AppFactoryFixture, LifeAppDataclass4Test
@@ -32,7 +33,8 @@ async def tool_4_test_fixture(  # pyright: ignore[reportIncompatibleMethodOverri
     ) -> Tool4TestFixture:
         """目标服务器请参考`tests.app.echo_http_app.get_app`."""
         client_for_conn_to_target_server = httpx.AsyncClient(
-            app=echo_http_test_model.app, base_url=DEFAULT_TARGET_SERVER_BASE_URL
+            transport=ASGITransport(echo_http_test_model.app),
+            base_url=DEFAULT_TARGET_SERVER_BASE_URL,
         )
 
         reverse_http_app = await reverse_http_app_fct(
@@ -41,7 +43,8 @@ async def tool_4_test_fixture(  # pyright: ignore[reportIncompatibleMethodOverri
         )
 
         client_for_conn_to_proxy_server = httpx.AsyncClient(
-            app=reverse_http_app, base_url=DEFAULT_PROXY_SERVER_BASE_URL
+            transport=ASGITransport(reverse_http_app),
+            base_url=DEFAULT_PROXY_SERVER_BASE_URL,
         )
 
         get_request = echo_http_test_model.get_request
@@ -198,7 +201,8 @@ async def test_bad_url_request(
         )
 
         client_for_conn_to_proxy_server = httpx.AsyncClient(
-            app=reverse_http_app, base_url=DEFAULT_PROXY_SERVER_BASE_URL
+            transport=ASGITransport(reverse_http_app),
+            base_url=DEFAULT_PROXY_SERVER_BASE_URL,
         )
 
         r = await client_for_conn_to_proxy_server.get(DEFAULT_PROXY_SERVER_BASE_URL)
@@ -252,15 +256,17 @@ async def tool_4_test_fixture(  # pyright: ignore[reportIncompatibleMethodOverri
     ) -> Tool4TestFixture:
         """目标服务器请参考`tests.app.echo_http_app.get_app`."""
         client_for_conn_to_target_server = httpx.AsyncClient(
-            app=echo_http_test_model.app, base_url=DEFAULT_TARGET_SERVER_BASE_URL
+            transport=ASGITransport(echo_http_test_model.app),
+            base_url=DEFAULT_TARGET_SERVER_BASE_URL,
         )
 
         forward_http_app = await forward_http_app_fct(
             client=client_for_conn_to_target_server, proxy_filter=default_proxy_filter
         )
 
         client_for_conn_to_proxy_server = httpx.AsyncClient(
-            app=forward_http_app, base_url=DEFAULT_PROXY_SERVER_BASE_URL
+            transport=ASGITransport(forward_http_app),
+            base_url=DEFAULT_PROXY_SERVER_BASE_URL,
         )
 
         get_request = echo_http_test_model.get_request
@@ -310,7 +316,8 @@ async def test_bad_url_request(
         )
 
         client_for_conn_to_proxy_server = httpx.AsyncClient(
-            app=forward_http_app, base_url=DEFAULT_PROXY_SERVER_BASE_URL
+            transport=ASGITransport(forward_http_app),
+            base_url=DEFAULT_PROXY_SERVER_BASE_URL,
         )
 
         # 错误的无法发出请求的URL
@@ -356,7 +363,8 @@ async def connect_error_mock_handler(
         )
 
         client_for_conn_to_proxy_server = httpx.AsyncClient(
-            app=forward_http_app, base_url=DEFAULT_PROXY_SERVER_BASE_URL
+            transport=ASGITransport(forward_http_app),
+            base_url=DEFAULT_PROXY_SERVER_BASE_URL,
         )
 
         r = await client_for_conn_to_proxy_server.get(

tests/test_ws.py

@@ -11,7 +11,7 @@
 import pytest
 import uvicorn
 from fastapi_proxy_lib.fastapi.app import reverse_ws_app as get_reverse_ws_app
-from httpx_ws import aconnect_ws
+from httpx_ws import AsyncWebSocketSession, aconnect_ws
 from starlette import websockets as starlette_websockets_module
 from typing_extensions import override
 
@@ -33,7 +33,7 @@
 # # https://github.com/encode/uvicorn/discussions/2105
 WS_BACKENDS_NEED_BE_TESTED = ("websockets",)
 
-# https://www.python-httpx.org/advanced/#http-proxying
+# https://www.python-httpx.org/advanced/transports/#no-proxy-support
 NO_PROXIES: Dict[Any, Any] = {"all://": None}
 
 
@@ -81,18 +81,20 @@ def _subprocess_run_httpx_ws(
     kwargs_async_client = kwargs_async_client or {}
     kwargs_aconnect_ws = kwargs_aconnect_ws or {}
 
-    kwargs_async_client.pop("proxies", None)
+    kwargs_async_client.pop("mounts", None)
     kwargs_aconnect_ws.pop("client", None)
 
     async def run():
         _exit_stack = AsyncExitStack()
-        _temp_client = httpx.AsyncClient(proxies=NO_PROXIES, **kwargs_async_client)
-        _ = await _exit_stack.enter_async_context(
-            aconnect_ws(
+        _temp_client = httpx.AsyncClient(mounts=NO_PROXIES, **kwargs_async_client)
+        # it's `httpx-ws` typing issue, so ignore it
+        _ws_session: AsyncWebSocketSession = (
+            aconnect_ws(  # pyright: ignore[reportAssignmentType]
                 client=_temp_client,
                 **kwargs_aconnect_ws,
             )
         )
+        _ = await _exit_stack.enter_async_context(_ws_session)
         queue.put("done")
         queue.close()
         while True:  # run forever
@@ -125,7 +127,7 @@ async def tool_4_test_fixture(  # pyright: ignore[reportIncompatibleMethodOverri
 
         target_server_base_url = str(target_ws_server.contx_socket_url)
 
-        client_for_conn_to_target_server = httpx.AsyncClient(proxies=NO_PROXIES)
+        client_for_conn_to_target_server = httpx.AsyncClient(mounts=NO_PROXIES)
 
         reverse_ws_app = get_reverse_ws_app(
             client=client_for_conn_to_target_server, base_url=target_server_base_url
@@ -140,7 +142,7 @@ async def tool_4_test_fixture(  # pyright: ignore[reportIncompatibleMethodOverri
 
         proxy_server_base_url = str(proxy_ws_server.contx_socket_url)
 
-        client_for_conn_to_proxy_server = httpx.AsyncClient(proxies=NO_PROXIES)
+        client_for_conn_to_proxy_server = httpx.AsyncClient(mounts=NO_PROXIES)
 
         return Tool4TestFixture(
             client_for_conn_to_target_server=client_for_conn_to_target_server,
@@ -210,7 +212,7 @@ async def test_ws_proxy(self, tool_4_test_fixture: Tool4TestFixture) -> None:
 
         aconnect_ws_subprocess_queue: "Queue[str]" = Queue()
 
-        kwargs_async_client = {"proxies": NO_PROXIES}
+        kwargs_async_client = {"mounts": NO_PROXIES}
         kwargs_aconnect_ws = {"url": proxy_server_base_url + "do_nothing"}
         kwargs = {
             "kwargs_async_client": kwargs_async_client,
@@ -270,7 +272,7 @@ async def test_target_server_shutdown_abnormally(
             await asyncio.sleep(0.1)
         target_server_base_url = subprocess_queue.get()
 
-        client_for_conn_to_target_server = httpx.AsyncClient(proxies=NO_PROXIES)
+        client_for_conn_to_target_server = httpx.AsyncClient(mounts=NO_PROXIES)
 
         reverse_ws_app = get_reverse_ws_app(
             client=client_for_conn_to_target_server, base_url=target_server_base_url
@@ -285,31 +287,23 @@ async def test_target_server_shutdown_abnormally(
 
             async with aconnect_ws(
                 proxy_server_base_url + "do_nothing",
-                httpx.AsyncClient(proxies=NO_PROXIES),
-            ) as ws0, aconnect_ws(
-                proxy_server_base_url + "do_nothing",
-                httpx.AsyncClient(proxies=NO_PROXIES),
-            ) as ws1:
+                httpx.AsyncClient(mounts=NO_PROXIES),
+            ) as ws:
+                loop = asyncio.get_running_loop()
+
                 # force shutdown target server
                 target_ws_server_subprocess.terminate()
                 target_ws_server_subprocess.kill()
-                # https://pytest-cov.readthedocs.io/en/latest/subprocess-support.html#if-you-use-multiprocessing-process
-                target_ws_server_subprocess.join()  # dont forget this, pytest-cov requires this
 
-                with pytest.raises(httpx_ws.WebSocketDisconnect) as exce:
-                    await ws0.receive()
-                assert exce.value.code == 1011
-
-                loop = asyncio.get_running_loop()
+                start = loop.time()
 
-                seconde_ws_recv_start = loop.time()
                 with pytest.raises(httpx_ws.WebSocketDisconnect) as exce:
-                    await ws1.receive()
+                    await ws.receive()
                 assert exce.value.code == 1011
-                seconde_ws_recv_end = loop.time()
 
-                # HACK: 由于收到关闭代码需要40s，目前无法确定是什么原因，
-                # 所以目前会同时测试两个客户端的连接，
-                # 只要第二个客户端不是在之前40s基础上又重复40s，就暂时没问题，
-                # 因为这模拟了多个客户端进行连接的情况。
-                assert (seconde_ws_recv_end - seconde_ws_recv_start) < 2
+                end = loop.time()
+                # we require the proxy server to send 1011 in 60s
+                assert end - start < 60
+
+                # https://pytest-cov.readthedocs.io/en/latest/subprocess-support.html#if-you-use-multiprocessing-process
+                target_ws_server_subprocess.join()  # dont forget this, pytest-cov requires this