From d876743d3e3852c24a7ca14843e4929b26cb5d11 Mon Sep 17 00:00:00 2001
From: milk <53408947@qq.com>
Date: Sun, 28 Sep 2025 14:35:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=83=B5=E5=B0=B8iproxy?=
 =?UTF-8?q?=E8=BF=9B=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |   3 +-
 Module/DeviceInfo.py                          | 181 +++++++++++++++---
 Module/__pycache__/DeviceInfo.cpython-312.pyc | Bin 11230 -> 16651 bytes
 build.bat                                     |   3 +-
 4 files changed, 155 insertions(+), 32 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 758cc12..ee97e09 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,8 @@
   <component name="ChangeListManager">
     <list default="true" id="eceeff5e-51c1-459c-a911-d21ec090a423" name="Changes" comment="20250904-初步功能已完成">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Module/Main.py" beforeDir="false" afterPath="$PROJECT_DIR$/Module/Main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Module/DeviceInfo.py" beforeDir="false" afterPath="$PROJECT_DIR$/Module/DeviceInfo.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build.bat" beforeDir="false" afterPath="$PROJECT_DIR$/build.bat" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/Module/DeviceInfo.py b/Module/DeviceInfo.py
index d6b93e7..6867093 100644
--- a/Module/DeviceInfo.py
+++ b/Module/DeviceInfo.py
@@ -14,6 +14,10 @@ from Entity.Variables import WdaAppBundleId
 from Module.FlaskSubprocessManager import FlaskSubprocessManager
 from Utils.LogManager import LogManager
 
+import socket
+import http.client
+from collections import defaultdict
+import psutil
 
 class DeviceInfo:
     def __init__(self):
@@ -24,14 +28,20 @@ class DeviceInfo:
         self._iproxy_path  = self._find_iproxy()
         self._pool         = ThreadPoolExecutor(max_workers=6)
 
+        self._last_heal_check_ts = 0.0
+        self._heal_backoff: Dict[str, float] = defaultdict(float)  # udid -> next_allowed_ts
+
     # ---------------- 主循环 ----------------
     def listen(self):
+        orphan_gc_tick = 0
         while True:
             online = {d.udid for d in Usbmux().device_list() if d.conn_type == ConnectionType.USB}
+
             # 拔掉——同步
             for udid in list(self._models):
                 if udid not in online:
                     self._remove_device(udid)
+
             # 插上——异步
             new = [u for u in online if u not in self._models]
             if new:
@@ -41,6 +51,16 @@ class DeviceInfo:
                         f.result()
                     except Exception as e:
                         LogManager.error(f"异步连接失败：{e}")
+
+            # 定期健康检查 + 自愈
+            self._check_and_heal_tunnels(interval=2.0)
+
+            # 每 10 次（约10秒）清理一次孤儿 iproxy
+            orphan_gc_tick += 1
+            if orphan_gc_tick >= 10:
+                orphan_gc_tick = 0
+                self._cleanup_orphan_iproxy()
+
             time.sleep(1)
 
     # ---------------- 新增设备 ----------------
@@ -100,25 +120,29 @@ class DeviceInfo:
         try:
             c = wda.USBClient(udid, 8100)
             c.home()
-            size  = c.window_size()
+            size = c.window_size()
             scale = c.scale
             return int(size.width), int(size.height), float(scale)
-            return 0, 0, 0
         except Exception as e:
-            print("获取设备信息遇到错误：",e)
+            print("获取设备信息遇到错误：", e)
             return 0, 0, 0
 
     ...
     # ---------------- 原来代码不变，只替换下面一个函数 ----------------
     def _start_iproxy(self, udid: str, port: int) -> Optional[subprocess.Popen]:
         try:
-            # 隐藏窗口的核心参数
-            kw = {"creationflags": subprocess.CREATE_NO_WINDOW}
+            # 确保端口空闲；不空闲则尝试换一个
+            if not self._is_port_free(port):
+                port = self._pick_free_port(max(self._port, port))
+
+            # 隐藏窗口 & 独立进程组（更好地终止）
+            flags = subprocess.CREATE_NO_WINDOW | subprocess.CREATE_NEW_PROCESS_GROUP
+
             return subprocess.Popen(
                 [self._iproxy_path, "-u", udid, str(port), "9100"],
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.DEVNULL,
-                **kw
+                creationflags=flags
             )
         except Exception as e:
             print(e)
@@ -137,8 +161,7 @@ class DeviceInfo:
                 pass
 
     def _alloc_port(self) -> int:
-        self._port += 1
-        return self._port
+        return self._pick_free_port(max(self._port, self._port))
 
     def _manager_send(self, model: DeviceModel):
         try:
@@ -157,25 +180,25 @@ class DeviceInfo:
 
     # ------------ Windows 专用：列出所有 iproxy 命令行 ------------
     def _get_all_iproxy_cmdlines(self) -> List[str]:
