From 79598a4f8c445ef0497c99050909e75241ab476e Mon Sep 17 00:00:00 2001 From: Zaksans Date: Thu, 5 Nov 2026 23:18:57 +0100 Subject: [PATCH] fix: close owned Aptos clients on SDK shutdown --- src/decibel/_base.py | 7 ++- src/decibel/read/__init__.py | 5 ++- tests/test_base.py | 3 +- tests/test_client_cleanup.py | 84 ++++++++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 4 deletions(-) create mode 100644 tests/test_client_cleanup.py diff --git a/src/decibel/_base.py b/src/decibel/_base.py index fc98504..703572d 100644 --- a/src/decibel/_base.py +++ b/src/decibel/_base.py @@ -189,8 +189,11 @@ def time_delta_ms(self, value: int) -> None: self._time_delta_ms = value async def close(self) -> None: - if self._owns_http_client: - await self._http_client.aclose() + try: + await self._aptos.close() + finally: + if self._owns_http_client: + await self._http_client.aclose() async def __aenter__(self) -> BaseSDK: return self diff --git a/src/decibel/read/__init__.py b/src/decibel/read/__init__.py index 1617a8d..b7aad73 100644 --- a/src/decibel/read/__init__.py +++ b/src/decibel/read/__init__.py @@ -386,7 +386,10 @@ async def close(self) -> None: try: await self.ws.close() finally: - await self._http_client.aclose() + try: + await self._aptos.close() + finally: + await self._http_client.aclose() async def __aenter__(self) -> DecibelReadDex: return self diff --git a/tests/test_base.py b/tests/test_base.py index 9b64535..5e5b688 100644 --- a/tests/test_base.py +++ b/tests/test_base.py @@ -78,7 +78,8 @@ def _module_response(status_code: int = 200, functions: Any = None) -> httpx.Res def _make_sdk(config: Any, account: Any, opts: Any = None) -> BaseSDK: - with patch("decibel._base.AbiRegistry"), patch("decibel._base.RestClient"): + with patch("decibel._base.AbiRegistry"), patch("decibel._base.RestClient") as mock_rest: + mock_rest.return_value.close = AsyncMock() sdk = BaseSDK(config=config, account=account, opts=opts) return sdk diff --git a/tests/test_client_cleanup.py b/tests/test_client_cleanup.py new file mode 100644 index 0000000..531c31c --- /dev/null +++ b/tests/test_client_cleanup.py @@ -0,0 +1,84 @@ +from typing import Any +from unittest.mock import AsyncMock, patch + +import httpx +import pytest + +from decibel._base import BaseSDK, BaseSDKOptions +from decibel.read import DecibelReadDex + + +@pytest.mark.parametrize("provided_client", [False, True]) +@pytest.mark.parametrize("exit_mode", ["close", "context", "exception"]) +async def test_base_closes_owned_clients( + test_config: Any, mock_account: Any, provided_client: bool, exit_mode: str +) -> None: + client = httpx.AsyncClient() if provided_client else None + sdk = BaseSDK(test_config, mock_account, BaseSDKOptions(http_client=client)) + try: + if exit_mode == "close": + await sdk.close() + elif exit_mode == "context": + async with sdk: + pass + else: + with pytest.raises(ValueError, match="body failed"): + async with sdk: + raise ValueError("body failed") + + assert sdk.aptos.client.is_closed + assert sdk._http_client.is_closed is not provided_client + finally: + await sdk.aptos.close() + await sdk._http_client.aclose() + + +@pytest.mark.parametrize("exit_mode", ["close", "context", "exception"]) +async def test_reader_closes_owned_clients(test_config: Any, exit_mode: str) -> None: + sdk = DecibelReadDex(test_config) + try: + if exit_mode == "close": + await sdk.close() + elif exit_mode == "context": + async with sdk: + pass + else: + with pytest.raises(ValueError, match="body failed"): + async with sdk: + raise ValueError("body failed") + + assert sdk._aptos.client.is_closed + assert sdk._http_client.is_closed + finally: + await sdk._aptos.close() + await sdk._http_client.aclose() + + +async def test_base_closes_http_client_when_aptos_close_fails( + test_config: Any, mock_account: Any +) -> None: + sdk = BaseSDK(test_config, mock_account) + try: + with patch.object(sdk.aptos, "close", AsyncMock(side_effect=ValueError("close failed"))): + with pytest.raises(ValueError, match="close failed"): + await sdk.close() + assert sdk._http_client.is_closed + finally: + await sdk.aptos.close() + await sdk._http_client.aclose() + + +@pytest.mark.parametrize("failure", ["websocket", "aptos"]) +async def test_reader_finishes_cleanup_after_close_error(test_config: Any, failure: str) -> None: + sdk = DecibelReadDex(test_config) + target = sdk.ws if failure == "websocket" else sdk._aptos + try: + with patch.object(target, "close", AsyncMock(side_effect=ValueError("close failed"))): + with pytest.raises(ValueError, match="close failed"): + await sdk.close() + assert sdk._http_client.is_closed + if failure == "websocket": + assert sdk._aptos.client.is_closed + finally: + await sdk._aptos.close() + await sdk._http_client.aclose()