feat: 添加打包构建和远程调试支持

ljzloser · ljzloser · commit 3820caf14162 · 2026-04-05T15:53:22.000+08:00
diff --git a/build.bat b/build.bat
@@ -0,0 +1,36 @@
+@echo off
+chcp 65001 >nul 2>&1
+
+set OUT=dist\app
+set DEST=%OUT%\metaminsweeper
+
+echo [Clean] Removing old builds...
+if exist "%OUT%\metaminsweeper" rmdir /s /q "%OUT%\metaminsweeper"
+if exist "%OUT%\plugin_manager" rmdir /s /q "%OUT%\plugin_manager"
+
+echo.
+echo [1/3] metaminsweeper.exe
+pyinstaller --noconfirm --name metaminsweeper --windowed --distpath %OUT% src\main.py
+
+echo.
+echo [2/3] plugin_manager.exe
+pyinstaller --noconfirm --name plugin_manager --windowed --hidden-import code --hidden-import xmlrpc --hidden-import xmlrpc.server --hidden-import xmlrpc.client --hidden-import http.server --hidden-import socketserver --hidden-import email --hidden-import email.utils --distpath %OUT% src\plugin_manager\_run.py
+
+echo.
+echo [3/3] Copy resources to metaminsweeper\
+copy /y "%OUT%\plugin_manager\plugin_manager.exe" "%DEST%\"
+xcopy /e /y /i "%OUT%\plugin_manager\_internal" "%DEST%\_internal" >nul
+xcopy /e /y /i "src\plugin_manager" "%DEST%\plugin_manager" >nul
+xcopy /e /y /i "src\plugins" "%DEST%\plugins" >nul
+xcopy /e /y /i "src\shared_types" "%DEST%\shared_types" >nul
+if exist "%DEST%\plugin_manager\_run.py" del /f /q "%DEST%\plugin_manager\_run.py"
+
+echo [4/4] Copy debugpy from venv to _internal\
+set SP=.venv\Lib\site-packages
+xcopy /e /y /i "%SP%\debugpy" "%DEST%\_internal\debugpy" >nul
+xcopy /e /y /i "%SP%\msgspec" "%DEST%\_internal\msgspec" >nul 2>nul
+xcopy /e /y /i "%SP%\setuptools" "%DEST%\_internal\setuptools" >nul 2>nul
+
+echo.
+echo Done! Both in: %OUT%\
+pause
diff --git a/hook-debugpy-pyinstaller.py b/hook-debugpy-pyinstaller.py
@@ -0,0 +1,26 @@
+"""
+PyInstaller runtime hook for debugpy compatibility.
+在 import debugpy 之前修复路径问题，确保 _vendored 目录可被找到。
+"""
+import os
+import sys
+
+# PyInstaller 打包后 __file__ 指向临时目录或 zip 内，
+# debugpy/_vendored/__init__.py 用 os.path.abspath(__file__) 定位资源会失败。
+# 此 hook 在任何代码执行前将 debugpy 的真实解压路径注入 sys._MEIPASS 搜索逻辑。
+
+def _fix_debugpy_paths():
+    # PyInstaller 运行时，已解压的文件在 sys._MEIPASS 下
+    meipass = getattr(sys, "_MEIPASS", None)
+    if not meipass:
+        return  # 非打包环境，不需要处理
+
+    debugpy_dir = os.path.join(meipass, "debugpy")
+    vendored_dir = os.path.join(debugpy_dir, "_vendored")
+
+    if os.path.isdir(debugpy_dir):
+        # 确保 debugpy 在 sys.path 中靠前（PyInstaller 已处理，但保险起见）
+        if debugpy_dir not in sys.path:
+            sys.path.insert(0, debugpy_dir)
+
+_fix_debugpy_paths()
diff --git a/src/main.py b/src/main.py
@@ -156,11 +156,41 @@ def cli_check_file(file_path: str) -> int:
 
         # ── 启动 ZMQ Server + 插件管理器 ──
         game_server = GameServerBridge(ui)
