zw/iOSAI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
milk
2025-10-23 21:38:18 +08:00
parent 26057d4afa
commit bfb105f324
7 changed files with 208 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

239
Module/DeviceInfo.py
View File

@@ -20,8 +20,15 @@ import socket
import http.client
from collections import defaultdict
import psutil
import hashlib
class DeviceInfo:
REMOVE_GRACE_SEC = 5.0 # 设备离线宽限期（秒）
ADD_STABLE_SEC = 1.5 # 设备上线稳定期（秒）
ORPHAN_COOLDOWN = 3.0 # 拓扑变更后暂停孤儿清理（秒）
def __init__(self):
self._port = 9110
self._models: Dict[str, DeviceModel] = {}
@@ -33,38 +40,70 @@ class DeviceInfo:
self._last_heal_check_ts = 0.0
self._heal_backoff: Dict[str, float] = defaultdict(float) # udid -> next_allowed_ts
# 并发保护 & 状态表
self._lock = threading.RLock()
self._port_by_udid: Dict[str, int] = {} # UDID -> local_port
self._pid_by_udid: Dict[str, int] = {} # UDID -> iproxy PID
# 抗抖：最近一次看到在线的时间 / 首次看到在线的时间
self._last_seen: Dict[str, float] = {} # udid -> ts
self._first_seen: Dict[str, float] = {} # udid -> ts(首次在线)
self._last_topology_change_ts = 0.0 # 最近一次“新增或真正移除”的时间
# ---------------- 主循环 ----------------
def listen(self):
orphan_gc_tick = 0
while True:
online = {d.udid for d in Usbmux().device_list() if d.conn_type == ConnectionType.USB}
now = time.time()
try:
usb = Usbmux().device_list()
online_now = {d.udid for d in usb if d.conn_type == ConnectionType.USB}
except Exception as e:
# 如果拉设备列表失败，本轮不做增删（避免误杀）
LogManager.warning(f"device_list() 异常：{e}")
time.sleep(1)
continue
# 拔掉——同步
for udid in list(self._models):
if udid not in online:
self._remove_device(udid)
# 记录“看到”的时间戳
for u in online_now:
if u not in self._first_seen:
self._first_seen[u] = now
self._last_seen[u] = now
# 插上——异步
new = [u for u in online if u not in self._models]
if new:
futures = {self._pool.submit(self._add_device, u): u for u in new}
# 处理真正移除（连续缺席超过宽限期）
with self._lock:
known = set(self._models.keys())
for udid in list(known):
last = self._last_seen.get(udid, 0.0)
if udid not in online_now and (now - last) >= self.REMOVE_GRACE_SEC:
self._remove_device(udid) # 真正下线
self._last_topology_change_ts = now
# 处理真正新增（连续在线超过稳定期）
new_candidates = [u for u in online_now if u not in known]
to_add = [u for u in new_candidates if (now - self._first_seen.get(u, now)) >= self.ADD_STABLE_SEC]
if to_add:
futures = {self._pool.submit(self._add_device, u): u for u in to_add}
for f in as_completed(futures, timeout=30):
try:
f.result()
self._last_topology_change_ts = time.time()
except Exception as e:
LogManager.error(f"异步连接失败：{e}")
# 定期健康检查 + 自愈
self._check_and_heal_tunnels(interval=2.0)
# 每 10 次（约10秒）清理一次孤儿 iproxy
# 每 10 次清理一次孤儿 iproxy（但在拓扑变更后 N 秒暂停执行，避免插拔风暴期误杀）
orphan_gc_tick += 1
if orphan_gc_tick >= 10:
orphan_gc_tick = 0
self._cleanup_orphan_iproxy()
if (time.time() - self._last_topology_change_ts) >= self.ORPHAN_COOLDOWN:
self._cleanup_orphan_iproxy()
time.sleep(1)
# ---------------- 新增设备 ----------------
def _add_device(self, udid: str):
if not self._trusted(udid):
@@ -78,27 +117,38 @@ class DeviceInfo:
print("未获取到设备屏幕信息")
return
print("获取设备信息成功")
port = self._alloc_port()
# 固定端口分配（加锁，避免竞态）
with self._lock:
port = self._alloc_port(udid)
proc = self._start_iproxy(udid, port)
if not proc:
print("启动iproxy失败")
return
model = DeviceModel(deviceId=udid, screenPort=port,
width=w, height=h, scale=s, type=1)
model.ready = True
self._models[udid] = model
self._procs[udid] = proc
with self._lock:
model = DeviceModel(deviceId=udid, screenPort=port,
width=w, height=h, scale=s, type=1)
model.ready = True
self._models[udid] = model
self._procs[udid] = proc
self._pid_by_udid[udid] = proc.pid
print("准备添加设备")
self._manager_send(model)
# ---------------- 移除设备 ----------------
# ---------------- 移除设备（仅在宽限期后调用） ----------------
def _remove_device(self, udid: str):
model = self._models.pop(udid, None)
with self._lock:
model = self._models.pop(udid, None)
proc = self._procs.pop(udid, None)
self._pid_by_udid.pop(udid, None)
# 不清 _port_by_udid，端口下次仍复用，前端更稳定
if not model:
return
model.type = 2
self._kill(self._procs.pop(udid, None))
self._kill(proc)
self._manager_send(model)
# ---------------- 工具函数 ----------------
@@ -141,23 +191,42 @@ class DeviceInfo:
print("获取设备信息遇到错误：", e)
return 0, 0, 0
...
# ---------------- 原来代码不变，只替换下面一个函数 ----------------
# ---------------- 端口映射（保留你之前的“先杀后启”“隐藏黑窗”修复） ----------------
def _start_iproxy(self, udid: str, port: int) -> Optional[subprocess.Popen]:
try:
# 确保端口空闲；不空闲则尝试换一个
if not self._is_port_free(port):
port = self._pick_free_port(max(self._port, port))
with self._lock:
old_pid = self._pid_by_udid.get(udid)
if old_pid:
self._kill_pid_gracefully(old_pid)
self._pid_by_udid.pop(udid, None)
time.sleep(0.2)
# 隐藏窗口 & 独立进程组（更好地终止）
flags = subprocess.CREATE_NO_WINDOW | subprocess.CREATE_NEW_PROCESS_GROUP
if not self._is_port_free(port):
port = self._pick_free_port(start=max(self._port, port))
return subprocess.Popen(
[self._iproxy_path, "-u", udid, str(port), str(wdaScreenPort)],
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL,
creationflags=flags
)
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
cmd = [self._iproxy_path, "-u", udid, str(port), str(wdaScreenPort)]
proc = subprocess.Popen(
cmd,
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL,
creationflags=creationflags,
startupinfo=startupinfo
)
self._procs[udid] = proc
self._pid_by_udid[udid] = proc.pid
self._port_by_udid[udid] = port
return proc
except Exception as e:
print(e)
return None
@@ -174,8 +243,26 @@ class DeviceInfo:
except Exception:
pass
def _alloc_port(self) -> int:
return self._pick_free_port(max(self._port, self._port))
# ---------------- 端口分配（加锁 + 稳定端口） ----------------
def _alloc_port(self, udid: str) -> int:
"""
为 UDID 分配一个**稳定**的本地端口：
- 同一 UDID 优先复用上次端口（减少前端切换）
- 初次分配使用 “20000-45000” 的稳定哈希起点向上探测空闲
"""
# 已有则直接复用
if udid in self._port_by_udid:
p = self._port_by_udid[udid]
if self._is_port_free(p):
return p
# 基于 UDID 计算稳定起点
h = int(hashlib.sha1(udid.encode("utf-8")).hexdigest(), 16)
start = 20000 + (h % 25000) # 20000~44999
# 避免和你类里默认的 9110 等端口冲突，向上找空闲
p = self._pick_free_port(start=start, limit=4000)
self._port_by_udid[udid] = p
return p
def _manager_send(self, model: DeviceModel):
try:
@@ -192,22 +279,23 @@ class DeviceInfo:
return str(path)
raise FileNotFoundError(f"iproxy 不存在: {path}")
# ------------ Windows 专用：列出所有 iproxy 命令行 ------------
# ------------ Windows 专用：列出所有 iproxy 命令行（更安全） ------------
def _get_all_iproxy_cmdlines(self) -> List[str]:
"""
使用 psutil 枚举 iproxy 进程，避免调用 wmic 造成的黑框闪烁。
返回形如："<完整命令行> <pid>" 的列表（兼容你后续的解析逻辑）。
"""
lines: List[str] = []
live_pids = set()
with self._lock:
live_pids = set(self._pid_by_udid.values())
for p in psutil.process_iter(attrs=["name", "cmdline", "pid"]):
try:
name = (p.info.get("name") or "").lower()
if name != "iproxy.exe":
continue
# 跳过我们自己登记在册的 iproxy，避免误杀
if p.info["pid"] in live_pids:
continue
cmdline = p.info.get("cmdline") or []
if not cmdline:
continue
# 与原逻辑保持一致：仅收集包含 -u 的 iproxy（我们需要解析 udid）
if "-u" in cmdline:
cmd = " ".join(cmdline)
lines.append(f"{cmd} {p.info['pid']}")
@@ -217,13 +305,19 @@ class DeviceInfo:
# ------------ 杀孤儿 ------------
def _cleanup_orphan_iproxy(self):
live_udids = set(self._models.keys())
live_udids = set()
live_pids = set()
with self._lock:
live_udids = set(self._models.keys())
live_pids = set(self._pid_by_udid.values())
for ln in self._get_all_iproxy_cmdlines():
parts = ln.split()
try:
udid = parts[parts.index('-u') + 1]
pid = int(parts[-1])
if udid not in live_udids:
# 既不在我们的 PID 表里，且 UDID 不在线，才算孤儿
if pid not in live_pids and udid not in live_udids:
self._kill_pid_gracefully(pid)
LogManager.warning(f'扫到孤儿 iproxy，已清理 {udid} PID={pid}')
except (ValueError, IndexError):
@@ -241,8 +335,7 @@ class DeviceInfo:
except Exception:
pass
# ------------ 端口工具 ------------
def _is_port_free(self, port: int) -> bool:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
@@ -254,7 +347,7 @@ class DeviceInfo:
return False
def _pick_free_port(self, start: int = None, limit: int = 2000) -> int:
"""从 start 起向上找一个空闲端口。"""
"""从 start 起向上找一个空闲端口。（注意：调用方务必在 self._lock 下）"""
p = self._port if start is None else start
tried = 0
while tried < limit:
@@ -274,9 +367,7 @@ class DeviceInfo:
conn = http.client.HTTPConnection("127.0.0.1", port, timeout=timeout)
conn.request("GET", "/")
resp = conn.getresponse()
# 2xx/3xx 都算活；某些构建下会是 200 带 multipart，也可能 302
alive = 200 <= resp.status < 400
# 尽量少读：只读很少字节避免成本
try:
resp.read(256)
except Exception:
@@ -287,36 +378,39 @@ class DeviceInfo:
return False
def _restart_iproxy(self, udid: str):
"""重启某个 udid 的 iproxy（带退避）"""
"""重启某个 udid 的 iproxy（带退避）。"""
now = time.time()
next_allowed = self._heal_backoff[udid]
if now < next_allowed:
return # 处于退避窗口内，先不重启
proc = self._procs.get(udid)
if proc:
self._kill(proc)
# 让端口真正释放
time.sleep(0.3)
with self._lock:
proc = self._procs.get(udid)
if proc:
self._kill(proc)
time.sleep(0.3)
model = self._models.get(udid)
if not model:
return
model = self._models.get(udid)
if not model:
return
# 如果端口被别的进程占用了，换一个新端口并通知管理器
if not self._is_port_free(model.screenPort):
new_port = self._pick_free_port(max(self._port, model.screenPort))
model.screenPort = new_port
self._models[udid] = model
self._manager_send(model) # 通知前端/上位机端口变化
# 如果端口被别的进程占用了，换一个新端口并通知管理器
if not self._is_port_free(model.screenPort):
new_port = self._pick_free_port(start=max(self._port, model.screenPort))
model.screenPort = new_port
self._models[udid] = model
self._port_by_udid[udid] = new_port
self._manager_send(model) # 通知前端/上位机端口变化
proc2 = self._start_iproxy(udid, model.screenPort)
if not proc2:
# 启动失败，设置退避（逐步增加上限）
self._heal_backoff[udid] = now + 2.0
return
proc2 = self._start_iproxy(udid, model.screenPort)
if not proc2:
# 启动失败，设置退避（逐步增加上限）
self._heal_backoff[udid] = now + 2.0
return
self._procs[udid] = proc2
self._pid_by_udid[udid] = proc2.pid
self._procs[udid] = proc2
# 成功后缩短退避
self._heal_backoff[udid] = now + 0.5
@@ -329,7 +423,11 @@ class DeviceInfo:
return
self._last_heal_check_ts = now
for udid, model in list(self._models.items()):
# 读取时也加锁，避免与增删设备并发冲突
with self._lock:
items = list(self._models.items())
for udid, model in items:
port = model.screenPort
if port <= 0:
continue
@@ -337,4 +435,3 @@ class DeviceInfo:
if not ok:
LogManager.warning(f"端口失活，准备自愈：udid={udid} port={port}")
self._restart_iproxy(udid)

