nonebot-plugin-bililive 2.0.1__tar.gz → 2.0.3__tar.gz

{nonebot_plugin_bililive-2.0.1 → nonebot_plugin_bililive-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-bililive
-Version: 2.0.1
+Version: 2.0.3
 Summary: Push bilibili dynamics and live notifications to QQ with NoneBot2.
 Keywords: nonebot,nonebot2,nonebot-plugin,qqbot,bilibili
 Author-Email: SK-415 <2967923486@qq.com>
@@ -33,7 +33,13 @@ Requires-Dist: msvc-runtime>=14.34.31931; sys_platform == "win32"
 Description-Content-Type: text/markdown
 
 <div align="center">
+  <a href="https://v2.nonebot.dev/store"><img src="https://github.com/A-kirami/nonebot-plugin-template/blob/resources/nbp_logo.png" width="180" height="180" alt="NoneBotPluginLogo"></a>
+  <br>
+  <p><img src="https://github.com/A-kirami/nonebot-plugin-template/blob/resources/NoneBotPlugin.svg" width="240" alt="NoneBotPluginText"></p>
+</div>
 
+<div align="center">
+	
 # nonebot-plugin-bililive
 
 _✨ 将 B 站 UP 主动态与直播推送到 QQ 的 NoneBot2 插件 ✨_
@@ -45,42 +51,12 @@ _✨ 将 B 站 UP 主动态与直播推送到 QQ 的 NoneBot2 插件 ✨_
 	<img src="https://img.shields.io/pypi/v/nonebot-plugin-bililive.svg" alt="pypi">
 </a>
 <img src="https://img.shields.io/badge/python-3.10+-blue.svg" alt="python">
-<a href="https://jq.qq.com/?_wv=1027&k=sHPbCRAd">
-	<img src="https://img.shields.io/badge/QQ%E7%BE%A4-629574472-orange" alt="qq group">
-</a>
 
 </div>
 
-> 当前仓库已按 NoneBot 插件模板整理，可直接作为插件包发布到 PyPI 并在 NoneBot2 项目中安装使用。
-
-<details>
-<summary>配置发布工作流</summary>
-
-1. 前往 https://pypi.org/manage/account/#api-tokens 创建新的 PyPI API Token。
-2. 打开当前 GitHub 仓库的 Settings - Secrets and variables - Actions。
-3. 新建名为 PYPI_API_TOKEN 的 Repository Secret，并填入刚刚创建的 Token。
-
-</details>
-
-> [!IMPORTANT]
-> 当前项目使用符合 PEP 621 的 pyproject.toml，并已补充基于 tag 触发的 PyPI 发布工作流。
-
-<details>
-<summary>触发发布</summary>
-
-创建 tag：
-
-	git tag v1.6.0post5
-
-推送 tag：
-
-	git push origin --tags
-
-</details>
-
 ## 📖 介绍
 
-BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直播与动态消息推送到 QQ 群或私聊场景。当前项目已将发布名、插件入口、核心实现包和工作流统一整理为 nonebot-plugin-bililive，便于作为独立插件分发。
+BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直播与动态消息推送到 QQ 群或私聊场景。
 
 ### 特性
 
@@ -103,34 +79,17 @@ BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直
 
 <details>
 <summary>使用包管理器安装</summary>
+在 nonebot2 项目的插件目录下, 打开命令行, 进入虚拟环境, 输入相应的安装命令
 
-<details>
-<summary>pip</summary>
-
-	pip install nonebot-plugin-bililive
-
-</details>
-
-<details>
-<summary>pdm</summary>
-
-	pdm add nonebot-plugin-bililive
-
-</details>
+    pip install nonebot-plugin-bililive
 
-<details>
-<summary>poetry</summary>
 
-	poetry add nonebot-plugin-bililive
+打开 nonebot2 项目根目录下的 `pyproject.toml` 文件, 在 `[tool.nonebot.plugins]` 部分追加写入
 
-</details>
+    nonebot-plugin-bililive = ["nonebot-plugin-bililive"]
 
 </details>
 
-安装后，在 NoneBot2 项目的 pyproject.toml 中加入：
-
-	plugins = ["nonebot_plugin_bililive"]
-
 ## ⚙️ 配置
 
 在 NoneBot2 项目的 .env 文件中按需添加配置项：
@@ -153,6 +112,8 @@ BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直
 | BILILIVE_DYNAMIC_BIG_IMAGE | 否 | false | 是否优先展示大图 |
 | BILILIVE_COMMAND_PREFIX | 否 | 空字符串 | 命令额外前缀 |
 
+动态抓取默认优先使用 gRPC 接口；当部分 UID 命中 B 站风控时，插件会自动回退到 Playwright 持久化浏览器中的 cookies 请求网页动态接口。通常不需要额外配置 Cookie 登录；如果某些 UID 仍持续抓取失败，建议在插件使用的浏览器数据目录中登录一个常用的 B 站账号，以提高动态抓取成功率。
+
 ## 🎉 使用
 
 ### 指令表

{nonebot_plugin_bililive-2.0.1 → nonebot_plugin_bililive-2.0.3}/README.md

@@ -1,5 +1,11 @@
 <div align="center">
+  <a href="https://v2.nonebot.dev/store"><img src="https://github.com/A-kirami/nonebot-plugin-template/blob/resources/nbp_logo.png" width="180" height="180" alt="NoneBotPluginLogo"></a>
+  <br>
+  <p><img src="https://github.com/A-kirami/nonebot-plugin-template/blob/resources/NoneBotPlugin.svg" width="240" alt="NoneBotPluginText"></p>
+</div>
 
+<div align="center">
+	
 # nonebot-plugin-bililive
 
 _✨ 将 B 站 UP 主动态与直播推送到 QQ 的 NoneBot2 插件 ✨_
@@ -11,42 +17,12 @@ _✨ 将 B 站 UP 主动态与直播推送到 QQ 的 NoneBot2 插件 ✨_
 	<img src="https://img.shields.io/pypi/v/nonebot-plugin-bililive.svg" alt="pypi">
 </a>
 <img src="https://img.shields.io/badge/python-3.10+-blue.svg" alt="python">
-<a href="https://jq.qq.com/?_wv=1027&k=sHPbCRAd">
-	<img src="https://img.shields.io/badge/QQ%E7%BE%A4-629574472-orange" alt="qq group">
-</a>
 
 </div>
 
-> 当前仓库已按 NoneBot 插件模板整理，可直接作为插件包发布到 PyPI 并在 NoneBot2 项目中安装使用。
-
-<details>
-<summary>配置发布工作流</summary>
-
-1. 前往 https://pypi.org/manage/account/#api-tokens 创建新的 PyPI API Token。
-2. 打开当前 GitHub 仓库的 Settings - Secrets and variables - Actions。
-3. 新建名为 PYPI_API_TOKEN 的 Repository Secret，并填入刚刚创建的 Token。
-
-</details>
-
-> [!IMPORTANT]
-> 当前项目使用符合 PEP 621 的 pyproject.toml，并已补充基于 tag 触发的 PyPI 发布工作流。
-
-<details>
-<summary>触发发布</summary>
-
-创建 tag：
-
-	git tag v1.6.0post5
-
-推送 tag：
-
-	git push origin --tags
-
-</details>
-
 ## 📖 介绍
 
-BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直播与动态消息推送到 QQ 群或私聊场景。当前项目已将发布名、插件入口、核心实现包和工作流统一整理为 nonebot-plugin-bililive，便于作为独立插件分发。
+BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直播与动态消息推送到 QQ 群或私聊场景。
 
 ### 特性
 
@@ -69,34 +45,17 @@ BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直
 
 <details>
 <summary>使用包管理器安装</summary>
+在 nonebot2 项目的插件目录下, 打开命令行, 进入虚拟环境, 输入相应的安装命令
 
-<details>
-<summary>pip</summary>
-
-	pip install nonebot-plugin-bililive
-
-</details>
-
-<details>
-<summary>pdm</summary>
-
-	pdm add nonebot-plugin-bililive
-
-</details>
+    pip install nonebot-plugin-bililive
 
-<details>
-<summary>poetry</summary>
 
-	poetry add nonebot-plugin-bililive
+打开 nonebot2 项目根目录下的 `pyproject.toml` 文件, 在 `[tool.nonebot.plugins]` 部分追加写入
 
-</details>
+    nonebot-plugin-bililive = ["nonebot-plugin-bililive"]
 
 </details>
 
-安装后，在 NoneBot2 项目的 pyproject.toml 中加入：
-
-	plugins = ["nonebot_plugin_bililive"]
-
 ## ⚙️ 配置
 
 在 NoneBot2 项目的 .env 文件中按需添加配置项：
@@ -119,6 +78,8 @@ BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直
 | BILILIVE_DYNAMIC_BIG_IMAGE | 否 | false | 是否优先展示大图 |
 | BILILIVE_COMMAND_PREFIX | 否 | 空字符串 | 命令额外前缀 |
 
+动态抓取默认优先使用 gRPC 接口；当部分 UID 命中 B 站风控时，插件会自动回退到 Playwright 持久化浏览器中的 cookies 请求网页动态接口。通常不需要额外配置 Cookie 登录；如果某些 UID 仍持续抓取失败，建议在插件使用的浏览器数据目录中登录一个常用的 B 站账号，以提高动态抓取成功率。
+
 ## 🎉 使用
 
 ### 指令表

{nonebot_plugin_bililive-2.0.1 → nonebot_plugin_bililive-2.0.3}/bililive/database/db.py

@@ -37,7 +37,7 @@ class DB:
             },
         }
 
