修复: Linux ADB 路径与 X11 会话提示

Author: 5656565566

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "MluaScript"
-version = "1.0.0"
+version = "1.0.2"
 description = "MaaFramework-driven script controller"
 authors = [
     {name = "5656565566", email = "2393963330@qq.com"},

src/mluascript/maa/connections/desktop.py

@@ -21,7 +21,7 @@ def current_desktop_backend() -> str:
     if system == "darwin":
         return "macos"
     if system == "linux":
-        return "wlroots"
+        return _detect_linux_desktop_backend()
     return "unknown"
 
 
@@ -31,7 +31,7 @@ def current_desktop_label() -> str:
         return " Windows 本地窗口"
     if backend == "macos":
         return " macOS 本地窗口"
-    if backend == "wlroots":
+    if backend in {"wlroots", "x11"}:
         return " Linux 本地窗口"
     return " 本地窗口"
 
@@ -46,6 +46,8 @@ def connect_desktop_window(context: MaaContext, params: DesktopWindowConnectionP
         return _connect_macos(context, params)
     if backend == "wlroots":
         return _connect_wlroots(context, params)
+    if backend == "x11":
+        raise RuntimeError("当前 Linux 会话为 X11，但当前 MAA 后端仅支持 wlroots/Wayland 本地窗口控制")
     raise RuntimeError(f"当前平台暂不支持本地窗口控制: {platform.system()}")
 
 
@@ -116,6 +118,20 @@ def _resolve_wlroots_socket_path() -> str:
     return os.path.join(xdg_runtime_dir, wayland_display)
 
 
+def _detect_linux_desktop_backend() -> str:
+    session_type = str(os.environ.get("XDG_SESSION_TYPE") or "").strip().lower()
+    if session_type == "x11":
+        return "x11"
+    if session_type == "wayland":
+        return "wlroots"
+
+    if str(os.environ.get("WAYLAND_DISPLAY") or "").strip():
+        return "wlroots"
+    if str(os.environ.get("DISPLAY") or "").strip():
+        return "x11"
+    return "wlroots"
+
+
 def _verify_controller_ready(controller, *, backend: str, target: str) -> None:
     job = controller.post_connection()
     job.wait()

src/mluascript/maa/lifecycle/bootstrap.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import platform
 from pathlib import Path
 
 from maa.define import LoggingLevelEnum
@@ -10,9 +11,11 @@
 
 def _normalize_adb_path(raw: str) -> Path:
     path = Path(raw)
-    if path.name.lower() not in {"adb", "adb.exe"}:
-        return path / "adb.exe"
-    return path
+    if path.name.lower() in {"adb", "adb.exe"}:
+        return path
+
+    adb_name = "adb.exe" if platform.system().lower() == "windows" else "adb"
+    return path / adb_name
 
 
 def resolve_maa_paths(root_dir: Path | None = None) -> MaaPaths:

tests/maa/connections/test_basic_connections.py

@@ -7,7 +7,7 @@
 
 from mluascript.maa.connections.adb import connect_adb
 from mluascript.maa.connections.browser import connect_browser
-from mluascript.maa.connections.desktop import connect_desktop_window
+from mluascript.maa.connections.desktop import connect_desktop_window, current_desktop_backend
 from mluascript.maa.connections.discovery import find_adb_devices, find_desktop_windows
 from mluascript.maa.connections.models import AdbConnectionParams, BrowserConnectionParams, DesktopWindowConnectionParams
 from mluascript.maa.lifecycle.runtime import MaaContext
@@ -167,6 +167,20 @@ def test_connect_desktop_window_uses_macos_backend(mocker) -> None:
     assert session.info.meta == {"platform": "macos", "handle": 2002}
 
 
+def test_current_desktop_backend_detects_linux_x11(monkeypatch, mocker) -> None:
+    monkeypatch.setenv("XDG_SESSION_TYPE", "x11")
+    mocker.patch("mluascript.maa.connections.desktop.platform.system", return_value="Linux")
+
+    assert current_desktop_backend() == "x11"
+
+
+def test_connect_desktop_window_rejects_linux_x11_with_clear_message() -> None:
+    context = build_context()
+
+    with pytest.raises(RuntimeError, match="X11"):
+        connect_desktop_window(context, DesktopWindowConnectionParams(handle=1, platform="x11"))
+
+
 def test_discovery_returns_mocked_results(mocker) -> None:
     mock_toolkit = mocker.patch("mluascript.maa.connections.discovery.Toolkit")
     mock_toolkit.find_adb_devices.return_value = []

tests/maa/lifecycle/test_basic_lifecycle.py

@@ -6,7 +6,7 @@
 
 from mluascript.shared.config.manager import load_config
 from mluascript.maa.errors import MaaResourceError
-from mluascript.maa.lifecycle.bootstrap import configure_toolkit_options, resolve_maa_paths
+from mluascript.maa.lifecycle.bootstrap import _normalize_adb_path, configure_toolkit_options, resolve_maa_paths
 from mluascript.maa.lifecycle.resources import get_node_list, load_resource, override_pipeline
 from mluascript.maa.lifecycle.runtime import MaaContext, create_maa_context
 from mluascript.maa.types import MaaContextState, MaaPaths
@@ -67,6 +67,18 @@ def test_configure_toolkit_options_contains_adb_path_when_present() -> None:
     assert options == {"adb_path": "adb.exe"}
 
 
+def test_normalize_adb_path_uses_platform_specific_binary_name_for_windows(monkeypatch) -> None:
+    monkeypatch.setattr("mluascript.maa.lifecycle.bootstrap.platform.system", lambda: "Windows")
+
+    assert _normalize_adb_path("C:/tools/platform-tools") == Path("C:/tools/platform-tools/adb.exe")
+
+
+def test_normalize_adb_path_uses_platform_specific_binary_name_for_linux(monkeypatch) -> None:
+    monkeypatch.setattr("mluascript.maa.lifecycle.bootstrap.platform.system", lambda: "Linux")
+
+    assert _normalize_adb_path("/usr/bin") == Path("/usr/bin/adb")
+
+
 def test_load_resource_returns_true_when_resource_missing() -> None:
     context = create_fake_maa_context()