fix: 修复ctrl+c无法关闭程序的问题

Author: ChangingSelf

main.py

@@ -2,6 +2,8 @@
 from src.sensor.danmaku_mock_sensor import danmaku_mock_sensor
 from src.utils.logger import get_logger
 import sys
+import signal
+import os
 from src.neuro.core import core
 
 logger = get_logger("main")
@@ -17,29 +19,66 @@ async def boot():
 
 async def halt():
     try:
-        logger.info("正在关闭Adapter...")
+        logger.info("正在关闭系统...")
+
+        # 先关闭传感器
+        await danmaku_mock_sensor.disconnect()
+        logger.info("弹幕传感器已关闭")
+
+        # 关闭核心
         await core.disconnect()
-        tasks = [t for t in asyncio.all_tasks() if t is not asyncio.current_task()]
-        for task in tasks:
-            if not task.done():
-                task.cancel()
-        await asyncio.gather(*tasks, return_exceptions=True)
+        logger.info("核心已关闭")
+
+        # 取消所有剩余任务
+        pending_tasks = [task for task in asyncio.all_tasks() if task is not asyncio.current_task()]
+
+        logger.info(f"正在取消 {len(pending_tasks)} 个剩余任务")
+
+        # 打印所有未完成任务的名称，帮助调试
+        for i, task in enumerate(pending_tasks):
+            logger.info(f"待取消任务 {i + 1}: {task.get_name()} - {task}")
+
+        # 给每个任务发送取消信号
+        for task in pending_tasks:
+            task.cancel()
+
+        # 设置超时等待所有任务完成
+        try:
+            await asyncio.wait_for(asyncio.gather(*pending_tasks, return_exceptions=True), timeout=2.0)
+        except asyncio.TimeoutError:
+            logger.warning("部分任务取消超时，强制退出")
+            # 打印超时后仍未完成的任务
+            still_pending = [t for t in pending_tasks if not t.done()]
+            for i, task in enumerate(still_pending):
+                logger.warning(f"超时未取消任务 {i + 1}: {task.get_name()} - {task}")
+
+        logger.info("所有任务已关闭")
 
     except Exception as e:
-        logger.error(f"Adapter关闭失败: {e}")
+        logger.error(f"关闭系统失败: {e}")
+        import traceback
+
+        logger.error(traceback.format_exc())
 
 
 if __name__ == "__main__":
+    # 设置信号处理
     loop = asyncio.new_event_loop()
     asyncio.set_event_loop(loop)
+
     try:
         loop.run_until_complete(boot())
+        loop.run_forever()
     except KeyboardInterrupt:
         logger.warning("收到中断信号，正在关闭...")
         loop.run_until_complete(halt())
+        loop.close()
+        logger.info("程序已完全退出，强制结束所有进程")
+        # 强制结束程序
+        os._exit(0)  # 使用os._exit强制退出，不会等待其他线程
     except Exception as e:
         logger.error(f"主程序异常: {str(e)}")
         if loop and not loop.is_closed():
             loop.run_until_complete(halt())
             loop.close()
-        sys.exit(1)
+        os._exit(1)

src/actuator/subtitle_actuator.py

@@ -52,17 +52,30 @@ async def disconnect(self):
         断开连接
         """
         logger.info("字幕执行器正在断开连接...")
-        self.running = False
-
-        # 取消订阅
+        # 先取消订阅，这样不会再有新消息
         await self.synapse.unsubscribe_output(self._handle_output)
+        logger.info("字幕执行器已取消订阅输出")
 
-        # 关闭字幕
-        if self.subtitle:
-            self.subtitle.close()
-            self.subtitle = None
+        # 停止处理消息的循环
+        self.running = False
 
-        logger.info("字幕执行器已断开连接")
+        # 关闭字幕
+        try:
+            if self.subtitle and hasattr(self.subtitle, "close"):
+                self.subtitle.close()
+                self.subtitle = None
+                logger.info("字幕窗口已关闭")
+        except Exception as e:
+            logger.error(f"关闭字幕窗口时出错: {e}")
+
+        # 最多等待1秒让线程自行结束
+        if self.subtitle_thread and self.subtitle_thread.is_alive():
+            logger.info("等待字幕线程结束...")
+            self.subtitle_thread.join(timeout=1.0)
+            if self.subtitle_thread.is_alive():
+                logger.warning("字幕线程未能正常结束，但将继续关闭流程")
+
+        logger.info("字幕执行器已完全断开连接")
 
     async def _handle_output(self, neurotransmitter: Neurotransmitter):
         """
@@ -84,32 +97,52 @@ def _run_subtitle(self):
         """
         运行字幕窗口
         """