-        try:
-            raw = subprocess.check_output(
-                ['wmic', 'process', 'where', "name='iproxy.exe'",
-                 'get', 'CommandLine,ProcessId', '/value'],
-                stderr=subprocess.DEVNULL, text=True
-            )
-        except subprocess.CalledProcessError:
-            return []
+        """
+        使用 psutil 枚举 iproxy 进程，避免调用 wmic 造成的黑框闪烁。
+        返回形如："<完整命令行> <pid>" 的列表（兼容你后续的解析逻辑）。
+        """
         lines: List[str] = []
-        for block in raw.split('\n\n'):
-            cmd = pid = ''
-            for line in block.splitlines():
-                line = line.strip()
-                if line.startswith('CommandLine='):
-                    cmd = line[len('CommandLine='):].strip()
-                elif line.startswith('ProcessId='):
-                    pid = line[len('ProcessId='):].strip()
-            if cmd and pid and '-u' in cmd:
-                lines.append(f'{cmd} {pid}')
+        for p in psutil.process_iter(attrs=["name", "cmdline", "pid"]):
+            try:
+                name = (p.info.get("name") or "").lower()
+                if name != "iproxy.exe":
+                    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']}")
+            except (psutil.NoSuchProcess, psutil.AccessDenied):
+                continue
         return lines
 
     # ------------ 杀孤儿 ------------
@@ -195,9 +218,109 @@ class DeviceInfo:
     # ------------ 按 PID 强杀 ------------
     def _kill_pid_gracefully(self, pid: int):
         try:
-            os.kill(pid, signal.SIGTERM)
-            time.sleep(1)
-            os.kill(pid, signal.SIGKILL)
+            p = psutil.Process(pid)
+            p.terminate()
+            try:
+                p.wait(timeout=1.0)
+            except psutil.TimeoutExpired:
+                p.kill()
         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)
+            s.settimeout(0.2)
+            try:
+                s.bind(("127.0.0.1", port))
+                return True
+            except OSError:
+                return False
+
+    def _pick_free_port(self, start: int = None, limit: int = 2000) -> int:
+        """从 start 起向上找一个空闲端口。"""
+        p = self._port if start is None else start
+        tried = 0
+        while tried < limit:
+            p += 1
+            tried += 1
+            if self._is_port_free(p):
+                self._port = p  # 更新游标
+                return p
+        raise RuntimeError("未找到可用端口（扫描范围内）")
+
+    def _health_check_mjpeg(self, port: int, timeout: float = 1.0) -> bool:
+        """
+        对 http://127.0.0.1:<port>/ 做非常轻量的探活。
+        WDA mjpegServer(默认9100)通常根路径就会有 multipart/x-mixed-replace。
+        """
+        try:
+            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:
+                pass
+            conn.close()
+            return alive
+        except Exception:
+            return False
+
+    def _restart_iproxy(self, udid: str):
+        """重启某个 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)
+
+        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)  # 通知前端/上位机端口变化
+
+        proc2 = self._start_iproxy(udid, model.screenPort)
+        if not proc2:
+            # 启动失败，设置退避（逐步增加上限）
+            self._heal_backoff[udid] = now + 2.0
+            return
+
+        self._procs[udid] = proc2
+        # 成功后缩短退避
+        self._heal_backoff[udid] = now + 0.5
+
+    def _check_and_heal_tunnels(self, interval: float = 2.0):
+        """
+        定期巡检所有在线设备的本地映射端口是否“活着”，不活就重启 iproxy。
+        """
+        now = time.time()
+        if now - self._last_heal_check_ts < interval:
+            return
+        self._last_heal_check_ts = now
+
+        for udid, model in list(self._models.items()):
+            port = model.screenPort
+            if port <= 0:
+                continue
+            ok = self._health_check_mjpeg(port, timeout=0.8)
+            if not ok:
+                LogManager.warning(f"端口失活，准备自愈：udid={udid} port={port}")
+                self._restart_iproxy(udid)
+
diff --git a/Module/__pycache__/DeviceInfo.cpython-312.pyc b/Module/__pycache__/DeviceInfo.cpython-312.pyc
index 213890b158f47aada6979810462937f2937e623e..2998d255f2fcb33b1d3f12090e47524c8abd96a9 100644
GIT binary patch
delta 7272
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
A>Hq)$

delta 2751
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
V+7R4)c8mL8mKlM%R|rQ_{=b9!gi!zh

diff --git a/build.bat b/build.bat
index 25cfd62..c1f352b 100644
--- a/build.bat
+++ b/build.bat
@@ -10,5 +10,4 @@ python -m nuitka Module\Main.py ^
   --include-data-files="E:/code/Python/iOSAi/resources/iproxy/*=resources/iproxy/" ^
   --include-data-files=resources/icon.ico=resources/icon.ico ^
   --jobs=20 ^
-  --windows-icon-from-ico=resources/icon.ico
-
+  --windows-icon-from-ico=resources/icon.ico
\ No newline at end of file