-        await Tortoise.init(config)
+        await Tortoise.init(config, _enable_global_fallback=True)
 
         await Tortoise.generate_schemas()
         await cls.migrate()

nonebot_plugin_bililive-2.0.3/bililive/libs/dynamic/web.py

@@ -0,0 +1,79 @@
+from dataclasses import dataclass
+
+import httpx
+
+WEB_DYNAMIC_URL = "https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space"
+DEFAULT_BROWSER_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"
+)
+
+
+class WebDynamicError(RuntimeError):
+    def __init__(self, code, msg, data=None):
+        super().__init__(f"{code} {msg}")
+        self.code = code
+        self.msg = msg
+        self.data = data
+
+
+@dataclass(slots=True)
+class WebDynamicItem:
+    dynamic_id: int
+    dynamic_type: str
+    author_name: str
+
+
+def parse_web_dynamic_items(payload: dict) -> list[WebDynamicItem]:
+    items = payload.get("data", {}).get("items") or []
+    parsed_items = []
+    for item in items:
+        dynamic_id = item.get("id_str")
+        modules = item.get("modules") or {}
+        author_name = (modules.get("module_author") or {}).get("name")
+        dynamic_type = item.get("type") or ""
+        if not dynamic_id or not author_name:
+            continue
+        try:
+            parsed_items.append(
+                WebDynamicItem(
+                    dynamic_id=int(dynamic_id),
+                    dynamic_type=dynamic_type,
+                    author_name=author_name,
+                )
+            )
+        except (TypeError, ValueError):
+            continue
+    return parsed_items
+
+
+async def get_user_dynamics_web(
+    uid: int,
+    cookies: dict[str, str],
+    *,
+    proxy: str | None = None,
+    user_agent: str | None = None,
+    timeout: int = 10,
+) -> list[WebDynamicItem]:
+    headers = {
+        "User-Agent": user_agent or DEFAULT_BROWSER_USER_AGENT,
+        "Referer": f"https://space.bilibili.com/{uid}/dynamic",
+        "Accept": "application/json, text/plain, */*",
+        "Origin": "https://space.bilibili.com",
+    }
+    async with httpx.AsyncClient(
+        proxy=proxy,
+        headers=headers,
+        cookies=cookies,
+        timeout=timeout,
+        follow_redirects=True,
+    ) as client:
+        response = await client.get(WEB_DYNAMIC_URL, params={"host_mid": uid})
+    payload = response.json()
+    if payload.get("code") != 0:
+        raise WebDynamicError(
+            payload.get("code"),
+            payload.get("message") or "unknown error",
+            payload.get("data"),
+        )
+    return parse_web_dynamic_items(payload)

