nonebot-plugin-bililive 2.1.6__tar.gz → 2.1.7__tar.gz

{nonebot_plugin_bililive-2.1.6 → nonebot_plugin_bililive-2.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-bililive
-Version: 2.1.6
+Version: 2.1.7
 Summary: Push bilibili dynamics and live notifications to QQ with NoneBot2.
 Keywords: nonebot,nonebot2,nonebot-plugin,bilibili,onebot,onebot-v11
 Author-Email: Akiyy_Lab <2806578374@qq.com>
@@ -116,8 +116,9 @@ BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直
 | BILILIVE_DYNAMIC_FONT | 否 | Noto Sans CJK SC | 截图字体 |
 | BILILIVE_DYNAMIC_BIG_IMAGE | 否 | false | 是否优先展示大图 |
 | BILILIVE_COMMAND_PREFIX | 否 | 空字符串 | 命令额外前缀 |
+| BILILIVE_CHROMIUM_ENDPOINT | 否 | 无 | 外部 Chromium CDP 地址，如 `http://127.0.0.1:9222` |
 
-动态抓取使用 Playwright 持久化浏览器中的 cookies 请求网页动态接口。通常不需要额外配置 Cookie 登录；如果某些 UID 持续抓取失败，建议在插件使用的浏览器数据目录中登录一个常用的 B 站账号，以提高动态抓取成功率。
+动态抓取优先使用 `BILILIVE_CHROMIUM_ENDPOINT` 连接的外部 Chromium；未配置时使用 Playwright 持久化浏览器中的 cookies 请求网页动态接口。若某些 UID 持续抓取失败，建议在外部 Chromium 或插件浏览器数据目录中登录常用 B 站账号，以降低风控概率。
 
 ## 🎉 使用
 

{nonebot_plugin_bililive-2.1.6 → nonebot_plugin_bililive-2.1.7}/README.md

@@ -82,8 +82,9 @@ BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直
 | BILILIVE_DYNAMIC_FONT | 否 | Noto Sans CJK SC | 截图字体 |
 | BILILIVE_DYNAMIC_BIG_IMAGE | 否 | false | 是否优先展示大图 |
 | BILILIVE_COMMAND_PREFIX | 否 | 空字符串 | 命令额外前缀 |
+| BILILIVE_CHROMIUM_ENDPOINT | 否 | 无 | 外部 Chromium CDP 地址，如 `http://127.0.0.1:9222` |
 
-动态抓取使用 Playwright 持久化浏览器中的 cookies 请求网页动态接口。通常不需要额外配置 Cookie 登录；如果某些 UID 持续抓取失败，建议在插件使用的浏览器数据目录中登录一个常用的 B 站账号，以提高动态抓取成功率。
+动态抓取优先使用 `BILILIVE_CHROMIUM_ENDPOINT` 连接的外部 Chromium；未配置时使用 Playwright 持久化浏览器中的 cookies 请求网页动态接口。若某些 UID 持续抓取失败，建议在外部 Chromium 或插件浏览器数据目录中登录常用 B 站账号，以降低风控概率。
 
 ## 🎉 使用
 

{nonebot_plugin_bililive-2.1.6 → nonebot_plugin_bililive-2.1.7}/nonebot_plugin_bililive/config.py

@@ -21,6 +21,7 @@ class Config(BaseModel):
     bililive_captcha_address: str = "https://captcha-cd.ngworks.cn"
     bililive_captcha_token: str = "bililive"
     bililive_browser_ua: str | None = None
+    bililive_chromium_endpoint: str | None = None
     bililive_dynamic_timeout: int = 30
     bililive_dynamic_font_source: str = "system"
     bililive_dynamic_font: str | None = "Noto Sans CJK SC"
@@ -46,6 +47,7 @@ class Config(BaseModel):
             "haruka_captcha_address": "bililive_captcha_address",
             "haruka_captcha_token": "bililive_captcha_token",
             "haruka_browser_ua": "bililive_browser_ua",
+            "haruka_chromium_endpoint": "bililive_chromium_endpoint",
             "haruka_dynamic_timeout": "bililive_dynamic_timeout",
             "haruka_dynamic_font_source": "bililive_dynamic_font_source",
             "haruka_dynamic_font": "bililive_dynamic_font",
@@ -72,6 +74,14 @@ class Config(BaseModel):
     def dynamic_interval_non_negative(cls, value: int):
         return 0 if value < 1 else value
 
+    @field_validator("bililive_chromium_endpoint")
+    @classmethod
+    def chromium_endpoint(cls, value: str | None):
+        if value is None:
+            return None
+        value = value.strip()
+        return value or None
+
     @field_validator("bililive_screenshot_style")
     @classmethod
     def screenshot_style(cls, value: str):

{nonebot_plugin_bililive-2.1.6 → nonebot_plugin_bililive-2.1.7}/nonebot_plugin_bililive/database/db.py

@@ -304,7 +304,19 @@ class DB:
     @classmethod
     async def set_sub(cls, conf, switch, **kwargs):
         """开关订阅设置"""
-        return await Sub.update(kwargs, **{conf: switch})
+        sub = await cls.get_sub(**kwargs)
+        if not sub:
+            return False
+        previous = getattr(sub, conf, None)
+        updated = await Sub.update(kwargs, **{conf: switch})
+        if not updated:
+            return False
+        if conf == "dynamic":
+            if switch and not previous:
+                dynamic_offset[int(kwargs["uid"])] = -1
+                await cls.save_dynamic_offsets()
+            await cls.update_uid_list()
+        return True
 
     @classmethod
     async def get_version(cls):

{nonebot_plugin_bililive-2.1.6 → nonebot_plugin_bililive-2.1.7}/nonebot_plugin_bililive/plugins/pusher/dynamic_pusher.py

@@ -135,9 +135,7 @@ async def process_dynamic_uid(uid: int):
 
     dynamic_risk_control_until.pop(uid, None)
 
-    if not dynamics:  # 没发过动态
-        if uid in offset and offset[uid] == -1:  # 不记录会导致第一次发动态不推送
-            await db.set_dynamic_offset(uid, 0)
+    if not dynamics:
         return
     name = get_dynamic_author_name(dynamics[0], use_web_fallback)
 

{nonebot_plugin_bililive-2.1.6 → nonebot_plugin_bililive-2.1.7}/nonebot_plugin_bililive/utils/__init__.py

@@ -298,14 +298,20 @@ def on_startup():
         from .browser import check_playwright_env, install
 
         check_proxy()
-        install()
-        try:
-            asyncio.get_event_loop().run_until_complete(check_playwright_env())
-        except ImportError as err:
-            logger.warning(
-                "Playwright 运行环境不完整，已跳过启动时强校验；"
-                f"涉及截图/浏览器能力时可能不可用。错误：{err}"
+        if plugin_config.bililive_chromium_endpoint:
+            logger.info(
+                "已配置 BILILIVE_CHROMIUM_ENDPOINT，"
+                "将优先连接外部 Chromium，跳过内置 Chromium 安装"
             )
+        else:
+            install()
+            try:
+                asyncio.get_event_loop().run_until_complete(check_playwright_env())
+            except ImportError as err:
+                logger.warning(
+                    "Playwright 运行环境不完整，已跳过启动时强校验；"
+                    f"涉及截图/浏览器能力时可能不可用。错误：{err}"
+                )
         DATA_DIR.mkdir(parents=True, exist_ok=True)
 
 

{nonebot_plugin_bililive-2.1.6 → nonebot_plugin_bililive-2.1.7}/nonebot_plugin_bililive/utils/browser.py

@@ -7,7 +7,7 @@ from pathlib import Path
 
 from nonebot import logger
 from playwright.__main__ import main
-from playwright.async_api import BrowserContext, Page, async_playwright
+from playwright.async_api import BrowserContext, Page, Playwright, async_playwright
 
 from ..config import plugin_config
 from ..utils import get_path
@@ -15,29 +15,81 @@ from .captcha_solver import CaptchaInfer
 from .fonts_provider import fill_font
 
 _browser: BrowserContext | None = None
+_playwright: Playwright | None = None
 mobile_js = Path(__file__).parent.joinpath("mobile.js")
 WEB_DYNAMIC_URL = "https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space"
+DEFAULT_MOBILE_USER_AGENT = (
+    "Mozilla/5.0 (Linux; Android 10; RMX1911) AppleWebKit/537.36 "
+    "(KHTML, like Gecko) Chrome/100.0.4896.127 Mobile Safari/537.36"
+)
+DEFAULT_DESKTOP_USER_AGENT = (
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
+    "(KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36"
+)
+
+
+def get_user_agent() -> str:
+    if plugin_config.bililive_browser_ua:
+        return plugin_config.bililive_browser_ua
+    if plugin_config.bililive_screenshot_style.lower() == "mobile":
+        return DEFAULT_MOBILE_USER_AGENT
+    return DEFAULT_DESKTOP_USER_AGENT
+
+
+def get_dynamic_api_headers(uid: int) -> dict[str, str]:
+    return {
+        "accept": "application/json, text/plain, */*",
+        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
+        "referer": f"https://space.bilibili.com/{uid}/dynamic",
+        "origin": "https://space.bilibili.com",
+    }
+
+
+async def _ensure_playwright() -> Playwright:
+    global _playwright
+    if _playwright is None:
+        _playwright = await async_playwright().start()
+    return _playwright
+
+
+async def _apply_browser_headers(context: BrowserContext) -> None:
+    await context.set_extra_http_headers(
+        {
+            "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
+        }
+    )
 
 
-async def init_browser(proxy=plugin_config.bililive_proxy, **kwargs) -> BrowserContext:
-    logger.info("初始化浏览器")
+async def init_browser_cdp(endpoint: str) -> BrowserContext:
+    logger.info(f"连接外部 Chromium：{endpoint}")
+    global _browser
+    playwright = await _ensure_playwright()
+    browser = await playwright.chromium.connect_over_cdp(endpoint)
+    if browser.contexts:
+        browser_context = browser.contexts[0]
+    else:
+        browser_context = await browser.new_context(
+            user_agent=get_user_agent(),
+            device_scale_factor=2,
+        )
+    await _apply_browser_headers(browser_context)
+    _browser = browser_context
+    return _browser
+
+
+async def init_browser_playwright(
+    proxy=plugin_config.bililive_proxy, **kwargs
+) -> BrowserContext:
+    logger.info("初始化 Playwright 内置浏览器")
     if proxy:
         kwargs["proxy"] = {"server": proxy}
     global _browser
-    p = await async_playwright().start()
+    playwright = await _ensure_playwright()
     browser_data = Path(get_path("browser"))
     browser_data.mkdir(parents=True, exist_ok=True)
-    browser_context = await p.chromium.launch_persistent_context(
+    browser_context = await playwright.chromium.launch_persistent_context(
         browser_data,
-        user_agent=plugin_config.bililive_browser_ua
-        or (
-            (
-                "Mozilla/5.0 (Linux; Android 10; RMX1911) AppleWebKit/537.36 "
-                "(KHTML, like Gecko) Chrome/100.0.4896.127 Mobile Safari/537.36"
-            )
-            if plugin_config.bililive_screenshot_style.lower() == "mobile"
-            else None
-        ),
+        user_agent=get_user_agent(),
         device_scale_factor=2,
         timeout=plugin_config.bililive_dynamic_timeout * 1000,
         **kwargs,
@@ -53,10 +105,24 @@ async def init_browser(proxy=plugin_config.bililive_proxy, **kwargs) -> BrowserC
                 }
             ]
         )
+    await _apply_browser_headers(browser_context)
     _browser = browser_context
     return _browser
 
 
+async def init_browser(proxy=plugin_config.bililive_proxy, **kwargs) -> BrowserContext:
+    endpoint = plugin_config.bililive_chromium_endpoint
+    if endpoint:
+        try:
+            return await init_browser_cdp(endpoint)
+        except Exception as err:
+            logger.warning(
+                f"连接外部 Chromium 失败（{endpoint}），"
+                f"将回退到 Playwright 内置浏览器：{err}"
+            )
+    return await init_browser_playwright(proxy=proxy, **kwargs)
+
+
 async def get_browser() -> BrowserContext:
     global _browser
     if not _browser:
@@ -76,23 +142,28 @@ async def get_bilibili_cookies() -> dict[str, str]:
 async def get_user_dynamics_payload_in_browser(uid: int) -> dict:
     browser = await get_browser()
     page = await browser.new_page()
+    api_headers = get_dynamic_api_headers(uid)
     try:
+        await page.set_extra_http_headers(
+            {
+                **api_headers,
+                "User-Agent": get_user_agent(),
+            }
+        )
         await page.goto(
             "https://www.bilibili.com/",
             wait_until="domcontentloaded",
             timeout=plugin_config.bililive_dynamic_timeout * 1000,
         )
         return await page.evaluate(
-            """async ({ url, uid }) => {
+            """async ({ url, uid, headers }) => {
                 const response = await fetch(`${url}?host_mid=${uid}`, {
                     credentials: 'include',
-                    headers: {
-                        accept: 'application/json, text/plain, */*',
-                    },
+                    headers,
                 });
                 return await response.json();
             }""",
-            {"url": WEB_DYNAMIC_URL, "uid": str(uid)},
+            {"url": WEB_DYNAMIC_URL, "uid": str(uid), "headers": api_headers},
         )
     finally:
         with contextlib.suppress(Exception):

{nonebot_plugin_bililive-2.1.6 → nonebot_plugin_bililive-2.1.7}/nonebot_plugin_bililive/version.py

@@ -1,4 +1,4 @@
 from packaging.version import Version
 
-__version__ = "2.1.6"
+__version__ = "2.1.7"
 VERSION = Version(__version__)

{nonebot_plugin_bililive-2.1.6 → nonebot_plugin_bililive-2.1.7}/pyproject.toml

@@ -39,7 +39,7 @@ dependencies = [
     "msvc-runtime>=14.34.31931; sys_platform == \"win32\"",
 ]
 dynamic = []
-version = "2.1.6"
+version = "2.1.7"
 
 [project.license]
 text = "AGPL-3.0-or-later"

{nonebot_plugin_bililive-2.1.6 → nonebot_plugin_bililive-2.1.7}/tests/test_maintenance.py

@@ -65,10 +65,12 @@ with patch("nonebot.get_driver", return_value=DummyDriver()), patch(
     core_version = import_module("nonebot_plugin_bililive.version")
     db_module = import_module("nonebot_plugin_bililive.database.db")
     web_dynamic = import_module("nonebot_plugin_bililive.libs.dynamic.web")
+    browser_module = import_module("nonebot_plugin_bililive.utils.browser")
     plugin_entry = import_module("nonebot_plugin_bililive")
     DB = db_module.DB
     models = import_module("nonebot_plugin_bililive.database.models")
     Group = models.Group
+    Sub = models.Sub
     get_path = import_module("nonebot_plugin_bililive.utils").get_path
 
 
@@ -102,6 +104,16 @@ class ConfigTests(unittest.TestCase):
         self.assertEqual(config.bililive_live_interval, 12)
         self.assertEqual(config.bililive_command_prefix, "hb")
 
+    def test_chromium_endpoint_is_trimmed(self):
+        config = Config(bililive_chromium_endpoint="  http://127.0.0.1:9222  ")
+
+        self.assertEqual(config.bililive_chromium_endpoint, "http://127.0.0.1:9222")
+
+    def test_legacy_haruka_chromium_endpoint_is_migrated(self):
+        config = Config(**{"haruka_chromium_endpoint": "http://127.0.0.1:9333"})
+
+        self.assertEqual(config.bililive_chromium_endpoint, "http://127.0.0.1:9333")
+
 
 class PluginEntryTests(unittest.TestCase):
     def test_plugin_entry_exposes_plugin_metadata(self):
@@ -131,6 +143,67 @@ class PluginEntryTests(unittest.TestCase):
         self.assertNotIn('bilireq>=', pyproject)
 
 
+class BrowserHelperTests(unittest.IsolatedAsyncioTestCase):
+    def test_get_dynamic_api_headers_include_space_referer(self):
+        headers = browser_module.get_dynamic_api_headers(477332594)
+
+        self.assertEqual(
+            headers["referer"],
+            "https://space.bilibili.com/477332594/dynamic",
+        )
+        self.assertEqual(headers["origin"], "https://space.bilibili.com")
+        self.assertIn("application/json", headers["accept"])
+
+    async def test_init_browser_prefers_external_chromium_when_configured(self):
+        cdp_context = object()
+        with (
+            patch.object(
+                browser_module.plugin_config,
+                "bililive_chromium_endpoint",
+                "http://127.0.0.1:9222",
+            ),
+            patch.object(
+                browser_module,
+                "init_browser_cdp",
+                new=AsyncMock(return_value=cdp_context),
+            ) as init_browser_cdp,
+            patch.object(
+                browser_module,
+                "init_browser_playwright",
+                new=AsyncMock(),
+            ) as init_browser_playwright,
+        ):
+            context = await browser_module.init_browser()
+
+        self.assertIs(context, cdp_context)
+        init_browser_cdp.assert_awaited_once_with("http://127.0.0.1:9222")
+        init_browser_playwright.assert_not_awaited()
+
+    async def test_init_browser_falls_back_to_playwright_when_cdp_fails(self):
+        playwright_context = object()
+        with (
+            patch.object(
+                browser_module.plugin_config,
+                "bililive_chromium_endpoint",
+                "http://127.0.0.1:9222",
+            ),
+            patch.object(
+                browser_module,
+                "init_browser_cdp",
+                new=AsyncMock(side_effect=RuntimeError("connect failed")),
+            ),
+            patch.object(
+                browser_module,
+                "init_browser_playwright",
+                new=AsyncMock(return_value=playwright_context),
+            ) as init_browser_playwright,
+        ):
+            context = await browser_module.init_browser()
+
+        self.assertIs(context, playwright_context)
+        init_browser_playwright.assert_awaited_once()
+
+
 class WebDynamicTests(unittest.TestCase):
     def test_parse_web_dynamic_items_extracts_required_fields(self):
         payload = {
@@ -268,6 +341,72 @@ class DBPermissionTests(unittest.IsolatedAsyncioTestCase):
         self.assertFalse(changed)
         update.assert_not_awaited()
 
+    async def test_set_sub_enabling_dynamic_resets_offset_and_updates_uid_list(self):
+        sub = SimpleNamespace(dynamic=False)
+        db_module.dynamic_offset.clear()
+        db_module.dynamic_offset[123] = 456
+        with (
+            patch.object(DB, "get_sub", new=AsyncMock(return_value=sub)),
+            patch.object(Sub, "update", new=AsyncMock(return_value=True)),
+            patch.object(DB, "update_uid_list", new=AsyncMock()) as update_uid_list,
+            patch.object(DB, "save_dynamic_offsets", new=AsyncMock()) as save_offsets,
+        ):
+            updated = await DB.set_sub(
+                "dynamic",
+                True,
+                uid=123,
+                type="group",
+                type_id=456,
+            )
+
+        self.assertTrue(updated)
+        self.assertEqual(db_module.dynamic_offset[123], -1)
+        save_offsets.assert_awaited_once()
+        update_uid_list.assert_awaited_once()
+
+    async def test_set_sub_enabling_dynamic_skips_reset_when_already_enabled(self):
+        sub = SimpleNamespace(dynamic=True)
+        db_module.dynamic_offset.clear()
+        db_module.dynamic_offset[123] = 456
+        with (
+            patch.object(DB, "get_sub", new=AsyncMock(return_value=sub)),
+            patch.object(Sub, "update", new=AsyncMock(return_value=True)),
+            patch.object(DB, "update_uid_list", new=AsyncMock()) as update_uid_list,
+            patch.object(DB, "save_dynamic_offsets", new=AsyncMock()) as save_offsets,
+        ):
+            updated = await DB.set_sub(
+                "dynamic",
+                True,
+                uid=123,
+                type="group",
+                type_id=456,
+            )
+
+        self.assertTrue(updated)
+        self.assertEqual(db_module.dynamic_offset[123], 456)
+        save_offsets.assert_not_awaited()
+        update_uid_list.assert_awaited_once()
+
+    async def test_set_sub_disabling_dynamic_updates_uid_list(self):
+        sub = SimpleNamespace(dynamic=True)
+        with (
+            patch.object(DB, "get_sub", new=AsyncMock(return_value=sub)),
+            patch.object(Sub, "update", new=AsyncMock(return_value=True)),
+            patch.object(DB, "update_uid_list", new=AsyncMock()) as update_uid_list,
+            patch.object(DB, "save_dynamic_offsets", new=AsyncMock()) as save_offsets,
+        ):
+            updated = await DB.set_sub(
+                "dynamic",
+                False,
+                uid=123,
+                type="group",
+                type_id=456,
+            )
+
+        self.assertTrue(updated)
+        save_offsets.assert_not_awaited()
+        update_uid_list.assert_awaited_once()
+
 
 if __name__ == "__main__":
     unittest.main()