nonebot-plugin-htmlrender 0.6.7__tar.gz → 0.6.8__tar.gz

{nonebot_plugin_htmlrender-0.6.7 → nonebot_plugin_htmlrender-0.6.8}/.pre-commit-config.yaml

@@ -7,10 +7,10 @@ ci:
   autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks"
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.2
+    rev: v0.12.12
     hooks:
-      - id: ruff
-        args: [--fix]
-        stages: [pre-commit]
       - id: ruff-format
-        stages: [pre-commit]
+      - id: ruff-check
+        args: [ --fix, --exit-non-zero-on-fix ]
+        types_or: [ python, pyi ]
+        require_serial: true

{nonebot_plugin_htmlrender-0.6.7 → nonebot_plugin_htmlrender-0.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-htmlrender
-Version: 0.6.7
+Version: 0.6.8
 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
@@ -31,6 +31,7 @@ Requires-Python: <4.0,>=3.9
 Requires-Dist: aiofiles>=0.8.0
 Requires-Dist: jinja2>=3.0.3
 Requires-Dist: markdown>=3.3.6
+Requires-Dist: nonebot-plugin-localstore>=0.7.4
 Requires-Dist: nonebot2>=2.4.2
 Requires-Dist: playwright>=1.48.0
 Requires-Dist: pygments>=2.10.0

nonebot_plugin_htmlrender-0.6.8/nonebot_plugin_htmlrender/__init__.py

@@ -0,0 +1,64 @@
+import nonebot
+from nonebot import require
+
+require("nonebot_plugin_localstore")
+from nonebot.log import logger
+from nonebot.plugin import PluginMetadata
+
+from nonebot_plugin_htmlrender.browser import (
+    get_new_page,
+    shutdown_htmlrender,
+    startup_htmlrender,
+)
+from nonebot_plugin_htmlrender.config import Config, plugin_config
+from nonebot_plugin_htmlrender.data_source import (
+    capture_element,
+    html_to_pic,
+    md_to_pic,
+    template_to_html,
+    template_to_pic,
+    text_to_pic,
+)
+from nonebot_plugin_htmlrender.utils import _clear_playwright_env_vars
+
+__plugin_meta__ = PluginMetadata(
+    name="nonebot-plugin-htmlrender",
+    description="通过浏览器渲染图片",
+    usage="",
+    type="library",
+    config=Config,
+    homepage="https://github.com/kexue-z/nonebot-plugin-htmlrender",
+    extra={},
+)
+
+driver = nonebot.get_driver()
+
+
+@driver.on_startup
+async def init(**kwargs):
+    logger.info("HTMLRender Starting...")
+    await startup_htmlrender(**kwargs)
+    logger.opt(colors=True).info(
+        f"HTMLRender Started with <cyan>{plugin_config.htmlrender_browser}</cyan>."
+    )
+
+
+@driver.on_shutdown
+async def shutdown():
+    logger.info("HTMLRender Shutting down...")
+    await shutdown_htmlrender()
+    _clear_playwright_env_vars()
+    logger.info("HTMLRender Shut down.")
+
+
+__all__ = [
+    "capture_element",
+    "get_new_page",
+    "html_to_pic",
+    "md_to_pic",
+    "shutdown_htmlrender",
+    "startup_htmlrender",
+    "template_to_html",
+    "template_to_pic",
+    "text_to_pic",
+]

{nonebot_plugin_htmlrender-0.6.7 → nonebot_plugin_htmlrender-0.6.8}/nonebot_plugin_htmlrender/browser.py

@@ -13,7 +13,13 @@ from playwright.async_api import (
 
 from nonebot_plugin_htmlrender.config import plugin_config
 from nonebot_plugin_htmlrender.install import install_browser
-from nonebot_plugin_htmlrender.utils import proxy_settings, suppress_and_log, with_lock
+from nonebot_plugin_htmlrender.utils import (
+    _prepare_playwright_env_vars,
+    clean_playwright_cache,
+    proxy_settings,
+    suppress_and_log,
+    with_lock,
+)
 
 _browser: Optional[Browser] = None
 _playwright: Optional[Playwright] = None
@@ -40,22 +46,6 @@ async def _launch(browser_type: str, **kwargs) -> Browser:
     return await _browser_cls.launch(**kwargs)
 
 
-async def init_browser(**kwargs) -> Browser:
-    """
-    初始化浏览器实例。
-
-    Args:
-        **kwargs: 传递给`playwright.launch`的关键字参数。
-
-    Returns:
-        Browser: 浏览器实例。
-
-    Raises:
-        RuntimeError: 如果浏览器无法启动或安装失败。
-    """
-    return await start_browser(**kwargs)
-
-
 @asynccontextmanager
 async def get_new_page(device_scale_factor: float = 2, **kwargs) -> AsyncIterator[Page]:
     """
@@ -88,7 +78,7 @@ async def get_browser(**kwargs) -> Browser:
     if _browser and _browser.is_connected():
         return _browser
 
-    return await init_browser(**kwargs)
+    return await startup_htmlrender(**kwargs)
 
 
 async def _connect_via_cdp(**kwargs) -> Browser:
@@ -106,12 +96,12 @@ async def _connect_via_cdp(**kwargs) -> Browser:
     """
     kwargs["endpoint_url"] = plugin_config.htmlrender_connect_over_cdp
     logger.info(
-        f"正在使用 CDP 连接 Chromium({plugin_config.htmlrender_connect_over_cdp})"
+        f"Connecting to Chromium via CDP ({plugin_config.htmlrender_connect_over_cdp})"
     )
     if _playwright is not None:
         return await _playwright.chromium.connect_over_cdp(**kwargs)
     else:
-        raise RuntimeError("Playwright 未初始化")
+        raise RuntimeError("Playwright is not initialized")
 
 
 async def _connect(browser_type: str, **kwargs) -> Browser:
@@ -131,7 +121,8 @@ async def _connect(browser_type: str, **kwargs) -> Browser:
     _browser_cls: BrowserType = getattr(_playwright, browser_type)
     kwargs["ws_endpoint"] = plugin_config.htmlrender_connect
     logger.info(
-        f"正在使用 Playwright 协议连接 {browser_type}({plugin_config.htmlrender_connect})"
+        f"Connecting to {browser_type.capitalize()} via "
+        f"WebSocket endpoint: {plugin_config.htmlrender_connect}"
     )
     if _playwright is not None:
         return await _browser_cls.connect(**kwargs)
@@ -140,7 +131,7 @@ async def _connect(browser_type: str, **kwargs) -> Browser:
 
 
 @with_lock
-async def start_browser(**kwargs) -> Browser:
+async def startup_htmlrender(**kwargs) -> Browser:
     """
     启动 Playwright 浏览器实例。
 
@@ -152,8 +143,12 @@ async def start_browser(**kwargs) -> Browser:
     """
     global _browser, _playwright
 
-    await shutdown_browser()
+    await shutdown_htmlrender()
+    clean_playwright_cache()
+    _prepare_playwright_env_vars()
+
     _playwright = await async_playwright().start()
+    logger.debug("Playwright started")
 
     if (
         plugin_config.htmlrender_browser == "chromium"
@@ -174,35 +169,62 @@ async def start_browser(**kwargs) -> Browser:
 
         if plugin_config.htmlrender_browser_executable_path:
             kwargs["executable_path"] = plugin_config.htmlrender_browser_executable_path
+            try:
+                _browser = await _launch(plugin_config.htmlrender_browser, **kwargs)
+            except Exception as e:
+                raise RuntimeError(
+                    f"Failed to launch browser with executable path"
+                    f" '{plugin_config.htmlrender_browser_executable_path}': {e}"
+                ) from e
         else:
             try:
-                await check_playwright_env(**kwargs)
+                _browser = await check_playwright_env(**kwargs)
             except RuntimeError:
                 await install_browser()
-                await check_playwright_env(**kwargs)
-
-        _browser = await _launch(plugin_config.htmlrender_browser, **kwargs)
+                _browser = await check_playwright_env(**kwargs)
 
     return _browser
 
 
-async def shutdown_browser() -> None:
+async def shutdown_htmlrender() -> None:
     """关闭浏览器和 Playwright 实例。"""
     if _browser:
-        with suppress_and_log():
-            await _browser.close()
+        if not _browser.is_connected():
+            logger.info("Browser was already disconnected, skipping close.")
+        else:
+            with suppress_and_log():
+                logger.debug("Disconnecting browser...")
+                await _browser.close()
+                logger.info("Disconnected browser.")
     if _playwright:
         with suppress_and_log():
+            logger.debug("Stopping Playwright...")
             await _playwright.stop()
+            logger.info("Playwright stopped.")
+
 
+async def check_playwright_env(**kwargs) -> Browser:
+    """
+    检查Playwright环境，复用_launch方法避免逻辑重复。
+
+    Args:
+        **kwargs: 传递给`playwright.launch`的关键字参数。
 
-async def check_playwright_env(**kwargs):
-    """Check Playwright environment."""
+    Raises:
+        RuntimeError: 如果Playwright环境设置不正确。
+    """
     logger.info("Checking Playwright environment...")
+    global _browser, _playwright
+
     try:
-        async with async_playwright() as p:
-            await getattr(p, plugin_config.htmlrender_browser).launch(**kwargs)
+        _playwright = await async_playwright().start()
+        _browser = await _launch(plugin_config.htmlrender_browser, **kwargs)
+        logger.success("Playwright environment is set up correctly.")
+        return _browser
+
     except Exception as e:
+        await shutdown_htmlrender()
+
         raise RuntimeError(
             "Playwright environment is not set up correctly. "
             "Refer to https://playwright.dev/python/docs/intro#system-requirements"

{nonebot_plugin_htmlrender-0.6.7 → nonebot_plugin_htmlrender-0.6.8}/nonebot_plugin_htmlrender/config.py

@@ -1,11 +1,17 @@
+from pathlib import Path
 from typing import Any, Optional
 
 from nonebot import get_driver, get_plugin_config
 from nonebot.compat import model_validator
+import nonebot_plugin_localstore as store
 from pydantic import BaseModel, Field
 
 from nonebot_plugin_htmlrender.consts import BROWSER_CHANNEL_TYPES, BROWSER_ENGINE_TYPES
 
+plugin_cache_dir: Path = store.get_plugin_cache_dir()
+plugin_config_dir: Path = store.get_plugin_config_dir()
+plugin_data_dir: Path = store.get_plugin_data_dir()
+
 
 class Config(BaseModel):
     """插件配置类。"""
@@ -14,6 +20,18 @@ class Config(BaseModel):
         default="chromium",
         description="Playwright浏览器引擎类型，默认值为 'chromium'。",
     )
+    htmlrender_storage_path: Path = Field(
+        default=plugin_data_dir,
+        description="存储路径，不填则使用 `nonebot-plugin-localstore` 管理",
+    )
+    htmlrender_cache_path: Path = Field(
+        default=plugin_cache_dir,
+        description="缓存路径，不填则使用 `nonebot-plugin-localstore` 管理",
+    )
+    htmlrender_config_path: Path = Field(
+        default=plugin_config_dir,
+        description="配置路径，不填则使用 `nonebot-plugin-localstore` 管理",
+    )
     htmlrender_download_host: Optional[str] = Field(
         default=None, description="下载Playwright浏览器时的主机地址。"
     )
@@ -29,7 +47,7 @@ class Config(BaseModel):
     htmlrender_browser_channel: Optional[str] = Field(
         default=None, description="Playwright浏览器通道类型。"
     )
-    htmlrender_browser_executable_path: Optional[str] = Field(
+    htmlrender_browser_executable_path: Optional[Path] = Field(
         default=None, description="Playwright浏览器可执行文件的路径。"
     )
     htmlrender_connect_over_cdp: Optional[str] = Field(
@@ -38,7 +56,6 @@ class Config(BaseModel):
     htmlrender_connect: Optional[str] = Field(
         default=None, description="通过Playwright协议连接Playwright浏览器的端点地址。"
     )
-
     htmlrender_browser_args: Optional[str] = Field(
         default=None, description="Playwright 浏览器启动参数。"
     )

{nonebot_plugin_htmlrender-0.6.7 → nonebot_plugin_htmlrender-0.6.8}/nonebot_plugin_htmlrender/data_source.py

@@ -87,7 +87,7 @@ async def md_to_pic(
         if md_path:
             md = await read_file(md_path)
         else:
-            raise Exception("必须输入 md 或 md_path")
+            raise Exception("md or md_path must be provided")
     logger.debug(md)
     md = markdown.markdown(
         md,
@@ -174,7 +174,7 @@ async def template_to_html(
     if filters:
         for filter_name, filter_func in filters.items():
             template_env.filters[filter_name] = filter_func
-            logger.debug(f"加载自定义过滤器 {filter_name}")
+            logger.debug(f"Custom filter loaded: {filter_name}")
 
     template = template_env.get_template(template_name)
 
@@ -209,9 +209,9 @@ async def html_to_pic(
     """
     # logger.debug(f"html:\n{html}")
     if "file:" not in template_path:
-        raise Exception("template_path 应该为 file:///path/to/template")
+        raise Exception("template_path should be file:///path/to/template")
     async with get_new_page(device_scale_factor, **kwargs) as page:
-        page.on("console", lambda msg: logger.debug(f"浏览器控制台: {msg.text}"))
+        page.on("console", lambda msg: logger.debug(f"[Browser Console]: {msg.text}"))
         await page.goto(template_path)
         await page.set_content(html, wait_until="networkidle")
         await page.wait_for_timeout(wait)
@@ -266,7 +266,7 @@ async def template_to_pic(
     if filters:
         for filter_name, filter_func in filters.items():
             template_env.filters[filter_name] = filter_func
-            logger.debug(f"加载自定义过滤器 {filter_name}")
+            logger.debug(f"Custom filter loaded: {filter_name}")
 
     template = template_env.get_template(template_name)
 

{nonebot_plugin_htmlrender-0.6.7 → nonebot_plugin_htmlrender-0.6.8}/nonebot_plugin_htmlrender/install.py

@@ -86,7 +86,10 @@ async def download_context() -> AsyncIterator[None]:
     try:
         best_mirror = await check_mirror_connectivity()
         if best_mirror is not None:
-            logger.info(f"Using Mirror source: {best_mirror.name} ({best_mirror.url})")
+            logger.opt(colors=True).info(
+                f"Using Mirror source: <cyan>{best_mirror.name}</cyan> "
+                f"{best_mirror.url}"
+            )
             os.environ["PLAYWRIGHT_DOWNLOAD_HOST"] = best_mirror.url
         else:
             logger.info("Mirror source not available, using default")
@@ -125,30 +128,25 @@ async def read_stream(
     if stream is None:
         return ""
 
-    last_progress = ""  # 上一次显示的进度
     output = []  # 存储读取到的文本内容
 
     while True:
         try:
-            char = await stream.read(1)
-            if not char:
+            line_data = await stream.readline()
+            if not line_data:
                 break
 
-            if char == b"\r":
-                continue
+            line = line_data.decode().strip()
 
-            line = char + await stream.readuntil(b"\n")
-            text = line.decode().strip()
+            if callback:
+                try:
+                    await callback(line)
+                except UnicodeEncodeError:
+                    safe_text = "".join(c if ord(c) < 128 else "?" for c in line)
+                    await callback(safe_text)
 
-            if "|" in text and "%" in text:
-                if text != last_progress:
-                    if callback:
-                        await callback(f"Progress: {text}")
-                    last_progress = text
-            else:
-                if callback:
-                    await callback(text)
-                output.append(text)
+            if line:
+                output.append(line)
 
         except asyncio.IncompleteReadError:
             break
@@ -171,6 +169,7 @@ async def execute_install_command(timeout: int) -> tuple[bool, str]:
     try:
         logger.debug("Starting playwright install process...")
         install_signal_handler()
+
         process = await create_process(
             "playwright",
             "install",
@@ -179,13 +178,21 @@ async def execute_install_command(timeout: int) -> tuple[bool, str]:
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
         )
-        logger.debug("Process created successfully")
 
         async def stdout_callback(line: str) -> None:
-            logger.info(f"{line.strip()}")
+            line_stripped = line.strip()
+            if (
+                not line_stripped.startswith("Progress:")
+                and "|" not in line_stripped
+                and "%" not in line_stripped
+                and line_stripped
+            ):
+                logger.info(line_stripped)
 
         async def stderr_callback(line: str) -> None:
-            logger.warning(f"Install error: {line.strip()}")
+            line_stripped = line.strip()
+            if line_stripped:
+                logger.warning(f"Install error: {line_stripped}")
 
         stdout_task = asyncio.create_task(read_stream(process.stdout, stdout_callback))
         stderr_task = asyncio.create_task(read_stream(process.stderr, stderr_callback))
@@ -195,18 +202,20 @@ async def execute_install_command(timeout: int) -> tuple[bool, str]:
                 asyncio.gather(stdout_task, stderr_task), timeout=timeout
             )
         except asyncio.TimeoutError:
+            logger.error(f"Timed out ({timeout}秒)")
             await terminate_process(process)
             return False, f"Timed out ({timeout}s)"
 
         await process.wait()
-        returncode = process.returncode
+        return_code = process.returncode
 
-        if returncode != 0:
-            return False, f"Exited with code {returncode}"
+        if return_code != 0:
+            return False, f"Exited with code {return_code}"
 
         return True, "Installation completed"
 
     except Exception as e:
+        logger.error(f"An error occurred during installation: {e!s}")
         return False, f"An error occurred during installation: {e!s}"
 
 

{nonebot_plugin_htmlrender-0.6.7 → nonebot_plugin_htmlrender-0.6.8}/nonebot_plugin_htmlrender/process.py

@@ -96,14 +96,27 @@ async def create_process(
         >>> async def func():
         ...     return await create_process("ls", cwd="/")
     """
-    return await asyncio.create_subprocess_exec(
-        *args,
-        cwd=cwd,
-        stdin=stdin,
-        stdout=stdout,
-        stderr=stderr,
-        creationflags=subprocess.CREATE_NEW_PROCESS_GROUP if WINDOWS else 0,
-    )
+    if WINDOWS:
+        creation_flags = subprocess.CREATE_NEW_PROCESS_GROUP
+        return await asyncio.create_subprocess_exec(
+            *args,
+            cwd=cwd,
+            stdin=stdin,
+            stdout=stdout,
+            stderr=stderr,
+            creationflags=creation_flags,
+        )
+    else:
+        creation_flags = 0
+        return await asyncio.create_subprocess_exec(
+            *args,
+            cwd=cwd,
+            stdin=stdin,
+            stdout=stdout,
+            stderr=stderr,
+            creationflags=creation_flags,
+            start_new_session=True,
+        )
 
 
 @ensure_process_terminated
@@ -160,6 +173,21 @@ async def terminate_process(process: asyncio.subprocess.Process) -> None:
         if WINDOWS:
             os.kill(process.pid, signal.CTRL_BREAK_EVENT)
         else:
-            process.terminate()
-
-        await process.wait()
+            try:
+                pgid = os.getpgid(process.pid)
+                os.killpg(pgid, signal.SIGTERM)
+            except ProcessLookupError:
+                process.terminate()
+
+        try:
+            await asyncio.wait_for(process.wait(), timeout=5.0)
+        except asyncio.TimeoutError:
+            if not WINDOWS:
+                try:
+                    pgid = os.getpgid(process.pid)
+                    os.killpg(pgid, signal.SIGKILL)
+                except ProcessLookupError:
+                    process.kill()
+            else:
+                process.kill()
+            await process.wait()

{nonebot_plugin_htmlrender-0.6.7 → nonebot_plugin_htmlrender-0.6.8}/nonebot_plugin_htmlrender/utils.py

@@ -2,7 +2,11 @@ from asyncio import Lock
 from collections.abc import Awaitable
 from contextlib import contextmanager
 from functools import wraps
+import os
+from pathlib import Path
+import platform
 import re
+import shutil
 from typing import (
     Any,
     Callable,
@@ -103,7 +107,7 @@ def suppress_and_log():
         yield
     except Exception as e:
         # 捕获异常并记录日志
-        logger.opt(exception=e).warning("关闭 playwright 时发生错误。")
+        logger.opt(exception=e).warning("Error occurred while closing playwright.")
 
 
 def proxy_settings(proxy_host: Optional[str]) -> Optional[dict]:
@@ -159,3 +163,60 @@ def with_lock(func: Callable[P, Awaitable[R]]) -> Callable[P, Awaitable[R]]:
             return await func(*args, **kwargs)
 
     return wrapper
+
+
+def _prepare_playwright_env_vars() -> None:
+    """
+    准备启动浏览器所需的环境变量。
+
+    Returns:
+        Dict[str, str]: 包含环境变量的字典
+    """
+    if (
+        plugin_config.htmlrender_storage_path
+        and not plugin_config.htmlrender_browser_executable_path
+    ):
+        storage_path = os.path.abspath(
+            os.path.expanduser(str(plugin_config.htmlrender_storage_path))
+        )
+        os.environ["PLAYWRIGHT_BROWSERS_PATH"] = storage_path
+
+        logger.debug(f'Setting PLAYWRIGHT_BROWSERS_PATH="{storage_path}"')
+
+
+def _clear_playwright_env_vars() -> None:
+    if (
+        plugin_config.htmlrender_storage_path
+        and not plugin_config.htmlrender_browser_executable_path
+    ) and "PLAYWRIGHT_BROWSERS_PATH" in os.environ:
+        playwright_path = os.environ.pop("PLAYWRIGHT_BROWSERS_PATH")
+        logger.debug(f'PLAYWRIGHT_BROWSERS_PATH="{playwright_path}" removed')
+
+
+def clean_playwright_cache() -> None:
+    system = platform.system()
+    home_dir = Path.home()
+    cache_path = None
+
+    if system == "Windows":
+        cache_path = home_dir / "AppData" / "Local" / "ms-playwright"
+    elif system == "Darwin":
+        cache_path = home_dir / "Library" / "Caches" / "ms-playwright"
+    elif system == "Linux":
+        cache_path = home_dir / ".cache" / "ms-playwright"
+
+    if cache_path and cache_path.exists():
+        try:
+            logger.warning(
+                "Since v0.7.0, nonebot-plugin-htmlrender has moved the Playwright"
+                "cache path. Executable files are now stored and managed by the "
+                "`nonebot-plugin-localstore` plugin under "
+                f"{plugin_config.htmlrender_storage_path}. "
+                "You can change this path via the config option "
+                "`htmlrender_storage_path`."
+            )
+            logger.info(f"Deleting Playwright directory at {cache_path}")
+            shutil.rmtree(str(cache_path))
+            logger.info("Playwright was cleaned successfully.")
+        except Exception as e:
+            logger.error(f"Failed to delete Playwright: {e}")

{nonebot_plugin_htmlrender-0.6.7 → nonebot_plugin_htmlrender-0.6.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-htmlrender"
-version = "0.6.7"
+version = "0.6.8"
 description = "通过浏览器渲染图片"
 readme = "README.md"
 authors = [{ name = "kexue", email = "x@kexue-cloud.cn" }]
@@ -10,6 +10,7 @@ dependencies = [
     "aiofiles>=0.8.0",
     "jinja2>=3.0.3",
     "markdown>=3.3.6",
+    "nonebot-plugin-localstore>=0.7.4",
     "nonebot2>=2.4.2",
     "playwright>=1.48.0",
     "pygments>=2.10.0",