chore: auto release commit (2026-07-03 18:50:07)

examples/simulator_browser_rpa/scripts/service/browser_session.py

@@ -1,16 +1,14 @@
-"""浏览器会话启动（系统 Chrome/Edge；URL 仅通过 page.goto 打开）。"""
+"""浏览器会话启动（系统 Chrome/Edge + async Playwright persistent context）。"""
 
 from __future__ import annotations
 
 import logging
 import os
-from contextlib import contextmanager
-from typing import Any, Generator, Iterator, List, Optional, Tuple
+from typing import Any, List, Optional, Tuple
 
 logger = logging.getLogger(__name__)
 
 DEFAULT_PAGE_TIMEOUT_MS = 15_000
-GOTO_TIMEOUT_MS = 60_000
 
 CHROME_LAUNCH_ARGS: List[str] = [
     "--start-maximized",
@@ -33,11 +31,11 @@ def _headless_from_env() -> bool:
     return v in ("1", "true", "yes", "on")
 
 
-def _find_chrome_executable() -> str | None:
+def find_chrome_executable() -> str | None:
     try:
-        from jiangchang_skill_core.runtime_env import find_chrome_executable
+        from jiangchang_skill_core.runtime_env import find_chrome_executable as _find
 
-        chrome = find_chrome_executable()
+        chrome = _find()
         if chrome and os.path.isfile(chrome):
             return chrome
     except ImportError:
@@ -59,80 +57,70 @@ def _clear_node_options() -> None:
     os.environ.pop("NODE_OPTIONS", None)
 
 
-@contextmanager
-def browser_session(
-    start_url: str,
+async def start_browser_session(
+    profile_dir: str,
     *,
-    profile_dir: Optional[str] = None,
     headless: Optional[bool] = None,
-) -> Generator[Any, None, None]:
+) -> Tuple[Any, Any, Any]:
     """
-    同步 Playwright 浏览器会话。
+    启动持久化 Chrome profile，返回 (playwright, context, page)。
 
-    - Playwright Python 包由宿主共享 runtime 提供；技能侧不要 playwright install。
-    - launch args 仅放 Chrome 参数，不含 URL。
-    - 流程：launch → new_page → goto(start_url)
+    URL 不在此文件打开；由 simulator_playwright.py 负责 page.goto。
     """
-    from playwright.sync_api import sync_playwright
+    from playwright.async_api import async_playwright
 
     _clear_node_options()
     hl = headless if headless is not None else _headless_from_env()
-    chrome = _find_chrome_executable()
+    chrome = find_chrome_executable()
     if not chrome:
         raise RuntimeError(
-            "未检测到 Chrome 或 Edge 浏览器，请安装系统浏览器后重试。"
+            "ERROR:MISSING_BROWSER 未检测到 Chrome 或 Edge 浏览器，请先安装系统浏览器后重试。"
         )
 
     args = chrome_launch_args()
     logger.info(
-        "browser_launch chrome=%s profile_dir=%s start_url=%s args=%s headless=%s",
+        "browser_launch chrome=%s profile_dir=%s args=%s headless=%s",
         chrome,
-        profile_dir or "",
-        start_url,
+        profile_dir,
         args,
         hl,
     )
 
-    browser_holder = None
+    pw = await async_playwright().start()
     context = None
-    with sync_playwright() as pw:
-        try:
-            if profile_dir:
-                context = pw.chromium.launch_persistent_context(
-                    user_data_dir=profile_dir,
-                    headless=hl,
-                    executable_path=chrome,
-                    locale="zh-CN",
-                    no_viewport=True,
-                    args=args,
-                    ignore_default_args=["--enable-automation"],
-                )
-            else:
-                browser_holder = pw.chromium.launch(
-                    headless=hl,
-                    executable_path=chrome,
-                    args=args,
-                    ignore_default_args=["--enable-automation"],
-                )
-                context = browser_holder.new_context(no_viewport=True, locale="zh-CN")
+    try:
+        context = await pw.chromium.launch_persistent_context(
+            user_data_dir=profile_dir,
+            headless=hl,
+            executable_path=chrome,
+            locale="zh-CN",
+            no_viewport=True,
+            args=args,
+            ignore_default_args=["--enable-automation"],
+        )
+        await context.add_init_script(STEALTH_INIT_SCRIPT)
 
-            context.add_init_script(STEALTH_INIT_SCRIPT)
-            page = context.new_page()
-            page.set_default_timeout(DEFAULT_PAGE_TIMEOUT_MS)
-            page.goto(start_url, wait_until="domcontentloaded", timeout=GOTO_TIMEOUT_MS)
-            yield page
-        finally:
+        page = context.pages[0] if context.pages else await context.new_page()
+        page.set_default_timeout(DEFAULT_PAGE_TIMEOUT_MS)
+        return pw, context, page
+    except Exception:
+        if context is not None:
             try:
-                if context is not None:
-                    context.close()
-            except Exception as exc:
-                logger.warning("browser_context_close_failed: %s", exc)
-            if browser_holder is not None:
-                try:
-                    browser_holder.close()
-                except Exception as exc:
-                    logger.warning("browser_close_failed: %s", exc)
+                await context.close()
+            except Exception:
+                pass
+        await pw.stop()
+        raise
 
 
-def find_chrome_executable() -> str | None:
-    return _find_chrome_executable()
+async def close_browser_session(playwright: Any, context: Any) -> None:
+    try:
+        if context is not None:
+            await context.close()
+    except Exception:
+        pass
+    try:
+        if playwright is not None:
+            await playwright.stop()
+    except Exception:
+        pass