-        # 创建字幕
-        self.subtitle = MultiMessageSubtitle(
-            text="等待消息...",
-            theme="dark",
-            font_family="Microsoft YaHei",
-            font_size=24,
-            text_color="#FFFFFF",
-            bg_color="#333333",
-            opacity=0.7,
-            animation_speed=10,
-            border_radius=10,
-            padding=15,
-            show_history=self.show_history,
-        )
-
-        # 设置初始位置（屏幕底部）
-        screen_width = self.subtitle.root.winfo_screenwidth()
-        screen_height = self.subtitle.root.winfo_screenheight()
-        subtitle_width = 600
-        subtitle_height = 200
-        x_pos = (screen_width - subtitle_width) // 2
-        y_pos = screen_height - subtitle_height - 50
-        self.subtitle.root.geometry(f"{subtitle_width}x{subtitle_height}+{x_pos}+{y_pos}")
-
-        # 运行字幕
-        self.subtitle.run()
+        try:
+            # 创建字幕
+            self.subtitle = MultiMessageSubtitle(
+                text="等待消息...",
+                theme="dark",
+                font_family="Microsoft YaHei",
+                font_size=24,
+                text_color="#FFFFFF",
+                bg_color="#333333",
+                opacity=0.7,
+                animation_speed=10,
+                border_radius=10,
+                padding=15,
+                show_history=self.show_history,
+            )
+
+            # 设置初始位置（屏幕底部）
+            screen_width = self.subtitle.root.winfo_screenwidth()
+            screen_height = self.subtitle.root.winfo_screenheight()
+            subtitle_width = 600
+            subtitle_height = 200
+            x_pos = (screen_width - subtitle_width) // 2
+            y_pos = screen_height - subtitle_height - 50
+            self.subtitle.root.geometry(f"{subtitle_width}x{subtitle_height}+{x_pos}+{y_pos}")
+
+            # 添加周期性检查，当running变为False时退出循环
+            def check_running():
+                if not self.running and self.subtitle and self.subtitle.root:
+                    try:
+                        self.subtitle.root.quit()
+                        return  # 不再继续调度
+                    except Exception as e:
+                        logger.error(f"退出字幕循环时出错: {e}")
+
+                # 如果仍在运行，继续检查
+                if self.subtitle and self.subtitle.root:
+                    self.subtitle.root.after(100, check_running)
+
+            # 开始检查循环
+            self.subtitle.root.after(100, check_running)
+
+            # 运行字幕
+            self.subtitle.run()
+
+        except Exception as e:
+            logger.error(f"字幕线程出错: {e}", exc_info=True)
 
     async def _process_messages(self):
         """

src/neuro/synapse.py

@@ -66,9 +66,17 @@ async def unsubscribe_output(self, handler: Callable):
         """
         取消订阅输出神经递质
         """
-        if handler in self.output_handlers:
-            self.output_handlers.remove(handler)
-            logger.debug(f"已移除输出处理器: {handler.__name__}")
+        try:
+            if handler in self.output_handlers:
+                self.output_handlers.remove(handler)
+                logger.debug(f"已移除输出处理器: {handler.__name__}")
+            else:
+                logger.debug(
+                    f"尝试移除不存在的输出处理器: {handler.__name__ if hasattr(handler, '__name__') else handler}"
+                )
+        except Exception as e:
+            logger.error(f"移除输出处理器时出错: {e}")
+            # 即使出错也继续执行，不阻塞关闭流程
 
 
 # 创建全局突触实例

src/sensor/danmaku_mock_sensor.py

@@ -48,5 +48,10 @@ async def connect(self):
             )
             await asyncio.sleep(10)
 
+    async def disconnect(self):
+        """停止模拟消息生成"""
+        logger.info("正在关闭弹幕模拟传感器...")
+        self.running = False
+
 
 danmaku_mock_sensor = DanmakuMockSensor(synapse)

src/utils/subtitle.py

@@ -239,10 +239,27 @@ def run(self):
 
     def close(self):
         """关闭窗口"""
+        # 停止动画线程
         self.animation_running = False
-        if self.animation_thread:
-            self.animation_thread.join()
-        self.root.destroy()
+        if self.animation_thread and self.animation_thread.is_alive():
+            try:
+                self.animation_thread.join(timeout=0.5)
+            except Exception as e:
+                print(f"关闭动画线程时出错: {e}")
+
+        # 安全地销毁窗口
+        try:
+            # 使用after方法在主线程中执行destroy
+            if self.root and self.root.winfo_exists():
+                self.root.after(0, self.root.quit)
+                self.root.after(100, self.root.destroy)
+        except Exception as e:
+            print(f"关闭窗口时出错: {e}")
+            # 即使出错也要尝试强制销毁
+            try:
+                self.root.destroy()
+            except:
+                pass
 
 
 class MultiMessageSubtitle(Subtitle):