From 31443d0fe7d16a82e88dc9912ee52747361af818 Mon Sep 17 00:00:00 2001
From: wangjia <809946525@qq.com>
Date: Fri, 19 Jun 2026 09:21:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(client):=20=E9=80=80=E5=87=BA=20Pangolin=20?=
 =?UTF-8?q?=E6=97=B6=E6=8B=86=E9=9A=A7=E9=81=93(=E5=81=9C=E5=86=85?=
 =?UTF-8?q?=E6=A0=B8),=E4=B8=8D=E5=86=8D=E6=AE=8B=E7=95=99=20sing-box/TUN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

此前真退出(托盘退出 / Cmd+Q)走 windowManager.destroy(),从不先停内核,
而 sing-box 是 sudo root 子进程不随父进程退出 → 孤儿 + TUN 残留,得手动 pkill。

- system_tray:托盘「退出」前 await onBeforeQuit()(停内核)再 destroy。
- main:PangolinApp→ConsumerStatefulWidget,AppLifecycleListener.onExitRequested
  在 Cmd+Q 时先停内核再退;_teardownVpn 调 vpnBridge.stop()(SIGTERM→sing-box,
  拆 TUN),带 3s 超时兜底。
- 关窗口→隐藏托盘的路径不拆(保持连接,符合常驻语义)。

flutter analyze 0 error;116 tests passed。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 client/lib/main.dart        | 41 +++++++++++++++++++++++++++++++++++--
 client/lib/system_tray.dart | 11 +++++++---
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/client/lib/main.dart b/client/lib/main.dart
index 4ced3fa..4522380 100644
--- a/client/lib/main.dart
+++ b/client/lib/main.dart
@@ -1,8 +1,11 @@
 // main.dart — 入口(演示态)
 // 串接:登录 → 引导 → 主框架(4 Tab);状态层统一走 Riverpod。
+import 'dart:ui' as ui;
+
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
+import 'bridge/vpn_bridge_provider.dart';
 import 'pangolin_theme.dart';
 import 'services/token_store.dart';
 import 'shell/home_shell.dart';
@@ -22,11 +25,45 @@ Future<void> main() async {
   runApp(const ProviderScope(child: PangolinApp()));
 }
 
-class PangolinApp extends ConsumerWidget {
+class PangolinApp extends ConsumerStatefulWidget {
   const PangolinApp({super.key});
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  ConsumerState<PangolinApp> createState() => _PangolinAppState();
+}
+
+class _PangolinAppState extends ConsumerState<PangolinApp> {
+  AppLifecycleListener? _lifecycle;
+
+  @override
+  void initState() {
+    super.initState();
+    if (isDesktop) {
+      // 真退出(Cmd+Q / 托盘退出)前先停内核拆隧道,避免 sing-box 孤儿 + TUN 残留。
+      _lifecycle = AppLifecycleListener(onExitRequested: () async {
+        await _teardownVpn();
+        return ui.AppExitResponse.exit;
+      });
+      TrayService.instance.onBeforeQuit = _teardownVpn;
+    }
+  }
+
+  Future<void> _teardownVpn() async {
+    try {
+      await ref.read(vpnBridgeProvider).stop().timeout(const Duration(seconds: 3));
+    } catch (_) {
+      // 内核未启动/已退出:忽略。
+    }
+  }
+
+  @override
+  void dispose() {
+    _lifecycle?.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
     final mode = ref.watch(themeModeProvider);
     return MaterialApp(
       title: '穿山甲',
diff --git a/client/lib/system_tray.dart b/client/lib/system_tray.dart
index 478f2cb..01c72fa 100644
--- a/client/lib/system_tray.dart
+++ b/client/lib/system_tray.dart
@@ -15,6 +15,9 @@ class TrayService with TrayListener, WindowListener {
   TrayService._();
   static final TrayService instance = TrayService._();
 
+  /// 真正退出前的清理钩子(由 app 注册,用于先停内核拆隧道再退出)。
+  Future<void> Function()? onBeforeQuit;
+
   /// 在 runApp 前调用(仅桌面端)。设置窗口拦截关闭 + 托盘图标与菜单。
   Future<void> init() async {
     await windowManager.ensureInitialized();
@@ -45,13 +48,15 @@ class TrayService with TrayListener, WindowListener {
   void onTrayIconRightMouseDown() => trayManager.popUpContextMenu();
 
   @override
-  void onTrayMenuItemClick(MenuItem menuItem) {
+  void onTrayMenuItemClick(MenuItem menuItem) async {
     switch (menuItem.key) {
       case 'show':
         _show();
       case 'quit':
-        windowManager.setPreventClose(false);
-        windowManager.destroy();
+        // 退出前先停内核拆隧道(避免 sudo sing-box 孤儿 + TUN 残留)。
+        await onBeforeQuit?.call();
+        await windowManager.setPreventClose(false);
+        await windowManager.destroy();
     }
   }