Address code review: fix CDPConnectionError import, JS escaping, execCommand replacement, test clarity

Agent-Logs-Url: https://github.com/HyperionGray/python-chrome-devtools-protocol/sessions/f5aedfd0-e970-4dc1-bc96-e614a946247f

Co-authored-by: P4X-ng <223870169+P4X-ng@users.noreply.github.com>

Author: Copilot

cdp/browser_control.py

@@ -37,10 +37,11 @@ async def main():
 
 import asyncio
 import base64
+import json as _json
 import typing
 
 from cdp import dom, input_, page, runtime
-from cdp.connection import CDPConnection
+from cdp.connection import CDPConnection, CDPConnectionError
 
 __all__ = [
     # Navigation
@@ -330,10 +331,28 @@ async def clear_and_type(
         else selector_or_node
     )
     await focus(conn, node)
-    # Select all – platform-agnostic via JavaScript.
-    await conn.execute(
-        runtime.evaluate(expression="document.execCommand('selectAll', false, null)")
-    )
+    # Select all existing content using the modern Selection/input API.
+    # For input/textarea: element.select(); for contenteditable: window.getSelection().
+    obj = await conn.execute(dom.resolve_node(node_id=node))
+    if obj and obj.object_id:
+        await conn.execute(
+            runtime.call_function_on(
+                function_declaration=(
+                    "function() {"
+                    "  if (typeof this.select === 'function') {"
+                    "    this.select();"
+                    "  } else {"
+                    "    var range = document.createRange();"
+                    "    range.selectNodeContents(this);"
+                    "    var sel = window.getSelection();"
+                    "    sel.removeAllRanges();"
+                    "    sel.addRange(range);"
+                    "  }"
+                    "}"
+                ),
+                object_id=obj.object_id,
+            )
+        )
     await type_text(conn, node, text, delay=delay)
 
 
@@ -396,8 +415,9 @@ async def select_option(
     obj = await conn.execute(dom.resolve_node(node_id=node))
     if obj is None:
         raise ValueError("Could not resolve node to a remote object")
-    escaped = value.replace("'", "\\'")
-    expr = f"function() {{ this.value = '{escaped}'; this.dispatchEvent(new Event('change', {{bubbles: true}})); }}"
+    # Use json.dumps to safely embed the value as a JS string literal.
+    js_value = _json.dumps(value)
+    expr = f"function() {{ this.value = {js_value}; this.dispatchEvent(new Event('change', {{bubbles: true}})); }}"
     await conn.execute(
         runtime.call_function_on(
             function_declaration=expr,
@@ -711,10 +731,9 @@ async def _wait() -> _T_Event:
         async for event in conn.listen():
             if isinstance(event, event_type):
                 return event  # type: ignore[return-value]
-        raise CDPConnectionError("Connection closed before event arrived")  # noqa: F821
+        raise CDPConnectionError("Connection closed before event arrived")
 
     try:
-        from cdp.connection import CDPConnectionError  # local import to avoid circular
         return await asyncio.wait_for(_wait(), timeout=timeout)
     except asyncio.TimeoutError:
         raise asyncio.TimeoutError(

examples/browser_control_example.py

@@ -10,7 +10,10 @@
 Start Chrome with remote debugging enabled:
     chrome --remote-debugging-port=9222 --headless
 
-Then run:
+Get the WebSocket URL for a tab:
+    curl http://localhost:9222/json
+
+Then update CDP_URL below with the "webSocketDebuggerUrl" value and run:
     python examples/browser_control_example.py
 """
 
@@ -20,8 +23,8 @@
 from cdp import page
 
 
-# Replace with a real CDP WebSocket URL from chrome://inspect or the
-# JSON endpoint at http://localhost:9222/json
+# Replace with the "webSocketDebuggerUrl" from http://localhost:9222/json
+# Example: "ws://localhost:9222/devtools/page/ABC123"
 CDP_URL = "ws://localhost:9222/devtools/page/YOUR_PAGE_ID"
 
 

test/test_browser_control.py

@@ -407,9 +407,10 @@ async def test_wait_for_selector_timeout():
         local_name="",
         node_value="",
     )
-    # Always return NodeId(0) = not found
+    # Always return NodeId(0) = not found; repeat enough times for the timeout
+    _ENOUGH_ATTEMPTS = 20  # timeout=0.1s / poll_interval=0.05s → at most ~4 polls
     conn = MagicMock()
-    conn.execute = AsyncMock(side_effect=[doc_node, dom.NodeId(0)] * 20)
+    conn.execute = AsyncMock(side_effect=[doc_node, dom.NodeId(0)] * _ENOUGH_ATTEMPTS)
     with pytest.raises(asyncio.TimeoutError):
         await wait_for_selector(conn, ".ghost", timeout=0.1, poll_interval=0.05)