🐫 CAMEL: The first and the best multi-agent framework. Finding the Scaling Law of Agents. https://www.camel-ai.org
Python agentai-societiesartificial-intelligencecommunicative-aicooperative-aideep-learninglarge-language-modelsmulti-agent-systemsnatural-language-processing
enhance:type script browser (#2902)
Puzhen Zhangc3d532484539
diff --git a/.gitignore b/.gitignoreindex 2c75b3562..23eadf3c1 100644--- a/.gitignore+++ b/.gitignore@@ -433,4 +433,31 @@ benchmark/gaia/results.jsonl.container/.env# Environment variables file-.env\ No newline at end of file+.env++##### Node.js/TypeScript.gitignore #####+# Hybrid Browser Toolkit TypeScript+camel/toolkits/hybrid_browser_toolkit/ts/++# npm/yarn logs+npm-debug.log*+yarn-debug.log*+yarn-error.log*++# TypeScript cache+*.tsbuildinfo++# Optional npm cache directory+.npm++# Optional eslint cache+.eslintcache++# Optional REPL history+.node_repl_history++# Output of 'npm pack'+*.tgz++# Yarn Integrity file+.yarn-integrity\ No newline at end of filediff --git a/camel/agents/chat_agent.py b/camel/agents/chat_agent.pyindex ecd0a78cf..132b704c5 100644--- a/camel/agents/chat_agent.py+++ b/camel/agents/chat_agent.py@@ -3533,6 +3533,9 @@ class ChatAgent(BaseAgent):# To avoid duplicated system memory.system_message = None if with_memory else self._original_system_message+ # Clone tools and collect toolkits that need registration+ cloned_tools, toolkits_to_register = self._clone_tools()+new_agent = ChatAgent(system_message=system_message,model=self.model_backend.models, # Pass the existing model_backend@@ -3542,7 +3545,8 @@ class ChatAgent(BaseAgent):self.memory.get_context_creator(), "token_limit", None),output_language=self._output_language,- tools=self._clone_tools(),+ tools=cloned_tools,+ toolkits_to_register_agent=toolkits_to_register,external_tools=[schema for schema in self._external_tool_schemas.values()],@@ -3567,55 +3571,76 @@ class ChatAgent(BaseAgent):return new_agent- def _clone_tools(self) -> List[Union[FunctionTool, Callable]]:- r"""Clone tools for new agent instance,- handling stateful toolkits properly."""+ def _clone_tools(+ self,+ ) -> Tuple[+ List[Union[FunctionTool, Callable]], List[RegisteredAgentToolkit]+ ]:+ r"""Clone tools and return toolkits that need agent registration.++ This method handles stateful toolkits by cloning them if they have+ a clone_for_new_session method, and collecting RegisteredAgentToolkit+ instances for later registration.++ Returns:+ Tuple containing:+ - List of cloned tools/functions+ - List of RegisteredAgentToolkit instances need registration+ """cloned_tools = []- hybrid_browser_toolkits = {} # Cache for created toolkits+ toolkits_to_register = []+ cloned_toolkits = {}+ # Cache for cloned toolkits by original toolkit idfor tool in self._internal_tools.values():- # Check if this is a HybridBrowserToolkit method- if (- hasattr(tool.func, '__self__')- and tool.func.__self__.__class__.__name__- == 'HybridBrowserToolkit'- ):+ # Check if this tool is a method bound to a toolkit instance+ if hasattr(tool.func, '__self__'):toolkit_instance = tool.func.__self__toolkit_id = id(toolkit_instance)- # Check if we already created a clone for this toolkit- if toolkit_id not in hybrid_browser_toolkits:- try:- import uuid+ if toolkit_id not in cloned_toolkits:+ # Check if the toolkit has a clone method+ if hasattr(toolkit_instance, 'clone_for_new_session'):+ try:+ import uuid- new_session_id = str(uuid.uuid4())[:8]- new_toolkit = toolkit_instance.clone_for_new_session(- new_session_id- )- hybrid_browser_toolkits[toolkit_id] = new_toolkit- except Exception as e:- logger.warning(- f"Failed to clone HybridBrowserToolkit: {e}"- )- # Fallback to original function- cloned_tools.append(tool.func)- continue+ new_session_id = str(uuid.uuid4())[:8]+ new_toolkit = (+ toolkit_instance.clone_for_new_session(+ new_session_id+ )+ )++ # If this is a RegisteredAgentToolkit,+ # add it to registration list+ if isinstance(new_toolkit, RegisteredAgentToolkit):+ toolkits_to_register.append(new_toolkit)++ cloned_toolkits[toolkit_id] = new_toolkit+ except Exception as e:+ logger.warning(+ f"Failed to clone toolkit {toolkit_instance.__class__.__name__}: {e}" # noqa:E501+ )+ # Use original toolkit if cloning fails+ cloned_toolkits[toolkit_id] = toolkit_instance+ else:+ # Toolkit doesn't support cloning, use original+ cloned_toolkits[toolkit_id] = toolkit_instance- # Get the corresponding method from the cloned toolkit- new_toolkit = hybrid_browser_toolkits[toolkit_id]+ # Get the method from the cloned (or original) toolkit+ toolkit = cloned_toolkits[toolkit_id]method_name = tool.func.__name__- if hasattr(new_toolkit, method_name):- new_method = getattr(new_toolkit, method_name)+ if hasattr(toolkit, method_name):+ new_method = getattr(toolkit, method_name)cloned_tools.append(new_method)else:# Fallback to original functioncloned_tools.append(tool.func)else:- # Regular tool or other stateless toolkit- # just use the original function+ # Not a toolkit method, just use the original functioncloned_tools.append(tool.func)- return cloned_tools+ return cloned_tools, toolkits_to_registerdef __repr__(self) -> str:r"""Returns a string representation of the :obj:`ChatAgent`.diff --git a/camel/toolkits/hybrid_browser_toolkit/actions.py b/camel/toolkits/hybrid_browser_toolkit/actions.pydeleted file mode 100644index 2630ab07e..000000000--- a/camel/toolkits/hybrid_browser_toolkit/actions.py+++ /dev/null@@ -1,417 +0,0 @@-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========-# Licensed under the Apache License, Version 2.0 (the "License");-# you may not use this file except in compliance with the License.-# You may obtain a copy of the License at-#-# http://www.apache.org/licenses/LICENSE-2.0-#-# Unless required by applicable law or agreed to in writing, software-# distributed under the License is distributed on an "AS IS" BASIS,-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-# See the License for the specific language governing permissions and-# limitations under the License.-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========-import asyncio-from typing import TYPE_CHECKING, Any, Dict, Optional--from .config_loader import ConfigLoader--if TYPE_CHECKING:- from playwright.async_api import Page---class ActionExecutor:- r"""Executes high-level actions (click, type …) on a Playwright Page."""-- def __init__(- self,- page: "Page",- session: Optional[Any] = None,- default_timeout: Optional[int] = None,- short_timeout: Optional[int] = None,- max_scroll_amount: Optional[int] = None,- ):- self.page = page- self.session = session # HybridBrowserSession instance-- # Configure timeouts using the config file with optional overrides- self.default_timeout = ConfigLoader.get_action_timeout(default_timeout)- self.short_timeout = ConfigLoader.get_short_timeout(short_timeout)- self.max_scroll_amount = ConfigLoader.get_max_scroll_amount(- max_scroll_amount- )-- # ------------------------------------------------------------------- # Public helpers- # ------------------------------------------------------------------- async def execute(self, action: Dict[str, Any]) -> Dict[str, Any]:- r"""Execute an action and return detailed result information."""- if not action:- return {- "success": False,- "message": "No action to execute",- "details": {},- }-- action_type = action.get("type")- if not action_type:- return {- "success": False,- "message": "Error: action has no type",- "details": {},- }-- try:- # small helper to ensure basic stability- # await self._wait_dom_stable()-- handler = {- "click": self._click,- "type": self._type,- "select": self._select,- "wait": self._wait,- "extract": self._extract,- "scroll": self._scroll,- "enter": self._enter,- }.get(action_type)-- if handler is None:- return {- "success": False,- "message": f"Error: Unknown action type '{action_type}'",- "details": {"action_type": action_type},- }-- result = await handler(action)- return {- "success": True,- "message": result["message"],- "details": result.get("details", {}),- }- except Exception as exc:- return {- "success": False,- "message": f"Error executing {action_type}: {exc}",- "details": {"action_type": action_type, "error": str(exc)},- }-- # ------------------------------------------------------------------- # Internal handlers- # ------------------------------------------------------------------- async def _click(self, action: Dict[str, Any]) -> Dict[str, Any]:- r"""Handle click actions with new tab support for any clickable- element."""- ref = action.get("ref")- text = action.get("text")- selector = action.get("selector")- if not (ref or text or selector):- return {- "message": "Error: click requires ref/text/selector",- "details": {"error": "missing_selector"},- }-- # Build strategies in priority order- strategies = []- if ref:- strategies.append(f"[aria-ref='{ref}']")- if selector:- strategies.append(selector)- if text:- strategies.append(f'text="{text}"')-- details: Dict[str, Any] = {- "ref": ref,- "selector": selector,- "text": text,- "strategies_tried": [],- "successful_strategy": None,- "click_method": None,- "new_tab_created": False,- }-- # Find the first valid selector- found_selector = None- for sel in strategies:- if await self.page.locator(sel).count() > 0:- found_selector = sel- break-- if not found_selector:- details['error'] = "Element not found with any strategy"- return {- "message": "Error: Click failed, element not found",- "details": details,- }-- element = self.page.locator(found_selector).first- details['successful_strategy'] = found_selector-- # Attempt ctrl+click first (always)- try:- if self.session:- async with self.page.context.expect_page(- timeout=self.short_timeout- ) as new_page_info:- await element.click(modifiers=["ControlOrMeta"])- new_page = await new_page_info.value- await new_page.wait_for_load_state('domcontentloaded')- new_tab_index = await self.session.register_page(new_page)- if new_tab_index is not None:- await self.session.switch_to_tab(new_tab_index)- self.page = new_page- details.update(- {- "click_method": "ctrl_click_new_tab",- "new_tab_created": True,- "new_tab_index": new_tab_index,- }- )- return {- "message": f"Clicked element (ctrl click), opened in new "- f"tab {new_tab_index}",- "details": details,- }- else:- await element.click(modifiers=["ControlOrMeta"])- details["click_method"] = "ctrl_click_no_session"- return {- "message": f"Clicked element (ctrl click, no"- f" session): {found_selector}",- "details": details,- }- except asyncio.TimeoutError:- # No new tab was opened, click may have still worked- details["click_method"] = "ctrl_click_same_tab"- return {- "message": f"Clicked element (ctrl click, "- f"same tab): {found_selector}",- "details": details,- }- except Exception as e:- details['strategies_tried'].append(- {- 'selector': found_selector,- 'method': 'ctrl_click',- 'error': str(e),- }- )- # Fall through to fallback-- # Fallback to normal force click if ctrl+click fails- try:- await element.click(force=True, timeout=self.default_timeout)- details["click_method"] = "playwright_force_click"- return {- "message": f"Fallback clicked element: {found_selector}",- "details": details,- }- except Exception as e:- details["click_method"] = "playwright_force_click_failed"- details["error"] = str(e)- return {- "message": f"Error: All click strategies "- f"failed for {found_selector}",- "details": details,- }-- async def _type(self, action: Dict[str, Any]) -> Dict[str, Any]:- r"""Handle typing text into input fields."""- ref = action.get("ref")- selector = action.get("selector")- text = action.get("text", "")- if not (ref or selector):- return {- "message": "Error: type requires ref/selector",- "details": {"error": "missing_selector"},- }-- target = selector or f"[aria-ref='{ref}']"- details = {- "ref": ref,- "selector": selector,- "target": target,- "text": text,- "text_length": len(text),- }-- try:- await self.page.fill(target, text, timeout=self.short_timeout)- return {- "message": f"Typed '{text}' into {target}",- "details": details,- }- except Exception as exc:- details["error"] = str(exc)- return {"message": f"Type failed: {exc}", "details": details}-- async def _select(self, action: Dict[str, Any]) -> Dict[str, Any]:- r"""Handle selecting options from dropdowns."""- ref = action.get("ref")- selector = action.get("selector")- value = action.get("value", "")- if not (ref or selector):- return {- "message": "Error: select requires ref/selector",- "details": {"error": "missing_selector"},- }-- target = selector or f"[aria-ref='{ref}']"- details = {- "ref": ref,- "selector": selector,- "target": target,- "value": value,- }-- try:- await self.page.select_option(- target, value, timeout=self.default_timeout- )- return {- "message": f"Selected '{value}' in {target}",- "details": details,- }- except Exception as exc:- details["error"] = str(exc)- return {"message": f"Select failed: {exc}", "details": details}-- async def _wait(self, action: Dict[str, Any]) -> Dict[str, Any]:- r"""Handle wait actions."""- details: Dict[str, Any] = {- "wait_type": None,- "timeout": None,- "selector": None,- }-- if "timeout" in action:- ms = int(action["timeout"])- details["wait_type"] = "timeout"- details["timeout"] = ms- await asyncio.sleep(ms / 1000)- return {"message": f"Waited {ms}ms", "details": details}- if "selector" in action:- sel = action["selector"]- details["wait_type"] = "selector"- details["selector"] = sel- await self.page.wait_for_selector(- sel, timeout=self.default_timeout- )- return {"message": f"Waited for {sel}", "details": details}- return {- "message": "Error: wait requires timeout/selector",- "details": details,- }-- async def _extract(self, action: Dict[str, Any]) -> Dict[str, Any]:- r"""Handle text extraction from elements."""- ref = action.get("ref")- if not ref:- return {- "message": "Error: extract requires ref",- "details": {"error": "missing_ref"},- }-- target = f"[aria-ref='{ref}']"- details = {"ref": ref, "target": target}-- await self.page.wait_for_selector(target, timeout=self.default_timeout)- txt = await self.page.text_content(target)-- details["extracted_text"] = txt- details["text_length"] = len(txt) if txt else 0-- return {- "message": f"Extracted: {txt[:100] if txt else 'None'}",- "details": details,- }-- async def _scroll(self, action: Dict[str, Any]) -> Dict[str, Any]:- r"""Handle page scrolling with safe parameter validation."""- direction = action.get("direction", "down")- amount = action.get("amount", 300)-- details = {- "direction": direction,- "requested_amount": amount,- "actual_amount": None,- "scroll_offset": None,- }-- # Validate inputs to prevent injection- if direction not in ("up", "down"):- return {- "message": "Error: direction must be 'up' or 'down'",- "details": details,- }-- try:- # Safely convert amount to integer and clamp to reasonable range- amount_int = int(amount)- amount_int = max(- -self.max_scroll_amount,- min(self.max_scroll_amount, amount_int),- ) # Clamp to max_scroll_amount range- details["actual_amount"] = amount_int- except (ValueError, TypeError):- return {- "message": "Error: amount must be a valid number",- "details": details,- }-- # Use safe evaluation with bound parameters- scroll_offset = amount_int if direction == "down" else -amount_int- details["scroll_offset"] = scroll_offset-- await self.page.evaluate(- "offset => window.scrollBy(0, offset)", scroll_offset- )- await asyncio.sleep(0.5)- return {- "message": f"Scrolled {direction} by {abs(amount_int)}px",- "details": details,- }-- async def _enter(self, action: Dict[str, Any]) -> Dict[str, Any]:- r"""Handle Enter key press on the currently focused element."""- details = {"action_type": "enter", "target": "focused_element"}-- # Press Enter on whatever element currently has focus- await self.page.keyboard.press("Enter")- return {- "message": "Pressed Enter on focused element",- "details": details,- }-- # utilities- async def _wait_dom_stable(self) -> None:- r"""Wait for DOM to become stable before executing actions."""- try:- # Wait for basic DOM content loading- await self.page.wait_for_load_state(- 'domcontentloaded', timeout=self.short_timeout- )-- # Try to wait for network idle briefly- try:- await self.page.wait_for_load_state(- 'networkidle', timeout=self.short_timeout- )- except Exception:- pass # Network idle is optional-- except Exception:- pass # Don't fail if wait times out-- # static helpers- @staticmethod- def should_update_snapshot(action: Dict[str, Any]) -> bool:- r"""Determine if an action requires a snapshot update."""- change_types = {- "click",- "type",- "select",- "scroll",- "navigate",- "enter",- }- return action.get("type") in change_typesdiff --git a/camel/toolkits/hybrid_browser_toolkit/agent.py b/camel/toolkits/hybrid_browser_toolkit/agent.pydeleted file mode 100644index d8c7ff6d4..000000000--- a/camel/toolkits/hybrid_browser_toolkit/agent.py+++ /dev/null@@ -1,311 +0,0 @@-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========-# Licensed under the Apache License, Version 2.0 (the "License");-# you may not use this file except in compliance with the License.-# You may obtain a copy of the License at-#-# http://www.apache.org/licenses/LICENSE-2.0-#-# Unless required by applicable law or agreed to in writing, software-# distributed under the License is distributed on an "AS IS" BASIS,-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-# See the License for the specific language governing permissions and-# limitations under the License.-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========-import json-import re-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union--from camel.logger import get_logger-from camel.models import BaseModelBackend, ModelFactory-from camel.types import ModelPlatformType, ModelType--from .actions import ActionExecutor-from .browser_session import HybridBrowserSession--if TYPE_CHECKING:- from camel.agents import ChatAgent--logger = get_logger(__name__)---class PlaywrightLLMAgent:- r"""High-level orchestration: snapshot ↔ LLM ↔ action executor."""-- # System prompt as class constant to avoid recreation- SYSTEM_PROMPT = """-You are a web automation assistant.--" Analyse the page snapshot and create a short high-level plan, "-"then output the FIRST action to start with.\n\n"-"Return a JSON object in *exactly* this shape:\n"-"Action format json_object examples:\n"-"{\n \"plan\": [\"Step 1\", \"Step 2\"],\n \"action\": {\n \"type\":-\"click\",\n \"ref\": \"e1\"\n }\n}\n\n"-"If task is already complete:\n"-"{\n \"plan\": [],\n \"action\": {\n \"type\": \"finish\",-\n \"ref\": null,\n \"summary\": \"Task was already completed. Summary-of what was found...\"\n }\n}"--Available action types:-- 'click': {"type": "click", "ref": "e1"} or {"type": "click", "text":-"Button Text"} or {"type": "click", "selector": "button"}-- 'type': {"type": "type", "ref": "e1", "text": "search text"} or {"type":-"type", "selector": "input", "text": "search text"}-- 'select': {"type": "select", "ref": "e1", "value": "option"} or {"type":-"select", "selector": "select", "value": "option"}-- 'wait': {"type": "wait", "timeout": 2000} or {"type": "wait", "selector":-"#element"}-- 'scroll': {"type": "scroll", "direction": "down", "amount": 300}-- 'enter': {"type": "enter", "ref": "e1"} or {"type": "enter", "selector":-"input[name=q]"} or {"type": "enter"}-- 'navigate': {"type": "navigate", "url": "https://example.com"}-- 'finish': {"type": "finish", "ref": null, "summary": "task completion-summary"}--IMPORTANT:-- For 'click': Use 'ref' from snapshot, or 'text' for visible text,-or 'selector' for CSS selectors-- For 'type'/'select': Use 'ref' from snapshot or 'selector' for CSS selectors-- Only use 'ref' values that exist in the snapshot (e.g., ref=e1, ref=e2, etc.)-- Use 'finish' when the task is completed successfully with a summary of-what was accomplished-- Use 'enter' to press the Enter key (optionally focus an element first)-- Use 'navigate' to open a new URL before interacting further-- click can choose radio, checkbox...- """-- def __init__(- self,- *,- user_data_dir: Optional[str] = None,- headless: bool = False,- stealth: bool = False,- model_backend: Optional[BaseModelBackend] = None,- default_timeout: Optional[int] = None,- short_timeout: Optional[int] = None,- ):- self._session = HybridBrowserSession(- headless=headless,- user_data_dir=user_data_dir,- stealth=stealth,- default_timeout=default_timeout,- short_timeout=short_timeout,- )- from camel.agents import ChatAgent-- # Populated lazily after first page load- self.action_history: List[Dict[str, Any]] = []- if model_backend is None:- model_backend = ModelFactory.create(- model_platform=ModelPlatformType.DEFAULT,- model_type=ModelType.DEFAULT,- model_config_dict={"temperature": 0, "top_p": 1},- )- self.model_backend = model_backend- # Reuse ChatAgent instance to avoid recreation overhead- self._chat_agent: Optional[ChatAgent] = None-- async def navigate(self, url: str) -> str:- r"""Navigate to a URL and return the snapshot."""- try:- # HybridBrowserSession handles waits internally- logger.debug("Navigated to URL: %s", url)- await self._session.visit(url)- return await self._session.get_snapshot(force_refresh=True)- except Exception as exc:- error_msg = f"Error: could not navigate to {url} - {exc}"- logger.error(error_msg)- return error_msg-- def _get_chat_agent(self) -> "ChatAgent":- r"""Get or create the ChatAgent instance."""- from camel.agents import ChatAgent-- if self._chat_agent is None:- self._chat_agent = ChatAgent(- system_message=self.SYSTEM_PROMPT, model=self.model_backend- )- return self._chat_agent-- def _safe_parse_json(self, content: str) -> Dict[str, Any]:- r"""Safely parse JSON from LLM response with multiple fallback- strategies.- """- # First attempt: direct parsing- try:- return json.loads(content)- except json.JSONDecodeError:- pass-- # Second attempt: extract JSON-like block using regex- # Look for content between outermost braces- json_pattern = re.compile(- r'\{[^{}]*(?:\{[^{}]*\}[^{}]*)*\}', re.DOTALL- )- json_matches = json_pattern.findall(content)-- for match in json_matches:- try:- return json.loads(match)- except json.JSONDecodeError:- continue-- # Third attempt: try to find and parse line by line- lines = content.split('\n')- json_lines = []- in_json = False-- for line in lines:- line = line.strip()- if line.startswith('{'):- in_json = True- json_lines = [line]- elif in_json:- json_lines.append(line)- if line.endswith('}'):- try:- json_text = '\n'.join(json_lines)- return json.loads(json_text)- except json.JSONDecodeError:- pass- in_json = False- json_lines = []-- # Fallback: return default structure- logger.warning(- "Could not parse JSON from LLM response: %s", content[:200]- )- return self._get_fallback_response("Parsing error")-- def _get_fallback_response(self, error_msg: str) -> Dict[str, Any]:- r"""Generate a fallback response structure."""- return {- "plan": [f"Could not parse response: {error_msg}"],- "action": {- "type": "finish",- "ref": None,- "summary": f"Parsing error: {error_msg}",- },- }-- def _llm_call(- self,- prompt: str,- snapshot: str,- is_initial: bool,- history: Optional[List[Dict[str, Any]]] = None,- ) -> Dict[str, Any]:- r"""Call the LLM (via CAMEL ChatAgent) to get plan & next action."""- # Build user message- if is_initial:- user_content = f"Snapshot:\n{snapshot}\n\nTask: {prompt}"- else:- hist_lines = [- (- f"{i + 1}. {'✅' if h['success'] else '❌'} "- f"{h['action']['type']} -> {h['result']}"- )- for i, h in enumerate(history or [])- ]- user_content = (- f"Snapshot:\n{snapshot}\n\nHistory:\n"- + "\n".join(hist_lines)- + f"\n\nTask: {prompt}"- )-- # Run ChatAgent- chat_agent = self._get_chat_agent()- response = chat_agent.step(user_content)- content = response.msgs[0].content if response.msgs else "{}"-- # Safely parse JSON response- return self._safe_parse_json(content)-- async def process_command(self, prompt: str, max_steps: int = 15):- r"""Process a command using LLM-guided browser automation."""- # initial full snapshot- full_snapshot = await self._session.get_snapshot()- assert self._session.snapshot is not None- meta = self._session.snapshot.last_info- logger.info("Initial snapshot priorities=%s", meta["priorities"])- logger.debug("Full snapshot:\n%s", full_snapshot)-- plan_resp = self._llm_call(- prompt, full_snapshot or "", is_initial=True- )- plan = plan_resp.get("plan", [])- action = plan_resp.get("action")-- logger.info("Plan generated: %s", json.dumps(plan, ensure_ascii=False))-- steps = 0- while action and steps < max_steps:- if action.get("type") == "finish":- logger.info("Task finished: %s", action.get("summary", "Done"))- break-- result = await self._run_action(action)- logger.debug("Executed action: %s | Result: %s", action, result)-- success = False- result_for_history = ""-- if isinstance(result, str):- success = "Error" not in result- result_for_history = result- elif isinstance(result, dict):- success = result.get('success', False)- result_for_history = result.get('message', str(result))- else:- # Fallback case- success = False- result_for_history = str(result)-- self.action_history.append(- {- "action": action,- "result": result_for_history,- "success": success,- }- )-- diff_snapshot = await self._session.get_snapshot(- force_refresh=ActionExecutor.should_update_snapshot(action),- diff_only=True,- )- assert self._session.snapshot is not None- meta = self._session.snapshot.last_info- logger.debug(- "Snapshot after action (diff=%s):\n%s",- meta["is_diff"],- diff_snapshot,- )-- # Update full snapshot if page changed- if meta["is_diff"] and not diff_snapshot.startswith(- "- Page Snapshot (no structural changes)"- ):- assert self._session.snapshot is not None- full_snapshot = self._session.snapshot.snapshot_data or ""-- action = self._llm_call(- prompt,- full_snapshot or "",- is_initial=False,- history=self.action_history,- ).get("action")- steps += 1-- logger.info("Process completed with %d steps", steps)-- async def _run_action(- self, action: Dict[str, Any]- ) -> Union[str, Dict[str, Any]]:- r"""Execute a single action and return the result."""- if action.get("type") == "navigate":- return await self.navigate(action.get("url", ""))- return await self._session.exec_action(action)-- async def close(self):- r"""Clean up browser session and resources."""- await self._session.close()diff --git a/camel/toolkits/hybrid_browser_toolkit/browser_session.py b/camel/toolkits/hybrid_browser_toolkit/browser_session.pydeleted file mode 100644index 0f261a6cf..000000000--- a/camel/toolkits/hybrid_browser_toolkit/browser_session.py+++ /dev/null@@ -1,740 +0,0 @@-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========-# Licensed under the Apache License, Version 2.0 (the "License");-# you may not use this file except in compliance with the License.-# You may obtain a copy of the License at-#-# http://www.apache.org/licenses/LICENSE-2.0-#-# Unless required by applicable law or agreed to in writing, software-# distributed under the License is distributed on an "AS IS" BASIS,-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-# See the License for the specific language governing permissions and-# limitations under the License.-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========-from __future__ import annotations--import asyncio-from typing import TYPE_CHECKING, Any, ClassVar, Dict, List, Optional, Tuple--from camel.logger import get_logger--from .actions import ActionExecutor-from .config_loader import ConfigLoader-from .snapshot import PageSnapshot--if TYPE_CHECKING:- from playwright.async_api import (- Browser,- BrowserContext,- Page,- Playwright,- )--logger = get_logger(__name__)---class TabIdGenerator:- """Monotonically increasing tab ID generator."""-- _counter: int = 0- _lock: ClassVar[asyncio.Lock] = asyncio.Lock()-- @classmethod- async def generate_tab_id(cls) -> str:- """Generate a monotonically increasing tab ID."""- async with cls._lock:- cls._counter += 1- return f"tab-{cls._counter:03d}"---class HybridBrowserSession:- """Lightweight wrapper around Playwright for- browsing with multi-tab support.-- It provides multiple *Page* instances plus helper utilities (snapshot &- executor). Multiple toolkits or agents can reuse this class without- duplicating Playwright setup code.-- This class is a singleton per event-loop and session-id combination.- """-- # Class-level registry for singleton instances- # Format: {(loop_id, session_id): HybridBrowserSession}- _instances: ClassVar[Dict[Tuple[Any, str], "HybridBrowserSession"]] = {}- _instances_lock: ClassVar[asyncio.Lock] = asyncio.Lock()-- _initialized: bool- _creation_params: Dict[str, Any]-- def __new__(- cls,- *,- headless: bool = True,- user_data_dir: Optional[str] = None,- stealth: bool = False,- session_id: Optional[str] = None,- default_timeout: Optional[int] = None,- short_timeout: Optional[int] = None,- navigation_timeout: Optional[int] = None,- network_idle_timeout: Optional[int] = None,- ) -> "HybridBrowserSession":- # Create a unique key for this event loop and session combination- # We defer the event loop lookup to avoid issues with creation- # outside async context- instance = super().__new__(cls)- instance._initialized = False- instance._session_id = session_id or "default"- instance._creation_params = {- "headless": headless,- "user_data_dir": user_data_dir,- "stealth": stealth,- "session_id": session_id,- "default_timeout": default_timeout,- "short_timeout": short_timeout,- "navigation_timeout": navigation_timeout,- "network_idle_timeout": network_idle_timeout,- }- return instance-- @classmethod- async def _get_or_create_instance(- cls,- instance: "HybridBrowserSession",- ) -> "HybridBrowserSession":- """Get or create singleton instance for the current event loop and- session."""- try:- loop = asyncio.get_running_loop()- loop_id = str(id(loop))- except RuntimeError:- # No event loop running, use a unique identifier for sync context- import threading-- loop_id = f"sync_{threading.current_thread().ident}"-- # Ensure session_id is never None for the key- session_id = (- instance._session_id- if instance._session_id is not None- else "default"- )- session_key = (loop_id, session_id)-- # Use class-level lock to protect the instances registry- async with cls._instances_lock:- if session_key in cls._instances:- existing_instance = cls._instances[session_key]- logger.debug(- f"Reusing existing browser session for session_id: "- f"{session_id}"- )- return existing_instance-- # Register this new instance- cls._instances[session_key] = instance- logger.debug(- f"Created new browser session for session_id: {session_id}"- )- return instance-- def __init__(- self,- *,- headless: bool = True,- user_data_dir: Optional[str] = None,- stealth: bool = False,- session_id: Optional[str] = None,- default_timeout: Optional[int] = None,- short_timeout: Optional[int] = None,- navigation_timeout: Optional[int] = None,- network_idle_timeout: Optional[int] = None,- ):- if self._initialized:- return- self._initialized = True-- self._headless = headless- self._user_data_dir = user_data_dir- self._stealth = stealth- self._session_id = session_id or "default"-- # Store timeout configuration for ActionExecutor instances and- # browser operations- self._default_timeout = default_timeout- self._short_timeout = short_timeout- self._navigation_timeout = ConfigLoader.get_navigation_timeout(- navigation_timeout- )- self._network_idle_timeout = ConfigLoader.get_network_idle_timeout(- network_idle_timeout- )-- # Initialize _creation_params to fix linter error- self._creation_params = {- "headless": headless,- "user_data_dir": user_data_dir,- "stealth": stealth,- "session_id": session_id,- "default_timeout": default_timeout,- "short_timeout": short_timeout,- "navigation_timeout": navigation_timeout,- "network_idle_timeout": network_idle_timeout,- }-- self._playwright: Optional[Playwright] = None- self._browser: Optional[Browser] = None- self._context: Optional[BrowserContext] = None- self._page: Optional[Page] = None-- # Dictionary-based tab management with monotonic IDs- self._pages: Dict[str, Page] = {} # tab_id -> Page object- self._current_tab_id: Optional[str] = None # Current active tab ID-- self.snapshot: Optional[PageSnapshot] = None- self.executor: Optional[ActionExecutor] = None-- # Protect browser initialisation against concurrent calls- self._ensure_lock: "asyncio.Lock" = asyncio.Lock()-- # Load stealth script and config on initialization- self._stealth_script: Optional[str] = None- self._stealth_config: Optional[Dict[str, Any]] = None- if self._stealth:- self._stealth_script = self._load_stealth_script()- stealth_config_class = ConfigLoader.get_stealth_config()- self._stealth_config = stealth_config_class.get_stealth_config()-- def _load_stealth_script(self) -> str:- r"""Load the stealth JavaScript script from file."""- import os-- script_path = os.path.join(- os.path.dirname(os.path.abspath(__file__)), "stealth_script.js"- )-- try:- with open(- script_path, "r", encoding='utf-8', errors='replace'- ) as f:- script_content = f.read()-- if not script_content.strip():- raise ValueError(f"Stealth script is empty: {script_path}")-- logger.debug(- f"Loaded stealth script ({len(script_content)} chars)"- )- return script_content- except FileNotFoundError:- logger.error(f"Stealth script not found: {script_path}")- raise FileNotFoundError(f"Stealth script not found: {script_path}")- except Exception as e:- logger.error(f"Error loading stealth script: {e}")- raise RuntimeError(f"Failed to load stealth script: {e}") from e-- # ------------------------------------------------------------------- # Multi-tab management methods- # ------------------------------------------------------------------- async def create_new_tab(self, url: Optional[str] = None) -> str:- r"""Create a new tab and optionally navigate to a URL.-- Args:- url: Optional URL to navigate to in the new tab-- Returns:- str: ID of the newly created tab- """- await self.ensure_browser()-- if self._context is None:- raise RuntimeError("Browser context is not available")-- # Generate unique tab ID- tab_id = await TabIdGenerator.generate_tab_id()-- # Create new page- new_page = await self._context.new_page()-- # Apply stealth modifications if enabled- if self._stealth and self._stealth_script:- try:- await new_page.add_init_script(self._stealth_script)- logger.debug("Applied stealth script to new tab")- except Exception as e:- logger.warning(- f"Failed to apply stealth script to new tab: {e}"- )-- # Store in pages dictionary- self._pages[tab_id] = new_page-- # Navigate if URL provided- if url:- try:- await new_page.goto(url, timeout=self._navigation_timeout)- await new_page.wait_for_load_state('domcontentloaded')- except Exception as e:- logger.warning(f"Failed to navigate new tab to {url}: {e}")-- logger.info(- f"Created new tab {tab_id}, total tabs: {len(self._pages)}"- )- return tab_id-- async def register_page(self, new_page: "Page") -> str:- r"""Register a page that was created externally (e.g., by a click).-- Args:- new_page (Page): The new page object to register.-- Returns:- str: The ID of the (newly) registered tab.- """- # Check if page is already registered- for tab_id, page in self._pages.items():- if page is new_page:- return tab_id-- # Create new ID for the page- tab_id = await TabIdGenerator.generate_tab_id()- self._pages[tab_id] = new_page-- logger.info(- f"Registered new tab {tab_id} (opened by user action). "- f"Total tabs: {len(self._pages)}"- )- return tab_id-- async def switch_to_tab(self, tab_id: str) -> bool:- r"""Switch to a specific tab by ID.-- Args:- tab_id: ID of the tab to switch to-- Returns:- bool: True if successful, False if tab ID is invalid- """- if tab_id not in self._pages:- logger.warning(f"Invalid tab ID: {tab_id}")- return False-- page = self._pages[tab_id]-- # Check if page is still valid- if page.is_closed():- logger.warning(f"Tab {tab_id} is closed, removing from registry")- # Clean up closed tab- del self._pages[tab_id]- return False-- try:- # Switch to the tab- self._current_tab_id = tab_id- self._page = page-- # Bring the tab to the front in the browser window- await page.bring_to_front()-- # Update utilities for new tab- self.executor = ActionExecutor(- page,- self,- default_timeout=self._default_timeout,- short_timeout=self._short_timeout,- )- self.snapshot = PageSnapshot(page)-- logger.info(f"Switched to tab {tab_id}")- return True-- except Exception as e:- logger.warning(f"Error switching to tab {tab_id}: {e}")- return False-- async def close_tab(self, tab_id: str) -> bool:- r"""Close a specific tab by ID.-- Args:- tab_id: ID of the tab to close-- Returns:- bool: True if successful, False if tab ID is invalid- """- if tab_id not in self._pages:- logger.warning(f"Invalid tab ID: {tab_id}")- return False-- page = self._pages[tab_id]-- try:- # Close the page if not already closed- if not page.is_closed():- await page.close()-- # Remove from our dictionary- del self._pages[tab_id]-- # If we closed the current tab, switch to another one- if tab_id == self._current_tab_id:- if self._pages:- # Switch to any available tab (first one we find)- next_tab_id = next(iter(self._pages.keys()))- await self.switch_to_tab(next_tab_id)- else:- # No tabs left- self._current_tab_id = None- self._page = None- self.executor = None- self.snapshot = None-- logger.info(- f"Closed tab {tab_id}, remaining tabs: {len(self._pages)}"- )- return True-- except Exception as e:- logger.warning(f"Error closing tab {tab_id}: {e}")- return False-- async def get_tab_info(self) -> List[Dict[str, Any]]:- r"""Get information about all open tabs including IDs.-- Returns:- List of dictionaries containing tab information- """- tab_info = []- tabs_to_cleanup = []-- # Process all tabs in dictionary- for tab_id, page in list(self._pages.items()):- try:- if not page.is_closed():- title = await page.title()- url = page.url- is_current = tab_id == self._current_tab_id- tab_info.append(- {- "tab_id": tab_id,- "title": title,- "url": url,- "is_current": is_current,- }- )- else:- # Mark for cleanup- tabs_to_cleanup.append(tab_id)- except Exception as e:- logger.warning(f"Error getting info for tab {tab_id}: {e}")- tabs_to_cleanup.append(tab_id)-- # Clean up closed/invalid tabs- for tab_id in tabs_to_cleanup:- if tab_id in self._pages:- del self._pages[tab_id]-- return tab_info-- async def get_current_tab_id(self) -> Optional[str]:- r"""Get the id for the current active tab."""- if not self._current_tab_id or not self._pages:- return None- return self._current_tab_id-- # ------------------------------------------------------------------- # Browser lifecycle helpers- # ------------------------------------------------------------------- async def ensure_browser(self) -> None:- r"""Ensure browser is ready. Each session_id gets its own browser- instance."""- # First, get the singleton instance for this session- singleton_instance = await self._get_or_create_instance(self)-- # If this isn't the singleton instance, delegate to the singleton- if singleton_instance is not self:- await singleton_instance.ensure_browser()- # Copy the singleton's browser state to this instance- self._playwright = singleton_instance._playwright- self._browser = singleton_instance._browser- self._context = singleton_instance._context- self._page = singleton_instance._page- self._pages = singleton_instance._pages- self._current_tab_id = singleton_instance._current_tab_id- self.snapshot = singleton_instance.snapshot- self.executor = singleton_instance.executor- return-- # Serialise initialisation to avoid race conditions where multiple- # concurrent coroutine calls create multiple browser instances for- # the same HybridBrowserSession.- async with self._ensure_lock:- await self._ensure_browser_inner()-- # Moved original logic to helper- async def _ensure_browser_inner(self) -> None:- r"""Internal browser initialization logic."""- from playwright.async_api import async_playwright-- if self._page is not None:- return-- self._playwright = await async_playwright().start()-- # Prepare stealth options- launch_options: Dict[str, Any] = {"headless": self._headless}- context_options: Dict[str, Any] = {}- if self._stealth and self._stealth_config:- # Use preloaded stealth configuration- launch_options['args'] = self._stealth_config['launch_args']- context_options.update(self._stealth_config['context_options'])-- if self._user_data_dir:- context = (- await self._playwright.chromium.launch_persistent_context(- user_data_dir=self._user_data_dir,- **launch_options,- **context_options,- )- )- self._context = context- # Get the first (default) page- pages = context.pages- if pages:- self._page = pages[0]- # Create ID for initial page- initial_tab_id = await TabIdGenerator.generate_tab_id()- self._pages[initial_tab_id] = pages[0]- self._current_tab_id = initial_tab_id- # Handle additional pages if any- for page in pages[1:]:- tab_id = await TabIdGenerator.generate_tab_id()- self._pages[tab_id] = page- else:- self._page = await context.new_page()- initial_tab_id = await TabIdGenerator.generate_tab_id()- self._pages[initial_tab_id] = self._page- self._current_tab_id = initial_tab_id- else:- self._browser = await self._playwright.chromium.launch(- **launch_options- )- self._context = await self._browser.new_context(**context_options)- self._page = await self._context.new_page()-- # Create ID for initial page- initial_tab_id = await TabIdGenerator.generate_tab_id()- self._pages[initial_tab_id] = self._page- self._current_tab_id = initial_tab_id-- # Apply stealth modifications if enabled- if self._stealth and self._stealth_script:- try:- await self._page.add_init_script(self._stealth_script)- logger.debug("Applied stealth script to main page")- except Exception as e:- logger.warning(f"Failed to apply stealth script: {e}")-- # Set up timeout for navigation- self._page.set_default_navigation_timeout(self._navigation_timeout)- self._page.set_default_timeout(self._navigation_timeout)-- # Initialize utilities- self.snapshot = PageSnapshot(self._page)- self.executor = ActionExecutor(- self._page,- self,- default_timeout=self._default_timeout,- short_timeout=self._short_timeout,- )-- logger.info("Browser session initialized successfully")-- async def close(self) -> None:- r"""Close browser session and clean up resources."""- if self._page is None:- return-- try:- logger.debug("Closing browser session...")- await self._close_session()-- # Remove from singleton registry- try:- try:- loop = asyncio.get_running_loop()- loop_id = str(id(loop))- except RuntimeError:- # Use same logic as _get_or_create_instance- import threading-- loop_id = f"sync_{threading.current_thread().ident}"-- session_id = (- self._session_id- if self._session_id is not None- else "default"- )- session_key = (loop_id, session_id)-- async with self._instances_lock:- if (- session_key in self._instances- and self._instances[session_key] is self- ):- del self._instances[session_key]- logger.debug(- f"Removed session {session_id} from registry"- )-- except Exception as registry_error:- logger.warning(f"Error cleaning up registry: {registry_error}")-- logger.debug("Browser session closed successfully")- except Exception as e:- logger.error(f"Error during browser session close: {e}")- finally:- self._page = None- self._pages = {}- self._current_tab_id = None- self.snapshot = None- self.executor = None-- async def _close_session(self) -> None:- r"""Internal session close logic with thorough cleanup."""- try:- # Close all pages first- pages_to_close = list(self._pages.values())- for page in pages_to_close:- try:- if not page.is_closed():- await page.close()- logger.debug(- f"Closed page: "- f"{page.url if hasattr(page, 'url') else 'unknown'}" # noqa:E501- )- except Exception as e:- logger.warning(f"Error closing page: {e}")-- # Clear the pages dictionary- self._pages.clear()-- # Close context with explicit wait- if self._context:- try:- await self._context.close()- logger.debug("Browser context closed")- except Exception as e:- logger.warning(f"Error closing context: {e}")- finally:- self._context = None-- # Close browser with explicit wait- if self._browser:- try:- await self._browser.close()- logger.debug("Browser instance closed")- except Exception as e:- logger.warning(f"Error closing browser: {e}")- finally:- self._browser = None-- # Stop playwright with increased delay for cleanup- if self._playwright:- try:- await self._playwright.stop()- logger.debug("Playwright stopped")-- # Give more time for complete subprocess cleanup- import asyncio-- await asyncio.sleep(0.5)-- except Exception as e:- logger.warning(f"Error stopping playwright: {e}")- finally:- self._playwright = None-- except Exception as e:- logger.error(f"Error during session cleanup: {e}")- finally:- # Ensure all attributes are cleared regardless of errors- self._page = None- self._pages = {}- self._current_tab_id = None- self._context = None- self._browser = None- self._playwright = None-- @classmethod- async def close_all_sessions(cls) -> None:- r"""Close all browser sessions and clean up the singleton registry."""- logger.debug("Closing all browser sessions...")- async with cls._instances_lock:- # Close all active sessions- instances_to_close = list(cls._instances.values())- cls._instances.clear()- logger.debug(f"Closing {len(instances_to_close)} sessions.")-- # Close sessions outside the lock to avoid deadlock- for instance in instances_to_close:- try:- await instance._close_session()- logger.debug(f"Closed session: {instance._session_id}")- except Exception as e:- logger.error(- f"Error closing session {instance._session_id}: {e}"- )-- logger.debug("All browser sessions closed and registry cleared")-- @classmethod- async def close_all(cls) -> None:- """Alias for close_all_sessions for backward compatibility."""- await cls.close_all_sessions()-- # ------------------------------------------------------------------- # Page interaction- # ------------------------------------------------------------------- async def visit(self, url: str) -> str:- r"""Navigate current tab to URL."""- await self.ensure_browser()- page = await self.get_page()-- await page.goto(url, timeout=self._navigation_timeout)- await page.wait_for_load_state('domcontentloaded')-- # Try to wait for network idle- try:- await page.wait_for_load_state(- 'networkidle', timeout=self._network_idle_timeout- )- except Exception:- logger.debug("Network idle timeout - continuing anyway")-- return f"Navigated to {url}"-- async def get_snapshot(- self, *, force_refresh: bool = False, diff_only: bool = False- ) -> str:- r"""Get snapshot for current tab."""- if not self.snapshot:- return "<empty>"- return await self.snapshot.capture(- force_refresh=force_refresh, diff_only=diff_only- )-- async def exec_action(self, action: Dict[str, Any]) -> Dict[str, Any]:- r"""Execute action on current tab."""- if not self.executor:- return {- "success": False,- "message": "No executor available",- "details": {},- }- return await self.executor.execute(action)-- async def get_page(self) -> "Page":- r"""Get current active page."""- await self.ensure_browser()- if self._page is None:- raise RuntimeError("No active page available")- return self._pagediff --git a/camel/toolkits/hybrid_browser_toolkit/config_loader.py b/camel/toolkits/hybrid_browser_toolkit/config_loader.pyindex bd0d78a4e..3b3823573 100644--- a/camel/toolkits/hybrid_browser_toolkit/config_loader.py+++ b/camel/toolkits/hybrid_browser_toolkit/config_loader.py@@ -1,4 +1,3 @@-#!/usr/bin/env python3# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========# Licensed under the Apache License, Version 2.0 (the "License");# you may not use this file except in compliance with the License.@@ -12,436 +11,150 @@# See the License for the specific language governing permissions and# limitations under the License.# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========--"""-Configuration for browser automation including stealth mode and timeouts.--This module contains all the configuration needed to make the browser-appear as a regular user browser and configure action timeouts.-"""--import os-from typing import Any, Dict, List, Optional+from dataclasses import dataclass+from typing import Any, Dict, Optional+@dataclassclass BrowserConfig:- r"""Configuration class for browser settings including stealth mode and- timeouts."""-- # Default timeout values (in milliseconds)- DEFAULT_ACTION_TIMEOUT = 3000- DEFAULT_SHORT_TIMEOUT = 1000- DEFAULT_NAVIGATION_TIMEOUT = 10000- DEFAULT_NETWORK_IDLE_TIMEOUT = 5000- DEFAULT_SCREENSHOT_TIMEOUT = 15000- DEFAULT_PAGE_STABILITY_TIMEOUT = 1500- DEFAULT_DOM_CONTENT_LOADED_TIMEOUT = 5000-- # Default action limits- DEFAULT_MAX_SCROLL_AMOUNT = 5000 # Maximum scroll distance in pixels-- @staticmethod- def get_timeout_config() -> Dict[str, int]:- r"""Get timeout configuration with environment variable support.-- Returns:- Dict[str, int]: Timeout configuration in milliseconds.- """- return {- 'default_timeout': int(- os.getenv(- 'HYBRID_BROWSER_DEFAULT_TIMEOUT',- BrowserConfig.DEFAULT_ACTION_TIMEOUT,- )- ),- 'short_timeout': int(- os.getenv(- 'HYBRID_BROWSER_SHORT_TIMEOUT',- BrowserConfig.DEFAULT_SHORT_TIMEOUT,- )- ),- 'navigation_timeout': int(- os.getenv(- 'HYBRID_BROWSER_NAVIGATION_TIMEOUT',- BrowserConfig.DEFAULT_NAVIGATION_TIMEOUT,- )- ),- 'network_idle_timeout': int(- os.getenv(- 'HYBRID_BROWSER_NETWORK_IDLE_TIMEOUT',- BrowserConfig.DEFAULT_NETWORK_IDLE_TIMEOUT,- )- ),- 'screenshot_timeout': int(- os.getenv(- 'HYBRID_BROWSER_SCREENSHOT_TIMEOUT',- BrowserConfig.DEFAULT_SCREENSHOT_TIMEOUT,- )- ),- 'page_stability_timeout': int(- os.getenv(- 'HYBRID_BROWSER_PAGE_STABILITY_TIMEOUT',- BrowserConfig.DEFAULT_PAGE_STABILITY_TIMEOUT,- )- ),- 'dom_content_loaded_timeout': int(- os.getenv(- 'HYBRID_BROWSER_DOM_CONTENT_LOADED_TIMEOUT',- BrowserConfig.DEFAULT_DOM_CONTENT_LOADED_TIMEOUT,- )- ),- }-- @staticmethod- def get_action_limits() -> Dict[str, int]:- r"""Get action limits configuration with environment variable support.-- Returns:- Dict[str, int]: Action limits configuration.- """- return {- 'max_scroll_amount': int(- os.getenv(- 'HYBRID_BROWSER_MAX_SCROLL_AMOUNT',- BrowserConfig.DEFAULT_MAX_SCROLL_AMOUNT,- )- ),- }-- @staticmethod- def get_action_timeout(override: Optional[int] = None) -> int:- r"""Get action timeout with optional override.-- Args:- override: Optional timeout override value in milliseconds.-- Returns:- int: Timeout value in milliseconds.- """- if override is not None:- return override- return BrowserConfig.get_timeout_config()['default_timeout']-- @staticmethod- def get_short_timeout(override: Optional[int] = None) -> int:- r"""Get short timeout with optional override.-- Args:- override: Optional timeout override value in milliseconds.-- Returns:- int: Timeout value in milliseconds.- """- if override is not None:- return override- return BrowserConfig.get_timeout_config()['short_timeout']-- @staticmethod- def get_navigation_timeout(override: Optional[int] = None) -> int:- r"""Get navigation timeout with optional override.-- Args:- override: Optional timeout override value in milliseconds.-- Returns:- int: Timeout value in milliseconds.- """- if override is not None:- return override- return BrowserConfig.get_timeout_config()['navigation_timeout']-- @staticmethod- def get_network_idle_timeout(override: Optional[int] = None) -> int:- r"""Get network idle timeout with optional override.+ """Browser configuration settings."""- Args:- override: Optional timeout override value in milliseconds.+ # Browser configuration+ headless: bool = True+ user_data_dir: Optional[str] = None+ stealth: bool = False- Returns:- int: Timeout value in milliseconds.- """- if override is not None:- return override- return BrowserConfig.get_timeout_config()['network_idle_timeout']+ # Default settings+ default_start_url: str = "https://google.com/"- @staticmethod- def get_max_scroll_amount(override: Optional[int] = None) -> int:- r"""Get maximum scroll amount with optional override.+ # Timeout configurations (in milliseconds)+ default_timeout: Optional[int] = None+ short_timeout: Optional[int] = None+ navigation_timeout: int = 30000+ network_idle_timeout: int = 5000+ screenshot_timeout: int = 15000+ page_stability_timeout: int = 1500+ dom_content_loaded_timeout: int = 5000- Args:- override: Optional scroll amount override value in pixels.+ # Viewport configuration+ viewport_limit: bool = False- Returns:- int: Maximum scroll amount in pixels.- """- if override is not None:- return override- return BrowserConfig.get_action_limits()['max_scroll_amount']- @staticmethod- def get_screenshot_timeout(override: Optional[int] = None) -> int:- r"""Get screenshot timeout with optional override.+@dataclass+class ToolkitConfig:+ """Toolkit-specific configuration."""- Args:- override: Optional timeout override value in milliseconds.+ cache_dir: str = "tmp/"+ browser_log_to_file: bool = False+ session_id: Optional[str] = None+ enabled_tools: Optional[list] = None- Returns:- int: Timeout value in milliseconds.- """- if override is not None:- return override- return BrowserConfig.get_timeout_config()['screenshot_timeout']- @staticmethod- def get_page_stability_timeout(override: Optional[int] = None) -> int:- r"""Get page stability timeout with optional override.-- Args:- override: Optional timeout override value in milliseconds.-- Returns:- int: Timeout value in milliseconds.- """- if override is not None:- return override- return BrowserConfig.get_timeout_config()['page_stability_timeout']-- @staticmethod- def get_dom_content_loaded_timeout(override: Optional[int] = None) -> int:- r"""Get DOM content loaded timeout with optional override.-- Args:- override: Optional timeout override value in milliseconds.-- Returns:- int: Timeout value in milliseconds.- """- if override is not None:- return override- return BrowserConfig.get_timeout_config()['dom_content_loaded_timeout']-- @staticmethod- def get_launch_args() -> List[str]:- r"""Get Chrome launch arguments for stealth mode.-- Returns:- List[str]: Chrome command line arguments to avoid detection.- """- return [- '--disable-blink-features=AutomationControlled',- '--disable-features=VizDisplayCompositor',- '--disable-ipc-flooding-protection',- '--disable-renderer-backgrounding',- '--disable-backgrounding-occluded-windows',- '--disable-dev-shm-usage',- '--disable-extensions',- '--disable-plugins',- '--disable-default-apps',- '--disable-sync',- '--no-default-browser-check',- '--no-first-run',- '--no-sandbox',- '--disable-setuid-sandbox',- '--disable-web-security',- '--disable-features=TranslateUI',- '--disable-features=BlinkGenPropertyTrees',- '--disable-component-extensions-with-background-pages',- ]-- @staticmethod- def get_context_options() -> Dict[str, Any]:- r"""Get browser context options for stealth mode.-- Returns:- Dict[str, Any]: Browser context configuration options.- """- return {- 'user_agent': (- 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) '- 'AppleWebKit/537.36 (KHTML, like Gecko) '- 'Chrome/131.0.0.0 Safari/537.36'- ),- 'viewport': {'width': 1920, 'height': 1080},- 'locale': 'en-US',- 'timezone_id': 'America/New_York',- 'geolocation': {'latitude': 40.7128, 'longitude': -74.0060},- 'permissions': ['geolocation'],- }+class ConfigLoader:+ """Configuration loader for HybridBrowserToolkit."""- @staticmethod- def get_http_headers() -> Dict[str, str]:- r"""Get HTTP headers for stealth mode.+ def __init__(+ self,+ browser_config: Optional[BrowserConfig] = None,+ toolkit_config: Optional[ToolkitConfig] = None,+ ) -> None:+ self.browser_config = browser_config or BrowserConfig()+ self.toolkit_config = toolkit_config or ToolkitConfig()- Returns:- Dict[str, str]: HTTP headers to appear more like a real browser.- """+ @classmethod+ def from_kwargs(cls, **kwargs) -> 'ConfigLoader':+ """Create ConfigLoader from keyword arguments."""+ browser_kwargs = {}+ toolkit_kwargs = {}++ # Map arguments to appropriate config classes+ browser_fields = set(BrowserConfig.__dataclass_fields__.keys())+ toolkit_fields = set(ToolkitConfig.__dataclass_fields__.keys())++ for key, value in kwargs.items():+ # Skip None values to preserve dataclass defaults+ if value is None:+ continue++ if key in browser_fields:+ browser_kwargs[key] = value+ elif key in toolkit_fields:+ toolkit_kwargs[key] = value+ # Handle some common aliases+ elif key == "userDataDir":+ browser_kwargs["user_data_dir"] = value+ elif key == "defaultStartUrl":+ browser_kwargs["default_start_url"] = value+ elif key == "navigationTimeout":+ browser_kwargs["navigation_timeout"] = value+ elif key == "networkIdleTimeout":+ browser_kwargs["network_idle_timeout"] = value+ elif key == "screenshotTimeout":+ browser_kwargs["screenshot_timeout"] = value+ elif key == "pageStabilityTimeout":+ browser_kwargs["page_stability_timeout"] = value+ elif key == "domContentLoadedTimeout":+ browser_kwargs["dom_content_loaded_timeout"] = value+ elif key == "viewportLimit":+ browser_kwargs["viewport_limit"] = value+ elif key == "cacheDir":+ toolkit_kwargs["cache_dir"] = value+ elif key == "browserLogToFile":+ toolkit_kwargs["browser_log_to_file"] = value+ elif key == "sessionId":+ toolkit_kwargs["session_id"] = value+ elif key == "enabledTools":+ toolkit_kwargs["enabled_tools"] = value++ browser_config = BrowserConfig(**browser_kwargs)+ toolkit_config = ToolkitConfig(**toolkit_kwargs)++ return cls(browser_config, toolkit_config)++ def get_browser_config(self) -> BrowserConfig:+ """Get browser configuration."""+ return self.browser_config++ def get_toolkit_config(self) -> ToolkitConfig:+ """Get toolkit configuration."""+ return self.toolkit_config++ def to_ws_config(self) -> Dict[str, Any]:+ """Convert to WebSocket wrapper configuration format."""return {- 'Accept': (- 'text/html,application/xhtml+xml,application/xml;q=0.9,'- 'image/avif,image/webp,image/apng,*/*;q=0.8,'- 'application/signed-exchange;v=b3;q=0.7'- ),- 'Accept-Language': 'en-US,en;q=0.9',- 'Accept-Encoding': 'gzip, deflate, br, zstd',- 'Cache-Control': 'max-age=0',- 'Sec-Ch-Ua': (- '"Google Chrome";v="131", "Chromium";v="131", '- '"Not=A?Brand";v="24"'- ),- 'Sec-Ch-Ua-Mobile': '?0',- 'Sec-Ch-Ua-Platform': '"Windows"',- 'Sec-Fetch-Dest': 'document',- 'Sec-Fetch-Mode': 'navigate',- 'Sec-Fetch-Site': 'none',- 'Sec-Fetch-User': '?1',- 'Upgrade-Insecure-Requests': '1',+ "headless": self.browser_config.headless,+ "userDataDir": self.browser_config.user_data_dir,+ "stealth": self.browser_config.stealth,+ "defaultStartUrl": self.browser_config.default_start_url,+ "navigationTimeout": self.browser_config.navigation_timeout,+ "networkIdleTimeout": self.browser_config.network_idle_timeout,+ "screenshotTimeout": self.browser_config.screenshot_timeout,+ "pageStabilityTimeout": self.browser_config.page_stability_timeout,+ "browser_log_to_file": self.toolkit_config.browser_log_to_file,+ "session_id": self.toolkit_config.session_id,+ "viewport_limit": self.browser_config.viewport_limit,}- @staticmethod- def get_stealth_config() -> Dict[str, Any]:- r"""Get stealth configuration.-- Returns:- Dict[str, Any]: Complete stealth configuration.- """+ def get_timeout_config(self) -> Dict[str, Optional[int]]:+ """Get all timeout configurations."""return {- 'launch_args': BrowserConfig.get_launch_args(),- 'context_options': BrowserConfig.get_context_options(),- 'http_headers': BrowserConfig.get_http_headers(),+ "default_timeout": self.browser_config.default_timeout,+ "short_timeout": self.browser_config.short_timeout,+ "navigation_timeout": self.browser_config.navigation_timeout,+ "network_idle_timeout": self.browser_config.network_idle_timeout,+ "screenshot_timeout": self.browser_config.screenshot_timeout,+ "page_stability_timeout": self.browser_config.page_stability_timeout, # noqa:E501+ "dom_content_loaded_timeout": self.browser_config.dom_content_loaded_timeout, # noqa:E501}- @staticmethod- def get_all_config() -> Dict[str, Any]:- r"""Get all browser configuration including stealth, timeouts,- and action limits.-- Returns:- Dict[str, Any]: Complete browser configuration.- """- return {- 'timeouts': BrowserConfig.get_timeout_config(),- 'action_limits': BrowserConfig.get_action_limits(),- 'stealth': BrowserConfig.get_stealth_config(),- }---# Legacy ConfigLoader class for compatibility (now just wraps BrowserConfig)-class ConfigLoader:- r"""Legacy wrapper for BrowserConfig - maintained for backward- compatibility."""-- @classmethod- def get_browser_config(cls):- r"""Get the BrowserConfig class."""- return BrowserConfig-- @classmethod- def get_stealth_config(cls):- r"""Get the StealthConfig class (alias)."""- return BrowserConfig # StealthConfig is an alias for BrowserConfig-- @classmethod- def get_timeout_config(cls) -> Dict[str, int]:- r"""Get timeout configuration."""- return BrowserConfig.get_timeout_config()-- @classmethod- def get_action_timeout(cls, override: Optional[int] = None) -> int:- r"""Get action timeout with optional override."""- return BrowserConfig.get_action_timeout(override)-- @classmethod- def get_short_timeout(cls, override: Optional[int] = None) -> int:- r"""Get short timeout with optional override."""- return BrowserConfig.get_short_timeout(override)-- @classmethod- def get_navigation_timeout(cls, override: Optional[int] = None) -> int:- r"""Get navigation timeout with optional override."""- return BrowserConfig.get_navigation_timeout(override)-- @classmethod- def get_network_idle_timeout(cls, override: Optional[int] = None) -> int:- r"""Get network idle timeout with optional override."""- return BrowserConfig.get_network_idle_timeout(override)-- @classmethod- def get_max_scroll_amount(cls, override: Optional[int] = None) -> int:- r"""Get maximum scroll amount with optional override."""- return BrowserConfig.get_max_scroll_amount(override)-- @classmethod- def get_screenshot_timeout(cls, override: Optional[int] = None) -> int:- r"""Get screenshot timeout with optional override."""- return BrowserConfig.get_screenshot_timeout(override)-- @classmethod- def get_page_stability_timeout(cls, override: Optional[int] = None) -> int:- r"""Get page stability timeout with optional override."""- return BrowserConfig.get_page_stability_timeout(override)-- @classmethod- def get_dom_content_loaded_timeout(- cls, override: Optional[int] = None- ) -> int:- r"""Get DOM content loaded timeout with optional override."""- return BrowserConfig.get_dom_content_loaded_timeout(override)---# Backward compatibility aliases and convenience functions-StealthConfig = BrowserConfig---def get_browser_config():- r"""Get BrowserConfig class."""- return BrowserConfig---def get_stealth_config():- r"""Get StealthConfig class."""- return BrowserConfig---def get_timeout_config() -> Dict[str, int]:- r"""Get timeout configuration."""- return BrowserConfig.get_timeout_config()---def get_action_timeout(override: Optional[int] = None) -> int:- r"""Get action timeout with optional override."""- return BrowserConfig.get_action_timeout(override)---def get_short_timeout(override: Optional[int] = None) -> int:- r"""Get short timeout with optional override."""- return BrowserConfig.get_short_timeout(override)---def get_navigation_timeout(override: Optional[int] = None) -> int:- r"""Get navigation timeout with optional override."""- return BrowserConfig.get_navigation_timeout(override)---def get_network_idle_timeout(override: Optional[int] = None) -> int:- r"""Get network idle timeout with optional override."""- return BrowserConfig.get_network_idle_timeout(override)---def get_max_scroll_amount(override: Optional[int] = None) -> int:- r"""Get maximum scroll amount with optional override."""- return BrowserConfig.get_max_scroll_amount(override)---def get_screenshot_timeout(override: Optional[int] = None) -> int:- r"""Get screenshot timeout with optional override."""- return BrowserConfig.get_screenshot_timeout(override)---def get_page_stability_timeout(override: Optional[int] = None) -> int:- r"""Get page stability timeout with optional override."""- return BrowserConfig.get_page_stability_timeout(override)---def get_dom_content_loaded_timeout(override: Optional[int] = None) -> int:- r"""Get DOM content loaded timeout with optional override."""- return BrowserConfig.get_dom_content_loaded_timeout(override)+ def update_browser_config(self, **kwargs) -> None:+ """Update browser configuration."""+ for key, value in kwargs.items():+ if hasattr(self.browser_config, key):+ setattr(self.browser_config, key, value)++ def update_toolkit_config(self, **kwargs) -> None:+ """Update toolkit configuration."""+ for key, value in kwargs.items():+ if hasattr(self.toolkit_config, key):+ setattr(self.toolkit_config, key, value)diff --git a/camel/toolkits/hybrid_browser_toolkit/hybrid_browser_toolkit.py b/camel/toolkits/hybrid_browser_toolkit/hybrid_browser_toolkit.pyindex 452f51c8e..78c440248 100644--- a/camel/toolkits/hybrid_browser_toolkit/hybrid_browser_toolkit.py+++ b/camel/toolkits/hybrid_browser_toolkit/hybrid_browser_toolkit.py@@ -11,75 +11,64 @@# See the License for the specific language governing permissions and# limitations under the License.# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========+# =========-import base64-import datetime-import io-import json-import osimport time-import urllib.parse-from functools import wrapsfrom typing import Any, Callable, ClassVar, Dict, List, Optional, castfrom camel.logger import get_logger+from camel.messages import BaseMessagefrom camel.models import BaseModelBackend-from camel.toolkits.base import BaseToolkit+from camel.toolkits.base import BaseToolkit, RegisteredAgentToolkitfrom camel.toolkits.function_tool import FunctionTool-from camel.utils import sanitize_filenamefrom camel.utils.commons import dependencies_required-from camel.utils.tool_result import ToolResult-from .agent import PlaywrightLLMAgent-from .browser_session import HybridBrowserSessionfrom .config_loader import ConfigLoader+from .ws_wrapper import WebSocketBrowserWrapperlogger = get_logger(__name__)-class HybridBrowserToolkit(BaseToolkit):+class HybridBrowserToolkit(BaseToolkit, RegisteredAgentToolkit):r"""A hybrid browser toolkit that combines non-visual, DOM-based browserautomation with visual, screenshot-based capabilities.- This toolkit exposes a set of actions as CAMEL FunctionTools for agents- to interact with web pages. It can operate in headless mode and supports- both programmatic control of browser actions (like clicking and typing)- and visual analysis of the page layout through screenshots with marked- interactive elements.+ This toolkit now uses TypeScript implementation with Playwright's+ _snapshotForAI functionality for enhanced AI integration."""# Default tool list - core browser functionalityDEFAULT_TOOLS: ClassVar[List[str]] = [- "open_browser",- "close_browser",- "visit_page",- "back",- "forward",- "click",- "type",- "switch_tab",+ "browser_open",+ "browser_close",+ "browser_visit_page",+ "browser_back",+ "browser_forward",+ "browser_click",+ "browser_type",+ "browser_switch_tab",]# All available toolsALL_TOOLS: ClassVar[List[str]] = [- "open_browser",- "close_browser",- "visit_page",- "back",- "forward",- "get_page_snapshot",- "get_som_screenshot",- "get_page_links",- "click",- "type",- "select",- "scroll",- "enter",- "wait_user",- "solve_task",- "switch_tab",- "close_tab",- "get_tab_info",+ "browser_open",+ "browser_close",+ "browser_visit_page",+ "browser_back",+ "browser_forward",+ "browser_get_page_snapshot",+ "browser_get_som_screenshot",+ "browser_get_page_links",+ "browser_click",+ "browser_type",+ "browser_select",+ "browser_scroll",+ "browser_enter",+ "browser_wait_user",+ "browser_solve_task",+ "browser_switch_tab",+ "browser_close_tab",+ "browser_get_tab_info",]def __init__(@@ -101,137 +90,95 @@ class HybridBrowserToolkit(BaseToolkit):screenshot_timeout: Optional[int] = None,page_stability_timeout: Optional[int] = None,dom_content_loaded_timeout: Optional[int] = None,+ viewport_limit: bool = False,) -> None:r"""Initialize the HybridBrowserToolkit.Args:- headless (bool): Whether to run the browser in headless mode.- Defaults to `True`.- user_data_dir (Optional[str]): Path to a directory for storing- browser data like cookies and local storage. Useful for- maintaining sessions across runs. Defaults to `None` (a- temporary directory is used).- stealth (bool): Whether to run the browser in stealth mode to avoid- bot detection. When enabled, hides WebDriver characteristics,- spoofs navigator properties, and implements various- anti-detection- measures. Highly recommended for production use and when- accessing sites with bot detection. Defaults to `False`.- web_agent_model (Optional[BaseModelBackend]): The language model- backend to use for the high-level `solve_task` agent. This is- required only if you plan to use `solve_task`.- Defaults to `None`.- cache_dir (str): The directory to store cached files, such as- screenshots. Defaults to `"tmp/"`.- enabled_tools (Optional[List[str]]): List of tool names to enable.- If None, uses DEFAULT_TOOLS. Available tools: open_browser,- close_browser, visit_page, back, forward, get_page_snapshot,- get_som_screenshot, get_page_links, click, type, select,- scroll, enter, wait_user, solve_task.- Defaults to `None`.- browser_log_to_file (bool): Whether to save detailed browser- action logs to file.- When enabled, logs action inputs/outputs, execution times,- and page loading times.- Logs are saved to an auto-generated timestamped file.- Defaults to `False`.- session_id (Optional[str]): A unique identifier for this browser- session. When multiple HybridBrowserToolkit instances are used- concurrently, different session IDs prevent them from sharing- the same browser session and causing conflicts. If None, a- default session will be used. Defaults to `None`.- default_start_url (str): The default URL to navigate to when- open_browser() is called without a start_url parameter or with- None. Defaults to `"https://google.com/"`.- default_timeout (Optional[int]): Default timeout in milliseconds- for browser actions. If None, uses environment variable- HYBRID_BROWSER_DEFAULT_TIMEOUT or defaults to 3000ms.- Defaults to `None`.- short_timeout (Optional[int]): Short timeout in milliseconds- for quick browser actions. If None, uses environment variable- HYBRID_BROWSER_SHORT_TIMEOUT or defaults to 1000ms.- Defaults to `None`.- navigation_timeout (Optional[int]): Custom navigation timeout in- milliseconds.- If None, uses environment variable- HYBRID_BROWSER_NAVIGATION_TIMEOUT or defaults to 10000ms.- Defaults to `None`.- network_idle_timeout (Optional[int]): Custom network idle- timeout in milliseconds.- If None, uses environment variable- HYBRID_BROWSER_NETWORK_IDLE_TIMEOUT or defaults to 5000ms.- Defaults to `None`.- screenshot_timeout (Optional[int]): Custom screenshot timeout in- milliseconds.- If None, uses environment variable- HYBRID_BROWSER_SCREENSHOT_TIMEOUT or defaults to 15000ms.- Defaults to `None`.- page_stability_timeout (Optional[int]): Custom page stability- timeout in milliseconds.- If None, uses environment variable- HYBRID_BROWSER_PAGE_STABILITY_TIMEOUT or defaults to 1500ms.- Defaults to `None`.- dom_content_loaded_timeout (Optional[int]): Custom DOM content- loaded timeout in milliseconds.- If None, uses environment variable- HYBRID_BROWSER_DOM_CONTENT_LOADED_TIMEOUT or defaults to- 5000ms.- Defaults to `None`.+ headless (bool): Whether to run browser in headless mode.+ Defaults to True.+ user_data_dir (Optional[str]): Directory for user data+ persistence. Defaults to None.+ stealth (bool): Whether to enable stealth mode. Defaults to+ False.+ web_agent_model (Optional[BaseModelBackend]): Model for web+ agent operations. Defaults to None.+ cache_dir (str): Directory for caching. Defaults to "tmp/".+ enabled_tools (Optional[List[str]]): List of enabled tools.+ Defaults to None.+ browser_log_to_file (bool): Whether to log browser actions to+ file. Defaults to False.+ session_id (Optional[str]): Session identifier. Defaults to None.+ default_start_url (str): Default URL to start with. Defaults+ to "https://google.com/".+ default_timeout (Optional[int]): Default timeout in+ milliseconds. Defaults to None.+ short_timeout (Optional[int]): Short timeout in milliseconds.+ Defaults to None.+ navigation_timeout (Optional[int]): Navigation timeout in+ milliseconds. Defaults to None.+ network_idle_timeout (Optional[int]): Network idle timeout in+ milliseconds. Defaults to None.+ screenshot_timeout (Optional[int]): Screenshot timeout in+ milliseconds. Defaults to None.+ page_stability_timeout (Optional[int]): Page stability timeout+ in milliseconds. Defaults to None.+ dom_content_loaded_timeout (Optional[int]): DOM content loaded+ timeout in milliseconds. Defaults to None.+ viewport_limit (bool): Whether to filter page snapshot+ elements to only those visible in the current viewport.+ When True, only elements within the current viewport+ bounds will be included in snapshots.+ When False (default), all elements on the page are+ included. Defaults to False."""super().__init__()- self._headless = headless- self._user_data_dir = user_data_dir- self._stealth = stealth- self._web_agent_model = web_agent_model- self._cache_dir = cache_dir- self._browser_log_to_file = browser_log_to_file- self._default_start_url = default_start_url- self._session_id = session_id or "default"-- # Store timeout configuration- self._default_timeout = default_timeout- self._short_timeout = short_timeout- self._navigation_timeout = ConfigLoader.get_navigation_timeout(- navigation_timeout- )- self._network_idle_timeout = ConfigLoader.get_network_idle_timeout(- network_idle_timeout- )- self._screenshot_timeout = ConfigLoader.get_screenshot_timeout(- screenshot_timeout- )- self._page_stability_timeout = ConfigLoader.get_page_stability_timeout(- page_stability_timeout- )- self._dom_content_loaded_timeout = (- ConfigLoader.get_dom_content_loaded_timeout(- dom_content_loaded_timeout- )+ RegisteredAgentToolkit.__init__(self)++ # Initialize configuration loader+ self.config_loader = ConfigLoader.from_kwargs(+ headless=headless,+ user_data_dir=user_data_dir,+ stealth=stealth,+ default_start_url=default_start_url,+ default_timeout=default_timeout,+ short_timeout=short_timeout,+ navigation_timeout=navigation_timeout,+ network_idle_timeout=network_idle_timeout,+ screenshot_timeout=screenshot_timeout,+ page_stability_timeout=page_stability_timeout,+ dom_content_loaded_timeout=dom_content_loaded_timeout,+ viewport_limit=viewport_limit,+ cache_dir=cache_dir,+ browser_log_to_file=browser_log_to_file,+ session_id=session_id,+ enabled_tools=enabled_tools,)- # Logging configuration - fixed values for simplicity- self.enable_action_logging = True- self.enable_timing_logging = True- self.enable_page_loading_logging = True- self.log_to_console = False # Always disabled for cleaner output- self.log_to_file = browser_log_to_file- self.max_log_length = None # No truncation for file logs-- # Set up log file if needed- if self.log_to_file:- # Create log directory if it doesn't exist- log_dir = "browser_log"- os.makedirs(log_dir, exist_ok=True)-- timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")- self.log_file_path: Optional[str] = os.path.join(- log_dir, f"hybrid_browser_toolkit_{timestamp}_{session_id}.log"- )- else:- self.log_file_path = None+ # Legacy attribute access for backward compatibility+ browser_config = self.config_loader.get_browser_config()+ toolkit_config = self.config_loader.get_toolkit_config()- # Initialize log buffer for in-memory storage- self.log_buffer: List[Dict[str, Any]] = []+ self._headless = browser_config.headless+ self._user_data_dir = browser_config.user_data_dir+ self._stealth = browser_config.stealth+ self._web_agent_model = web_agent_model+ self._cache_dir = toolkit_config.cache_dir+ self._browser_log_to_file = toolkit_config.browser_log_to_file+ self._default_start_url = browser_config.default_start_url+ self._session_id = toolkit_config.session_id or "default"+ self._viewport_limit = browser_config.viewport_limit++ # Store timeout configuration for backward compatibility+ self._default_timeout = browser_config.default_timeout+ self._short_timeout = browser_config.short_timeout+ self._navigation_timeout = browser_config.navigation_timeout+ self._network_idle_timeout = browser_config.network_idle_timeout+ self._screenshot_timeout = browser_config.screenshot_timeout+ self._page_stability_timeout = browser_config.page_stability_timeout+ self._dom_content_loaded_timeout = (+ browser_config.dom_content_loaded_timeout+ )# Configure enabled toolsif enabled_tools is None:@@ -250,42 +197,22 @@ class HybridBrowserToolkit(BaseToolkit):logger.info(f"Enabled tools: {self.enabled_tools}")- # Log initialization if file logging is enabled- if self.log_to_file:- logger.info(- "HybridBrowserToolkit initialized with file logging enabled"- )- logger.info(f"Log file path: {self.log_file_path}")-- # Core components- temp_session = HybridBrowserSession(- headless=headless,- user_data_dir=user_data_dir,- stealth=stealth,- session_id=session_id,- default_timeout=default_timeout,- short_timeout=short_timeout,- )- # Use the session directly - singleton logic is handled in- # ensure_browser- self._session = temp_session- self._agent: Optional[PlaywrightLLMAgent] = None- self._unified_script = self._load_unified_analyzer()-- @property- def web_agent_model(self) -> Optional[BaseModelBackend]:- """Get the web agent model."""- return self._web_agent_model+ # Initialize WebSocket wrapper+ self._ws_wrapper: Optional[WebSocketBrowserWrapper] = None+ self._ws_config = self.config_loader.to_ws_config()- @web_agent_model.setter- def web_agent_model(self, value: Optional[BaseModelBackend]) -> None:- """Set the web agent model."""- self._web_agent_model = value+ async def _ensure_ws_wrapper(self):+ """Ensure WebSocket wrapper is initialized."""+ if self._ws_wrapper is None:+ self._ws_wrapper = WebSocketBrowserWrapper(self._ws_config)+ await self._ws_wrapper.start()- @property- def cache_dir(self) -> str:- """Get the cache directory."""- return self._cache_dir+ async def _get_ws_wrapper(self) -> WebSocketBrowserWrapper:+ """Get the WebSocket wrapper, initializing if needed."""+ await self._ensure_ws_wrapper()+ if self._ws_wrapper is None:+ raise RuntimeError("Failed to initialize WebSocket wrapper")+ return self._ws_wrapperdef __del__(self):r"""Cleanup browser resources on garbage collection."""@@ -300,800 +227,35 @@ class HybridBrowserToolkit(BaseToolkit):try:loop = asyncio.get_event_loop()if not loop.is_closed() and not loop.is_running():- # Try to close browser with a timeout to prevent hangingtry:loop.run_until_complete(- asyncio.wait_for(self.close_browser(), timeout=2.0)+ asyncio.wait_for(self.browser_close(), timeout=2.0))except asyncio.TimeoutError:- pass # Skip cleanup if it takes too long+ passexcept (RuntimeError, ImportError):- pass # Event loop unavailable, skip cleanup- except Exception:- pass # Suppress all errors during garbage collection-- def _load_unified_analyzer(self) -> str:- r"""Load the unified analyzer JavaScript script."""- script_path = os.path.join(- os.path.dirname(os.path.abspath(__file__)), "unified_analyzer.js"- )-- try:- with open(- script_path, "r", encoding='utf-8', errors='replace'- ) as f:- script_content = f.read()-- if not script_content.strip():- raise ValueError(f"Script is empty: {script_path}")-- logger.debug(- f"Loaded unified analyzer ({len(script_content)} chars)"- )- return script_content- except FileNotFoundError:- raise FileNotFoundError(f"Script not found: {script_path}")-- def _validate_ref(self, ref: str, method_name: str) -> None:- r"""Validate ref parameter."""- if not ref or not isinstance(ref, str):- raise ValueError(- f"{method_name}: 'ref' must be a non-empty string"- )-- def _truncate_if_needed(self, content: Any) -> str:- r"""Truncate content if max_log_length is set."""- content_str = str(content)- if (- self.max_log_length is not None- and len(content_str) > self.max_log_length- ):- return content_str[: self.max_log_length] + "... [TRUNCATED]"- return content_str-- async def _get_current_url(self) -> Optional[str]:- r"""Safely get the current URL of the active page."""- try:- page = await self._session.get_page()- if page and not page.is_closed():- return page.url- return None # Return None if page is closed+ passexcept Exception:- # This can happen if browser is not open.- return None+ pass- async def _log_action(- self,- action_name: str,- inputs: Dict[str, Any],- outputs: Any,- execution_time: float,- page_load_time: Optional[float] = None,- error: Optional[str] = None,- ) -> None:- r"""Log action details with comprehensive information."""- if not (self.enable_action_logging or self.enable_timing_logging):- return-- current_url = await self._get_current_url()-- log_entry: Dict[str, Any] = {- "timestamp": datetime.datetime.now().isoformat(),- "action": action_name,- "url": current_url,- "execution_time_ms": round(execution_time * 1000, 2),- }-- if self.enable_action_logging:- log_entry["inputs"] = inputs- if error:- log_entry["error"] = str(error)- elif isinstance(outputs, dict):- # Unpack dictionary items into the log entry- log_entry.update(outputs)- elif isinstance(outputs, ToolResult):- log_entry["outputs"] = {- "text": outputs.text,- "images": outputs.images,- }- else:- # For non-dict outputs, assign to 'outputs' key- log_entry["outputs"] = outputs-- if page_load_time is not None and self.enable_page_loading_logging:- log_entry["page_load_time_ms"] = round(page_load_time * 1000, 2)-- # Add to buffer- self.log_buffer.append(log_entry)-- # Console logging- if self.log_to_console:- log_msg = f"[BROWSER ACTION] {action_name}"- if self.enable_timing_logging:- log_msg += f" | Execution: {log_entry['execution_time_ms']}ms"- if page_load_time is not None and self.enable_page_loading_logging:- log_msg += f" | Page Load: {log_entry['page_load_time_ms']}ms"- if error:- log_msg += f" | ERROR: {error}"-- logger.info(log_msg)-- if self.enable_action_logging:- logger.info(f" Inputs: {self._truncate_if_needed(inputs)}")- if not error:- if isinstance(outputs, dict):- for key, value in outputs.items():- logger.info(- f" - {key}: "- f"{self._truncate_if_needed(value)}"- )- else:- logger.info(- f" Outputs: {self._truncate_if_needed(outputs)}"- )-- # File logging- if self.log_to_file and self.log_file_path:- try:- with open(self.log_file_path, 'a', encoding='utf-8') as f:- # Write full log entry to file without truncation- f.write(- json.dumps(log_entry, ensure_ascii=False, indent=2)- + '\n'- )- except Exception as e:- logger.error(f"Failed to write to log file: {e}")-- @staticmethod- def action_logger(func: Callable[..., Any]) -> Callable[..., Any]:- r"""Decorator to add logging to action methods."""-- @wraps(func)- async def wrapper(self, *args, **kwargs):- action_name = func.__name__- start_time = time.time()-- # Log inputs- inputs = {- "args": args, # Don't skip self since it's already handled- "kwargs": kwargs,- }-- try:- # Execute the original function- result = await func(self, *args, **kwargs)- execution_time = time.time() - start_time-- # Log success- await self._log_action(- action_name=action_name,- inputs=inputs,- outputs=result,- execution_time=execution_time,- )-- return result-- except Exception as e:- execution_time = time.time() - start_time- error_msg = f"{type(e).__name__}: {e!s}"-- # Log error- await self._log_action(- action_name=action_name,- inputs=inputs,- outputs=None,- execution_time=execution_time,- error=error_msg,- )-- raise-- return wrapper-- async def _get_session(self) -> "HybridBrowserSession":- """Get the correct singleton session instance."""- singleton = await HybridBrowserSession._get_or_create_instance(- self._session- )- if singleton is not self._session:- logger.debug("Updating to singleton session instance")- self._session = singleton- return self._session-- async def _ensure_browser(self):- # Get singleton instance and update self._session if needed- session = await self._get_session()- await session.ensure_browser()-- async def _require_page(self):- # Get singleton instance and update self._session if needed- session = await self._get_session()- await session.ensure_browser()- return await session.get_page()-- async def _wait_for_page_stability(self):- r"""Wait for page to become stable after actions that might trigger- updates. Optimized with shorter timeouts.- """- page = await self._require_page()- import asyncio-- try:- # Wait for DOM content to be loaded (reduced timeout)- await page.wait_for_load_state(- 'domcontentloaded', timeout=self._page_stability_timeout- )- logger.debug("DOM content loaded")-- # Try to wait for network idle with shorter timeout- try:- await page.wait_for_load_state(- 'networkidle', timeout=self._network_idle_timeout- )- logger.debug("Network idle achieved")- except Exception:- logger.debug("Network idle timeout - continuing anyway")-- # Reduced delay for JavaScript execution- await asyncio.sleep(0.2) # Reduced from 0.5s- logger.debug("Page stability wait completed")-- except Exception as e:- logger.debug(- f"Page stability wait failed: {e} - continuing anyway"- )-- async def _get_unified_analysis(- self, max_retries: int = 3- ) -> Dict[str, Any]:- r"""Get unified analysis data from the page with retry mechanism for- navigation issues."""- page = await self._require_page()-- for attempt in range(max_retries):- try:- if not self._unified_script:- logger.error("Unified analyzer script not loaded")- return {"elements": {}, "metadata": {"elementCount": 0}}-- # Wait for DOM stability before each attempt (with optimized- # timeout)- try:- await page.wait_for_load_state(- 'domcontentloaded',- timeout=self._dom_content_loaded_timeout,- )- except Exception:- # Don't fail if DOM wait times out- pass-- result = await page.evaluate(self._unified_script)-- if not isinstance(result, dict):- logger.warning(f"Invalid result type: {type(result)}")- return {"elements": {}, "metadata": {"elementCount": 0}}-- # Success - return result- if attempt > 0:- logger.debug(- f"Unified analysis succeeded on attempt {attempt + 1}"- )- return result-- except Exception as e:- error_msg = str(e)-- # Check if this is a navigation-related error- is_navigation_error = (- "Execution context was destroyed" in error_msg- or "Most likely because of a navigation" in error_msg- or "Target page, context or browser has been closed"- in error_msg- )-- if is_navigation_error and attempt < max_retries - 1:- logger.debug(- f"Navigation error in unified analysis (attempt "- f"{attempt + 1}/{max_retries}): {e}. Retrying..."- )-- # Wait a bit for page stability before retrying (optimized)- try:- await page.wait_for_load_state(- 'domcontentloaded',- timeout=self._page_stability_timeout,- )- # Reduced delay for JS context to stabilize- import asyncio-- await asyncio.sleep(0.1) # Reduced from 0.2s- except Exception:- # Continue even if wait fails- pass-- continue-- # Non-navigation error or final attempt - log and return- # empty result- if attempt == max_retries - 1:- logger.warning(- f"Error in unified analysis after {max_retries} "- f"attempts: {e}"- )- else:- logger.warning(- f"Non-retryable error in unified analysis: {e}"- )-- return {"elements": {}, "metadata": {"elementCount": 0}}-- # Should not reach here, but just in case- return {"elements": {}, "metadata": {"elementCount": 0}}-- def _convert_analysis_to_rects(- self, analysis_data: Dict[str, Any]- ) -> Dict[str, Any]:- r"""Convert analysis data to rect format for visual marking."""- rects = {}- elements = analysis_data.get("elements", {})-- for ref, element_data in elements.items():- coordinates = element_data.get("coordinates", [])- if coordinates:- rects[ref] = {- "role": element_data.get("role", "generic"),- "aria-name": element_data.get("name", ""),- "rects": [coordinates[0]],- }- return rects-- def _add_set_of_mark(self, image, rects):- r"""Add visual marks to the image."""- try:- from PIL import ImageDraw, ImageFont- except ImportError:- logger.warning("PIL not available, returning original image")- return image-- marked_image = image.copy()- draw = ImageDraw.Draw(marked_image)-- # Try to get font- try:- font = ImageFont.truetype("arial.ttf", 16)- except (OSError, IOError):- try:- font = ImageFont.load_default()- except (OSError, IOError):- font = None-- # Color scheme- colors = {- "button": "#FF6B6B",- "link": "#4ECDC4",- "textbox": "#45B7D1",- "select": "#96CEB4",- "checkbox": "#FECA57",- "radio": "#FF9FF3",- "default": "#DDA0DD",- }-- for ref, rect_data in rects.items():- rects_list = rect_data.get("rects", [])- role = rect_data.get("role", "generic")- color = colors.get(role, colors["default"])-- for rect in rects_list:- x, y = rect.get("x", 0), rect.get("y", 0)- width, height = rect.get("width", 0), rect.get("height", 0)-- # Draw rectangle outline- draw.rectangle(- [x, y, x + width, y + height], outline=color, width=2- )-- # Draw reference label- label_text = ref- if font:- bbox = draw.textbbox((0, 0), label_text, font=font)- text_width, text_height = (- bbox[2] - bbox[0],- bbox[3] - bbox[1],- )- else:- text_width, text_height = len(label_text) * 8, 16-- label_x, label_y = max(0, x - 2), max(0, y - text_height - 2)-- # Background and text- draw.rectangle(- [- label_x,- label_y,- label_x + text_width + 4,- label_y + text_height + 2,- ],- fill=color,- )- draw.text(- (label_x + 2, label_y + 1),- label_text,- fill="white",- font=font,- )-- return marked_image-- def _format_snapshot_from_analysis(- self, analysis_data: Dict[str, Any]- ) -> str:- r"""Format analysis data into snapshot string."""- lines = []- elements = analysis_data.get("elements", {})-- for ref, element_data in elements.items():- role = element_data.get("role", "generic")- name = element_data.get("name", "")-- line = f"- {role}"- if name:- line += f' "{name}"'-- # Add properties- props = []- for prop in ["disabled", "checked", "expanded"]:- value = element_data.get(prop)- if value is True:- props.append(prop)- elif value is not None and prop in ["checked", "expanded"]:- props.append(f"{prop}={value}")-- if props:- line += f" {' '.join(props)}"-- line += f" [ref={ref}]"- lines.append(line)-- return "\n".join(lines)-- async def _get_tab_info_for_output(self) -> Dict[str, Any]:- r"""Get tab information to include in action outputs."""- try:- # Ensure we have the correct singleton session instance first- session = await self._get_session()-- # Add debug info for tab info retrieval- logger.debug("Attempting to get tab info from session...")- tab_info = await session.get_tab_info()- current_tab_index = await session.get_current_tab_id()-- # Debug log the successful retrieval- logger.debug(- f"Successfully retrieved {len(tab_info)} tabs, current: "- f"{current_tab_index}"- )-- return {- "tabs": tab_info,- "current_tab": current_tab_index,- "total_tabs": len(tab_info),- }- except Exception as e:- logger.warning(- f"Failed to get tab info from session: {type(e).__name__}: {e}"- )-- # Try to get actual tab count from session pages directly- try:- # Get the correct session instance for fallback- fallback_session = await self._get_session()-- # Check browser session state- session_state = {- "has_session": fallback_session is not None,- "has_pages_attr": hasattr(fallback_session, '_pages'),- "pages_count": len(fallback_session._pages)- if hasattr(fallback_session, '_pages')- else "unknown",- "has_page": hasattr(fallback_session, '_page')- and fallback_session._page is not None,- "session_id": getattr(- fallback_session, '_session_id', 'unknown'- ),- }- logger.debug(f"Browser session state: {session_state}")-- actual_tab_count = 0- if (- hasattr(fallback_session, '_pages')- and fallback_session._pages- ):- actual_tab_count = len(fallback_session._pages)- # Also try to filter out closed pages- try:- open_pages = [- p- for p in fallback_session._pages.values()- if not p.is_closed()- ]- actual_tab_count = len(open_pages)- logger.debug(- f"Found {actual_tab_count} open tabs out of "- f"{len(fallback_session._pages)} total"- )- except Exception:- # Keep the original count if we can't check page status- pass-- if actual_tab_count == 0:- # If no pages, check if browser is even initialized- if (- hasattr(fallback_session, '_page')- and fallback_session._page is not None- ):- actual_tab_count = 1- logger.debug(- "No pages in list but main page exists, assuming "- "1 tab"- )- else:- actual_tab_count = 1- logger.debug("No pages found, defaulting to 1 tab")-- logger.debug(f"Using fallback tab count: {actual_tab_count}")- return {- "tabs": [],- "current_tab": 0,- "total_tabs": actual_tab_count,- }-- except Exception as fallback_error:- logger.warning(- f"Fallback tab count also failed: "- f"{type(fallback_error).__name__}: {fallback_error}"- )- return {"tabs": [], "current_tab": 0, "total_tabs": 1}-- async def _exec_with_snapshot(- self,- action: Dict[str, Any],- element_details: Optional[Dict[str, Any]] = None,- ) -> Dict[str, str]:- r"""Execute action and return result with snapshot comparison."""-- # Log action execution start- action_type = action.get("type", "unknown")- logger.info(f"Executing action: {action_type}")-- action_start_time = time.time()- inputs: Dict[str, Any] = {"action": action}- page_load_time = None-- try:- # Get before snapshot- logger.info("Capturing pre-action snapshot...")- snapshot_start_before = time.time()- before_snapshot = await self._session.get_snapshot(- force_refresh=True, diff_only=False- )- before_snapshot_time = time.time() - snapshot_start_before- logger.info(- f"Pre-action snapshot captured in {before_snapshot_time:.2f}s"- )-- # Execute action- logger.info(f"Executing {action_type} action...")- exec_start = time.time()- exec_result = await self._session.exec_action(action)- exec_time = time.time() - exec_start- logger.info(f"Action {action_type} completed in {exec_time:.2f}s")-- # Parse the detailed result from ActionExecutor- if isinstance(exec_result, dict):- result_message = exec_result.get("message", str(exec_result))- action_details = exec_result.get("details", {})- success = exec_result.get("success", True)- else:- result_message = str(exec_result)- action_details = {}- success = True-- # Wait for page stability after action (especially important for- # click)- stability_time: float = 0.0- if action_type in ["click", "type", "select", "enter"]:- logger.info(- f"Waiting for page stability " f"after {action_type}..."- )- stability_start = time.time()- await self._wait_for_page_stability()- stability_time = time.time() - stability_start- logger.info(- f"Page stability wait "- f"completed in "- f"{stability_time:.2f}s"- )- page_load_time = stability_time-- # Enhanced logging for page loading times- if self.enable_page_loading_logging and self.log_to_console:- logger.info(- f"[PAGE LOADING] Page stability for {action_type}: "- f"{round(stability_time * 1000, 2)}ms"- )-- # Get after snapshot- logger.info("Capturing post-action snapshot...")- snapshot_start_after = time.time()- after_snapshot = await self._session.get_snapshot(- force_refresh=True, diff_only=False- )- after_snapshot_time = time.time() - snapshot_start_after- logger.info(- f"Post-action snapshot "- f"captured in {after_snapshot_time:.2f}s"- )-- # Check for snapshot quality and log warnings- if before_snapshot == after_snapshot:- snapshot = "snapshot not changed"- logger.debug("Page snapshot unchanged after action")- else:- snapshot = after_snapshot- # Check if snapshot is empty or problematic- if "<empty>" in after_snapshot:- logger.warning(- f"Action {action_type} resulted "- f"in empty snapshot - "- f"page may still be loading"- )- elif len(after_snapshot.strip()) < 50:- logger.warning(- f"Action {action_type} resulted "- f"in very short snapshot:"- f" {len(after_snapshot)} chars"- )- else:- logger.debug(- f"Action {action_type} resulted "- f"in updated snapshot: "- f"{len(after_snapshot)} chars"- )-- # Get tab information for output- tab_info = await self._get_tab_info_for_output()-- # Create comprehensive output for logging- execution_time = time.time() - action_start_time- total_snapshot_time = before_snapshot_time + after_snapshot_time- outputs = {- "result": result_message,- "snapshot": snapshot,- "success": success,- "action_details": action_details,- "execution_stats": {- "exec_time_ms": round(exec_time * 1000, 2),- "stability_time_ms": round(stability_time * 1000, 2)- if stability_time > 0- else None,- "snapshot_time_ms": round(total_snapshot_time * 1000, 2),- "total_time_ms": round(execution_time * 1000, 2),- },- **tab_info, # Include tab information- }-- # If snapshot is unchanged after click, add element details to log- if (- snapshot == "snapshot not changed"- and action_type == "click"- and element_details- ):- logger.debug(- "Snapshot unchanged after click. "- "Adding element details to log."- )- outputs["clicked_element_tag"] = element_details.get(- "tagName", "N/A"- )- outputs["clicked_element_content"] = element_details.get(- "name", ""- )- outputs["clicked_element_type"] = element_details.get(- "role", "generic"- )-- # Log the action with all details- await self._log_action(- action_name=f"_exec_with_snapshot_{action_type}",- inputs=inputs,- outputs=outputs,- execution_time=execution_time,- page_load_time=page_load_time,- )-- return {"result": result_message, "snapshot": snapshot}-- except Exception as e:- execution_time = time.time() - action_start_time- error_msg = f"{type(e).__name__}: {e!s}"-- # Log error- await self._log_action(- action_name=f"_exec_with_snapshot_{action_type}",- inputs=inputs,- outputs=None,- execution_time=execution_time,- page_load_time=page_load_time,- error=error_msg,- )-- raise-- async def _extract_links_by_refs(- self, snapshot: str, page, refs: List[str]- ) -> List[Dict[str, str]]:- r"""Extract multiple links by their reference IDs."""- import re-- found_links = []- ref_set = set(refs)- lines = snapshot.split('\n')-- for line in lines:- link_match = re.search(- r'- link\s+"([^"]+)"\s+\[ref=([^\]]+)\]', line- )- if link_match and link_match.group(2) in ref_set:- text, found_ref = link_match.groups()- try:- url = await self._get_link_url_by_ref(page, found_ref)- found_links.append(- {"text": text, "ref": found_ref, "url": url or ""}- )- except Exception as e:- logger.warning(- f"Failed to get URL for ref {found_ref}: {e}"- )- found_links.append(- {"text": text, "ref": found_ref, "url": ""}- )-- return found_links+ @property+ def web_agent_model(self) -> Optional[BaseModelBackend]:+ """Get the web agent model."""+ return self._web_agent_model- async def _get_link_url_by_ref(self, page, ref: str) -> str:- r"""Get URL of a link element by reference ID."""- try:- element = await page.query_selector(f'[aria-ref="{ref}"]')- if element:- href = await element.get_attribute('href')- if href:- from urllib.parse import urljoin-- return urljoin(page.url, href)- return ""- except Exception as e:- logger.warning(f"Failed to get URL for ref {ref}: {e}")- return ""-- def _ensure_agent(self) -> PlaywrightLLMAgent:- r"""Create PlaywrightLLMAgent on first use."""- if self._web_agent_model is None:- raise RuntimeError(- "web_agent_model required for high-level task planning"- )+ @web_agent_model.setter+ def web_agent_model(self, value: Optional[BaseModelBackend]) -> None:+ """Set the web agent model."""+ self._web_agent_model = value- if self._agent is None:- self._agent = PlaywrightLLMAgent(- headless=self._headless,- user_data_dir=self._user_data_dir,- model_backend=self._web_agent_model,- )- return self._agent+ @property+ def cache_dir(self) -> str:+ """Get the cache directory."""+ return self._cache_dir# Public API Methods- async def open_browser(self) -> Dict[str, Any]:+ async def browser_open(self) -> Dict[str, Any]:r"""Starts a new browser session. This must be the first browseraction.@@ -1103,60 +265,45 @@ class HybridBrowserToolkit(BaseToolkit):Returns:Dict[str, Any]: A dictionary with the result of the action:- "result" (str): Confirmation of the action.- - "snapshot" (str): A textual snapshot of interactive elements.+ - "snapshot" (str): A textual snapshot of interactive+ elements.- "tabs" (List[Dict]): Information about all open tabs.- "current_tab" (int): Index of the active tab.- "total_tabs" (int): Total number of open tabs."""- # Add logging if enabled- action_start = time.time()- inputs: Dict[str, Any] = {} # No input parameters for agents-- logger.info("Starting browser session...")-- browser_start = time.time()- await self._session.ensure_browser()- browser_time = time.time() - browser_start- logger.info(f"Browser session started in {browser_time:.2f}s")-try:- # Always use the configured default start URL- start_url = self._default_start_url- logger.info(f"Navigating to configured default page: {start_url}")-- # Use visit_page without creating a new tab- result = await self.visit_page(start_url)-- # Log success- if self.enable_action_logging or self.enable_timing_logging:- execution_time = time.time() - action_start- await self._log_action(- action_name="open_browser",- inputs=inputs,- outputs={- "result": "Browser opened and navigated to "- "default page."- },- execution_time=execution_time,- )+ ws_wrapper = await self._get_ws_wrapper()+ result = await ws_wrapper.open_browser(self._default_start_url)++ # Add tab information+ tab_info = await ws_wrapper.get_tab_info()+ result.update(+ {+ "tabs": tab_info,+ "current_tab": next(+ (+ i+ for i, tab in enumerate(tab_info)+ if tab.get("is_current")+ ),+ 0,+ ),+ "total_tabs": len(tab_info),+ }+ )return result-except Exception as e:- # Log error- if self.enable_action_logging or self.enable_timing_logging:- execution_time = time.time() - action_start- await self._log_action(- action_name="open_browser",- inputs=inputs,- outputs=None,- execution_time=execution_time,- error=f"{type(e).__name__}: {e!s}",- )- raise+ logger.error(f"Failed to open browser: {e}")+ return {+ "result": f"Error opening browser: {e}",+ "snapshot": "",+ "tabs": [],+ "current_tab": 0,+ "total_tabs": 0,+ }- @action_logger- async def close_browser(self) -> str:+ async def browser_close(self) -> str:r"""Closes the browser session, releasing all resources.This should be called at the end of a task for cleanup.@@ -1164,18 +311,16 @@ class HybridBrowserToolkit(BaseToolkit):Returns:str: A confirmation message."""- if self._agent is not None:- try:- await self._agent.close()- except Exception:- pass- self._agent = None-- await self._session.close()- return "Browser session closed."+ try:+ if self._ws_wrapper:+ await self._ws_wrapper.stop()+ self._ws_wrapper = None+ return "Browser session closed."+ except Exception as e:+ logger.error(f"Failed to close browser: {e}")+ return f"Error closing browser: {e}"- @action_logger- async def visit_page(self, url: str) -> Dict[str, Any]:+ async def browser_visit_page(self, url: str) -> Dict[str, Any]:r"""Opens a URL in a new browser tab and switches to it.Args:@@ -1190,70 +335,39 @@ class HybridBrowserToolkit(BaseToolkit):- "current_tab" (int): Index of the new active tab.- "total_tabs" (int): Total number of open tabs."""- if not url or not isinstance(url, str):+ try:+ ws_wrapper = await self._get_ws_wrapper()+ result = await ws_wrapper.visit_page(url)++ # Add tab information+ tab_info = await ws_wrapper.get_tab_info()+ result.update(+ {+ "tabs": tab_info,+ "current_tab": next(+ (+ i+ for i, tab in enumerate(tab_info)+ if tab.get("is_current")+ ),+ 0,+ ),+ "total_tabs": len(tab_info),+ }+ )++ return result+ except Exception as e:+ logger.error(f"Failed to visit page: {e}")return {- "result": "Error: 'url' must be a non-empty string",+ "result": f"Error visiting page: {e}","snapshot": "","tabs": [],"current_tab": 0,- "total_tabs": 1,+ "total_tabs": 0,}- if '://' not in url:- url = f'https://{url}'-- await self._ensure_browser()- session = await self._get_session()- nav_result = ""-- # By default, we want to create a new tab.- should_create_new_tab = True- try:- # If the browser has just started with a single "about:blank" tab,- # use that tab instead of creating a new one.- tab_info_data = await self._get_tab_info_for_output()- tabs = tab_info_data.get("tabs", [])- if len(tabs) == 1 and tabs[0].get("url") == "about:blank":- logger.info(- "Found single blank tab, navigating in current tab "- "instead of creating a new one."- )- should_create_new_tab = False- except Exception as e:- logger.warning(- "Could not get tab info to check for blank tab, "- f"proceeding with default behavior (new tab). Error: {e}"- )-- if should_create_new_tab:- logger.info(f"Creating new tab and navigating to URL: {url}")- try:- new_tab_id = await session.create_new_tab(url)- await session.switch_to_tab(new_tab_id)- nav_result = f"Visited {url} in new tab {new_tab_id}"- except Exception as e:- logger.error(f"Failed to create new tab and navigate: {e}")- nav_result = f"Error creating new tab: {e}"- else:- logger.info(f"Navigating to URL in current tab: {url}")- nav_result = await session.visit(url)-- # Get snapshot- snapshot = ""- try:- snapshot = await session.get_snapshot(- force_refresh=True, diff_only=False- )- except Exception as e:- logger.warning(f"Failed to capture snapshot: {e}")-- # Get tab information- tab_info = await self._get_tab_info_for_output()-- return {"result": nav_result, "snapshot": snapshot, **tab_info}-- @action_logger- async def back(self) -> Dict[str, Any]:+ async def browser_back(self) -> Dict[str, Any]:r"""Goes back to the previous page in the browser history.This action simulates using the browser's "back" button in the@@ -1267,57 +381,39 @@ class HybridBrowserToolkit(BaseToolkit):- "current_tab" (int): Index of the active tab.- "total_tabs" (int): Total number of open tabs."""- page = await self._require_page()-try:- logger.info("Navigating back in browser history...")- nav_start = time.time()- await page.go_back(- wait_until="domcontentloaded", timeout=self._navigation_timeout- )- nav_time = time.time() - nav_start- logger.info(f"Back navigation completed in {nav_time:.2f}s")-- # Minimal wait for page stability (back navigation is usually fast)- import asyncio-- await asyncio.sleep(0.2)-- # Get snapshot- logger.info("Capturing page snapshot after back navigation...")- snapshot_start = time.time()- snapshot = await self._session.get_snapshot(- force_refresh=True, diff_only=False- )- snapshot_time = time.time() - snapshot_start- logger.info(- f"Back navigation snapshot captured in {snapshot_time:.2f}s"+ ws_wrapper = await self._get_ws_wrapper()+ result = await ws_wrapper.back()++ # Add tab information+ tab_info = await ws_wrapper.get_tab_info()+ result.update(+ {+ "tabs": tab_info,+ "current_tab": next(+ (+ i+ for i, tab in enumerate(tab_info)+ if tab.get("is_current")+ ),+ 0,+ ),+ "total_tabs": len(tab_info),+ })- # Get tab information- tab_info = await self._get_tab_info_for_output()-- return {- "result": "Back navigation successful.",- "snapshot": snapshot,- **tab_info,- }-+ return resultexcept Exception as e:- logger.warning(f"Back navigation failed: {e}")- # Get current snapshot even if navigation failed- snapshot = await self._session.get_snapshot(- force_refresh=True, diff_only=False- )- tab_info = await self._get_tab_info_for_output()+ logger.error(f"Failed to navigate back: {e}")return {- "result": f"Back navigation failed: {e!s}",- "snapshot": snapshot,- **tab_info,+ "result": f"Error navigating back: {e}",+ "snapshot": "",+ "tabs": [],+ "current_tab": 0,+ "total_tabs": 0,}- @action_logger- async def forward(self) -> Dict[str, Any]:+ async def browser_forward(self) -> Dict[str, Any]:r"""Goes forward to the next page in the browser history.This action simulates using the browser's "forward" button in the@@ -1331,164 +427,192 @@ class HybridBrowserToolkit(BaseToolkit):- "current_tab" (int): Index of the active tab.- "total_tabs" (int): Total number of open tabs."""- page = await self._require_page()-try:- logger.info("Navigating forward in browser history...")- nav_start = time.time()- await page.go_forward(- wait_until="domcontentloaded", timeout=self._navigation_timeout- )- nav_time = time.time() - nav_start- logger.info(f"Forward navigation completed in {nav_time:.2f}s")-- # Minimal wait for page stability (forward navigation is usually- # fast)- import asyncio-- await asyncio.sleep(0.2)-- # Get snapshot- logger.info("Capturing page snapshot after forward navigation...")- snapshot_start = time.time()- snapshot = await self._session.get_snapshot(- force_refresh=True, diff_only=False- )- snapshot_time = time.time() - snapshot_start- logger.info(- f"Forward navigation snapshot captured in {snapshot_time:.2f}s"+ ws_wrapper = await self._get_ws_wrapper()+ result = await ws_wrapper.forward()++ # Add tab information+ tab_info = await ws_wrapper.get_tab_info()+ result.update(+ {+ "tabs": tab_info,+ "current_tab": next(+ (+ i+ for i, tab in enumerate(tab_info)+ if tab.get("is_current")+ ),+ 0,+ ),+ "total_tabs": len(tab_info),+ })- # Get tab information- tab_info = await self._get_tab_info_for_output()-- return {- "result": "Forward navigation successful.",- "snapshot": snapshot,- **tab_info,- }-+ return resultexcept Exception as e:- logger.warning(f"Forward navigation failed: {e}")- # Get current snapshot even if navigation failed- snapshot = await self._session.get_snapshot(- force_refresh=True, diff_only=False- )- tab_info = await self._get_tab_info_for_output()+ logger.error(f"Failed to navigate forward: {e}")return {- "result": f"Forward navigation failed: {e!s}",- "snapshot": snapshot,- **tab_info,+ "result": f"Error navigating forward: {e}",+ "snapshot": "",+ "tabs": [],+ "current_tab": 0,+ "total_tabs": 0,}- @action_logger- async def get_page_snapshot(self) -> str:+ async def browser_get_page_snapshot(self) -> str:r"""Gets a textual snapshot of the page's interactive elements.- The snapshot lists elements like buttons, links, and inputs, each with+ The snapshot lists elements like buttons, links, and inputs,+ each witha unique `ref` ID. This ID is used by other tools (e.g., `click`,`type`) to interact with a specific element. This tool provides novisual information.+ If viewport_limit is enabled, only elements within the current+ viewport+ will be included in the snapshot.+Returns:str: A formatted string representing the interactive elements andtheir `ref` IDs. For example:'- link "Sign In" [ref=1]''- textbox "Username" [ref=2]'"""- logger.info("Capturing page snapshot")-- analysis_start = time.time()- analysis_data = await self._get_unified_analysis()- analysis_time = time.time() - analysis_start- logger.info(- f"Page snapshot analysis " f"completed in {analysis_time:.2f}s"- )-- snapshot_text = analysis_data.get("snapshotText", "")- return (- snapshot_text- if snapshot_text- else self._format_snapshot_from_analysis(analysis_data)- )+ try:+ ws_wrapper = await self._get_ws_wrapper()+ return await ws_wrapper.get_page_snapshot(self._viewport_limit)+ except Exception as e:+ logger.error(f"Failed to get page snapshot: {e}")+ return f"Error capturing snapshot: {e}"@dependencies_required('PIL')- @action_logger- async def get_som_screenshot(self):+ async def browser_get_som_screenshot(+ self,+ read_image: bool = False,+ instruction: Optional[str] = None,+ ) -> str:r"""Captures a screenshot with interactive elements highlighted.- "SoM" stands for "Set of Marks". This tool takes a screenshot and draws+ "SoM" stands for "Set of Marks". This tool takes a screenshot and+ drawsboxes around clickable elements, overlaying a `ref` ID on each. Usethis for a visual understanding of the page, especially when thetextual snapshot is not enough.+ Args:+ read_image (bool, optional): If `True`, the agent will analyze+ the screenshot. Requires agent to be registered.+ (default: :obj:`False`)+ instruction (Optional[str], optional): A specific question or+ command for the agent regarding the screenshot, used only if+ `read_image` is `True`. For example: "Find the login button."+Returns:- ToolResult: An object containing:- - `text` (str): A summary, e.g., "Visual webpage screenshot- captured with 42 interactive elements".- - `images` (List[str]): A list containing one base64-encoded- PNG image data URL.+ str: A confirmation message indicating the screenshot was+ captured,+ the file path where it was saved, and optionally the agent's+ analysis if `read_image` is `True`."""- from PIL import Image+ import base64+ import datetime+ import os+ import urllib.parse- from camel.utils.tool_result import ToolResult+ from camel.utils import sanitize_filename- os.makedirs(self._cache_dir, exist_ok=True)- # Get screenshot and analysis- page = await self._require_page()+ try:+ ws_wrapper = await self._get_ws_wrapper()+ result = await ws_wrapper.get_som_screenshot()- # Log screenshot timeout start- logger.info(- f"Starting screenshot capture"- f"with timeout: {self._screenshot_timeout}ms"- )+ # Initialize result text+ result_text = result.text+ file_path = None- start_time = time.time()- image_data = await page.screenshot(timeout=self._screenshot_timeout)- screenshot_time = time.time() - start_time-- logger.info(f"Screenshot capture completed in {screenshot_time:.2f}s")- image = Image.open(io.BytesIO(image_data))-- # Log unified analysis start- logger.info("Starting unified page analysis...")- analysis_start_time = time.time()- analysis_data = await self._get_unified_analysis()- analysis_time = time.time() - analysis_start_time- logger.info(f"Unified page analysis completed in {analysis_time:.2f}s")-- # Log image processing- logger.info("Processing visual marks on screenshot...")- mark_start_time = time.time()- rects = self._convert_analysis_to_rects(analysis_data)- marked_image = self._add_set_of_mark(image, rects)- mark_time = time.time() - mark_start_time- logger.info(f"Visual marks processing completed in {mark_time:.2f}s")-- # Save screenshot to cache directory- parsed_url = urllib.parse.urlparse(page.url)- url_name = sanitize_filename(str(parsed_url.path), max_length=241)- timestamp = datetime.datetime.now().strftime("%m%d%H%M%S")- file_path = os.path.join(- self._cache_dir, f"{url_name}_{timestamp}_som.png"- )- marked_image.save(file_path, "PNG")-- # Convert to base64- img_buffer = io.BytesIO()- marked_image.save(img_buffer, format="PNG")- img_buffer.seek(0)- img_base64 = base64.b64encode(img_buffer.getvalue()).decode('utf-8')- img_data_url = f"data:image/png;base64,{img_base64}"-- text_result = (- f"Visual webpage screenshot "- f"captured with {len(rects)} interactive elements"- )+ # Save screenshot to cache directory if images are available+ if result.images:+ # Ensure cache directory exists (use absolute path)+ cache_dir = os.path.abspath(self._cache_dir)+ os.makedirs(cache_dir, exist_ok=True)++ # Get current page URL for filename+ try:+ # Try to get the current page URL from the wrapper+ page_info = await ws_wrapper.get_tab_info()+ current_tab = next(+ (tab for tab in page_info if tab.get('is_current')),+ None,+ )+ url = current_tab['url'] if current_tab else 'unknown'+ except Exception:+ url = 'unknown'++ # Generate filename+ parsed_url = urllib.parse.urlparse(url)+ url_name = sanitize_filename(+ str(parsed_url.path) or 'homepage', max_length=241+ )+ timestamp = datetime.datetime.now().strftime("%m%d%H%M%S")+ file_path = os.path.join(+ cache_dir, f"{url_name}_{timestamp}_som.png"+ )++ # Extract base64 data and save to file+ for _, image_data in enumerate(result.images):+ if image_data.startswith('data:image/png;base64,'):+ # Remove data URL prefix+ base64_data = image_data.split(',', 1)[1]++ # Decode and save+ image_bytes = base64.b64decode(base64_data)+ with open(file_path, 'wb') as f:+ f.write(image_bytes)++ logger.info(f"Screenshot saved to: {file_path}")++ # Update result text to include file path+ result_text += f" (saved to: {file_path})"+ break++ # Analyze image if requested and agent is registered+ if read_image and file_path:+ if self.agent is None:+ logger.error(+ "Cannot analyze screenshot: No agent registered. "+ "Please pass this toolkit to ChatAgent via "+ "toolkits_to_register_agent parameter."+ )+ result_text += (+ " Error: No agent registered for image analysis. "+ "Please pass this toolkit to ChatAgent via "+ "toolkits_to_register_agent parameter."+ )+ else:+ try:+ # Load the image and create a message+ from PIL import Image++ img = Image.open(file_path)+ inst = instruction if instruction is not None else ""+ message = BaseMessage.make_user_message(+ role_name="User",+ content=inst,+ image_list=[img],+ )- return ToolResult(text=text_result, images=[img_data_url])+ # Get agent's analysis+ response = await self.agent.astep(message)+ agent_response = response.msgs[0].content+ result_text += f". Agent analysis: {agent_response}"+ except Exception as e:+ logger.error(f"Error analyzing screenshot: {e}")+ result_text += f". Error analyzing screenshot: {e}"- async def click(self, *, ref: str) -> Dict[str, Any]:+ return result_text+ except Exception as e:+ logger.error(f"Failed to get screenshot: {e}")+ return f"Error capturing screenshot: {e}"++ async def browser_click(self, *, ref: str) -> Dict[str, Any]:r"""Performs a click on an element on the page.Args:@@ -1505,155 +629,379 @@ class HybridBrowserToolkit(BaseToolkit):- "current_tab" (int): Index of the active tab.- "total_tabs" (int): Total number of open tabs."""- self._validate_ref(ref, "click")-- analysis = await self._get_unified_analysis()- elements = analysis.get("elements", {})- if ref not in elements:- logger.error(f"Error: Element reference '{ref}' not found. ")- # Added snapshot to give more context on failure- snapshot = self._format_snapshot_from_analysis(analysis)- tab_info = await self._get_tab_info_for_output()+ try:+ ws_wrapper = await self._get_ws_wrapper()+ result = await ws_wrapper.click(ref)++ # Add tab information+ tab_info = await ws_wrapper.get_tab_info()+ result.update(+ {+ "tabs": tab_info,+ "current_tab": next(+ (+ i+ for i, tab in enumerate(tab_info)+ if tab.get("is_current")+ ),+ 0,+ ),+ "total_tabs": len(tab_info),+ }+ )++ return result+ except Exception as e:+ logger.error(f"Failed to click element: {e}")return {- "result": f"Error: Element reference '{ref}' not found. ",- "snapshot": snapshot,- **tab_info,+ "result": f"Error clicking element: {e}",+ "snapshot": "",+ "tabs": [],+ "current_tab": 0,+ "total_tabs": 0,}- element_details = elements.get(ref)- action = {"type": "click", "ref": ref}- result = await self._exec_with_snapshot(- action, element_details=element_details- )+ async def browser_type(self, *, ref: str, text: str) -> Dict[str, Any]:+ r"""Types text into an input element on the page.++ Args:+ ref (str): The `ref` ID of the input element, from a snapshot.+ text (str): The text to type into the element.++ Returns:+ Dict[str, Any]: A dictionary with the result of the action:+ - "result" (str): Confirmation of the action.+ - "snapshot" (str): A textual snapshot of the page after+ typing.+ - "tabs" (List[Dict]): Information about all open tabs.+ - "current_tab" (int): Index of the active tab.+ - "total_tabs" (int): Total number of open tabs.+ """+ try:+ ws_wrapper = await self._get_ws_wrapper()+ result = await ws_wrapper.type(ref, text)++ # Add tab information+ tab_info = await ws_wrapper.get_tab_info()+ result.update(+ {+ "tabs": tab_info,+ "current_tab": next(+ (+ i+ for i, tab in enumerate(tab_info)+ if tab.get("is_current")+ ),+ 0,+ ),+ "total_tabs": len(tab_info),+ }+ )++ return result+ except Exception as e:+ logger.error(f"Failed to type text: {e}")+ return {+ "result": f"Error typing text: {e}",+ "snapshot": "",+ "tabs": [],+ "current_tab": 0,+ "total_tabs": 0,+ }++ async def browser_select(self, *, ref: str, value: str) -> Dict[str, Any]:+ r"""Selects an option in a dropdown (`<select>`) element.++ Args:+ ref (str): The `ref` ID of the `<select>` element.+ value (str): The `value` attribute of the `<option>` to select,+ not its visible text.- # Add tab information to the result- tab_info = await self._get_tab_info_for_output()- result.update(tab_info)+ Returns:+ Dict[str, Any]: A dictionary with the result of the action:+ - "result" (str): Confirmation of the action.+ - "snapshot" (str): A snapshot of the page after the+ selection.+ - "tabs" (List[Dict]): Information about all open tabs.+ - "current_tab" (int): Index of the active tab.+ - "total_tabs" (int): Total number of open tabs.+ """+ try:+ ws_wrapper = await self._get_ws_wrapper()+ result = await ws_wrapper.select(ref, value)++ # Add tab information+ tab_info = await ws_wrapper.get_tab_info()+ result.update(+ {+ "tabs": tab_info,+ "current_tab": next(+ (+ i+ for i, tab in enumerate(tab_info)+ if tab.get("is_current")+ ),+ 0,+ ),+ "total_tabs": len(tab_info),+ }+ )- return result+ return result+ except Exception as e:+ logger.error(f"Failed to select option: {e}")+ return {+ "result": f"Error selecting option: {e}",+ "snapshot": "",+ "tabs": [],+ "current_tab": 0,+ "total_tabs": 0,+ }++ async def browser_scroll(+ self, *, direction: str, amount: int = 500+ ) -> Dict[str, Any]:+ r"""Scrolls the current page window.++ Args:+ direction (str): The direction to scroll: 'up' or 'down'.+ amount (int): The number of pixels to scroll, default is 500.++ Returns:+ Dict[str, Any]: A dictionary with the result of the action:+ - "result" (str): Confirmation of the action.+ - "snapshot" (str): A snapshot of the page after scrolling.+ - "tabs" (List[Dict]): Information about all open tabs.+ - "current_tab" (int): Index of the active tab.+ - "total_tabs" (int): Total number of open tabs.+ """+ try:+ ws_wrapper = await self._get_ws_wrapper()+ result = await ws_wrapper.scroll(direction, amount)++ # Add tab information+ tab_info = await ws_wrapper.get_tab_info()+ result.update(+ {+ "tabs": tab_info,+ "current_tab": next(+ (+ i+ for i, tab in enumerate(tab_info)+ if tab.get("is_current")+ ),+ 0,+ ),+ "total_tabs": len(tab_info),+ }+ )++ return result+ except Exception as e:+ logger.error(f"Failed to scroll: {e}")+ return {+ "result": f"Error scrolling: {e}",+ "snapshot": "",+ "tabs": [],+ "current_tab": 0,+ "total_tabs": 0,+ }- async def type(self, *, ref: str, text: str) -> Dict[str, Any]:- r"""Types text into an input element on the page.+ async def browser_enter(self) -> Dict[str, Any]:+ r"""Simulates pressing the Enter key on the currently focused+ element.- Args:- ref (str): The `ref` ID of the input element, from a snapshot.- text (str): The text to type into the element.+ This is useful for submitting forms or search queries after using the+ `type` tool.Returns:Dict[str, Any]: A dictionary with the result of the action:- "result" (str): Confirmation of the action.- - "snapshot" (str): A textual snapshot of the page after- typing.+ - "snapshot" (str): A new page snapshot, as this action often+ triggers navigation.- "tabs" (List[Dict]): Information about all open tabs.- "current_tab" (int): Index of the active tab.- "total_tabs" (int): Total number of open tabs."""- self._validate_ref(ref, "type")- await self._get_unified_analysis() # Ensure aria-ref attributes-- action = {"type": "type", "ref": ref, "text": text}- result = await self._exec_with_snapshot(action)+ try:+ ws_wrapper = await self._get_ws_wrapper()+ result = await ws_wrapper.enter()++ # Add tab information+ tab_info = await ws_wrapper.get_tab_info()+ result.update(+ {+ "tabs": tab_info,+ "current_tab": next(+ (+ i+ for i, tab in enumerate(tab_info)+ if tab.get("is_current")+ ),+ 0,+ ),+ "total_tabs": len(tab_info),+ }+ )- # Add tab information to the result- tab_info = await self._get_tab_info_for_output()- result.update(tab_info)+ return result+ except Exception as e:+ logger.error(f"Failed to press enter: {e}")+ return {+ "result": f"Error pressing enter: {e}",+ "snapshot": "",+ "tabs": [],+ "current_tab": 0,+ "total_tabs": 0,+ }- return result+ async def browser_switch_tab(self, *, tab_id: str) -> Dict[str, Any]:+ r"""Switches to a different browser tab using its ID.- async def select(self, *, ref: str, value: str) -> Dict[str, Any]:- r"""Selects an option in a dropdown (`<select>`) element.+ After switching, all actions will apply to the new tab. Use+ `get_tab_info` to find the ID of the tab you want to switch to.Args:- ref (str): The `ref` ID of the `<select>` element.- value (str): The `value` attribute of the `<option>` to select,- not its visible text.+ tab_id (str): The ID of the tab to activate.Returns:Dict[str, Any]: A dictionary with the result of the action:- "result" (str): Confirmation of the action.- - "snapshot" (str): A snapshot of the page after the- selection.+ - "snapshot" (str): A snapshot of the newly active tab.- "tabs" (List[Dict]): Information about all open tabs.- - "current_tab" (int): Index of the active tab.+ - "current_tab" (int): Index of the new active tab.- "total_tabs" (int): Total number of open tabs."""- self._validate_ref(ref, "select")- await self._get_unified_analysis()-- action = {"type": "select", "ref": ref, "value": value}- result = await self._exec_with_snapshot(action)+ try:+ ws_wrapper = await self._get_ws_wrapper()+ result = await ws_wrapper.switch_tab(tab_id)++ # Add tab information+ tab_info = await ws_wrapper.get_tab_info()+ result.update(+ {+ "tabs": tab_info,+ "current_tab": next(+ (+ i+ for i, tab in enumerate(tab_info)+ if tab.get("is_current")+ ),+ 0,+ ),+ "total_tabs": len(tab_info),+ }+ )- # Add tab information to the result- tab_info = await self._get_tab_info_for_output()- result.update(tab_info)+ return result+ except Exception as e:+ logger.error(f"Failed to switch tab: {e}")+ return {+ "result": f"Error switching tab: {e}",+ "snapshot": "",+ "tabs": [],+ "current_tab": 0,+ "total_tabs": 0,+ }- return result+ async def browser_close_tab(self, *, tab_id: str) -> Dict[str, Any]:+ r"""Closes a browser tab using its ID.- async def scroll(self, *, direction: str, amount: int) -> Dict[str, Any]:- r"""Scrolls the current page window.+ Use `get_tab_info` to find the ID of the tab to close. After+ closing, the browser will switch to another tab if available.Args:- direction (str): The direction to scroll: 'up' or 'down'.- amount (int): The number of pixels to scroll.+ tab_id (str): The ID of the tab to close.Returns:Dict[str, Any]: A dictionary with the result of the action:- "result" (str): Confirmation of the action.- - "snapshot" (str): A snapshot of the page after scrolling.- - "tabs" (List[Dict]): Information about all open tabs.- - "current_tab" (int): Index of the active tab.- - "total_tabs" (int): Total number of open tabs.+ - "snapshot" (str): A snapshot of the active tab after+ closure.+ - "tabs" (List[Dict]): Information about remaining tabs.+ - "current_tab" (int): Index of the new active tab.+ - "total_tabs" (int): Total number of remaining tabs."""- if direction not in ("up", "down"):- tab_info = await self._get_tab_info_for_output()+ try:+ ws_wrapper = await self._get_ws_wrapper()+ result = await ws_wrapper.close_tab(tab_id)++ # Add tab information+ tab_info = await ws_wrapper.get_tab_info()+ result.update(+ {+ "tabs": tab_info,+ "current_tab": next(+ (+ i+ for i, tab in enumerate(tab_info)+ if tab.get("is_current")+ ),+ 0,+ ),+ "total_tabs": len(tab_info),+ }+ )++ return result+ except Exception as e:+ logger.error(f"Failed to close tab: {e}")return {- "result": "Error: direction must be 'up' or 'down'",+ "result": f"Error closing tab: {e}","snapshot": "",- **tab_info,+ "tabs": [],+ "current_tab": 0,+ "total_tabs": 0,}- action = {"type": "scroll", "direction": direction, "amount": amount}- result = await self._exec_with_snapshot(action)-- # Add tab information to the result- tab_info = await self._get_tab_info_for_output()- result.update(tab_info)-- return result-- async def enter(self) -> Dict[str, Any]:- r"""Simulates pressing the Enter key on the currently focused element.+ async def browser_get_tab_info(self) -> Dict[str, Any]:+ r"""Gets a list of all open browser tabs and their information.- This is useful for submitting forms or search queries after using the- `type` tool.+ This includes each tab's index, title, and URL, and indicates which+ tab is currently active. Use this to manage multiple tabs.Returns:- Dict[str, Any]: A dictionary with the result of the action:- - "result" (str): Confirmation of the action.- - "snapshot" (str): A new page snapshot, as this action often- triggers navigation.- - "tabs" (List[Dict]): Information about all open tabs.+ Dict[str, Any]: A dictionary with tab information:+ - "tabs" (List[Dict]): A list of open tabs, each with:+ - "index" (int): The tab's zero-based index.+ - "title" (str): The page title.+ - "url" (str): The current URL.+ - "is_current" (bool): True if the tab is active.- "current_tab" (int): Index of the active tab.- "total_tabs" (int): Total number of open tabs."""- # Always press Enter on the currently focused element- action = {"type": "enter"}-- result = await self._exec_with_snapshot(action)-- # Add tab information to the result- tab_info = await self._get_tab_info_for_output()- result.update(tab_info)+ try:+ ws_wrapper = await self._get_ws_wrapper()+ tab_info = await ws_wrapper.get_tab_info()- return result+ return {+ "tabs": tab_info,+ "current_tab": next(+ (+ i+ for i, tab in enumerate(tab_info)+ if tab.get("is_current")+ ),+ 0,+ ),+ "total_tabs": len(tab_info),+ }+ except Exception as e:+ logger.error(f"Failed to get tab info: {e}")+ return {+ "tabs": [],+ "current_tab": 0,+ "total_tabs": 0,+ }- @action_logger- async def wait_user(+ # Additional methods for backward compatibility+ async def browser_wait_user(self, timeout_sec: Optional[float] = None) -> Dict[str, Any]:r"""Pauses execution and waits for human input from the console.- Use this for tasks requiring manual steps, like solving a CAPTCHA. The+ Use this for tasks requiring manual steps, like solving a CAPTCHA.+ Theagent will resume after the user presses Enter in the console.Args:@@ -1677,7 +1025,13 @@ class HybridBrowserToolkit(BaseToolkit):logger.info(f"\n{prompt}\n")async def _await_enter():- await asyncio.to_thread(input, ">>> Press Enter to resume <<<\n")+ try:+ await asyncio.to_thread(+ input, ">>> Press Enter to resume <<<\n"+ )+ except (asyncio.CancelledError, Exception):+ # Handle cancellation gracefully+ passtry:if timeout_sec is not None:@@ -1685,178 +1039,48 @@ class HybridBrowserToolkit(BaseToolkit):f"Waiting for user input with timeout: {timeout_sec}s")start_time = time.time()- await asyncio.wait_for(_await_enter(), timeout=timeout_sec)- wait_time = time.time() - start_time- logger.info(f"User input received after {wait_time:.2f}s")- result_msg = "User resumed."+ task = asyncio.create_task(_await_enter())+ try:+ await asyncio.wait_for(task, timeout=timeout_sec)+ wait_time = time.time() - start_time+ logger.info(f"User input received after {wait_time:.2f}s")+ result_msg = "User resumed."+ except asyncio.TimeoutError:+ task.cancel()+ # Wait for task to be cancelled properly+ try:+ await task+ except asyncio.CancelledError:+ pass+ raiseelse:- logger.info("Waiting for user " "input (no timeout)")+ logger.info("Waiting for user input (no timeout)")start_time = time.time()await _await_enter()wait_time = time.time() - start_time- logger.info(f"User input received " f"after {wait_time:.2f}s")+ logger.info(f"User input received after {wait_time:.2f}s")result_msg = "User resumed."except asyncio.TimeoutError:wait_time = timeout_sec or 0.0logger.info(- f"User input timeout reached "- f"after {wait_time}s, auto-resuming"+ f"User input timeout reached after {wait_time}s, "+ f"auto-resuming")result_msg = f"Timeout {timeout_sec}s reached, auto-resumed."- snapshot = await self._session.get_snapshot(- force_refresh=True, diff_only=False- )- tab_info = await self._get_tab_info_for_output()-- return {"result": result_msg, "snapshot": snapshot, **tab_info}-- @action_logger- async def get_page_links(self, *, ref: List[str]) -> Dict[str, Any]:- r"""Gets the destination URLs for a list of link elements.-- This is useful to know where a link goes before clicking it.-- Args:- ref (List[str]): A list of `ref` IDs for link elements, obtained- from a page snapshot.-- Returns:- Dict[str, Any]: A dictionary containing:- - "links" (List[Dict]): A list of found links, where each- link has "text", "ref", and "url" keys.- """- if not ref or not isinstance(ref, list):- return {"links": []}-- for r in ref:- if not r or not isinstance(r, str):- return {"links": []}-- page = await self._require_page()- snapshot = await self._session.get_snapshot(- force_refresh=True, diff_only=False- )- links = await self._extract_links_by_refs(snapshot, page, ref)-- return {"links": links}-- @action_logger- async def solve_task(- self, task_prompt: str, start_url: str, max_steps: int = 15- ) -> str:- r"""Delegates a complex, high-level task to a specialized web agent.-- Use this for multi-step tasks that can be described in a single prompt- (e.g., "log into my account and check for new messages"). The agent- will autonomously perform the necessary browser actions.-- NOTE: This is a high-level action; for simple interactions, use tools- like `click` and `type`. `web_agent_model` must be provided during- toolkit initialization.-- Args:- task_prompt (str): A natural language description of the task.- start_url (str): The URL to start the task from. This should be a- valid and existing URL, as agents may generate non-existent- ones.- max_steps (int): The maximum number of steps the agent can take.-- Returns:- str: A summary message indicating the task has finished.- """- agent = self._ensure_agent()- await agent.navigate(start_url)- await agent.process_command(task_prompt, max_steps=max_steps)- return "Task processing finished - see stdout for detailed trace."-- def get_log_summary(self) -> Dict[str, Any]:- r"""Get a summary of logged actions."""- if not self.log_buffer:- return {"total_actions": 0, "summary": "No actions logged"}-- total_actions = len(self.log_buffer)- total_execution_time = sum(- entry.get("execution_time_ms", 0) for entry in self.log_buffer- )- total_page_load_time = sum(- entry.get("page_load_time_ms", 0)- for entry in self.log_buffer- if "page_load_time_ms" in entry- )-- action_counts: Dict[str, int] = {}- error_count = 0-- for entry in self.log_buffer:- action = entry["action"]- action_counts[action] = action_counts.get(action, 0) + 1- if "error" in entry:- error_count += 1-- return {- "total_actions": total_actions,- "total_execution_time_ms": round(total_execution_time, 2),- "total_page_load_time_ms": round(total_page_load_time, 2),- "action_counts": action_counts,- "error_count": error_count,- "success_rate": round(- (total_actions - error_count) / total_actions * 100, 2- )- if total_actions > 0- else 0,- }-- def clear_logs(self) -> None:- r"""Clear the log buffer."""- self.log_buffer.clear()- logger.info("Log buffer cleared")-- def get_tools(self) -> List[FunctionTool]:- r"""Get available function tools- based on enabled_tools configuration."""- # Map tool names to their corresponding methods- tool_map = {- "open_browser": self.open_browser,- "close_browser": self.close_browser,- "visit_page": self.visit_page,- "back": self.back,- "forward": self.forward,- "get_page_snapshot": self.get_page_snapshot,- "get_som_screenshot": self.get_som_screenshot,- "get_page_links": self.get_page_links,- "click": self.click,- "type": self.type,- "select": self.select,- "scroll": self.scroll,- "enter": self.enter,- "wait_user": self.wait_user,- "solve_task": self.solve_task,- "switch_tab": self.switch_tab,- "close_tab": self.close_tab,- "get_tab_info": self.get_tab_info,- }-- enabled_tools = []-- for tool_name in self.enabled_tools:- if tool_name == "solve_task" and self._web_agent_model is None:- logger.warning(- f"Tool '{tool_name}' is enabled but web_agent_model "- f"is not provided. Skipping this tool."- )- continue-- if tool_name in tool_map:- tool = FunctionTool(- cast(Callable[..., Any], tool_map[tool_name])- )- enabled_tools.append(tool)- else:- logger.warning(f"Unknown tool name: {tool_name}")-- logger.info(f"Returning {len(enabled_tools)} enabled tools")- return enabled_tools+ try:+ snapshot = await self.browser_get_page_snapshot()+ tab_info = await self.browser_get_tab_info()+ return {"result": result_msg, "snapshot": snapshot, **tab_info}+ except Exception as e:+ logger.warning(f"Failed to get snapshot after wait: {e}")+ return {+ "result": result_msg,+ "snapshot": "",+ "tabs": [],+ "current_tab": 0,+ "total_tabs": 0,+ }def clone_for_new_session(self, new_session_id: Optional[str] = None@@ -1882,7 +1106,8 @@ class HybridBrowserToolkit(BaseToolkit):user_data_dir=self._user_data_dir,stealth=self._stealth,web_agent_model=self._web_agent_model,- cache_dir=f"{self._cache_dir.rstrip('/')}_clone_{new_session_id}/",+ cache_dir=f"{self._cache_dir.rstrip('/')}_clone_"+ f"{new_session_id}/",enabled_tools=self.enabled_tools.copy(),browser_log_to_file=self._browser_log_to_file,session_id=new_session_id,@@ -1896,117 +1121,49 @@ class HybridBrowserToolkit(BaseToolkit):dom_content_loaded_timeout=self._dom_content_loaded_timeout,)- @action_logger- async def switch_tab(self, *, tab_id: str) -> Dict[str, Any]:- r"""Switches to a different browser tab using its ID.-- After switching, all actions will apply to the new tab. Use- `get_tab_info` to find the ID of the tab you want to switch to.-- Args:- tab_id (str): The ID of the tab to activate.-- Returns:- Dict[str, Any]: A dictionary with the result of the action:- - "result" (str): Confirmation of the action.- - "snapshot" (str): A snapshot of the newly active tab.- - "tabs" (List[Dict]): Information about all open tabs.- - "current_tab" (int): Index of the new active tab.- - "total_tabs" (int): Total number of open tabs.- """- await self._ensure_browser()- session = await self._get_session()-- success = await session.switch_to_tab(tab_id)-- if success:- snapshot = await session.get_snapshot(- force_refresh=True, diff_only=False- )- tab_info = await self._get_tab_info_for_output()-- result = {- "result": f"Successfully switched to tab {tab_id}",- "snapshot": snapshot,- **tab_info,- }- else:- tab_info = await self._get_tab_info_for_output()- result = {- "result": f"Failed to switch to tab {tab_id}. Tab may not "- f"exist.",- "snapshot": "",- **tab_info,- }-- return result-- @action_logger- async def close_tab(self, *, tab_id: str) -> Dict[str, Any]:- r"""Closes a browser tab using its ID.-- Use `get_tab_info` to find the ID of the tab to close. After- closing, the browser will switch to another tab if available.-- Args:- tab_id (str): The ID of the tab to close.-- Returns:- Dict[str, Any]: A dictionary with the result of the action:- - "result" (str): Confirmation of the action.- - "snapshot" (str): A snapshot of the active tab after closure.- - "tabs" (List[Dict]): Information about remaining tabs.- - "current_tab" (int): Index of the new active tab.- - "total_tabs" (int): Total number of remaining tabs.- """- await self._ensure_browser()- session = await self._get_session()+ def get_tools(self) -> List[FunctionTool]:+ r"""Get available function tools based+ on enabled_tools configuration."""+ # Map tool names to their corresponding methods+ tool_map = {+ "browser_open": self.browser_open,+ "browser_close": self.browser_close,+ "browser_visit_page": self.browser_visit_page,+ "browser_back": self.browser_back,+ "browser_forward": self.browser_forward,+ "browser_get_page_snapshot": self.browser_get_page_snapshot,+ "browser_get_som_screenshot": self.browser_get_som_screenshot,+ "browser_click": self.browser_click,+ "browser_type": self.browser_type,+ "browser_select": self.browser_select,+ "browser_scroll": self.browser_scroll,+ "browser_enter": self.browser_enter,+ "browser_wait_user": self.browser_wait_user,+ "browser_switch_tab": self.browser_switch_tab,+ "browser_close_tab": self.browser_close_tab,+ "browser_get_tab_info": self.browser_get_tab_info,+ }- success = await session.close_tab(tab_id)+ enabled_tools = []- if success:- # Get current state after closing the tab- try:- snapshot = await session.get_snapshot(- force_refresh=True, diff_only=False+ for tool_name in self.enabled_tools:+ if (+ tool_name == "browser_solve_task"+ and self._web_agent_model is None+ ):+ logger.warning(+ f"Tool '{tool_name}' is enabled but web_agent_model "+ f"is not provided. Skipping this tool.")- except Exception:- snapshot = "" # No active tab-- tab_info = await self._get_tab_info_for_output()-- result = {- "result": f"Successfully closed tab {tab_id}",- "snapshot": snapshot,- **tab_info,- }- else:- tab_info = await self._get_tab_info_for_output()- result = {- "result": f"Failed to close tab {tab_id}. Tab may not "- f"exist.",- "snapshot": "",- **tab_info,- }-- return result-- @action_logger- async def get_tab_info(self) -> Dict[str, Any]:- r"""Gets a list of all open browser tabs and their information.+ continue- This includes each tab's index, title, and URL, and indicates which- tab is currently active. Use this to manage multiple tabs.+ if tool_name in tool_map:+ tool = FunctionTool(+ cast(Callable[..., Any], tool_map[tool_name])+ )+ enabled_tools.append(tool)+ else:+ logger.warning(f"Unknown tool name: {tool_name}")- Returns:- Dict[str, Any]: A dictionary with tab information:- - "tabs" (List[Dict]): A list of open tabs, each with:- - "index" (int): The tab's zero-based index.- - "title" (str): The page title.- - "url" (str): The current URL.- - "is_current" (bool): True if the tab is active.- - "current_tab" (int): Index of the active tab.- - "total_tabs" (int): Total number of open tabs.- """- await self._ensure_browser()- return await self._get_tab_info_for_output()+ logger.info(f"Returning {len(enabled_tools)} enabled tools")+ return enabled_toolsdiff --git a/camel/toolkits/hybrid_browser_toolkit/snapshot.py b/camel/toolkits/hybrid_browser_toolkit/snapshot.pydeleted file mode 100644index 9a2e79e3a..000000000--- a/camel/toolkits/hybrid_browser_toolkit/snapshot.py+++ /dev/null@@ -1,227 +0,0 @@-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========-# Licensed under the Apache License, Version 2.0 (the "License");-# you may not use this file except in compliance with the License.-# You may obtain a copy of the License at-#-# http://www.apache.org/licenses/LICENSE-2.0-#-# Unless required by applicable law or agreed to in writing, software-# distributed under the License is distributed on an "AS IS" BASIS,-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.-# See the License for the specific language governing permissions and-# limitations under the License.-# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========-from pathlib import Path-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union--if TYPE_CHECKING:- from playwright.async_api import Page--# Logging support-from camel.logger import get_logger--from .config_loader import ConfigLoader--logger = get_logger(__name__)---class PageSnapshot:- """Utility for capturing YAML-like page snapshots and diff-only- variants."""-- def __init__(self, page: "Page"):- self.page = page- self.snapshot_data: Optional[str] = None # last full snapshot- self._last_url: Optional[str] = None- self.last_info: Dict[str, List[int] | bool] = {- "is_diff": False,- "priorities": [1, 2, 3],- }- self.dom_timeout = ConfigLoader.get_dom_content_loaded_timeout()-- # ---------------------------------------------------------------------- # Public API- # ---------------------------------------------------------------------- async def capture(- self, *, force_refresh: bool = False, diff_only: bool = False- ) -> str:- """Return current snapshot or just the diff to previous one."""- try:- current_url = self.page.url-- # Previously we skipped regeneration when the URL had not changed- # and no explicit refresh was requested. This prevented the agent- # from seeing DOM updates that occur without a navigation (e.g.- # single-page apps, dynamic games such as Wordle). The early-exit- # logic has been removed so that we always capture a *fresh* DOM- # snapshot. If the snapshot happens to be byte-for-byte identical- # to the previous one we simply return it after the standard- # comparison step below; otherwise callers receive the updated- # snapshot even when the URL did not change.-- # ensure DOM stability- await self.page.wait_for_load_state(- 'domcontentloaded', timeout=self.dom_timeout- )-- logger.debug("Capturing page snapshot …")- snapshot_result = await self._get_snapshot_direct()-- # Extract snapshot text from the unified analyzer result- if (- isinstance(snapshot_result, dict)- and 'snapshotText' in snapshot_result- ):- snapshot_text = snapshot_result['snapshotText']- else:- snapshot_text = snapshot_result-- formatted = self._format_snapshot(snapshot_text or "<empty>")-- output = formatted- if diff_only and self.snapshot_data:- output = self._compute_diff(self.snapshot_data, formatted)-- # update cache with *full* snapshot (not diff)- self._last_url = current_url- self.snapshot_data = formatted-- # analyse priorities present (only for non-diff)- priorities_included = self._detect_priorities(- formatted if not diff_only else self.snapshot_data or formatted- )- self.last_info = {- "is_diff": diff_only and self.snapshot_data is not None,- "priorities": priorities_included,- }-- logger.debug(- "Snapshot captured. Diff_only=%s, priorities=%s",- diff_only,- self.last_info["priorities"],- )- return output- except Exception as exc:- logger.error("Snapshot capture failed: %s", exc)- return f"Error: Could not capture page snapshot {exc}"-- # ------------------------------------------------------------------- # Internal helpers- # ------------------------------------------------------------------- _snapshot_js_cache: Optional[str] = None # class-level cache-- async def _get_snapshot_direct(- self,- ) -> Optional[Union[str, Dict[str, Any]]]:- r"""Evaluate the snapshot-extraction JS with simple retry logic.-- Playwright throws *Execution context was destroyed* when a new page- navigation happens between scheduling and evaluating the JS. In that- case we retry a few times after waiting for the next DOMContentLoaded- event; for all other exceptions we abort immediately.- """-- # Load JS once and cache it at class level- if PageSnapshot._snapshot_js_cache is None:- js_path = Path(__file__).parent / "unified_analyzer.js"- PageSnapshot._snapshot_js_cache = js_path.read_text(- encoding="utf-8"- )-- js_code = PageSnapshot._snapshot_js_cache-- retries: int = 3- while retries > 0:- try:- return await self.page.evaluate(js_code)- except Exception as e:- msg = str(e)-- # Typical error when navigation happens between calls- nav_err = "Execution context was destroyed"-- if (- nav_err in msg- or "Most likely because of a navigation" in msg- ):- retries -= 1- logger.debug(- "Snapshot evaluate failed due to navigation; "- "retrying (%d left)…",- retries,- )-- # Wait for next DOM stability before retrying- try:- await self.page.wait_for_load_state(- "domcontentloaded", timeout=self.dom_timeout- )- except Exception:- # Even if waiting fails, attempt retry to give it- # one more chance- pass-- continue # retry the evaluate()-- # Any other exception → abort- logger.warning(- "Failed to execute snapshot JavaScript: %s",- e,- )- return None-- logger.warning("Failed to execute snapshot JavaScript after retries")- return None-- @staticmethod- def _format_snapshot(text: str) -> str:- return "\n".join(["- Page Snapshot", "```yaml", text, "```"])-- @staticmethod- def _compute_diff(old: str, new: str) -> str:- if not old or not new:- return "- Page Snapshot (error: missing data for diff)"-- import difflib-- diff = list(- difflib.unified_diff(- old.splitlines(False),- new.splitlines(False),- fromfile='prev',- tofile='curr',- lineterm='',- )- )- if not diff:- return "- Page Snapshot (no structural changes)"- return "\n".join(["- Page Snapshot (diff)", "```diff", *diff, "```"])-- # ------------------------------------------------------------------- def _detect_priorities(self, snapshot_yaml: str) -> List[int]:- """Return sorted list of priorities present (1,2,3)."""- priorities = set()- for line in snapshot_yaml.splitlines():- if '[ref=' not in line:- continue- lower_line = line.lower()- if any(- r in lower_line- for r in (- "input",- "button",- "select",- "textarea",- "checkbox",- "radio",- "link",- )- ):- priorities.add(1)- elif 'label' in lower_line:- priorities.add(2)- else:- priorities.add(3)- if not priorities:- priorities.add(3)- return sorted(priorities)diff --git a/camel/toolkits/hybrid_browser_toolkit/stealth_script.js b/camel/toolkits/hybrid_browser_toolkit/stealth_script.jsdeleted file mode 100644index ba9296cf5..000000000Binary files a/camel/toolkits/hybrid_browser_toolkit/stealth_script.js and /dev/null differdiff --git a/camel/toolkits/hybrid_browser_toolkit/ts/package-lock.json b/camel/toolkits/hybrid_browser_toolkit/ts/package-lock.jsonnew file mode 100644index 000000000..451773c15--- /dev/null+++ b/camel/toolkits/hybrid_browser_toolkit/ts/package-lock.json@@ -0,0 +1,4356 @@+{+ "name": "hybrid-browser-toolkit-ts",+ "version": "1.0.0",+ "lockfileVersion": 3,+ "requires": true,+ "packages": {+ "": {+ "name": "hybrid-browser-toolkit-ts",+ "version": "1.0.0",+ "license": "Apache-2.0",+ "dependencies": {+ "playwright": "^1.40.0",+ "sharp": "^0.32.0",+ "ws": "^8.14.0"+ },+ "devDependencies": {+ "@types/jest": "^29.0.0",+ "@types/node": "^20.0.0",+ "@types/ws": "^8.5.0",+ "jest": "^29.0.0",+ "typescript": "^5.8.3"+ }+ },+ "node_modules/@ampproject/remapping": {+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",+ "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",+ "dev": true,+ "license": "Apache-2.0",+ "dependencies": {+ "@jridgewell/gen-mapping": "^0.3.5",+ "@jridgewell/trace-mapping": "^0.3.24"+ },+ "engines": {+ "node": ">=6.0.0"+ }+ },+ "node_modules/@babel/code-frame": {+ "version": "7.27.1",+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",+ "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-validator-identifier": "^7.27.1",+ "js-tokens": "^4.0.0",+ "picocolors": "^1.1.1"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/compat-data": {+ "version": "7.28.0",+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",+ "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/core": {+ "version": "7.28.0",+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz",+ "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@ampproject/remapping": "^2.2.0",+ "@babel/code-frame": "^7.27.1",+ "@babel/generator": "^7.28.0",+ "@babel/helper-compilation-targets": "^7.27.2",+ "@babel/helper-module-transforms": "^7.27.3",+ "@babel/helpers": "^7.27.6",+ "@babel/parser": "^7.28.0",+ "@babel/template": "^7.27.2",+ "@babel/traverse": "^7.28.0",+ "@babel/types": "^7.28.0",+ "convert-source-map": "^2.0.0",+ "debug": "^4.1.0",+ "gensync": "^1.0.0-beta.2",+ "json5": "^2.2.3",+ "semver": "^6.3.1"+ },+ "engines": {+ "node": ">=6.9.0"+ },+ "funding": {+ "type": "opencollective",+ "url": "https://opencollective.com/babel"+ }+ },+ "node_modules/@babel/generator": {+ "version": "7.28.0",+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",+ "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/parser": "^7.28.0",+ "@babel/types": "^7.28.0",+ "@jridgewell/gen-mapping": "^0.3.12",+ "@jridgewell/trace-mapping": "^0.3.28",+ "jsesc": "^3.0.2"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/helper-compilation-targets": {+ "version": "7.27.2",+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",+ "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/compat-data": "^7.27.2",+ "@babel/helper-validator-option": "^7.27.1",+ "browserslist": "^4.24.0",+ "lru-cache": "^5.1.1",+ "semver": "^6.3.1"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/helper-globals": {+ "version": "7.28.0",+ "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",+ "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/helper-module-imports": {+ "version": "7.27.1",+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",+ "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/traverse": "^7.27.1",+ "@babel/types": "^7.27.1"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/helper-module-transforms": {+ "version": "7.27.3",+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",+ "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-module-imports": "^7.27.1",+ "@babel/helper-validator-identifier": "^7.27.1",+ "@babel/traverse": "^7.27.3"+ },+ "engines": {+ "node": ">=6.9.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0"+ }+ },+ "node_modules/@babel/helper-plugin-utils": {+ "version": "7.27.1",+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",+ "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/helper-string-parser": {+ "version": "7.27.1",+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",+ "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/helper-validator-identifier": {+ "version": "7.27.1",+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",+ "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/helper-validator-option": {+ "version": "7.27.1",+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",+ "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/helpers": {+ "version": "7.27.6",+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",+ "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/template": "^7.27.2",+ "@babel/types": "^7.27.6"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/parser": {+ "version": "7.28.0",+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",+ "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/types": "^7.28.0"+ },+ "bin": {+ "parser": "bin/babel-parser.js"+ },+ "engines": {+ "node": ">=6.0.0"+ }+ },+ "node_modules/@babel/plugin-syntax-async-generators": {+ "version": "7.8.4",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",+ "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.8.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-bigint": {+ "version": "7.8.3",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",+ "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.8.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-class-properties": {+ "version": "7.12.13",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",+ "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.12.13"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-class-static-block": {+ "version": "7.14.5",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",+ "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-import-attributes": {+ "version": "7.27.1",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",+ "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.27.1"+ },+ "engines": {+ "node": ">=6.9.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-import-meta": {+ "version": "7.10.4",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",+ "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.10.4"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-json-strings": {+ "version": "7.8.3",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",+ "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.8.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-jsx": {+ "version": "7.27.1",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",+ "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.27.1"+ },+ "engines": {+ "node": ">=6.9.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-logical-assignment-operators": {+ "version": "7.10.4",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",+ "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.10.4"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {+ "version": "7.8.3",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",+ "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.8.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-numeric-separator": {+ "version": "7.10.4",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",+ "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.10.4"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-object-rest-spread": {+ "version": "7.8.3",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",+ "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.8.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-optional-catch-binding": {+ "version": "7.8.3",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",+ "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.8.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-optional-chaining": {+ "version": "7.8.3",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",+ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.8.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-private-property-in-object": {+ "version": "7.14.5",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",+ "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-top-level-await": {+ "version": "7.14.5",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",+ "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/plugin-syntax-typescript": {+ "version": "7.27.1",+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",+ "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.27.1"+ },+ "engines": {+ "node": ">=6.9.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0-0"+ }+ },+ "node_modules/@babel/template": {+ "version": "7.27.2",+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",+ "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/code-frame": "^7.27.1",+ "@babel/parser": "^7.27.2",+ "@babel/types": "^7.27.1"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/traverse": {+ "version": "7.28.0",+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz",+ "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/code-frame": "^7.27.1",+ "@babel/generator": "^7.28.0",+ "@babel/helper-globals": "^7.28.0",+ "@babel/parser": "^7.28.0",+ "@babel/template": "^7.27.2",+ "@babel/types": "^7.28.0",+ "debug": "^4.3.1"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/types": {+ "version": "7.28.1",+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.1.tgz",+ "integrity": "sha512-x0LvFTekgSX+83TI28Y9wYPUfzrnl2aT5+5QLnO6v7mSJYtEEevuDRN0F0uSHRk1G1IWZC43o00Y0xDDrpBGPQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/helper-string-parser": "^7.27.1",+ "@babel/helper-validator-identifier": "^7.27.1"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@bcoe/v8-coverage": {+ "version": "0.2.3",+ "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",+ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/@istanbuljs/load-nyc-config": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",+ "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "camelcase": "^5.3.1",+ "find-up": "^4.1.0",+ "get-package-type": "^0.1.0",+ "js-yaml": "^3.13.1",+ "resolve-from": "^5.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/@istanbuljs/schema": {+ "version": "0.1.3",+ "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",+ "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/@jest/console": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",+ "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/types": "^29.6.3",+ "@types/node": "*",+ "chalk": "^4.0.0",+ "jest-message-util": "^29.7.0",+ "jest-util": "^29.7.0",+ "slash": "^3.0.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/@jest/core": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",+ "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/console": "^29.7.0",+ "@jest/reporters": "^29.7.0",+ "@jest/test-result": "^29.7.0",+ "@jest/transform": "^29.7.0",+ "@jest/types": "^29.6.3",+ "@types/node": "*",+ "ansi-escapes": "^4.2.1",+ "chalk": "^4.0.0",+ "ci-info": "^3.2.0",+ "exit": "^0.1.2",+ "graceful-fs": "^4.2.9",+ "jest-changed-files": "^29.7.0",+ "jest-config": "^29.7.0",+ "jest-haste-map": "^29.7.0",+ "jest-message-util": "^29.7.0",+ "jest-regex-util": "^29.6.3",+ "jest-resolve": "^29.7.0",+ "jest-resolve-dependencies": "^29.7.0",+ "jest-runner": "^29.7.0",+ "jest-runtime": "^29.7.0",+ "jest-snapshot": "^29.7.0",+ "jest-util": "^29.7.0",+ "jest-validate": "^29.7.0",+ "jest-watcher": "^29.7.0",+ "micromatch": "^4.0.4",+ "pretty-format": "^29.7.0",+ "slash": "^3.0.0",+ "strip-ansi": "^6.0.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ },+ "peerDependencies": {+ "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"+ },+ "peerDependenciesMeta": {+ "node-notifier": {+ "optional": true+ }+ }+ },+ "node_modules/@jest/environment": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",+ "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/fake-timers": "^29.7.0",+ "@jest/types": "^29.6.3",+ "@types/node": "*",+ "jest-mock": "^29.7.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/@jest/expect": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",+ "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "expect": "^29.7.0",+ "jest-snapshot": "^29.7.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/@jest/expect-utils": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",+ "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "jest-get-type": "^29.6.3"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/@jest/fake-timers": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",+ "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/types": "^29.6.3",+ "@sinonjs/fake-timers": "^10.0.2",+ "@types/node": "*",+ "jest-message-util": "^29.7.0",+ "jest-mock": "^29.7.0",+ "jest-util": "^29.7.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/@jest/globals": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",+ "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/environment": "^29.7.0",+ "@jest/expect": "^29.7.0",+ "@jest/types": "^29.6.3",+ "jest-mock": "^29.7.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/@jest/reporters": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",+ "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@bcoe/v8-coverage": "^0.2.3",+ "@jest/console": "^29.7.0",+ "@jest/test-result": "^29.7.0",+ "@jest/transform": "^29.7.0",+ "@jest/types": "^29.6.3",+ "@jridgewell/trace-mapping": "^0.3.18",+ "@types/node": "*",+ "chalk": "^4.0.0",+ "collect-v8-coverage": "^1.0.0",+ "exit": "^0.1.2",+ "glob": "^7.1.3",+ "graceful-fs": "^4.2.9",+ "istanbul-lib-coverage": "^3.0.0",+ "istanbul-lib-instrument": "^6.0.0",+ "istanbul-lib-report": "^3.0.0",+ "istanbul-lib-source-maps": "^4.0.0",+ "istanbul-reports": "^3.1.3",+ "jest-message-util": "^29.7.0",+ "jest-util": "^29.7.0",+ "jest-worker": "^29.7.0",+ "slash": "^3.0.0",+ "string-length": "^4.0.1",+ "strip-ansi": "^6.0.0",+ "v8-to-istanbul": "^9.0.1"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ },+ "peerDependencies": {+ "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"+ },+ "peerDependenciesMeta": {+ "node-notifier": {+ "optional": true+ }+ }+ },+ "node_modules/@jest/schemas": {+ "version": "29.6.3",+ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",+ "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@sinclair/typebox": "^0.27.8"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/@jest/source-map": {+ "version": "29.6.3",+ "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",+ "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jridgewell/trace-mapping": "^0.3.18",+ "callsites": "^3.0.0",+ "graceful-fs": "^4.2.9"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/@jest/test-result": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",+ "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/console": "^29.7.0",+ "@jest/types": "^29.6.3",+ "@types/istanbul-lib-coverage": "^2.0.0",+ "collect-v8-coverage": "^1.0.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/@jest/test-sequencer": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",+ "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/test-result": "^29.7.0",+ "graceful-fs": "^4.2.9",+ "jest-haste-map": "^29.7.0",+ "slash": "^3.0.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/@jest/transform": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",+ "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/core": "^7.11.6",+ "@jest/types": "^29.6.3",+ "@jridgewell/trace-mapping": "^0.3.18",+ "babel-plugin-istanbul": "^6.1.1",+ "chalk": "^4.0.0",+ "convert-source-map": "^2.0.0",+ "fast-json-stable-stringify": "^2.1.0",+ "graceful-fs": "^4.2.9",+ "jest-haste-map": "^29.7.0",+ "jest-regex-util": "^29.6.3",+ "jest-util": "^29.7.0",+ "micromatch": "^4.0.4",+ "pirates": "^4.0.4",+ "slash": "^3.0.0",+ "write-file-atomic": "^4.0.2"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/@jest/types": {+ "version": "29.6.3",+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",+ "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/schemas": "^29.6.3",+ "@types/istanbul-lib-coverage": "^2.0.0",+ "@types/istanbul-reports": "^3.0.0",+ "@types/node": "*",+ "@types/yargs": "^17.0.8",+ "chalk": "^4.0.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/@jridgewell/gen-mapping": {+ "version": "0.3.12",+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",+ "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jridgewell/sourcemap-codec": "^1.5.0",+ "@jridgewell/trace-mapping": "^0.3.24"+ }+ },+ "node_modules/@jridgewell/resolve-uri": {+ "version": "3.1.2",+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",+ "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6.0.0"+ }+ },+ "node_modules/@jridgewell/sourcemap-codec": {+ "version": "1.5.4",+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",+ "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/@jridgewell/trace-mapping": {+ "version": "0.3.29",+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",+ "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jridgewell/resolve-uri": "^3.1.0",+ "@jridgewell/sourcemap-codec": "^1.4.14"+ }+ },+ "node_modules/@sinclair/typebox": {+ "version": "0.27.8",+ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",+ "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/@sinonjs/commons": {+ "version": "3.0.1",+ "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",+ "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",+ "dev": true,+ "license": "BSD-3-Clause",+ "dependencies": {+ "type-detect": "4.0.8"+ }+ },+ "node_modules/@sinonjs/fake-timers": {+ "version": "10.3.0",+ "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",+ "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",+ "dev": true,+ "license": "BSD-3-Clause",+ "dependencies": {+ "@sinonjs/commons": "^3.0.0"+ }+ },+ "node_modules/@types/babel__core": {+ "version": "7.20.5",+ "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",+ "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/parser": "^7.20.7",+ "@babel/types": "^7.20.7",+ "@types/babel__generator": "*",+ "@types/babel__template": "*",+ "@types/babel__traverse": "*"+ }+ },+ "node_modules/@types/babel__generator": {+ "version": "7.27.0",+ "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz",+ "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/types": "^7.0.0"+ }+ },+ "node_modules/@types/babel__template": {+ "version": "7.4.4",+ "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",+ "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/parser": "^7.1.0",+ "@babel/types": "^7.0.0"+ }+ },+ "node_modules/@types/babel__traverse": {+ "version": "7.20.7",+ "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz",+ "integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/types": "^7.20.7"+ }+ },+ "node_modules/@types/graceful-fs": {+ "version": "4.1.9",+ "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",+ "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@types/node": "*"+ }+ },+ "node_modules/@types/istanbul-lib-coverage": {+ "version": "2.0.6",+ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",+ "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/@types/istanbul-lib-report": {+ "version": "3.0.3",+ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",+ "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@types/istanbul-lib-coverage": "*"+ }+ },+ "node_modules/@types/istanbul-reports": {+ "version": "3.0.4",+ "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",+ "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@types/istanbul-lib-report": "*"+ }+ },+ "node_modules/@types/jest": {+ "version": "29.5.14",+ "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",+ "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "expect": "^29.0.0",+ "pretty-format": "^29.0.0"+ }+ },+ "node_modules/@types/node": {+ "version": "20.19.9",+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.9.tgz",+ "integrity": "sha512-cuVNgarYWZqxRJDQHEB58GEONhOK79QVR/qYx4S7kcUObQvUwvFnYxJuuHUKm2aieN9X3yZB4LZsuYNU1Qphsw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "undici-types": "~6.21.0"+ }+ },+ "node_modules/@types/stack-utils": {+ "version": "2.0.3",+ "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",+ "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/@types/ws": {+ "version": "8.18.1",+ "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",+ "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@types/node": "*"+ }+ },+ "node_modules/@types/yargs": {+ "version": "17.0.33",+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",+ "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@types/yargs-parser": "*"+ }+ },+ "node_modules/@types/yargs-parser": {+ "version": "21.0.3",+ "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",+ "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/ansi-escapes": {+ "version": "4.3.2",+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",+ "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "type-fest": "^0.21.3"+ },+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/ansi-regex": {+ "version": "5.0.1",+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/ansi-styles": {+ "version": "4.3.0",+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "color-convert": "^2.0.1"+ },+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"+ }+ },+ "node_modules/anymatch": {+ "version": "3.1.3",+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "normalize-path": "^3.0.0",+ "picomatch": "^2.0.4"+ },+ "engines": {+ "node": ">= 8"+ }+ },+ "node_modules/argparse": {+ "version": "1.0.10",+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",+ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "sprintf-js": "~1.0.2"+ }+ },+ "node_modules/b4a": {+ "version": "1.6.7",+ "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz",+ "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==",+ "license": "Apache-2.0"+ },+ "node_modules/babel-jest": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",+ "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/transform": "^29.7.0",+ "@types/babel__core": "^7.1.14",+ "babel-plugin-istanbul": "^6.1.1",+ "babel-preset-jest": "^29.6.3",+ "chalk": "^4.0.0",+ "graceful-fs": "^4.2.9",+ "slash": "^3.0.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.8.0"+ }+ },+ "node_modules/babel-plugin-istanbul": {+ "version": "6.1.1",+ "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",+ "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",+ "dev": true,+ "license": "BSD-3-Clause",+ "dependencies": {+ "@babel/helper-plugin-utils": "^7.0.0",+ "@istanbuljs/load-nyc-config": "^1.0.0",+ "@istanbuljs/schema": "^0.1.2",+ "istanbul-lib-instrument": "^5.0.4",+ "test-exclude": "^6.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {+ "version": "5.2.1",+ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",+ "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",+ "dev": true,+ "license": "BSD-3-Clause",+ "dependencies": {+ "@babel/core": "^7.12.3",+ "@babel/parser": "^7.14.7",+ "@istanbuljs/schema": "^0.1.2",+ "istanbul-lib-coverage": "^3.2.0",+ "semver": "^6.3.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/babel-plugin-jest-hoist": {+ "version": "29.6.3",+ "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",+ "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/template": "^7.3.3",+ "@babel/types": "^7.3.3",+ "@types/babel__core": "^7.1.14",+ "@types/babel__traverse": "^7.0.6"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/babel-preset-current-node-syntax": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",+ "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/plugin-syntax-async-generators": "^7.8.4",+ "@babel/plugin-syntax-bigint": "^7.8.3",+ "@babel/plugin-syntax-class-properties": "^7.12.13",+ "@babel/plugin-syntax-class-static-block": "^7.14.5",+ "@babel/plugin-syntax-import-attributes": "^7.24.7",+ "@babel/plugin-syntax-import-meta": "^7.10.4",+ "@babel/plugin-syntax-json-strings": "^7.8.3",+ "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",+ "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",+ "@babel/plugin-syntax-numeric-separator": "^7.10.4",+ "@babel/plugin-syntax-object-rest-spread": "^7.8.3",+ "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",+ "@babel/plugin-syntax-optional-chaining": "^7.8.3",+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5",+ "@babel/plugin-syntax-top-level-await": "^7.14.5"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0"+ }+ },+ "node_modules/babel-preset-jest": {+ "version": "29.6.3",+ "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",+ "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "babel-plugin-jest-hoist": "^29.6.3",+ "babel-preset-current-node-syntax": "^1.0.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0"+ }+ },+ "node_modules/balanced-match": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/bare-events": {+ "version": "2.6.0",+ "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.6.0.tgz",+ "integrity": "sha512-EKZ5BTXYExaNqi3I3f9RtEsaI/xBSGjE0XZCZilPzFAV/goswFHuPd9jEZlPIZ/iNZJwDSao9qRiScySz7MbQg==",+ "license": "Apache-2.0",+ "optional": true+ },+ "node_modules/bare-fs": {+ "version": "4.1.6",+ "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.6.tgz",+ "integrity": "sha512-25RsLF33BqooOEFNdMcEhMpJy8EoR88zSMrnOQOaM3USnOK2VmaJ1uaQEwPA6AQjrv1lXChScosN6CzbwbO9OQ==",+ "license": "Apache-2.0",+ "optional": true,+ "dependencies": {+ "bare-events": "^2.5.4",+ "bare-path": "^3.0.0",+ "bare-stream": "^2.6.4"+ },+ "engines": {+ "bare": ">=1.16.0"+ },+ "peerDependencies": {+ "bare-buffer": "*"+ },+ "peerDependenciesMeta": {+ "bare-buffer": {+ "optional": true+ }+ }+ },+ "node_modules/bare-os": {+ "version": "3.6.1",+ "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz",+ "integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==",+ "license": "Apache-2.0",+ "optional": true,+ "engines": {+ "bare": ">=1.14.0"+ }+ },+ "node_modules/bare-path": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",+ "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",+ "license": "Apache-2.0",+ "optional": true,+ "dependencies": {+ "bare-os": "^3.0.1"+ }+ },+ "node_modules/bare-stream": {+ "version": "2.6.5",+ "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.5.tgz",+ "integrity": "sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==",+ "license": "Apache-2.0",+ "optional": true,+ "dependencies": {+ "streamx": "^2.21.0"+ },+ "peerDependencies": {+ "bare-buffer": "*",+ "bare-events": "*"+ },+ "peerDependenciesMeta": {+ "bare-buffer": {+ "optional": true+ },+ "bare-events": {+ "optional": true+ }+ }+ },+ "node_modules/base64-js": {+ "version": "1.5.1",+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",+ "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/feross"+ },+ {+ "type": "patreon",+ "url": "https://www.patreon.com/feross"+ },+ {+ "type": "consulting",+ "url": "https://feross.org/support"+ }+ ],+ "license": "MIT"+ },+ "node_modules/bl": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",+ "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",+ "license": "MIT",+ "dependencies": {+ "buffer": "^5.5.0",+ "inherits": "^2.0.4",+ "readable-stream": "^3.4.0"+ }+ },+ "node_modules/brace-expansion": {+ "version": "1.1.12",+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",+ "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "balanced-match": "^1.0.0",+ "concat-map": "0.0.1"+ }+ },+ "node_modules/braces": {+ "version": "3.0.3",+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",+ "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "fill-range": "^7.1.1"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/browserslist": {+ "version": "4.25.1",+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",+ "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",+ "dev": true,+ "funding": [+ {+ "type": "opencollective",+ "url": "https://opencollective.com/browserslist"+ },+ {+ "type": "tidelift",+ "url": "https://tidelift.com/funding/github/npm/browserslist"+ },+ {+ "type": "github",+ "url": "https://github.com/sponsors/ai"+ }+ ],+ "license": "MIT",+ "dependencies": {+ "caniuse-lite": "^1.0.30001726",+ "electron-to-chromium": "^1.5.173",+ "node-releases": "^2.0.19",+ "update-browserslist-db": "^1.1.3"+ },+ "bin": {+ "browserslist": "cli.js"+ },+ "engines": {+ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"+ }+ },+ "node_modules/bser": {+ "version": "2.1.1",+ "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",+ "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",+ "dev": true,+ "license": "Apache-2.0",+ "dependencies": {+ "node-int64": "^0.4.0"+ }+ },+ "node_modules/buffer": {+ "version": "5.7.1",+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",+ "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/feross"+ },+ {+ "type": "patreon",+ "url": "https://www.patreon.com/feross"+ },+ {+ "type": "consulting",+ "url": "https://feross.org/support"+ }+ ],+ "license": "MIT",+ "dependencies": {+ "base64-js": "^1.3.1",+ "ieee754": "^1.1.13"+ }+ },+ "node_modules/buffer-from": {+ "version": "1.1.2",+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",+ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/callsites": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/camelcase": {+ "version": "5.3.1",+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/caniuse-lite": {+ "version": "1.0.30001727",+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz",+ "integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==",+ "dev": true,+ "funding": [+ {+ "type": "opencollective",+ "url": "https://opencollective.com/browserslist"+ },+ {+ "type": "tidelift",+ "url": "https://tidelift.com/funding/github/npm/caniuse-lite"+ },+ {+ "type": "github",+ "url": "https://github.com/sponsors/ai"+ }+ ],+ "license": "CC-BY-4.0"+ },+ "node_modules/chalk": {+ "version": "4.1.2",+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "ansi-styles": "^4.1.0",+ "supports-color": "^7.1.0"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/chalk/chalk?sponsor=1"+ }+ },+ "node_modules/char-regex": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",+ "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/chownr": {+ "version": "1.1.4",+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",+ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",+ "license": "ISC"+ },+ "node_modules/ci-info": {+ "version": "3.9.0",+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",+ "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",+ "dev": true,+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/sibiraj-s"+ }+ ],+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/cjs-module-lexer": {+ "version": "1.4.3",+ "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",+ "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/cliui": {+ "version": "8.0.1",+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "string-width": "^4.2.0",+ "strip-ansi": "^6.0.1",+ "wrap-ansi": "^7.0.0"+ },+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/co": {+ "version": "4.6.0",+ "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",+ "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "iojs": ">= 1.0.0",+ "node": ">= 0.12.0"+ }+ },+ "node_modules/collect-v8-coverage": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",+ "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/color": {+ "version": "4.2.3",+ "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",+ "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",+ "license": "MIT",+ "dependencies": {+ "color-convert": "^2.0.1",+ "color-string": "^1.9.0"+ },+ "engines": {+ "node": ">=12.5.0"+ }+ },+ "node_modules/color-convert": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",+ "license": "MIT",+ "dependencies": {+ "color-name": "~1.1.4"+ },+ "engines": {+ "node": ">=7.0.0"+ }+ },+ "node_modules/color-name": {+ "version": "1.1.4",+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",+ "license": "MIT"+ },+ "node_modules/color-string": {+ "version": "1.9.1",+ "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",+ "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",+ "license": "MIT",+ "dependencies": {+ "color-name": "^1.0.0",+ "simple-swizzle": "^0.2.2"+ }+ },+ "node_modules/concat-map": {+ "version": "0.0.1",+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/convert-source-map": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",+ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/create-jest": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",+ "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/types": "^29.6.3",+ "chalk": "^4.0.0",+ "exit": "^0.1.2",+ "graceful-fs": "^4.2.9",+ "jest-config": "^29.7.0",+ "jest-util": "^29.7.0",+ "prompts": "^2.0.1"+ },+ "bin": {+ "create-jest": "bin/create-jest.js"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/cross-spawn": {+ "version": "7.0.6",+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",+ "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "path-key": "^3.1.0",+ "shebang-command": "^2.0.0",+ "which": "^2.0.1"+ },+ "engines": {+ "node": ">= 8"+ }+ },+ "node_modules/debug": {+ "version": "4.4.1",+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",+ "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "ms": "^2.1.3"+ },+ "engines": {+ "node": ">=6.0"+ },+ "peerDependenciesMeta": {+ "supports-color": {+ "optional": true+ }+ }+ },+ "node_modules/decompress-response": {+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",+ "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",+ "license": "MIT",+ "dependencies": {+ "mimic-response": "^3.1.0"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/dedent": {+ "version": "1.6.0",+ "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz",+ "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==",+ "dev": true,+ "license": "MIT",+ "peerDependencies": {+ "babel-plugin-macros": "^3.1.0"+ },+ "peerDependenciesMeta": {+ "babel-plugin-macros": {+ "optional": true+ }+ }+ },+ "node_modules/deep-extend": {+ "version": "0.6.0",+ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",+ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",+ "license": "MIT",+ "engines": {+ "node": ">=4.0.0"+ }+ },+ "node_modules/deepmerge": {+ "version": "4.3.1",+ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",+ "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=0.10.0"+ }+ },+ "node_modules/detect-libc": {+ "version": "2.0.4",+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",+ "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",+ "license": "Apache-2.0",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/detect-newline": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",+ "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/diff-sequences": {+ "version": "29.6.3",+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",+ "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/electron-to-chromium": {+ "version": "1.5.187",+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.187.tgz",+ "integrity": "sha512-cl5Jc9I0KGUoOoSbxvTywTa40uspGJt/BDBoDLoxJRSBpWh4FFXBsjNRHfQrONsV/OoEjDfHUmZQa2d6Ze4YgA==",+ "dev": true,+ "license": "ISC"+ },+ "node_modules/emittery": {+ "version": "0.13.1",+ "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",+ "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=12"+ },+ "funding": {+ "url": "https://github.com/sindresorhus/emittery?sponsor=1"+ }+ },+ "node_modules/emoji-regex": {+ "version": "8.0.0",+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/end-of-stream": {+ "version": "1.4.5",+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",+ "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",+ "license": "MIT",+ "dependencies": {+ "once": "^1.4.0"+ }+ },+ "node_modules/error-ex": {+ "version": "1.3.2",+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",+ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "is-arrayish": "^0.2.1"+ }+ },+ "node_modules/escalade": {+ "version": "3.2.0",+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",+ "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/escape-string-regexp": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",+ "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/esprima": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",+ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",+ "dev": true,+ "license": "BSD-2-Clause",+ "bin": {+ "esparse": "bin/esparse.js",+ "esvalidate": "bin/esvalidate.js"+ },+ "engines": {+ "node": ">=4"+ }+ },+ "node_modules/execa": {+ "version": "5.1.1",+ "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",+ "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "cross-spawn": "^7.0.3",+ "get-stream": "^6.0.0",+ "human-signals": "^2.1.0",+ "is-stream": "^2.0.0",+ "merge-stream": "^2.0.0",+ "npm-run-path": "^4.0.1",+ "onetime": "^5.1.2",+ "signal-exit": "^3.0.3",+ "strip-final-newline": "^2.0.0"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sindresorhus/execa?sponsor=1"+ }+ },+ "node_modules/exit": {+ "version": "0.1.2",+ "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",+ "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",+ "dev": true,+ "engines": {+ "node": ">= 0.8.0"+ }+ },+ "node_modules/expand-template": {+ "version": "2.0.3",+ "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",+ "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",+ "license": "(MIT OR WTFPL)",+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/expect": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",+ "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/expect-utils": "^29.7.0",+ "jest-get-type": "^29.6.3",+ "jest-matcher-utils": "^29.7.0",+ "jest-message-util": "^29.7.0",+ "jest-util": "^29.7.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/fast-fifo": {+ "version": "1.3.2",+ "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",+ "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",+ "license": "MIT"+ },+ "node_modules/fast-json-stable-stringify": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/fb-watchman": {+ "version": "2.0.2",+ "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",+ "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",+ "dev": true,+ "license": "Apache-2.0",+ "dependencies": {+ "bser": "2.1.1"+ }+ },+ "node_modules/fill-range": {+ "version": "7.1.1",+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",+ "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "to-regex-range": "^5.0.1"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/find-up": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "locate-path": "^5.0.0",+ "path-exists": "^4.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/fs-constants": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",+ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",+ "license": "MIT"+ },+ "node_modules/fs.realpath": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",+ "dev": true,+ "license": "ISC"+ },+ "node_modules/fsevents": {+ "version": "2.3.3",+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",+ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",+ "dev": true,+ "hasInstallScript": true,+ "license": "MIT",+ "optional": true,+ "os": [+ "darwin"+ ],+ "engines": {+ "node": "^8.16.0 || ^10.6.0 || >=11.0.0"+ }+ },+ "node_modules/function-bind": {+ "version": "1.1.2",+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",+ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",+ "dev": true,+ "license": "MIT",+ "funding": {+ "url": "https://github.com/sponsors/ljharb"+ }+ },+ "node_modules/gensync": {+ "version": "1.0.0-beta.2",+ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",+ "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/get-caller-file": {+ "version": "2.0.5",+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",+ "dev": true,+ "license": "ISC",+ "engines": {+ "node": "6.* || 8.* || >= 10.*"+ }+ },+ "node_modules/get-package-type": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",+ "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8.0.0"+ }+ },+ "node_modules/get-stream": {+ "version": "6.0.1",+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",+ "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/github-from-package": {+ "version": "0.0.0",+ "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",+ "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",+ "license": "MIT"+ },+ "node_modules/glob": {+ "version": "7.2.3",+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",+ "deprecated": "Glob versions prior to v9 are no longer supported",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "fs.realpath": "^1.0.0",+ "inflight": "^1.0.4",+ "inherits": "2",+ "minimatch": "^3.1.1",+ "once": "^1.3.0",+ "path-is-absolute": "^1.0.0"+ },+ "engines": {+ "node": "*"+ },+ "funding": {+ "url": "https://github.com/sponsors/isaacs"+ }+ },+ "node_modules/graceful-fs": {+ "version": "4.2.11",+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",+ "dev": true,+ "license": "ISC"+ },+ "node_modules/has-flag": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/hasown": {+ "version": "2.0.2",+ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",+ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "function-bind": "^1.1.2"+ },+ "engines": {+ "node": ">= 0.4"+ }+ },+ "node_modules/html-escaper": {+ "version": "2.0.2",+ "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",+ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/human-signals": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",+ "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",+ "dev": true,+ "license": "Apache-2.0",+ "engines": {+ "node": ">=10.17.0"+ }+ },+ "node_modules/ieee754": {+ "version": "1.2.1",+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",+ "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/feross"+ },+ {+ "type": "patreon",+ "url": "https://www.patreon.com/feross"+ },+ {+ "type": "consulting",+ "url": "https://feross.org/support"+ }+ ],+ "license": "BSD-3-Clause"+ },+ "node_modules/import-local": {+ "version": "3.2.0",+ "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",+ "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "pkg-dir": "^4.2.0",+ "resolve-cwd": "^3.0.0"+ },+ "bin": {+ "import-local-fixture": "fixtures/cli.js"+ },+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/imurmurhash": {+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=0.8.19"+ }+ },+ "node_modules/inflight": {+ "version": "1.0.6",+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",+ "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "once": "^1.3.0",+ "wrappy": "1"+ }+ },+ "node_modules/inherits": {+ "version": "2.0.4",+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",+ "license": "ISC"+ },+ "node_modules/ini": {+ "version": "1.3.8",+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",+ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",+ "license": "ISC"+ },+ "node_modules/is-arrayish": {+ "version": "0.2.1",+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",+ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/is-core-module": {+ "version": "2.16.1",+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",+ "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "hasown": "^2.0.2"+ },+ "engines": {+ "node": ">= 0.4"+ },+ "funding": {+ "url": "https://github.com/sponsors/ljharb"+ }+ },+ "node_modules/is-fullwidth-code-point": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/is-generator-fn": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",+ "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/is-number": {+ "version": "7.0.0",+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=0.12.0"+ }+ },+ "node_modules/is-stream": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",+ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/isexe": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",+ "dev": true,+ "license": "ISC"+ },+ "node_modules/istanbul-lib-coverage": {+ "version": "3.2.2",+ "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",+ "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",+ "dev": true,+ "license": "BSD-3-Clause",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/istanbul-lib-instrument": {+ "version": "6.0.3",+ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",+ "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",+ "dev": true,+ "license": "BSD-3-Clause",+ "dependencies": {+ "@babel/core": "^7.23.9",+ "@babel/parser": "^7.23.9",+ "@istanbuljs/schema": "^0.1.3",+ "istanbul-lib-coverage": "^3.2.0",+ "semver": "^7.5.4"+ },+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/istanbul-lib-instrument/node_modules/semver": {+ "version": "7.7.2",+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",+ "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",+ "dev": true,+ "license": "ISC",+ "bin": {+ "semver": "bin/semver.js"+ },+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/istanbul-lib-report": {+ "version": "3.0.1",+ "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",+ "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",+ "dev": true,+ "license": "BSD-3-Clause",+ "dependencies": {+ "istanbul-lib-coverage": "^3.0.0",+ "make-dir": "^4.0.0",+ "supports-color": "^7.1.0"+ },+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/istanbul-lib-source-maps": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",+ "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",+ "dev": true,+ "license": "BSD-3-Clause",+ "dependencies": {+ "debug": "^4.1.1",+ "istanbul-lib-coverage": "^3.0.0",+ "source-map": "^0.6.1"+ },+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/istanbul-reports": {+ "version": "3.1.7",+ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",+ "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",+ "dev": true,+ "license": "BSD-3-Clause",+ "dependencies": {+ "html-escaper": "^2.0.0",+ "istanbul-lib-report": "^3.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/jest": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",+ "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/core": "^29.7.0",+ "@jest/types": "^29.6.3",+ "import-local": "^3.0.2",+ "jest-cli": "^29.7.0"+ },+ "bin": {+ "jest": "bin/jest.js"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ },+ "peerDependencies": {+ "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"+ },+ "peerDependenciesMeta": {+ "node-notifier": {+ "optional": true+ }+ }+ },+ "node_modules/jest-changed-files": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",+ "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "execa": "^5.0.0",+ "jest-util": "^29.7.0",+ "p-limit": "^3.1.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-circus": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",+ "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/environment": "^29.7.0",+ "@jest/expect": "^29.7.0",+ "@jest/test-result": "^29.7.0",+ "@jest/types": "^29.6.3",+ "@types/node": "*",+ "chalk": "^4.0.0",+ "co": "^4.6.0",+ "dedent": "^1.0.0",+ "is-generator-fn": "^2.0.0",+ "jest-each": "^29.7.0",+ "jest-matcher-utils": "^29.7.0",+ "jest-message-util": "^29.7.0",+ "jest-runtime": "^29.7.0",+ "jest-snapshot": "^29.7.0",+ "jest-util": "^29.7.0",+ "p-limit": "^3.1.0",+ "pretty-format": "^29.7.0",+ "pure-rand": "^6.0.0",+ "slash": "^3.0.0",+ "stack-utils": "^2.0.3"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-cli": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",+ "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/core": "^29.7.0",+ "@jest/test-result": "^29.7.0",+ "@jest/types": "^29.6.3",+ "chalk": "^4.0.0",+ "create-jest": "^29.7.0",+ "exit": "^0.1.2",+ "import-local": "^3.0.2",+ "jest-config": "^29.7.0",+ "jest-util": "^29.7.0",+ "jest-validate": "^29.7.0",+ "yargs": "^17.3.1"+ },+ "bin": {+ "jest": "bin/jest.js"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ },+ "peerDependencies": {+ "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"+ },+ "peerDependenciesMeta": {+ "node-notifier": {+ "optional": true+ }+ }+ },+ "node_modules/jest-config": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",+ "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/core": "^7.11.6",+ "@jest/test-sequencer": "^29.7.0",+ "@jest/types": "^29.6.3",+ "babel-jest": "^29.7.0",+ "chalk": "^4.0.0",+ "ci-info": "^3.2.0",+ "deepmerge": "^4.2.2",+ "glob": "^7.1.3",+ "graceful-fs": "^4.2.9",+ "jest-circus": "^29.7.0",+ "jest-environment-node": "^29.7.0",+ "jest-get-type": "^29.6.3",+ "jest-regex-util": "^29.6.3",+ "jest-resolve": "^29.7.0",+ "jest-runner": "^29.7.0",+ "jest-util": "^29.7.0",+ "jest-validate": "^29.7.0",+ "micromatch": "^4.0.4",+ "parse-json": "^5.2.0",+ "pretty-format": "^29.7.0",+ "slash": "^3.0.0",+ "strip-json-comments": "^3.1.1"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ },+ "peerDependencies": {+ "@types/node": "*",+ "ts-node": ">=9.0.0"+ },+ "peerDependenciesMeta": {+ "@types/node": {+ "optional": true+ },+ "ts-node": {+ "optional": true+ }+ }+ },+ "node_modules/jest-diff": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",+ "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "chalk": "^4.0.0",+ "diff-sequences": "^29.6.3",+ "jest-get-type": "^29.6.3",+ "pretty-format": "^29.7.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-docblock": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",+ "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "detect-newline": "^3.0.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-each": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",+ "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/types": "^29.6.3",+ "chalk": "^4.0.0",+ "jest-get-type": "^29.6.3",+ "jest-util": "^29.7.0",+ "pretty-format": "^29.7.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-environment-node": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",+ "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/environment": "^29.7.0",+ "@jest/fake-timers": "^29.7.0",+ "@jest/types": "^29.6.3",+ "@types/node": "*",+ "jest-mock": "^29.7.0",+ "jest-util": "^29.7.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-get-type": {+ "version": "29.6.3",+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",+ "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-haste-map": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",+ "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/types": "^29.6.3",+ "@types/graceful-fs": "^4.1.3",+ "@types/node": "*",+ "anymatch": "^3.0.3",+ "fb-watchman": "^2.0.0",+ "graceful-fs": "^4.2.9",+ "jest-regex-util": "^29.6.3",+ "jest-util": "^29.7.0",+ "jest-worker": "^29.7.0",+ "micromatch": "^4.0.4",+ "walker": "^1.0.8"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ },+ "optionalDependencies": {+ "fsevents": "^2.3.2"+ }+ },+ "node_modules/jest-leak-detector": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",+ "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "jest-get-type": "^29.6.3",+ "pretty-format": "^29.7.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-matcher-utils": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",+ "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "chalk": "^4.0.0",+ "jest-diff": "^29.7.0",+ "jest-get-type": "^29.6.3",+ "pretty-format": "^29.7.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-message-util": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",+ "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/code-frame": "^7.12.13",+ "@jest/types": "^29.6.3",+ "@types/stack-utils": "^2.0.0",+ "chalk": "^4.0.0",+ "graceful-fs": "^4.2.9",+ "micromatch": "^4.0.4",+ "pretty-format": "^29.7.0",+ "slash": "^3.0.0",+ "stack-utils": "^2.0.3"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-mock": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",+ "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/types": "^29.6.3",+ "@types/node": "*",+ "jest-util": "^29.7.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-pnp-resolver": {+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",+ "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6"+ },+ "peerDependencies": {+ "jest-resolve": "*"+ },+ "peerDependenciesMeta": {+ "jest-resolve": {+ "optional": true+ }+ }+ },+ "node_modules/jest-regex-util": {+ "version": "29.6.3",+ "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",+ "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-resolve": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",+ "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "chalk": "^4.0.0",+ "graceful-fs": "^4.2.9",+ "jest-haste-map": "^29.7.0",+ "jest-pnp-resolver": "^1.2.2",+ "jest-util": "^29.7.0",+ "jest-validate": "^29.7.0",+ "resolve": "^1.20.0",+ "resolve.exports": "^2.0.0",+ "slash": "^3.0.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-resolve-dependencies": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",+ "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "jest-regex-util": "^29.6.3",+ "jest-snapshot": "^29.7.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-runner": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",+ "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/console": "^29.7.0",+ "@jest/environment": "^29.7.0",+ "@jest/test-result": "^29.7.0",+ "@jest/transform": "^29.7.0",+ "@jest/types": "^29.6.3",+ "@types/node": "*",+ "chalk": "^4.0.0",+ "emittery": "^0.13.1",+ "graceful-fs": "^4.2.9",+ "jest-docblock": "^29.7.0",+ "jest-environment-node": "^29.7.0",+ "jest-haste-map": "^29.7.0",+ "jest-leak-detector": "^29.7.0",+ "jest-message-util": "^29.7.0",+ "jest-resolve": "^29.7.0",+ "jest-runtime": "^29.7.0",+ "jest-util": "^29.7.0",+ "jest-watcher": "^29.7.0",+ "jest-worker": "^29.7.0",+ "p-limit": "^3.1.0",+ "source-map-support": "0.5.13"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-runtime": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",+ "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/environment": "^29.7.0",+ "@jest/fake-timers": "^29.7.0",+ "@jest/globals": "^29.7.0",+ "@jest/source-map": "^29.6.3",+ "@jest/test-result": "^29.7.0",+ "@jest/transform": "^29.7.0",+ "@jest/types": "^29.6.3",+ "@types/node": "*",+ "chalk": "^4.0.0",+ "cjs-module-lexer": "^1.0.0",+ "collect-v8-coverage": "^1.0.0",+ "glob": "^7.1.3",+ "graceful-fs": "^4.2.9",+ "jest-haste-map": "^29.7.0",+ "jest-message-util": "^29.7.0",+ "jest-mock": "^29.7.0",+ "jest-regex-util": "^29.6.3",+ "jest-resolve": "^29.7.0",+ "jest-snapshot": "^29.7.0",+ "jest-util": "^29.7.0",+ "slash": "^3.0.0",+ "strip-bom": "^4.0.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-snapshot": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",+ "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/core": "^7.11.6",+ "@babel/generator": "^7.7.2",+ "@babel/plugin-syntax-jsx": "^7.7.2",+ "@babel/plugin-syntax-typescript": "^7.7.2",+ "@babel/types": "^7.3.3",+ "@jest/expect-utils": "^29.7.0",+ "@jest/transform": "^29.7.0",+ "@jest/types": "^29.6.3",+ "babel-preset-current-node-syntax": "^1.0.0",+ "chalk": "^4.0.0",+ "expect": "^29.7.0",+ "graceful-fs": "^4.2.9",+ "jest-diff": "^29.7.0",+ "jest-get-type": "^29.6.3",+ "jest-matcher-utils": "^29.7.0",+ "jest-message-util": "^29.7.0",+ "jest-util": "^29.7.0",+ "natural-compare": "^1.4.0",+ "pretty-format": "^29.7.0",+ "semver": "^7.5.3"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-snapshot/node_modules/semver": {+ "version": "7.7.2",+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",+ "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",+ "dev": true,+ "license": "ISC",+ "bin": {+ "semver": "bin/semver.js"+ },+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/jest-util": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",+ "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/types": "^29.6.3",+ "@types/node": "*",+ "chalk": "^4.0.0",+ "ci-info": "^3.2.0",+ "graceful-fs": "^4.2.9",+ "picomatch": "^2.2.3"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-validate": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",+ "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/types": "^29.6.3",+ "camelcase": "^6.2.0",+ "chalk": "^4.0.0",+ "jest-get-type": "^29.6.3",+ "leven": "^3.1.0",+ "pretty-format": "^29.7.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-validate/node_modules/camelcase": {+ "version": "6.3.0",+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",+ "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/jest-watcher": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",+ "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/test-result": "^29.7.0",+ "@jest/types": "^29.6.3",+ "@types/node": "*",+ "ansi-escapes": "^4.2.1",+ "chalk": "^4.0.0",+ "emittery": "^0.13.1",+ "jest-util": "^29.7.0",+ "string-length": "^4.0.1"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-worker": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",+ "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@types/node": "*",+ "jest-util": "^29.7.0",+ "merge-stream": "^2.0.0",+ "supports-color": "^8.0.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/jest-worker/node_modules/supports-color": {+ "version": "8.1.1",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",+ "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "has-flag": "^4.0.0"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/chalk/supports-color?sponsor=1"+ }+ },+ "node_modules/js-tokens": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/js-yaml": {+ "version": "3.14.1",+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",+ "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "argparse": "^1.0.7",+ "esprima": "^4.0.0"+ },+ "bin": {+ "js-yaml": "bin/js-yaml.js"+ }+ },+ "node_modules/jsesc": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",+ "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",+ "dev": true,+ "license": "MIT",+ "bin": {+ "jsesc": "bin/jsesc"+ },+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/json-parse-even-better-errors": {+ "version": "2.3.1",+ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",+ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/json5": {+ "version": "2.2.3",+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",+ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",+ "dev": true,+ "license": "MIT",+ "bin": {+ "json5": "lib/cli.js"+ },+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/kleur": {+ "version": "3.0.3",+ "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",+ "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/leven": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",+ "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/lines-and-columns": {+ "version": "1.2.4",+ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",+ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/locate-path": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "p-locate": "^4.1.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/lru-cache": {+ "version": "5.1.1",+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",+ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "yallist": "^3.0.2"+ }+ },+ "node_modules/make-dir": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",+ "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "semver": "^7.5.3"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/make-dir/node_modules/semver": {+ "version": "7.7.2",+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",+ "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",+ "dev": true,+ "license": "ISC",+ "bin": {+ "semver": "bin/semver.js"+ },+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/makeerror": {+ "version": "1.0.12",+ "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",+ "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",+ "dev": true,+ "license": "BSD-3-Clause",+ "dependencies": {+ "tmpl": "1.0.5"+ }+ },+ "node_modules/merge-stream": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",+ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/micromatch": {+ "version": "4.0.8",+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",+ "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "braces": "^3.0.3",+ "picomatch": "^2.3.1"+ },+ "engines": {+ "node": ">=8.6"+ }+ },+ "node_modules/mimic-fn": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/mimic-response": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",+ "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",+ "license": "MIT",+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/minimatch": {+ "version": "3.1.2",+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "brace-expansion": "^1.1.7"+ },+ "engines": {+ "node": "*"+ }+ },+ "node_modules/minimist": {+ "version": "1.2.8",+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",+ "license": "MIT",+ "funding": {+ "url": "https://github.com/sponsors/ljharb"+ }+ },+ "node_modules/mkdirp-classic": {+ "version": "0.5.3",+ "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",+ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",+ "license": "MIT"+ },+ "node_modules/ms": {+ "version": "2.1.3",+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/napi-build-utils": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz",+ "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",+ "license": "MIT"+ },+ "node_modules/natural-compare": {+ "version": "1.4.0",+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",+ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/node-abi": {+ "version": "3.75.0",+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.75.0.tgz",+ "integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==",+ "license": "MIT",+ "dependencies": {+ "semver": "^7.3.5"+ },+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/node-abi/node_modules/semver": {+ "version": "7.7.2",+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",+ "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",+ "license": "ISC",+ "bin": {+ "semver": "bin/semver.js"+ },+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/node-addon-api": {+ "version": "6.1.0",+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",+ "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",+ "license": "MIT"+ },+ "node_modules/node-int64": {+ "version": "0.4.0",+ "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",+ "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/node-releases": {+ "version": "2.0.19",+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",+ "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/normalize-path": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=0.10.0"+ }+ },+ "node_modules/npm-run-path": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",+ "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "path-key": "^3.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/once": {+ "version": "1.4.0",+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",+ "license": "ISC",+ "dependencies": {+ "wrappy": "1"+ }+ },+ "node_modules/onetime": {+ "version": "5.1.2",+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",+ "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "mimic-fn": "^2.1.0"+ },+ "engines": {+ "node": ">=6"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/p-limit": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",+ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "yocto-queue": "^0.1.0"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/p-locate": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "p-limit": "^2.2.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/p-locate/node_modules/p-limit": {+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "p-try": "^2.0.0"+ },+ "engines": {+ "node": ">=6"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/p-try": {+ "version": "2.2.0",+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/parse-json": {+ "version": "5.2.0",+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",+ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@babel/code-frame": "^7.0.0",+ "error-ex": "^1.3.1",+ "json-parse-even-better-errors": "^2.3.0",+ "lines-and-columns": "^1.1.6"+ },+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/path-exists": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/path-is-absolute": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=0.10.0"+ }+ },+ "node_modules/path-key": {+ "version": "3.1.1",+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/path-parse": {+ "version": "1.0.7",+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/picocolors": {+ "version": "1.1.1",+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",+ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",+ "dev": true,+ "license": "ISC"+ },+ "node_modules/picomatch": {+ "version": "2.3.1",+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8.6"+ },+ "funding": {+ "url": "https://github.com/sponsors/jonschlinkert"+ }+ },+ "node_modules/pirates": {+ "version": "4.0.7",+ "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",+ "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">= 6"+ }+ },+ "node_modules/pkg-dir": {+ "version": "4.2.0",+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",+ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "find-up": "^4.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/playwright": {+ "version": "1.54.1",+ "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.54.1.tgz",+ "integrity": "sha512-peWpSwIBmSLi6aW2auvrUtf2DqY16YYcCMO8rTVx486jKmDTJg7UAhyrraP98GB8BoPURZP8+nxO7TSd4cPr5g==",+ "license": "Apache-2.0",+ "dependencies": {+ "playwright-core": "1.54.1"+ },+ "bin": {+ "playwright": "cli.js"+ },+ "engines": {+ "node": ">=18"+ },+ "optionalDependencies": {+ "fsevents": "2.3.2"+ }+ },+ "node_modules/playwright-core": {+ "version": "1.54.1",+ "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.54.1.tgz",+ "integrity": "sha512-Nbjs2zjj0htNhzgiy5wu+3w09YetDx5pkrpI/kZotDlDUaYk0HVA5xrBVPdow4SAUIlhgKcJeJg4GRKW6xHusA==",+ "license": "Apache-2.0",+ "bin": {+ "playwright-core": "cli.js"+ },+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/playwright/node_modules/fsevents": {+ "version": "2.3.2",+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",+ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",+ "hasInstallScript": true,+ "license": "MIT",+ "optional": true,+ "os": [+ "darwin"+ ],+ "engines": {+ "node": "^8.16.0 || ^10.6.0 || >=11.0.0"+ }+ },+ "node_modules/prebuild-install": {+ "version": "7.1.3",+ "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",+ "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",+ "license": "MIT",+ "dependencies": {+ "detect-libc": "^2.0.0",+ "expand-template": "^2.0.3",+ "github-from-package": "0.0.0",+ "minimist": "^1.2.3",+ "mkdirp-classic": "^0.5.3",+ "napi-build-utils": "^2.0.0",+ "node-abi": "^3.3.0",+ "pump": "^3.0.0",+ "rc": "^1.2.7",+ "simple-get": "^4.0.0",+ "tar-fs": "^2.0.0",+ "tunnel-agent": "^0.6.0"+ },+ "bin": {+ "prebuild-install": "bin.js"+ },+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/prebuild-install/node_modules/tar-fs": {+ "version": "2.1.3",+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",+ "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",+ "license": "MIT",+ "dependencies": {+ "chownr": "^1.1.1",+ "mkdirp-classic": "^0.5.2",+ "pump": "^3.0.0",+ "tar-stream": "^2.1.4"+ }+ },+ "node_modules/prebuild-install/node_modules/tar-stream": {+ "version": "2.2.0",+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",+ "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",+ "license": "MIT",+ "dependencies": {+ "bl": "^4.0.3",+ "end-of-stream": "^1.4.1",+ "fs-constants": "^1.0.0",+ "inherits": "^2.0.3",+ "readable-stream": "^3.1.1"+ },+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/pretty-format": {+ "version": "29.7.0",+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",+ "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@jest/schemas": "^29.6.3",+ "ansi-styles": "^5.0.0",+ "react-is": "^18.0.0"+ },+ "engines": {+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"+ }+ },+ "node_modules/pretty-format/node_modules/ansi-styles": {+ "version": "5.2.0",+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",+ "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"+ }+ },+ "node_modules/prompts": {+ "version": "2.4.2",+ "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",+ "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "kleur": "^3.0.3",+ "sisteransi": "^1.0.5"+ },+ "engines": {+ "node": ">= 6"+ }+ },+ "node_modules/pump": {+ "version": "3.0.3",+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",+ "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",+ "license": "MIT",+ "dependencies": {+ "end-of-stream": "^1.1.0",+ "once": "^1.3.1"+ }+ },+ "node_modules/pure-rand": {+ "version": "6.1.0",+ "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",+ "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",+ "dev": true,+ "funding": [+ {+ "type": "individual",+ "url": "https://github.com/sponsors/dubzzz"+ },+ {+ "type": "opencollective",+ "url": "https://opencollective.com/fast-check"+ }+ ],+ "license": "MIT"+ },+ "node_modules/rc": {+ "version": "1.2.8",+ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",+ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",+ "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",+ "dependencies": {+ "deep-extend": "^0.6.0",+ "ini": "~1.3.0",+ "minimist": "^1.2.0",+ "strip-json-comments": "~2.0.1"+ },+ "bin": {+ "rc": "cli.js"+ }+ },+ "node_modules/rc/node_modules/strip-json-comments": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",+ "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",+ "license": "MIT",+ "engines": {+ "node": ">=0.10.0"+ }+ },+ "node_modules/react-is": {+ "version": "18.3.1",+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",+ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/readable-stream": {+ "version": "3.6.2",+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",+ "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",+ "license": "MIT",+ "dependencies": {+ "inherits": "^2.0.3",+ "string_decoder": "^1.1.1",+ "util-deprecate": "^1.0.1"+ },+ "engines": {+ "node": ">= 6"+ }+ },+ "node_modules/require-directory": {+ "version": "2.1.1",+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",+ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=0.10.0"+ }+ },+ "node_modules/resolve": {+ "version": "1.22.10",+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",+ "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "is-core-module": "^2.16.0",+ "path-parse": "^1.0.7",+ "supports-preserve-symlinks-flag": "^1.0.0"+ },+ "bin": {+ "resolve": "bin/resolve"+ },+ "engines": {+ "node": ">= 0.4"+ },+ "funding": {+ "url": "https://github.com/sponsors/ljharb"+ }+ },+ "node_modules/resolve-cwd": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",+ "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "resolve-from": "^5.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/resolve-from": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",+ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/resolve.exports": {+ "version": "2.0.3",+ "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",+ "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/safe-buffer": {+ "version": "5.2.1",+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/feross"+ },+ {+ "type": "patreon",+ "url": "https://www.patreon.com/feross"+ },+ {+ "type": "consulting",+ "url": "https://feross.org/support"+ }+ ],+ "license": "MIT"+ },+ "node_modules/semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true,+ "license": "ISC",+ "bin": {+ "semver": "bin/semver.js"+ }+ },+ "node_modules/sharp": {+ "version": "0.32.6",+ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.6.tgz",+ "integrity": "sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==",+ "hasInstallScript": true,+ "license": "Apache-2.0",+ "dependencies": {+ "color": "^4.2.3",+ "detect-libc": "^2.0.2",+ "node-addon-api": "^6.1.0",+ "prebuild-install": "^7.1.1",+ "semver": "^7.5.4",+ "simple-get": "^4.0.1",+ "tar-fs": "^3.0.4",+ "tunnel-agent": "^0.6.0"+ },+ "engines": {+ "node": ">=14.15.0"+ },+ "funding": {+ "url": "https://opencollective.com/libvips"+ }+ },+ "node_modules/sharp/node_modules/semver": {+ "version": "7.7.2",+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",+ "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",+ "license": "ISC",+ "bin": {+ "semver": "bin/semver.js"+ },+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/shebang-command": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "shebang-regex": "^3.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/shebang-regex": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/signal-exit": {+ "version": "3.0.7",+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",+ "dev": true,+ "license": "ISC"+ },+ "node_modules/simple-concat": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",+ "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/feross"+ },+ {+ "type": "patreon",+ "url": "https://www.patreon.com/feross"+ },+ {+ "type": "consulting",+ "url": "https://feross.org/support"+ }+ ],+ "license": "MIT"+ },+ "node_modules/simple-get": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",+ "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/feross"+ },+ {+ "type": "patreon",+ "url": "https://www.patreon.com/feross"+ },+ {+ "type": "consulting",+ "url": "https://feross.org/support"+ }+ ],+ "license": "MIT",+ "dependencies": {+ "decompress-response": "^6.0.0",+ "once": "^1.3.1",+ "simple-concat": "^1.0.0"+ }+ },+ "node_modules/simple-swizzle": {+ "version": "0.2.2",+ "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",+ "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",+ "license": "MIT",+ "dependencies": {+ "is-arrayish": "^0.3.1"+ }+ },+ "node_modules/simple-swizzle/node_modules/is-arrayish": {+ "version": "0.3.2",+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",+ "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",+ "license": "MIT"+ },+ "node_modules/sisteransi": {+ "version": "1.0.5",+ "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",+ "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/slash": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/source-map": {+ "version": "0.6.1",+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",+ "dev": true,+ "license": "BSD-3-Clause",+ "engines": {+ "node": ">=0.10.0"+ }+ },+ "node_modules/source-map-support": {+ "version": "0.5.13",+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",+ "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "buffer-from": "^1.0.0",+ "source-map": "^0.6.0"+ }+ },+ "node_modules/sprintf-js": {+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",+ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",+ "dev": true,+ "license": "BSD-3-Clause"+ },+ "node_modules/stack-utils": {+ "version": "2.0.6",+ "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",+ "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "escape-string-regexp": "^2.0.0"+ },+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/streamx": {+ "version": "2.22.1",+ "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.1.tgz",+ "integrity": "sha512-znKXEBxfatz2GBNK02kRnCXjV+AA4kjZIUxeWSr3UGirZMJfTE9uiwKHobnbgxWyL/JWro8tTq+vOqAK1/qbSA==",+ "license": "MIT",+ "dependencies": {+ "fast-fifo": "^1.3.2",+ "text-decoder": "^1.1.0"+ },+ "optionalDependencies": {+ "bare-events": "^2.2.0"+ }+ },+ "node_modules/string_decoder": {+ "version": "1.3.0",+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",+ "license": "MIT",+ "dependencies": {+ "safe-buffer": "~5.2.0"+ }+ },+ "node_modules/string-length": {+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",+ "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "char-regex": "^1.0.2",+ "strip-ansi": "^6.0.0"+ },+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/string-width": {+ "version": "4.2.3",+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "emoji-regex": "^8.0.0",+ "is-fullwidth-code-point": "^3.0.0",+ "strip-ansi": "^6.0.1"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/strip-ansi": {+ "version": "6.0.1",+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "ansi-regex": "^5.0.1"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/strip-bom": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",+ "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/strip-final-newline": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",+ "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/strip-json-comments": {+ "version": "3.1.1",+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",+ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/supports-color": {+ "version": "7.2.0",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "has-flag": "^4.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/supports-preserve-symlinks-flag": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">= 0.4"+ },+ "funding": {+ "url": "https://github.com/sponsors/ljharb"+ }+ },+ "node_modules/tar-fs": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.0.tgz",+ "integrity": "sha512-5Mty5y/sOF1YWj1J6GiBodjlDc05CUR8PKXrsnFAiSG0xA+GHeWLovaZPYUDXkH/1iKRf2+M5+OrRgzC7O9b7w==",+ "license": "MIT",+ "dependencies": {+ "pump": "^3.0.0",+ "tar-stream": "^3.1.5"+ },+ "optionalDependencies": {+ "bare-fs": "^4.0.1",+ "bare-path": "^3.0.0"+ }+ },+ "node_modules/tar-stream": {+ "version": "3.1.7",+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",+ "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",+ "license": "MIT",+ "dependencies": {+ "b4a": "^1.6.4",+ "fast-fifo": "^1.2.0",+ "streamx": "^2.15.0"+ }+ },+ "node_modules/test-exclude": {+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",+ "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "@istanbuljs/schema": "^0.1.2",+ "glob": "^7.1.4",+ "minimatch": "^3.0.4"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/text-decoder": {+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz",+ "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==",+ "license": "Apache-2.0",+ "dependencies": {+ "b4a": "^1.6.4"+ }+ },+ "node_modules/tmpl": {+ "version": "1.0.5",+ "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",+ "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",+ "dev": true,+ "license": "BSD-3-Clause"+ },+ "node_modules/to-regex-range": {+ "version": "5.0.1",+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "is-number": "^7.0.0"+ },+ "engines": {+ "node": ">=8.0"+ }+ },+ "node_modules/tunnel-agent": {+ "version": "0.6.0",+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",+ "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",+ "license": "Apache-2.0",+ "dependencies": {+ "safe-buffer": "^5.0.1"+ },+ "engines": {+ "node": "*"+ }+ },+ "node_modules/type-detect": {+ "version": "4.0.8",+ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",+ "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=4"+ }+ },+ "node_modules/type-fest": {+ "version": "0.21.3",+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",+ "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",+ "dev": true,+ "license": "(MIT OR CC0-1.0)",+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/typescript": {+ "version": "5.8.3",+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",+ "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",+ "dev": true,+ "license": "Apache-2.0",+ "bin": {+ "tsc": "bin/tsc",+ "tsserver": "bin/tsserver"+ },+ "engines": {+ "node": ">=14.17"+ }+ },+ "node_modules/undici-types": {+ "version": "6.21.0",+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",+ "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",+ "dev": true,+ "license": "MIT"+ },+ "node_modules/update-browserslist-db": {+ "version": "1.1.3",+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",+ "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",+ "dev": true,+ "funding": [+ {+ "type": "opencollective",+ "url": "https://opencollective.com/browserslist"+ },+ {+ "type": "tidelift",+ "url": "https://tidelift.com/funding/github/npm/browserslist"+ },+ {+ "type": "github",+ "url": "https://github.com/sponsors/ai"+ }+ ],+ "license": "MIT",+ "dependencies": {+ "escalade": "^3.2.0",+ "picocolors": "^1.1.1"+ },+ "bin": {+ "update-browserslist-db": "cli.js"+ },+ "peerDependencies": {+ "browserslist": ">= 4.21.0"+ }+ },+ "node_modules/util-deprecate": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",+ "license": "MIT"+ },+ "node_modules/v8-to-istanbul": {+ "version": "9.3.0",+ "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",+ "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "@jridgewell/trace-mapping": "^0.3.12",+ "@types/istanbul-lib-coverage": "^2.0.1",+ "convert-source-map": "^2.0.0"+ },+ "engines": {+ "node": ">=10.12.0"+ }+ },+ "node_modules/walker": {+ "version": "1.0.8",+ "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",+ "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",+ "dev": true,+ "license": "Apache-2.0",+ "dependencies": {+ "makeerror": "1.0.12"+ }+ },+ "node_modules/which": {+ "version": "2.0.2",+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "isexe": "^2.0.0"+ },+ "bin": {+ "node-which": "bin/node-which"+ },+ "engines": {+ "node": ">= 8"+ }+ },+ "node_modules/wrap-ansi": {+ "version": "7.0.0",+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "ansi-styles": "^4.0.0",+ "string-width": "^4.1.0",+ "strip-ansi": "^6.0.0"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"+ }+ },+ "node_modules/wrappy": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",+ "license": "ISC"+ },+ "node_modules/write-file-atomic": {+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",+ "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "imurmurhash": "^0.1.4",+ "signal-exit": "^3.0.7"+ },+ "engines": {+ "node": "^12.13.0 || ^14.15.0 || >=16.0.0"+ }+ },+ "node_modules/ws": {+ "version": "8.18.3",+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",+ "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",+ "license": "MIT",+ "engines": {+ "node": ">=10.0.0"+ },+ "peerDependencies": {+ "bufferutil": "^4.0.1",+ "utf-8-validate": ">=5.0.2"+ },+ "peerDependenciesMeta": {+ "bufferutil": {+ "optional": true+ },+ "utf-8-validate": {+ "optional": true+ }+ }+ },+ "node_modules/y18n": {+ "version": "5.0.8",+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",+ "dev": true,+ "license": "ISC",+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/yallist": {+ "version": "3.1.1",+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",+ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",+ "dev": true,+ "license": "ISC"+ },+ "node_modules/yargs": {+ "version": "17.7.2",+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",+ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "cliui": "^8.0.1",+ "escalade": "^3.1.1",+ "get-caller-file": "^2.0.5",+ "require-directory": "^2.1.1",+ "string-width": "^4.2.3",+ "y18n": "^5.0.5",+ "yargs-parser": "^21.1.1"+ },+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/yargs-parser": {+ "version": "21.1.1",+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",+ "dev": true,+ "license": "ISC",+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/yocto-queue": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",+ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ }+ }+}diff --git a/camel/toolkits/hybrid_browser_toolkit/ts/package.json b/camel/toolkits/hybrid_browser_toolkit/ts/package.jsonnew file mode 100644index 000000000..89287e06a--- /dev/null+++ b/camel/toolkits/hybrid_browser_toolkit/ts/package.json@@ -0,0 +1,33 @@+{+ "name": "hybrid-browser-toolkit-ts",+ "version": "1.0.0",+ "description": "TypeScript implementation of hybrid browser toolkit with Playwright _snapshotForAI integration",+ "main": "dist/index.js",+ "scripts": {+ "build": "npx tsc",+ "dev": "npx tsc --watch",+ "test": "jest",+ "start": "node dist/index.js"+ },+ "keywords": [+ "playwright",+ "browser",+ "automation",+ "ai",+ "snapshot"+ ],+ "author": "CAMEL-AI",+ "license": "Apache-2.0",+ "dependencies": {+ "playwright": "^1.40.0",+ "sharp": "^0.32.0",+ "ws": "^8.14.0"+ },+ "devDependencies": {+ "@types/jest": "^29.0.0",+ "@types/node": "^20.0.0",+ "@types/ws": "^8.5.0",+ "jest": "^29.0.0",+ "typescript": "^5.8.3"+ }+}diff --git a/camel/toolkits/hybrid_browser_toolkit/ts/src/browser-scripts.js b/camel/toolkits/hybrid_browser_toolkit/ts/src/browser-scripts.jsnew file mode 100644index 000000000..93ec79191--- /dev/null+++ b/camel/toolkits/hybrid_browser_toolkit/ts/src/browser-scripts.js@@ -0,0 +1,125 @@+/**+ * Browser-side JavaScript utilities for the hybrid browser toolkit+ */++/**+ * Get current scroll position and browser metrics+ */+function getCurrentScrollPosition() {+ return {+ x: window.pageXOffset || document.documentElement.scrollLeft || 0,+ y: window.pageYOffset || document.documentElement.scrollTop || 0,+ devicePixelRatio: window.devicePixelRatio || 1,+ zoomLevel: window.outerWidth / window.innerWidth || 1+ };+}++/**+ * Set target="_blank" attribute for anchor elements+ */+function setTargetBlank(element) {+ if (element.tagName.toLowerCase() === 'a') {+ element.setAttribute('target', '_blank');+ }+}++/**+ * Scroll the page by a specified amount+ */+function scrollPage(amount) {+ window.scrollBy(0, amount);+}++/**+ * Check if browser has specific capability+ */+function checkBrowserCapability(capability) {+ switch (capability) {+ case 'devicePixelRatio':+ return window.devicePixelRatio || 1;+ case 'viewport':+ return {+ width: window.innerWidth,+ height: window.innerHeight+ };+ case 'scroll':+ return {+ x: window.pageXOffset || document.documentElement.scrollLeft || 0,+ y: window.pageYOffset || document.documentElement.scrollTop || 0,+ maxX: Math.max(0, document.documentElement.scrollWidth - window.innerWidth),+ maxY: Math.max(0, document.documentElement.scrollHeight - window.innerHeight)+ };+ default:+ return null;+ }+}++/**+ * Get document dimensions+ */+function getDocumentDimensions() {+ return {+ scrollWidth: document.documentElement.scrollWidth,+ scrollHeight: document.documentElement.scrollHeight,+ clientWidth: document.documentElement.clientWidth,+ clientHeight: document.documentElement.clientHeight,+ offsetWidth: document.documentElement.offsetWidth,+ offsetHeight: document.documentElement.offsetHeight+ };+}++/**+ * Wait for element to be visible or interactable+ */+function waitForElement(selector, timeout = 5000) {+ return new Promise((resolve, reject) => {+ const startTime = Date.now();++ function checkElement() {+ const element = document.querySelector(selector);+ if (element && element.offsetParent !== null) {+ resolve(element);+ return;+ }++ if (Date.now() - startTime > timeout) {+ reject(new Error(`Element ${selector} not found within timeout`));+ return;+ }++ setTimeout(checkElement, 100);+ }++ checkElement();+ });+}++/**+ * Get element coordinates relative to viewport+ */+function getElementCoordinates(element) {+ const rect = element.getBoundingClientRect();+ const scroll = getCurrentScrollPosition();++ return {+ x: rect.left + scroll.x,+ y: rect.top + scroll.y,+ width: rect.width,+ height: rect.height,+ viewportX: rect.left,+ viewportY: rect.top+ };+}++// Export for use in evaluate() calls+if (typeof module !== 'undefined' && module.exports) {+ module.exports = {+ getCurrentScrollPosition,+ setTargetBlank,+ scrollPage,+ checkBrowserCapability,+ getDocumentDimensions,+ waitForElement,+ getElementCoordinates+ };+}\ No newline at end of filediff --git a/camel/toolkits/hybrid_browser_toolkit/ts/src/browser-session.ts b/camel/toolkits/hybrid_browser_toolkit/ts/src/browser-session.tsnew file mode 100644index 000000000..f658ec62a--- /dev/null+++ b/camel/toolkits/hybrid_browser_toolkit/ts/src/browser-session.ts@@ -0,0 +1,865 @@+import { Page, Browser, BrowserContext, chromium } from 'playwright';+import { BrowserToolkitConfig, SnapshotResult, SnapshotElement, ActionResult, TabInfo, BrowserAction, DetailedTiming } from './types';+import { ConfigLoader, StealthConfig } from './config-loader';++export class HybridBrowserSession {+ private browser: Browser | null = null;+ private context: BrowserContext | null = null;+ private pages: Map<string, Page> = new Map();+ private currentTabId: string | null = null;+ private tabCounter = 0;+ private configLoader: ConfigLoader;+ private scrollPosition: { x: number; y: number } = {x: 0, y: 0};+ private hasNavigatedBefore = false; // Track if we've navigated before++ constructor(config: BrowserToolkitConfig = {}) {+ // Use ConfigLoader's fromPythonConfig to handle conversion properly+ this.configLoader = ConfigLoader.fromPythonConfig(config);+ }++ async ensureBrowser(): Promise<void> {+ if (this.browser) {+ return;+ }++ const browserConfig = this.configLoader.getBrowserConfig();+ const stealthConfig = this.configLoader.getStealthConfig();++ const launchOptions: any = {+ headless: browserConfig.headless,+ };++ if (stealthConfig.enabled) {+ launchOptions.args = stealthConfig.args || [];++ // Apply stealth user agent if configured+ if (stealthConfig.userAgent) {+ launchOptions.userAgent = stealthConfig.userAgent;+ }+ }++ if (browserConfig.userDataDir) {+ this.context = await chromium.launchPersistentContext(+ browserConfig.userDataDir,+ launchOptions+ );++ const pages = this.context.pages();+ if (pages.length > 0) {+ const initialTabId = this.generateTabId();+ this.pages.set(initialTabId, pages[0]);+ this.currentTabId = initialTabId;+ }+ } else {+ this.browser = await chromium.launch(launchOptions);+ const contextOptions: any = {+ viewport: browserConfig.viewport+ };++ // Apply stealth headers if configured+ if (stealthConfig.enabled && stealthConfig.extraHTTPHeaders) {+ contextOptions.extraHTTPHeaders = stealthConfig.extraHTTPHeaders;+ }++ this.context = await this.browser.newContext(contextOptions);++ const initialPage = await this.context.newPage();+ const initialTabId = this.generateTabId();+ this.pages.set(initialTabId, initialPage);+ this.currentTabId = initialTabId;+ }++ // Set timeouts+ for (const page of this.pages.values()) {+ page.setDefaultNavigationTimeout(browserConfig.navigationTimeout);+ page.setDefaultTimeout(browserConfig.navigationTimeout);+ }+ }++ private generateTabId(): string {+ const browserConfig = this.configLoader.getBrowserConfig();+ return `${browserConfig.tabIdPrefix}${String(++this.tabCounter).padStart(browserConfig.tabCounterPadding, '0')}`;+ }++ async getCurrentPage(): Promise<Page> {+ if (!this.currentTabId || !this.pages.has(this.currentTabId)) {+ throw new Error('No active page available');+ }+ return this.pages.get(this.currentTabId)!;+ }++ /**+ * Get current scroll position from the page+ */+ private async getCurrentScrollPosition(): Promise<{ x: number; y: number }> {+ try {+ const page = await this.getCurrentPage();+ const scrollInfo = await page.evaluate(() => {+ return {+ x: window.pageXOffset || document.documentElement.scrollLeft || 0,+ y: window.pageYOffset || document.documentElement.scrollTop || 0,+ devicePixelRatio: window.devicePixelRatio || 1,+ zoomLevel: window.outerWidth / window.innerWidth || 1+ };+ }) as { x: number; y: number; devicePixelRatio: number; zoomLevel: number };++ // Store scroll position+ this.scrollPosition = { x: scrollInfo.x, y: scrollInfo.y };+ return this.scrollPosition;+ } catch (error) {+ console.warn('Failed to get scroll position:', error);+ return this.scrollPosition;+ }+ }++ async getSnapshotForAI(includeCoordinates = false, viewportLimit = false): Promise<SnapshotResult & { timing: DetailedTiming }> {+ // Always use native Playwright mapping - this is the correct approach+ return this.getSnapshotForAINative(includeCoordinates, viewportLimit);+ }++ private async getSnapshotForAINative(includeCoordinates = false, viewportLimit = false): Promise<SnapshotResult & { timing: DetailedTiming }> {+ const startTime = Date.now();+ const page = await this.getCurrentPage();++ try {+ // Use _snapshotForAI() to properly update _lastAriaSnapshot+ const snapshotStart = Date.now();+ const snapshotText = await (page as any)._snapshotForAI();+ const snapshotTime = Date.now() - snapshotStart;++ // Extract refs from the snapshot text+ const refPattern = /\[ref=([^\]]+)\]/g;+ const refs: string[] = [];+ let match;+ while ((match = refPattern.exec(snapshotText)) !== null) {+ refs.push(match[1]);+ }++ // Get element information including coordinates if needed+ const mappingStart = Date.now();+ const playwrightMapping: Record<string, any> = {};++ if (includeCoordinates) {+ // Get coordinates for each ref using aria-ref selector+ for (const ref of refs) {+ try {+ const selector = `aria-ref=${ref}`;+ const element = await page.locator(selector).first();+ const exists = await element.count() > 0;++ if (exists) {+ // Get bounding box+ const boundingBox = await element.boundingBox();++ if (boundingBox) {+ playwrightMapping[ref] = {+ ref,+ coordinates: {+ x: Math.round(boundingBox.x),+ y: Math.round(boundingBox.y),+ width: Math.round(boundingBox.width),+ height: Math.round(boundingBox.height)+ }+ };+ }+ }+ } catch (error) {+ // Failed to get coordinates for element+ }+ }+ }++ const mappingTime = Date.now() - mappingStart;++ // Apply viewport filtering if requested+ let finalElements = playwrightMapping;+ let finalSnapshot = snapshotText;++ if (viewportLimit) {+ const viewport = page.viewportSize() || { width: 1280, height: 720 };+ const scrollPos = await this.getCurrentScrollPosition();+ finalElements = this.filterElementsInViewport(playwrightMapping, viewport, scrollPos);+ finalSnapshot = this.rebuildSnapshotText(snapshotText, finalElements);+ }++ const totalTime = Date.now() - startTime;++ return {+ snapshot: finalSnapshot,+ elements: finalElements,+ metadata: {+ elementCount: Object.keys(finalElements).length,+ url: page.url(),+ timestamp: new Date().toISOString(),+ },+ timing: {+ total_time_ms: totalTime,+ snapshot_time_ms: snapshotTime,+ coordinate_enrichment_time_ms: 0, // Integrated into mapping+ aria_mapping_time_ms: mappingTime,+ },+ };+ } catch (error) {+ console.error('Failed to get AI snapshot with native mapping:', error);+ const totalTime = Date.now() - startTime;++ return {+ snapshot: 'Error: Unable to capture page snapshot',+ elements: {},+ metadata: {+ elementCount: 0,+ url: page.url(),+ timestamp: new Date().toISOString(),+ },+ timing: {+ total_time_ms: totalTime,+ snapshot_time_ms: 0,+ coordinate_enrichment_time_ms: 0,+ aria_mapping_time_ms: 0,+ },+ };+ }+ }++++ /**+ * Enhanced click implementation with new tab detection and scroll fix+ */+ private async performClick(page: Page, ref: string): Promise<{ success: boolean; method?: string; error?: string; newTabId?: string }> {++ try {+ // Ensure we have the latest snapshot and mapping+ await (page as any)._snapshotForAI();++ // Use Playwright's aria-ref selector engine+ const selector = `aria-ref=${ref}`;++ // Check if element exists+ const element = await page.locator(selector).first();+ const exists = await element.count() > 0;++ if (!exists) {+ return { success: false, error: `Element with ref ${ref} not found` };+ }++ // Check element properties+ const browserConfig = this.configLoader.getBrowserConfig();+ const target = await element.getAttribute(browserConfig.targetAttribute);+ const href = await element.getAttribute(browserConfig.hrefAttribute);+ const onclick = await element.getAttribute(browserConfig.onclickAttribute);+ const tagName = await element.evaluate(el => el.tagName.toLowerCase());++ // Check if element naturally opens new tab+ const naturallyOpensNewTab = (+ target === browserConfig.blankTarget ||+ (onclick && onclick.includes(browserConfig.windowOpenString)) ||+ (tagName === 'a' && href && (href.includes(`javascript:${browserConfig.windowOpenString}`) || href.includes(browserConfig.blankTarget)))+ );++ // Open ALL links in new tabs+ // Check if this is a navigable link+ const isNavigableLink = tagName === 'a' && href &&+ !href.startsWith(browserConfig.anchorOnly) && // Not an anchor link+ !href.startsWith(browserConfig.javascriptVoidPrefix) && // Not a void javascript+ href !== browserConfig.javascriptVoidEmpty && // Not empty javascript+ href !== browserConfig.anchorOnly; // Not just #++ const shouldOpenNewTab = naturallyOpensNewTab || isNavigableLink;+++ if (shouldOpenNewTab) {+ // Handle new tab opening++ // If it's a link that doesn't naturally open in new tab, force it+ if (isNavigableLink && !naturallyOpensNewTab) {+ await element.evaluate((el, blankTarget) => {+ if (el.tagName.toLowerCase() === 'a') {+ el.setAttribute('target', blankTarget);+ }+ }, browserConfig.blankTarget);+ }++ // Set up popup listener before clicking+ const popupPromise = page.context().waitForEvent('page', { timeout: browserConfig.popupTimeout });++ // Click with force to avoid scrolling issues+ await element.click({ force: browserConfig.forceClick });++ try {+ // Wait for new page to open+ const newPage = await popupPromise;++ // Generate tab ID for the new page+ const newTabId = this.generateTabId();+ this.pages.set(newTabId, newPage);++ // Set up page properties+ const browserConfig = this.configLoader.getBrowserConfig();+ newPage.setDefaultNavigationTimeout(browserConfig.navigationTimeout);+ newPage.setDefaultTimeout(browserConfig.navigationTimeout);+++ // Automatically switch to the new tab+ this.currentTabId = newTabId;+ await newPage.bringToFront();++ // Wait for new page to be ready+ await newPage.waitForLoadState('domcontentloaded', { timeout: browserConfig.popupTimeout }).catch(() => {});++ return { success: true, method: 'playwright-aria-ref-newtab', newTabId };+ } catch (popupError) {+ return { success: true, method: 'playwright-aria-ref' };+ }+ } else {+ // Add options to prevent scrolling issues+ try {+ // First try normal click+ const browserConfig = this.configLoader.getBrowserConfig();+ await element.click({ timeout: browserConfig.clickTimeout });+ } catch (clickError) {+ // If normal click fails due to scrolling, try force click+ await element.click({ force: browserConfig.forceClick });+ }++ return { success: true, method: 'playwright-aria-ref' };+ }++ } catch (error) {+ console.error('[performClick] Exception during click for ref: %s', ref, error);+ return { success: false, error: `Click failed with exception: ${error}` };+ }+ }++ /**+ * Simplified type implementation using Playwright's aria-ref selector+ */+ private async performType(page: Page, ref: string, text: string): Promise<{ success: boolean; error?: string }> {+ try {+ // Ensure we have the latest snapshot+ await (page as any)._snapshotForAI();++ // Use Playwright's aria-ref selector+ const selector = `aria-ref=${ref}`;+ const element = await page.locator(selector).first();++ const exists = await element.count() > 0;+ if (!exists) {+ return { success: false, error: `Element with ref ${ref} not found` };+ }++ // Type text using Playwright's built-in fill method+ await element.fill(text);++ return { success: true };+ } catch (error) {+ return { success: false, error: `Type failed: ${error}` };+ }+ }++ /**+ * Simplified select implementation using Playwright's aria-ref selector+ */+ private async performSelect(page: Page, ref: string, value: string): Promise<{ success: boolean; error?: string }> {+ try {+ // Ensure we have the latest snapshot+ await (page as any)._snapshotForAI();++ // Use Playwright's aria-ref selector+ const selector = `aria-ref=${ref}`;+ const element = await page.locator(selector).first();++ const exists = await element.count() > 0;+ if (!exists) {+ return { success: false, error: `Element with ref ${ref} not found` };+ }++ // Select value using Playwright's built-in selectOption method+ await element.selectOption(value);++ return { success: true };+ } catch (error) {+ return { success: false, error: `Select failed: ${error}` };+ }+ }++++ async executeAction(action: BrowserAction): Promise<ActionResult> {+ const startTime = Date.now();+ const page = await this.getCurrentPage();++ let elementSearchTime = 0;+ let actionExecutionTime = 0;+ let stabilityWaitTime = 0;++ try {+ const elementSearchStart = Date.now();++ // No need to pre-fetch snapshot - each action method handles this++ let newTabId: string | undefined;++ switch (action.type) {+ case 'click': {+ elementSearchTime = Date.now() - elementSearchStart;+ const clickStart = Date.now();++ // Use simplified click logic+ const clickResult = await this.performClick(page, action.ref);++ if (!clickResult.success) {+ throw new Error(`Click failed: ${clickResult.error}`);+ }++ // Capture new tab ID if present+ newTabId = clickResult.newTabId;++ actionExecutionTime = Date.now() - clickStart;+ break;+ }++ case 'type': {+ elementSearchTime = Date.now() - elementSearchStart;+ const typeStart = Date.now();++ const typeResult = await this.performType(page, action.ref, action.text);++ if (!typeResult.success) {+ throw new Error(`Type failed: ${typeResult.error}`);+ }++ actionExecutionTime = Date.now() - typeStart;+ break;+ }++ case 'select': {+ elementSearchTime = Date.now() - elementSearchStart;+ const selectStart = Date.now();++ const selectResult = await this.performSelect(page, action.ref, action.value);++ if (!selectResult.success) {+ throw new Error(`Select failed: ${selectResult.error}`);+ }++ actionExecutionTime = Date.now() - selectStart;+ break;+ }++ case 'scroll': {+ elementSearchTime = Date.now() - elementSearchStart;+ const scrollStart = Date.now();+ const scrollAmount = action.direction === 'up' ? -action.amount : action.amount;+ await page.evaluate((amount: number) => {+ window.scrollBy(0, amount);+ }, scrollAmount);+ // Update scroll position tracking+ await this.getCurrentScrollPosition();+ actionExecutionTime = Date.now() - scrollStart;+ break;+ }++ case 'enter': {+ elementSearchTime = Date.now() - elementSearchStart;+ const enterStart = Date.now();+ const browserConfig = this.configLoader.getBrowserConfig();+ await page.keyboard.press(browserConfig.enterKey);+ actionExecutionTime = Date.now() - enterStart;+ break;+ }++ default:+ throw new Error(`Unknown action type: ${(action as any).type}`);+ }++ // Wait for stability after action+ const stabilityStart = Date.now();+ const stabilityResult = await this.waitForPageStability(page);+ stabilityWaitTime = Date.now() - stabilityStart;++ const totalTime = Date.now() - startTime;++ return {+ success: true,+ message: `Action ${action.type} executed successfully`,+ timing: {+ total_time_ms: totalTime,+ element_search_time_ms: elementSearchTime,+ action_execution_time_ms: actionExecutionTime,+ stability_wait_time_ms: stabilityWaitTime,+ dom_content_loaded_time_ms: stabilityResult.domContentLoadedTime,+ network_idle_time_ms: stabilityResult.networkIdleTime,+ },+ ...(newTabId && { newTabId }), // Include new tab ID if present+ };+ } catch (error) {+ const totalTime = Date.now() - startTime;+ return {+ success: false,+ message: `Action ${action.type} failed: ${error}`,+ timing: {+ total_time_ms: totalTime,+ element_search_time_ms: elementSearchTime,+ action_execution_time_ms: actionExecutionTime,+ stability_wait_time_ms: stabilityWaitTime,+ },+ };+ }+ }++ private async waitForPageStability(page: Page): Promise<{ domContentLoadedTime: number; networkIdleTime: number }> {+ let domContentLoadedTime = 0;+ let networkIdleTime = 0;++ try {+ const domStart = Date.now();+ const browserConfig = this.configLoader.getBrowserConfig();+ await page.waitForLoadState(browserConfig.domContentLoadedState as any, { timeout: browserConfig.pageStabilityTimeout });+ domContentLoadedTime = Date.now() - domStart;++ const networkStart = Date.now();+ await page.waitForLoadState(browserConfig.networkIdleState as any, { timeout: browserConfig.networkIdleTimeout });+ networkIdleTime = Date.now() - networkStart;+ } catch (error) {+ // Continue even if stability wait fails+ }++ return { domContentLoadedTime, networkIdleTime };+ }++ async visitPage(url: string): Promise<ActionResult & { newTabId?: string }> {+ const startTime = Date.now();++ try {+ // Get current page to check if it's blank+ const currentPage = await this.getCurrentPage();+ const currentUrl = currentPage.url();++ // Check if current page is blank or if this is the first navigation+ const browserConfig = this.configLoader.getBrowserConfig();+ const isBlankPage = (+ browserConfig.blankPageUrls.includes(currentUrl) ||+ currentUrl === browserConfig.defaultStartUrl ||+ currentUrl.startsWith(browserConfig.dataUrlPrefix) // data URLs are often used for blank pages+ );++ const shouldUseCurrentTab = isBlankPage || !this.hasNavigatedBefore;+++ if (shouldUseCurrentTab) {+ // Navigate in current tab if it's blank++ const navigationStart = Date.now();+ const browserConfig = this.configLoader.getBrowserConfig();+ await currentPage.goto(url, {+ timeout: browserConfig.navigationTimeout,+ waitUntil: browserConfig.domContentLoadedState as any+ });++ // Reset scroll position after navigation+ this.scrollPosition = { x: 0, y: 0 };++ // Mark that we've navigated+ this.hasNavigatedBefore = true;++ const navigationTime = Date.now() - navigationStart;+ const stabilityResult = await this.waitForPageStability(currentPage);+ const totalTime = Date.now() - startTime;++ return {+ success: true,+ message: `Navigated to ${url}`,+ timing: {+ total_time_ms: totalTime,+ navigation_time_ms: navigationTime,+ dom_content_loaded_time_ms: stabilityResult.domContentLoadedTime,+ network_idle_time_ms: stabilityResult.networkIdleTime,+ },+ };+ } else {+ // Open in new tab if current page has content+ if (!this.context) {+ throw new Error('Browser context not initialized');+ }+++ const navigationStart = Date.now();++ // Create a new page (tab)+ const newPage = await this.context.newPage();++ // Generate tab ID for the new page+ const newTabId = this.generateTabId();+ this.pages.set(newTabId, newPage);++ // Set up page properties+ const browserConfig = this.configLoader.getBrowserConfig();+ newPage.setDefaultNavigationTimeout(browserConfig.navigationTimeout);+ newPage.setDefaultTimeout(browserConfig.navigationTimeout);++ // Navigate to the URL+ await newPage.goto(url, {+ timeout: browserConfig.navigationTimeout,+ waitUntil: browserConfig.domContentLoadedState as any+ });++ // Automatically switch to the new tab+ this.currentTabId = newTabId;+ await newPage.bringToFront();++ // Reset scroll position for the new page+ this.scrollPosition = { x: 0, y: 0 };++ // Mark that we've navigated+ this.hasNavigatedBefore = true;++ const navigationTime = Date.now() - navigationStart;+ const stabilityResult = await this.waitForPageStability(newPage);+ const totalTime = Date.now() - startTime;++ return {+ success: true,+ message: `Opened ${url} in new tab`,+ newTabId: newTabId, // Include the new tab ID+ timing: {+ total_time_ms: totalTime,+ navigation_time_ms: navigationTime,+ dom_content_loaded_time_ms: stabilityResult.domContentLoadedTime,+ network_idle_time_ms: stabilityResult.networkIdleTime,+ },+ };+ }+ } catch (error) {+ const totalTime = Date.now() - startTime;+ return {+ success: false,+ message: `Navigation to ${url} failed: ${error}`,+ timing: {+ total_time_ms: totalTime,+ navigation_time_ms: 0,+ dom_content_loaded_time_ms: 0,+ network_idle_time_ms: 0,+ },+ };+ }+ }++ async switchToTab(tabId: string): Promise<boolean> {+ if (!this.pages.has(tabId)) {+ return false;+ }++ const page = this.pages.get(tabId)!;++ if (page.isClosed()) {+ this.pages.delete(tabId);+ return false;+ }++ try {+ console.log(`Switching to tab ${tabId}`);++ // Update internal state first+ this.currentTabId = tabId;++ // Try to activate the tab using a gentler approach+ // Instead of bringToFront, we'll use a combination of methods+ try {+ // Method 1: Evaluate focus in the page context+ await page.evaluate(() => {+ // Focus the window+ window.focus();+ // Dispatch a focus event+ window.dispatchEvent(new Event('focus'));+ }).catch(() => {});++ // Method 2: For non-headless mode, schedule bringToFront asynchronously+ // This prevents WebSocket disruption by not blocking the current operation+ if (!this.configLoader.getBrowserConfig().headless) {+ // Use Promise to handle async operation without await+ Promise.resolve().then(async () => {+ // Small delay to ensure WebSocket message is processed+ const browserConfig = this.configLoader.getBrowserConfig();+ await new Promise(resolve => setTimeout(resolve, browserConfig.navigationDelay));+ try {+ await page.bringToFront();+ } catch (e) {+ // Silently ignore - tab switching still works internally+ console.debug(`bringToFront failed for ${tabId}, but tab is switched internally`);+ }+ });+ }+ } catch (error) {+ // Log but don't fail - internal state is still updated+ console.warn(`Tab focus warning for ${tabId}:`, error);+ }++ console.log(`Successfully switched to tab ${tabId}`);+ return true;+ } catch (error) {+ console.error(`Error switching to tab ${tabId}:`, error);+ return false;+ }+ }++ async closeTab(tabId: string): Promise<boolean> {+ if (!this.pages.has(tabId)) {+ return false;+ }++ const page = this.pages.get(tabId)!;++ if (!page.isClosed()) {+ await page.close();+ }++ this.pages.delete(tabId);++ if (tabId === this.currentTabId) {+ const remainingTabs = Array.from(this.pages.keys());+ if (remainingTabs.length > 0) {+ this.currentTabId = remainingTabs[0];+ } else {+ this.currentTabId = null;+ }+ }++ return true;+ }++ async getTabInfo(): Promise<TabInfo[]> {+ const tabInfo: TabInfo[] = [];++ for (const [tabId, page] of this.pages) {+ if (!page.isClosed()) {+ try {+ const title = await page.title();+ const url = page.url();++ tabInfo.push({+ tab_id: tabId,+ title,+ url,+ is_current: tabId === this.currentTabId,+ });+ } catch (error) {+ // Skip tabs that can't be accessed+ }+ }+ }++ return tabInfo;+ }++ async takeScreenshot(): Promise<{ buffer: Buffer; timing: { screenshot_time_ms: number } }> {+ const startTime = Date.now();+ const page = await this.getCurrentPage();++ const browserConfig = this.configLoader.getBrowserConfig();+ const buffer = await page.screenshot({+ timeout: browserConfig.screenshotTimeout,+ fullPage: browserConfig.fullPageScreenshot+ });++ const screenshotTime = Date.now() - startTime;++ return {+ buffer,+ timing: {+ screenshot_time_ms: screenshotTime,+ },+ };+ }++ async close(): Promise<void> {+ for (const page of this.pages.values()) {+ if (!page.isClosed()) {+ await page.close();+ }+ }++ this.pages.clear();+ this.currentTabId = null;++ if (this.context) {+ await this.context.close();+ this.context = null;+ }++ if (this.browser) {+ await this.browser.close();+ this.browser = null;+ }+ }++ private filterElementsInViewport(+ elements: Record<string, SnapshotElement>,+ viewport: { width: number, height: number },+ scrollPos: { x: number, y: number }+ ): Record<string, SnapshotElement> {+ const filtered: Record<string, SnapshotElement> = {};+++ // Apply viewport filtering with scroll position adjustment+ const browserConfig = this.configLoader.getBrowserConfig();+ const adjustedScrollPos = {+ x: scrollPos.x * browserConfig.scrollPositionScale,+ y: scrollPos.y * browserConfig.scrollPositionScale+ };++ for (const [ref, element] of Object.entries(elements)) {+ // If element has no coordinates, include it (fallback)+ if (!element.coordinates) {+ filtered[ref] = element;+ continue;+ }++ const { x, y, width, height } = element.coordinates;++ // Calculate viewport bounds using adjusted scroll position+ const viewportLeft = adjustedScrollPos.x;+ const viewportTop = adjustedScrollPos.y;+ const viewportRight = adjustedScrollPos.x + viewport.width;+ const viewportBottom = adjustedScrollPos.y + viewport.height;++ // Check if element is visible in current viewport+ // Element is visible if it overlaps with viewport bounds+ const isVisible = (+ x < viewportRight && // Left edge is before viewport right+ y < viewportBottom && // Top edge is before viewport bottom+ x + width > viewportLeft && // Right edge is after viewport left+ y + height > viewportTop // Bottom edge is after viewport top+ );++ if (isVisible) {+ filtered[ref] = element;+ }+ }++ return filtered;+ }++ private rebuildSnapshotText(originalSnapshot: string, filteredElements: Record<string, SnapshotElement>): string {+ const lines = originalSnapshot.split('\n');+ const filteredLines: string[] = [];++ for (const line of lines) {+ const refMatch = line.match(/\[ref=([^\]]+)\]/);++ if (refMatch) {+ const ref = refMatch[1];+ // Only include lines for elements that passed viewport filtering+ if (filteredElements[ref]) {+ filteredLines.push(line);+ }+ } else {+ // Include non-element lines (headers, etc.)+ filteredLines.push(line);+ }+ }++ return filteredLines.join('\n');+ }++}\ No newline at end of filediff --git a/camel/toolkits/hybrid_browser_toolkit/ts/src/config-loader.ts b/camel/toolkits/hybrid_browser_toolkit/ts/src/config-loader.tsnew file mode 100644index 000000000..ef1a8f6c6--- /dev/null+++ b/camel/toolkits/hybrid_browser_toolkit/ts/src/config-loader.ts@@ -0,0 +1,216 @@+export interface StealthConfig {+ enabled: boolean;+ args?: string[];+ userAgent?: string;+ extraHTTPHeaders?: Record<string, string>;+}++export interface BrowserConfig {+ // Browser configuration+ headless: boolean;+ userDataDir?: string;+ stealth: StealthConfig;++ // Default settings+ defaultStartUrl: string;++ // Timeout configurations (in milliseconds)+ defaultTimeout?: number;+ shortTimeout?: number;+ navigationTimeout: number;+ networkIdleTimeout: number;+ screenshotTimeout: number;+ pageStabilityTimeout: number;+ domContentLoadedTimeout: number;++ // Action timeouts+ popupTimeout: number;+ clickTimeout: number;++ // Tab management+ tabIdPrefix: string;+ tabCounterPadding: number;++ // Scroll and positioning+ scrollPositionScale: number;+ navigationDelay: number;++ // Page states and URLs+ blankPageUrls: string[];+ dataUrlPrefix: string;++ // Wait states+ domContentLoadedState: string;+ networkIdleState: string;++ // HTML attributes+ targetAttribute: string;+ hrefAttribute: string;+ onclickAttribute: string;++ // Target and navigation values+ blankTarget: string;+ windowOpenString: string;+ javascriptVoidPrefix: string;+ javascriptVoidEmpty: string;+ anchorOnly: string;++ // Action options+ forceClick: boolean;+ fullPageScreenshot: boolean;++ // Keyboard keys+ enterKey: string;++ // Other options+ useNativePlaywrightMapping: boolean;+ viewport: {+ width: number;+ height: number;+ };+}++export interface WebSocketConfig {+ browser_log_to_file: boolean;+ session_id?: string;+ viewport_limit: boolean;+}++// Default stealth configuration+function getDefaultStealthConfig(): StealthConfig {+ return {+ enabled: false,+ args: [+ '--disable-blink-features=AutomationControlled',+ '--disable-dev-shm-usage',+ '--disable-features=VizDisplayCompositor',+ '--no-first-run',+ '--no-default-browser-check',+ '--no-sandbox',+ '--disable-setuid-sandbox',+ ],+ userAgent: undefined,+ extraHTTPHeaders: {}+ };+}++// Default configuration helper function+function getDefaultBrowserConfig(): BrowserConfig {+ return {+ headless: true,+ stealth: getDefaultStealthConfig(),+ defaultStartUrl: 'https://google.com/',+ navigationTimeout: 30000,+ networkIdleTimeout: 5000,+ screenshotTimeout: 15000,+ pageStabilityTimeout: 1500,+ domContentLoadedTimeout: 5000,+ popupTimeout: 5000,+ clickTimeout: 3000,+ tabIdPrefix: 'tab-',+ tabCounterPadding: 3,+ scrollPositionScale: 0.1,+ navigationDelay: 100,+ blankPageUrls: ['about:blank', ''],+ dataUrlPrefix: 'data:',+ domContentLoadedState: 'domcontentloaded',+ networkIdleState: 'networkidle',+ targetAttribute: 'target',+ hrefAttribute: 'href',+ onclickAttribute: 'onclick',+ blankTarget: '_blank',+ windowOpenString: 'window.open',+ javascriptVoidPrefix: 'javascript:void',+ javascriptVoidEmpty: 'javascript:;',+ anchorOnly: '#',+ forceClick: true,+ fullPageScreenshot: false,+ enterKey: 'Enter',+ useNativePlaywrightMapping: true,+ viewport: {+ width: 1280,+ height: 720+ }+ };+}++function getDefaultWebSocketConfig(): WebSocketConfig {+ return {+ browser_log_to_file: false,+ viewport_limit: false+ };+}++export class ConfigLoader {+ private browserConfig: BrowserConfig;+ private wsConfig: WebSocketConfig;++ constructor(+ browserConfig: Partial<BrowserConfig> = {},+ wsConfig: Partial<WebSocketConfig> = {}+ ) {+ const defaultConfig = getDefaultBrowserConfig();+ this.browserConfig = {+ ...defaultConfig,+ ...browserConfig,+ stealth: {+ ...defaultConfig.stealth,+ ...(browserConfig.stealth || {})+ }+ };++ this.wsConfig = {+ ...getDefaultWebSocketConfig(),+ ...wsConfig+ };+ }++ getBrowserConfig(): BrowserConfig {+ return { ...this.browserConfig };+ }++ getWebSocketConfig(): WebSocketConfig {+ return { ...this.wsConfig };+ }+++++ // Merge from Python config format+ static fromPythonConfig(config: any): ConfigLoader {+ const browserConfig: Partial<BrowserConfig> = {};+ const wsConfig: Partial<WebSocketConfig> = {};++ // Map Python config to TypeScript config+ if (config.headless !== undefined) browserConfig.headless = config.headless;+ if (config.userDataDir !== undefined) browserConfig.userDataDir = config.userDataDir;+ if (config.stealth !== undefined) {+ // Handle both boolean and object formats for backward compatibility+ if (typeof config.stealth === 'boolean') {+ browserConfig.stealth = {+ enabled: config.stealth,+ args: getDefaultStealthConfig().args+ };+ } else {+ browserConfig.stealth = config.stealth;+ }+ }+ if (config.defaultStartUrl !== undefined) browserConfig.defaultStartUrl = config.defaultStartUrl;+ if (config.navigationTimeout !== undefined) browserConfig.navigationTimeout = config.navigationTimeout;+ if (config.networkIdleTimeout !== undefined) browserConfig.networkIdleTimeout = config.networkIdleTimeout;+ if (config.screenshotTimeout !== undefined) browserConfig.screenshotTimeout = config.screenshotTimeout;+ if (config.pageStabilityTimeout !== undefined) browserConfig.pageStabilityTimeout = config.pageStabilityTimeout;++ if (config.browser_log_to_file !== undefined) wsConfig.browser_log_to_file = config.browser_log_to_file;+ if (config.session_id !== undefined) wsConfig.session_id = config.session_id;+ if (config.viewport_limit !== undefined) wsConfig.viewport_limit = config.viewport_limit;++ return new ConfigLoader(browserConfig, wsConfig);+ }++ // Get stealth configuration for browser launch+ getStealthConfig(): StealthConfig {+ return { ...this.browserConfig.stealth };+ }++}\ No newline at end of filediff --git a/camel/toolkits/hybrid_browser_toolkit/ts/src/hybrid-browser-toolkit.ts b/camel/toolkits/hybrid_browser_toolkit/ts/src/hybrid-browser-toolkit.tsnew file mode 100644index 000000000..2623f985d--- /dev/null+++ b/camel/toolkits/hybrid_browser_toolkit/ts/src/hybrid-browser-toolkit.ts@@ -0,0 +1,522 @@+import {HybridBrowserSession} from './browser-session';+import {ActionResult, BrowserAction, BrowserToolkitConfig, SnapshotResult, TabInfo, VisualMarkResult} from './types';+import {ConfigLoader} from './config-loader';++export class HybridBrowserToolkit {+ private session: HybridBrowserSession;+ private config: BrowserToolkitConfig;+ private configLoader: ConfigLoader;+ private viewportLimit: boolean;++ constructor(config: BrowserToolkitConfig = {}) {+ this.configLoader = ConfigLoader.fromPythonConfig(config);+ this.config = config; // Store original config for backward compatibility+ this.session = new HybridBrowserSession(this.configLoader.getBrowserConfig()); // Pass processed config+ this.viewportLimit = this.configLoader.getWebSocketConfig().viewport_limit;+ }++ async openBrowser(startUrl?: string): Promise<ActionResult> {+ const startTime = Date.now();++ try {+ await this.session.ensureBrowser();++ const url = startUrl || this.config.defaultStartUrl || 'https://google.com/';+ const result = await this.session.visitPage(url);++ const snapshotStart = Date.now();+ const snapshot = await this.getPageSnapshot(this.viewportLimit);+ const snapshotTime = Date.now() - snapshotStart;++ const totalTime = Date.now() - startTime;++ return {+ success: true,+ message: `Browser opened and navigated to ${url}`,+ snapshot,+ timing: {+ total_time_ms: totalTime,+ ...result.timing,+ snapshot_time_ms: snapshotTime,+ },+ };+ } catch (error) {+ const totalTime = Date.now() - startTime;+ return {+ success: false,+ message: `Failed to open browser: ${error}`,+ timing: {+ total_time_ms: totalTime,+ },+ };+ }+ }++ async closeBrowser(): Promise<ActionResult> {+ try {+ await this.session.close();+ return {+ success: true,+ message: 'Browser closed successfully',+ };+ } catch (error) {+ return {+ success: false,+ message: `Failed to close browser: ${error}`,+ };+ }+ }++ async visitPage(url: string): Promise<any> {+ const result = await this.session.visitPage(url);++ // Format response for Python layer compatibility+ const response: any = {+ result: result.message,+ snapshot: '',+ };++ if (result.success) {+ const snapshotStart = Date.now();+ response.snapshot = await this.getPageSnapshot(this.viewportLimit);+ const snapshotTime = Date.now() - snapshotStart;++ if (result.timing) {+ result.timing.snapshot_time_ms = snapshotTime;+ }+ }++ // Include timing if available+ if (result.timing) {+ response.timing = result.timing;+ }++ // Include newTabId if present+ if (result.newTabId) {+ response.newTabId = result.newTabId;+ }++ return response;+ }++ async getPageSnapshot(viewportLimit: boolean = false): Promise<string> {+ try {+ // If viewport limiting is enabled, we need coordinates for filtering+ const snapshotResult = await this.session.getSnapshotForAI(viewportLimit, viewportLimit);+ return snapshotResult.snapshot;+ } catch (error) {+ return `Error capturing snapshot: ${error}`;+ }+ }+++ async getSnapshotForAI(): Promise<SnapshotResult> {+ return await this.session.getSnapshotForAI();+ }++ async getSomScreenshot(): Promise<VisualMarkResult & { timing: any }> {+ const startTime = Date.now();++ try {+ const screenshotResult = await this.session.takeScreenshot();+ const snapshotResult = await this.session.getSnapshotForAI(true); // Include coordinates for SOM_mark++ // Add visual marks using improved method+ const markingStart = Date.now();+ const markedImageBuffer = await this.addVisualMarksOptimized(screenshotResult.buffer, snapshotResult);+ const markingTime = Date.now() - markingStart;++ const base64Image = markedImageBuffer.toString('base64');+ const dataUrl = `data:image/png;base64,${base64Image}`;++ const totalTime = Date.now() - startTime;++ // Count elements with coordinates+ const elementsWithCoords = Object.values(snapshotResult.elements).filter(el => el.coordinates).length;++ return {+ text: `Visual webpage screenshot captured with ${Object.keys(snapshotResult.elements).length} interactive elements (${elementsWithCoords} marked visually)`,+ images: [dataUrl],+ timing: {+ total_time_ms: totalTime,+ screenshot_time_ms: screenshotResult.timing.screenshot_time_ms,+ snapshot_time_ms: snapshotResult.timing.snapshot_time_ms,+ coordinate_enrichment_time_ms: snapshotResult.timing.coordinate_enrichment_time_ms,+ visual_marking_time_ms: markingTime,+ },+ };+ } catch (error) {+ const totalTime = Date.now() - startTime;+ return {+ text: `Error capturing screenshot: ${error}`,+ images: [],+ timing: {+ total_time_ms: totalTime,+ screenshot_time_ms: 0,+ snapshot_time_ms: 0,+ coordinate_enrichment_time_ms: 0,+ visual_marking_time_ms: 0,+ },+ };+ }+ }++ private async addVisualMarksOptimized(screenshotBuffer: Buffer, snapshotResult: SnapshotResult): Promise<Buffer> {+ try {++ // Check if we have any elements with coordinates+ const elementsWithCoords = Object.entries(snapshotResult.elements)+ .filter(([ref, element]) => element.coordinates);++ if (elementsWithCoords.length === 0) {+ return screenshotBuffer;+ }++ // Parse clickable elements from snapshot text+ const clickableElements = this.parseClickableElements(snapshotResult.snapshot);++ // Use sharp for image processing+ const sharp = require('sharp');+ const page = await this.session.getCurrentPage();+ const viewport = page.viewportSize() || { width: 1280, height: 720 };++ // Filter elements visible in viewport+ const visibleElements = elementsWithCoords.filter(([ref, element]) => {+ const coords = element.coordinates!;+ return coords.x < viewport.width &&+ coords.y < viewport.height &&+ coords.x + coords.width > 0 &&+ coords.y + coords.height > 0;+ });++ // Remove overlapped elements (only keep topmost)+ const nonOverlappedElements = this.removeOverlappedElements(visibleElements);++ // Create SVG overlay with all the marks+ const marks = nonOverlappedElements.map(([ref, element]) => {+ const coords = element.coordinates!;+ const isClickable = clickableElements.has(ref);++ // Use original coordinates for elements within viewport+ // Clamp only to prevent marks from extending beyond screenshot bounds+ const x = Math.max(0, coords.x);+ const y = Math.max(0, coords.y);+ const maxWidth = viewport.width - x;+ const maxHeight = viewport.height - y;+ const width = Math.min(coords.width, maxWidth);+ const height = Math.min(coords.height, maxHeight);++ // Position text to be visible even if element is partially cut off+ const textX = Math.max(2, Math.min(x + 2, viewport.width - 40));+ const textY = Math.max(14, Math.min(y + 14, viewport.height - 4));++ // Different colors for clickable vs non-clickable elements+ const colors = isClickable ? {+ fill: 'rgba(0, 150, 255, 0.15)', // Blue for clickable+ stroke: '#0096FF',+ textFill: '#0096FF'+ } : {+ fill: 'rgba(255, 107, 107, 0.1)', // Red for non-clickable+ stroke: '#FF6B6B',+ textFill: '#FF6B6B'+ };++ return `+ <rect x="${x}" y="${y}" width="${width}" height="${height}"+ fill="${colors.fill}" stroke="${colors.stroke}" stroke-width="2" rx="2"/>+ <text x="${textX}" y="${textY}" font-family="Arial, sans-serif"+ font-size="12" fill="${colors.textFill}" font-weight="bold">${ref}</text>+ `;+ }).join('');++ const svgOverlay = `+ <svg width="${viewport.width}" height="${viewport.height}" xmlns="http://www.w3.org/2000/svg">+ ${marks}+ </svg>+ `;++ // Composite the overlay onto the screenshot+ const markedImageBuffer = await sharp(screenshotBuffer)+ .composite([{+ input: Buffer.from(svgOverlay),+ top: 0,+ left: 0+ }])+ .png()+ .toBuffer();++ return markedImageBuffer;++ } catch (error) {+ // Error adding visual marks, falling back to original screenshot+ // Return original screenshot if marking fails+ return screenshotBuffer;+ }+ }++ /**+ * Parse clickable elements from snapshot text+ */+ private parseClickableElements(snapshotText: string): Set<string> {+ const clickableElements = new Set<string>();+ const lines = snapshotText.split('\n');++ for (const line of lines) {+ // Look for lines containing [cursor=pointer] and extract ref+ if (line.includes('[cursor=pointer]')) {+ const refMatch = line.match(/\[ref=([^\]]+)\]/);+ if (refMatch) {+ clickableElements.add(refMatch[1]);+ }+ }+ }++ return clickableElements;+ }++ /**+ * Remove overlapped elements, keeping only the topmost (last in DOM order)+ */+ private removeOverlappedElements(elements: Array<[string, any]>): Array<[string, any]> {+ const result: Array<[string, any]> = [];++ for (let i = 0; i < elements.length; i++) {+ const [refA, elementA] = elements[i];+ const coordsA = elementA.coordinates!;+ let isOverlapped = false;++ // Check if this element is completely overlapped by any later element+ for (let j = i + 1; j < elements.length; j++) {+ const [refB, elementB] = elements[j];+ const coordsB = elementB.coordinates!;++ // Check if element A is completely covered by element B+ if (this.isCompletelyOverlapped(coordsA, coordsB)) {+ isOverlapped = true;+ break;+ }+ }++ if (!isOverlapped) {+ result.push(elements[i]);+ }+ }++ return result;+ }++ /**+ * Check if element A is completely overlapped by element B+ */+ private isCompletelyOverlapped(+ coordsA: { x: number; y: number; width: number; height: number },+ coordsB: { x: number; y: number; width: number; height: number }+ ): boolean {+ // A is completely overlapped by B if:+ // B's left edge is <= A's left edge AND+ // B's top edge is <= A's top edge AND+ // B's right edge is >= A's right edge AND+ // B's bottom edge is >= A's bottom edge+ return (+ coordsB.x <= coordsA.x &&+ coordsB.y <= coordsA.y &&+ coordsB.x + coordsB.width >= coordsA.x + coordsA.width &&+ coordsB.y + coordsB.height >= coordsA.y + coordsA.height+ );+ }++ private async executeActionWithSnapshot(action: BrowserAction): Promise<any> {+ const result = await this.session.executeAction(action);++ // Format response for Python layer compatibility+ const response: any = {+ result: result.message,+ snapshot: '',+ };++ if (result.success) {+ const snapshotStart = Date.now();+ response.snapshot = await this.getPageSnapshot(this.viewportLimit);+ const snapshotTime = Date.now() - snapshotStart;++ if (result.timing) {+ result.timing.snapshot_time_ms = snapshotTime;+ }+ }++ // Include timing if available+ if (result.timing) {+ response.timing = result.timing;+ }++ // Include newTabId if present+ if (result.newTabId) {+ response.newTabId = result.newTabId;+ }++ return response;+ }++ async click(ref: string): Promise<any> {+ const action: BrowserAction = { type: 'click', ref };+ return this.executeActionWithSnapshot(action);+ }++ async type(ref: string, text: string): Promise<any> {+ const action: BrowserAction = { type: 'type', ref, text };+ return this.executeActionWithSnapshot(action);+ }++ async select(ref: string, value: string): Promise<any> {+ const action: BrowserAction = { type: 'select', ref, value };+ return this.executeActionWithSnapshot(action);+ }++ async scroll(direction: 'up' | 'down', amount: number): Promise<any> {+ const action: BrowserAction = { type: 'scroll', direction, amount };+ return this.executeActionWithSnapshot(action);+ }++ async enter(): Promise<any> {+ const action: BrowserAction = { type: 'enter' };+ return this.executeActionWithSnapshot(action);+ }++ async back(): Promise<ActionResult> {+ const startTime = Date.now();++ try {+ const page = await this.session.getCurrentPage();++ const navigationStart = Date.now();+ await page.goBack({ waitUntil: 'domcontentloaded' });+ const navigationTime = Date.now() - navigationStart;++ const snapshotStart = Date.now();+ const snapshot = await this.getPageSnapshot(this.viewportLimit);+ const snapshotTime = Date.now() - snapshotStart;++ const totalTime = Date.now() - startTime;++ return {+ success: true,+ message: 'Navigated back successfully',+ snapshot,+ timing: {+ total_time_ms: totalTime,+ navigation_time_ms: navigationTime,+ snapshot_time_ms: snapshotTime,+ },+ };+ } catch (error) {+ const totalTime = Date.now() - startTime;+ return {+ success: false,+ message: `Back navigation failed: ${error}`,+ timing: {+ total_time_ms: totalTime,+ navigation_time_ms: 0,+ snapshot_time_ms: 0,+ },+ };+ }+ }++ async forward(): Promise<ActionResult> {+ const startTime = Date.now();++ try {+ const page = await this.session.getCurrentPage();++ const navigationStart = Date.now();+ await page.goForward({ waitUntil: 'domcontentloaded' });+ const navigationTime = Date.now() - navigationStart;++ const snapshotStart = Date.now();+ const snapshot = await this.getPageSnapshot(this.viewportLimit);+ const snapshotTime = Date.now() - snapshotStart;++ const totalTime = Date.now() - startTime;++ return {+ success: true,+ message: 'Navigated forward successfully',+ snapshot,+ timing: {+ total_time_ms: totalTime,+ navigation_time_ms: navigationTime,+ snapshot_time_ms: snapshotTime,+ },+ };+ } catch (error) {+ const totalTime = Date.now() - startTime;+ return {+ success: false,+ message: `Forward navigation failed: ${error}`,+ timing: {+ total_time_ms: totalTime,+ navigation_time_ms: 0,+ snapshot_time_ms: 0,+ },+ };+ }+ }+++ async switchTab(tabId: string): Promise<any> {+ const startTime = Date.now();++ try {+ const success = await this.session.switchToTab(tabId);++ if (success) {+ const snapshotStart = Date.now();+ const snapshot = await this.getPageSnapshot(this.viewportLimit);+ const snapshotTime = Date.now() - snapshotStart;++ const totalTime = Date.now() - startTime;++ return {+ result: `Switched to tab ${tabId}`,+ snapshot: snapshot,+ timing: {+ total_time_ms: totalTime,+ snapshot_time_ms: snapshotTime,+ },+ };+ } else {+ return {+ result: `Failed to switch to tab ${tabId}`,+ snapshot: '',+ };+ }+ } catch (error) {+ return {+ result: `Error switching tab: ${error}`,+ snapshot: '',+ };+ }+ }++ async closeTab(tabId: string): Promise<ActionResult> {+ const success = await this.session.closeTab(tabId);++ if (success) {+ return {+ success: true,+ message: `Closed tab ${tabId}`,+ snapshot: await this.getPageSnapshot(this.viewportLimit),+ };+ } else {+ return {+ success: false,+ message: `Failed to close tab ${tabId}`,+ };+ }+ }++ async getTabInfo(): Promise<TabInfo[]> {+ return await this.session.getTabInfo();+ }++}\ No newline at end of filediff --git a/camel/toolkits/hybrid_browser_toolkit/ts/src/index.ts b/camel/toolkits/hybrid_browser_toolkit/ts/src/index.tsnew file mode 100644index 000000000..70e5ff2fb--- /dev/null+++ b/camel/toolkits/hybrid_browser_toolkit/ts/src/index.ts@@ -0,0 +1,7 @@+export { HybridBrowserToolkit } from './hybrid-browser-toolkit';+export { HybridBrowserSession } from './browser-session';+export { ConfigLoader, StealthConfig, BrowserConfig, WebSocketConfig } from './config-loader';+export * from './types';++// Default export for convenience+export { HybridBrowserToolkit as default } from './hybrid-browser-toolkit';\ No newline at end of filediff --git a/camel/toolkits/hybrid_browser_toolkit/ts/src/types.ts b/camel/toolkits/hybrid_browser_toolkit/ts/src/types.tsnew file mode 100644index 000000000..8eea98582--- /dev/null+++ b/camel/toolkits/hybrid_browser_toolkit/ts/src/types.ts@@ -0,0 +1,108 @@+export interface SnapshotElement {+ ref: string;+ role: string;+ name: string;+ coordinates?: {+ x: number;+ y: number;+ width: number;+ height: number;+ };+ disabled?: boolean;+ checked?: boolean;+ expanded?: boolean;+ tagName?: string;+ [key: string]: any;+}+++export interface SnapshotResult {+ snapshot: string;+ elements: Record<string, SnapshotElement>;+ metadata: {+ elementCount: number;+ url: string;+ timestamp: string;+ };+}++export interface DetailedTiming {+ total_time_ms: number;+ navigation_time_ms?: number;+ page_load_time_ms?: number;+ stability_wait_time_ms?: number;+ dom_content_loaded_time_ms?: number;+ network_idle_time_ms?: number;+ snapshot_time_ms?: number;+ element_search_time_ms?: number;+ action_execution_time_ms?: number;+ screenshot_time_ms?: number;+ coordinate_enrichment_time_ms?: number;+ visual_marking_time_ms?: number;+ aria_mapping_time_ms?: number;+}++export interface ActionResult {+ success: boolean;+ message: string;+ snapshot?: string;+ details?: Record<string, any>;+ timing?: DetailedTiming;+ newTabId?: string; // ID of newly opened tab if click opened a new tab+}++export interface TabInfo {+ tab_id: string;+ title: string;+ url: string;+ is_current: boolean;+}++import { StealthConfig } from './config-loader';++export interface BrowserToolkitConfig {+ headless?: boolean;+ userDataDir?: string;+ stealth?: boolean | StealthConfig; // Support both legacy boolean and new object format+ defaultStartUrl?: string;+ navigationTimeout?: number;+ networkIdleTimeout?: number;+ screenshotTimeout?: number;+ pageStabilityTimeout?: number;+ useNativePlaywrightMapping?: boolean; // New option to control mapping implementation+}++export interface ClickAction {+ type: 'click';+ ref: string;+}++export interface TypeAction {+ type: 'type';+ ref: string;+ text: string;+}++export interface SelectAction {+ type: 'select';+ ref: string;+ value: string;+}++export interface ScrollAction {+ type: 'scroll';+ direction: 'up' | 'down';+ amount: number;+}++export interface EnterAction {+ type: 'enter';+}++export type BrowserAction = ClickAction | TypeAction | SelectAction | ScrollAction | EnterAction;++export interface VisualMarkResult {+ text: string;+ images: string[];+}+diff --git a/camel/toolkits/hybrid_browser_toolkit/ts/tsconfig.json b/camel/toolkits/hybrid_browser_toolkit/ts/tsconfig.jsonnew file mode 100644index 000000000..47676ecf7--- /dev/null+++ b/camel/toolkits/hybrid_browser_toolkit/ts/tsconfig.json@@ -0,0 +1,26 @@+{+ "compilerOptions": {+ "target": "ES2020",+ "module": "commonjs",+ "lib": ["ES2020", "DOM"],+ "outDir": "./dist",+ "rootDir": "./src",+ "strict": true,+ "esModuleInterop": true,+ "skipLibCheck": true,+ "forceConsistentCasingInFileNames": true,+ "declaration": true,+ "declarationMap": true,+ "sourceMap": true,+ "moduleResolution": "node",+ "resolveJsonModule": true+ },+ "include": [+ "src/**/*"+ ],+ "exclude": [+ "node_modules",+ "dist",+ "**/*.test.ts"+ ]+}\ No newline at end of filediff --git a/camel/toolkits/hybrid_browser_toolkit/ts/websocket-server.js b/camel/toolkits/hybrid_browser_toolkit/ts/websocket-server.jsnew file mode 100644index 000000000..5bfaf7d6a--- /dev/null+++ b/camel/toolkits/hybrid_browser_toolkit/ts/websocket-server.js@@ -0,0 +1,210 @@+const WebSocket = require('ws');+const { HybridBrowserToolkit } = require('./dist/index.js');++class WebSocketBrowserServer {+ constructor() {+ this.toolkit = null;+ this.port = 0; // Let the OS assign a free port+ this.server = null;+ }++ async start() {+ return new Promise((resolve, reject) => {+ this.server = new WebSocket.Server({+ port: this.port,+ maxPayload: 50 * 1024 * 1024 // 50MB limit instead of default 1MB+ }, () => {+ this.port = this.server.address().port;+ console.log(`WebSocket server started on port ${this.port}`);+ resolve(this.port);+ });++ this.server.on('connection', (ws) => {+ console.log('Client connected');++ ws.on('message', async (message) => {+ try {+ const data = JSON.parse(message.toString());+ const { id, command, params } = data;++ console.log(`Received command: ${command} with id: ${id}`);++ const result = await this.handleCommand(command, params);++ const response = {+ id,+ success: true,+ result+ };++ ws.send(JSON.stringify(response));+ } catch (error) {+ console.error('Error handling command:', error);++ const errorResponse = {+ id: data?.id || 'unknown',+ success: false,+ error: error.message,+ stack: error.stack+ };++ ws.send(JSON.stringify(errorResponse));+ }+ });++ ws.on('close', (code, reason) => {+ console.log('Client disconnected, code:', code, 'reason:', reason?.toString());+ // Clean up resources when client disconnects+ if (this.toolkit) {+ this.toolkit.closeBrowser().catch(err => {+ console.error('Error closing browser on disconnect:', err);+ });+ }+ });++ ws.on('error', (error) => {+ console.error('WebSocket error:', error);+ });+ });++ this.server.on('error', (error) => {+ console.error('Server error:', error);+ reject(error);+ });+ });+ }++ async handleCommand(command, params) {+ switch (command) {+ case 'init':+ console.log('Initializing toolkit with params:', JSON.stringify(params, null, 2));+ this.toolkit = new HybridBrowserToolkit(params);+ return { message: 'Toolkit initialized' };++ case 'open_browser':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.openBrowser(params.startUrl);++ case 'close_browser':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.closeBrowser();++ case 'visit_page':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.visitPage(params.url);++ case 'get_page_snapshot':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.getPageSnapshot(params.viewport_limit);++ case 'get_snapshot_for_ai':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.getSnapshotForAI();++ case 'get_som_screenshot': {+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ console.log('Starting screenshot...');+ const startTime = Date.now();+ const result = await this.toolkit.getSomScreenshot();+ const endTime = Date.now();+ console.log(`Screenshot completed in ${endTime - startTime}ms`);+ return result;+ }+ case 'click':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.click(params.ref);++ case 'type':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.type(params.ref, params.text);++ case 'select':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.select(params.ref, params.value);++ case 'scroll':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.scroll(params.direction, params.amount);++ case 'enter':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.enter();++ case 'back':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.back();++ case 'forward':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.forward();++ case 'switch_tab':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.switchTab(params.tabId);++ case 'close_tab':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.closeTab(params.tabId);++ case 'get_tab_info':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.getTabInfo();++ case 'wait_user':+ if (!this.toolkit) throw new Error('Toolkit not initialized');+ return await this.toolkit.waitUser(params.timeout);++ case 'shutdown':+ console.log('Shutting down server...');+ if (this.toolkit) {+ try {+ await this.toolkit.closeBrowser();+ } catch (error) {+ console.error('Error closing browser:', error);+ }+ }+ setTimeout(() => {+ process.exit(0);+ }, 1000);+ return { message: 'Server shutting down' };++ default:+ throw new Error(`Unknown command: ${command}`);+ }+ }++ async stop() {+ if (this.server) {+ this.server.close();+ console.log('WebSocket server stopped');+ }+ }+}++// Start server if this file is run directly+if (require.main === module) {+ const server = new WebSocketBrowserServer();++ server.start().then((port) => {+ // Output the port so the Python client can connect+ console.log(`SERVER_READY:${port}`);+ }).catch((error) => {+ console.error('Failed to start server:', error);+ process.exit(1);+ });++ // Handle graceful shutdown+ process.on('SIGINT', async () => {+ console.log('Received SIGINT, shutting down gracefully...');+ await server.stop();+ process.exit(0);+ });++ process.on('SIGTERM', async () => {+ console.log('Received SIGTERM, shutting down gracefully...');+ await server.stop();+ process.exit(0);+ });+}++module.exports = WebSocketBrowserServer;\ No newline at end of filediff --git a/camel/toolkits/hybrid_browser_toolkit/unified_analyzer.js b/camel/toolkits/hybrid_browser_toolkit/unified_analyzer.jsdeleted file mode 100644index 85ab2510f..000000000--- a/camel/toolkits/hybrid_browser_toolkit/unified_analyzer.js+++ /dev/null@@ -1,1002 +0,0 @@-(() => {- // Unified analyzer that combines visual and structural analysis- // Preserves complete snapshot.js logic while adding visual coordinate information-- // Memory management constants and configuration- const MAX_REFS = 2000; // Maximum number of refs to keep in memory- const MAX_UNUSED_AGE_MS = 90000; // Remove refs unused for more than xx seconds- const CLEANUP_THRESHOLD = 0.8; // Start aggressive cleanup when 80% of max refs reached-- // Persistent ref management across page analysis calls with memory leak prevention- let refCounter = window.__camelRefCounter || 1;- let elementRefMap = window.__camelElementRefMap || new WeakMap();- let refElementMap = window.__camelRefElementMap || new Map();- let elementSignatureMap = window.__camelElementSignatureMap || new Map();-- // LRU tracking for ref access times- let refAccessTimes = window.__camelRefAccessTimes || new Map();- let lastNavigationUrl = window.__camelLastNavigationUrl || window.location.href;-- // Initialize navigation event listeners for automatic cleanup- if (!window.__camelNavigationListenersInitialized) {- window.__camelNavigationListenersInitialized = true;-- // Listen for page navigation events- window.addEventListener('beforeunload', clearAllRefs);- window.addEventListener('pagehide', clearAllRefs);-- // Listen for pushState/replaceState navigation (SPA navigation)- const originalPushState = history.pushState;- const originalReplaceState = history.replaceState;-- history.pushState = function(...args) {- clearAllRefs();- return originalPushState.apply(this, args);- };-- history.replaceState = function(...args) {- clearAllRefs();- return originalReplaceState.apply(this, args);- };-- // Listen for popstate (back/forward navigation)- window.addEventListener('popstate', clearAllRefs);-- // Check for URL changes periodically (fallback for other navigation types)- setInterval(() => {- if (window.location.href !== lastNavigationUrl) {- clearAllRefs();- lastNavigationUrl = window.location.href;- window.__camelLastNavigationUrl = lastNavigationUrl;- }- }, 1000);- }-- function generateRef() {- const ref = `e${refCounter++}`;- // Persist counter globally- window.__camelRefCounter = refCounter;- return ref;- }-- // Clear all refs and reset memory state- function clearAllRefs() {- try {- // Clear all DOM aria-ref attributes- document.querySelectorAll('[aria-ref]').forEach(element => {- element.removeAttribute('aria-ref');- });-- // Clear all maps and reset counters- elementRefMap.clear();- refElementMap.clear();- elementSignatureMap.clear();- refAccessTimes.clear();-- // Reset global state- window.__camelElementRefMap = elementRefMap;- window.__camelRefElementMap = refElementMap;- window.__camelElementSignatureMap = elementSignatureMap;- window.__camelRefAccessTimes = refAccessTimes;-- // Clear cached analysis results- delete window.__camelLastAnalysisResult;- delete window.__camelLastAnalysisTime;-- console.log('CAMEL: Cleared all refs due to navigation');- } catch (error) {- console.warn('CAMEL: Error clearing refs:', error);- }- }-- // LRU eviction: Remove least recently used refs when limit exceeded- function evictLRURefs() {- const refsToEvict = refAccessTimes.size - MAX_REFS + Math.floor(MAX_REFS * 0.1); // Remove 10% extra for breathing room- if (refsToEvict <= 0) return 0;-- // Sort refs by access time (oldest first)- const sortedRefs = Array.from(refAccessTimes.entries())- .sort((a, b) => a[1] - b[1])- .slice(0, refsToEvict);-- let evictedCount = 0;- for (const [ref, _] of sortedRefs) {- const element = refElementMap.get(ref);- if (element) {- // Remove aria-ref attribute from DOM- try {- element.removeAttribute('aria-ref');- } catch (e) {- // Element might be detached from DOM- }- elementRefMap.delete(element);-- // Remove from signature map- const signature = generateElementSignature(element);- if (signature && elementSignatureMap.get(signature) === ref) {- elementSignatureMap.delete(signature);- }- }-- refElementMap.delete(ref);- refAccessTimes.delete(ref);- evictedCount++;- }-- // Persist updated maps- window.__camelElementRefMap = elementRefMap;- window.__camelRefElementMap = refElementMap;- window.__camelElementSignatureMap = elementSignatureMap;- window.__camelRefAccessTimes = refAccessTimes;-- return evictedCount;- }-- // Update ref access time for LRU tracking- function updateRefAccessTime(ref) {- refAccessTimes.set(ref, Date.now());- window.__camelRefAccessTimes = refAccessTimes;- }-- // Generate a unique signature for an element based on its characteristics- function generateElementSignature(element) {- if (!element || !element.tagName) return null;-- const tagName = element.tagName.toLowerCase();- const textContent = (element.textContent || '').trim().substring(0, 50);- const className = element.className || '';- const id = element.id || '';- const href = element.href || '';- const src = element.src || '';- const value = element.value || '';- const type = element.type || '';- const placeholder = element.placeholder || '';-- // Include position in DOM tree for uniqueness- let pathElements = [];- let current = element;- let depth = 0;- while (current && current.parentElement && depth < 5) {- const siblings = Array.from(current.parentElement.children);- const index = siblings.indexOf(current);- pathElements.unshift(`${current.tagName.toLowerCase()}[${index}]`);- current = current.parentElement;- depth++;- }- const domPath = pathElements.join('>');-- return `${tagName}|${textContent}|${className}|${id}|${href}|${src}|${value}|${type}|${placeholder}|${domPath}`;- }-- // Get or assign a persistent ref for an element- function getOrAssignRef(element) {- // Check if element already has a ref assigned- if (elementRefMap.has(element)) {- const existingRef = elementRefMap.get(element);- // Verify the ref is still valid- if (refElementMap.get(existingRef) === element) {- updateRefAccessTime(existingRef);- return existingRef;- }- }-- // Check if element has aria-ref attribute (from previous analysis)- const existingAriaRef = element.getAttribute('aria-ref');- if (existingAriaRef && refElementMap.get(existingAriaRef) === element) {- // Re-establish mappings- elementRefMap.set(element, existingAriaRef);- updateRefAccessTime(existingAriaRef);- return existingAriaRef;- }-- // Try to find element by signature (in case DOM was modified)- const signature = generateElementSignature(element);- if (signature && elementSignatureMap.has(signature)) {- const existingRef = elementSignatureMap.get(signature);- // Verify the old element is no longer in DOM or has changed- const oldElement = refElementMap.get(existingRef);- if (!oldElement || !document.contains(oldElement) || generateElementSignature(oldElement) !== signature) {- // Reassign the ref to the new element- elementRefMap.set(element, existingRef);- refElementMap.set(existingRef, element);- elementSignatureMap.set(signature, existingRef);- element.setAttribute('aria-ref', existingRef);- updateRefAccessTime(existingRef);- return existingRef;- }- }-- // Check if we need to evict refs before creating new ones- if (refElementMap.size >= MAX_REFS) {- evictLRURefs();- }-- // Generate new ref for new element- const newRef = generateRef();- elementRefMap.set(element, newRef);- refElementMap.set(newRef, element);- if (signature) {- elementSignatureMap.set(signature, newRef);- }- element.setAttribute('aria-ref', newRef);- updateRefAccessTime(newRef);- return newRef;- }-- // Enhanced cleanup function with aggressive stale ref removal- function cleanupStaleRefs() {- const staleRefs = [];- const currentTime = Date.now();- const isAggressiveCleanup = refElementMap.size > (MAX_REFS * CLEANUP_THRESHOLD);-- // Check all mapped elements to see if they're still in DOM or too old- for (const [ref, element] of refElementMap.entries()) {- let shouldRemove = false;-- // Standard checks: element not in DOM- if (!element || !document.contains(element)) {- shouldRemove = true;- }- // Aggressive cleanup: remove refs unused for too long- else if (isAggressiveCleanup) {- const lastAccess = refAccessTimes.get(ref) || 0;- const age = currentTime - lastAccess;- if (age > MAX_UNUSED_AGE_MS) {- shouldRemove = true;- }- }- // Additional checks for aggressive cleanup- else if (isAggressiveCleanup) {- // Remove refs for elements that are hidden or have no meaningful content- try {- const style = window.getComputedStyle(element);- const hasNoVisibleContent = !element.textContent?.trim() &&- !element.value?.trim() &&- !element.src &&- !element.href;-- if ((style.display === 'none' || style.visibility === 'hidden') && hasNoVisibleContent) {- shouldRemove = true;- }- } catch (e) {- // If we can't get computed style, element might be detached- shouldRemove = true;- }- }-- if (shouldRemove) {- staleRefs.push(ref);- }- }-- // Remove stale mappings- for (const ref of staleRefs) {- const element = refElementMap.get(ref);- if (element) {- // Remove aria-ref attribute from DOM- try {- element.removeAttribute('aria-ref');- } catch (e) {- // Element might be detached from DOM- }- elementRefMap.delete(element);-- // Remove from signature map- const signature = generateElementSignature(element);- if (signature && elementSignatureMap.get(signature) === ref) {- elementSignatureMap.delete(signature);- }- }- refElementMap.delete(ref);- refAccessTimes.delete(ref);- }-- // Persist maps globally- window.__camelElementRefMap = elementRefMap;- window.__camelRefElementMap = refElementMap;- window.__camelElementSignatureMap = elementSignatureMap;- window.__camelRefAccessTimes = refAccessTimes;-- return staleRefs.length;- }-- // === Complete snapshot.js logic preservation ===-- function isVisible(node) {- // Check if node is null or not a valid DOM node- if (!node || typeof node.nodeType === 'undefined') return false;- if (node.nodeType !== Node.ELEMENT_NODE) return true;-- try {- const style = window.getComputedStyle(node);- if (style.display === 'none' || style.visibility === 'hidden' || style.opacity === '0')- return false;- // An element with `display: contents` is not rendered itself, but its children are.- if (style.display === 'contents')- return true;- const rect = node.getBoundingClientRect();- return rect.width > 0 && rect.height > 0;- } catch (e) {- // If there's an error getting computed style or bounding rect, assume element is not visible- return false;- }- }-- // Optimized occlusion detection with fewer test points- function isOccluded(element) {- if (!element || element.nodeType !== Node.ELEMENT_NODE) return false;-- try {- const rect = element.getBoundingClientRect();- if (rect.width === 0 || rect.height === 0) return true;-- // Simplified: Use fewer test points for better performance- const testPoints = [- // Center point (most important)- { x: rect.left + rect.width * 0.5, y: rect.top + rect.height * 0.5, weight: 4 },- // Only test 4 strategic points instead of 9- { x: rect.left + rect.width * 0.25, y: rect.top + rect.height * 0.25, weight: 1 },- { x: rect.left + rect.width * 0.75, y: rect.top + rect.height * 0.25, weight: 1 },- { x: rect.left + rect.width * 0.25, y: rect.top + rect.height * 0.75, weight: 1 },- { x: rect.left + rect.width * 0.75, y: rect.top + rect.height * 0.75, weight: 1 }- ];-- let totalWeight = 0;- let visibleWeight = 0;-- for (const point of testPoints) {- // Skip points outside viewport- if (point.x < 0 || point.y < 0 ||- point.x >= window.innerWidth || point.y >= window.innerHeight) {- continue;- }-- const hitElement = document.elementFromPoint(point.x, point.y);- totalWeight += point.weight;-- // Simplified visibility check- if (hitElement && (hitElement === element || element.contains(hitElement) || hitElement.contains(element))) {- visibleWeight += point.weight;- }- }-- // If no valid test points, assume not occluded- if (totalWeight === 0) return false;-- // Element is occluded if less than 40% of weighted points are visible- return (visibleWeight / totalWeight) < 0.4;-- } catch (e) {- return false;- }- }-- function getRole(node) {- // Check if node is null or doesn't have required properties- if (!node || !node.tagName || !node.getAttribute) {- return 'generic';- }-- const role = node.getAttribute('role');- if (role) return role;-- const tagName = node.tagName.toLowerCase();-- // Extended role mapping to better match Playwright- if (tagName === 'a') return 'link';- if (tagName === 'button') return 'button';- if (tagName === 'input') {- const type = node.getAttribute('type')?.toLowerCase();- if (['button', 'checkbox', 'radio', 'reset', 'submit'].includes(type)) return type;- return 'textbox';- }- if (['select', 'textarea'].includes(tagName)) return tagName;- if (['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].includes(tagName)) return 'heading';-- // Additional roles for better Playwright compatibility- if (tagName === 'img') return 'img';- if (tagName === 'main') return 'main';- if (tagName === 'nav') return 'navigation';- if (tagName === 'ul' || tagName === 'ol') return 'list';- if (tagName === 'li') return 'listitem';- if (tagName === 'em') return 'emphasis';- if (tagName === 'form' && node.getAttribute('role') === 'search') return 'search';- if (tagName === 'section' || tagName === 'article') return 'region';- if (tagName === 'aside') return 'complementary';- if (tagName === 'header') return 'banner';- if (tagName === 'footer') return 'contentinfo';- if (tagName === 'fieldset') return 'group';-- return 'generic';- }-- // Playwright-inspired function to check if element receives pointer events- function receivesPointerEvents(element) {- if (!element || !element.nodeType || element.nodeType !== Node.ELEMENT_NODE) return false;-- try {- let e = element;- while (e) {- const style = window.getComputedStyle(e);- if (!style) break;-- const pointerEvents = style.pointerEvents;- if (pointerEvents === 'none') return false;- if (pointerEvents && pointerEvents !== 'auto') return true;-- e = e.parentElement;- }- return true;- } catch (error) {- return false;- }- }-- // Playwright-inspired function to check if element has pointer cursor- function hasPointerCursor(element) {- if (!element || !element.nodeType || element.nodeType !== Node.ELEMENT_NODE) return false;-- try {- const style = window.getComputedStyle(element);- return style.cursor === 'pointer';- } catch (error) {- return false;- }- }-- // Playwright-inspired function to get aria level- function getAriaLevel(element) {- if (!element || !element.tagName) return 0;-- // Native HTML heading levels (H1=1, H2=2, etc.)- const tagName = element.tagName.toUpperCase();- const nativeLevel = { 'H1': 1, 'H2': 2, 'H3': 3, 'H4': 4, 'H5': 5, 'H6': 6 }[tagName];- if (nativeLevel) return nativeLevel;-- // Check aria-level attribute for roles that support it- const role = getRole(element);- const kAriaLevelRoles = ['heading', 'listitem', 'row', 'treeitem'];- if (kAriaLevelRoles.includes(role)) {- const ariaLevel = element.getAttribute('aria-level');- if (ariaLevel !== null) {- const value = Number(ariaLevel);- if (Number.isInteger(value) && value >= 1) {- return value;- }- }- }-- return 0;- }-- function getAccessibleName(node) {- // Check if node is null or doesn't have required methods- if (!node || !node.hasAttribute || !node.getAttribute) return '';-- if (node.hasAttribute('aria-label')) return node.getAttribute('aria-label') || '';- if (node.hasAttribute('aria-labelledby')) {- const id = node.getAttribute('aria-labelledby');- const labelEl = document.getElementById(id);- if (labelEl) return labelEl.textContent || '';- }- // This is the new, visibility-aware text extraction logic.- const text = getVisibleTextContent(node);-- // Add a heuristic to ignore code-like text that might be in the DOM- if ((text.match(/[;:{}]/g)?.length || 0) > 2) return '';- return text;- }-- const textCache = new Map();- function getVisibleTextContent(_node) {- // Check if node is null or doesn't have nodeType- if (!_node || typeof _node.nodeType === 'undefined') return '';-- if (textCache.has(_node)) return textCache.get(_node);-- if (_node.nodeType === Node.TEXT_NODE) {- // For a text node, its content is visible if its parent is.- // The isVisible check on the parent happens before this recursion.- return _node.nodeValue || '';- }-- if (_node.nodeType !== Node.ELEMENT_NODE || !isVisible(_node) || ['SCRIPT', 'STYLE', 'NOSCRIPT', 'META', 'HEAD'].includes(_node.tagName)) {- return '';- }-- let result = '';- for (const child of _node.childNodes) {- result += getVisibleTextContent(child);- }-- // Caching the result for performance.- textCache.set(_node, result);- return result;- }-- /**- * Phase 1: Build an in-memory representation of the accessibility tree.- * Complete preservation of snapshot.js buildAriaTree logic- */- function buildAriaTree(rootElement) {- const visited = new Set();-- function toAriaNode(element) {- // Check if element is null or not a valid DOM element- if (!element || !element.tagName) return null;-- // Only consider visible elements- if (!isVisible(element)) return null;-- const role = getRole(element);- // 'presentation' and 'none' roles are ignored, but their children are processed.- if (['presentation', 'none'].includes(role)) return null;-- const name = getAccessibleName(element);-- // Get persistent ref for this element- const ref = getOrAssignRef(element);-- // Create the node- const node = {- role,- name,- children: [],- element: element,- ref: ref,- };-- // Add states for interactive elements, similar to Playwright- if (element.hasAttribute('disabled') || element.disabled) node.disabled = true;-- // NEW: Check if element is occluded and mark with occluded tag- if (isOccluded(element)) {- node.occluded = true; // Mark as occluded but don't disable- }-- // Handle aria-checked and native checked- const ariaChecked = element.getAttribute('aria-checked');- if (ariaChecked) {- node.checked = ariaChecked;- } else if (element.type === 'checkbox' || element.type === 'radio') {- node.checked = element.checked;- }-- // Handle aria-expanded- const ariaExpanded = element.getAttribute('aria-expanded');- if (ariaExpanded) {- node.expanded = ariaExpanded === 'true';- }-- // Handle aria-selected- const ariaSelected = element.getAttribute('aria-selected');- if (ariaSelected === 'true') {- node.selected = true;- }-- // Add level support following Playwright's implementation- const level = getAriaLevel(element);- if (level > 0) node.level = level;-- return node;- }-- function traverse(element, parentNode) {- // Check if element is null or not a valid DOM element- if (!element || !element.tagName || visited.has(element)) return;- visited.add(element);-- // FIX: Completely skip script and style tags and their children.- const tagName = element.tagName.toLowerCase();- if (['script', 'style', 'meta', 'noscript'].includes(tagName))- return;-- // Check if element is explicitly hidden by CSS - if so, skip entirely including children- const style = window.getComputedStyle(element);- if (style.display === 'none' || style.visibility === 'hidden' || style.opacity === '0') {- return;- }-- const ariaNode = toAriaNode(element);- // If the element is not rendered or is presentational, its children- // are attached directly to the parent.- const newParent = ariaNode || parentNode;- if (ariaNode) parentNode.children.push(ariaNode);-- for (const child of element.childNodes) {- if (child.nodeType === Node.ELEMENT_NODE) {- traverse(child, newParent);- } else if (child.nodeType === Node.TEXT_NODE) {- const text = (child.textContent || '').trim();- if (text) newParent.children.push(text);- }- }-- // Also traverse into shadow DOM if it exists- if (element.shadowRoot) {- for (const child of element.shadowRoot.childNodes) {- if (child.nodeType === Node.ELEMENT_NODE) {- traverse(child, newParent);- } else if (child.nodeType === Node.TEXT_NODE) {- const text = (child.textContent || '').trim();- if (text) newParent.children.push(text);- }- }- }-- // FIX: Remove redundant text children that match the element's name- if (ariaNode && ariaNode.children.length > 0) {- // Remove text children that are the same as the parent's name or are contained in it- ariaNode.children = ariaNode.children.filter(child => {- if (typeof child === 'string') {- const childText = child.trim();- const parentName = ariaNode.name.trim();-- // Remove if text child exactly matches parent name- if (childText === parentName) {- return false;- }-- // Also remove if the child text is completely contained in parent name- // and represents a significant portion (to avoid removing important partial text)- if (childText.length > 3 && parentName.includes(childText)) {- return false;- }-- return true;- }- return true;- });-- // If after filtering, we have only one text child that equals the name, remove it- if (ariaNode.children.length === 1 && typeof ariaNode.children[0] === 'string' && ariaNode.name === ariaNode.children[0]) {- ariaNode.children = [];- }- }- }-- const root = { role: 'Root', name: '', children: [], element: rootElement };- traverse(rootElement, root);- return root;- }-- /**- * Phase 2: Normalize the tree by removing redundant generic wrappers.- * Complete preservation of snapshot.js normalizeTree logic with cursor inheritance- */- function normalizeTree(node) {- if (typeof node === 'string') return [node];-- const newChildren = [];- for (const child of node.children) {- newChildren.push(...normalizeTree(child));- }- node.children = newChildren;-- // Remove child elements that have the same name as their parent- // and inherit cursor=pointer property if child had it- const filteredChildren = [];- for (const child of node.children) {- if (typeof child !== 'string' && child.name && node.name) {- const childName = child.name.trim();- const parentName = node.name.trim();- if (childName === parentName) {- // If child has same name as parent, merge its children into parent- filteredChildren.push(...(child.children || []));-- // Inherit cursor=pointer from merged child- if (child.element && receivesPointerEvents(child.element) && hasPointerCursor(child.element)) {- node.inheritedCursor = true;- }-- // Also inherit other properties if needed- if (child.disabled && !node.disabled) node.disabled = child.disabled;- if (child.selected && !node.selected) node.selected = child.selected;- } else {- filteredChildren.push(child);- }- } else {- filteredChildren.push(child);- }- }- node.children = filteredChildren;-- // Also handle the case where we have only one child with same name- if (node.children.length === 1 && typeof node.children[0] !== 'string') {- const child = node.children[0];- if (child.name && node.name && child.name.trim() === node.name.trim()) {- // Inherit cursor=pointer from the child being merged- if (child.element && receivesPointerEvents(child.element) && hasPointerCursor(child.element)) {- node.inheritedCursor = true;- }-- // Also inherit other properties- if (child.disabled && !node.disabled) node.disabled = child.disabled;- if (child.selected && !node.selected) node.selected = child.selected;-- // Merge child's children into parent and remove the redundant child- node.children = child.children || [];- }- }-- // A 'generic' role that just wraps a single other element is redundant.- // We lift its child up to replace it, simplifying the hierarchy.- const isRedundantWrapper = node.role === 'generic' && node.children.length === 1 && typeof node.children[0] !== 'string';- if (isRedundantWrapper) {- return node.children;- }- return [node];- }-- /**- * Phase 3: Render the normalized tree into the final string format.- * Complete preservation of snapshot.js renderTree logic with Playwright enhancements- */- function renderTree(node, indent = '') {- const lines = [];- let meaningfulProps = '';- if (node.disabled) meaningfulProps += ' [disabled]';- if (node.occluded) meaningfulProps += ' [occluded]';- if (node.checked !== undefined) meaningfulProps += ` checked=${node.checked}`;- if (node.expanded !== undefined) meaningfulProps += ` expanded=${node.expanded}`;- if (node.selected) meaningfulProps += ' [selected]';-- // Add level attribute following Playwright's format- if (node.level !== undefined) meaningfulProps += ` [level=${node.level}]`;-- const ref = node.ref ? ` [ref=${node.ref}]` : '';-- // Add cursor=pointer detection following Playwright's implementation- // Check both direct cursor and inherited cursor from merged children- let cursor = '';- const hasDirectCursor = node.element && receivesPointerEvents(node.element) && hasPointerCursor(node.element);- const hasInheritedCursor = node.inheritedCursor;-- // Only add cursor=pointer if element is not occluded- if ((hasDirectCursor || hasInheritedCursor) && !node.occluded) {- cursor = ' [cursor=pointer]';- }-- const name = (node.name || '').replace(/\s+/g, ' ').trim();-- // Skip elements with empty names and no meaningful props (ref and cursor are not considered meaningful for this check)- if (!name && !meaningfulProps) {- // If element has no name and no meaningful props, render its children directly at current level- for (const child of node.children) {- if (typeof child === 'string') {- const childText = child.replace(/\s+/g, ' ').trim();- if (childText) { // Only add non-empty text- lines.push(`${indent}- text "${childText}"`);- }- } else {- lines.push(...renderTree(child, indent));- }- }- return lines;- }-- lines.push(`${indent}- ${node.role}${name ? ` "${name}"` : ''}${meaningfulProps}${ref}${cursor}`);-- for (const child of node.children) {- if (typeof child === 'string') {- const childText = child.replace(/\s+/g, ' ').trim();- if (childText) { // Only add non-empty text- lines.push(`${indent} - text "${childText}"`);- }- } else {- lines.push(...renderTree(child, indent + ' '));- }- }- return lines;- }-- function processDocument(doc) {- if (!doc.body) return [];-- // Clear cache for each new document processing.- textCache.clear();- let tree = buildAriaTree(doc.body);- [tree] = normalizeTree(tree);-- const lines = renderTree(tree).slice(1); // Skip the root node line-- const frames = doc.querySelectorAll('iframe');- for (const frame of frames) {- try {- if (frame.contentDocument) {- lines.push(...processDocument(frame.contentDocument));- }- } catch (e) {- // Skip cross-origin iframes- }- }- return lines;- }-- // === Visual analysis functions from page_script.js ===-- // From page_script.js - check if element is topmost at coordinates- function isTopmost(element, x, y) {- let hit = document.elementFromPoint(x, y);- if (hit === null) return true;-- while (hit) {- if (hit == element) return true;- hit = hit.parentNode;- }- return false;- }-- // From page_script.js - get visual coordinates- function getElementCoordinates(element) {- let rects = element.getClientRects();- let scale = window.devicePixelRatio || 1;- let validRects = [];-- for (const rect of rects) {- let x = rect.left + rect.width / 2;- let y = rect.top + rect.height / 2;- if (isTopmost(element, x, y)) {- validRects.push({- x: rect.x * scale,- y: rect.y * scale,- width: rect.width * scale,- height: rect.height * scale,- top: rect.top * scale,- left: rect.left * scale,- right: rect.right * scale,- bottom: rect.bottom * scale- });- }- }-- return validRects;- }-- // === Unified analysis function ===-- function collectElementsFromTree(node, elementsMap) {- if (typeof node === 'string') return;-- if (node.element && node.ref) {- // Get visual coordinates for this element- const coordinates = getElementCoordinates(node.element);-- // Store comprehensive element information- elementsMap[node.ref] = {- // Structural information (preserved from snapshot.js)- role: node.role,- name: node.name,- tagName: node.element.tagName.toLowerCase(),- disabled: node.disabled,- checked: node.checked,- expanded: node.expanded,- level: node.level,-- // Visual information (from page_script.js)- coordinates: coordinates,-- // Additional metadata- href: node.element.href || null,- value: node.element.value || null,- placeholder: node.element.placeholder || null,- scrollable: node.element.scrollHeight > node.element.clientHeight,-- // Playwright-inspired properties- receivesPointerEvents: receivesPointerEvents(node.element),- hasPointerCursor: hasPointerCursor(node.element)- };- }-- // Recursively process children- if (node.children) {- for (const child of node.children) {- collectElementsFromTree(child, elementsMap);- }- }- }-- function analyzePageElements() {- // Clean up stale refs before analysis- const cleanedRefCount = cleanupStaleRefs();-- // Performance optimization: Check if we can reuse recent analysis- const currentTime = Date.now();- const lastAnalysisTime = window.__camelLastAnalysisTime || 0;- const timeSinceLastAnalysis = currentTime - lastAnalysisTime;-- // If less than 1 second since last analysis and page hasn't changed significantly- if (timeSinceLastAnalysis < 1000 && window.__camelLastAnalysisResult && cleanedRefCount === 0) {- const cachedResult = window.__camelLastAnalysisResult;- // Update timestamp and memory info in cached result- cachedResult.metadata.timestamp = new Date().toISOString();- cachedResult.metadata.memoryInfo = {- currentRefCount: refElementMap.size,- maxRefs: MAX_REFS,- memoryUtilization: (refElementMap.size / MAX_REFS * 100).toFixed(1) + '%',- lruAccessTimesCount: refAccessTimes.size- };- cachedResult.metadata.cacheHit = true;- return cachedResult;- }-- // Generate the complete structured snapshot using original snapshot.js logic- const outputLines = processDocument(document);- const snapshotText = outputLines.join('\n');-- // Build the tree again to collect element information with visual data- textCache.clear();- // Note: Don't reset refCounter anymore - use persistent counters- let tree = buildAriaTree(document.body);- [tree] = normalizeTree(tree);-- const elementsMap = {};- collectElementsFromTree(tree, elementsMap);-- // Verify uniqueness of aria-ref attributes (debugging aid)- const ariaRefCounts = {};- document.querySelectorAll('[aria-ref]').forEach(element => {- const ref = element.getAttribute('aria-ref');- ariaRefCounts[ref] = (ariaRefCounts[ref] || 0) + 1;- });-- // Log any duplicates for debugging- const duplicateRefs = Object.entries(ariaRefCounts).filter(([ref, count]) => count > 1);- if (duplicateRefs.length > 0) {- console.warn('Duplicate aria-ref attributes found:', duplicateRefs);- }-- // Validate ref consistency- const refValidationErrors = [];- for (const [ref, elementInfo] of Object.entries(elementsMap)) {- const mappedElement = refElementMap.get(ref);- if (!mappedElement || !document.contains(mappedElement)) {- refValidationErrors.push(`Ref ${ref} points to invalid or removed element`);- }- }-- const result = {- url: window.location.href,- elements: elementsMap,- snapshotText: snapshotText,- metadata: {- timestamp: new Date().toISOString(),- elementCount: Object.keys(elementsMap).length,- screenInfo: {- width: window.innerWidth,- height: window.innerHeight,- devicePixelRatio: window.devicePixelRatio || 1- },- // Enhanced debugging information- ariaRefCounts: ariaRefCounts,- duplicateRefsFound: duplicateRefs.length > 0,- staleRefsCleanedUp: cleanedRefCount,- refValidationErrors: refValidationErrors,- totalMappedRefs: refElementMap.size,- refCounterValue: refCounter,- // Memory management information- memoryInfo: {- currentRefCount: refElementMap.size,- maxRefs: MAX_REFS,- memoryUtilization: (refElementMap.size / MAX_REFS * 100).toFixed(1) + '%',- lruAccessTimesCount: refAccessTimes.size,- unusedAgeThreshold: MAX_UNUSED_AGE_MS + 'ms',- cleanupThreshold: (CLEANUP_THRESHOLD * 100).toFixed(0) + '%',- isAggressiveCleanup: refElementMap.size > (MAX_REFS * CLEANUP_THRESHOLD)- },- // Performance information- cacheHit: false,- analysisTime: Date.now() - currentTime- }- };-- // Cache the result for potential reuse- window.__camelLastAnalysisResult = result;- window.__camelLastAnalysisTime = currentTime;-- return result;- }-- // Execute analysis and return result- return analyzePageElements();-})();\ No newline at end of filediff --git a/camel/toolkits/hybrid_browser_toolkit/ws_wrapper.py b/camel/toolkits/hybrid_browser_toolkit/ws_wrapper.pynew file mode 100644index 000000000..c4a55d7d9--- /dev/null+++ b/camel/toolkits/hybrid_browser_toolkit/ws_wrapper.py@@ -0,0 +1,489 @@+# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========+# Licensed under the Apache License, Version 2.0 (the "License");+# you may not use this file except in compliance with the License.+# You may obtain a copy of the License at+#+# http://www.apache.org/licenses/LICENSE-2.0+#+# Unless required by applicable law or agreed to in writing, software+# distributed under the License is distributed on an "AS IS" BASIS,+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+# See the License for the specific language governing permissions and+# limitations under the License.+# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========++import asyncio+import datetime+import json+import os+import subprocess+import time+import uuid+from functools import wraps+from typing import TYPE_CHECKING, Any, Dict, List, Optional++if TYPE_CHECKING:+ import websockets+else:+ try:+ import websockets+ except ImportError:+ websockets = None++from camel.logger import get_logger+from camel.utils.tool_result import ToolResult++logger = get_logger(__name__)+++def action_logger(func):+ """Decorator to add logging to action methods."""++ @wraps(func)+ async def wrapper(self, *args, **kwargs):+ action_name = func.__name__+ start_time = time.time()++ # Log inputs (skip self)+ inputs = {+ "args": args,+ "kwargs": kwargs,+ }++ try:+ # Execute the original function+ result = await func(self, *args, **kwargs)+ execution_time = time.time() - start_time++ # Extract page load time if available+ page_load_time = None+ if isinstance(result, dict) and 'page_load_time_ms' in result:+ page_load_time = result['page_load_time_ms'] / 1000.0++ # Log success+ await self._log_action(+ action_name=action_name,+ inputs=inputs,+ outputs=result,+ execution_time=execution_time,+ page_load_time=page_load_time,+ )++ return result++ except Exception as e:+ execution_time = time.time() - start_time+ error_msg = f"{type(e).__name__}: {e!s}"++ # Log error+ await self._log_action(+ action_name=action_name,+ inputs=inputs,+ outputs=None,+ execution_time=execution_time,+ error=error_msg,+ )++ raise++ return wrapper+++class WebSocketBrowserWrapper:+ """Python wrapper for the TypeScript hybrid browser+ toolkit implementation using WebSocket."""++ def __init__(self, config: Optional[Dict[str, Any]] = None):+ """Initialize the wrapper.++ Args:+ config: Configuration dictionary for the browser toolkit+ """+ if websockets is None:+ raise ImportError(+ "websockets package is required for WebSocket communication. "+ "Install with: pip install websockets"+ )++ self.config = config or {}+ self.ts_dir = os.path.join(os.path.dirname(__file__), 'ts')+ self.process: Optional[subprocess.Popen] = None+ self.websocket = None+ self.server_port = None++ # Logging configuration+ self.browser_log_to_file = (config or {}).get(+ 'browser_log_to_file', False+ )+ self.session_id = (config or {}).get('session_id', 'default')+ self.log_file_path: Optional[str] = None+ self.log_buffer: List[Dict[str, Any]] = []++ # Set up log file if needed+ if self.browser_log_to_file:+ log_dir = "browser_log"+ os.makedirs(log_dir, exist_ok=True)+ timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")+ self.log_file_path = os.path.join(+ log_dir,+ f"hybrid_browser_toolkit_ws_{timestamp}_{self.session_id}.log",+ )++ async def __aenter__(self):+ """Async context manager entry."""+ await self.start()+ return self++ async def __aexit__(self, exc_type, exc_val, exc_tb):+ """Async context manager exit."""+ await self.stop()++ async def start(self):+ """Start the WebSocket server and connect to it."""+ # Ensure the TypeScript code is built+ build_result = subprocess.run(+ ['npm', 'run', 'build'],+ cwd=self.ts_dir,+ capture_output=True,+ text=True,+ )+ if build_result.returncode != 0:+ logger.error(f"TypeScript build failed: {build_result.stderr}")+ raise RuntimeError(+ f"TypeScript build failed: {build_result.stderr}"+ )++ # Start the WebSocket server+ self.process = subprocess.Popen(+ ['node', 'websocket-server.js'],+ cwd=self.ts_dir,+ stdout=subprocess.PIPE,+ stderr=subprocess.PIPE,+ text=True,+ )++ # Wait for server to output the port+ server_ready = False+ timeout = 10 # 10 seconds timeout+ start_time = time.time()++ while not server_ready and time.time() - start_time < timeout:+ if self.process.poll() is not None:+ # Process died+ stderr = self.process.stderr.read()+ raise RuntimeError(+ f"WebSocket server failed to start: {stderr}"+ )++ try:+ line = self.process.stdout.readline()+ if line.startswith('SERVER_READY:'):+ self.server_port = int(line.split(':')[1].strip())+ server_ready = True+ logger.info(+ f"WebSocket server ready on port {self.server_port}"+ )+ except (ValueError, IndexError):+ continue++ if not server_ready:+ self.process.kill()+ raise RuntimeError(+ "WebSocket server failed to start within timeout"+ )++ # Connect to the WebSocket server+ try:+ self.websocket = await websockets.connect(+ f"ws://localhost:{self.server_port}",+ ping_interval=30,+ ping_timeout=10,+ max_size=50 * 1024 * 1024, # 50MB limit to match server+ )+ logger.info("Connected to WebSocket server")+ except Exception as e:+ self.process.kill()+ raise RuntimeError(+ f"Failed to connect to WebSocket server: {e}"+ ) from e++ # Initialize the browser toolkit+ await self._send_command('init', self.config)++ async def stop(self):+ """Stop the WebSocket connection and server."""+ if self.websocket:+ try:+ await self._send_command('shutdown', {})+ await self.websocket.close()+ except Exception as e:+ logger.warning(f"Error during websocket shutdown: {e}")+ finally:+ self.websocket = None++ if self.process:+ try:+ self.process.terminate()+ self.process.wait(timeout=5)+ except subprocess.TimeoutExpired:+ self.process.kill()+ self.process.wait()+ except Exception as e:+ logger.warning(f"Error terminating process: {e}")+ finally:+ self.process = None++ async def _log_action(+ self,+ action_name: str,+ inputs: Dict[str, Any],+ outputs: Any,+ execution_time: float,+ page_load_time: Optional[float] = None,+ error: Optional[str] = None,+ ) -> None:+ """Log action details with comprehensive+ information including detailed timing breakdown."""+ if not self.browser_log_to_file or not self.log_file_path:+ return++ # Create log entry+ log_entry = {+ "timestamp": datetime.datetime.now().isoformat(),+ "session_id": self.session_id,+ "action": action_name,+ "execution_time_ms": round(execution_time * 1000, 2),+ "inputs": inputs,+ }++ if error:+ log_entry["error"] = error+ else:+ # Handle ToolResult objects for JSON serialization+ if hasattr(outputs, 'text') and hasattr(outputs, 'images'):+ # This is a ToolResult object+ log_entry["outputs"] = {+ "text": outputs.text,+ "images_count": len(outputs.images)+ if outputs.images+ else 0,+ }+ else:+ log_entry["outputs"] = outputs++ if page_load_time is not None:+ log_entry["page_load_time_ms"] = round(page_load_time * 1000, 2)++ # Write to log file+ try:+ with open(self.log_file_path, 'a', encoding='utf-8') as f:+ f.write(+ json.dumps(log_entry, ensure_ascii=False, indent=2) + '\n'+ )+ except Exception as e:+ logger.error(f"Failed to write to log file: {e}")++ async def _ensure_connection(self) -> None:+ """Ensure WebSocket connection is alive."""+ if not self.websocket:+ raise RuntimeError("WebSocket not connected")++ # Check if connection is still alive+ try:+ # Send a ping to check connection+ await self.websocket.ping()+ except Exception as e:+ logger.warning(f"WebSocket ping failed: {e}")+ self.websocket = None+ raise RuntimeError("WebSocket connection lost")++ async def _send_command(+ self, command: str, params: Dict[str, Any]+ ) -> Dict[str, Any]:+ """Send a command to the WebSocket server and get response."""+ await self._ensure_connection()++ message_id = str(uuid.uuid4())+ message = {'id': message_id, 'command': command, 'params': params}++ try:+ # Send command+ if self.websocket is None:+ raise RuntimeError("WebSocket connection not established")+ await self.websocket.send(json.dumps(message))++ # Wait for response with matching ID+ while True:+ try:+ if self.websocket is None:+ raise RuntimeError("WebSocket connection lost")+ response_data = await asyncio.wait_for(+ self.websocket.recv(), timeout=60.0+ )+ response = json.loads(response_data)++ # Check if this is the response we're waiting for+ if response.get('id') == message_id:+ if not response.get('success'):+ raise RuntimeError(+ f"Command failed: {response.get('error')}"+ )+ return response['result']++ except asyncio.TimeoutError:+ raise RuntimeError(+ f"Timeout waiting for response to command: {command}"+ )+ except json.JSONDecodeError as e:+ logger.warning(f"Failed to decode WebSocket response: {e}")+ continue++ except Exception as e:+ # Check if it's a connection closed error+ if (+ "close frame" in str(e)+ or "connection closed" in str(e).lower()+ ):+ logger.error(f"WebSocket connection closed unexpectedly: {e}")+ # Mark connection as closed+ self.websocket = None+ raise RuntimeError(+ f"WebSocket connection lost "+ f"during {command} operation: {e}"+ )+ else:+ logger.error(f"WebSocket communication error: {e}")+ raise++ # Browser action methods+ @action_logger+ async def open_browser(+ self, start_url: Optional[str] = None+ ) -> Dict[str, Any]:+ """Open browser."""+ response = await self._send_command(+ 'open_browser', {'startUrl': start_url}+ )+ return response++ @action_logger+ async def close_browser(self) -> str:+ """Close browser."""+ response = await self._send_command('close_browser', {})+ return response['message']++ @action_logger+ async def visit_page(self, url: str) -> Dict[str, Any]:+ """Visit a page."""+ response = await self._send_command('visit_page', {'url': url})+ return response++ @action_logger+ async def get_page_snapshot(self, viewport_limit: bool = False) -> str:+ """Get page snapshot."""+ response = await self._send_command(+ 'get_page_snapshot', {'viewport_limit': viewport_limit}+ )+ # The backend returns the snapshot string directly,+ # not wrapped in an object+ if isinstance(response, str):+ return response+ # Fallback if wrapped in an object+ return response.get('snapshot', '')++ @action_logger+ async def get_snapshot_for_ai(self) -> Dict[str, Any]:+ """Get snapshot for AI with element details."""+ response = await self._send_command('get_snapshot_for_ai', {})+ return response++ @action_logger+ async def get_som_screenshot(self) -> ToolResult:+ """Get screenshot."""+ logger.info("Requesting screenshot via WebSocket...")+ start_time = time.time()++ response = await self._send_command('get_som_screenshot', {})++ end_time = time.time()+ logger.info(f"Screenshot completed in {end_time - start_time:.2f}s")++ return ToolResult(text=response['text'], images=response['images'])++ @action_logger+ async def click(self, ref: str) -> Dict[str, Any]:+ """Click an element."""+ response = await self._send_command('click', {'ref': ref})+ return response++ @action_logger+ async def type(self, ref: str, text: str) -> Dict[str, Any]:+ """Type text into an element."""+ response = await self._send_command('type', {'ref': ref, 'text': text})+ return response++ @action_logger+ async def select(self, ref: str, value: str) -> Dict[str, Any]:+ """Select an option."""+ response = await self._send_command(+ 'select', {'ref': ref, 'value': value}+ )+ return response++ @action_logger+ async def scroll(self, direction: str, amount: int) -> Dict[str, Any]:+ """Scroll the page."""+ response = await self._send_command(+ 'scroll', {'direction': direction, 'amount': amount}+ )+ return response++ @action_logger+ async def enter(self) -> Dict[str, Any]:+ """Press enter."""+ response = await self._send_command('enter', {})+ return response++ @action_logger+ async def back(self) -> Dict[str, Any]:+ """Navigate back."""+ response = await self._send_command('back', {})+ return response++ @action_logger+ async def forward(self) -> Dict[str, Any]:+ """Navigate forward."""+ response = await self._send_command('forward', {})+ return response++ @action_logger+ async def switch_tab(self, tab_id: str) -> Dict[str, Any]:+ """Switch to a tab."""+ response = await self._send_command('switch_tab', {'tabId': tab_id})+ return response++ @action_logger+ async def close_tab(self, tab_id: str) -> Dict[str, Any]:+ """Close a tab."""+ response = await self._send_command('close_tab', {'tabId': tab_id})+ return response++ @action_logger+ async def get_tab_info(self) -> List[Dict[str, Any]]:+ """Get tab information."""+ response = await self._send_command('get_tab_info', {})+ # The backend returns the tab list directly, not wrapped in an object+ if isinstance(response, list):+ return response+ # Fallback if wrapped in an object+ return response.get('tabs', [])++ @action_logger+ async def wait_user(+ self, timeout_sec: Optional[float] = None+ ) -> Dict[str, Any]:+ """Wait for user input."""+ response = await self._send_command(+ 'wait_user', {'timeout': timeout_sec}+ )+ return responsediff --git a/examples/toolkits/hybrid_browser_toolkit_example.py b/examples/toolkits/hybrid_browser_toolkit_example.pyindex 0b5f17e14..eaf5acab8 100644--- a/examples/toolkits/hybrid_browser_toolkit_example.py+++ b/examples/toolkits/hybrid_browser_toolkit_example.py@@ -59,15 +59,15 @@ model_backend = ModelFactory.create(# Example 3: Use custom tools selectioncustom_tools = [- "open_browser",- "close_browser",- "visit_page",- "click",- "type",- "back",- "forward",- "switch_tab",- "enter",+ "browser_open",+ "browser_close",+ "browser_back",+ "browser_forward",+ "browser_click",+ "browser_type",+ "browser_enter",+ "browser_switch_tab",+ # "browser_get_som_screenshot", # remove it to achieve faster operation]web_toolkit_custom = HybridBrowserToolkit(@@ -76,6 +76,8 @@ web_toolkit_custom = HybridBrowserToolkit(enabled_tools=custom_tools,browser_log_to_file=True, # generate detailed log file in ./browser_logstealth=True, # Using stealth mode during browser operation+ viewport_limit=True,+ # Limit snapshot to current viewport to reduce context)print(f"Custom tools: {web_toolkit_custom.enabled_tools}")output_dir = "./file_write_outputs"@@ -91,6 +93,7 @@ tools_list = file_toolkit.get_tools()agent = ChatAgent(model=model_backend,tools=[*web_toolkit_custom.get_tools(), *file_toolkit.get_tools()],+ toolkits_to_register_agent=[web_toolkit_custom],max_iteration=10,)@@ -102,12 +105,8 @@ I mean you need to browse multiple websites. After visiting each website,write the news in markdown, then return to the Google search results pageand click on other websites.-If you encounter "snapshot": "snapshot not changed" when clicking, it might-be because you've clicked on plain text that doesn't lead to another page.-Don't be discouraged—keep trying to click on different links (but do not-click the same reference more than once).-Use enter to confirm search or input.+If you see a cookie page, click accept all."""@@ -119,22 +118,6 @@ async def main() -> None:print("\nResponse from agent:")print(response.msgs[0].content if response.msgs else "<no response>")- # Ensure proper cleanup- try:- await web_toolkit_custom.close_browser()- # Close all browser sessions to ensure complete cleanup- from camel.toolkits.hybrid_browser_toolkit.browser_session import (- HybridBrowserSession,- )-- await HybridBrowserSession.close_all_sessions()- # Give Playwright time to fully shut down subprocesses- await asyncio.sleep(0.5)- except Exception as err:- logging.warning(- "Failed to close " "browser session explicitly: %s", err- )-if __name__ == "__main__":asyncio.run(main())diff --git a/examples/workforce/eigent.py b/examples/workforce/eigent.pyindex c76efaa6a..a3ac92e0f 100644--- a/examples/workforce/eigent.py+++ b/examples/workforce/eigent.py@@ -285,16 +285,16 @@ def search_agent_factory(agent_id = str(uuid.uuid4())[:8]custom_tools = [- "open_browser",- "close_browser",- "click",- "type",- "back",- "forward",- "switch_tab",- "enter",- "get_som_screenshot",- "visit_page",+ "browser_open",+ "browser_close",+ "browser_back",+ "browser_forward",+ "browser_click",+ "browser_type",+ "browser_enter",+ "browser_switch_tab",+ "browser_visit_page",+ "browser_get_som_screenshot",]web_toolkit_custom = HybridBrowserToolkit(headless=False,@@ -302,6 +302,7 @@ def search_agent_factory(browser_log_to_file=True,stealth=True,session_id=agent_id,+ viewport_limit=True,cache_dir=WORKING_DIRECTORY,default_start_url="https://search.brave.com/",)@@ -424,6 +425,7 @@ Your capabilities include:content=system_message,),model=model,+ toolkits_to_register_agent=[web_toolkit_custom],tools=tools,prune_tool_calls_from_memory=True,)diff --git a/hatch_build_npm.py b/hatch_build_npm.pynew file mode 100644index 000000000..81d5ff8e3--- /dev/null+++ b/hatch_build_npm.py@@ -0,0 +1,213 @@+# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========+# Licensed under the Apache License, Version 2.0 (the "License");+# you may not use this file except in compliance with the License.+# You may obtain a copy of the License at+#+# http://www.apache.org/licenses/LICENSE-2.0+#+# Unless required by applicable law or agreed to in writing, software+# distributed under the License is distributed on an "AS IS" BASIS,+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+# See the License for the specific language governing permissions and+# limitations under the License.+# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========+# !/usr/bin/env python3+"""+Hatch build hook for building TypeScript dependencies in+hybrid_browser_toolkit.++This script runs during package building to compile TypeScript code.+It gracefully handles cases where Node.js/npm is not available.+"""++import subprocess+from pathlib import Path++from hatchling.builders.hooks.plugin.interface import BuildHookInterface+++class NpmBuildHook(BuildHookInterface):+ """Hatch build hook for TypeScript compilation."""++ PLUGIN_NAME = "npm-build"++ def initialize(self, version, build_data):+ """Initialize the build hook and run npm build."""+ self.build_npm_dependencies()++ def finalize(self, version, build_data, artifact_path):+ """Finalize the build - ensure TypeScript was built."""+ base_dir = Path(self.root)+ ts_dir = (+ base_dir / "camel" / "toolkits" / "hybrid_browser_toolkit" / "ts"+ )+ dist_dir = ts_dir / "dist"++ if dist_dir.exists():+ print(f"TypeScript build artifacts found at: {dist_dir}")+ else:+ print("Warning: TypeScript build artifacts not found")++ def build_npm_dependencies(self):+ """Build TypeScript dependencies during wheel/sdist creation."""+ base_dir = Path(self.root)+ ts_dir = (+ base_dir / "camel" / "toolkits" / "hybrid_browser_toolkit" / "ts"+ )++ print(f"Checking TypeScript directory: {ts_dir}")++ if not ts_dir.exists():+ print("TypeScript directory not found, skipping npm build")+ return++ # Check if dist already exists and is not empty+ dist_dir = ts_dir / "dist"+ if dist_dir.exists() and any(dist_dir.iterdir()):+ print(+ "TypeScript already built (dist directory exists), "+ "skipping build"+ )+ return++ try:+ # Check if npm is available+ result = subprocess.run(+ ["npm", "--version"],+ check=True,+ capture_output=True,+ text=True,+ )+ print(f"Found npm version: {result.stdout.strip()}")++ # Check if Node.js is available+ result = subprocess.run(+ ["node", "--version"],+ check=True,+ capture_output=True,+ text=True,+ )+ print(f"Found Node.js version: {result.stdout.strip()}")++ print("Installing npm dependencies...")+ # Use npm install to ensure+ # devDependencies like TypeScript are installed+ subprocess.run(+ ["npm", "install"], cwd=ts_dir, check=True, text=True+ )++ print("Building TypeScript...")+ subprocess.run(+ ["npm", "run", "build"], cwd=ts_dir, check=True, text=True+ )++ # Verify build output+ index_js = dist_dir / "index.js"+ if index_js.exists():+ print("TypeScript build completed successfully")+ else:+ print(+ "Warning: TypeScript build may have failed (index.js "+ "not found)"+ )++ except FileNotFoundError:+ print("Warning: npm or node not found in PATH")+ print("Installing without TypeScript support")+ print(+ "To use hybrid_browser_toolkit, please install Node.js and "+ "run:"+ )+ print(f" cd {ts_dir}")+ print(" npm install && npm run build")++ except subprocess.CalledProcessError as e:+ print(f"Warning: TypeScript build failed with error: {e}")+ print("Installing without TypeScript support")+ print("This may affect hybrid_browser_toolkit functionality")++ except Exception as e:+ print(f"Warning: Unexpected error during TypeScript build: {e}")+ print("Installing without TypeScript support")+++def build_npm_dependencies_standalone():+ """Standalone function for testing purposes."""+ base_dir = Path(__file__).parent+ ts_dir = base_dir / "camel" / "toolkits" / "hybrid_browser_toolkit" / "ts"++ print(f"Checking TypeScript directory: {ts_dir}")++ if not ts_dir.exists():+ print("TypeScript directory not found, skipping npm build")+ return++ # Check if dist already exists and is not empty+ dist_dir = ts_dir / "dist"+ if dist_dir.exists() and any(dist_dir.iterdir()):+ print(+ "TypeScript already built (dist directory exists), skipping "+ "build"+ )+ return++ try:+ # Check if npm is available+ result = subprocess.run(+ ["npm", "--version"], check=True, capture_output=True, text=True+ )+ print(f"Found npm version: {result.stdout.strip()}")++ # Check if Node.js is available+ result = subprocess.run(+ ["node", "--version"], check=True, capture_output=True, text=True+ )+ print(f"Found Node.js version: {result.stdout.strip()}")++ print("Installing npm dependencies...")+ # Use npm install to ensure+ # devDependencies like TypeScript are installed+ subprocess.run(["npm", "install"], cwd=ts_dir, check=True, text=True)++ print("Building TypeScript...")+ subprocess.run(+ ["npm", "run", "build"], cwd=ts_dir, check=True, text=True+ )++ # Verify build output+ index_js = dist_dir / "index.js"+ if index_js.exists():+ print("TypeScript build completed successfully")+ else:+ print(+ "Warning: TypeScript build may have failed (index.js not "+ "found)"+ )++ except FileNotFoundError:+ print("Warning: npm or node not found in PATH")+ print("Installing without TypeScript support")+ print("To use hybrid_browser_toolkit, please install Node.js and run:")+ print(f" cd {ts_dir}")+ print(" npm install && npm run build")++ except subprocess.CalledProcessError as e:+ print(f"Warning: TypeScript build failed with error: {e}")+ print("Installing without TypeScript support")+ print("This may affect hybrid_browser_toolkit functionality")++ except Exception as e:+ print(f"Warning: Unexpected error during TypeScript build: {e}")+ print("Installing without TypeScript support")+++if __name__ == "__main__":+ print("=" * 60)+ print("Running Hatch build hook for TypeScript dependencies")+ print("=" * 60)++ build_npm_dependencies_standalone()++ print("=" * 60)+ print("Build hook completed")+ print("=" * 60)diff --git a/pyproject.toml b/pyproject.tomlindex c80965da1..33cb013ad 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -111,6 +111,7 @@ web_tools = ["beautifulsoup4>=4,<5","exa-py>=1.10.0,<2","scrapegraph-py>=1.12.0,<2",+ "websockets>=13.0,<15.1",]document_tools = ["numpy>=1.2,<=2.2",@@ -250,6 +251,7 @@ owl = ["playwright>=1.50.0","html2text>=2024.2.26","requests_oauthlib>=1.3.1,<2",+ "websockets>=13.0,<15.1","e2b-code-interpreter>=1.0.3,<2","typer>=0.15.2","tree-sitter-python>=0.23.6,<0.24",@@ -366,6 +368,7 @@ all = ["playwright>=1.50.0","html2text>=2024.2.26","docx>=0.2.4",+ "websockets>=13.0,<15.1","mcp>=1.3.0","typer>=0.15.2","mem0ai>=0.1.67",@@ -400,10 +403,38 @@ Repository = "https://github.com/camel-ai/camel"Documentation = "https://docs.camel-ai.org"[tool.hatch.build.targets.sdist]-include = ["camel"]+include = [+ "camel",+ "camel/toolkits/hybrid_browser_toolkit/ts/package.json",+ "camel/toolkits/hybrid_browser_toolkit/ts/package-lock.json",+ "camel/toolkits/hybrid_browser_toolkit/ts/tsconfig.json",+ "camel/toolkits/hybrid_browser_toolkit/ts/src/**/*",+ "camel/toolkits/hybrid_browser_toolkit/ts/websocket-server.js",+ "hatch_build_npm.py"+]+exclude = [+ "camel/toolkits/hybrid_browser_toolkit/ts/node_modules/**/*"+][tool.hatch.build.targets.wheel]-include = ["camel"]+include = [+ "camel",+ "camel/toolkits/hybrid_browser_toolkit/ts/package.json",+ "camel/toolkits/hybrid_browser_toolkit/ts/package-lock.json",+ "camel/toolkits/hybrid_browser_toolkit/ts/tsconfig.json",+ "camel/toolkits/hybrid_browser_toolkit/ts/src/**/*",+ "camel/toolkits/hybrid_browser_toolkit/ts/dist/**/*",+ "camel/toolkits/hybrid_browser_toolkit/ts/websocket-server.js"+]+exclude = [+ "camel/toolkits/hybrid_browser_toolkit/ts/node_modules/**/*"+]++[tool.hatch.build.targets.wheel.hooks.custom]+path = "hatch_build_npm.py"++[tool.hatch.build.targets.sdist.hooks.custom]+path = "hatch_build_npm.py"[tool.hatch.metadata]allow-direct-references = truediff --git a/test/toolkits/test_hybrid_browser_toolkit.py b/test/toolkits/test_hybrid_browser_toolkit.pyindex 77110aff0..e97ddc841 100644--- a/test/toolkits/test_hybrid_browser_toolkit.py+++ b/test/toolkits/test_hybrid_browser_toolkit.py@@ -12,95 +12,116 @@# limitations under the License.# ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. =========-import ioimport osimport shutil-from unittest.mock import AsyncMock, MagicMock, mock_open, patch+from unittest.mock import AsyncMock, MagicMock, patchimport pytest-from PIL import Image-# Import the modules directly without global sys.modules mockingfrom camel.toolkits.hybrid_browser_toolkit import HybridBrowserToolkit-from camel.utils.tool_result import ToolResultTEST_URL = "https://example.com"TEST_FILE_URL = "file:///test.html"-def create_mock_playwright_objects():- """Create mock playwright objects for testing."""- # Create comprehensive mock objects- mock_page = AsyncMock()- mock_page.url = "https://example.com"- mock_page.goto = AsyncMock()- mock_page.wait_for_load_state = AsyncMock()- mock_page.screenshot = AsyncMock(return_value=b"fake_screenshot_data")- mock_page.evaluate = AsyncMock(return_value={"elements": {}})- mock_page.query_selector = AsyncMock(return_value=None)- mock_page.query_selector_all = AsyncMock(return_value=[])- mock_page.click = AsyncMock()- mock_page.fill = AsyncMock()- mock_page.select_option = AsyncMock()- mock_page.mouse = MagicMock()- mock_page.mouse.wheel = AsyncMock()-- mock_context = AsyncMock()- mock_context.pages = [mock_page]- mock_context.new_page = AsyncMock(return_value=mock_page)- mock_context.close = AsyncMock()- mock_context.browser = None-- mock_browser = AsyncMock()- mock_browser.new_context = AsyncMock(return_value=mock_context)- mock_browser.close = AsyncMock()- mock_browser.contexts = [mock_context]-- mock_chromium = MagicMock()- mock_chromium.launch = AsyncMock(return_value=mock_browser)- mock_chromium.launch_persistent_context = AsyncMock(- return_value=mock_context+def create_mock_ws_wrapper():+ """Create mock WebSocket wrapper for testing."""+ mock_ws_wrapper = AsyncMock()+ mock_ws_wrapper.start = AsyncMock()+ mock_ws_wrapper.stop = AsyncMock()+ mock_ws_wrapper.open_browser = AsyncMock(+ return_value={+ "result": "Browser opened successfully",+ "snapshot": "- Page snapshot\n```yaml\n<test content>\n```",+ })-- mock_playwright_instance = AsyncMock()- mock_playwright_instance.chromium = mock_chromium- mock_playwright_instance.firefox = mock_chromium- mock_playwright_instance.webkit = mock_chromium- mock_playwright_instance.stop = AsyncMock()-- # Mock the async_playwright context manager- mock_async_playwright_cm = AsyncMock()- mock_async_playwright_cm.__aenter__ = AsyncMock(- return_value=mock_playwright_instance+ mock_ws_wrapper.visit_page = AsyncMock(+ return_value={+ "result": "Visited test URL in new tab",+ "snapshot": "- Page snapshot\n```yaml\n<test content>\n```",+ })- mock_async_playwright_cm.__aexit__ = AsyncMock(return_value=None)-- # Mock the async_playwright function- mock_async_playwright = MagicMock(return_value=mock_async_playwright_cm)-- return (- mock_async_playwright,- mock_playwright_instance,- mock_page,- mock_context,- mock_browser,+ mock_ws_wrapper.back = AsyncMock(+ return_value={+ "result": "Navigated back",+ "snapshot": "- Page snapshot\n```yaml\n<test content>\n```",+ }+ )+ mock_ws_wrapper.forward = AsyncMock(+ return_value={+ "result": "Navigated forward",+ "snapshot": "- Page snapshot\n```yaml\n<test content>\n```",+ }+ )+ mock_ws_wrapper.click = AsyncMock(+ return_value={+ "result": "Element clicked successfully",+ "snapshot": "- Page snapshot\n```yaml\n<test content>\n```",+ }+ )+ mock_ws_wrapper.type = AsyncMock(+ return_value={+ "result": "Text typed successfully",+ "snapshot": "- Page snapshot\n```yaml\n<test content>\n```",+ }+ )+ mock_ws_wrapper.select = AsyncMock(+ return_value={+ "result": "Option selected successfully",+ "snapshot": "- Page snapshot\n```yaml\n<test content>\n```",+ }+ )+ mock_ws_wrapper.scroll = AsyncMock(+ return_value={+ "result": "Scrolled successfully",+ "snapshot": "- Page snapshot\n```yaml\n<test content>\n```",+ }+ )+ mock_ws_wrapper.enter = AsyncMock(+ return_value={+ "result": "Enter key pressed",+ "snapshot": "- Page snapshot\n```yaml\n<test content>\n```",+ }+ )+ mock_ws_wrapper.switch_tab = AsyncMock(+ return_value={+ "result": "Switched to tab",+ "snapshot": "- Page snapshot\n```yaml\n<test content>\n```",+ }+ )+ mock_ws_wrapper.close_tab = AsyncMock(+ return_value={+ "result": "Tab closed",+ "snapshot": "- Page snapshot\n```yaml\n<test content>\n```",+ }+ )+ mock_ws_wrapper.get_page_snapshot = AsyncMock(+ return_value="- Page snapshot\n```yaml\n<test content>\n```")+ mock_ws_wrapper.get_som_screenshot = AsyncMock(+ return_value="Visual webpage screenshot captured"+ )+ mock_ws_wrapper.get_tab_info = AsyncMock(+ return_value=[+ {+ "id": "tab-001",+ "title": "Test Page",+ "url": "https://example.com",+ "is_current": True,+ }+ ]+ )+ return mock_ws_wrapper-# Create global mock objects for backward compatibility-(- mock_async_playwright,- mock_playwright_instance,- mock_page,- mock_context,- mock_browser,-) = create_mock_playwright_objects()+# Create global mock WebSocket wrapper+mock_ws_wrapper = create_mock_ws_wrapper()@pytest.fixture(scope="function")-def mock_playwright_setup():- """Set up playwright mocks for individual tests."""- return create_mock_playwright_objects()+def mock_ws_wrapper_setup():+ """Set up WebSocket wrapper mocks for individual tests."""+ return create_mock_ws_wrapper()@pytest.fixture(autouse=True)@@ -110,17 +131,8 @@ def mock_browser_dependencies():patch('os.makedirs'),patch('os.path.exists', return_value=True),patch(- 'playwright.async_api.async_playwright',- return_value=mock_async_playwright(),- ),- patch(- 'camel.toolkits.hybrid_browser_toolkit.browser_session.async_playwright',- return_value=mock_async_playwright(),- create=True,- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock unified analyzer');"),+ 'camel.toolkits.hybrid_browser_toolkit.ws_wrapper.WebSocketBrowserWrapper',+ return_value=mock_ws_wrapper,),):yield@@ -129,33 +141,16 @@ def mock_browser_dependencies():@pytest.fixture(scope="function")def browser_toolkit_fixture():"""Create a HybridBrowserToolkit instance for testing."""- mock_session = AsyncMock()- mock_session.ensure_browser = AsyncMock()- mock_session.get_page = AsyncMock(return_value=mock_page)- mock_session.visit = AsyncMock(return_value="Visited test URL")- mock_session.get_snapshot = AsyncMock(- return_value="- Page Snapshot\\n```yaml\\n<test content>\\n```"- )- mock_session.exec_action = AsyncMock(- return_value="Action executed successfully"- )- mock_session.close = AsyncMock()-with (patch(- 'camel.toolkits.hybrid_browser_toolkit.browser_session.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.os.path.join',- return_value='mock_script_path',- ),- patch(- 'builtins.open', mock_open(read_data="console.log('mock script');")+ 'camel.toolkits.hybrid_browser_toolkit.ws_wrapper.WebSocketBrowserWrapper',+ return_value=mock_ws_wrapper,),):toolkit = HybridBrowserToolkit(headless=True)- toolkit._session = mock_session # Ensure the mock session is used+ toolkit._ws_wrapper = (+ mock_ws_wrapper # Ensure the mock wrapper is used+ )yield toolkit# Cleanup@@ -164,20 +159,9 @@ def browser_toolkit_fixture():@pytest.fixture(scope="function")-def mock_session():- """Create a mock browser session."""- session = AsyncMock()- session.ensure_browser = AsyncMock()- session.get_page = AsyncMock(return_value=mock_page)- session.visit = AsyncMock(return_value="Visited test URL")- session.get_snapshot = AsyncMock(- return_value="- Page Snapshot\\n```yaml\\n<test content>\\n```"- )- session.exec_action = AsyncMock(- return_value="Action executed successfully"- )- session.close = AsyncMock()- return session+def mock_ws_wrapper_fixture():+ """Create a mock WebSocket wrapper."""+ return create_mock_ws_wrapper()@pytest.fixture(scope="function")@@ -200,33 +184,16 @@ def mock_page_fixture():@pytest.fixture(scope="function")def sync_browser_toolkit():"""Create a HybridBrowserToolkit instance for synchronous testing."""- mock_session = AsyncMock()- mock_session.ensure_browser = AsyncMock()- mock_session.get_page = AsyncMock(return_value=mock_page)- mock_session.visit = AsyncMock(return_value="Visited test URL")- mock_session.get_snapshot = AsyncMock(- return_value="- Page Snapshot\\n```yaml\\n<test content>\\n```"- )- mock_session.exec_action = AsyncMock(- return_value="Action executed successfully"- )- mock_session.close = AsyncMock()-with (patch(- 'camel.toolkits.hybrid_browser_toolkit.browser_session.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.os.path.join',- return_value='mock_script_path',- ),- patch(- 'builtins.open', mock_open(read_data="console.log('mock script');")+ 'camel.toolkits.hybrid_browser_toolkit.ws_wrapper.WebSocketBrowserWrapper',+ return_value=mock_ws_wrapper,),):toolkit = HybridBrowserToolkit(headless=True)- toolkit._session = mock_session # Ensure the mock session is used+ toolkit._ws_wrapper = (+ mock_ws_wrapper # Ensure the mock wrapper is used+ )return toolkit@@ -235,16 +202,10 @@ class TestHybridBrowserToolkit:def test_init_default_params(self):"""Test initialization with default parameters."""- mock_session = AsyncMock()with (patch(- 'camel.toolkits.hybrid_browser_toolkit.browser_session'- '.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock unified analyzer');"),+ 'camel.toolkits.hybrid_browser_toolkit.ws_wrapper.WebSocketBrowserWrapper',+ return_value=mock_ws_wrapper,),patch('os.path.exists', return_value=True),patch('os.makedirs'),@@ -256,23 +217,16 @@ class TestHybridBrowserToolkit:assert toolkit.web_agent_model is Noneassert toolkit.cache_dir == "tmp/"assert toolkit._agent is None- assert toolkit._unified_script is not Nonedef test_init_custom_params(self):"""Test initialization with custom parameters."""test_cache_dir = "custom_cache"test_user_data_dir = "custom_user_data"- mock_session = AsyncMock()with (patch(- 'camel.toolkits.hybrid_browser_toolkit.browser_session'- '.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock unified analyzer');"),+ 'camel.toolkits.hybrid_browser_toolkit.ws_wrapper.WebSocketBrowserWrapper',+ return_value=mock_ws_wrapper,),patch('os.path.exists', return_value=True),patch('os.makedirs'),@@ -290,110 +244,39 @@ class TestHybridBrowserToolkit:if os.path.exists(test_cache_dir):shutil.rmtree(test_cache_dir, ignore_errors=True)- def test_load_unified_analyzer_success(self):- """Test successful loading of unified analyzer script."""- mock_session = AsyncMock()- with patch(- 'camel.toolkits.hybrid_browser_toolkit.browser_session'- '.HybridBrowserSession',- return_value=mock_session,- ):- with patch('builtins.open', create=True) as mock_file:- # ruff:noqa:E501- mock_file.return_value.__enter__.return_value.read.return_value = "console.log('test');"-- with (- patch('os.makedirs'),- patch('os.path.exists', return_value=True),- ):- toolkit = HybridBrowserToolkit()- assert "console.log('test');" in toolkit._unified_script-- def test_load_unified_analyzer_file_not_found(self):- """Test handling of missing unified analyzer script."""- mock_session = AsyncMock()- with patch(- 'camel.toolkits.hybrid_browser_toolkit.browser_session'- '.HybridBrowserSession',- return_value=mock_session,- ):- with (- patch('builtins.open', side_effect=FileNotFoundError),- patch('os.makedirs'),- patch('os.path.exists', return_value=True),- ):- with pytest.raises(FileNotFoundError):- HybridBrowserToolkit()-- def test_validate_ref_valid(self):- """Test ref validation with valid input."""- mock_session = AsyncMock()- with (- patch(- 'camel.toolkits.hybrid_browser_toolkit.browser_session'- '.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock script');"),- ),- patch('os.makedirs'),- patch('os.path.exists', return_value=True),- ):- toolkit = HybridBrowserToolkit()- # Should not raise exception- toolkit._validate_ref("e1", "test_method")-- def test_validate_ref_invalid(self):- """Test ref validation with invalid input."""- mock_session = AsyncMock()- with (- patch(- 'camel.toolkits.hybrid_browser_toolkit.browser_session'- '.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock script');"),- ),- patch('os.makedirs'),- patch('os.path.exists', return_value=True),- ):- toolkit = HybridBrowserToolkit()-- # Test with empty string- with pytest.raises(ValueError):- toolkit._validate_ref("", "test_method")-@pytest.mark.asyncioasync def test_open_browser_no_start_url(self, browser_toolkit_fixture):- """Test opening browser using the default start URL configured during initialization."""+ """Test opening browser using the default start+ URL configured during initialization."""toolkit = browser_toolkit_fixture- result = await toolkit.open_browser()+ result = await toolkit.browser_open()- assert "Visited" in result["result"]+ assert "opened" in result["result"].lower()assert "snapshot" in result+ assert "tabs" in result+ assert "current_tab" in result+ assert "total_tabs" in result@pytest.mark.asyncioasync def test_open_browser_with_custom_default_url(self, browser_toolkit_fixture):- """Test open_browser with a custom default start URL."""+ """Test browser_open with a custom default start URL."""toolkit = browser_toolkit_fixture- result = await toolkit.open_browser()+ result = await toolkit.browser_open()# Just check that the method works and returns expected structureassert "result" in resultassert "snapshot" in result- assert "Visited" in result['result']+ assert "tabs" in result+ assert "current_tab" in result+ assert "total_tabs" in result@pytest.mark.asyncioasync def test_close_browser(self, browser_toolkit_fixture):"""Test closing browser."""toolkit = browser_toolkit_fixture- result = await toolkit.close_browser()+ result = await toolkit.browser_close()assert isinstance(result, str)assert "closed" in result.lower()@@ -401,487 +284,180 @@ class TestHybridBrowserToolkit:async def test_visit_page_valid_url(self, browser_toolkit_fixture):"""Test visiting a valid URL."""toolkit = browser_toolkit_fixture- mock_session = toolkit._session+ result = await toolkit.browser_visit_page(TEST_URL)- # Mock create_new_tab to return a mock tab index- mock_session.create_new_tab = AsyncMock(return_value=1)- mock_session.visit = AsyncMock(- return_value=f"Visited {TEST_URL} in new tab 1"+ assert "result" in result+ assert "snapshot" in result+ assert "tabs" in result+ assert "current_tab" in result+ assert "total_tabs" in result+ assert (+ "test url" in result['result'].lower()+ or "visited" in result['result'].lower())- mock_session.switch_to_tab = AsyncMock()- mock_session.get_snapshot = AsyncMock(return_value="snapshot")-- # Mock _get_tab_info_for_output- with patch.object(- toolkit, '_get_tab_info_for_output', new_callable=AsyncMock- ) as mock_get_tab_info:- mock_get_tab_info.return_value = {- "tabs": [],- "current_tab": 1,- "total_tabs": 2,- }- result = await toolkit.visit_page(TEST_URL)- mock_session.create_new_tab.assert_called_once_with(TEST_URL)- mock_session.switch_to_tab.assert_called_once_with(1)- mock_session.get_snapshot.assert_called_once()- assert "snapshot" in result- assert result['snapshot'] == "snapshot"- assert TEST_URL in result['result']- assert "new tab" in result['result']@pytest.mark.asyncioasync def test_visit_page_invalid_url(self, browser_toolkit_fixture):"""Test visiting an invalid URL (empty string)."""toolkit = browser_toolkit_fixture- mock_session = toolkit._session- mock_session.create_new_tab = AsyncMock()- result = await toolkit.visit_page("")- mock_session.create_new_tab.assert_not_called()- assert "Error: 'url' must be a non-empty string" in result['result']- assert result['snapshot'] == ""+ result = await toolkit.browser_visit_page("")+ assert "result" in result+ assert "snapshot" in result+ # The WebSocket wrapper should handle validation+ assert isinstance(result['result'], str)@pytest.mark.asyncio- async def test_get_page_snapshot(- self, browser_toolkit_fixture, mock_page_fixture- ):+ async def test_get_page_snapshot(self, browser_toolkit_fixture):"""Test getting page snapshot."""toolkit = browser_toolkit_fixture- mock_page = mock_page_fixture- toolkit._session.get_page = AsyncMock(return_value=mock_page)-- # Mock unified analysis- mock_analysis = {- "snapshotText": "Test snapshot content",- "elements": {"e1": {"role": "button", "name": "Test"}},- }- mock_page.evaluate = AsyncMock(return_value=mock_analysis)- result = await toolkit.get_page_snapshot()- assert result == "Test snapshot content"+ result = await toolkit.browser_get_page_snapshot()+ assert isinstance(result, str)+ assert (+ "page snapshot" in result.lower()+ or "test content" in result.lower()+ )@pytest.mark.asyncio- async def test_get_som_screenshot_success(self):+ async def test_get_som_screenshot_success(self, browser_toolkit_fixture):"""Test successful Set of Marks screenshot generation."""- mock_session = AsyncMock()- mock_session.ensure_browser = AsyncMock()- mock_session.get_page = AsyncMock(return_value=mock_page)- mock_session.visit = AsyncMock(return_value="Visited test URL")- mock_session.get_snapshot = AsyncMock(- return_value="- Page Snapshot\\n```yaml\\n<test content>\\n```"- )- mock_session.exec_action = AsyncMock(- return_value="Action executed successfully"- )- mock_session.close = AsyncMock()-- with (- patch(- 'camel.toolkits.hybrid_browser_toolkit.browser_session.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.os.path.join',- return_value='mock_script_path',- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock script');"),- ),- ):- toolkit = HybridBrowserToolkit(headless=True)- toolkit._session = mock_session-- # Create a mock image- mock_image = Image.new('RGB', (100, 100), color='red')- img_byte_arr = io.BytesIO()- mock_image.save(img_byte_arr, format='PNG')- mock_image_data = img_byte_arr.getvalue()-- # Set up the mock page with screenshot and analysis data- mock_page.screenshot = AsyncMock(return_value=mock_image_data)- mock_page.url = TEST_URL-- # Mock unified analysis- mock_analysis = {- "elements": {- "e1": {- "role": "button",- "name": "Test Button",- "coordinates": [- {"x": 10, "y": 10, "width": 50, "height": 20}- ],- }- }- }- mock_page.evaluate = AsyncMock(return_value=mock_analysis)-- result = await toolkit.get_som_screenshot()+ toolkit = browser_toolkit_fixture+ result = await toolkit.browser_get_som_screenshot()- assert isinstance(result, ToolResult)- assert "Visual webpage screenshot captured" in result.text- assert len(result.images) == 1- assert result.images[0].startswith("data:image/png;base64,")+ # The result should be a string indicating success+ assert isinstance(result, str)+ assert "screenshot" in result.lower() or "captured" in result.lower()@pytest.mark.asyncio- async def test_get_som_screenshot_pil_not_available(self):+ async def test_get_som_screenshot_pil_not_available(+ self, browser_toolkit_fixture+ ):"""Test Set of Marks screenshot when PIL is not available."""- mock_session = AsyncMock()- mock_session.ensure_browser = AsyncMock()- mock_session.get_page = AsyncMock(return_value=mock_page)- mock_session.visit = AsyncMock(return_value="Visited test URL")- mock_session.get_snapshot = AsyncMock(- return_value="- Page Snapshot\\n```yaml\\n<test content>\\n```"- )- mock_session.exec_action = AsyncMock(- return_value="Action executed successfully"- )- mock_session.close = AsyncMock()-- with (- patch(- 'camel.toolkits.hybrid_browser_toolkit.browser_session.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.os.path.join',- return_value='mock_script_path',- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock script');"),- ),- ):- toolkit = HybridBrowserToolkit(headless=True)- toolkit._session = mock_session-- # Create a mock image for the screenshot- mock_image = Image.new('RGB', (100, 100), color='red')- img_byte_arr = io.BytesIO()- mock_image.save(img_byte_arr, format='PNG')- mock_image_data = img_byte_arr.getvalue()-- # Set up the mock page with screenshot data- mock_page.screenshot = AsyncMock(return_value=mock_image_data)- mock_page.url = TEST_URL-- # Mock unified analysis - provide empty elements to avoid coordinate processing- mock_analysis = {"elements": {}}- mock_page.evaluate = AsyncMock(return_value=mock_analysis)+ toolkit = browser_toolkit_fixture- with patch('PIL.ImageDraw', side_effect=ImportError):- result = await toolkit.get_som_screenshot()+ with patch('PIL.ImageDraw', side_effect=ImportError):+ result = await toolkit.browser_get_som_screenshot()- assert isinstance(result, ToolResult)- assert "Visual webpage screenshot captured" in result.text+ # The result should still be a string even if PIL is not available+ assert isinstance(result, str)+ assert (+ "screenshot" in result.lower() or "captured" in result.lower()+ )@pytest.mark.asyncio- async def test_click_valid_ref(self):+ async def test_click_valid_ref(self, browser_toolkit_fixture):"""Test clicking with valid reference."""- mock_session = AsyncMock()- mock_session.ensure_browser = AsyncMock()- mock_session.get_page = AsyncMock(return_value=mock_page)- mock_session.visit = AsyncMock(return_value="Visited test URL")- mock_session.get_snapshot = AsyncMock(- return_value="- Page Snapshot\\n```yaml\\n<test content>\\n```"- )- mock_session.exec_action = AsyncMock(- return_value="Action executed successfully"- )- mock_session.close = AsyncMock()-- with (- patch(- 'camel.toolkits.hybrid_browser_toolkit.browser_session.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.os.path.join',- return_value='mock_script_path',- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock script');"),- ),- ):- toolkit = HybridBrowserToolkit(headless=True)- toolkit._session = mock_session-- # Mock the _get_unified_analysis method to include e1 element- mock_analysis = {"elements": {"e1": {"role": "button"}}}- toolkit._get_unified_analysis = AsyncMock(- return_value=mock_analysis- )-- result = await toolkit.click(ref="e1")+ toolkit = browser_toolkit_fixture+ result = await toolkit.browser_click(ref="e1")- assert result["result"] == "Action executed successfully"- assert "snapshot" in result+ assert "result" in result+ assert "snapshot" in result+ assert "tabs" in result+ assert "current_tab" in result+ assert "total_tabs" in result+ assert (+ "clicked" in result["result"].lower()+ or "successfully" in result["result"].lower()+ )@pytest.mark.asyncio- async def test_click_invalid_ref(self):+ async def test_click_invalid_ref(self, browser_toolkit_fixture):"""Test clicking with invalid reference."""- mock_session = AsyncMock()- mock_session.ensure_browser = AsyncMock()- mock_session.get_page = AsyncMock(return_value=mock_page)- mock_session.visit = AsyncMock(return_value="Visited test URL")- mock_session.get_snapshot = AsyncMock(- return_value="- Page Snapshot\\n```yaml\\n<test content>\\n```"- )- mock_session.exec_action = AsyncMock(- return_value="Action executed successfully"- )- mock_session.close = AsyncMock()-- with (- patch(- 'camel.toolkits.hybrid_browser_toolkit.browser_session.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.os.path.join',- return_value='mock_script_path',- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock script');"),- ),- ):- toolkit = HybridBrowserToolkit(headless=True)- toolkit._session = mock_session-- with pytest.raises(ValueError):- await toolkit.click(ref="")+ toolkit = browser_toolkit_fixture+ # With WebSocket wrapper, validation should be handled gracefully+ result = await toolkit.browser_click(ref="")+ assert "result" in result+ assert isinstance(result["result"], str)@pytest.mark.asyncioasync def test_type_text(self, browser_toolkit_fixture):"""Test typing text in element."""toolkit = browser_toolkit_fixture- result = await toolkit.type(ref="input_element", text="Hello World")- assert result["result"] == "Action executed successfully"+ result = await toolkit.browser_type(+ ref="input_element", text="Hello World"+ )+ assert "result" in resultassert "snapshot" in result+ assert "tabs" in result+ assert (+ "typed" in result["result"].lower()+ or "successfully" in result["result"].lower()+ )@pytest.mark.asyncioasync def test_select_option(self, browser_toolkit_fixture):"""Test selecting option in dropdown."""toolkit = browser_toolkit_fixture- result = await toolkit.select(ref="select_element", value="option1")+ result = await toolkit.browser_select(+ ref="select_element", value="option1"+ )- assert result["result"] == "Action executed successfully"+ assert "result" in resultassert "snapshot" in result+ assert "tabs" in result+ assert (+ "selected" in result["result"].lower()+ or "successfully" in result["result"].lower()+ )@pytest.mark.asyncio- async def test_scroll_valid_direction(self):+ async def test_scroll_valid_direction(self, browser_toolkit_fixture):"""Test scrolling with valid direction."""- mock_session = AsyncMock()- mock_session.ensure_browser = AsyncMock()- mock_session.get_page = AsyncMock(return_value=mock_page)- mock_session.visit = AsyncMock(return_value="Visited test URL")- mock_session.get_snapshot = AsyncMock(- return_value="- Page Snapshot\\n```yaml\\n<test content>\\n```"- )- mock_session.exec_action = AsyncMock(- return_value="Action executed successfully"- )- mock_session.close = AsyncMock()-- with (- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.os.path.join',- return_value='mock_script_path',- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock script');"),- ),- ):- toolkit = HybridBrowserToolkit(headless=True)- toolkit._session = mock_session-- result = await toolkit.scroll(direction="down", amount=100)-- assert result["result"] == "Action executed successfully"- assert "snapshot" in result+ toolkit = browser_toolkit_fixture+ result = await toolkit.browser_scroll(direction="down", amount=100)- @pytest.mark.asyncio- async def test_scroll_invalid_direction(self):- """Test scrolling with invalid direction."""- mock_session = AsyncMock()- mock_session.ensure_browser = AsyncMock()- mock_session.get_page = AsyncMock(return_value=mock_page)- mock_session.visit = AsyncMock(return_value="Visited test URL")- mock_session.get_snapshot = AsyncMock(- return_value="- Page Snapshot\\n```yaml\\n<test content>\\n```"- )- mock_session.exec_action = AsyncMock(- return_value="Action executed successfully"+ assert "result" in result+ assert "snapshot" in result+ assert "tabs" in result+ assert (+ "scrolled" in result["result"].lower()+ or "successfully" in result["result"].lower())- mock_session.close = AsyncMock()-- with (- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.os.path.join',- return_value='mock_script_path',- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock script');"),- ),- ):- toolkit = HybridBrowserToolkit(headless=True)- toolkit._session = mock_session-- result = await toolkit.scroll(- direction="invalid_direction", amount=100- )- assert (- "Error: direction must be 'up' or 'down'" in result["result"]- )@pytest.mark.asyncio- async def test_get_page_links_valid_refs(- self, browser_toolkit_fixture, mock_page_fixture- ):- """Test getting page links with valid references."""+ async def test_scroll_invalid_direction(self, browser_toolkit_fixture):+ """Test scrolling with invalid direction."""toolkit = browser_toolkit_fixture- mock_page = mock_page_fixture- toolkit._session.get_page = AsyncMock(return_value=mock_page)-- # Mock page evaluate to return links- mock_links = [- {"href": "https://example.com/page1", "text": "Page 1"},- {"href": "https://example.com/page2", "text": "Page 2"},- ]- mock_page.evaluate = AsyncMock(return_value=mock_links)-- result = await toolkit.get_page_links(ref=["e1", "e2"])-- assert "links" in result- assert isinstance(result["links"], list)-- @pytest.mark.asyncio- async def test_get_page_links_invalid_refs(self):- """Test getting page links with invalid references."""- mock_session = AsyncMock()- mock_session.ensure_browser = AsyncMock()- mock_session.get_page = AsyncMock(return_value=mock_page)- mock_session.visit = AsyncMock(return_value="Visited test URL")- mock_session.get_snapshot = AsyncMock(- return_value="- Page Snapshot\\n```yaml\\n<test content>\\n```"- )- mock_session.exec_action = AsyncMock(- return_value="Action executed successfully"+ result = await toolkit.browser_scroll(+ direction="invalid_direction", amount=100)- mock_session.close = AsyncMock()-- with (- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.os.path.join',- return_value='mock_script_path',- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock script');"),- ),- ):- toolkit = HybridBrowserToolkit(headless=True)- toolkit._session = mock_session-- result = await toolkit.get_page_links(ref=[])- assert result["links"] == []+ # WebSocket wrapper should handle validation gracefully+ assert "result" in result+ assert isinstance(result["result"], str)@pytest.mark.asyncio- async def test_wait_user_no_timeout(self):+ async def test_wait_user_no_timeout(self, browser_toolkit_fixture):"""Test waiting for user input without timeout."""- mock_session = AsyncMock()- mock_session.ensure_browser = AsyncMock()- mock_session.get_page = AsyncMock(return_value=mock_page)- mock_session.visit = AsyncMock(return_value="Visited test URL")- mock_session.get_snapshot = AsyncMock(- return_value="- Page Snapshot\\n```yaml\\n<test content>\\n```"- )- mock_session.exec_action = AsyncMock(- return_value="Action executed successfully"- )- mock_session.close = AsyncMock()-- with (- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.os.path.join',- return_value='mock_script_path',- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock script');"),- ),- ):- toolkit = HybridBrowserToolkit(headless=True)- toolkit._session = mock_session+ toolkit = browser_toolkit_fixture- # Mock user input- with patch('builtins.input', return_value='continue'):- result = await toolkit.wait_user()+ # Mock user input+ with patch('builtins.input', return_value='continue'):+ result = await toolkit.browser_wait_user()- assert result["result"] == "User resumed."- assert "snapshot" in result+ assert "result" in result+ assert "snapshot" in result+ assert (+ "resumed" in result["result"].lower()+ or "user" in result["result"].lower()+ )@pytest.mark.asyncio- async def test_wait_user_with_timeout(self):+ async def test_wait_user_with_timeout(self, browser_toolkit_fixture):"""Test waiting for user input with timeout."""- mock_session = AsyncMock()- mock_session.ensure_browser = AsyncMock()- mock_session.get_page = AsyncMock(return_value=mock_page)- mock_session.visit = AsyncMock(return_value="Visited test URL")- mock_session.get_snapshot = AsyncMock(- return_value="- Page Snapshot\\n```yaml\\n<test content>\\n```"- )- mock_session.exec_action = AsyncMock(- return_value="Action executed successfully"- )- mock_session.close = AsyncMock()-- with (- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.HybridBrowserSession',- return_value=mock_session,- ),- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.os.path.join',- return_value='mock_script_path',- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock script');"),- ),- ):- toolkit = HybridBrowserToolkit(headless=True)- toolkit._session = mock_session+ toolkit = browser_toolkit_fixture- # Mock asyncio.wait_for to simulate timeout- import asyncio+ # Mock asyncio.wait_for to simulate timeout+ import asyncio- with patch('asyncio.wait_for', side_effect=asyncio.TimeoutError()):- result = await toolkit.wait_user(timeout_sec=1.0)+ with patch('asyncio.wait_for', side_effect=asyncio.TimeoutError()):+ result = await toolkit.browser_wait_user(timeout_sec=1.0)- assert (- "Timeout 1.0s reached, auto-resumed." in result["result"]- )- assert "snapshot" in result+ assert "result" in result+ assert "snapshot" in result+ assert (+ "timeout" in result["result"].lower()+ or "auto-resumed" in result["result"].lower()+ )def test_get_tools(self, sync_browser_toolkit):"""Test getting available tools with default configuration."""@@ -895,94 +471,36 @@ class TestHybridBrowserToolkit:tool_names = [tool.func.__name__ for tool in tools]expected_default_tools = [- "open_browser",- "close_browser",- "visit_page",- "back",- "forward",- "click",- "type",- "switch_tab",+ "browser_open",+ "browser_close",+ "browser_visit_page",+ "browser_back",+ "browser_forward",+ "browser_click",+ "browser_type",+ "browser_switch_tab",]for expected_tool in expected_default_tools:assert expected_tool in tool_names- def test_get_tools_with_web_agent_model(self, sync_browser_toolkit):- """Test getting tools when web_agent_model is provided."""- mock_model = MagicMock()- toolkit = sync_browser_toolkit-- # Simulate having a web agent model- toolkit.web_agent_model = mock_model-- tools = toolkit.get_tools()-- # Default tools should be 6, even with web_agent_model set- # unless solve_task is explicitly enabled- assert len(tools) == 8- tool_names = [tool.func.__name__ for tool in tools]-- # Should not automatically include solve_task unless explicitly enabled- assert 'solve_task' not in tool_names-- def test_get_tools_with_solve_task_enabled(self):- """Test getting tools when solve_task is explicitly enabled."""- mock_model = MagicMock()-- with (- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.HybridBrowserSession',- return_value=AsyncMock(),- ),- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.os.path.join',- return_value='mock_script_path',- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock script');"),- ),- ):- toolkit = HybridBrowserToolkit(- headless=True,- web_agent_model=mock_model,- enabled_tools=['open_browser', 'close_browser', 'solve_task'],- )-- tools = toolkit.get_tools()- tool_names = [tool.func.__name__ for tool in tools]-- assert len(tools) == 3- assert 'solve_task' in tool_names- assert 'open_browser' in tool_names- assert 'close_browser' in tool_names-def test_get_tools_custom_selection(self):"""Test getting tools with custom tool selection."""custom_tools = [- "open_browser",- "close_browser",- "visit_page",- "back",- "forward",- "click",- "type",- "switch_tab",+ "browser_open",+ "browser_close",+ "browser_visit_page",+ "browser_back",+ "browser_forward",+ "browser_click",+ "browser_type",+ "browser_switch_tab",]with (patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.HybridBrowserSession',- return_value=AsyncMock(),- ),- patch(- 'camel.toolkits.hybrid_browser_toolkit.hybrid_browser_toolkit.os.path.join',- return_value='mock_script_path',- ),- patch(- 'builtins.open',- mock_open(read_data="console.log('mock script');"),+ 'camel.toolkits.hybrid_browser_toolkit.ws_wrapper.WebSocketBrowserWrapper',+ return_value=mock_ws_wrapper,),):toolkit = HybridBrowserToolkit(@@ -996,324 +514,13 @@ class TestHybridBrowserToolkit:for expected_tool in custom_tools:assert expected_tool in tool_names- def test_convert_analysis_to_rects(self, sync_browser_toolkit):- """Test converting analysis data to rect format."""- toolkit = sync_browser_toolkit-- analysis_data = {- "elements": {- "e1": {- "role": "button",- "name": "Submit",- "coordinates": [- {"x": 10, "y": 20, "width": 50, "height": 30}- ],- }- }- }-- rects = toolkit._convert_analysis_to_rects(analysis_data)-- assert "e1" in rects- assert rects["e1"]["role"] == "button"- assert rects["e1"]["aria-name"] == "Submit"- assert len(rects["e1"]["rects"]) == 1- assert rects["e1"]["rects"][0]["x"] == 10-- def test_format_snapshot_from_analysis(self, sync_browser_toolkit):- """Test formatting snapshot from analysis data."""- toolkit = sync_browser_toolkit-- analysis_data = {- "elements": {- "e1": {- "role": "button",- "name": "Submit",- "disabled": True,- },- "e2": {- "role": "checkbox",- "name": "Agree",- "checked": True,- },- }- }-- snapshot = toolkit._format_snapshot_from_analysis(analysis_data)-- assert "[ref=e1]" in snapshot- assert "button" in snapshot- assert "Submit" in snapshot- assert "disabled" in snapshot- assert "[ref=e2]" in snapshot- assert "checkbox" in snapshot- assert "checked" in snapshot-- def test_add_set_of_mark_with_pil(self, sync_browser_toolkit):- """Test adding visual marks to image."""- toolkit = sync_browser_toolkit-- # Create test image- test_image = Image.new('RGB', (200, 200), color='white')-- # Test rects data- rects = {- "e1": {- "role": "button",- "rects": [{"x": 10, "y": 10, "width": 50, "height": 20}],- }- }-- marked_image = toolkit._add_set_of_mark(test_image, rects)-- assert isinstance(marked_image, Image.Image)- assert marked_image.size == test_image.size-- def test_add_set_of_mark_without_pil(self, sync_browser_toolkit):- """Test adding visual marks when PIL is not available."""- toolkit = sync_browser_toolkit-- test_image = Image.new('RGB', (200, 200), color='white')-- with patch('PIL.ImageDraw', side_effect=ImportError):- result = toolkit._add_set_of_mark(test_image, {})-- # Should return original image when PIL not available- assert result == test_image-@pytest.mark.asyncioasync def test_simple_async_creation(self, browser_toolkit_fixture):"""Simple test to verify async toolkit creation works with mocks."""toolkit = browser_toolkit_fixture- result = await toolkit.open_browser()- assert "Visited" in result["result"]+ result = await toolkit.browser_open()+ assert "result" in resultassert "snapshot" in result---class TestActionExecutorTimeouts:- """Test ActionExecutor timeout configuration functionality."""-- @pytest.fixture- def mock_page(self):- """Create a mock page for ActionExecutor tests."""- page = AsyncMock()- page.locator = MagicMock(return_value=AsyncMock())- page.locator.return_value.count = AsyncMock(return_value=1)- page.locator.return_value.first = AsyncMock()- page.locator.return_value.first.click = AsyncMock()- page.fill = AsyncMock()- page.select_option = AsyncMock()- page.wait_for_selector = AsyncMock()- page.text_content = AsyncMock(return_value="test text")- page.wait_for_load_state = AsyncMock()- return page-- def test_action_executor_default_timeouts(self, mock_page):- """Test that ActionExecutor uses default timeouts when none provided."""- from camel.toolkits.hybrid_browser_toolkit.actions import (- ActionExecutor,- )-- executor = ActionExecutor(mock_page)-- assert executor.default_timeout == 3000- assert executor.short_timeout == 1000-- def test_action_executor_constructor_timeouts(self, mock_page):- """Test that ActionExecutor respects constructor timeout parameters."""- from camel.toolkits.hybrid_browser_toolkit.actions import (- ActionExecutor,- )-- executor = ActionExecutor(- mock_page, default_timeout=5000, short_timeout=2000- )-- assert executor.default_timeout == 5000- assert executor.short_timeout == 2000-- @patch.dict(- 'os.environ',- {- 'HYBRID_BROWSER_DEFAULT_TIMEOUT': '7000',- 'HYBRID_BROWSER_SHORT_TIMEOUT': '3500',- },- )- def test_action_executor_environment_timeouts(self, mock_page):- """Test that ActionExecutor respects environment variable timeouts."""- from camel.toolkits.hybrid_browser_toolkit.actions import (- ActionExecutor,- )-- executor = ActionExecutor(mock_page)-- assert executor.default_timeout == 7000- assert executor.short_timeout == 3500-- @patch.dict(- 'os.environ',- {- 'HYBRID_BROWSER_DEFAULT_TIMEOUT': '7000',- 'HYBRID_BROWSER_SHORT_TIMEOUT': '3500',- },- )- def test_action_executor_constructor_precedence_over_env(self, mock_page):- """Test that constructor parameters take precedence over environment variables."""- from camel.toolkits.hybrid_browser_toolkit.actions import (- ActionExecutor,- )-- executor = ActionExecutor(- mock_page, default_timeout=9000, short_timeout=4500- )-- # Constructor params should override environment variables- assert executor.default_timeout == 9000- assert executor.short_timeout == 4500-- @patch.dict('os.environ', {'HYBRID_BROWSER_DEFAULT_TIMEOUT': '7000'})- def test_action_executor_partial_env_override(self, mock_page):- """Test partial environment variable override with constructor params."""- from camel.toolkits.hybrid_browser_toolkit.actions import (- ActionExecutor,- )-- executor = ActionExecutor(- mock_page,- short_timeout=2500, # Only override short_timeout- )-- # Should use env var for default_timeout, constructor for short_timeout- assert executor.default_timeout == 7000- assert executor.short_timeout == 2500-- @pytest.mark.asyncio- async def test_action_executor_uses_configured_timeouts_in_fill(- self, mock_page- ):- """Test that ActionExecutor uses configured timeouts in operations."""- from camel.toolkits.hybrid_browser_toolkit.actions import (- ActionExecutor,- )-- executor = ActionExecutor(- mock_page, default_timeout=6000, short_timeout=2500- )-- # Test that fill operation uses the configured short_timeout- action = {"type": "type", "ref": "test", "text": "hello"}- await executor._type(action)-- mock_page.fill.assert_called_once()- call_args = mock_page.fill.call_args- assert call_args[1]["timeout"] == 2500 # Should use short_timeout-- @pytest.mark.asyncio- async def test_action_executor_uses_configured_timeouts_in_select(- self, mock_page- ):- """Test that ActionExecutor uses configured timeouts in select operations."""- from camel.toolkits.hybrid_browser_toolkit.actions import (- ActionExecutor,- )-- executor = ActionExecutor(- mock_page, default_timeout=8000, short_timeout=3000- )-- # Test that select operation uses the configured default_timeout- action = {"type": "select", "ref": "test", "value": "option1"}- await executor._select(action)-- mock_page.select_option.assert_called_once()- call_args = mock_page.select_option.call_args- assert call_args[1]["timeout"] == 8000 # Should use default_timeout-- @pytest.mark.asyncio- async def test_action_executor_uses_configured_timeouts_in_wait(- self, mock_page- ):- """Test that ActionExecutor uses configured timeouts in wait operations."""- from camel.toolkits.hybrid_browser_toolkit.actions import (- ActionExecutor,- )-- executor = ActionExecutor(- mock_page, default_timeout=7500, short_timeout=2750- )-- # Test that wait operation uses the configured default_timeout- action = {"type": "wait", "selector": "test"}- await executor._wait(action)-- mock_page.wait_for_selector.assert_called_once()- call_args = mock_page.wait_for_selector.call_args- assert call_args[1]["timeout"] == 7500 # Should use default_timeout---class TestTabIdGenerator:- """Test cases for the TabIdGenerator class."""-- @pytest.mark.asyncio- async def test_generate_monotonic_ids(self):- """Test that TabIdGenerator generates monotonic sequential IDs."""- from camel.toolkits.hybrid_browser_toolkit.browser_session import (- TabIdGenerator,- )-- # Reset counter for clean test- TabIdGenerator._counter = 0-- id1 = await TabIdGenerator.generate_tab_id()- id2 = await TabIdGenerator.generate_tab_id()- id3 = await TabIdGenerator.generate_tab_id()-- assert id1 == "tab-001"- assert id2 == "tab-002"- assert id3 == "tab-003"-- @pytest.mark.asyncio- async def test_concurrent_id_generation(self):- """Test that concurrent ID generation is thread-safe."""- import asyncio-- from camel.toolkits.hybrid_browser_toolkit.browser_session import (- TabIdGenerator,- )-- # Reset counter for clean test- TabIdGenerator._counter = 0-- async def generate_ids():- return [await TabIdGenerator.generate_tab_id() for _ in range(5)]-- # Run multiple concurrent generators- results = await asyncio.gather(- generate_ids(), generate_ids(), generate_ids()- )-- # Flatten results and check all IDs are unique- all_ids = [id for result in results for id in result]- assert len(all_ids) == 15- assert len(set(all_ids)) == 15 # All IDs should be unique-- # Check they're all properly formatted- for id in all_ids:- assert id.startswith("tab-")- assert len(id) == 7 # "tab-" + 3 digits-- @pytest.mark.asyncio- async def test_id_format(self):- """Test that generated IDs follow the expected format."""- from camel.toolkits.hybrid_browser_toolkit.browser_session import (- TabIdGenerator,- )-- # Reset counter for clean test- TabIdGenerator._counter = 0-- id = await TabIdGenerator.generate_tab_id()-- assert id.startswith("tab-")- assert len(id) == 7 # "tab-" + 3 digits- assert id[4:].isdigit() # Last 3 characters should be digits+ assert "tabs" in result+ assert "current_tab" in result+ assert "total_tabs" in resultdiff --git a/uv.lock b/uv.lockindex 5b7b36f41..e8711e220 100644--- a/uv.lock+++ b/uv.lock@@ -784,6 +784,7 @@ all = [{ name = "types-tqdm" },{ name = "unstructured" },{ name = "weaviate-client" },+ { name = "websockets" },{ name = "wikipedia" },{ name = "wolframalpha" },{ name = "xls2xlsx" },@@ -944,6 +945,7 @@ owl = [{ name = "tree-sitter-python" },{ name = "typer" },{ name = "unstructured" },+ { name = "websockets" },{ name = "wikipedia" },{ name = "xls2xlsx" },{ name = "yt-dlp" },@@ -1011,6 +1013,7 @@ web-tools = [{ name = "scrapegraph-py" },{ name = "sympy" },{ name = "tavily-python" },+ { name = "websockets" },{ name = "wikipedia" },{ name = "wolframalpha" },]@@ -1336,6 +1339,9 @@ requires-dist = [{ name = "weaviate-client", marker = "extra == 'all'", specifier = ">=4.15.0" },{ name = "weaviate-client", marker = "extra == 'rag'", specifier = ">=4.15.0" },{ name = "weaviate-client", marker = "extra == 'storage'", specifier = ">=4.15.0" },+ { name = "websockets", marker = "extra == 'all'", specifier = ">=13.0,<15.1" },+ { name = "websockets", marker = "extra == 'owl'", specifier = ">=13.0,<15.1" },+ { name = "websockets", marker = "extra == 'web-tools'", specifier = ">=13.0,<15.1" },{ name = "wikipedia", marker = "extra == 'all'", specifier = ">=1,<2" },{ name = "wikipedia", marker = "extra == 'owl'", specifier = ">=1,<2" },{ name = "wikipedia", marker = "extra == 'web-tools'", specifier = ">=1,<2" },