nonebot_plugin_bililive-2.0.3/bililive/plugins/pusher/dynamic_pusher.py

@@ -0,0 +1,278 @@
+import asyncio
+from datetime import datetime
+from time import monotonic
+
+from apscheduler.events import (
+    EVENT_JOB_ERROR,
+    EVENT_JOB_EXECUTED,
+    EVENT_JOB_MISSED,
+    EVENT_SCHEDULER_STARTED,
+)
+from bilireq.exceptions import GrpcError
+from bilireq.grpc.dynamic import grpc_get_user_dynamics
+from bilireq.grpc.protos.bilibili.app.dynamic.v2.dynamic_pb2 import DynamicType
+from grpc import StatusCode
+from grpc.aio import AioRpcError
+from nonebot.adapters.onebot.v11.message import MessageSegment
+from nonebot.log import logger
+
+from ...config import plugin_config
+from ...database import DB as db
+from ...database import dynamic_offset as offset
+from ...libs.dynamic.web import WebDynamicError, get_user_dynamics_web
+from ...utils import (
+    get_bilibili_cookies,
+    get_dynamic_screenshot,
+    safe_send,
+    scheduler,
+)
+
+RISK_CONTROL_RETRY_SECONDS = 3600
+dynamic_risk_control_until = {}
+dynamic_web_fallback_until = {}
+WEB_SKIP_DYNAMIC_TYPES = {
+    "DYNAMIC_TYPE_LIVE_RCMD",
+    "DYNAMIC_TYPE_LIVE",
+    "DYNAMIC_TYPE_AD",
+    "DYNAMIC_TYPE_BANNER",
+}
+WEB_DYNAMIC_TYPE_MESSAGES = {
+    "DYNAMIC_TYPE_FORWARD": "转发了一条动态",
+    "DYNAMIC_TYPE_WORD": "发布了新文字动态",
+    "DYNAMIC_TYPE_DRAW": "发布了新图文动态",
+    "DYNAMIC_TYPE_AV": "发布了新投稿",
+    "DYNAMIC_TYPE_ARTICLE": "发布了新专栏",
+    "DYNAMIC_TYPE_MUSIC": "发布了新音频",
+}
+
+
+async def throttle_dynamic_loop():
+    if plugin_config.bililive_dynamic_interval == 0:
+        await asyncio.sleep(1)
+
+
+def get_dynamic_id(dynamic, use_web_fallback: bool) -> int:
+    if use_web_fallback:
+        return dynamic.dynamic_id
+    return int(dynamic.extend.dyn_id_str)
+
+
+def get_dynamic_type(dynamic, use_web_fallback: bool):
+    if use_web_fallback:
+        return dynamic.dynamic_type
+    return dynamic.card_type
+
+
+def get_dynamic_author_name(dynamic, use_web_fallback: bool) -> str:
+    if use_web_fallback:
+        return dynamic.author_name
+    return dynamic.modules[0].module_author.author.name
+
+
+def get_dynamic_type_message(dynamic_type, use_web_fallback: bool) -> str:
+    if use_web_fallback:
+        return WEB_DYNAMIC_TYPE_MESSAGES.get(dynamic_type, "发布了新动态")
+    return {
+        0: "发布了新动态",
+        DynamicType.forward: "转发了一条动态",
+        DynamicType.word: "发布了新文字动态",
+        DynamicType.draw: "发布了新图文动态",
+        DynamicType.av: "发布了新投稿",
+        DynamicType.article: "发布了新专栏",
+        DynamicType.music: "发布了新音频",
+    }.get(dynamic_type, "发布了新动态")
+
+
+def should_skip_dynamic(dynamic_type, use_web_fallback: bool) -> bool:
+    if use_web_fallback:
+        return dynamic_type in WEB_SKIP_DYNAMIC_TYPES
+    return dynamic_type in [
+        DynamicType.live_rcmd,
+        DynamicType.live,
+        DynamicType.ad,
+        DynamicType.banner,
+    ]
+
+
+async def get_user_dynamics_with_web_fallback(uid: int) -> tuple[list, bool]:
+    fallback_until = dynamic_web_fallback_until.get(uid)
+    if fallback_until is not None:
+        if fallback_until > monotonic():
+            logger.debug(f"动态 gRPC 接口仍在风控，继续使用 Web 接口：{uid}")
+            cookies = await get_bilibili_cookies()
+            if not cookies:
+                raise WebDynamicError(-1, "browser cookies unavailable")
+            dynamics = await get_user_dynamics_web(
+                uid,
+                cookies,
+                proxy=plugin_config.bililive_proxy,
+                user_agent=plugin_config.bililive_browser_ua or None,
+                timeout=plugin_config.bililive_dynamic_timeout,
+            )
+            return dynamics, True
+        del dynamic_web_fallback_until[uid]
+
+    try:
+        dynamics = (
+            await grpc_get_user_dynamics(
+                uid,
+                timeout=plugin_config.bililive_dynamic_timeout,
+                proxy=plugin_config.bililive_proxy,
+            )
+        ).list
+        dynamic_web_fallback_until.pop(uid, None)
+        return list(dynamics), False
+    except GrpcError as e:
+        if e.code != -352:
+            raise
+        logger.warning(
+            f"动态 gRPC 接口触发风控，切换 Web 接口：{uid} "
+            f"{e.code} {e.msg}"
+        )
+        dynamic_web_fallback_until[uid] = monotonic() + RISK_CONTROL_RETRY_SECONDS
+    cookies = await get_bilibili_cookies()
+    if not cookies:
+        raise WebDynamicError(-1, "browser cookies unavailable")
+    dynamics = await get_user_dynamics_web(
+        uid,
+        cookies,
+        proxy=plugin_config.bililive_proxy,
+        user_agent=plugin_config.bililive_browser_ua or None,
+        timeout=plugin_config.bililive_dynamic_timeout,
+    )
+    return dynamics, True
+
+
+async def dy_sched():
+    """动态推送"""
+    uid = await db.next_uid("dynamic")
+    if not uid:
+        # 没有订阅先暂停一秒再跳过，不然会导致 CPU 占用过高
+        await throttle_dynamic_loop()
+        return
+    user = await db.get_user(uid=uid)
+    if user is None:
+        logger.warning(f"动态推送跳过异常订阅 UID：{uid}")
+        await throttle_dynamic_loop()
+        return
+    name = user.name
+
+    retry_at = dynamic_risk_control_until.get(uid)
+    if retry_at is not None:
+        if retry_at > monotonic():
+            logger.debug(f"动态接口风控冷却中，跳过 {name}（{uid}）")
+            await throttle_dynamic_loop()
+            return
+        del dynamic_risk_control_until[uid]
+
+    logger.debug(f"爬取动态 {name}（{uid}）")
+    use_web_fallback = False
+    try:
+        dynamics, use_web_fallback = await get_user_dynamics_with_web_fallback(uid)
+    except asyncio.CancelledError:
+        logger.debug(f"动态轮询任务已取消：{name}（{uid}）")
+        return
+    except AioRpcError as e:
+        if e.code() == StatusCode.DEADLINE_EXCEEDED:
+            logger.error(f"爬取动态超时，将在下个轮询中重试：{e.code()} {e.details()}")
+        else:
+            logger.error(f"爬取动态失败：{e.code()} {e.details()}")
+        await throttle_dynamic_loop()
+        return
+    except GrpcError as e:
+        logger.error(f"爬取动态失败：{e.code} {e.msg}")
+        await throttle_dynamic_loop()
+        return
+    except WebDynamicError as e:
+        dynamic_risk_control_until[uid] = monotonic() + RISK_CONTROL_RETRY_SECONDS
+        retry_minutes = RISK_CONTROL_RETRY_SECONDS // 60
+        logger.warning(
+            f"动态 Web 接口获取失败，{name}（{uid}）将在 "
+            f"{retry_minutes} 分钟后重试：{e.code} {e.msg}"
+        )
+        await throttle_dynamic_loop()
+        return
+
+    dynamic_risk_control_until.pop(uid, None)
+
+    if not dynamics:  # 没发过动态
+        if uid in offset and offset[uid] == -1:  # 不记录会导致第一次发动态不推送
+            offset[uid] = 0
+        return
+    name = get_dynamic_author_name(dynamics[0], use_web_fallback)
+
+    if uid not in offset:  # 已删除
+        return
+    elif offset[uid] == -1:  # 第一次爬取
+        if len(dynamics) == 1:  # 只有一条动态
+            offset[uid] = get_dynamic_id(dynamics[0], use_web_fallback)
+        else:  # 第一个可能是置顶动态，但置顶也可能是最新一条，所以取前两条的最大值
+            offset[uid] = max(
+                get_dynamic_id(dynamics[0], use_web_fallback),
+                get_dynamic_id(dynamics[1], use_web_fallback),
+            )
+        return
+
+    dynamic = None
+    for dynamic in sorted(
+        dynamics,
+        key=lambda x: get_dynamic_id(x, use_web_fallback),  # 动态从旧到新排列
+    ):
+        dynamic_id = get_dynamic_id(dynamic, use_web_fallback)
+        dynamic_type = get_dynamic_type(dynamic, use_web_fallback)
+        if dynamic_id > offset[uid]:
+            logger.info(f"检测到新动态（{dynamic_id}）：{name}（{uid}）")
+            image, err = await get_dynamic_screenshot(dynamic_id)
+            url = f"https://t.bilibili.com/{dynamic_id}"
+            if image is None:
+                logger.debug(f"动态不存在，已跳过：{url}")
+                return
+            elif should_skip_dynamic(dynamic_type, use_web_fallback):
+                logger.debug(f"无需推送的动态 {dynamic_type}，已跳过：{url}")
+                offset[uid] = dynamic_id
+                return
+            message = (
+                f"{name} {get_dynamic_type_message(dynamic_type, use_web_fallback)}：\n"
+                + str(f"动态图片可能截图异常：{err}\n" if err else "")
+                + MessageSegment.image(image)
+                + f"\n{url}"
+            )
+
+            push_list = await db.get_push_list(uid, "dynamic")
+            for sets in push_list:
+                await safe_send(
+                    bot_id=sets.bot_id,
+                    send_type=sets.type,
+                    type_id=sets.type_id,
+                    message=message,
+                    at=bool(sets.at) and plugin_config.bililive_dynamic_at,
+                )
+
+            offset[uid] = dynamic_id
+
+    if dynamic:
+        await db.update_user(uid, name)
+
+
+def dynamic_lisener(event):
+    if hasattr(event, "job_id") and event.job_id != "dynamic_sched":
+        return
+    job = scheduler.get_job("dynamic_sched")
+    if not job:
+        scheduler.add_job(
+            dy_sched, id="dynamic_sched", next_run_time=datetime.now(scheduler.timezone)
+        )
+
+
+if plugin_config.bililive_dynamic_interval == 0:
+    scheduler.add_listener(
+        dynamic_lisener,
+        EVENT_JOB_EXECUTED | EVENT_JOB_ERROR | EVENT_JOB_MISSED | EVENT_SCHEDULER_STARTED,
+    )
+else:
+    scheduler.add_job(
+        dy_sched,
+        "interval",
+        seconds=plugin_config.bililive_dynamic_interval,
+        id="dynamic_sched",
+    )