47
Module/IOSActivator.py
View File

@@ -40,7 +40,13 @@ class IOSActivator:
cmd = [*launcher, *args]
print("[pmd3]", " ".join(map(str, cmd)))
try:
return subprocess.check_output(cmd, text=True, stderr=subprocess.STDOUT, env=env) or ""
return subprocess.check_output(
cmd,
text=True,
stderr=subprocess.STDOUT,
env=env,
**self._win_hidden_popen_kwargs()
) or ""
except subprocess.CalledProcessError as exc:
raise RuntimeError(exc.output or f"pymobiledevice3 执行失败，退出码 {exc.returncode}")
@@ -62,12 +68,17 @@ class IOSActivator:
cmd = self._ensure_str_list(cmd)
print("[pmd3-subproc]", " ".join(cmd))
try:
out = subprocess.check_output(cmd, text=True, stderr=subprocess.STDOUT, env=env)
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 的子进程（需要常驻）
# =========================================================================
@@ -105,7 +116,11 @@ class IOSActivator:
try:
out = subprocess.check_output(
[str(cand), "-c", "import pymobiledevice3;print('ok')"],
text=True, stderr=subprocess.STDOUT, env=env, timeout=6
text=True,
stderr=subprocess.STDOUT,
env=env,
timeout=6,
**self._win_hidden_popen_kwargs()
)
if "ok" in out:
print(f"[IOSAI] ✅ sidecar selected: {cand}")
@@ -135,7 +150,11 @@ class IOSActivator:
try:
out = subprocess.check_output(
[py, "-c", "import pymobiledevice3;print('ok')"],
text=True, stderr=subprocess.STDOUT, env=env, timeout=6
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}")
@@ -145,15 +164,26 @@ 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),
}
# =========================================================================
# 功能函数-
# =========================================================================
def _auto_mount_developer_disk(self, udid: str, retries: int = 3, backoff_seconds: float = 2.0) -> None:
print("[mounter] Developer disk image mounted.")
"""
使用进程内 CLI：pymobiledevice3 mounter auto-mount（带重试）
"""
@@ -310,6 +340,7 @@ class IOSActivator:
bufsize=1,
universal_newlines=True,
env=env2,
**self._win_hidden_popen_kwargs()
)
captured: list[str] = []
@@ -440,5 +471,3 @@ class IOSActivator:
return udid.lower() in (line or "").lower()
except Exception:
return False

BIN
Module/__pycache__/DeviceInfo.cpython-312.pyc
View File

Binary file not shown.

BIN
Module/__pycache__/Main.cpython-312.pyc
View File

Binary file not shown.