nonebot-plugin-bililive 2.0.9__tar.gz → 2.1.0__tar.gz

{nonebot_plugin_bililive-2.0.9 → nonebot_plugin_bililive-2.1.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-bililive
-Version: 2.0.9
+Version: 2.1.0
 Summary: Push bilibili dynamics and live notifications to QQ with NoneBot2.
 Keywords: nonebot,nonebot2,nonebot-plugin,bilibili,onebot,onebot-v11
-Author-Email: SK-415 <2967923486@qq.com>
+Author-Email: Akiyy_Lab <2806578374@qq.com>
 License: AGPL-3.0-or-later
 Classifier: Development Status :: 4 - Beta
 Classifier: Framework :: AsyncIO
@@ -23,12 +23,11 @@ Requires-Dist: httpx<1.0,>=0.28.1
 Requires-Dist: nonebot-adapter-onebot>=2.4.6
 Requires-Dist: nonebot-plugin-apscheduler>=0.5.0
 Requires-Dist: nonebot-plugin-localstore>=0.7
-Requires-Dist: nonebot2[fastapi]>=2.5.0
+Requires-Dist: nonebot2>=2.5.0
 Requires-Dist: playwright>=1.58.0
-Requires-Dist: pydantic<3.0,>=2.12.5
+Requires-Dist: pydantic<3.0,>=1.10.0
 Requires-Dist: python-dotenv>=1.2.2
 Requires-Dist: tortoise-orm[asyncpg]>=0.19.3
-Requires-Dist: bilireq>=0.2.13
 Requires-Dist: packaging>=26.0
 Requires-Dist: msvc-runtime>=14.34.31931; sys_platform == "win32"
 Description-Content-Type: text/markdown
@@ -95,7 +94,7 @@ BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直
 
 </details>
 
-首次使用动态截图功能时，插件会自动检查并安装 Chromium；如果需要自定义数据目录，可通过 BILILIVE_DIR 覆盖默认存储位置。未配置时，插件会使用 nonebot-plugin-localstore 提供的插件数据目录。
+首次使用动态截图功能时，插件会自动检查并安装 Chromium。插件数据目录统一由 nonebot-plugin-localstore 提供，无需再单独配置数据目录。
 
 ## ⚙️ 配置
 
@@ -103,7 +102,6 @@ BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直
 
 | 配置项 | 必填 | 默认值 | 说明 |
 |:-----:|:----:|:----:|:----|
-| BILILIVE_DIR | 否 | 由 nonebot-plugin-localstore 自动分配 | 插件数据目录，包含数据库、浏览器数据与动态偏移缓存 |
 | BILILIVE_TO_ME | 否 | true | 是否需要 @机器人 或命令前缀触发 |
 | BILILIVE_PROXY | 否 | 无 | HTTP 代理地址，用于 B 站请求和 Playwright 下载 |
 | BILILIVE_INTERVAL | 否 | 10 | 默认轮询间隔，单位秒 |
@@ -119,7 +117,7 @@ BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直
 | BILILIVE_DYNAMIC_BIG_IMAGE | 否 | false | 是否优先展示大图 |
 | BILILIVE_COMMAND_PREFIX | 否 | 空字符串 | 命令额外前缀 |
 
-动态抓取默认优先使用 gRPC 接口；当部分 UID 命中 B 站风控时，插件会自动回退到 Playwright 持久化浏览器中的 cookies 请求网页动态接口。通常不需要额外配置 Cookie 登录；如果某些 UID 仍持续抓取失败，建议在插件使用的浏览器数据目录中登录一个常用的 B 站账号，以提高动态抓取成功率。
+动态抓取使用 Playwright 持久化浏览器中的 cookies 请求网页动态接口。通常不需要额外配置 Cookie 登录；如果某些 UID 持续抓取失败，建议在插件使用的浏览器数据目录中登录一个常用的 B 站账号，以提高动态抓取成功率。
 
 ## 🎉 使用
 

{nonebot_plugin_bililive-2.0.9 → nonebot_plugin_bililive-2.1.0}/README.md

@@ -60,7 +60,7 @@ BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直
 
 </details>
 
-首次使用动态截图功能时，插件会自动检查并安装 Chromium；如果需要自定义数据目录，可通过 BILILIVE_DIR 覆盖默认存储位置。未配置时，插件会使用 nonebot-plugin-localstore 提供的插件数据目录。
+首次使用动态截图功能时，插件会自动检查并安装 Chromium。插件数据目录统一由 nonebot-plugin-localstore 提供，无需再单独配置数据目录。
 
 ## ⚙️ 配置
 
@@ -68,7 +68,6 @@ BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直
 
 | 配置项 | 必填 | 默认值 | 说明 |
 |:-----:|:----:|:----:|:----|
-| BILILIVE_DIR | 否 | 由 nonebot-plugin-localstore 自动分配 | 插件数据目录，包含数据库、浏览器数据与动态偏移缓存 |
 | BILILIVE_TO_ME | 否 | true | 是否需要 @机器人 或命令前缀触发 |
 | BILILIVE_PROXY | 否 | 无 | HTTP 代理地址，用于 B 站请求和 Playwright 下载 |
 | BILILIVE_INTERVAL | 否 | 10 | 默认轮询间隔，单位秒 |
@@ -84,7 +83,7 @@ BiliLive 是一个基于 NoneBot2 的 B 站推送插件，支持将 UP 主的直
 | BILILIVE_DYNAMIC_BIG_IMAGE | 否 | false | 是否优先展示大图 |
 | BILILIVE_COMMAND_PREFIX | 否 | 空字符串 | 命令额外前缀 |
 
-动态抓取默认优先使用 gRPC 接口；当部分 UID 命中 B 站风控时，插件会自动回退到 Playwright 持久化浏览器中的 cookies 请求网页动态接口。通常不需要额外配置 Cookie 登录；如果某些 UID 仍持续抓取失败，建议在插件使用的浏览器数据目录中登录一个常用的 B 站账号，以提高动态抓取成功率。
+动态抓取使用 Playwright 持久化浏览器中的 cookies 请求网页动态接口。通常不需要额外配置 Cookie 登录；如果某些 UID 持续抓取失败，建议在插件使用的浏览器数据目录中登录一个常用的 B 站账号，以提高动态抓取成功率。
 
 ## 🎉 使用
 

{nonebot_plugin_bililive-2.0.9/bililive → nonebot_plugin_bililive-2.1.0/nonebot_plugin_bililive}/__init__.py

@@ -1,10 +1,9 @@
 from nonebot.plugin import PluginMetadata
 from nonebot.plugin.manager import PluginLoader
 
-from .compat import patch_httpx_compat
-from .config import Config
+from .config import Config, plugin_config
+from .version import VERSION, __version__
 
-patch_httpx_compat()
 
 def bootstrap_plugin(force: bool = False):
     if force or isinstance(globals()["__loader__"], PluginLoader):
@@ -17,8 +16,6 @@ def bootstrap_plugin(force: bool = False):
 
 bootstrap_plugin()
 
-from .version import VERSION, __version__  # noqa: F401
-
 __plugin_meta__ = PluginMetadata(
     name="BiliLive",
     description="将B站UP主的动态和直播信息推送至QQ",
@@ -28,8 +25,10 @@ __plugin_meta__ = PluginMetadata(
     config=Config,
     supported_adapters={"~onebot.v11"},
     extra={
-        "author": "SK-415",
+        "author": "Akiyy_Lab",
         "version": __version__,
         "priority": 1,
     },
 )
+
+__all__ = ["__plugin_meta__", "__version__", "VERSION", "plugin_config"]

nonebot_plugin_bililive-2.1.0/nonebot_plugin_bililive/bilibili_api.py

@@ -0,0 +1,57 @@
+import httpx
+
+
+class BilibiliAPIError(RuntimeError):
+    def __init__(self, code: int, message: str, data=None):
+        super().__init__(f"{code} {message}")
+        self.code = code
+        self.message = message
+        self.data = data
+
+
+async def request_bilibili_api(
+    method: str,
+    url: str,
+    *,
+    proxy: str | None = None,
+    headers: dict[str, str] | None = None,
+    timeout: int = 20,
+    **kwargs,
+):
+    request_headers = {
+        "User-Agent": "Mozilla/5.0",
+        "Referer": "https://www.bilibili.com/",
+    }
+    if headers:
+        request_headers.update(headers)
+
+    async with httpx.AsyncClient(
+        proxy=proxy,
+        headers=request_headers,
+        timeout=timeout,
+        follow_redirects=True,
+    ) as client:
+        response = await client.request(method, url, **kwargs)
+
+    payload = response.json()
+    if payload.get("code") != 0:
+        raise BilibiliAPIError(
+            payload.get("code", -1),
+            payload.get("message") or payload.get("msg") or "unknown error",
+            payload.get("data"),
+        )
+    return payload.get("data")
+
+
+async def get_live_rooms_info_by_uids(
+    uids: list[int],
+    *,
+    proxy: str | None = None,
+) -> dict[str, dict]:
+    data = await request_bilibili_api(
+        "POST",
+        "https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids",
+        proxy=proxy,
+        json={"uids": uids},
+    )
+    return data or {}

{nonebot_plugin_bililive-2.0.9/bililive → nonebot_plugin_bililive-2.1.0/nonebot_plugin_bililive}/cli/bot.py

@@ -2,8 +2,9 @@ import sys
 from os import path
 
 import nonebot
+from nonebot import logger
 from nonebot.adapters.onebot.v11 import Adapter
-from nonebot.log import default_format, logger
+from nonebot.log import default_format
 
 nonebot.init()
 driver = nonebot.get_driver()
@@ -35,4 +36,4 @@ logger.add(
 
 
 def run():
-    nonebot.run(app="bililive.cli.bot:app")
+    nonebot.run(app="nonebot_plugin_bililive.cli.bot:app")

nonebot_plugin_bililive-2.1.0/nonebot_plugin_bililive/config.py

@@ -0,0 +1,90 @@
+
+from collections.abc import Mapping
+from typing import Any
+
+from nonebot import get_plugin_config, logger
+from nonebot.compat import PYDANTIC_V2, ConfigDict, field_validator, model_validator
+from pydantic import BaseModel
+
+
+# 其他地方出现的类似 from .. import config，均是从 __init__.py 导入的 Config 实例
+class Config(BaseModel):
+    if PYDANTIC_V2:
+        model_config = ConfigDict(extra="ignore")
+    else:
+
+        class Config:
+            extra = "ignore"
+
+    fastapi_reload: bool = False
+    bililive_to_me: bool = True
+    bililive_live_off_notify: bool = False
+    bililive_proxy: str | None = None
+    bililive_interval: int = 10
+    bililive_live_interval: int = 10
+    bililive_dynamic_interval: int = 0
+    bililive_dynamic_at: bool = False
+    bililive_screenshot_style: str = "mobile"
+    bililive_captcha_address: str = "https://captcha-cd.ngworks.cn"
+    bililive_captcha_token: str = "bililive"
+    bililive_browser_ua: str | None = None
+    bililive_dynamic_timeout: int = 30
+    bililive_dynamic_font_source: str = "system"
+    bililive_dynamic_font: str | None = "Noto Sans CJK SC"
+    bililive_dynamic_big_image: bool = False
+    bililive_command_prefix: str = ""
+
+    @model_validator(mode="before")
+    @classmethod
+    def migrate_legacy_keys(cls, values: Any):
+        if not isinstance(values, Mapping):
+            return values
+
+        data = dict(values)
+        for legacy_key, new_key in {
+            "haruka_to_me": "bililive_to_me",
+            "haruka_live_off_notify": "bililive_live_off_notify",
+            "haruka_proxy": "bililive_proxy",
+            "haruka_interval": "bililive_interval",
+            "haruka_live_interval": "bililive_live_interval",
+            "haruka_dynamic_interval": "bililive_dynamic_interval",
+            "haruka_dynamic_at": "bililive_dynamic_at",
+            "haruka_screenshot_style": "bililive_screenshot_style",
+            "haruka_captcha_address": "bililive_captcha_address",
+            "haruka_captcha_token": "bililive_captcha_token",
+            "haruka_browser_ua": "bililive_browser_ua",
+            "haruka_dynamic_timeout": "bililive_dynamic_timeout",
+            "haruka_dynamic_font_source": "bililive_dynamic_font_source",
+            "haruka_dynamic_font": "bililive_dynamic_font",
+            "haruka_dynamic_big_image": "bililive_dynamic_big_image",
+            "haruka_command_prefix": "bililive_command_prefix",
+        }.items():
+            if new_key not in data and legacy_key in data:
+                data[new_key] = data[legacy_key]
+
+        return data
+
+    @field_validator("bililive_interval")
+    @classmethod
+    def interval_non_negative(cls, value: int):
+        return 10 if value < 1 else value
+
+    @field_validator("bililive_live_interval")
+    @classmethod
+    def live_interval_non_negative(cls, value: int):
+        return 10 if value < 1 else value
+
+    @field_validator("bililive_dynamic_interval")
+    @classmethod
+    def dynamic_interval_non_negative(cls, value: int):
+        return 0 if value < 1 else value
+
+    @field_validator("bililive_screenshot_style")
+    @classmethod
+    def screenshot_style(cls, value: str):
+        if value != "mobile":
+            logger.warning("截图样式目前只支持 mobile，pc 样式现已被弃用")
+        return "mobile"
+
+
+plugin_config = get_plugin_config(Config)

{nonebot_plugin_bililive-2.0.9/bililive → nonebot_plugin_bililive-2.1.0/nonebot_plugin_bililive}/database/db.py

@@ -2,8 +2,7 @@ import asyncio
 import json
 from pathlib import Path
 
-from nonebot import get_driver
-from nonebot.log import logger
+from nonebot import get_driver, logger
 from packaging.version import Version as version_parser
 from tortoise import Tortoise
 from tortoise.connection import connections
@@ -39,7 +38,7 @@ class DB:
             },
             "apps": {
                 "bililive_app": {
-                    "models": ["bililive.database.models"],
+                    "models": ["nonebot_plugin_bililive.database.models"],
                     "default_connection": "bililive",
                 }
             },

{nonebot_plugin_bililive-2.0.9/bililive → nonebot_plugin_bililive-2.1.0/nonebot_plugin_bililive}/plugins/help.py

@@ -13,7 +13,7 @@ async def _():
         for matcher in matchers_list:
             if (
                 matcher.plugin_name
-                and matcher.plugin_name.startswith("bililive")
+                and matcher.plugin_name.startswith("nonebot_plugin_bililive")
                 and matcher.__doc__
             ):
                 message += matcher.__doc__ + "\n"

{nonebot_plugin_bililive-2.0.9/bililive → nonebot_plugin_bililive-2.1.0/nonebot_plugin_bililive}/plugins/pusher/dynamic_pusher.py

@@ -8,13 +8,8 @@ from apscheduler.events import (
     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 import logger
 from nonebot.adapters.onebot.v11.message import MessageSegment
-from nonebot.log import logger
 
 from ...config import plugin_config
 from ...database import DB as db
@@ -32,11 +27,9 @@ from ...utils import (
     scheduler,
 )
 
-GRPC_RISK_CONTROL_RETRY_SECONDS = 3600
 WEB_REQUEST_BANNED_RETRY_SECONDS = 300
 WEB_REQUEST_ERROR_RETRY_SECONDS = 600
 dynamic_risk_control_until = {}
-dynamic_web_fallback_until = {}
 WEB_SKIP_DYNAMIC_TYPES = {
     "DYNAMIC_TYPE_LIVE_RCMD",
     "DYNAMIC_TYPE_LIVE",
@@ -60,96 +53,48 @@ async def throttle_dynamic_loop():
 
 
 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)
+    return dynamic.dynamic_id
 
 
 def get_dynamic_type(dynamic, use_web_fallback: bool):
-    if use_web_fallback:
-        return dynamic.dynamic_type
-    return dynamic.card_type
+    return dynamic.dynamic_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
+    return dynamic.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, "发布了新动态")
+    return WEB_DYNAMIC_TYPE_MESSAGES.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,
-    ]
+    return dynamic_type in WEB_SKIP_DYNAMIC_TYPES
 
 
 async def get_user_dynamics_with_web_fallback(uid: int) -> tuple[list, bool]:
-    async def fetch_web_dynamics() -> list:
-        try:
-            payload = await get_user_dynamics_payload_in_browser(uid)
-            return parse_web_dynamic_payload(payload)
-        except WebDynamicError as browser_error:
-            logger.debug(
-                f"浏览器上下文动态接口获取失败，尝试直连 Web API：{uid} "
-                f"{browser_error.code} {browser_error.msg}"
-            )
+    try:
+        payload = await get_user_dynamics_payload_in_browser(uid)
+        return parse_web_dynamic_payload(payload), True
+    except WebDynamicError as browser_error:
+        logger.debug(
+            f"浏览器上下文动态接口获取失败，尝试直连 Web API：{uid} "
+            f"{browser_error.code} {browser_error.msg}"
+        )
 
-        cookies = await get_bilibili_cookies()
-        if not cookies:
-            raise WebDynamicError(-1, "browser cookies unavailable")
-        return await get_user_dynamics_web(
+    cookies = await get_bilibili_cookies()
+    if not cookies:
+        raise WebDynamicError(-1, "browser cookies unavailable")
+    return (
+        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,
-        )
-
-    fallback_until = dynamic_web_fallback_until.get(uid)
-    if fallback_until is not None:
-        if fallback_until > monotonic():
-            logger.debug(f"动态 gRPC 接口仍在风控，继续使用 Web 接口：{uid}")
-            return await fetch_web_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() + GRPC_RISK_CONTROL_RETRY_SECONDS
-    return await fetch_web_dynamics(), True
+        ),
+        True,
+    )
 
 
 async def process_dynamic_uid(uid: int):
