nonebot-plugin-bililive 2.1.3__tar.gz → 2.1.5__tar.gz

{nonebot_plugin_bililive-2.1.3 → nonebot_plugin_bililive-2.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-bililive
-Version: 2.1.3
+Version: 2.1.5
 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>

{nonebot_plugin_bililive-2.1.3 → nonebot_plugin_bililive-2.1.5}/nonebot_plugin_bililive/database/db.py

@@ -5,7 +5,6 @@ from pathlib import Path
 from nonebot import get_driver, logger
 from packaging.version import Version as version_parser
 from tortoise import Tortoise
-from tortoise.connection import connections
 
 from ..utils import get_path
 from ..version import VERSION as APP_VERSION
@@ -14,6 +13,8 @@ from .models import Group, Sub, User, Version
 uid_list = {"live": {"list": [], "index": 0}, "dynamic": {"list": [], "index": 0}}
 dynamic_offset = {}
 
+_db_init_lock = asyncio.Lock()
+
 
 class DB:
     """数据库交互类，与增删改查无关的部分不应该在这里面实现"""
@@ -25,15 +26,18 @@ class DB:
         return Path(get_path("dynamic_offset.json"))
 
     @classmethod
-    async def init(cls):
-        """初始化数据库"""
+    def _orm_context_ok(cls) -> bool:
+        """_ready 与 Tortoise 1.x 全局上下文需同时成立，否则会出现 No TortoiseContext。"""
+        from tortoise.context import get_current_context
+
+        return cls._ready and get_current_context() is not None
+
+    @classmethod
+    async def _do_init(cls) -> None:
+        """在持有 _db_init_lock 时执行完整初始化。"""
         cls._ready = False
         config = {
             "connections": {
-                # "bililive": {
-                #     "engine": "tortoise.backends.sqlite",
-                #     "credentials": {"file_path": get_path("data.sqlite3")},
-                # },
                 "bililive": f"sqlite://{get_path('data.sqlite3')}"
             },
             "apps": {
@@ -53,26 +57,61 @@ class DB:
         await cls.save_dynamic_offsets()
         cls._ready = True
 
+    @classmethod
+    async def init(cls):
+        """初始化数据库"""
+        async with _db_init_lock:
+            await cls._do_init()
+
     @classmethod
     async def close(cls):
-        cls._ready = False
-        await cls.save_dynamic_offsets()
-        await connections.close_all()
+        async with _db_init_lock:
+            cls._ready = False
+            await cls.save_dynamic_offsets()
+            await Tortoise.close_connections()
+
+    @classmethod
+    async def _recover_stale_orm(cls) -> None:
+        """_ready 仍为 True 但 Tortoise 上下文已丢失时，关闭并重新初始化。"""
+        async with _db_init_lock:
+            from tortoise.context import get_current_context
+
+            if get_current_context() is not None:
+                return
+            if not cls._ready:
+                return
+            logger.warning(
+                "Tortoise ORM 上下文已失效（可能被其他代码关闭连接），"
+                "正在重新初始化数据库"
+            )
+            try:
+                await Tortoise.close_connections()
+            except Exception:
+                logger.exception("关闭 Tortoise 连接时出错，仍将尝试重新初始化")
+            cls._ready = False
+            await cls._do_init()
 
     @classmethod
     async def wait_until_ready(cls, timeout: float = 30) -> bool:
-        if cls._ready:
+        if cls._orm_context_ok():
             return True
 
         waited = 0.0
         interval = 0.1
         while waited < timeout:
-            if cls._ready:
+            if cls._orm_context_ok():
                 return True
+            if cls._ready:
+                from tortoise.context import get_current_context
+
+                if get_current_context() is None:
+                    await cls._recover_stale_orm()
+                    if cls._orm_context_ok():
+                        return True
             await asyncio.sleep(interval)
             waited += interval
 
-        return cls._ready
+        return cls._orm_context_ok()
 
     @classmethod
     async def load_dynamic_offsets(cls):

{nonebot_plugin_bililive-2.1.3 → nonebot_plugin_bililive-2.1.5}/nonebot_plugin_bililive/utils/__init__.py

@@ -164,6 +164,9 @@ async def permission_check(
             raise FinishedException
         return
     if isinstance(event, GroupMessageEvent):
+        if not await db.wait_until_ready():
+            await bot.send(event, "数据库尚未初始化完成，请稍后再试")
+            raise FinishedException
         if not await db.get_group_admin(event.group_id):
             return
         if await (GROUP_ADMIN | GROUP_OWNER | SUPERUSER)(bot, event):

{nonebot_plugin_bililive-2.1.3 → nonebot_plugin_bililive-2.1.5}/nonebot_plugin_bililive/version.py

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

{nonebot_plugin_bililive-2.1.3 → nonebot_plugin_bililive-2.1.5}/pyproject.toml

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