Support reconnecting multiple WiFi ADB devices
This commit is contained in:
1 parent
b533c4e96e
commit
5c98bb8353
6 files changed
+105
-35
No files matched your search
@@ -68,7 +68,7 @@ def try_reconnect_last_wifi(
|
||||
target = str(last.get("target"))
|
||||
model = str(last.get("model") or "")
|
||||
|
||||
# 已经有设备时不打扰
|
||||
# 已经有设备时不抢占当前选择;但仍允许后台把上次 WiFi 目标连回来。
|
||||
try:
|
||||
existing = list_adb_devices(adb_exe)
|
||||
except Exception:
|
||||
@@ -79,9 +79,9 @@ def try_reconnect_last_wifi(
|
||||
return
|
||||
if existing:
|
||||
on_line(
|
||||
f"[启动] 当前已有设备 {existing[0]},上次 WiFi 目标 {target} 不抢占"
|
||||
f"[启动] 当前已有设备 {existing[0]},后台尝试连接上次 WiFi 目标 {target}"
|
||||
)
|
||||
return
|
||||
keep_current_selection = bool(existing)
|
||||
|
||||
on_line(f"[启动] 尝试重连上次的 WiFi 设备: {target} ...")
|
||||
|
||||
@@ -108,11 +108,10 @@ def try_reconnect_last_wifi(
|
||||
if state == "connected":
|
||||
def render_ok():
|
||||
refresh_devices()
|
||||
device_var.set(target)
|
||||
on_line(
|
||||
f"[启动] 自动重连成功: {target}"
|
||||
+ (f" ({model})" if model else "")
|
||||
)
|
||||
if not keep_current_selection:
|
||||
device_var.set(target)
|
||||
label = "后台重连成功" if keep_current_selection else "自动重连成功"
|
||||
on_line(f"[启动] {label}: {target}" + (f" ({model})" if model else ""))
|
||||
_safe_after(root, render_ok, fallback=lambda: on_line(f"[启动] 自动重连成功: {target}"))
|
||||
return
|
||||
|
||||
@@ -139,13 +138,15 @@ def try_reconnect_last_wifi(
|
||||
|
||||
def render_same_ip_hit(probe_target=probe_target):
|
||||
refresh_devices()
|
||||
device_var.set(probe_target)
|
||||
if not keep_current_selection:
|
||||
device_var.set(probe_target)
|
||||
try:
|
||||
set_last_wifi_target(probe_target, model)
|
||||
except Exception:
|
||||
pass
|
||||
label = "后台命中轻量端口" if keep_current_selection else "上次 IP 命中轻量端口"
|
||||
on_line(
|
||||
f"[启动] 上次 IP 命中轻量端口 {probe_target}"
|
||||
f"[启动] {label} {probe_target}"
|
||||
+ (f" ({model})" if model else "")
|
||||
)
|
||||
|
||||
@@ -188,20 +189,22 @@ def try_reconnect_last_wifi(
|
||||
return
|
||||
|
||||
refresh_devices()
|
||||
device_var.set(best.target)
|
||||
if not keep_current_selection:
|
||||
device_var.set(best.target)
|
||||
# 更新记忆
|
||||
try:
|
||||
set_last_wifi_target(best.target, best.model or model)
|
||||
except Exception:
|
||||
pass
|
||||
prefix = "后台" if keep_current_selection else ""
|
||||
if best.target == target:
|
||||
on_line(
|
||||
f"[启动] 自动重连成功(扫描确认): {best.target}"
|
||||
f"[启动] {prefix}自动重连成功(扫描确认): {best.target}"
|
||||
+ (f" ({best.model})" if best.model else "")
|
||||
)
|
||||
else:
|
||||
on_line(
|
||||
f"[启动] 上次目标 {target} 已变 → 智能匹配到 {best.target}"
|
||||
f"[启动] {prefix}上次目标 {target} 已变 → 智能匹配到 {best.target}"
|
||||
+ (f" ({best.model})" if best.model else "")
|
||||
+ "(已更新记忆)"
|
||||
)
|
||||
|
||||
@@ -848,6 +848,7 @@ def discover_adb_devices(
|
||||
port_list = [DEFAULT_ADB_PORT]
|
||||
|
||||
# 1.5) 利用上次成功目标加速:优先直连上次 target;并把上次端口作为补充端口。
|
||||
preverified: list[DiscoveredDevice] = []
|
||||
last_target = ""
|
||||
last_model = ""
|
||||
last_ip_for_same_host = ""
|
||||
@@ -879,7 +880,7 @@ def discover_adb_devices(
|
||||
pass
|
||||
dev = _connect_last_target_fast(adb_exe, f"{last_ip}:{last_port_hint}", last_model)
|
||||
if dev is not None:
|
||||
return [dev]
|
||||
preverified.append(dev)
|
||||
|
||||
# 2) mDNS 发现(Android 11+ 无线调试常见随机端口)
|
||||
mdns_targets = discover_mdns_targets(adb_exe)
|
||||
@@ -974,9 +975,12 @@ def discover_adb_devices(
|
||||
pass
|
||||
|
||||
# 3) 对每个开放 (IP,Port) 调 adb connect 验证
|
||||
results: list[DiscoveredDevice] = []
|
||||
results: list[DiscoveredDevice] = list(preverified)
|
||||
preverified_targets = {d.target for d in preverified}
|
||||
for ip, p in uniq_open:
|
||||
target = f"{ip}:{p}"
|
||||
if target in preverified_targets:
|
||||
continue
|
||||
state, message = verify_adb_target(adb_exe, target)
|
||||
dev = DiscoveredDevice(ip=ip, port=p, adb_state=state, message=message)
|
||||
if state == "connected":
|
||||
|
||||
+12
-12
@@ -850,16 +850,8 @@ def handle_post(handler, u, runner, csrf_token: str) -> None:
|
||||
"message": f"WiFi 设备已在线: {target}",
|
||||
}
|
||||
)
|
||||
if existing:
|
||||
return handler._send_json(
|
||||
{
|
||||
"ok": True,
|
||||
"action": "noop",
|
||||
"target": existing[0],
|
||||
"model": "",
|
||||
"message": f"当前已有设备 {existing[0]},上次 WiFi 目标 {target} 不抢占",
|
||||
}
|
||||
)
|
||||
selected_target = existing[0] if existing else ""
|
||||
background_mode = bool(existing)
|
||||
try:
|
||||
state, _ = verify_adb_target(adb, target)
|
||||
except Exception as e:
|
||||
@@ -869,10 +861,15 @@ def handle_post(handler, u, runner, csrf_token: str) -> None:
|
||||
return handler._send_json(
|
||||
{
|
||||
"ok": True,
|
||||
"action": "reconnected",
|
||||
"action": "reconnected_background" if background_mode else "reconnected",
|
||||
"target": target,
|
||||
"model": model,
|
||||
"message": f"自动重连成功: {target}",
|
||||
"selected_target": selected_target,
|
||||
"message": (
|
||||
f"后台重连成功: {target},当前选择仍为 {selected_target}"
|
||||
if background_mode
|
||||
else f"自动重连成功: {target}"
|
||||
),
|
||||
}
|
||||
)
|
||||
if state == "unauthorized":
|
||||
@@ -882,6 +879,7 @@ def handle_post(handler, u, runner, csrf_token: str) -> None:
|
||||
"action": "failed",
|
||||
"target": target,
|
||||
"model": model,
|
||||
"selected_target": selected_target,
|
||||
"message": f"上次设备 {target} 未授权,请在手机上确认 ADB 调试授权",
|
||||
}
|
||||
)
|
||||
@@ -917,6 +915,7 @@ def handle_post(handler, u, runner, csrf_token: str) -> None:
|
||||
"action": "failed",
|
||||
"target": target,
|
||||
"model": model,
|
||||
"selected_target": selected_target,
|
||||
"message": msg,
|
||||
"devices": payload_devs,
|
||||
}
|
||||
@@ -938,6 +937,7 @@ def handle_post(handler, u, runner, csrf_token: str) -> None:
|
||||
"action": "matched",
|
||||
"target": best.target,
|
||||
"model": best.model or "",
|
||||
"selected_target": selected_target,
|
||||
"message": msg,
|
||||
"devices": payload_devs,
|
||||
}
|
||||
|
||||
@@ -426,6 +426,29 @@ def test_wifi_auto_reconnect_uses_lightweight_ports(monkeypatch):
|
||||
assert captured.get("ports") == [39601, 5555, 44219]
|
||||
|
||||
|
||||
def test_wifi_auto_reconnect_connects_last_target_even_when_other_device_exists(monkeypatch):
|
||||
monkeypatch.setattr(routes, "find_adb_executable", lambda: "adb")
|
||||
monkeypatch.setattr(routes, "list_adb_devices", lambda adb: ["192.168.10.200:5555"]) # noqa: ARG001
|
||||
|
||||
import gui.gui_core_pkg as core_pkg
|
||||
import gui.gui_core_pkg.wifi_adb_scan as scan_mod
|
||||
|
||||
monkeypatch.setattr(
|
||||
core_pkg,
|
||||
"get_last_wifi_target",
|
||||
lambda: {"target": "192.168.10.105:44219", "model": "PEPM00"},
|
||||
)
|
||||
monkeypatch.setattr(scan_mod, "verify_adb_target", lambda adb, target: ("connected", "ok")) # noqa: ARG005
|
||||
|
||||
status, obj = _post("/api/wifi/auto-reconnect", {}, monkeypatch)
|
||||
|
||||
assert status == 200
|
||||
assert obj.get("ok") is True
|
||||
assert obj.get("action") == "reconnected_background"
|
||||
assert obj.get("target") == "192.168.10.105:44219"
|
||||
assert obj.get("selected_target") == "192.168.10.200:5555"
|
||||
|
||||
|
||||
def test_wifi_scan_includes_tried_subnets(monkeypatch):
|
||||
monkeypatch.setattr(routes, "find_adb_executable", lambda: "adb")
|
||||
monkeypatch.setattr(routes, "list_adb_devices", lambda adb: []) # noqa: ARG001
|
||||
|
||||
@@ -74,6 +74,37 @@ def test_try_reconnect_last_wifi_picks_exact_verified_target_without_scan(monkey
|
||||
assert any("自动重连成功" in line for line in logs)
|
||||
|
||||
|
||||
def test_try_reconnect_last_wifi_keeps_existing_selection_but_connects_last_target(monkeypatch):
|
||||
device_var = _Var()
|
||||
device_var.set("192.168.10.200:5555")
|
||||
logs = []
|
||||
refreshed = {"count": 0}
|
||||
verify_calls = []
|
||||
|
||||
monkeypatch.setattr(reconnect, "get_last_wifi_target", lambda: {"target": "192.168.10.105:44219", "model": "PEPM00"})
|
||||
monkeypatch.setattr(reconnect, "list_adb_devices", lambda _adb: ["192.168.10.200:5555"])
|
||||
|
||||
def fake_verify(_adb, target):
|
||||
verify_calls.append(target)
|
||||
return ("connected", "ok")
|
||||
|
||||
monkeypatch.setattr(reconnect, "verify_adb_target", fake_verify)
|
||||
monkeypatch.setattr(reconnect, "discover_adb_devices", lambda *_a, **_k: (_ for _ in ()).throw(AssertionError("should not scan")))
|
||||
|
||||
reconnect.try_reconnect_last_wifi(
|
||||
_Root(),
|
||||
adb_exe="adb",
|
||||
device_var=device_var,
|
||||
on_line=logs.append,
|
||||
refresh_devices=lambda: refreshed.__setitem__("count", refreshed["count"] + 1),
|
||||
)
|
||||
|
||||
assert verify_calls == ["192.168.10.105:44219"]
|
||||
assert device_var.value == "192.168.10.200:5555"
|
||||
assert refreshed["count"] == 1
|
||||
assert any("后台重连成功" in line for line in logs)
|
||||
|
||||
|
||||
def test_try_reconnect_last_wifi_hits_same_ip_lightweight_port_before_discover(monkeypatch):
|
||||
device_var = _Var()
|
||||
logs = []
|
||||
|
||||
@@ -450,19 +450,28 @@ class TestDiscoverAdbDevices:
|
||||
assert devs[0].target == "192.168.5.2:5555"
|
||||
assert devs[1].target == "192.168.5.2:37001"
|
||||
|
||||
def test_fast_path_hits_last_target_and_returns_early(self):
|
||||
def test_fast_path_includes_last_target_but_still_scans_other_wifi_devices(self):
|
||||
calls = []
|
||||
|
||||
def fake_scan_ports(ips, **kwargs):
|
||||
calls.append((list(ips), list(kwargs.get("ports") or [])))
|
||||
return [("192.168.10.104", 5555)]
|
||||
|
||||
with patch.object(scan, "get_local_subnets", return_value=["192.168.10.0/24"]), \
|
||||
patch("gui.gui_core_pkg.config.get_last_wifi_target", return_value={"target": "192.168.10.103:37697", "model": "Xiaomi 14"}), \
|
||||
patch.object(scan, "verify_adb_target", return_value=("connected", "ok")), \
|
||||
patch.object(scan, "query_device_model", return_value="SHOULD_NOT_CALL"), \
|
||||
patch.object(scan, "discover_mdns_targets", side_effect=AssertionError("should not reach mdns")), \
|
||||
patch.object(scan, "scan_open_ports", side_effect=AssertionError("should not scan ports")):
|
||||
patch.object(scan, "verify_adb_target", side_effect=lambda adb, target, **kwargs: ("connected", f"ok:{target}")), \
|
||||
patch.object(scan, "query_device_model", side_effect=lambda adb, target: f"model:{target}"), \
|
||||
patch.object(scan, "discover_mdns_targets", return_value=[]), \
|
||||
patch.object(scan, "_list_arp_ipv4_candidates", return_value=[]), \
|
||||
patch.object(scan, "scan_open_ports", side_effect=fake_scan_ports):
|
||||
devs = scan.discover_adb_devices("/adb")
|
||||
|
||||
assert len(devs) == 1
|
||||
assert devs[0].target == "192.168.10.103:37697"
|
||||
assert [d.target for d in devs] == [
|
||||
"192.168.10.103:37697",
|
||||
"192.168.10.104:5555",
|
||||
]
|
||||
assert devs[0].model == "Xiaomi 14"
|
||||
assert devs[0].adb_state == "connected"
|
||||
assert calls
|
||||
|
||||
def test_last_port_hint_added_to_lightweight_scan_ports(self):
|
||||
captured_ports = []
|
||||
|
||||
Reference in new issue
Block a user