Files
browser-use/browser_use/browser/_cdp_timeout.py
Saurav Panda 847ad78365 address cubic review: validate constructor timeout + exercise real send_raw
Two P2 comments from cubic on 9a09c4d7:

1. TimeoutWrappedCDPClient.__init__ trusted its cdp_request_timeout_s arg
   blindly. nan / inf / <=0 would either make every CDP call time out
   immediately (nan) or disable the guard (inf / <=0) — same defensive
   gap we already fixed for the env-var path. Extracted _coerce_valid_
   timeout() that mirrors _parse_env_cdp_timeout's validation; constructor
   now routes through it, so both entry points are equally safe.

2. test_send_raw_times_out_on_silent_server used an inline copy of the
   wrapper logic rather than the real TimeoutWrappedCDPClient.send_raw.
   A regression in the production method — e.g. accidentally removing
   the asyncio.wait_for — would not fail the test. Rewrote to:
   - Construct via __new__ (skip CDPClient.__init__'s WebSocket setup)
   - unittest.mock.patch the parent CDPClient.send_raw with a hanging
     coroutine
   - Call the real TimeoutWrappedCDPClient.send_raw, which does
     super().send_raw(...) → our patched stub
   - Assert it raises TimeoutError within the cap

Also added test_send_raw_passes_through_when_fast (fast-path regression
guard) and test_constructor_rejects_invalid_timeout (validation for
fix #1). All 14 tests in the timeout suite pass locally.
2026-04-20 17:54:37 -07:00

126 lines
4.2 KiB
Python

"""Per-CDP-request timeout wrapper around cdp_use.CDPClient.
cdp_use's `send_raw()` awaits a future that only resolves when the browser
sends a matching response. If the server goes silent mid-session (observed
failure mode against remote cloud browsers: WebSocket stays "alive" at the
TCP/keepalive layer while the browser container is dead or the proxy has
lost its upstream) the future never resolves and the whole agent hangs.
This module provides a thin subclass that wraps each `send_raw()` in
`asyncio.wait_for`. Any CDP method that doesn't get a response within the
cap raises `TimeoutError`, which propagates through existing
error-handling paths in browser-use instead of hanging indefinitely.
Configure the cap via:
- `BROWSER_USE_CDP_TIMEOUT_S` env var (process-wide default)
- `TimeoutWrappedCDPClient(..., cdp_request_timeout_s=...)` constructor arg
Default (60s) is generous for slow operations like `Page.captureScreenshot`
or `Page.printToPDF` on heavy pages, but well below the 180s agent step
timeout and the typical outer agent watchdog.
"""
from __future__ import annotations
import asyncio
import logging
import math
import os
from typing import Any
from cdp_use import CDPClient
logger = logging.getLogger(__name__)
_CDP_TIMEOUT_FALLBACK_S = 60.0
def _parse_env_cdp_timeout(raw: str | None) -> float:
"""Parse BROWSER_USE_CDP_TIMEOUT_S defensively.
Accepts only finite positive values; everything else falls back to the
hardcoded default with a warning. Mirrors the guard on
BROWSER_USE_ACTION_TIMEOUT_S in tools/service.py — a bad env value here
would otherwise make every CDP call time out immediately (nan) or never
(inf / negative / zero).
"""
if raw is None or raw == '':
return _CDP_TIMEOUT_FALLBACK_S
try:
parsed = float(raw)
except ValueError:
logger.warning(
'Invalid BROWSER_USE_CDP_TIMEOUT_S=%r; falling back to %.0fs',
raw,
_CDP_TIMEOUT_FALLBACK_S,
)
return _CDP_TIMEOUT_FALLBACK_S
if not math.isfinite(parsed) or parsed <= 0:
logger.warning(
'BROWSER_USE_CDP_TIMEOUT_S=%r is not a finite positive number; falling back to %.0fs',
raw,
_CDP_TIMEOUT_FALLBACK_S,
)
return _CDP_TIMEOUT_FALLBACK_S
return parsed
DEFAULT_CDP_REQUEST_TIMEOUT_S: float = _parse_env_cdp_timeout(os.getenv('BROWSER_USE_CDP_TIMEOUT_S'))
def _coerce_valid_timeout(value: float | None) -> float:
"""Normalize a user-supplied timeout to a finite positive value.
None / nan / inf / non-positive values all fall back to the env-derived
default with a warning. This mirrors _parse_env_cdp_timeout so callers that
pass cdp_request_timeout_s directly get the same defensive behaviour as
callers that set the env var.
"""
if value is None:
return DEFAULT_CDP_REQUEST_TIMEOUT_S
if not math.isfinite(value) or value <= 0:
logger.warning(
'cdp_request_timeout_s=%r is not a finite positive number; falling back to %.0fs',
value,
DEFAULT_CDP_REQUEST_TIMEOUT_S,
)
return DEFAULT_CDP_REQUEST_TIMEOUT_S
return float(value)
class TimeoutWrappedCDPClient(CDPClient):
"""CDPClient subclass that enforces a per-request timeout on send_raw.
Any CDP method that doesn't receive a response within `cdp_request_timeout_s`
raises `TimeoutError` instead of hanging forever. This turns silent-hang
failure modes (cloud proxy alive, browser dead) into fast observable errors.
"""
def __init__(
self,
*args: Any,
cdp_request_timeout_s: float | None = None,
**kwargs: Any,
) -> None:
super().__init__(*args, **kwargs)
self._cdp_request_timeout_s: float = _coerce_valid_timeout(cdp_request_timeout_s)
async def send_raw(
self,
method: str,
params: Any | None = None,
session_id: str | None = None,
) -> dict[str, Any]:
try:
return await asyncio.wait_for(
super().send_raw(method=method, params=params, session_id=session_id),
timeout=self._cdp_request_timeout_s,
)
except TimeoutError as e:
# Raise a plain TimeoutError so existing `except TimeoutError`
# handlers in browser-use / tools treat this uniformly.
raise TimeoutError(
f'CDP method {method!r} did not respond within {self._cdp_request_timeout_s:.0f}s. '
f'The browser may be unresponsive (silent WebSocket — container crashed or proxy lost upstream).'
) from e