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

liteyuki/core/manager.py

@@ -13,7 +13,7 @@ import threading
 from multiprocessing import Process
 from typing import TYPE_CHECKING
 
-from liteyuki.comm import Channel
+from liteyuki.comm import Channel, get_channel, set_channels
 from liteyuki.log import logger
 
 if TYPE_CHECKING:
@@ -31,12 +31,18 @@ class ProcessManager:
     在主进程中被调用
     """
 
-    def __init__(self, bot: "LiteyukiBot", chan: Channel):
+    def __init__(self, bot: "LiteyukiBot"):
         self.bot = bot
-        self.chan = chan
         self.targets: dict[str, tuple[callable, tuple, dict]] = {}
         self.processes: dict[str, Process] = {}
 
+        set_channels({
+                "nonebot-active" : Channel(_id="nonebot-active"),
+                "melobot-active" : Channel(_id="melobot-active"),
+                "nonebot-passive": Channel(_id="nonebot-passive"),
+                "melobot-passive": Channel(_id="melobot-passive"),
+        })
+
     def start(self, name: str, delay: int = 0):
         """
         开启后自动监控进程，并添加到进程字典中
@@ -47,19 +53,21 @@ class ProcessManager:
         Returns:
 
         """
-
         if name not in self.targets:
             raise KeyError(f"Process {name} not found.")
 
         def _start():
             should_exit = False
             while not should_exit:
-                process = Process(target=self.targets[name][0], args=(self.chan, *self.targets[name][1]), kwargs=self.targets[name][2])
+                chan_active = get_channel(f"{name}-active")
+                chan_passive = get_channel(f"{name}-passive")
+                process = Process(target=self.targets[name][0], args=(chan_active, chan_passive, *self.targets[name][1]),
+                                  kwargs=self.targets[name][2])
                 self.processes[name] = process
                 process.start()
                 while not should_exit:
                     # 0退出 1重启
-                    data = self.chan.receive(name)
+                    data = chan_active.receive()
                     if data == 1:
                         logger.info(f"Restarting process {name}")
                         asyncio.run(self.bot.lifespan.before_shutdown())
@@ -103,3 +111,7 @@ class ProcessManager:
         process.join(TIMEOUT)
         if process.is_alive():
             process.kill()
+
+    def terminate_all(self):
+        for name in self.targets:
+            self.terminate(name)

liteyuki/core/spawn_process.py

@@ -3,6 +3,7 @@ from typing import Optional, TYPE_CHECKING
 import nonebot
 
 from liteyuki.core.nb import adapter_manager, driver_manager
+from liteyuki.comm.channel import set_channel
 
 if TYPE_CHECKING:
     from liteyuki.comm.channel import Channel
@@ -10,23 +11,23 @@ if TYPE_CHECKING:
 timeout_limit: int = 20
 
 """导出对象，用于主进程与nonebot通信"""
-chan_in_spawn_nb: Optional["Channel"] = None
+_channels = {}
 
 
-def nb_run(chan, *args, **kwargs):
+def nb_run(chan_active: "Channel", chan_passive: "Channel", *args, **kwargs):
     """
     初始化NoneBot并运行在子进程
     Args:
 
-        chan:
-        *args:
+        chan_active:
+        chan_passive:
         **kwargs:
 
     Returns:
 
     """
-    global chan_in_spawn_nb
-    chan_in_spawn_nb = chan
+    set_channel("nonebot-active", chan_active)
+    set_channel("nonebot-passive", chan_passive)
     nonebot.init(**kwargs)
     driver_manager.init(config=kwargs)
     adapter_manager.init(kwargs)
@@ -35,17 +36,21 @@ def nb_run(chan, *args, **kwargs):
     nonebot.run()
 
 
-def mb_run(chan, *args, **kwargs):
+def mb_run(chan_active: "Channel", chan_passive: "Channel", *args, **kwargs):
     """
     初始化MeloBot并运行在子进程
     Args:
-        chan
+        chan_active
+        chan_passive
         *args:
         **kwargs:
 
     Returns:
 
     """
+    set_channel("melobot-active", chan_active)
+    set_channel("melobot-passive", chan_passive)
+
     # bot = MeloBot(__name__)
     # bot.init(AbstractConnector(cd_time=0))
     # bot.run()