Skip to content

Open-source Python library for AI browser agents, plus Browser Use Cloud: stealth browsers and a hosted agent API.

Merge branch 'main' into feat/cdp-add-origins-storage-state

Magnus Müller60bc98b3c04c
diff --cc browser_use/browser/session.py
index 52cf4e658,75a316469..58101d8b6
--- a/browser_use/browser/session.py
+++ b/browser_use/browser/session.py
@@@ -1706,87 -1782,33 +1782,108 @@@ class BrowserSession(BaseModel)
params={'identifier': identifier}, session_id=cdp_session.session_id
)
- async def _cdp_set_viewport(self, width: int, height: int, device_scale_factor: float = 1.0, mobile: bool = False) -> None:
- """Set viewport using CDP Emulation.setDeviceMetricsOverride."""
- await self.cdp_client.send.Emulation.setDeviceMetricsOverride(
- params={'width': width, 'height': height, 'deviceScaleFactor': device_scale_factor, 'mobile': mobile}
+ async def _cdp_set_viewport(
+ self, width: int, height: int, device_scale_factor: float = 1.0, mobile: bool = False, target_id: str | None = None
+ ) -> None:
+ """Set viewport using CDP Emulation.setDeviceMetricsOverride.
+
+ Args:
+ width: Viewport width
+ height: Viewport height
+ device_scale_factor: Device scale factor (default 1.0)
+ mobile: Whether to emulate mobile device (default False)
+ target_id: Optional target ID to set viewport for. If not provided, uses agent_focus.
+ """
+ if target_id:
+ # Set viewport for specific target
+ cdp_session = await self.get_or_create_cdp_session(target_id, focus=False, new_socket=False)
+ elif self.agent_focus:
+ # Use current focus
+ cdp_session = self.agent_focus
+ else:
+ self.logger.warning('Cannot set viewport: no target_id provided and agent_focus not initialized')
+ return
+
+ await cdp_session.cdp_client.send.Emulation.setDeviceMetricsOverride(
+ params={'width': width, 'height': height, 'deviceScaleFactor': device_scale_factor, 'mobile': mobile},
+ session_id=cdp_session.session_id,
)
+ async def _cdp_get_origins(self) -> list[dict[str, Any]]:
+ """Get origins with localStorage and sessionStorage using CDP."""
+ origins = []
+ cdp_session = await self.get_or_create_cdp_session(target_id=None, new_socket=False)
+
+ try:
+ # Enable DOMStorage domain to track storage
+ await cdp_session.cdp_client.send.DOMStorage.enable(session_id=cdp_session.session_id)
+
+ try:
+ # Get all frames to find unique origins
+ frames_result = await cdp_session.cdp_client.send.Page.getFrameTree(session_id=cdp_session.session_id)
+
+ # Extract unique origins from frames
+ unique_origins = set()
+
+ def _extract_origins(frame_tree):
+ """Recursively extract origins from frame tree."""
+ frame = frame_tree.get('frame', {})
+ origin = frame.get('securityOrigin')
+ if origin and origin != 'null':
+ unique_origins.add(origin)
+
+ # Process child frames
+ for child in frame_tree.get('childFrames', []):
+ _extract_origins(child)
+
+ async def _get_storage_items(origin: str, is_local_storage: bool) -> list[dict[str, str]] | None:
+ """Helper to get storage items for an origin."""
+ storage_type = 'localStorage' if is_local_storage else 'sessionStorage'
+ try:
+ result = await cdp_session.cdp_client.send.DOMStorage.getDOMStorageItems(
+ params={'storageId': {'securityOrigin': origin, 'isLocalStorage': is_local_storage}},
+ session_id=cdp_session.session_id,
+ )
+
+ items = []
+ for item in result.get('entries', []):
+ if len(item) == 2: # Each item is [key, value]
+ items.append({'name': item[0], 'value': item[1]})
+
+ return items if items else None
+ except Exception as e:
+ self.logger.debug(f'Failed to get {storage_type} for {origin}: {e}')
+ return None
+
+ _extract_origins(frames_result.get('frameTree', {}))
+
+ # For each unique origin, get localStorage and sessionStorage
+ for origin in unique_origins:
+ origin_data = {'origin': origin}
+
+ # Get localStorage
+ local_storage = await _get_storage_items(origin, is_local_storage=True)
+ if local_storage:
+ origin_data['localStorage'] = local_storage
+
+ # Get sessionStorage
+ session_storage = await _get_storage_items(origin, is_local_storage=False)
+ if session_storage:
+ origin_data['sessionStorage'] = session_storage
+
+ # Only add origin if it has storage data
+ if 'localStorage' in origin_data or 'sessionStorage' in origin_data:
+ origins.append(origin_data)
+
+ finally:
+ # Always disable DOMStorage tracking when done
+ await cdp_session.cdp_client.send.DOMStorage.disable(session_id=cdp_session.session_id)
+
+ except Exception as e:
+ self.logger.warning(f'Failed to get origins: {e}')
+
+ return origins
+
async def _cdp_get_storage_state(self) -> dict:
"""Get storage state (cookies, localStorage, sessionStorage) using CDP."""
# Use the _cdp_get_cookies helper which handles session attachment