From 23f63e42c8ad1c85f828f6f74cb8f07ed3b429e5 Mon Sep 17 00:00:00 2001
From: milk <53408947@qq.com>
Date: Fri, 24 Oct 2025 22:04:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=89=E7=94=BB=E9=9D=A2?=
=?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/iOSAI.iml | 3 +
.idea/misc.xml | 2 +-
Module/DeviceInfo.py | 444 +++++++++---
Module/FlaskService.py | 5 +
Module/IOSActivator.py | 631 +++++++++---------
Module/Main.py | 2 +-
Module/__pycache__/DeviceInfo.cpython-312.pyc | Bin 40489 -> 51028 bytes
Module/__pycache__/Main.cpython-312.pyc | Bin 3738 -> 3738 bytes
Utils/ThreadManager.py | 179 +++--
Utils/__pycache__/LogManager.cpython-312.pyc | Bin 14663 -> 14663 bytes
.../__pycache__/ThreadManager.cpython-312.pyc | Bin 4872 -> 8165 bytes
.../__pycache__/ScriptManager.cpython-312.pyc | Bin 65346 -> 66531 bytes
12 files changed, 796 insertions(+), 470 deletions(-)
diff --git a/.idea/iOSAI.iml b/.idea/iOSAI.iml
index ec63674..aad402c 100644
--- a/.idea/iOSAI.iml
+++ b/.idea/iOSAI.iml
@@ -4,4 +4,7 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 575b414..a37b124 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
-
+
\ No newline at end of file
diff --git a/Module/DeviceInfo.py b/Module/DeviceInfo.py
index 4df70e7..00b4960 100644
--- a/Module/DeviceInfo.py
+++ b/Module/DeviceInfo.py
@@ -6,7 +6,7 @@ import threading
import time
from concurrent.futures import ThreadPoolExecutor, as_completed, TimeoutError
from pathlib import Path
-from typing import Dict, Optional, List
+from typing import Dict, Optional, List, Any
import random
import socket
import http.client
@@ -55,6 +55,15 @@ class DeviceInfo:
# WDA Ready 等待（HTTP 轮询方式，不触发 xctest）
WDA_READY_TIMEOUT = float(os.getenv("WDA_READY_TIMEOUT", "35.0"))
+ # WDA 轻量复位策略
+ MJPEG_BAD_THRESHOLD = int(os.getenv("MJPEG_BAD_THRESHOLD", "3")) # 连续几次 mjpeg 健康失败才重置 WDA
+ WDA_RESET_COOLDOWN = float(os.getenv("WDA_RESET_COOLDOWN", "10")) # WDA 复位冷却，避免风暴
+
+ # 防连坐参数（支持环境变量）
+ GLITCH_SUPPRESS_SEC = float(os.getenv("GLITCH_SUPPRESS_SEC", "6.0")) # 扫描异常后抑制移除的秒数
+ MASS_DROP_RATIO = float(os.getenv("MASS_DROP_RATIO", "0.6")) # 一次性丢失占比阈值
+ ABSENT_TICKS_BEFORE_REMOVE = int(os.getenv("ABSENT_TICKS_BEFORE_REMOVE", "3")) # 连续缺席轮数
+
def __init__(self):
# 自增端口游标仅作兜底扫描使用
self._port = 9110
@@ -69,7 +78,7 @@ class DeviceInfo:
# 并发保护 & 状态表
self._lock = threading.RLock()
- self._port_by_udid: Dict[str, int] = {} # UDID -> 当前使用的本地端口
+ self._port_by_udid: Dict[str, int] = {} # UDID -> 当前使用的本地端口（映射 wdaScreenPort）
self._pid_by_udid: Dict[str, int] = {} # UDID -> iproxy PID
# 抗抖
@@ -81,6 +90,17 @@ class DeviceInfo:
self._trusted_cache: Dict[str, float] = {} # udid -> expire_ts
self._wda_ok_cache: Dict[str, float] = {} # udid -> expire_ts
+ # 新增：MJPEG 连续坏计数 + 最近一次 WDA 复位时间
+ self._mjpeg_bad_count: Dict[str, int] = {}
+ self._last_wda_reset: Dict[str, float] = {}
+
+ # 新增：按 UDID 的 /status 探测单飞锁，避免临时 iproxy 并发
+ self._probe_locks: Dict[str, threading.Lock] = {}
+
+ # 防连坐
+ self._scan_glitch_until = 0.0 # 截止到该时间前，认为扫描不可靠，跳过移除
+ self._absent_ticks: Dict[str, int] = {} # udid -> 连续缺席次数
+
LogManager.info("DeviceInfo init 完成；日志已启用", udid="system")
# ---------------- 主循环 ----------------
@@ -108,13 +128,70 @@ class DeviceInfo:
with self._lock:
known = set(self._models.keys())
- # 真正移除（连续缺席超过宽限期）
+ # -------- 全局扫描异常检测（防连坐）--------
+ missing = [u for u in known if u not in online_now]
+ mass_drop = (len(known) > 0) and (
+ (len(online_now) == 0) or
+ (len(missing) / max(1, len(known)) >= self.MASS_DROP_RATIO)
+ )
+ if mass_drop:
+ self._scan_glitch_until = now + self.GLITCH_SUPPRESS_SEC
+ LogManager.method_warning(
+ f"检测到扫描异常：known={len(known)}, online={len(online_now)}, "
+ f"missing={len(missing)}，进入抑制窗口 {self.GLITCH_SUPPRESS_SEC}s",
+ method, udid="system"
+ )
+
+ # 真正移除（仅在非抑制窗口内 + 连续缺席达到阈值 才移除）
for udid in list(known):
+ if udid in online_now:
+ # 在线：清空缺席计数
+ self._absent_ticks.pop(udid, None)
+ continue
+
+ # 离线：记录一次缺席
+ miss = self._absent_ticks.get(udid, 0) + 1
+ self._absent_ticks[udid] = miss
+
last = self._last_seen.get(udid, 0.0)
- if udid not in online_now and (now - last) >= self.REMOVE_GRACE_SEC:
- LogManager.info(f"设备判定离线（超过宽限期 {self.REMOVE_GRACE_SEC}s），last_seen={last}", udid=udid)
+ exceed_grace = (now - last) >= self.REMOVE_GRACE_SEC
+ exceed_ticks = miss >= self.ABSENT_TICKS_BEFORE_REMOVE
+
+ # 抑制窗口内：跳过任何移除
+ if now < self._scan_glitch_until:
+ continue
+
+ if exceed_grace and exceed_ticks:
+ # --- 移除前的“可达性”反校验 ---
+ try:
+ with self._lock:
+ model = self._models.get(udid)
+ port = model.screenPort if model else -1
+ reachable = False
+ # 1) ip:port 的 MJPEG 是否还在
+ if port and port > 0 and self._health_check_mjpeg(port, timeout=0.8):
+ reachable = True
+ # 2) WDA /status 是否仍然正常
+ if not reachable and self._health_check_wda(udid):
+ reachable = True
+
+ if reachable:
+ # 误报：续命
+ self._last_seen[udid] = now
+ self._absent_ticks[udid] = 0
+ LogManager.method_info("离线误报：反校验可达，取消移除并续命", method, udid=udid)
+ continue
+ except Exception as e:
+ LogManager.method_warning(f"离线反校验异常：{e}", method, udid=udid)
+
+ LogManager.info(
+ f"设备判定离线（超过宽限期 {self.REMOVE_GRACE_SEC}s 且 连续缺席 {self._absent_ticks[udid]} 次）",
+ udid=udid
+ )
self._remove_device(udid)
self._last_topology_change_ts = now
+ # 清理计数
+ self._absent_ticks.pop(udid, None)
# 真正新增（连续在线超过稳定期）
new_candidates = [u for u in online_now if u not in known]
@@ -164,7 +241,7 @@ class DeviceInfo:
LogManager.method_warning(f"读取系统版本失败：{e}", method, udid=udid)
system_version_major = 0 # 保底
- # === iOS>17：先“被动探测”WDA，未运行则交给 IOSActivator，并通过 HTTP 轮询等待 ===
+ # === iOS>17：被动探测 WDA；未运行则交给 IOSActivator，并通过 HTTP 轮询等待 ===
if system_version_major > 17:
if self._wda_is_running(udid):
LogManager.method_info("检测到 WDA 已运行，直接映射", method, udid=udid)
@@ -209,6 +286,8 @@ class DeviceInfo:
model.ready = True
self._models[udid] = model
self._procs[udid] = proc
+ # 初始化计数
+ self._mjpeg_bad_count[udid] = 0
LogManager.method_info(f"设备添加完成，port={port}, {w}x{h}@{s}", method, udid=udid)
self._manager_send(model)
@@ -227,6 +306,9 @@ class DeviceInfo:
self._wda_ok_cache.pop(udid, None)
self._last_seen.pop(udid, None)
self._first_seen.pop(udid, None)
+ self._mjpeg_bad_count.pop(udid, None)
+ self._last_wda_reset.pop(udid, None)
+ self._absent_ticks.pop(udid, None)
self._kill(proc)
if pid:
@@ -266,52 +348,96 @@ class DeviceInfo:
return False
# ======= WDA 探测/等待（仅走 iproxy+HTTP，不触发 xctest） =======
- def _wda_http_status_ok(self, udid: str, timeout_sec: float = 1.2) -> bool:
- """临时 iproxy 转发到 wdaFunctionPort，GET /status 成功视为 OK。"""
- method = "_wda_http_status_ok"
- tmp_port = self._pick_new_port()
- proc = None
- try:
- cmd = [self._iproxy_path, "-u", udid, str(tmp_port), str(wdaFunctionPort)]
- proc = subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
- if not self._wait_until_listening(tmp_port, initial_timeout=0.8):
- LogManager.method_info(f"WDA探测：临时端口未监听（{tmp_port}）", method, udid=udid)
- return False
+ def _get_probe_lock(self, udid: str) -> threading.Lock:
+ with self._lock:
+ lk = self._probe_locks.get(udid)
+ if lk is None:
+ lk = threading.Lock()
+ self._probe_locks[udid] = lk
+ return lk
- conn = http.client.HTTPConnection("127.0.0.1", tmp_port, timeout=timeout_sec)
+ def _wda_http_status_ok(self, udid: str, timeout_sec: float = 1.2) -> bool:
+ """起临时 iproxy 到 wdaFunctionPort，探测 /status。增加单飞锁与严格清理。"""
+ method = "_wda_http_status_ok"
+ lock = self._get_probe_lock(udid)
+ if not lock.acquire(timeout=3.0):
+ # 有并发探测在进行，避免同时起多个 iproxy；直接返回“未知→False”
+ LogManager.method_info("状态探测被并发锁抑制", method, udid=udid)
+ return False
+ try:
+ tmp_port = self._pick_new_port()
+ proc = None
try:
- conn.request("GET", "/status")
- resp = conn.getresponse()
- _ = resp.read(256)
- code = getattr(resp, "status", 0)
- ok = 200 <= code < 400
- LogManager.method_info(f"WDA探测：/status code={code}, ok={ok}", method, udid=udid)
- return ok
- except Exception as e:
- LogManager.method_info(f"WDA探测异常：{e}", method, udid=udid)
+ cmd = [self._iproxy_path, "-u", udid, str(tmp_port), str(wdaFunctionPort)]
+
+ # --- Windows 下隐藏 iproxy 控制台 ---
+ creationflags = 0
+ startupinfo = None
+ if os.name == "nt":
+ creationflags = getattr(subprocess, "CREATE_NO_WINDOW", 0x08000000) | \
+ getattr(subprocess, "CREATE_NEW_PROCESS_GROUP", 0x00000200)
+ si = subprocess.STARTUPINFO()
+ si.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+ si.wShowWindow = 0
+ startupinfo = si
+
+ proc = subprocess.Popen(
+ cmd,
+ stdout=subprocess.DEVNULL,
+ stderr=subprocess.DEVNULL,
+ creationflags=creationflags,
+ startupinfo=startupinfo
+ )
+
+ if not self._wait_until_listening(tmp_port, initial_timeout=1.0):
+ LogManager.method_info(f"WDA探测：临时端口未监听（{tmp_port}）", method, udid=udid)
+ return False
+
+ # /status 双重尝试，减少瞬态抖动
+ for _ in (1, 2):
+ try:
+ conn = http.client.HTTPConnection("127.0.0.1", tmp_port, timeout=timeout_sec)
+ conn.request("GET", "/status")
+ resp = conn.getresponse()
+ _ = resp.read(256)
+ code = getattr(resp, "status", 0)
+ ok = 200 <= code < 400
+ LogManager.method_info(f"WDA探测：/status code={code}, ok={ok}", method, udid=udid)
+ try:
+ conn.close()
+ except Exception:
+ pass
+ if ok:
+ return True
+ time.sleep(0.2)
+ except Exception as e:
+ LogManager.method_info(f"WDA探测异常：{e}", method, udid=udid)
+ time.sleep(0.2)
return False
finally:
- try:
- conn.close()
- except Exception:
- pass
- finally:
- if proc:
- try:
- p = psutil.Process(proc.pid)
- p.terminate()
- p.wait(timeout=0.6)
- except Exception:
+ if proc:
try:
- p.kill()
+ p = psutil.Process(proc.pid)
+ p.terminate()
+ try:
+ p.wait(timeout=1.2)
+ except psutil.TimeoutExpired:
+ p.kill()
+ p.wait(timeout=1.2)
except Exception:
- pass
+ # 兜底强杀
+ try:
+ os.kill(proc.pid, signal.SIGTERM)
+ except Exception:
+ pass
+ finally:
+ try:
+ lock.release()
+ except Exception:
+ pass
def _wait_wda_ready_http(self, udid: str, total_timeout_sec: float = None, interval_sec: float = 0.6) -> bool:
- """
- 通过 _wda_http_status_ok 轮询等待 WDA Ready。
- total_timeout_sec 默认取环境变量 WDA_READY_TIMEOUT（默认 35s）。
- """
+ """通过 _wda_http_status_ok 轮询等待 WDA Ready。"""
method = "_wait_wda_ready_http"
if total_timeout_sec is None:
total_timeout_sec = self.WDA_READY_TIMEOUT
@@ -387,11 +513,11 @@ class DeviceInfo:
deadline = _monotonic() + to
while _monotonic() < deadline:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
- s.settimeout(0.2)
+ s.settimeout(0.25)
if s.connect_ex(("127.0.0.1", port)) == 0:
LogManager.method_info(f"端口已开始监听：{port}", method, udid="system")
return True
- time.sleep(0.05)
+ time.sleep(0.06)
LogManager.method_info(f"监听验收阶段超时：{port}，扩展等待", method, udid="system")
LogManager.method_warning(f"监听验收最终超时：{port}", method, udid="system")
return False
@@ -490,6 +616,7 @@ class DeviceInfo:
LogManager.method_info(f"自愈被退避抑制，剩余 {delta}s", method, udid=udid)
return
+ old_port = None
with self._lock:
proc = self._procs.get(udid)
if proc:
@@ -499,6 +626,7 @@ class DeviceInfo:
if not model:
LogManager.method_warning("模型不存在，取消自愈", method, udid=udid)
return
+ old_port = model.screenPort
proc2 = self._start_iproxy(udid, port=None)
if not proc2:
@@ -518,26 +646,78 @@ class DeviceInfo:
model.screenPort = self._port_by_udid.get(udid, model.screenPort)
self._models[udid] = model
self._manager_send(model)
+ LogManager.method_info(f"[PORT-SWITCH] {udid} {old_port} -> {self._port_by_udid.get(udid)}", method, udid=udid)
LogManager.method_info(f"重启成功，使用新端口 {self._port_by_udid.get(udid)}", method, udid=udid)
# ---------------- 健康检查 ----------------
- def _health_check_mjpeg(self, port: int, timeout: float = 0.8) -> bool:
+ def _health_check_mjpeg(self, port: int, timeout: float = 1.8) -> bool:
+ """使用 GET 真实探测 MJPEG：校验 Content-Type 和 boundary。尝试 /mjpeg -> /mjpegstream -> /"""
method = "_health_check_mjpeg"
- try:
- conn = http.client.HTTPConnection("127.0.0.1", port, timeout=timeout)
- conn.request("HEAD", "/")
- resp = conn.getresponse()
- _ = resp.read(128)
- code = getattr(resp, "status", 0)
- conn.close()
- return 200 <= code < 400
- except Exception:
- return False
+ paths = ["/mjpeg", "/mjpegstream", "/"]
+ for path in paths:
+ try:
+ conn = http.client.HTTPConnection("127.0.0.1", port, timeout=timeout)
+ conn.request("GET", path, headers={"Connection": "close"})
+ resp = conn.getresponse()
+ ctype = (resp.getheader("Content-Type") or "").lower()
+ ok_hdr = (200 <= resp.status < 300) and ("multipart/x-mixed-replace" in ctype)
+ # 仅读少量字节，不阻塞
+ chunk = resp.read(1024)
+ try:
+ conn.close()
+ except Exception:
+ pass
+ if ok_hdr and (b"--" in chunk):
+ return True
+ except Exception:
+ pass
+ return False
def _health_check_wda(self, udid: str) -> bool:
- # 使用 HTTP 探测（带短缓存），避免触发 xctest
+ """使用 HTTP 探测（带短缓存），避免触发 xctest。"""
+ # 加一次重试，减少瞬态波动
+ if self._wda_is_running(udid, cache_sec=1.0):
+ return True
+ time.sleep(0.2)
return self._wda_is_running(udid, cache_sec=1.0)
+ def _maybe_reset_wda_lightweight(self, udid: str) -> bool:
+ """在 MJPEG 多次异常但 /status 正常时，做 WDA 轻量复位。成功返回 True。"""
+ method = "_maybe_reset_wda_lightweight"
+ now = _monotonic()
+ last = self._last_wda_reset.get(udid, 0.0)
+ if now - last < self.WDA_RESET_COOLDOWN:
+ return False
+
+ LogManager.method_warning("MJPEG 连续异常，尝试 WDA 轻量复位", method, udid=udid)
+ try:
+ dev = tidevice.Device(udid)
+ # 先尝试 stop/start
+ try:
+ dev.app_stop(WdaAppBundleId)
+ time.sleep(1.0)
+ except Exception:
+ pass
+ dev.app_start(WdaAppBundleId)
+ # 等待就绪（缩短等待）
+ if self._wait_wda_ready_http(udid, total_timeout_sec=12.0):
+ self._last_wda_reset[udid] = _monotonic()
+ return True
+ except Exception as e:
+ LogManager.method_warning(f"WDA stop/start 失败：{e}", method, udid=udid)
+
+ # 兜底：iOS18+ 用 IOSActivator 再尝试
+ try:
+ ios = IOSActivator()
+ ios.activate(udid)
+ if self._wait_wda_ready_http(udid, total_timeout_sec=12.0):
+ self._last_wda_reset[udid] = _monotonic()
+ return True
+ except Exception as e:
+ LogManager.method_warning(f"IOSActivator 复位失败：{e}", method, udid=udid)
+
+ return False
+
def _check_and_heal_tunnels(self, interval: float = 5.0):
method = "_check_and_heal_tunnels"
now = _monotonic()
@@ -557,21 +737,41 @@ class DeviceInfo:
if port <= 0:
continue
- ok_local = self._health_check_mjpeg(port, timeout=0.8)
+ ok_local = self._health_check_mjpeg(port, timeout=1.8)
ok_wda = self._health_check_wda(udid)
LogManager.method_info(f"健康检查：mjpeg={ok_local}, wda={ok_wda}, port={port}", method, udid=udid)
- if not (ok_local and ok_wda):
+ if ok_local and ok_wda:
+ self._mjpeg_bad_count[udid] = 0
+ continue
+
+ # 分层自愈：MJPEG 连续异常而 WDA 正常 → 优先复位 WDA
+ if (not ok_local) and ok_wda:
+ cnt = self._mjpeg_bad_count.get(udid, 0) + 1
+ self._mjpeg_bad_count[udid] = cnt
+ if cnt >= self.MJPEG_BAD_THRESHOLD:
+ if self._maybe_reset_wda_lightweight(udid):
+ # 复位成功后重启 iproxy，确保新流映射
+ self._restart_iproxy(udid)
+ self._mjpeg_bad_count[udid] = 0
+ continue # 下一个设备
+ # 若未达门槛或复位失败，仍执行 iproxy 重启
LogManager.method_warning(f"检测到不健康，触发重启；port={port}", method, udid=udid)
self._restart_iproxy(udid)
+ continue
- # ---------------- Windows/*nix：列出所有 iproxy 命令行 ----------------
- def _get_all_iproxy_cmdlines(self) -> List[str]:
- method = "_get_all_iproxy_cmdlines"
- lines: List[str] = []
- with self._lock:
- live_pids = set(self._pid_by_udid.values())
+ # 其他情况（wda 不健康或两者都不健康）：先重启 iproxy
+ LogManager.method_warning(f"检测到不健康，触发重启；port={port}", method, udid=udid)
+ self._restart_iproxy(udid)
+ # ---------------- 进程枚举（结构化返回） ----------------
+ def _get_all_iproxy_entries(self) -> List[Dict[str, Any]]:
+ """
+ 返回结构化 iproxy 进程项：
+ { 'pid': int, 'name': str, 'cmdline': List[str], 'udid': str|None, 'local_port': int|None, 'remote_port': int|None }
+ """
+ method = "_get_all_iproxy_entries"
+ entries: List[Dict[str, Any]] = []
is_windows = os.name == "nt"
target_name = "iproxy.exe" if is_windows else "iproxy"
@@ -580,58 +780,106 @@ class DeviceInfo:
name = (p.info.get("name") or "").lower()
if name != target_name:
continue
- if p.info["pid"] in live_pids:
- continue
cmdline = p.info.get("cmdline") or []
if not cmdline:
continue
+
+ udid = None
+ local_port = None
+ remote_port = None
+
+ # 解析 -u 与后续的两个端口（LOCAL_PORT, REMOTE_PORT）
if "-u" in cmdline:
- cmd = " ".join(cmdline)
- lines.append(f"{cmd} {p.info['pid']}")
+ try:
+ i = cmdline.index("-u")
+ if i + 1 < len(cmdline):
+ udid = cmdline[i + 1]
+ # 在 -u udid 之后扫描数字端口
+ ints = []
+ for token in cmdline[i + 2:]:
+ if token.isdigit():
+ ints.append(int(token))
+ # 停止条件：拿到两个
+ if len(ints) >= 2:
+ break
+ if len(ints) >= 2:
+ local_port, remote_port = ints[0], ints[1]
+ else:
+ # 兜底：全局找两个数字
+ ints2 = [int(t) for t in cmdline if t.isdigit()]
+ if len(ints2) >= 2:
+ local_port, remote_port = ints2[-2], ints2[-1]
+ except Exception:
+ pass
+
+ entries.append({
+ "pid": p.info["pid"],
+ "name": name,
+ "cmdline": cmdline,
+ "udid": udid,
+ "local_port": local_port,
+ "remote_port": remote_port
+ })
except (psutil.NoSuchProcess, psutil.AccessDenied):
continue
- LogManager.method_info(f"扫描到候选 iproxy 进程数={len(lines)}", method, udid="system")
- return lines
- # ---------------- 杀孤儿 ----------------
+ LogManager.method_info(f"扫描到候选 iproxy 进程数={len(entries)}", method, udid="system")
+ return entries
+
+ # ---------------- 杀孤儿（含“同 UDID 的非当前实例”清理） ----------------
def _cleanup_orphan_iproxy(self):
method = "_cleanup_orphan_iproxy"
+
with self._lock:
live_udids = set(self._models.keys())
- live_pids = set(self._pid_by_udid.values())
+ live_pid_by_udid = dict(self._pid_by_udid)
+ live_port_by_udid = dict(self._port_by_udid)
cleaned = 0
- for ln in self._get_all_iproxy_cmdlines():
- parts = ln.split()
- try:
- if "-u" not in parts:
- continue
- udid = parts[parts.index('-u') + 1]
- pid = int(parts[-1])
- if pid not in live_pids and udid not in live_udids:
- self._kill_pid_gracefully(pid)
- cleaned += 1
- LogManager.method_warning(f"孤儿 iproxy 已清理：udid={udid}, pid={pid}", method, udid=udid)
- except (ValueError, IndexError):
+ for ent in self._get_all_iproxy_entries():
+ pid = ent["pid"]
+ udid = ent.get("udid")
+ local_port = ent.get("local_port")
+ # 完全不认识的进程（无法解析 udid），跳过
+ if not udid:
continue
+ # 1) 完全孤儿：udid 不在活跃设备集，且 pid 不是任何已跟踪 pid → 杀
+ if udid not in live_udids and pid not in live_pid_by_udid.values():
+ self._kill_pid_gracefully(pid, silent=True)
+ cleaned += 1
+ LogManager.method_info(f"孤儿 iproxy 已清理：udid={udid}, pid={pid}", method)
+ continue
+
+ # 2) 同 UDID 的非当前实例：udid 活跃，但 pid != 当前 pid，且本地端口也不是当前端口 → 杀
+ live_pid = live_pid_by_udid.get(udid)
+ live_port = live_port_by_udid.get(udid)
+ if udid in live_udids and pid != live_pid:
+ if (local_port is None) or (live_port is None) or (local_port != live_port):
+ self._kill_pid_gracefully(pid, silent=True)
+ cleaned += 1
+ LogManager.method_info(f"清理同UDID旧实例：udid={udid}, pid={pid}, local_port={local_port}", method)
+
if cleaned:
- LogManager.method_info(f"孤儿清理完成，数量={cleaned}", method, udid="system")
+ LogManager.method_info(f"孤儿清理完成，数量={cleaned}", method)
# ---------------- 按 PID 强杀 ----------------
- def _kill_pid_gracefully(self, pid: int):
- method = "_kill_pid_gracefully"
+ def _kill_pid_gracefully(self, pid: int, silent: bool = False):
+ """优雅地结束进程，不弹出cmd窗口"""
try:
- p = psutil.Process(pid)
- p.terminate()
- try:
- p.wait(timeout=1.0)
- LogManager.method_info(f"进程已终止：pid={pid}", method, udid="system")
- except psutil.TimeoutExpired:
- p.kill()
- LogManager.method_warning(f"进程被强制 kill：pid={pid}", method, udid="system")
+ if platform.system() == "Windows":
+ # 不弹窗方式
+ subprocess.run(
+ ["taskkill", "/PID", str(pid), "/F", "/T"],
+ stdout=subprocess.DEVNULL if silent else None,
+ stderr=subprocess.DEVNULL if silent else None,
+ creationflags=getattr(subprocess, "CREATE_NO_WINDOW", 0x08000000),
+ )
+ else:
+ # Linux / macOS
+ os.kill(pid, signal.SIGTERM)
except Exception as e:
- LogManager.method_warning(f"kill 进程异常：pid={pid}, err={e}", method, udid="system")
+ LogManager.method_error(f"结束进程 {pid} 失败: {e}", "_kill_pid_gracefully")
# ---------------- 端口工具（兜底） ----------------
def _pick_free_port(self, start: int = None, limit: int = 2000) -> int:
diff --git a/Module/FlaskService.py b/Module/FlaskService.py
index f93e25a..02bf6aa 100644
--- a/Module/FlaskService.py
+++ b/Module/FlaskService.py
@@ -716,6 +716,11 @@ def test():
# 关闭会话
session.close()
+# 获取ai配置
+@app.route("/getAiConfig", methods=['GET'])
+def getAiConfig():
+ data = IOSAIStorage.load("aiConfig.json")
+ return ResultData(data=data).toJson()
if __name__ == '__main__':
app.run("0.0.0.0", port=5000, debug=True, use_reloader=False)
diff --git a/Module/IOSActivator.py b/Module/IOSActivator.py
index fdb1977..8651f1d 100644
--- a/Module/IOSActivator.py
+++ b/Module/IOSActivator.py
@@ -1,32 +1,307 @@
+# -*- coding: utf-8 -*-
import os
import re
import sys
+import atexit
+import signal
import socket
import subprocess
-from typing import Optional
+from typing import Optional, List, Tuple, Dict, Set
from Entity.Variables import WdaAppBundleId
class IOSActivator:
"""
- 轻量 iOS 激活器（仅代码调用） - 打包安全版
- 1) 启动 `pymobiledevice3 remote tunneld`（子进程常驻）
- 2) 自动挂载 Developer Disk Image（进程内调用 CLI）
- 3) 设备隧道就绪后启动 WDA（进程内调用 CLI）：
- - 优先使用 `--rsd `（支持 IPv6）
- - 失败再用 `PYMOBILEDEVICE3_TUNNEL=127.0.0.1:` 回退（仅 IPv4）
+ 轻量 iOS 激活器（仅代码调用） - 进程/网卡可控版
+ 1) 启动 `pymobiledevice3 remote tunneld`（可常驻/可一次性）
+ 2) 自动挂载 DDI
+ 3) 隧道就绪后启动 WDA
+ 4) 程序退出或 keep_tunnel=False 时，确保 tunneld 进程与虚拟网卡被清理
"""
- def __init__(self, python_executable: Optional[str] = None):
- # 仅用于旧逻辑兼容；本版本已不依赖 self.python 去 -m 调 CLI
- self.python = python_executable or None
+ # ---------- 正则 ----------
+ HTTP_RE = re.compile(r"http://([0-9.]+):(\d+)")
+ RSD_CREATED_RE = re.compile(r"Created tunnel\s+--rsd\s+([^\s]+)\s+(\d+)")
+ RSD_FALLBACK_RE = re.compile(r"--rsd\s+(\S+?)[\s:](\d+)")
+ IFACE_RE = re.compile(r"\b(pymobiledevice3-tunnel-[^\s/\\]+)\b", re.IGNORECASE)
- # =========================================================================
- # 内部工具：进程内调用 pymobiledevice3 CLI
- # =========================================================================
- def _pmd3_run(self, args: list[str], udid: str, extra_env: Optional[dict] = None) -> str:
- import subprocess
+ def __init__(self, python_executable: Optional[str] = None):
+ self.python = python_executable or None
+ self._live_procs: Dict[str, subprocess.Popen] = {} # udid -> tunneld proc
+ self._live_ifaces: Dict[str, Set[str]] = {} # udid -> {iface names}
+ self._registered = False
+
+ # =============== 公共入口 ===============
+ def activate(
+ self,
+ udid: str,
+ wda_bundle_id: Optional[str] = WdaAppBundleId,
+ ready_timeout_sec: float = 120.0,
+ mount_retries: int = 3,
+ backoff_seconds: float = 2.0,
+ rsd_probe_retries: int = 5,
+ rsd_probe_delay_sec: float = 3.0,
+ pre_mount_first: bool = True,
+ keep_tunnel: bool = False, # << 新增：默认 False，一次性用完就关
+ broad_cleanup_on_exit: bool = True, # << 退出时顺带清理所有 pmd3 残留网卡
+ ) -> str:
+ """
+ 执行：挂镜像(可选) -> 开隧道 -> （等待 RSD 就绪）-> 启动 WDA
+ - 默认 keep_tunnel=False：WDA 启动后关闭隧道（避免虚拟网卡常驻）
+ - keep_tunnel=True：让隧道常驻，交由 atexit/signal 或上层调用 stop_tunnel() 清理
+ """
+ if not udid or not isinstance(udid, str):
+ raise ValueError("udid is required and must be a non-empty string")
+
+ print(f"[activate] UDID = {udid}")
+ self._ensure_exit_hooks(broad_cleanup_on_exit=broad_cleanup_on_exit)
+
+ # 管理员检测（Windows 清理网卡需要）
+ if os.name == "nt":
+ import ctypes
+ try:
+ is_admin = ctypes.windll.shell32.IsUserAnAdmin() != 0
+ except Exception:
+ is_admin = False
+ if not is_admin:
+ print("[⚠] 未以管理员运行：若需要移除虚拟网卡，可能失败。")
+
+ import time as _t
+ start_ts = _t.time()
+
+ # 1) 预挂载
+ if pre_mount_first:
+ try:
+ self._auto_mount_developer_disk(udid, retries=mount_retries, backoff_seconds=backoff_seconds)
+ _t.sleep(2)
+ except Exception as e:
+ print(f"[activate] 预挂载失败（继续尝试开隧道后再挂载一次）：{e}")
+
+ # 2) 启动 tunneld
+ http_host = http_port = rsd_host = rsd_port = None
+ iface_names: Set[str] = set()
+ proc, port = self._start_tunneld(udid)
+ self._live_procs[udid] = proc
+ self._live_ifaces[udid] = iface_names
+
+ captured: List[str] = []
+ wda_started = False
+ mount_done = pre_mount_first
+
+ try:
+ assert proc.stdout is not None
+ for line in proc.stdout:
+ captured.append(line)
+ print(f"[tunneld] {line}", end="")
+
+ # 捕获虚拟网卡名
+ for m in self.IFACE_RE.finditer(line):
+ iface_names.add(m.group(1))
+
+ if proc.poll() is not None:
+ break
+
+ # 捕获 HTTP 网关端口
+ if http_port is None:
+ m = self.HTTP_RE.search(line)
+ if m:
+ http_host, http_port = m.group(1), m.group(2)
+ print(f"[tunneld] Tunnel API: {http_host}:{http_port}")
+
+ # 捕获 RSD（仅识别当前 UDID 的行）
+ if not self._line_is_for_udid(line, udid):
+ continue
+ m = self.RSD_CREATED_RE.search(line) or self.RSD_FALLBACK_RE.search(line)
+ if m and not rsd_host and not rsd_port:
+ rsd_host, rsd_port = m.group(1), m.group(2)
+ print(f"[tunneld] Device-level tunnel ready (RSD {rsd_host}:{rsd_port}).")
+
+ # 启动 WDA
+ if (not wda_started) and wda_bundle_id and (rsd_host and rsd_port):
+ if not mount_done:
+ self._auto_mount_developer_disk(udid, retries=mount_retries, backoff_seconds=backoff_seconds)
+ _t.sleep(2)
+ mount_done = True
+
+ if self._wait_for_rsd_ready(rsd_host, rsd_port, retries=rsd_probe_retries, delay=rsd_probe_delay_sec):
+ self._launch_wda_via_rsd(bundle_id=wda_bundle_id, rsd_host=rsd_host, rsd_port=rsd_port, udid=udid)
+ wda_started = True
+ elif http_host and http_port:
+ self._launch_wda_via_http_tunnel(bundle_id=wda_bundle_id, http_host=http_host, http_port=http_port, udid=udid)
+ wda_started = True
+ else:
+ raise RuntimeError("No valid tunnel endpoint for WDA.")
+
+ # 超时保护
+ if (not wda_started) and ready_timeout_sec > 0 and (_t.time() - start_ts > ready_timeout_sec):
+ print(f"[tunneld] Timeout waiting for device tunnel ({ready_timeout_sec}s). Aborting.")
+ break
+
+ # 结束/收尾
+ out = "".join(captured)
+
+ finally:
+ if not keep_tunnel:
+ # 一次性模式：WDA 已启动后就关闭隧道并清理网卡
+ self.stop_tunnel(udid, broad_cleanup=broad_cleanup_on_exit)
+
+ print("[activate] Done.")
+ return out
+
+ # =============== 外部可显式调用的清理 ===============
+ def stop_tunnel(self, udid: str, broad_cleanup: bool = True):
+ """关闭某 UDID 的 tunneld，并清理已知/残留的 pmd3 虚拟网卡。"""
+ proc = self._live_procs.pop(udid, None)
+ ifaces = self._live_ifaces.pop(udid, set())
+
+ # 1) 结束进程
+ if proc:
+ try:
+ proc.terminate()
+ proc.wait(timeout=5)
+ except subprocess.TimeoutExpired:
+ try:
+ proc.kill()
+ proc.wait(timeout=3)
+ except Exception:
+ pass
+ # 兜底：杀掉本进程树内可能残留的 tunneld
+ self._kill_stray_tunneld_children()
+
+ # 2) 清理网卡
+ try:
+ if os.name == "nt":
+ # 先按已知名精确删除
+ for name in sorted(ifaces):
+ self._win_remove_adapter(name)
+ # 宽匹配兜底
+ if broad_cleanup:
+ self._win_remove_all_pmd3_adapters()
+ else:
+ # *nix 基本不需要手动删，若有需要可在此处添加 ip link delete 等
+ pass
+ except Exception as e:
+ print(f"[cleanup] adapter cleanup error: {e}")
+
+ # =============== 内部：启动 tunneld ===============
+ def _start_tunneld(self, udid: str) -> Tuple[subprocess.Popen, int]:
+ port = self._pick_available_port()
+ launcher, env2 = self._resolve_pmd3_argv_and_env()
+ env2["PYTHONUNBUFFERED"] = "1"
+ env2.setdefault("PYTHONIOENCODING", "utf-8")
+ env2["PYMOBILEDEVICE3_UDID"] = udid
+
+ cmd = self._ensure_str_list([*launcher, "remote", "tunneld", "--port", str(port)])
+ print("[activate] 启动隧道:", " ".join(cmd))
+
+ proc = subprocess.Popen(
+ cmd,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ text=True,
+ bufsize=1,
+ universal_newlines=True,
+ env=env2,
+ **self._win_hidden_popen_kwargs()
+ )
+ return proc, port
+
+ # =============== 退出/信号回收 ===============
+ def _ensure_exit_hooks(self, broad_cleanup_on_exit: bool):
+ if self._registered:
+ return
+ self._registered = True
+
+ def _on_exit():
+ # 逐个关闭存活隧道
+ for udid in list(self._live_procs.keys()):
+ try:
+ self.stop_tunnel(udid, broad_cleanup=broad_cleanup_on_exit)
+ except Exception:
+ pass
+
+ atexit.register(_on_exit)
+
+ def _signal_handler(signum, frame):
+ _on_exit()
+ # 默认行为：再次发出信号退出
+ try:
+ signal.signal(signum, signal.SIG_DFL)
+ except Exception:
+ pass
+ os.kill(os.getpid(), signum)
+
+ for sig in (signal.SIGINT, signal.SIGTERM):
+ try:
+ signal.signal(sig, _signal_handler)
+ except Exception:
+ pass # 某些环境不允许设置
+
+ # =============== Windows 虚拟网卡清理 ===============
+ def _win_remove_adapter(self, name: str):
+ """按名删除一个虚拟网卡。"""
+ print(f"[cleanup] remove adapter: {name}")
+ # 先尝试 PowerShell（需要管理员）
+ ps = [
+ "powershell", "-NoProfile", "-ExecutionPolicy", "Bypass", "-Command",
+ f"$a=Get-NetAdapter -Name '{name}' -ErrorAction SilentlyContinue; "
+ f"if($a){{ Disable-NetAdapter -Name '{name}' -Confirm:$false -PassThru | Out-Null; "
+ f"Remove-NetAdapter -Name '{name}' -Confirm:$false -ErrorAction SilentlyContinue; }}"
+ ]
+ try:
+ subprocess.run(ps, check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, **self._win_hidden_popen_kwargs())
+ return
+ except Exception:
+ pass
+
+ # 兜底：netsh 禁用
+ try:
+ subprocess.run(
+ ["netsh", "interface", "set", "interface", name, "disable"],
+ check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, **self._win_hidden_popen_kwargs()
+ )
+ except Exception:
+ pass
+
+ def _win_remove_all_pmd3_adapters(self):
+ """宽匹配删除所有 pymobiledevice3-tunnel-* 网卡（防残留）。"""
+ print("[cleanup] sweeping all pymobiledevice3-tunnel-* adapters")
+ ps = [
+ "powershell", "-NoProfile", "-ExecutionPolicy", "Bypass", "-Command",
+ r"$nics=Get-NetAdapter -Name 'pymobiledevice3-tunnel-*' -ErrorAction SilentlyContinue; "
+ r"foreach($n in $nics){ Disable-NetAdapter -Name $n.Name -Confirm:$false -PassThru | Out-Null; "
+ r"Remove-NetAdapter -Name $n.Name -Confirm:$false -ErrorAction SilentlyContinue; }"
+ ]
+ try:
+ subprocess.run(ps, check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, **self._win_hidden_popen_kwargs())
+ except Exception:
+ pass
+
+ def _kill_stray_tunneld_children(self):
+ """在当前进程空间内尽量清理残留的 tunneld 子进程。"""
+ import psutil
+ try:
+ me = psutil.Process(os.getpid())
+ for ch in me.children(recursive=True):
+ try:
+ cmd = " ".join(ch.cmdline()).lower()
+ except Exception:
+ cmd = ""
+ if "pymobiledevice3" in cmd and "remote" in cmd and "tunneld" in cmd:
+ try:
+ ch.terminate()
+ ch.wait(2)
+ except Exception:
+ try:
+ ch.kill()
+ except Exception:
+ pass
+ except Exception:
+ pass
+
+ # =============== 其它工具 & 你原有的方法（未改动核心逻辑） ===============
+ def _pmd3_run(self, args: List[str], udid: str, extra_env: Optional[dict] = None) -> str:
launcher, env = self._resolve_pmd3_argv_and_env()
env["PYMOBILEDEVICE3_UDID"] = udid
env["PYTHONUNBUFFERED"] = "1"
@@ -50,92 +325,61 @@ class IOSActivator:
except subprocess.CalledProcessError as exc:
raise RuntimeError(exc.output or f"pymobiledevice3 执行失败，退出码 {exc.returncode}")
- def _pmd3_run_subprocess(self, full_args: list[str], extra_env: Optional[dict] = None) -> str:
- """
- 兜底：通过子进程执行 pymobiledevice3（使用 _resolve_pmd3_argv_and_env()）。
- """
- import subprocess
+ def _ensure_str_list(self, seq):
+ return [str(x) for x in seq]
- launcher, env = self._resolve_pmd3_argv_and_env()
- if extra_env:
- for k, v in extra_env.items():
- if v is None:
- env.pop(k, None)
- else:
- env[k] = str(v)
+ def _win_hidden_popen_kwargs(self):
+ if os.name != "nt":
+ return {}
+ si = subprocess.STARTUPINFO()
+ si.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+ si.wShowWindow = 0 # SW_HIDE
+ return {
+ "startupinfo": si,
+ "creationflags": getattr(subprocess, "CREATE_NO_WINDOW", 0x08000000),
+ }
- cmd = [*launcher, *full_args]
- cmd = self._ensure_str_list(cmd)
- print("[pmd3-subproc]", " ".join(cmd))
- try:
- out = subprocess.check_output(
- cmd,
- text=True,
- stderr=subprocess.STDOUT,
- env=env,
- **self._win_hidden_popen_kwargs()
- )
- return out or ""
- except subprocess.CalledProcessError as exc:
- raise RuntimeError(exc.output or f"pymobiledevice3 子进程执行失败，代码 {exc.returncode}")
-
- # =========================================================================
- # 旧版环境依赖的替代方案：仅用于启动 tunneld 的子进程（需要常驻）
- # =========================================================================
def _resolve_pmd3_argv_and_env(self):
- import os, sys, shutil, subprocess
+ import shutil, subprocess
from pathlib import Path
env = os.environ.copy()
env["PYTHONUNBUFFERED"] = "1"
env.setdefault("PYTHONIOENCODING", "utf-8")
- # 1) 明确使用 IOSAI_PYTHON（如果上层已设置）
prefer_py = env.get("IOSAI_PYTHON")
-
- # 2) 构造一批候选路径（先根目录，再 Scripts）
base = Path(sys.argv[0]).resolve()
base_dir = base.parent if base.is_file() else base
py_name = "python.exe" if os.name == "nt" else "python"
sidecar_candidates = [
- base_dir / "python-rt" / py_name, # ✅ 嵌入式/你现在的摆放方式
- base_dir / "python-rt" / "Scripts" / py_name, # 兼容虚拟环境式
+ base_dir / "python-rt" / py_name,
+ base_dir / "python-rt" / "Scripts" / py_name,
base_dir.parent / "python-rt" / py_name,
base_dir.parent / "python-rt" / "Scripts" / py_name,
]
-
- # 若外层已通过 IOSAI_PYTHON 指了路径，也放进候选
if prefer_py:
sidecar_candidates.insert(0, Path(prefer_py))
- # 打印探测
for cand in sidecar_candidates:
print(f"[IOSAI] 🔎 probing sidecar at: {cand}")
if cand.is_file():
try:
out = subprocess.check_output(
[str(cand), "-c", "import pymobiledevice3;print('ok')"],
- text=True,
- stderr=subprocess.STDOUT,
- env=env,
- timeout=6,
- **self._win_hidden_popen_kwargs()
+ text=True, stderr=subprocess.STDOUT, env=env, timeout=6, **self._win_hidden_popen_kwargs()
)
if "ok" in out:
print(f"[IOSAI] ✅ sidecar selected: {cand}")
return ([str(cand), "-u", "-m", "pymobiledevice3"], env)
except Exception:
- # 候选解释器存在但没装 pmd3，就继续找下一个
pass
- # 3) 回退：系统 PATH 里直接找 pymobiledevice3 可执行
exe = shutil.which("pymobiledevice3")
if exe:
print(f"[IOSAI] ✅ use PATH executable: {exe}")
return ([exe], env)
- # 4) 兜底：从系统 Python 里找装了 pmd3 的解释器
py_candidates = []
base_exec = getattr(sys, "_base_executable", None)
if base_exec and os.path.isfile(base_exec):
@@ -150,11 +394,7 @@ class IOSActivator:
try:
out = subprocess.check_output(
[py, "-c", "import pymobiledevice3;print('ok')"],
- text=True,
- stderr=subprocess.STDOUT,
- env=env,
- timeout=6,
- **self._win_hidden_popen_kwargs()
+ text=True, stderr=subprocess.STDOUT, env=env, timeout=6, **self._win_hidden_popen_kwargs()
)
if "ok" in out:
print(f"[IOSAI] ✅ system python selected: {py}")
@@ -164,31 +404,10 @@ class IOSActivator:
raise RuntimeError("未检测到可用的 pymobiledevice3（建议携带 python-rt 或安装系统 Python+pmd3）。")
- def _ensure_str_list(self, seq):
- return [str(x) for x in seq]
-
- def _win_hidden_popen_kwargs(self):
- """在 Windows 上隐藏子进程窗口；非 Windows 返回空参数。"""
- if os.name != "nt":
- return {}
- import subprocess as _sp
- si = _sp.STARTUPINFO()
- si.dwFlags |= _sp.STARTF_USESHOWWINDOW
- si.wShowWindow = 0 # SW_HIDE
- return {
- "startupinfo": si,
- "creationflags": getattr(_sp, "CREATE_NO_WINDOW", 0x08000000),
- }
-
- # =========================================================================
- # 功能函数-
- # =========================================================================
+ # -------- DDI / RSD / 启动 WDA （与你原逻辑一致） --------
def _auto_mount_developer_disk(self, udid: str, retries: int = 3, backoff_seconds: float = 2.0) -> None:
- """
- 使用进程内 CLI：pymobiledevice3 mounter auto-mount（带重试）
- """
- import time
- last_err_text = ""
+ import time as _t
+ last_err = ""
for i in range(max(1, retries)):
try:
out = self._pmd3_run(["mounter", "auto-mount"], udid)
@@ -201,24 +420,17 @@ class IOSActivator:
print("[mounter] Developer disk image mounted.")
return
except Exception as e:
- last_err_text = str(e)
+ last_err = str(e)
if i < retries - 1:
print(f"[mounter] attempt {i+1}/{retries} failed, retrying in {backoff_seconds}s ...")
- try:
- time.sleep(backoff_seconds)
- except Exception:
- pass
+ _t.sleep(backoff_seconds)
else:
- raise RuntimeError(f"Auto-mount failed after {retries} attempts.\n{last_err_text}")
+ raise RuntimeError(f"Auto-mount failed after {retries} attempts.\n{last_err}")
def _is_ipv4_host(self, host: str) -> bool:
- import re as _re
- return bool(_re.match(r"^\d{1,3}(\.\d{1,3}){3}$", host))
+ return bool(re.match(r"^\d{1,3}(\.\d{1,3}){3}$", host))
def _wait_for_rsd_ready(self, rsd_host: str, rsd_port: str, retries: int = 5, delay: float = 3.0) -> bool:
- """
- 探测 RSD 通道是否就绪：直接尝试 TCP 连接。
- """
port_int = int(rsd_port)
for i in range(1, retries + 1):
print(f"[rsd] Probing RSD {rsd_host}:{rsd_port} (attempt {i}/{retries}) ...")
@@ -234,42 +446,27 @@ class IOSActivator:
return False
def _launch_wda_via_rsd(self, bundle_id: str, rsd_host: str, rsd_port: str, udid: str) -> None:
- """
- 使用进程内 CLI：pymobiledevice3 developer dvt launch --rsd
- """
print(f"[wda] Launch via RSD {rsd_host}:{rsd_port}, bundle: {bundle_id}")
- out = self._pmd3_run(
- ["developer", "dvt", "launch", bundle_id, "--rsd", rsd_host, rsd_port],
- udid=udid,
- )
+ out = self._pmd3_run(["developer", "dvt", "launch", bundle_id, "--rsd", rsd_host, rsd_port], udid=udid)
if out:
for line in out.splitlines():
print(f"[wda] {line}")
print("[wda] Launch via RSD completed.")
def _launch_wda_via_http_tunnel(self, bundle_id: str, http_host: str, http_port: str, udid: str) -> None:
- """
- 退路：通过 HTTP 网关端口设置 PYMOBILEDEVICE3_TUNNEL（仅 IPv4）。
- 使用进程内 CLI 启动 WDA。
- """
if not self._is_ipv4_host(http_host):
raise RuntimeError(f"HTTP tunnel host must be IPv4, got {http_host}")
-
tunnel_endpoint = f"{http_host}:{http_port}"
print(f"[wda] Launch via HTTP tunnel {tunnel_endpoint}, bundle: {bundle_id}")
-
- out = self._pmd3_run(
- ["developer", "dvt", "launch", bundle_id],
- udid=udid,
- extra_env={"PYMOBILEDEVICE3_TUNNEL": tunnel_endpoint},
- )
+ out = self._pmd3_run(["developer", "dvt", "launch", bundle_id], udid=udid,
+ extra_env={"PYMOBILEDEVICE3_TUNNEL": tunnel_endpoint})
if out:
for line in out.splitlines():
print(f"[wda] {line}")
print("[wda] Launch via HTTP tunnel completed.")
+ # -------- 端口挑选 --------
def _pick_available_port(self, base=49151, step=10) -> int:
- """挑选一个可用端口（避免重复）"""
for i in range(0, 1000, step):
port = base + i
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
@@ -277,197 +474,9 @@ class IOSActivator:
return port
raise RuntimeError("No free port found for tunneld")
- # =========================================================================
- # 对外方法
- # =========================================================================
- def activate(
- self,
- udid: str,
- wda_bundle_id: Optional[str] = WdaAppBundleId,
- ready_timeout_sec: float = 120.0,
- mount_retries: int = 3,
- backoff_seconds: float = 2.0,
- rsd_probe_retries: int = 5,
- rsd_probe_delay_sec: float = 3.0,
- pre_mount_first: bool = True,
- ) -> str:
- """
- 执行：挂镜像(可选) -> 开隧道 -> （等待 RSD 就绪）-> 启动 WDA
- - 优先用 `--rsd` 启动
- - 失败再用 HTTP 网关作为退路
- """
- if not udid or not isinstance(udid, str):
- raise ValueError("udid is required and must be a non-empty string")
-
- print(f"[activate] UDID = {udid}")
-
- # ⚠️ 检查管理员权限
- if os.name == "nt":
- import ctypes
- try:
- is_admin = ctypes.windll.shell32.IsUserAnAdmin() != 0
- except Exception:
- is_admin = False
- if not is_admin:
- print("[⚠️] 当前进程未以管理员身份运行，tunneld 可能无法创建 USB 隧道。")
-
- import time as _t
- start_ts = _t.time()
-
- # 1) (可选) 先挂载，避免 tidevice 并发 DDI 竞态
- if pre_mount_first:
- try:
- self._auto_mount_developer_disk(udid, retries=mount_retries, backoff_seconds=backoff_seconds)
- _t.sleep(2) # 稳定 DDI
- except Exception as e:
- print(f"[activate] 预挂载失败（继续尝试开隧道后再挂载一次）：{e}")
-
- # 2) 启动 tunneld 子进程
- port = self._pick_available_port()
- launcher, env2 = self._resolve_pmd3_argv_and_env()
- env2["PYTHONUNBUFFERED"] = "1"
- env2.setdefault("PYTHONIOENCODING", "utf-8")
- env2["PYMOBILEDEVICE3_UDID"] = udid
-
- cmd = self._ensure_str_list([*launcher, "remote", "tunneld", "--port", str(port)])
- print("[activate] 使用命令启动隧道:", " ".join(cmd))
-
- proc = subprocess.Popen(
- cmd,
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT,
- text=True,
- bufsize=1,
- universal_newlines=True,
- env=env2,
- **self._win_hidden_popen_kwargs()
- )
-
- captured: list[str] = []
- http_host: Optional[str] = None
- http_port: Optional[str] = None
- rsd_host: Optional[str] = None
- rsd_port: Optional[str] = None
- device_tunnel_ready = False
- wda_started = False
- mount_done = pre_mount_first
-
- HTTP_RE = re.compile(r"http://([0-9.]+):(\d+)")
- RSD_CREATED_RE = re.compile(r"Created tunnel\s+--rsd\s+([^\s]+)\s+(\d+)")
- RSD_FALLBACK_RE = re.compile(r"--rsd\s+(\S+?)[\s:](\d+)")
-
- try:
- assert proc.stdout is not None
- for line in proc.stdout:
- captured.append(line)
- print(f"[tunneld] {line}", end="")
-
- if proc.poll() is not None:
- break
-
- # 捕获 HTTP 网关端口
- if http_port is None:
- m = HTTP_RE.search(line)
- if m:
- http_host, http_port = m.group(1), m.group(2)
- print(f"[tunneld] Tunnel API: {http_host}:{http_port}")
-
- # ✅ 捕获 RSD（仅识别当前 UDID 的行）
- if self._line_is_for_udid(line, udid):
- m = RSD_CREATED_RE.search(line) or RSD_FALLBACK_RE.search(line)
- if m and not device_tunnel_ready:
- rsd_host, rsd_port = m.group(1), m.group(2)
- device_tunnel_ready = True
- print(f"[tunneld] Device-level tunnel ready (RSD {rsd_host}:{rsd_port}).")
- else:
- continue # 其它设备的隧道日志忽略
-
- # 当设备隧道准备好后启动 WDA
- if (not wda_started) and wda_bundle_id and device_tunnel_ready:
- try:
- if not mount_done:
- self._auto_mount_developer_disk(
- udid, retries=mount_retries, backoff_seconds=backoff_seconds
- )
- _t.sleep(2)
- mount_done = True
-
- rsd_ok = False
- if rsd_host and rsd_port:
- rsd_ok = self._wait_for_rsd_ready(
- rsd_host, rsd_port,
- retries=rsd_probe_retries,
- delay=rsd_probe_delay_sec,
- )
-
- if rsd_ok:
- self._launch_wda_via_rsd(
- bundle_id=wda_bundle_id,
- rsd_host=rsd_host,
- rsd_port=rsd_port,
- udid=udid,
- )
- else:
- if http_host and http_port:
- self._launch_wda_via_http_tunnel(
- bundle_id=wda_bundle_id,
- http_host=http_host,
- http_port=http_port,
- udid=udid,
- )
- else:
- raise RuntimeError("No valid tunnel endpoint for fallback.")
-
- wda_started = True
-
- except RuntimeError as exc:
- print(str(exc), file=sys.stderr)
- proc.terminate()
- try:
- proc.wait(timeout=5)
- except subprocess.TimeoutExpired:
- proc.kill()
- raise
-
- # 超时保护
- if (not wda_started) and ready_timeout_sec > 0 and (_t.time() - start_ts > ready_timeout_sec):
- print(f"[tunneld] Timeout waiting for device tunnel ({ready_timeout_sec}s). Aborting.")
- proc.terminate()
- try:
- proc.wait(timeout=5)
- except subprocess.TimeoutExpired:
- proc.kill()
- break
-
- # 结束清理
- try:
- return_code = proc.wait(timeout=5)
- except subprocess.TimeoutExpired:
- proc.kill()
- return_code = proc.returncode or -9
-
- output = "".join(captured)
- if return_code != 0 and not wda_started:
- raise RuntimeError(f"tunneld exited with code {return_code}.\n{output}")
-
- print("[activate] Done.")
- return output
-
- except KeyboardInterrupt:
- print("\n[activate] Interrupted, cleaning up ...", file=sys.stderr)
- try:
- proc.terminate()
- proc.wait(timeout=5)
- except Exception:
- try:
- proc.kill()
- except Exception:
- pass
- raise
-
+ # -------- UDID 过滤 --------
def _line_is_for_udid(self, line: str, udid: str) -> bool:
- """日志行是否属于目标 UDID。"""
try:
return udid.lower() in (line or "").lower()
except Exception:
- return False
+ return False
\ No newline at end of file
diff --git a/Module/Main.py b/Module/Main.py
index 65777ce..eb10e2f 100644
--- a/Module/Main.py
+++ b/Module/Main.py
@@ -49,7 +49,7 @@ def main(arg):
if __name__ == "__main__":
# 获取启动时候传递的参数
- # main(sys.argv)
+ main(sys.argv)
# 添加iOS开发包到电脑上
deployer = DevDiskImageDeployer(verbose=True)
diff --git a/Module/__pycache__/DeviceInfo.cpython-312.pyc b/Module/__pycache__/DeviceInfo.cpython-312.pyc
index fb33a677418d3014b852850fdf312d271fbec2f3..1912666c2feb4f6c4bbe34105663170f1c5026a0 100644
GIT binary patch
delta 21747
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
X$Qop_i0bUzs0uBcah*X(<>|ix^C-)6
diff --git a/Module/__pycache__/Main.cpython-312.pyc b/Module/__pycache__/Main.cpython-312.pyc
index 8def77f4807f4d0c73ab38c95cb3dd87800b8202..24cd69eac3ec15f66b9916510cd494ebbed61053 100644
GIT binary patch
delta 20
acmbOwJ4=@PG%qg~0}x0x{ocsk&j$cDDg{{p
delta 20
acmbOwJ4=@PG%qg~0}vci`?Zm~pAP^yl?9{#
diff --git a/Utils/ThreadManager.py b/Utils/ThreadManager.py
index 523fe26..a464052 100644
--- a/Utils/ThreadManager.py
+++ b/Utils/ThreadManager.py
@@ -1,80 +1,141 @@
import ctypes
import threading
+import time
from typing import Dict, Tuple, List
from Utils.LogManager import LogManager
-def _async_raise(tid: int, exc_type=KeyboardInterrupt):
- """向指定线程抛异常，强制跳出"""
- res = ctypes.pythonapi.PyThreadState_SetAsyncExc(ctypes.c_long(tid), ctypes.py_object(exc_type))
- if res == 0:
- raise ValueError("线程不存在")
- elif res > 1:
- ctypes.pythonapi.PyThreadState_SetAsyncExc(ctypes.c_long(tid), 0)
+def _async_raise(tid: int, exc_type=KeyboardInterrupt) -> bool:
+ """向指定线程抛异常（兜底方案）"""
+ try:
+ res = ctypes.pythonapi.PyThreadState_SetAsyncExc(
+ ctypes.c_long(tid), ctypes.py_object(exc_type)
+ )
+ if res == 0:
+ LogManager.method_info(f"线程 {tid} 不存在", "task")
+ return False
+ elif res > 1:
+ ctypes.pythonapi.PyThreadState_SetAsyncExc(ctypes.c_long(tid), 0)
+ LogManager.method_info(f"线程 {tid} 命中多个线程，已回滚", "task")
+ return False
+ return True
+ except Exception as e:
+ LogManager.method_error(f"强杀线程失败: {e}", "task")
+ return False
+
class ThreadManager:
_tasks: Dict[str, Dict] = {}
- _lock = threading.Lock()
+ _lock = threading.RLock()
@classmethod
- def add(cls, udid: str, thread: threading.Thread, event: threading.Event) -> Tuple[int, str]:
- LogManager.method_info(f"准备创建任务:{udid}", "task")
- LogManager.method_info("创建线程成功", "监控消息")
+ def _cleanup_if_dead(cls, udid: str):
+ """如果任务线程已结束，清理占位"""
+ obj = cls._tasks.get(udid)
+ if obj and not obj["thread"].is_alive():
+ cls._tasks.pop(udid, None)
+ LogManager.method_info(f"检测到 [{udid}] 线程已结束，自动清理。", "task")
+
+ @classmethod
+ def add(cls, udid: str, thread: threading.Thread, event: threading.Event, force: bool = False) -> Tuple[int, str]:
with cls._lock:
- # 判断当前设备是否有任务
- if cls._tasks.get(udid, None) is not None:
- return 1001, "当前设备已存在任务"
- thread.start()
- print(thread.ident)
+ cls._cleanup_if_dead(udid)
- cls._tasks[udid] = {
- "id": thread.ident,
- "thread": thread,
- "event": event
- }
- return 200, "创建成功"
+ # 已存在任务还在运行
+ old = cls._tasks.get(udid)
+ if old and old["thread"].is_alive():
+ if not force:
+ return 1001, "当前设备已存在任务"
+ LogManager.method_info(f"[{udid}] 检测到旧任务，尝试强制停止", "task")
+ cls._force_stop_locked(udid)
+
+ # 启动新任务
+ try:
+ thread.start()
+ cls._tasks[udid] = {
+ "id": thread.ident,
+ "thread": thread,
+ "event": event,
+ "start_time": time.time(),
+ }
+ LogManager.method_info(f"创建任务成功 [{udid}]，线程ID={thread.ident}", "task")
+ return 200, "创建成功"
+ except Exception as e:
+ LogManager.method_error(f"线程启动失败: {e}", "task")
+ return 1002, f"线程启动失败: {e}"
@classmethod
- def stop(cls, udid: str) -> Tuple[int, str]:
- try:
- print(cls._tasks)
- obj = cls._tasks.get(udid, None)
- obj["event"].set()
- r = cls._kill_thread(obj.get("id"))
- if r:
+ def stop(cls, udid: str, stop_timeout: float = 5.0, kill_timeout: float = 2.0) -> Tuple[int, str]:
+ """安全停止单个任务"""
+ with cls._lock:
+ obj = cls._tasks.get(udid)
+ if not obj:
+ return 200, "任务不存在"
+
+ thread = obj["thread"]
+ event = obj["event"]
+ tid = obj["id"]
+
+ LogManager.method_info(f"请求停止 [{udid}] 线程ID={tid}", "task")
+
+ # 已经结束
+ if not thread.is_alive():
cls._tasks.pop(udid, None)
- else:
- print("好像有问题")
+ return 200, "已结束"
+
+ # 1. 协作式停止
+ try:
+ event.set()
+ except Exception as e:
+ LogManager.method_error(f"[{udid}] 设置停止事件失败: {e}", "task")
+
+ thread.join(timeout=stop_timeout)
+ if not thread.is_alive():
+ cls._tasks.pop(udid, None)
+ LogManager.method_info(f"[{udid}] 协作式停止成功", "task")
+ return 200, "已停止"
+
+ # 2. 强杀兜底
+ LogManager.method_info(f"[{udid}] 协作式超时，尝试强杀", "task")
+ if _async_raise(tid):
+ thread.join(timeout=kill_timeout)
+
+ if not thread.is_alive():
+ cls._tasks.pop(udid, None)
+ LogManager.method_info(f"[{udid}] 强杀成功", "task")
+ return 200, "已停止"
+
+ # 3. 最终兜底：标记释放占位
+ LogManager.method_error(f"[{udid}] 无法停止（线程可能卡死），已释放占位", "task")
+ cls._tasks.pop(udid, None)
+ return 206, "停止超时，线程可能仍在后台运行"
+
+ @classmethod
+ def _force_stop_locked(cls, udid: str):
+ """内部用，带锁强制停止旧任务"""
+ obj = cls._tasks.get(udid)
+ if not obj:
+ return
+ try:
+ event = obj["event"]
+ event.set()
+ obj["thread"].join(timeout=2)
+ if obj["thread"].is_alive():
+ _async_raise(obj["id"])
+ obj["thread"].join(timeout=1)
except Exception as e:
- print(e)
- return 200, "操作成功"
+ LogManager.method_error(f"[{udid}] 强制停止失败: {e}", "task")
+ finally:
+ cls._tasks.pop(udid, None)
@classmethod
def batch_stop(cls, ids: List[str]) -> Tuple[int, str]:
- try:
- for udid in ids:
- cls.stop(udid)
- except Exception as e:
- print(e)
- return 200, "停止成功."
-
- @classmethod
- def _kill_thread(cls, tid: int) -> bool:
- """向原生线程 ID 抛 KeyboardInterrupt，强制跳出"""
- try:
- res = ctypes.pythonapi.PyThreadState_SetAsyncExc(ctypes.c_long(tid),
- ctypes.py_object(KeyboardInterrupt))
- # LogManager.method_info(f"向原生线程 {tid} 抛 KeyboardInterrupt，强制跳出", "task")
- if res == 0: # 线程已不存在
- print("线程不存在")
- return False
- if res > 1: # 命中多个线程，重置
- print("命中了多个线程")
- ctypes.pythonapi.PyThreadState_SetAsyncExc(ctypes.c_long(tid), 0)
- LogManager.method_info("杀死线程创建成功", "监控消息")
-
- print("杀死线程成功")
- return True
- except Exception as e:
- print("杀死线程出现问题 错误的原因：",e)
\ No newline at end of file
+ failed = []
+ for udid in ids:
+ code, msg = cls.stop(udid)
+ if code != 200:
+ failed.append(udid)
+ if failed:
+ return 207, f"部分任务未成功停止: {failed}"
+ return 200, "全部停止成功"
\ No newline at end of file
diff --git a/Utils/__pycache__/LogManager.cpython-312.pyc b/Utils/__pycache__/LogManager.cpython-312.pyc
index 4fab7ccb5e6edc76e1ee5f14d65ff69e19d81108..2607057c369146f2ec04baf0459c453df7218785 100644
GIT binary patch
delta 23
dcmX?Jbi9b~G%qg~0}v=S{myXG+Q?^V2>@Lc2NM7Q
delta 23
dcmX?Jbi9b~G%qg~0}vci`<0=mxslJ(5&&PG2SNY<
diff --git a/Utils/__pycache__/ThreadManager.cpython-312.pyc b/Utils/__pycache__/ThreadManager.cpython-312.pyc
index 1e67d5d86925a4d0cf34096a413191adba1eb7c1..c2b09b701808562d3919e5a8783da987be6bf0d2 100644
GIT binary patch
literal 8165
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
Nq8g}0q79nb{{W}9VaEUf
diff --git a/script/__pycache__/ScriptManager.cpython-312.pyc b/script/__pycache__/ScriptManager.cpython-312.pyc
index f355c047eaaf07ce8e8f415ebf26f63e67ea5cfa..cc81b14c3ed40f665b5c293b75f1f4291155509a 100644
GIT binary patch
delta 5478
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
delta 4703
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
B2hjik