@@ -174,16 +119,6 @@ async def process_dynamic_uid(uid: int):
     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}")
-        return
     except WebDynamicError as e:
         retry_seconds = (
             WEB_REQUEST_BANNED_RETRY_SECONDS

{nonebot_plugin_bililive-2.0.9/bililive → nonebot_plugin_bililive-2.1.0/nonebot_plugin_bililive}/plugins/pusher/live_pusher.py

@@ -1,12 +1,12 @@
 import time
 
-from bilireq.live import get_rooms_info_by_uids
+from nonebot import logger
 from nonebot.adapters.onebot.v11.message import MessageSegment
-from nonebot.log import logger
 
+from ...bilibili_api import get_live_rooms_info_by_uids
 from ...config import plugin_config
 from ...database import DB as db
-from ...utils import PROXIES, calc_time_total, safe_send, scheduler
+from ...utils import calc_time_total, safe_send, scheduler
 
 status = {}
 live_time = {}
@@ -32,7 +32,7 @@ async def live_sched():
     if not uids:  # 订阅为空
         return
     logger.debug(f"爬取直播列表，目前开播{sum(status.values())}人，总共{len(uids)}人")
-    res = await get_rooms_info_by_uids(uids, reqtype="web", proxies=PROXIES)
+    res = await get_live_rooms_info_by_uids(uids, proxy=plugin_config.bililive_proxy)
     if not res:
         return
     for uid, info in res.items():

{nonebot_plugin_bililive-2.0.9/bililive → nonebot_plugin_bililive-2.1.0/nonebot_plugin_bililive}/plugins/sub/add_sub.py

@@ -1,11 +1,8 @@
-from bilireq.exceptions import ResponseCodeError
-from bilireq.user import get_user_info
 from nonebot.adapters.onebot.v11.event import MessageEvent
 from nonebot.params import ArgPlainText
 
 from ...database import DB as db
 from ...utils import (
-    PROXIES,
     get_type_id,
     get_user_name_by_uid,
     handle_uid,
@@ -31,28 +28,9 @@ async def _(event: MessageEvent, uid: str = ArgPlainText("uid")):
     user = await db.get_user(uid=uid)
     name = user and user.name
     if not name:
-        try:
-            name = (await get_user_info(uid, reqtype="web", proxies=PROXIES))["name"]
-        except ResponseCodeError as e:
-            name = await get_user_name_by_uid(uid)
-            if name:
-                logger_message = f"UID {uid} 使用 card 接口回退获取昵称成功"
-                from nonebot.log import logger
-
-                logger.warning(logger_message)
-            elif e.code in [-400, -404]:
-                await add_sub.finish("UID不存在，注意UID不是房间号")
-            elif e.code == -412:
-                await add_sub.finish("操作过于频繁IP暂时被风控，请半小时后再尝试")
-            else:
-                await add_sub.finish(
-                    f"未知错误，请联系开发者反馈，错误内容：\n\
-                                    {str(e)}"
-                )
-        except Exception:
-            name = await get_user_name_by_uid(uid)
-            if not name:
-                raise
+        name = await get_user_name_by_uid(uid)
+        if not name:
+            await add_sub.finish("UID不存在，注意UID不是房间号")
 
     result = await db.add_sub(
         uid=uid,

{nonebot_plugin_bililive-2.0.9/bililive → nonebot_plugin_bililive-2.1.0/nonebot_plugin_bililive}/utils/__init__.py

@@ -3,14 +3,12 @@ import contextlib
 import datetime
 import re
 import sys
-from pathlib import Path
 from typing import Annotated
 
 import httpx
 import nonebot
-from bilireq.utils import get
+from nonebot import logger, require
 from nonebot import on_command as _on_command
-from nonebot import require
 from nonebot.adapters.onebot.v11 import (
     ActionFailed,
     Bot,
@@ -22,7 +20,6 @@ from nonebot.adapters.onebot.v11 import (
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent, PrivateMessageEvent
 from nonebot.adapters.onebot.v11.permission import GROUP_ADMIN, GROUP_OWNER
 from nonebot.exception import FinishedException
-from nonebot.log import logger
 from nonebot.matcher import Matcher
 from nonebot.params import ArgPlainText, CommandArg, RawCommand
 from nonebot.permission import SUPERUSER
@@ -33,14 +30,10 @@ from ..config import plugin_config
 require("nonebot_plugin_localstore")
 import nonebot_plugin_localstore as store
 
-PLUGIN_ENTRY_NAME = "nonebot_plugin_bililive"
 
-
-def get_data_dir() -> Path:
+def get_data_dir():
     """获取插件数据目录。"""
-    if plugin_config.bililive_dir:
-        return Path(plugin_config.bililive_dir).resolve()
-    return store.get_data_dir(PLUGIN_ENTRY_NAME)
+    return store.get_plugin_data_dir()
 
 
 def get_path(*other):
@@ -99,9 +92,16 @@ async def search_user(keyword: str):
     """
     url = "https://api.bilibili.com/x/web-interface/search/type"
     data = {"keyword": keyword, "search_type": "bili_user"}
-    resp = await get(url, params=data)
-    logger.debug(resp)
-    return resp
+    async with httpx.AsyncClient(
+        proxy=plugin_config.bililive_proxy,
+        headers={"User-Agent": "Mozilla/5.0", "Referer": "https://www.bilibili.com/"},
+        timeout=20,
+        follow_redirects=True,
+    ) as client:
+        response = await client.get(url, params=data)
+    payload = response.json()
+    logger.debug(payload)
+    return payload.get("data")
 
 
 async def get_user_name_by_uid(uid: int | str) -> str | None:
@@ -304,8 +304,6 @@ def on_command(cmd, *args, **kwargs):
     return _on_command(plugin_config.bililive_command_prefix + cmd, *args, **kwargs)
 
 
-PROXIES = {"all://": plugin_config.bililive_proxy}
-
 require("nonebot_plugin_apscheduler")
 from nonebot_plugin_apscheduler import scheduler  # noqa
 

{nonebot_plugin_bililive-2.0.9/bililive → nonebot_plugin_bililive-2.1.0/nonebot_plugin_bililive}/utils/browser.py

@@ -5,7 +5,7 @@ import re
 import sys
 from pathlib import Path
 
-from nonebot.log import logger
+from nonebot import logger
 from playwright.__main__ import main
 from playwright.async_api import BrowserContext, Page, async_playwright
 

{nonebot_plugin_bililive-2.0.9/bililive → nonebot_plugin_bililive-2.1.0/nonebot_plugin_bililive}/utils/captcha_solver.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 from typing import Any
 
 import httpx
-from loguru import logger
+from nonebot import logger
 from playwright._impl._api_structures import Position
 from playwright.async_api import Page, Response
 

{nonebot_plugin_bililive-2.0.9/bililive → nonebot_plugin_bililive-2.1.0/nonebot_plugin_bililive}/utils/fonts_provider.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from loguru import logger
+from nonebot import logger
 from playwright.async_api import Request, Route
 from yarl import URL
 

{nonebot_plugin_bililive-2.0.9/bililive → nonebot_plugin_bililive-2.1.0/nonebot_plugin_bililive}/version.py

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

{nonebot_plugin_bililive-2.0.9 → nonebot_plugin_bililive-2.1.0}/pyproject.toml

@@ -2,7 +2,7 @@
 name = "nonebot-plugin-bililive"
 description = "Push bilibili dynamics and live notifications to QQ with NoneBot2."
 authors = [
-    { name = "SK-415", email = "2967923486@qq.com" },
+    { name = "Akiyy_Lab", email = "2806578374@qq.com" },
 ]
 requires-python = ">=3.10,<4.0"
 readme = "README.md"
@@ -30,17 +30,16 @@ dependencies = [
     "nonebot-adapter-onebot>=2.4.6",
     "nonebot-plugin-apscheduler>=0.5.0",
     "nonebot-plugin-localstore>=0.7",
-    "nonebot2[fastapi]>=2.5.0",
+    "nonebot2>=2.5.0",
     "playwright>=1.58.0",
-    "pydantic>=2.12.5,<3.0",
+    "pydantic>=1.10.0,<3.0",
     "python-dotenv>=1.2.2",
     "tortoise-orm[asyncpg]>=0.19.3",
-    "bilireq>=0.2.13",
     "packaging>=26.0",
     "msvc-runtime>=14.34.31931; sys_platform == \"win32\"",
 ]
 dynamic = []
-version = "2.0.9"
+version = "2.1.0"
 
 [project.license]
 text = "AGPL-3.0-or-later"
@@ -52,11 +51,10 @@ 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"
+bililive = "nonebot_plugin_bililive.__main__:main"
 
 [tool.nonebot]
 adapters = [
@@ -73,13 +71,11 @@ distribution = true
 
 [tool.pdm.version]
 source = "file"
-path = "bililive/version.py"
+path = "nonebot_plugin_bililive/version.py"
 
 [tool.pdm.build]
 includes = [
-    "bililive",
     "nonebot_plugin_bililive",
-    "nonebot-plugin-bililive",
 ]
 
 [tool.pdm.dev-dependencies]

{nonebot_plugin_bililive-2.0.9 → nonebot_plugin_bililive-2.1.0}/tests/test_maintenance.py

@@ -1,14 +1,11 @@
 import sys
 import tempfile
 import unittest
-import importlib
 from importlib import import_module
 from pathlib import Path
 from types import ModuleType, SimpleNamespace
 from unittest.mock import AsyncMock, patch
 
-import httpx
-
 
 class DummyDriver:
     config = {}
@@ -38,32 +35,31 @@ class DummyScheduler:
 fake_apscheduler.scheduler = DummyScheduler()
 
 
-def _get_data_dir(plugin_name: str | None) -> Path:
-    return Path(tempfile.gettempdir()) / (plugin_name or "nonebot2")
+def _get_plugin_data_dir() -> Path:
+    return Path(tempfile.gettempdir()) / "nonebot_plugin_bililive"
 
 
-fake_localstore.get_data_dir = _get_data_dir
+fake_localstore.get_plugin_data_dir = _get_plugin_data_dir
 
 
 with patch("nonebot.get_driver", return_value=DummyDriver()), patch(
-    "nonebot.require", return_value=None
-), patch.dict(
+    "nonebot.get_plugin_config", side_effect=lambda cls: cls()
+), patch("nonebot.require", return_value=None), patch.dict(
     sys.modules,
     {
         "nonebot_plugin_apscheduler": fake_apscheduler,
         "nonebot_plugin_localstore": fake_localstore,
     },
 ):
-    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")
+    Config = import_module("nonebot_plugin_bililive.config").Config
+    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")
     plugin_entry = import_module("nonebot_plugin_bililive")
     DB = db_module.DB
-    models = import_module("bililive.database.models")
+    models = import_module("nonebot_plugin_bililive.database.models")
     Group = models.Group
-    get_path = import_module("bililive.utils").get_path
+    get_path = import_module("nonebot_plugin_bililive.utils").get_path
 
 
 class ConfigTests(unittest.TestCase):
@@ -84,8 +80,8 @@ class ConfigTests(unittest.TestCase):
         self.assertEqual(config.bililive_screenshot_style, "mobile")
 
     def test_legacy_haruka_config_names_are_still_supported(self):
-        config = Config.model_validate(
-            {
+        config = Config(
+            **{
                 "haruka_interval": -1,
                 "haruka_live_interval": 12,
                 "haruka_command_prefix": "hb",
@@ -97,67 +93,32 @@ class ConfigTests(unittest.TestCase):
         self.assertEqual(config.bililive_command_prefix, "hb")
 
 
-class CompatTests(unittest.TestCase):
-    def test_httpx_compat_adds_legacy_proxy_alias(self):
-        compat.patch_httpx_compat()
-
-        self.assertTrue(hasattr(httpx._types, "ProxiesTypes"))
-
-    def test_httpx_compat_accepts_legacy_proxies_keyword(self):
-        compat.patch_httpx_compat()
-
-        client = httpx.AsyncClient(proxies={"all://": None})
-        self.assertIsInstance(client, httpx.AsyncClient)
-        self.addCleanup(lambda: __import__("asyncio").run(client.aclose()))
-
-
 class PluginEntryTests(unittest.TestCase):
-    def test_wrapper_entry_exposes_plugin_metadata(self):
+    def test_plugin_entry_exposes_plugin_metadata(self):
         self.assertEqual(
             plugin_entry.__plugin_meta__.homepage,
             "https://github.com/Akiyy-dev/nonebot-plugin-bililive",
         )
         self.assertEqual(plugin_entry.__plugin_meta__.config, Config)
+        self.assertEqual(plugin_entry.__plugin_meta__.extra["author"], "Akiyy_Lab")
         self.assertEqual(plugin_entry.__version__, core_version.__version__)
 
     def test_default_data_dir_uses_localstore(self):
-        expected = _get_data_dir("nonebot_plugin_bililive") / "data.sqlite3"
+        expected = _get_plugin_data_dir() / "data.sqlite3"
 
         self.assertEqual(Path(get_path("data.sqlite3")), expected)
 
-    def test_pyproject_declares_hyphen_and_module_plugin_entrypoints(self):
+    def test_pyproject_uses_direct_plugin_entrypoint(self):
         pyproject = Path("pyproject.toml").read_text(encoding="utf-8")
 
-        self.assertIn(
-            'nonebot-plugin-bililive = "nonebot_plugin_bililive"',
-            pyproject,
-        )
         self.assertIn(
             'nonebot_plugin_bililive = "nonebot_plugin_bililive"',
             pyproject,
         )
-
-    def test_hyphenated_module_alias_can_be_imported(self):
-        with patch("nonebot.get_driver", return_value=DummyDriver()), patch(
-            "nonebot.require", return_value=None
-        ), patch.dict(
-            sys.modules,
-            {
-                "nonebot_plugin_apscheduler": fake_apscheduler,
-                "nonebot_plugin_localstore": fake_localstore,
-            },
-        ):
-            alias_module = importlib.import_module("nonebot-plugin-bililive")
-
-        self.assertEqual(alias_module.__plugin_meta__.name, plugin_entry.__plugin_meta__.name)
-        self.assertEqual(
-            alias_module.__plugin_meta__.homepage,
-            plugin_entry.__plugin_meta__.homepage,
-        )
-        self.assertEqual(
-            alias_module.__plugin_meta__.supported_adapters,
-            plugin_entry.__plugin_meta__.supported_adapters,
-        )
+        self.assertNotIn('nonebot-plugin-bililive = "nonebot_plugin_bililive"', pyproject)
+        self.assertIn('bililive = "nonebot_plugin_bililive.__main__:main"', pyproject)
+        self.assertNotIn('nonebot2[fastapi]>=', pyproject)
+        self.assertNotIn('bilireq>=', pyproject)
 
 
 class WebDynamicTests(unittest.TestCase):

nonebot_plugin_bililive-2.0.9/bililive/compat.py

@@ -1,42 +0,0 @@
-from collections.abc import Mapping
-from typing import Any
-
-import httpx
-import httpx._types as httpx_types
-
-
-def _normalize_proxy_value(proxies: Any):
-    if proxies is None:
-        return None
-    if isinstance(proxies, Mapping):
-        if "all://" in proxies:
-            return proxies["all://"]
-        for value in proxies.values():
-            if value is not None:
-                return value
-        return None
-    return proxies
-
-
-def patch_httpx_compat():
-    if not hasattr(httpx_types, "ProxiesTypes") and hasattr(httpx_types, "ProxyTypes"):
-        httpx_types.ProxiesTypes = httpx_types.ProxyTypes
-
-    if getattr(httpx.AsyncClient, "__bililive_compat_patch__", False):
-        return
-
-    original_async_client = httpx.AsyncClient
-
-    class CompatAsyncClient(original_async_client):
-        __bililive_compat_patch__ = True
-
-        def __init__(self, *args, proxies=Ellipsis, **kwargs):
-            if proxies is not Ellipsis and "proxy" not in kwargs:
-                kwargs["proxy"] = _normalize_proxy_value(proxies)
-            super().__init__(*args, **kwargs)
-
-    CompatAsyncClient.__name__ = original_async_client.__name__
-    CompatAsyncClient.__qualname__ = original_async_client.__qualname__
-    CompatAsyncClient.__module__ = original_async_client.__module__
-
-    httpx.AsyncClient = CompatAsyncClient

nonebot_plugin_bililive-2.0.9/bililive/config.py

@@ -1,123 +0,0 @@
-
-from loguru import logger
-from nonebot import get_driver
-from pydantic import (
-    AliasChoices,
-    BaseModel,
-    ConfigDict,
-    Field,
-    ValidationInfo,
-    field_validator,
-)
-
-
-def compat_field(default, new_name: str, legacy_name: str):
-    return Field(
-        default=default,
-        validation_alias=AliasChoices(new_name, legacy_name),
-    )
-
-
-# 其他地方出现的类似 from .. import config，均是从 __init__.py 导入的 Config 实例
-class Config(BaseModel):
-    model_config = ConfigDict(extra="ignore")
-
-    fastapi_reload: bool = False
-    bililive_dir: str | None = compat_field(None, "bililive_dir", "haruka_dir")
-    bililive_to_me: bool = compat_field(True, "bililive_to_me", "haruka_to_me")
-    bililive_live_off_notify: bool = compat_field(
-        False,
-        "bililive_live_off_notify",
-        "haruka_live_off_notify",
-    )
-    bililive_proxy: str | None = compat_field(
-        None,
-        "bililive_proxy",
-        "haruka_proxy",
-    )
-    bililive_interval: int = compat_field(10, "bililive_interval", "haruka_interval")
-    bililive_live_interval: int = compat_field(
-        10,
-        "bililive_live_interval",
-        "haruka_live_interval",
-    )
-    bililive_dynamic_interval: int = compat_field(
-        0,
-        "bililive_dynamic_interval",
-        "haruka_dynamic_interval",
-    )
-    bililive_dynamic_at: bool = compat_field(
-        False,
-        "bililive_dynamic_at",
-        "haruka_dynamic_at",
-    )
-    bililive_screenshot_style: str = compat_field(
-        "mobile",
-        "bililive_screenshot_style",
-        "haruka_screenshot_style",
-    )
-    bililive_captcha_address: str = compat_field(
-        "https://captcha-cd.ngworks.cn",
-        "bililive_captcha_address",
-        "haruka_captcha_address",
-    )
-    bililive_captcha_token: str = compat_field(
-        "bililive",
-        "bililive_captcha_token",
-        "haruka_captcha_token",
-    )
-    bililive_browser_ua: str | None = compat_field(
-        None,
-        "bililive_browser_ua",
-        "haruka_browser_ua",
-    )
-    bililive_dynamic_timeout: int = compat_field(
-        30,
-        "bililive_dynamic_timeout",
-        "haruka_dynamic_timeout",
-    )
-    bililive_dynamic_font_source: str = compat_field(
-        "system",
-        "bililive_dynamic_font_source",
-        "haruka_dynamic_font_source",
-    )
-    bililive_dynamic_font: str | None = compat_field(
-        "Noto Sans CJK SC",
-        "bililive_dynamic_font",
-        "haruka_dynamic_font",
-    )
-    bililive_dynamic_big_image: bool = compat_field(
-        False,
-        "bililive_dynamic_big_image",
-        "haruka_dynamic_big_image",
-    )
-    bililive_command_prefix: str = compat_field(
-        "",
-        "bililive_command_prefix",
-        "haruka_command_prefix",
-    )
-
-    @field_validator(
-        "bililive_interval", "bililive_live_interval", "bililive_dynamic_interval"
-    )
-    @classmethod
-    def non_negative(cls, v: int, info: ValidationInfo):
-        """定时器为负返回默认值"""
-        default = cls.model_fields[info.field_name].default
-        return default if v < 1 else v
-
-    @field_validator("bililive_screenshot_style")
-    @classmethod
-    def screenshot_style(cls, v: str):
-        if v != "mobile":
-            logger.warning("截图样式目前只支持 mobile，pc 样式现已被弃用")
-        return "mobile"
-
-
-global_config = get_driver().config
-if hasattr(global_config, "model_dump"):
-    plugin_config = Config.model_validate(global_config.model_dump())
-elif hasattr(global_config, "dict"):
-    plugin_config = Config.model_validate(global_config.dict())
-else:
-    plugin_config = Config.model_validate(global_config)

nonebot_plugin_bililive-2.0.9/nonebot-plugin-bililive/__init__.py

@@ -1 +0,0 @@
-from nonebot_plugin_bililive import *  # noqa: F403

nonebot_plugin_bililive-2.0.9/nonebot_plugin_bililive/__init__.py

@@ -1,25 +0,0 @@
-from nonebot.plugin import PluginMetadata
-from nonebot.plugin.manager import PluginLoader
-
-from bililive import VERSION, __version__, bootstrap_plugin
-from bililive.config import Config, plugin_config
-
-if isinstance(globals()["__loader__"], PluginLoader):
-    bootstrap_plugin(force=True)
-
-__plugin_meta__ = PluginMetadata(
-    name="BiliLive",
-    description="将 B 站 UP 主的动态和直播信息推送至 QQ",
-    usage="发送“帮助”查看命令列表，发送“关注 UID”订阅 UP 主",
-    homepage="https://github.com/Akiyy-dev/nonebot-plugin-bililive",
-    type="application",
-    config=Config,
-    supported_adapters={"~onebot.v11"},
-    extra={
-        "author": "SK-415",
-        "version": __version__,
-        "priority": 1,
-    },
-)
-
-__all__ = ["__plugin_meta__", "__version__", "VERSION", "plugin_config"]