🐛 fix 通道类回调函数在进程间传递时无法序列号的问题

src/liteyuki_main/core.py

@@ -6,29 +6,25 @@ import nonebot
 import pip
 from nonebot import Bot, get_driver, require
 from nonebot.adapters import onebot, satori
-from nonebot.adapters.onebot.v11 import Message, escape, unescape
+from nonebot.adapters.onebot.v11 import Message, unescape
 from nonebot.exception import MockApiException
 from nonebot.internal.matcher import Matcher
 from nonebot.permission import SUPERUSER
 
-from liteyuki import Channel
+# from src.liteyuki.core import Reloader
+from src.utils import event as event_utils, satori_utils
 from src.utils.base.config import get_config, load_from_yaml
 from src.utils.base.data_manager import StoredConfig, TempConfig, common_db
 from src.utils.base.language import get_user_lang
 from src.utils.base.ly_typing import T_Bot, T_MessageEvent
 from src.utils.message.message import MarkdownMessage as md, broadcast_to_superusers
-# from src.liteyuki.core import Reloader
-from src.utils import event as event_utils, satori_utils
-from liteyuki.core.spawn_process import chan_in_spawn_nb
-
 from .api import update_liteyuki
-from liteyuki.bot import get_bot
 from ..utils.base import reload
 from ..utils.base.ly_function import get_function
 
 require("nonebot_plugin_alconna")
 require("nonebot_plugin_apscheduler")
-from nonebot_plugin_alconna import UniMessage, on_alconna, Alconna, Args, Subcommand, Arparma, MultiVar
+from nonebot_plugin_alconna import on_alconna, Alconna, Args, Subcommand, Arparma, MultiVar
 from nonebot_plugin_apscheduler import scheduler
 
 driver = get_driver()
@@ -81,7 +77,6 @@ async def _(bot: T_Bot, event: T_MessageEvent):
 ).handle()
 # Satori OK
 async def _(matcher: Matcher, bot: T_Bot, event: T_MessageEvent):
-    global channel_in_spawn_process
     await matcher.send("Liteyuki reloading")
     temp_data = common_db.where_one(TempConfig(), default=TempConfig())
 
@@ -91,8 +86,8 @@ async def _(matcher: Matcher, bot: T_Bot, event: T_MessageEvent):
                 "reload_time"        : time.time(),
                 "reload_bot_id"      : bot.self_id,
                 "reload_session_type": event_utils.get_message_type(event),
-                "reload_session_id"  : (event.group_id if event.message_type == "group" else event.user_id) if not isinstance(event,
-                                                                                                                              satori.event.Event) else event.chan.id,
+                "reload_session_id"  : (event.group_id if event.message_type == "group" else event.user_id)
+                    if not isinstance(event, satori.event.Event) else event.chan_active.id,
                 "delta_time"         : 0
         }
     )
@@ -358,7 +353,7 @@ async def _(bot: T_Bot):
         delta_time = temp_data.data.get("delta_time", 0)
         common_db.save(temp_data)  # 更新数据
 
-        if delta_time <= 20.0:   # 启动时间太长就别发了，丢人
+        if delta_time <= 20.0:  # 启动时间太长就别发了，丢人
             if isinstance(bot, satori.Bot):
                 await bot.send_message(
                     channel_id=reload_session_id,

src/liteyuki_main/dev.py

@@ -11,35 +11,12 @@ if get_config("debug", False):
 
     liteyuki_bot = get_bot()
 
-    src_directories = (
-            "src/liteyuki_main",
-            "src/plugins",
-            "src/utils",
-    )
-    src_excludes_extensions = (
-            "pyc",
-    )
-
     res_directories = (
             "src/resources",
             "resources",
+
     )
 
-    nonebot.logger.info("Liteyuki Reload enabled, watching for file changes...")
-
-
-    class CodeModifiedHandler(FileSystemEventHandler):
-        """
-        Handler for code file changes
-        """
-
-        def on_modified(self, event):
-            if event.src_path.endswith(
-                    src_excludes_extensions) or event.is_directory or "__pycache__" in event.src_path:
-                return
-            nonebot.logger.info(f"{event.src_path} modified, reloading bot...")
-            reload()
-
 
     class ResourceModifiedHandler(FileSystemEventHandler):
         """
@@ -51,12 +28,9 @@ if get_config("debug", False):
             load_resources()
 
 
-    code_modified_handler = CodeModifiedHandler()
     resource_modified_handle = ResourceModifiedHandler()
 
     observer = Observer()
-    for directory in src_directories:
-        observer.schedule(code_modified_handler, directory, recursive=True)
     for directory in res_directories:
         observer.schedule(resource_modified_handle, directory, recursive=True)
     observer.start()

src/liteyuki_main/loader.py

@@ -21,7 +21,7 @@ liteyuki_bot = get_bot()
 
 @driver.on_startup
 async def load_plugins():
-    nonebot.plugin.load_plugins("src/plugins")
+    nonebot.plugin.load_plugins("src/nonebot_plugins")
     # 从数据库读取已安装的插件
     if not get_config("safe_mode", False):
         # 安全模式下，不加载插件