nonebot-plugin-htmlrender 0.6.2__tar.gz → 0.6.3__tar.gz

{nonebot_plugin_htmlrender-0.6.2 → nonebot_plugin_htmlrender-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-htmlrender
-Version: 0.6.2
+Version: 0.6.3
 Summary: 通过浏览器渲染图片
 Project-URL: Homepage, https://github.com/kexue-z/nonebot-plugin-htmlrender
 Project-URL: Bug Tracker, https://github.com/kexue-z/nonebot-plugin-htmlrender/issues

{nonebot_plugin_htmlrender-0.6.2 → nonebot_plugin_htmlrender-0.6.3}/nonebot_plugin_htmlrender/browser.py

@@ -53,8 +53,6 @@ async def init_browser(**kwargs) -> Browser:
     Raises:
         RuntimeError: 如果浏览器无法启动或安装失败。
     """
-    await install_browser()  # update playwright when start
-    await check_playwright_env()
     return await start_browser(**kwargs)
 
 
@@ -117,6 +115,31 @@ async def _connect_via_cdp(**kwargs) -> Browser:
         raise RuntimeError("Playwright 未初始化")
 
 
+async def _connect(browser_type: str, **kwargs) -> Browser:
+    """
+    通过 Playwright 协议连接浏览器。
+
+    Args:
+        browser_type (str): 浏览器类型。
+        **kwargs: 传递给`playwright.connect`的关键字参数。
+
+    Returns:
+        Browser: 启动的浏览器实例。
+
+    Raises:
+        RuntimeError: 如果 Playwright 未初始化。
+    """
+    _browser_cls: BrowserType = getattr(_playwright, browser_type)
+    kwargs["ws_endpoint"] = plugin_config.htmlrender_connect
+    logger.info(
+        f"正在使用 Playwright 协议连接 {browser_type}({plugin_config.htmlrender_connect})"
+    )
+    if _playwright is not None:
+        return await _browser_cls.connect(**kwargs)
+    else:
+        raise RuntimeError("Playwright 未初始化")
+
+
 async def start_browser(**kwargs) -> Browser:
     """
     启动 Playwright 浏览器实例。
@@ -136,6 +159,9 @@ async def start_browser(**kwargs) -> Browser:
     ):
         return await _connect_via_cdp(**kwargs)
 
+    if plugin_config.htmlrender_connect:
+        return await _connect(plugin_config.htmlrender_browser, **kwargs)
+
     if plugin_config.htmlrender_browser_channel:
         kwargs["channel"] = plugin_config.htmlrender_browser_channel
 
@@ -144,6 +170,12 @@ async def start_browser(**kwargs) -> Browser:
 
     if plugin_config.htmlrender_browser_executable_path:
         kwargs["executable_path"] = plugin_config.htmlrender_browser_executable_path
+    else:
+        try:
+            await check_playwright_env()
+        except RuntimeError:
+            await install_browser()
+            await check_playwright_env()
 
     _browser = await _launch(plugin_config.htmlrender_browser, **kwargs)
     return _browser
@@ -164,7 +196,7 @@ async def check_playwright_env():
     logger.info("Checking Playwright environment...")
     try:
         async with async_playwright() as p:
-            await p.chromium.launch()
+            await getattr(p, plugin_config.htmlrender_browser).launch()
     except Exception as e:
         raise RuntimeError(
             "Playwright environment is not set up correctly. "

{nonebot_plugin_htmlrender-0.6.2 → nonebot_plugin_htmlrender-0.6.3}/nonebot_plugin_htmlrender/config.py

@@ -36,6 +36,9 @@ class Config(BaseModel):
     htmlrender_connect_over_cdp: Optional[str] = Field(
         default=None, description="通过 CDP 连接Playwright浏览器的端点地址。"
     )
+    htmlrender_connect: Optional[str] = Field(
+        default=None, description="通过Playwright协议连接Playwright浏览器的端点地址。"
+    )
 
     @model_validator(mode="after")
     def check_browser_channel(self) -> Self:

{nonebot_plugin_htmlrender-0.6.2 → nonebot_plugin_htmlrender-0.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-htmlrender"
-version = "0.6.2"
+version = "0.6.3"
 description = "通过浏览器渲染图片"
 readme = "README.md"
 authors = [{ name = "kexue", email = "x@kexue-cloud.cn" }]

{nonebot_plugin_htmlrender-0.6.2 → nonebot_plugin_htmlrender-0.6.3}/tests/test_browser.py

@@ -39,6 +39,7 @@ def browser_config() -> dict[str, str]:
     return {
         "browser": "chromium",
         "cdp": "ws://localhost:9222",
+        "pwp": "ws://localhost:3000/chromium/playwright",
     }
 
 
@@ -169,6 +170,29 @@ async def test_connect_via_cdp(
     assert browser == mock_browser
 
 
+@pytest.mark.asyncio
+async def test_connect(
+    mocker: MockerFixture, mock_browser: Browser, browser_config: dict[str, str]
+) -> None:
+    """测试通过Playwright协议连接浏览器"""
+    from nonebot_plugin_htmlrender.browser import start_browser
+
+    mocker.patch(
+        "nonebot_plugin_htmlrender.browser._connect", return_value=mock_browser
+    )
+    mocker.patch(
+        "nonebot_plugin_htmlrender.browser.plugin_config.htmlrender_browser",
+        browser_config["browser"],
+    )
+    mocker.patch(
+        "nonebot_plugin_htmlrender.browser.plugin_config.htmlrender_connect",
+        browser_config["pwp"],
+    )
+
+    browser = await start_browser()
+    assert browser == mock_browser
+
+
 @pytest.mark.parametrize(
     ("proxy_url", "expected"),
     [