✨ 监控QPS (#180)

Author: KimigaiiWuyi

gsuid_core/bot.py

@@ -16,7 +16,7 @@
     markdown_to_template_markdown,
 )
 from gsuid_core.gs_logger import GsLogger
-from gsuid_core.global_val import get_global_val
+from gsuid_core.global_val import bot_traffic, get_global_val
 from gsuid_core.load_template import (
     parse_button,
     custom_buttons,
@@ -55,7 +55,7 @@ def __init__(self, _id: str, ws: Optional[WebSocket] = None):
         self.queue = asyncio.queues.Queue()
         self.send_dict = {}
         self.bg_tasks = set()
-        self.sem = asyncio.Semaphore(4)
+        self.sem = asyncio.Semaphore(10)
 
     async def target_send(
         self,
@@ -182,12 +182,16 @@ async def _safe_run(self, coro: Coroutine):
         async with self.sem:
             try:
                 await coro
+
+                bot_traffic["max_qps"] = max(bot_traffic["max_qps"], bot_traffic["req"])
+                bot_traffic["req"] -= 1
             except Exception:
                 logger.exception("[核心执行异常] 插件执行发生未捕获异常")
 
     async def _process(self):
         while True:
             coro = await self.queue.get()
+            bot_traffic["req"] += 1
             asyncio.create_task(self._safe_run(coro))
             self.queue.task_done()
 

gsuid_core/buildin_plugins/core_command/core_status/__init__.py

@@ -6,10 +6,13 @@
 from gsuid_core.bot import Bot
 from gsuid_core.logger import logger
 from gsuid_core.models import Event
-from gsuid_core.global_val import save_all_global_val
+from gsuid_core.global_val import bot_traffic, save_bot_max_qps, save_all_global_val
 from gsuid_core.status.draw_status import draw_status
+from gsuid_core.status.plugin_status import register_status
 from gsuid_core.utils.database.models import CoreUser, CoreGroup
 
+from ..utils import get_ICON
+
 sv_core_status = SV("Core状态", pm=0)
 
 template = """收:{}
@@ -38,9 +41,16 @@ async def count_group_user():
 async def _u_clear_and_save_global_val_all():
     """每天凌晨0点执行，清空全局状态"""
 
+    global bot_traffic
+
     await save_all_global_val(1)
     gv.bot_val = {}
+
+    await save_bot_max_qps()
+    bot_traffic = {"req": 0, "max_qps": 0}
+
     logger.success("[早柚核心] 状态已清空!")
+
     await count_group_user()
     logger.success("[早柚核心] 状态已保存!")
 
@@ -51,6 +61,7 @@ async def _scheduled_save_global_val_all():
     """每隔10分钟执行一次，同步全局状态"""
 
     await save_all_global_val(0)
+    await save_bot_max_qps()
     logger.success("[早柚核心] 状态已同步!")
 
 
@@ -96,3 +107,21 @@ async def send_core_status_msg(bot: Bot, ev: Event):
         )
     else:
         await bot.send("暂未存在当天的记录...")
+
+
+async def get_now_req():
+    return bot_traffic["req"]
+
+
+async def get_max_qps():
+    return bot_traffic["max_qps"]
+
+
+register_status(
+    get_ICON(),
+    "Status",
+    {
+        "当前请求量": get_now_req,
+        "最大QPS": get_max_qps,
+    },
+)

gsuid_core/buildin_plugins/core_command/utils.py

@@ -0,0 +1,9 @@
+from pathlib import Path
+
+from PIL import Image
+
+ICON = Path(__file__).parent.parent.parent.parent / "ICON.png"
+
+
+def get_ICON() -> Image.Image:
+    return Image.open(ICON)

gsuid_core/global_val.py

@@ -11,6 +11,7 @@
 from gsuid_core.data_store import get_res_path
 from gsuid_core.utils.database.global_val_models import (
     DataType,
+    CoreTraffic,
     CoreDataSummary,
     CoreDataAnalysis,
 )
@@ -45,6 +46,27 @@ class PlatformVal(TypedDict):
 }
 
 bot_val: BotVal = {}
+bot_traffic: Dict[str, int] = {
+    "req": 0,
+    "max_qps": 0,
+}
+
+
+async def save_bot_max_qps():
+    logger.info(f"🔒️ 开始保存流量统计! {bot_traffic}")
+    today = datetime.date.today()
+
+    await CoreTraffic.batch_insert_data_with_update(
+        [
+            CoreTraffic(
+                max_qps=bot_traffic["max_qps"],
+                date=today,
+            )
+        ],
+        ["max_qps"],
+        ["date"],
+    )
+    logger.success("🔒️ 流量统计保存完成!")
 
 
 def merge_dict(dict1: PlatformVal, dict2: PlatformVal) -> PlatformVal:

gsuid_core/utils/database/global_val_models.py

@@ -14,6 +14,19 @@ class DataType(enum.Enum):
     USER = "user"
 
 
+class CoreTraffic(BaseIDModel, table=True):
+    __table_args__ = (
+        UniqueConstraint(
+            "date",
+            name="record_traffic",
+        ),
+        {"extend_existing": True},
+    )
+
+    max_qps: int = Field(title="最大QPS", default=0)
+    date: ymddate = Field(title="日期")
+
+
 class CoreDataSummary(BaseIDModel, table=True):
     __table_args__ = (
         UniqueConstraint(

gsuid_core/webconsole/__init__.py

@@ -34,7 +34,7 @@ async def start_check():
 
     if HOST == "localhost" or HOST == "127.0.0.1":
         _host = "localhost"
-        logger.warning("💻 WebConsole挂载于本地, 如想外网访问请修改config.json中host为0.0.0.0!")
+        logger.warning("💻 WebConsole挂载于本地, 如想外网访问请修改data/config.json中host为0.0.0.0!")
     else:
         _host = HOST