优化flask获取设备列表的逻辑

Module/DeviceInfo.py

@@ -21,6 +21,7 @@ import psutil
 import http.client
 import tidevice
 import wda
+from flask import json
 from tidevice import Usbmux, ConnectionType
 from tidevice._device import BaseDevice
 from Entity.DeviceModel import DeviceModel
@@ -350,7 +351,7 @@ class DeviceInfo:
                             if need_report and m:
                                 try:
                                     print(f"[iproxy-check] 自愈成功，恢复就绪 deviceId={device_id} port={port}")
-                                    self._manager_send(m)
+                                    self._manager_send()
                                 except Exception as e:
                                     print(f"[iproxy-check] 上报恢复异常 deviceId={device_id}: {e}")
 
@@ -384,7 +385,7 @@ class DeviceInfo:
                                         need_report = True
                             if need_report and m:
                                 try:
-                                    self._manager_send(m)
+                                    self._manager_send()
                                 except Exception as e:
                                     print(f"[iproxy-check] 上报恢复异常 deviceId={device_id}: {e}")
                             continue
@@ -405,7 +406,7 @@ class DeviceInfo:
                                 if m:
                                     print(
                                         f"[iproxy-check] 连续失败 {fails} 次，降级设备（保留在线） deviceId={device_id} port={port}")
-                                    self._manager_send(m)
+                                    self._manager_send()
                             except Exception as e:
                                 print(f"[iproxy-check] 上报降级异常 deviceId={device_id}: {e}")
 
@@ -487,6 +488,29 @@ class DeviceInfo:
         print(f"[WDA] /status@{local_port} 等待超时 {udid}")
         return False
 
+    def _send_snapshot_to_flask(self):
+        """把当前 _models 的全量快照发送给 Flask 进程"""
+        try:
+            # 1. 把 _models 里的设备转成可 JSON 的 dict 列表
+            with self._lock:
+                devices = [m.toDict() for m in self._models.values()]
+
+            payload = json.dumps({"devices": devices}, ensure_ascii=False)
+
+            # 2. 建立到 Flask 的本地 socket 连接并发送
+            port = int(os.getenv("FLASK_COMM_PORT", "34566"))
+            if port <= 0:
+                LogManager.warning("[SNAPSHOT] 无有效端口，跳过发送")
+                return
+
+            with socket.create_connection(("127.0.0.1", port), timeout=1.5) as s:
+                s.sendall(payload.encode("utf-8") + b"\n")
+            print(f"[SNAPSHOT] 已发送 {len(devices)} 台设备快照到 Flask")
+            LogManager.info(f"[SNAPSHOT] 已发送 {len(devices)} 台设备快照到 Flask")
+        except Exception as e:
+            # 不要让异常影响主循环，只打个日志
+            LogManager.warning(f"[SNAPSHOT] 发送快照失败: {e}")
+
     def _device_online_via_tidevice(self, udid: str) -> bool:
         try:
             from tidevice import Usbmux, ConnectionType
@@ -629,7 +653,7 @@ class DeviceInfo:
                 self._iproxy_fail_count[udid] = 0
 
         print(f"[Manager] 准备发送设备数据到前端 {udid}")
-        self._manager_send(model)
+        self._manager_send()
         print(datetime.datetime.now().strftime("%H:%M:%S"))
         print(f"[Add] 设备添加成功 {udid}, port={port}, {w}x{h}@{s}")
 
@@ -669,7 +693,7 @@ class DeviceInfo:
 
         # 通知上层
         try:
-            self._manager_send(model)
+            self._manager_send()
         except Exception as e:
             print(f"[Remove] 通知上层异常 {udid}: {e}")
 
@@ -832,22 +856,44 @@ class DeviceInfo:
         except Exception as e:
             print(f"[Proc] 结束进程异常: {e}")
 
-    def _manager_send(self, model: DeviceModel):
+    def _manager_send(self):
+        # try:
+        #     if self._manager.send(model.toDict()):
+        #         print(f"[Manager] 已发送前端数据 {model.deviceId}")
+        #         return
+        # except Exception as e:
+        #     print(f"[Manager] 首次发送异常: {e}")
+        #
+        # # 自愈：拉起一次并重试一次（不要用 and 连接）
+        # try:
+        #     self._manager.start()  # 不关心返回值
+        #     if self._manager.send(model.toDict()):
+        #         print(f"[Manager] 重试发送成功 {model.deviceId}")
+        #         return
+        # except Exception as e:
+        #     print(f"[Manager] 重试发送异常: {e}")
+        """对外统一的“通知 Flask 有设备变动”的入口（无参数）。
+           作用：把当前所有设备的全量快照发给 Flask。
+        """
+        # 第 1 次：直接发快照
         try:
-            if self._manager.send(model.toDict()):
-                print(f"[Manager] 已发送前端数据 {model.deviceId}")
-                return
+            self._send_snapshot_to_flask()
+            return
         except Exception as e:
-            print(f"[Manager] 首次发送异常: {e}")
+            print(f"[Manager] 首次发送快照异常: {e}")
 
-        # 自愈：拉起一次并重试一次（不要用 and 连接）
+        # 自愈：尝试拉起 Flask 子进程
         try:
-            self._manager.start()  # 不关心返回值
-            if self._manager.send(model.toDict()):
-                print(f"[Manager] 重试发送成功 {model.deviceId}")
-                return
+            self._manager.start()
         except Exception as e:
-            print(f"[Manager] 重试发送异常: {e}")
+            print(f"[Manager] 拉起 Flask 子进程异常: {e}")
+
+        # 第 2 次：再发快照
+        try:
+            self._send_snapshot_to_flask()
+            print(f"[Manager] 重试发送快照成功")
+        except Exception as e:
+            print(f"[Manager] 重试发送快照仍失败: {e}")
 
     def _find_iproxy(self) -> str:
         env_path = os.getenv("IPROXY_PATH")