-        plugin_process = subprocess.Popen(
-            [sys.executable, "-m", "plugin_manager", "--mode", "tray"],
-            cwd=os.path.dirname(os.path.abspath(__file__)),
-            env=get_env_for_subprocess(),
-        )
+
+        # 打包后直接调用 plugin_manager.exe，开发模式用 python -m
+        if getattr(sys, 'frozen', False):
+            base_dir = os.path.dirname(sys.executable)
+            plugin_exe = os.path.join(base_dir, "plugin_manager.exe")
+            if not os.path.exists(plugin_exe):
+                QtWidgets.QMessageBox.warning(
+                    mainWindow, "Plugin Manager",
+                    f"plugin_manager.exe not found:\n{plugin_exe}\n\nPlugins will be disabled.",
+                )
+                plugin_process = None
+            else:
+                cmd = [plugin_exe, "--mode", "tray"]
+                cwd = base_dir
+                try:
+                    plugin_process = subprocess.Popen(
+                        cmd, cwd=cwd, env=get_env_for_subprocess(),
+                    )
+                except Exception as e:
+                    QtWidgets.QMessageBox.warning(
+                        mainWindow, "Plugin Manager",
+                        f"Failed to start plugin_manager:\n{e}",
+                    )
+                    plugin_process = None
+        else:
+            cmd = [sys.executable, "-m", "plugin_manager", "--mode", "tray"]
+            cwd = os.path.dirname(os.path.abspath(__file__))
+            try:
+                plugin_process = subprocess.Popen(
+                    cmd, cwd=cwd, env=get_env_for_subprocess(),
+                )
+            except Exception as e:
+                print(f"[WARN] Failed to start plugin_manager: {e}")
+                plugin_process = None
+
         ui._plugin_process = plugin_process  # 保存引用，防止被 GC
 
         # 连接信号：插件发来的新游戏指令 → 主线程处理
@@ -180,7 +210,7 @@ def cli_check_file(file_path: str) -> int:
 
         def _cleanup():
             game_server.stop()
-            if plugin_process.poll() is None:
+            if plugin_process is not None and plugin_process.poll() is None:
                 plugin_process.terminate()
                 plugin_process.wait(timeout=5)
 
diff --git a/src/plugin_manager/_run.py b/src/plugin_manager/_run.py
@@ -0,0 +1,77 @@
+"""
+插件管理器独立入口（供 PyInstaller 打包使用）
+
+替代 __main__.py，避免相对导入问题。
+python -m plugin_manager 仍走 __main__.py（开发模式）
+打包后使用此脚本作为入口。
+"""
+
+import argparse
+import sys
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(description="Solvable-Minesweeper 插件管理器")
+    parser.add_argument(
+        "--endpoint",
+        default="tcp://127.0.0.1:5555",
+        help="ZMQ Server 地址 (默认: tcp://127.0.0.1:5555)",
+    )
+    parser.add_argument(
+        "--mode",
+        choices=["window", "tray"],
+        default="window",
+        help="GUI 模式: window=显示主窗口, tray=系统托盘 (默认: window)",
+    )
+    parser.add_argument(
+        "--no-gui",
+        action="store_true",
+        default=False,
+        help="不显示界面（后台模式）",
+    )
+    parser.add_argument(
+        "--debug",
+        action="store_true",
+        default=False,
+        help="启用 debugpy 远程调试，等待 VS Code 附加 (端口 5678)",
+    )
+    parser.add_argument(
+        "--debug-port",
+        type=int,
+        default=5678,
+        help="debugpy 监听端口 (默认: 5678)",
+    )
+
+    args = parser.parse_args()
+
+    # 可选：启动 debugpy 等待远程调试附加
+    if args.debug:
+        try:
+            import debugpy
+            # in_process_debug_adapter=True: 不启动子进程，直接在当前进程中运行 adapter
+            # 解决 PyInstaller 打包后子进程找不到 Python/debugpy 的问题
+            debugpy.listen(("0.0.0.0", args.debug_port), in_process_debug_adapter=True)
+            print(f"[debug] Waiting for debugger attach on port {args.debug_port}...")
+            debugpy.wait_for_client()
+            print("[debug] Debugger attached, continuing...")
+        except ImportError as e:
+            print(f"[WARN] --debug set but debugpy import failed: {e}")
+
+    from plugin_manager.app_paths import get_log_dir
+    from plugin_manager.logging_setup import init_logging
+
+    init_logging(get_log_dir(), console=True, level="DEBUG")
+
+    from plugin_manager import run_plugin_manager_process
+
+    show_main_window = not args.no_gui and args.mode == "window"
+
+    return run_plugin_manager_process(
+        endpoint=args.endpoint,
+        with_gui=not args.no_gui,
+        show_main_window=show_main_window,
+    )
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/src/plugin_manager/app_paths.py b/src/plugin_manager/app_paths.py
@@ -95,14 +95,16 @@ def get_user_plugin_dirs() -> list[Path]:
     """
     获取用户自定义插件目录（外部，用户自行添加的插件）
 
-    - 开发模式: <project>/src/user_plugins/（可选）
-    - 打包模式:   <exe所在目录>/user_plugins/
+    - 开发模式: <项目根目录>/src/plugins/, <项目根目录>/src/user_plugins/
+    - 打包模式:   <exe所在目录>/plugins/, <exe所在目录>/user_plugins/
     """
     base = get_executable_dir()
