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

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

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

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

@@ -1,3 +1,4 @@
+import asyncio
 import json
 from pathlib import Path
 
@@ -18,9 +19,16 @@ dynamic_offset = {}
 class DB:
     """数据库交互类，与增删改查无关的部分不应该在这里面实现"""
 
+    _ready = False
+
+    @classmethod
+    def get_dynamic_offset_path(cls) -> Path:
+        return Path(get_path("dynamic_offset.json"))
+
     @classmethod
     async def init(cls):
         """初始化数据库"""
+        cls._ready = False
         config = {
             "connections": {
                 # "bililive": {
@@ -42,11 +50,68 @@ class DB:
         await Tortoise.generate_schemas()
         await cls.migrate()
         await cls.update_uid_list()
+        await cls.load_dynamic_offsets()
+        await cls.save_dynamic_offsets()
+        cls._ready = True
 
     @classmethod
     async def close(cls):
+        cls._ready = False
+        await cls.save_dynamic_offsets()
         await connections.close_all()
 
+    @classmethod
+    async def wait_until_ready(cls, timeout: float = 30) -> bool:
+        if cls._ready:
+            return True
+
+        waited = 0.0
+        interval = 0.1
+        while waited < timeout:
+            if cls._ready:
+                return True
+            await asyncio.sleep(interval)
+            waited += interval
+
+        return cls._ready
+
+    @classmethod
+    async def load_dynamic_offsets(cls):
+        path = cls.get_dynamic_offset_path()
+        if not path.exists():
+            return
+        try:
+            raw_offsets = json.loads(path.read_text(encoding="utf-8"))
+        except Exception:
+            logger.warning("动态偏移量缓存读取失败，将使用当前内存状态继续运行")
+            return
+
+        for uid_str, value in raw_offsets.items():
+            try:
+                uid = int(uid_str)
+                dynamic_id = int(value)
+            except (TypeError, ValueError):
+                continue
+            if uid in dynamic_offset:
+                dynamic_offset[uid] = dynamic_id
+
+    @classmethod
+    async def save_dynamic_offsets(cls):
+        path = cls.get_dynamic_offset_path()
+        path.parent.mkdir(parents=True, exist_ok=True)
+        serialized_offsets = {
+            str(uid): dynamic_offset[uid] for uid in sorted(dynamic_offset)
+        }
+        path.write_text(
+            json.dumps(serialized_offsets, ensure_ascii=False, sort_keys=True),
+            encoding="utf-8",
+        )
+
+    @classmethod
+    async def set_dynamic_offset(cls, uid: int, value: int):
+        dynamic_offset[int(uid)] = int(value)
+        await cls.save_dynamic_offsets()
+
     @classmethod
     async def get_user(cls, **kwargs):
         """获取 UP 主信息"""
@@ -256,12 +321,17 @@ class DB:
         )
 
         # 清除没有订阅的 offset
+        changed = False
         dynamic_offset_keys = set(dynamic_offset)
         dynamic_uids = set(uid_list["dynamic"]["list"])
         for uid in dynamic_offset_keys - dynamic_uids:
             del dynamic_offset[uid]
+            changed = True
         for uid in dynamic_uids - dynamic_offset_keys:
             dynamic_offset[uid] = -1
+            changed = True
+        if changed:
+            await cls.save_dynamic_offsets()
 
     async def backup(self):
         """备份数据库"""

{nonebot_plugin_bililive-2.0.3 → nonebot_plugin_bililive-2.0.5}/bililive/plugins/pusher/dynamic_pusher.py

@@ -145,6 +145,11 @@ async def get_user_dynamics_with_web_fallback(uid: int) -> tuple[list, bool]:
 
 async def dy_sched():
     """动态推送"""
+    if not await db.wait_until_ready():
+        logger.debug("数据库尚未初始化完成，跳过本轮动态推送")
+        await throttle_dynamic_loop()
+        return
+
     uid = await db.next_uid("dynamic")
     if not uid:
         # 没有订阅先暂停一秒再跳过，不然会导致 CPU 占用过高
@@ -197,20 +202,17 @@ async def dy_sched():
 
     if not dynamics:  # 没发过动态
         if uid in offset and offset[uid] == -1:  # 不记录会导致第一次发动态不推送
-            offset[uid] = 0
+            await db.set_dynamic_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),
-            )
+        await db.set_dynamic_offset(
+            uid,
+            max(get_dynamic_id(item, use_web_fallback) for item in dynamics),
+        )
         return
 
     dynamic = None