{nonebot_plugin_bililive-2.0.1 → nonebot_plugin_bililive-2.0.3}/bililive/plugins/pusher/live_pusher.py

@@ -13,7 +13,12 @@ live_time = {}
 
 
 @scheduler.scheduled_job(
-    "interval", seconds=plugin_config.bililive_live_interval, id="live_sched"
+    "interval",
+    seconds=plugin_config.bililive_live_interval,
+    id="live_sched",
+    coalesce=True,
+    max_instances=1,
+    misfire_grace_time=5,
 )
 async def live_sched():
     # sourcery skip: use-fstring-for-concatenation

{nonebot_plugin_bililive-2.0.1 → nonebot_plugin_bililive-2.0.3}/bililive/utils/__init__.py

@@ -304,4 +304,4 @@ PROXIES = {"all://": plugin_config.bililive_proxy}
 require("nonebot_plugin_apscheduler")
 from nonebot_plugin_apscheduler import scheduler  # noqa
 
-from .browser import get_dynamic_screenshot  # noqa
+from .browser import get_bilibili_cookies, get_dynamic_screenshot  # noqa

{nonebot_plugin_bililive-2.0.1 → nonebot_plugin_bililive-2.0.3}/bililive/utils/browser.py

@@ -63,6 +63,15 @@ async def get_browser() -> BrowserContext:
     return _browser
 
 
