Harden response JSON fallback handling in transports

Co-authored-by: Shri Sukhani <shrisukhani@users.noreply.github.com>

Author: cursoragent

hyperbrowser/transport/async_transport.py

@@ -1,4 +1,3 @@
-import json
 import httpx
 from typing import Mapping, Optional
 
@@ -56,10 +55,14 @@ async def _handle_response(self, response: httpx.Response) -> APIResponse:
                 if not response.content:
                     return APIResponse.from_status(response.status_code)
                 return APIResponse(response.json())
-            except (httpx.DecodingError, json.JSONDecodeError, ValueError) as e:
+            except Exception as e:
                 if response.status_code >= 400:
+                    try:
+                        response_text = response.text
+                    except Exception:
+                        response_text = ""
                     raise HyperbrowserError(
-                        response.text or "Unknown error occurred",
+                        response_text or "Unknown error occurred",
                         status_code=response.status_code,
                         response=response,
                         original_error=e,

hyperbrowser/transport/sync.py

@@ -1,4 +1,3 @@
-import json
 import httpx
 from typing import Mapping, Optional
 
@@ -44,10 +43,14 @@ def _handle_response(self, response: httpx.Response) -> APIResponse:
                 if not response.content:
                     return APIResponse.from_status(response.status_code)
                 return APIResponse(response.json())
-            except (httpx.DecodingError, json.JSONDecodeError, ValueError) as e:
+            except Exception as e:
                 if response.status_code >= 400:
+                    try:
+                        response_text = response.text
+                    except Exception:
+                        response_text = ""
                     raise HyperbrowserError(
-                        response.text or "Unknown error occurred",
+                        response_text or "Unknown error occurred",
                         status_code=response.status_code,
                         response=response,
                         original_error=e,

tests/test_transport_response_handling.py

@@ -26,6 +26,32 @@ def raise_for_status(self) -> None:
         raise httpx.RequestError("network down")
 
 
+class _BrokenJsonSuccessResponse:
+    status_code = 200
+    content = b"{broken-json}"
+
+    def raise_for_status(self) -> None:
+        return None
+
+    def json(self):
+        raise RuntimeError("broken json")
+
+
+class _BrokenJsonErrorResponse:
+    status_code = 500
+    content = b"{broken-json}"
+
+    def raise_for_status(self) -> None:
+        return None
+
+    @property
+    def text(self) -> str:
+        raise RuntimeError("broken response text")
+
+    def json(self):
+        raise RuntimeError("broken json")
+
+
 def test_sync_handle_response_with_non_json_success_body_returns_status_only():
     transport = SyncTransport(api_key="test-key")
     try:
@@ -39,6 +65,30 @@ def test_sync_handle_response_with_non_json_success_body_returns_status_only():
         transport.close()
 
 
+def test_sync_handle_response_with_broken_json_success_payload_returns_status_only():
+    transport = SyncTransport(api_key="test-key")
+    try:
+        api_response = transport._handle_response(
+            _BrokenJsonSuccessResponse()  # type: ignore[arg-type]
+        )
+
+        assert api_response.status_code == 200
+        assert api_response.data is None
+    finally:
+        transport.close()
+
+
+def test_sync_handle_response_with_broken_json_error_payload_uses_default_message():
+    transport = SyncTransport(api_key="test-key")
+    try:
+        with pytest.raises(HyperbrowserError, match="Unknown error occurred"):
+            transport._handle_response(
+                _BrokenJsonErrorResponse()  # type: ignore[arg-type]
+            )
+    finally:
+        transport.close()
+
+
 def test_sync_handle_response_with_request_error_includes_method_and_url():
     transport = SyncTransport(api_key="test-key")
     try:
@@ -111,6 +161,36 @@ async def run() -> None:
     asyncio.run(run())
 
 
+def test_async_handle_response_with_broken_json_success_payload_returns_status_only():
+    async def run() -> None:
+        transport = AsyncTransport(api_key="test-key")
+        try:
+            api_response = await transport._handle_response(
+                _BrokenJsonSuccessResponse()  # type: ignore[arg-type]
+            )
+
+            assert api_response.status_code == 200
+            assert api_response.data is None
+        finally:
+            await transport.close()
+
+    asyncio.run(run())
+
+
+def test_async_handle_response_with_broken_json_error_payload_uses_default_message():
+    async def run() -> None:
+        transport = AsyncTransport(api_key="test-key")
+        try:
+            with pytest.raises(HyperbrowserError, match="Unknown error occurred"):
+                await transport._handle_response(
+                    _BrokenJsonErrorResponse()  # type: ignore[arg-type]
+                )
+        finally:
+            await transport.close()
+
+    asyncio.run(run())
+
+
 def test_async_handle_response_with_request_error_includes_method_and_url():
     async def run() -> None:
         transport = AsyncTransport(api_key="test-key")