@@ -229,7 +231,7 @@ async def dy_sched():
                 return
             elif should_skip_dynamic(dynamic_type, use_web_fallback):
                 logger.debug(f"无需推送的动态 {dynamic_type}，已跳过：{url}")
-                offset[uid] = dynamic_id
+                await db.set_dynamic_offset(uid, dynamic_id)
                 return
             message = (
                 f"{name} {get_dynamic_type_message(dynamic_type, use_web_fallback)}：\n"
@@ -248,7 +250,7 @@ async def dy_sched():
                     at=bool(sets.at) and plugin_config.bililive_dynamic_at,
                 )
 
-            offset[uid] = dynamic_id
+            await db.set_dynamic_offset(uid, dynamic_id)
 
     if dynamic:
         await db.update_user(uid, name)

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

@@ -23,6 +23,10 @@ live_time = {}
 async def live_sched():
     # sourcery skip: use-fstring-for-concatenation
     """直播推送"""
+    if not await db.wait_until_ready():
+        logger.debug("数据库尚未初始化完成，跳过本轮直播推送")
+        return
+
     uids = await db.get_uid_list("live")
 
     if not uids:  # 订阅为空

{nonebot_plugin_bililive-2.0.3 → nonebot_plugin_bililive-2.0.5}/bililive/utils/mobile.js

@@ -183,13 +183,13 @@ function setFont(font = "", fontSource = "local") {
     // 将字体样式设置到 div#app 上
     const appDom = document.querySelector("#app");
     const emojiFont = emojiFontList.join(",");
+    const fallbackFonts = needLoadFontList.map(fontObject => fontObject.fontFamily).join(",");
     if (appDom) {
         // 动态加字体, 并给与默认值 sans-serif
         if (fontSource === "system") {
-            appDom.style.fontFamily = font + "," + emojiFont + ",sans-serif";
+            appDom.style.fontFamily = [font, fallbackFonts, emojiFont, "sans-serif"].filter(Boolean).join(",");
         } else {
-            const needLoadFont = needLoadFontList.reduce((defaultString, fontObject) => defaultString + fontObject.fontFamily + ",", "");
-            appDom.style.fontFamily = needLoadFont + emojiFont + ",sans-serif";
+            appDom.style.fontFamily = [fallbackFonts, emojiFont, "sans-serif"].filter(Boolean).join(",");
         };
         appDom.style.overflowWrap = "break-word";
     }

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

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

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

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

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

@@ -1,6 +1,8 @@
 import sys
+import tempfile
 import unittest
 from importlib import import_module
+from pathlib import Path
 from types import ModuleType, SimpleNamespace
 from unittest.mock import AsyncMock, patch
 
@@ -145,10 +147,35 @@ class DBPermissionTests(unittest.IsolatedAsyncioTestCase):
             await DB.init()
 
         self.assertTrue(init_db.await_args.kwargs["_enable_global_fallback"])
+        self.assertTrue(DB._ready)
         generate_schemas.assert_awaited_once()
         migrate.assert_awaited_once()
         update_uid_list.assert_awaited_once()
 
+    async def test_wait_until_ready_returns_false_before_init(self):
+        DB._ready = False
+
+        ready = await DB.wait_until_ready(timeout=0)
+
+        self.assertFalse(ready)
+
+    async def test_dynamic_offsets_are_persisted_and_restored(self):
+        with tempfile.TemporaryDirectory() as tmpdir:
+            offset_path = Path(tmpdir) / "dynamic_offset.json"
+            db_module.dynamic_offset.clear()
+            db_module.dynamic_offset[123] = 456
+
+            with patch.object(db_module, "get_path", return_value=str(offset_path)):
+                await DB.save_dynamic_offsets()
+
+                db_module.dynamic_offset.clear()
+                db_module.dynamic_offset[123] = -1
+                db_module.dynamic_offset[789] = -1
+                await DB.load_dynamic_offsets()
+
+            self.assertEqual(db_module.dynamic_offset[123], 456)
+            self.assertEqual(db_module.dynamic_offset[789], -1)
+
     async def test_set_permission_creates_group_when_missing(self):
         with (
             patch.object(DB, "get_group", new=AsyncMock(return_value=None)),