-    user_dir = base / "user_plugins"
-    if user_dir.is_dir():
-        return [user_dir]
-    return []
+    result: list[Path] = []
+    for name in ("plugins", "user_plugins"):
+        d = base / name
+        if d.is_dir():
+            result.append(d)
+    return result
 
 
 def get_all_plugin_dirs() -> list[Path]:
diff --git a/src/plugin_manager/main_window.py b/src/plugin_manager/main_window.py
@@ -485,11 +485,17 @@ def _setup_ui(self) -> None:
         self._list = lst
         left_layout.addWidget(lst)
 
-        # 刷新按钮
+        # 刷新 + 调试按钮行
         btn_row = QHBoxLayout()
         self._refresh_btn = QPushButton(self.tr("刷新"))
         btn_row.addWidget(self._refresh_btn)
         btn_row.addStretch()
+
+        self._debug_btn = QPushButton("🐛 Debug")
+        self._debug_btn.setCheckable(True)
+        self._debug_btn.setToolTip(self.tr("开启/关闭远程调试 (debugpy)"))
+        btn_row.addWidget(self._debug_btn)
+
         left_layout.addLayout(btn_row)
 
         left_panel.setMaximumWidth(200)
@@ -585,6 +591,9 @@ def _connect_signals(self) -> None:
         self._list.customContextMenuRequested.connect(self._on_list_context_menu)
         self.connection_changed.connect(self._on_conn_changed)
 
+        # 调试开关
+        self._debug_btn.toggled.connect(self._toggle_debug)
+
     # ── 连接状态 ────────────────────────────────────────
 
     def set_connected(self, ok: bool) -> None:
@@ -613,6 +622,52 @@ def _poll_connection_status(self) -> None:
         except Exception:
             pass
 
+    # ── 远程调试 ────────────────────────────────────────
+
+    _debug_active: bool = False
+
+    def _toggle_debug(self, enabled: bool) -> None:
+        """开启/关闭 debugpy 远程调试"""
+        if enabled:
+            self._start_debug()
+        else:
+            self._stop_debug()
+
+    def _start_debug(self) -> None:
+        """启动 debugpy 监听"""
+        try:
+            import debugpy
+            # in_process_debug_adapter=True: 不启动子进程，直接在当前进程中运行 adapter
+            # 解决 PyInstaller 打包后子进程找不到 Python/debugpy 的问题
+            debugpy.listen(("0.0.0.0", 5678), in_process_debug_adapter=True)
+            PluginManagerWindow._debug_active = True
+            self._debug_btn.setText("🐛 Listening...")
+            self._debug_btn.setStyleSheet("background: #4caf50; color: white; font-weight: bold;")
+            self.statusBar().showMessage(self.tr("Debug server listening on port 5678, waiting for VS Code attach..."))
+            logger.info("Debug server started on port 5678")
+        except ImportError as e:
+            self._debug_btn.setChecked(False)
+            QMessageBox.warning(
+                self, "Debug",
+                f"debugpy import failed:\n{e}",
+            )
+        except Exception as e:
+            self._debug_btn.setChecked(False)
+            QMessageBox.warning(self, "Debug", f"Failed to start debugger:\n{e}")
+
+    def _stop_debug(self) -> None:
+        """停止 debugpy"""
+        try:
+            import debugpy
+            debugpy.stop_listen()
+        except Exception:
+            pass
+        PluginManagerWindow._debug_active = False
+        self._debug_btn.setText("🐛 Debug")
+        self._debug_btn.setStyleSheet("")
+        self.statusBar().showMessage(self.tr("Debug stopped"))
+        logger.info("Debug server stopped")
+
     # ── 插件列表 ────────────────────────────────────────
 
     # ── 插件列表 ────────────────────────────────────────