+async def get_bilibili_cookies() -> dict[str, str]:
+    browser = await get_browser()
+    cookies = await browser.cookies([
+        "https://www.bilibili.com/",
+        "https://api.bilibili.com/",
+    ])
+    return {cookie["name"]: cookie["value"] for cookie in cookies}
+
+
 async def get_dynamic_screenshot(
     dynamic_id,
     style=plugin_config.bililive_screenshot_style,

{nonebot_plugin_bililive-2.0.1 → nonebot_plugin_bililive-2.0.3}/bililive/version.py

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

{nonebot_plugin_bililive-2.0.1 → nonebot_plugin_bililive-2.0.3}/pyproject.toml

@@ -38,7 +38,7 @@ dependencies = [
     "msvc-runtime>=14.34.31931; sys_platform == \"win32\"",
 ]
 dynamic = []
-version = "2.0.1"
+version = "2.0.3"
 
 [project.license]
 text = "AGPL-3.0-or-later"
@@ -49,6 +49,10 @@ Repository = "https://github.com/Akiyy-dev/nonebot-plugin-bililive"
 Documentation = "https://github.com/Akiyy-dev/nonebot-plugin-bililive#readme"
 Issues = "https://github.com/Akiyy-dev/nonebot-plugin-bililive/issues"
 
+[project.entry-points."nonebot.plugin"]
+nonebot-plugin-bililive = "nonebot_plugin_bililive"
+nonebot_plugin_bililive = "nonebot_plugin_bililive"
+
 [project.scripts]
 bililive = "bililive.__main__:main"
 

{nonebot_plugin_bililive-2.0.1 → nonebot_plugin_bililive-2.0.3}/tests/test_maintenance.py

@@ -27,8 +27,10 @@ with patch("nonebot.get_driver", return_value=DummyDriver()), patch(
     compat = import_module("bililive.compat")
     Config = import_module("bililive.config").Config
     core_version = import_module("bililive.version")
+    db_module = import_module("bililive.database.db")
+    web_dynamic = import_module("bililive.libs.dynamic.web")
     plugin_entry = import_module("nonebot_plugin_bililive")
-    DB = import_module("bililive.database.db").DB
+    DB = db_module.DB
     models = import_module("bililive.database.models")
     Group = models.Group
 
@@ -88,7 +90,65 @@ class PluginEntryTests(unittest.TestCase):
         self.assertEqual(plugin_entry.__version__, core_version.__version__)
 
 
+class WebDynamicTests(unittest.TestCase):
+    def test_parse_web_dynamic_items_extracts_required_fields(self):
+        payload = {
+            "data": {
+                "items": [
+                    {
+                        "id_str": "1190297023030493193",
+                        "type": "DYNAMIC_TYPE_DRAW",
+                        "modules": {
+                            "module_author": {"name": "玻啵莉Polly"},
+                        },
+                    }
+                ]
+            }
+        }
+
+        items = web_dynamic.parse_web_dynamic_items(payload)
+
+        self.assertEqual(len(items), 1)
+        self.assertEqual(items[0].dynamic_id, 1190297023030493193)
+        self.assertEqual(items[0].dynamic_type, "DYNAMIC_TYPE_DRAW")
+        self.assertEqual(items[0].author_name, "玻啵莉Polly")
+
+    def test_parse_web_dynamic_items_skips_invalid_items(self):
+        payload = {
+            "data": {
+                "items": [
+                    {"id_str": "bad", "type": "DYNAMIC_TYPE_DRAW", "modules": {}},
+                    {
+                        "id_str": "1190297023030493193",
+                        "type": "DYNAMIC_TYPE_DRAW",
+                        "modules": {"module_author": {}},
+                    },
+                ]
+            }
+        }
+
+        self.assertEqual(web_dynamic.parse_web_dynamic_items(payload), [])
+
+
 class DBPermissionTests(unittest.IsolatedAsyncioTestCase):
+    async def test_db_init_enables_global_fallback(self):
+        with (
+            patch.object(db_module.Tortoise, "init", new=AsyncMock()) as init_db,
+            patch.object(
+                db_module.Tortoise,
+                "generate_schemas",
+                new=AsyncMock(),
+            ) as generate_schemas,
+            patch.object(DB, "migrate", new=AsyncMock()) as migrate,
+            patch.object(DB, "update_uid_list", new=AsyncMock()) as update_uid_list,
+        ):
+            await DB.init()
+
+        self.assertTrue(init_db.await_args.kwargs["_enable_global_fallback"])
+        generate_schemas.assert_awaited_once()
+        migrate.assert_awaited_once()
+        update_uid_list.assert_awaited_once()
+
     async def test_set_permission_creates_group_when_missing(self):
         with (
             patch.object(DB, "get_group", new=AsyncMock(return_value=None)),

nonebot_plugin_bililive-2.0.1/bililive/plugins/pusher/dynamic_pusher.py

@@ -1,151 +0,0 @@
-import asyncio
-from datetime import datetime
-
-from apscheduler.events import (
-    EVENT_JOB_ERROR,
-    EVENT_JOB_EXECUTED,
-    EVENT_JOB_MISSED,
-    EVENT_SCHEDULER_STARTED,
-)
-from bilireq.exceptions import GrpcError
-from bilireq.grpc.dynamic import grpc_get_user_dynamics
-from bilireq.grpc.protos.bilibili.app.dynamic.v2.dynamic_pb2 import DynamicType
-from grpc import StatusCode
-from grpc.aio import AioRpcError
-from nonebot.adapters.onebot.v11.message import MessageSegment
-from nonebot.log import logger
-
-from ...config import plugin_config
-from ...database import DB as db
-from ...database import dynamic_offset as offset
-from ...utils import get_dynamic_screenshot, safe_send, scheduler
-
-
-async def dy_sched():
-    """动态推送"""
-    uid = await db.next_uid("dynamic")
-    if not uid:
-        # 没有订阅先暂停一秒再跳过，不然会导致 CPU 占用过高
-        await asyncio.sleep(1)
-        return
-    user = await db.get_user(uid=uid)
-    if user is None:
-        logger.warning(f"动态推送跳过异常订阅 UID：{uid}")
-        return
-    name = user.name
-
-    logger.debug(f"爬取动态 {name}（{uid}）")
-    try:
-        # 获取 UP 最新动态列表
-        dynamics = (
-            await grpc_get_user_dynamics(
-                uid,
-                timeout=plugin_config.bililive_dynamic_timeout,
-                proxy=plugin_config.bililive_proxy,
-            )
-        ).list
-    except AioRpcError as e:
-        if e.code() == StatusCode.DEADLINE_EXCEEDED:
-            logger.error(f"爬取动态超时，将在下个轮询中重试：{e.code()} {e.details()}")
-        else:
-            logger.error(f"爬取动态失败：{e.code()} {e.details()}")
-        return
-    except GrpcError as e:
-        logger.error(f"爬取动态失败：{e.code} {e.msg}")
-        return
-
-    if not dynamics:  # 没发过动态
-        if uid in offset and offset[uid] == -1:  # 不记录会导致第一次发动态不推送
-            offset[uid] = 0
-        return
-    # 更新昵称
-    name = dynamics[0].modules[0].module_author.author.name
-
-    if uid not in offset:  # 已删除
-        return
-    elif offset[uid] == -1:  # 第一次爬取
-        if len(dynamics) == 1:  # 只有一条动态
-            offset[uid] = int(dynamics[0].extend.dyn_id_str)
-        else:  # 第一个可能是置顶动态，但置顶也可能是最新一条，所以取前两条的最大值
-            offset[uid] = max(
-                int(dynamics[0].extend.dyn_id_str), int(dynamics[1].extend.dyn_id_str)
-            )
-        return
-
-    dynamic = None
-    for dynamic in sorted(
-        dynamics,
-        key=lambda x: int(x.extend.dyn_id_str),  # 动态从旧到新排列
-    ):
-        dynamic_id = int(dynamic.extend.dyn_id_str)
-        if dynamic_id > offset[uid]:
-            logger.info(f"检测到新动态（{dynamic_id}）：{name}（{uid}）")
-            image, err = await get_dynamic_screenshot(dynamic_id)
-            url = f"https://t.bilibili.com/{dynamic_id}"
-            if image is None:
-                logger.debug(f"动态不存在，已跳过：{url}")
-                return
-            elif dynamic.card_type in [
-                DynamicType.live_rcmd,
-                DynamicType.live,
-                DynamicType.ad,
-                DynamicType.banner,
-            ]:
-                logger.debug(f"无需推送的动态 {dynamic.card_type}，已跳过：{url}")
-                offset[uid] = dynamic_id
-                return
-
-            type_msg = {
-                0: "发布了新动态",
-                DynamicType.forward: "转发了一条动态",
-                DynamicType.word: "发布了新文字动态",
-                DynamicType.draw: "发布了新图文动态",
-                DynamicType.av: "发布了新投稿",
-                DynamicType.article: "发布了新专栏",
-                DynamicType.music: "发布了新音频",
-            }
-            message = (
-                f"{name} {type_msg.get(dynamic.card_type, type_msg[0])}：\n"
-                + str(f"动态图片可能截图异常：{err}\n" if err else "")
-                + MessageSegment.image(image)
-                + f"\n{url}"
-            )
-
-            push_list = await db.get_push_list(uid, "dynamic")
-            for sets in push_list:
-                await safe_send(
-                    bot_id=sets.bot_id,
-                    send_type=sets.type,
-                    type_id=sets.type_id,
-                    message=message,
-                    at=bool(sets.at) and plugin_config.bililive_dynamic_at,
-                )
-
-            offset[uid] = dynamic_id
-
-    if dynamic:
-        await db.update_user(uid, name)
-
-
-def dynamic_lisener(event):
-    if hasattr(event, "job_id") and event.job_id != "dynamic_sched":
-        return
-    job = scheduler.get_job("dynamic_sched")
-    if not job:
-        scheduler.add_job(
-            dy_sched, id="dynamic_sched", next_run_time=datetime.now(scheduler.timezone)
-        )
-
-
-if plugin_config.bililive_dynamic_interval == 0:
-    scheduler.add_listener(
-        dynamic_lisener,
-        EVENT_JOB_EXECUTED | EVENT_JOB_ERROR | EVENT_JOB_MISSED | EVENT_SCHEDULER_STARTED,
-    )
-else:
-    scheduler.add_job(
-        dy_sched,
-        "interval",
-        seconds=plugin_config.bililive_dynamic_interval,
-        id="dynamic_sched",
-    )