feat: experimental htmlkit

Author: ProgramRipper

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:alpine AS base
+FROM python:slim AS base
 WORKDIR /app
 
 
@@ -14,6 +14,7 @@ RUN --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
 
 FROM base
 
+RUN apt update && apt install --no-install-recommends -y libx11-6
 COPY --link --from=build /app/.venv/ .venv
 COPY --link . .
 

pdm.lock

@@ -10,6 +10,7 @@ dependencies = [
     "nonebot-adapter-milky~=0.5.0rc3",
     "nonebot-plugin-alconna~=0.59",
     "nonebot-plugin-apscheduler~=0.5",
+    "nonebot-plugin-htmlkit @ https://github.com/ProgramRipper/plugin-htmlkit/releases/download/0.1.0-rc1/nonebot_plugin_htmlkit-0.1.0rc1-cp310-abi3-manylinux_2_34_x86_64.whl",
     "nonebot-plugin-htmlrender~=0.6",
     "nonebot-plugin-orm[sqlite]~=0.8",
     "nonebot-plugin-uninfo @ https://github.com/RF-Tar-Railt/nonebot-plugin-uninfo/archive/5b87d916af09d6a878039d3445193efda2ed1af3.zip",
@@ -30,6 +31,7 @@ adapters = [
 plugins = [
     "nonebot_plugin_alconna",
     "nonebot_plugin_apscheduler",
+    "nonebot_plugin_htmlkit",
     "nonebot_plugin_htmlrender",
     "nonebot_plugin_orm",
     "nonebot_plugin_uninfo",

pyproject.toml

@@ -1,5 +1,6 @@
 from asyncio import gather
 from contextlib import asynccontextmanager
+from importlib.resources import as_file, files
 from queue import PriorityQueue
 from typing import Annotated, Any, AsyncGenerator
 
@@ -11,16 +12,18 @@
 from nonebot.plugin import PluginMetadata
 from nonebot_plugin_alconna import Alconna, Image, Subcommand, UniMessage, on_alconna
 from nonebot_plugin_apscheduler import scheduler
+from nonebot_plugin_htmlkit import template_to_pic
 from nonebot_plugin_htmlrender.browser import get_browser
 from nonebot_plugin_orm import async_scoped_session, get_session
 from nonebot_plugin_uninfo import MEMBER
 from nonebot_plugin_uninfo.orm import SceneModel, SceneOrm
 from playwright.async_api import BrowserContext, Page
 from sqlalchemy import exists, select
 
-from .....utils import run_task, send_message
+from .....utils import css_fetch_fn, img_fetch_fn, run_task, send_message
 from ... import plugin_config as bilibili_config
 from ...utils import UID_ARG, get_share_click, handle_error, raise_for_status
+from . import templates
 from .config import Config
 from .models import Dynamic, Dynamics, Subscription
 
@@ -82,7 +85,19 @@ async def get_dynamics(page: int = 1) -> Dynamics:
                 "type": "all",
                 "page": page,
                 "features": ",".join(
-                    ("itemOpusStyle", "listOnlyfans", "opusBigCover", "onlyfansVote")
+                    (
+                        "itemOpusStyle",
+                        "listOnlyfans",
+                        "opusBigCover",
+                        "onlyfansVote",
+                        "decorationCard",
+                        "onlyfansAssetsV2",
+                        "forwardListHidden",
+                        "ugcDelete",
+                        "onlyfansQaCard",
+                        "commentsNewVersion",
+                        "avatarAutoTheme",
+                    )
                 ),
             },
         )
@@ -163,7 +178,7 @@ async def render_screenshot(id_str: str) -> bytes:
         )
         await page.add_style_tag(
             content="""
-                * {
+                body {
                   font-family: "LXGW ZhenKai GB", "LXGW WenKai GB", sans-serif !important;
                 }
 
@@ -198,15 +213,35 @@ async def render_screenshot(id_str: str) -> bytes:
 async def broadcast(dynamics: list[Dynamic]):
     async with get_session() as session:
         for dynamic in dynamics:
-            screenshot, url, subs = await gather(
-                render_screenshot(dynamic["id_str"]),
-                get_share_click(dynamic["id_str"], "dynamic", "dt.dt-detail.0.0.pv"),
-                session.scalars(
-                    select(Subscription).where(
-                        Subscription.uid == dynamic["modules"]["module_author"]["mid"]
-                    )
-                ),
-            )
+            with as_file(files(templates)) as templates_path:
+                screenshot, url, subs = await gather(
+                    (
+                        template_to_pic(
+                            str(templates_path),
+                            "draw.html.j2",
+                            dynamic,
+                            max_width=360 * 3,
+                            device_height=640 * 3,
+                            allow_refit=False,
+                            img_fetch_fn=img_fetch_fn,
+                            css_fetch_fn=css_fetch_fn,
+                            image_format="jpeg",
+                            jpeg_quality=80,
+                        )
+                        if dynamic["type"] == "DYNAMIC_TYPE_DRAW"
+                        and not dynamic["modules"]["module_dynamic"]["additional"]
+                        else render_screenshot(dynamic["id_str"])
+                    ),
+                    get_share_click(
+                        dynamic["id_str"], "dynamic", "dt.dt-detail.0.0.pv"
+                    ),
+                    session.scalars(
+                        select(Subscription).where(
+                            Subscription.uid
+                            == dynamic["modules"]["module_author"]["mid"]
+                        )
+                    ),
+                )
 
             msg = plugin_config.template.format(
                 name=dynamic["modules"]["module_author"]["name"],
@@ -310,16 +345,50 @@ async def _(id_str: str):
         dynamic = raise_for_status(
             await client.get(
                 "/polymer/web-dynamic/v1/detail",
-                params={"id": id_str, "features": "itemOpusStyle"},
+                params={
+                    "id": id_str,
+                    "features": ",".join(
+                        (
+                            "itemOpusStyle",
+                            "listOnlyfans",
+                            "opusBigCover",
+                            "onlyfansVote",
+                            "decorationCard",
+                            "onlyfansAssetsV2",
+                            "forwardListHidden",
+                            "ugcDelete",
+                            "onlyfansQaCard",
+                            "commentsNewVersion",
+                            "avatarAutoTheme",
+                        )
+                    ),
+                },
             )
         )["item"]
     except Exception:
         await handle_error("获取动态信息失败")
 
-    screenshot, url = await gather(
-        render_screenshot(id_str),
-        get_share_click(id_str, "dynamic", "dt.dt-detail.0.0.pv"),
-    )
+    with as_file(files(templates)) as templates_path:
+        screenshot, url = await gather(
+            (
+                template_to_pic(
+                    str(templates_path),
+                    "draw.html.j2",
+                    dynamic,
+                    max_width=360 * 3,
+                    device_height=640 * 3,
+                    allow_refit=False,
+                    img_fetch_fn=img_fetch_fn,
+                    css_fetch_fn=css_fetch_fn,
+                    image_format="jpeg",
+                    jpeg_quality=80,
+                )
+                if dynamic["type"] == "DYNAMIC_TYPE_DRAW"
+                and not dynamic["modules"]["module_dynamic"]["additional"]
+                else render_screenshot(dynamic["id_str"])
+            ),
+            get_share_click(id_str, "dynamic", "dt.dt-detail.0.0.pv"),
+        )
     await plugin_config.template.format(
         name=dynamic["modules"]["module_author"]["name"],
         action=dynamic["modules"]["module_author"]["pub_action"]

src/plugins/bilibili/plugins/dynamic/__init__.py

@@ -1,4 +1,4 @@
-from typing import TypedDict
+from typing import Any, TypedDict
 
 from nonebot_plugin_orm import Model
 from nonebot_plugin_uninfo.orm import SceneModel
@@ -14,6 +14,7 @@ class ModuleAuthor(TypedDict):
 
 class Modules(TypedDict):
     module_author: ModuleAuthor
+    module_dynamic: dict[str, Any]
 
 
 class Dynamic(TypedDict):