bugfix:修复sqlite部分场景下锁竞争问题；新增插件恶意触发配置文件 (#2144)

* bugfix:修复sqlite部分场景下锁竞争问题；新增插件恶意触发配置文件

* 文件没同步完

zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/__init__.py

@@ -7,7 +7,7 @@ from nonebot.config import Config
 from zhenxun.services.log import logger
 
 from ....base_model import BaseResultModel, QueryModel, Result
-from ....utils import authentication
+from ....utils import DB_BUSY_MESSAGE, authentication
 from .data_source import ApiDataSource
 from .model import AllChatAndCallCount, BotInfo, ChatCallMonthCount, QueryChatCallCount
 
@@ -28,6 +28,8 @@ driver = nonebot.get_driver()
 async def _() -> Result[list[BotInfo]]:
     try:
         return Result.ok(await ApiDataSource.get_bot_list(), "拿到信息啦!")
+    except TimeoutError:
+        return Result.fail(DB_BUSY_MESSAGE)
     except Exception as e:
         logger.error(f"{router.prefix}/get_bot_list 调用错误", "WebUi", e=e)
         return Result.fail(f"发生了一点错误捏 {type(e)}: {e}")
@@ -45,6 +47,8 @@ async def _(bot_id: str | None = None) -> Result[QueryChatCallCount]:
         return Result.ok(
             await ApiDataSource.get_chat_and_call_count(bot_id), "拿到信息啦!"
         )
+    except TimeoutError:
+        return Result.fail(DB_BUSY_MESSAGE)
     except Exception as e:
         logger.error(f"{router.prefix}/get_chat_and_call_count 调用错误", "WebUi", e=e)
         return Result.fail(f"发生了一点错误捏 {type(e)}: {e}")
@@ -62,6 +66,8 @@ async def _(bot_id: str | None = None) -> Result[AllChatAndCallCount]:
         return Result.ok(
             await ApiDataSource.get_all_chat_and_call_count(bot_id), "拿到信息啦!"
         )
+    except TimeoutError:
+        return Result.fail(DB_BUSY_MESSAGE)
     except Exception as e:
         logger.error(
             f"{router.prefix}/get_all_chat_and_call_count 调用错误", "WebUi", e=e
@@ -81,6 +87,8 @@ async def _(bot_id: str | None = None) -> Result[ChatCallMonthCount]:
         return Result.ok(
             await ApiDataSource.get_chat_and_call_month(bot_id), "拿到信息啦!"
         )
+    except TimeoutError:
+        return Result.fail(DB_BUSY_MESSAGE)
     except Exception as e:
         logger.error(f"{router.prefix}/get_chat_and_call_month 调用错误", "WebUi", e=e)
         return Result.fail(f"发生了一点错误捏 {type(e)}: {e}")

zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py

@@ -17,6 +17,7 @@ from zhenxun.utils.manager.priority_manager import PriorityLifecycle
 from zhenxun.utils.platform import PlatformUtils
 
 from ....base_model import BaseResultModel, QueryModel
+from ....utils import webui_db_call
 from ..main.data_source import bot_live
 from .model import (
     AllChatAndCallCount,
@@ -77,14 +78,20 @@ class ApiDataSource:
             logger.warning("获取bot好友/群组信息失败...", "WebUi", e=e)
             bot_info.group_count = 0
             bot_info.friend_count = 0
-        bot_info.day_call = await Statistics.filter(
-            create_time__gte=now - timedelta(hours=now.hour, minutes=now.minute),
-            bot_id=bot.self_id,
-        ).count()
-        bot_info.received_messages = await ChatHistory.filter(
-            bot_id=bot_info.self_id,
-            create_time__gte=now - timedelta(hours=now.hour, minutes=now.minute),
-        ).count()
+        bot_info.day_call = await webui_db_call(
+            Statistics.filter(
+                create_time__gte=now - timedelta(hours=now.hour, minutes=now.minute),
+                bot_id=bot.self_id,
+            ).count(),
+            "Dashboard.bot_day_call",
+        )
+        bot_info.received_messages = await webui_db_call(
+            ChatHistory.filter(
+                bot_id=bot_info.self_id,
+                create_time__gte=now - timedelta(hours=now.hour, minutes=now.minute),
+            ).count(),
+            "Dashboard.bot_received_messages",
+        )
         bot_info.connect_time = bot_live.get(bot.self_id) or 0
         if bot_info.connect_time:
             connect_date = datetime.fromtimestamp(CONNECT_TIME)
@@ -117,17 +124,29 @@ class ApiDataSource:
         query = ChatHistory
         if bot_id:
             query = query.filter(bot_id=bot_id)
-        chat_all_count = await query.annotate().count()
-        chat_day_count = await query.filter(
-            create_time__gte=now - timedelta(hours=now.hour, minutes=now.minute)
-        ).count()
+        chat_all_count = await webui_db_call(
+            query.annotate().count(),
+            "Dashboard.chat_all_count",
+        )
+        chat_day_count = await webui_db_call(
+            query.filter(
+                create_time__gte=now - timedelta(hours=now.hour, minutes=now.minute)
+            ).count(),
+            "Dashboard.chat_day_count",
+        )
         query = Statistics
         if bot_id:
             query = query.filter(bot_id=bot_id)
-        call_all_count = await query.annotate().count()
-        call_day_count = await query.filter(
-            create_time__gte=now - timedelta(hours=now.hour, minutes=now.minute)
-        ).count()
+        call_all_count = await webui_db_call(
+            query.annotate().count(),
+            "Dashboard.call_all_count",
+        )
+        call_day_count = await webui_db_call(
+            query.filter(
+                create_time__gte=now - timedelta(hours=now.hour, minutes=now.minute)
+            ).count(),
+            "Dashboard.call_day_count",
+        )
         return QueryChatCallCount(
             chat_num=chat_all_count,
             chat_day=chat_day_count,
@@ -151,31 +170,51 @@ class ApiDataSource:
         query = ChatHistory
         if bot_id:
             query = query.filter(bot_id=bot_id)
-        chat_week_count = await query.filter(
-            create_time__gte=now - timedelta(days=7, hours=now.hour, minutes=now.minute)
-        ).count()
-        chat_month_count = await query.filter(
-            create_time__gte=now
-            - timedelta(days=30, hours=now.hour, minutes=now.minute)
-        ).count()
-        chat_year_count = await query.filter(
-            create_time__gte=now
-            - timedelta(days=365, hours=now.hour, minutes=now.minute)
-        ).count()
+        chat_week_count = await webui_db_call(
+            query.filter(
+                create_time__gte=now
+                - timedelta(days=7, hours=now.hour, minutes=now.minute)
+            ).count(),
+            "Dashboard.chat_week_count",
+        )
+        chat_month_count = await webui_db_call(
+            query.filter(
+                create_time__gte=now
+                - timedelta(days=30, hours=now.hour, minutes=now.minute)
+            ).count(),
+            "Dashboard.chat_month_count",
+        )
+        chat_year_count = await webui_db_call(
+            query.filter(
+                create_time__gte=now
+                - timedelta(days=365, hours=now.hour, minutes=now.minute)
+            ).count(),
+            "Dashboard.chat_year_count",
+        )
         query = Statistics
         if bot_id:
             query = query.filter(bot_id=bot_id)
-        call_week_count = await query.filter(
-            create_time__gte=now - timedelta(days=7, hours=now.hour, minutes=now.minute)
-        ).count()
-        call_month_count = await query.filter(
-            create_time__gte=now
-            - timedelta(days=30, hours=now.hour, minutes=now.minute)
-        ).count()
-        call_year_count = await query.filter(
-            create_time__gte=now
-            - timedelta(days=365, hours=now.hour, minutes=now.minute)
-        ).count()
+        call_week_count = await webui_db_call(
+            query.filter(
+                create_time__gte=now
+                - timedelta(days=7, hours=now.hour, minutes=now.minute)
+            ).count(),
+            "Dashboard.call_week_count",
+        )
+        call_month_count = await webui_db_call(
+            query.filter(
+                create_time__gte=now
+                - timedelta(days=30, hours=now.hour, minutes=now.minute)
+            ).count(),
+            "Dashboard.call_month_count",
+        )
+        call_year_count = await webui_db_call(
+            query.filter(
+                create_time__gte=now
+                - timedelta(days=365, hours=now.hour, minutes=now.minute)
+            ).count(),
+            "Dashboard.call_year_count",
+        )
         return AllChatAndCallCount(
             chat_week=chat_week_count,
             chat_month=chat_month_count,
@@ -202,17 +241,19 @@ class ApiDataSource:
         if bot_id:
             chat_query = chat_query.filter(bot_id=bot_id)
             call_query = call_query.filter(bot_id=bot_id)
-        chat_date_list = (
-            await chat_query.filter(create_time__gte=filter_date)
+        chat_date_list = await webui_db_call(
+            chat_query.filter(create_time__gte=filter_date)
             .annotate(date=RawSQL("DATE(create_time)"), count=Count("id"))
             .group_by("date")
-            .values("date", "count")
+            .values("date", "count"),
+            "Dashboard.chat_month_series",
         )
-        call_date_list = (
-            await call_query.filter(create_time__gte=filter_date)
+        call_date_list = await webui_db_call(
+            call_query.filter(create_time__gte=filter_date)
             .annotate(date=RawSQL("DATE(create_time)"), count=Count("id"))
             .group_by("date")
-            .values("date", "count")
+            .values("date", "count"),
+            "Dashboard.call_month_series",
         )
         date_list = []
         chat_count_list = []