diff --git a/.gitignore b/.gitignore
index b6bbb41..8b81175 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ var/
*.egg-info/
.installed.cfg
*.egg
+out/
# PyInstaller
# Usually these files are written by a python script from a template
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 13c0010..0826860 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,68 +5,13 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -153,7 +98,9 @@
-
+
+
+
@@ -161,6 +108,6 @@
-
+
\ No newline at end of file
diff --git a/Entity/Variables.py b/Entity/Variables.py
index b65e7c5..362df7f 100644
--- a/Entity/Variables.py
+++ b/Entity/Variables.py
@@ -9,8 +9,6 @@ WdaAppBundleId = "com.vv.wda.xctrunner"
anchorList: list[AnchorModel] = []
# 线程锁
anchorListLock = threading.Lock()
-# 账号token
-accountToken = "xHtil6YiAH2QxDgAYVwCfVafx7xkOoeHVfiVgfqfdwe88KZW5jbRsjDS9ZGFILJSGuXTu4V29MgHaYnO3jy2dxpqs77DtAQGnW6AlJ7NItSWSmSaoKRXtCYEng9KlCft"
# 打招呼数据
prologueList = []
# 评论列表
diff --git a/Module/DeviceInfo.py b/Module/DeviceInfo.py
index 9d07142..952f78c 100644
--- a/Module/DeviceInfo.py
+++ b/Module/DeviceInfo.py
@@ -31,6 +31,68 @@ class Deviceinfo(object):
self.manager = FlaskSubprocessManager.get_instance()
# 已发给前端的设备模型列表（用于拔出时发 type=2）
self.deviceModelList: List[DeviceModel] = []
+ # 最大可连接设备限制
+ self.maxDeviceCount = 6
+
+ # ===== iproxy：一次性完成 路径定位 + 环境变量配置 + 启动器准备 =====
+ try:
+ self.iproxy_path = self._iproxy_path() # 绝对路径
+ self.iproxy_dir = self.iproxy_path.parent
+
+ # 1) 配置环境（PATH/DLL），放到初始化里一次性处理
+ os.environ["PATH"] = str(self.iproxy_dir) + os.pathsep + os.environ.get("PATH", "")
+ try:
+ # 仅 Windows 有效；其他平台忽略
+ os.add_dll_directory(str(self.iproxy_dir))
+ except Exception:
+ pass
+
+ # 2) 预构建通用 Popen 参数（隐藏窗口、工作目录、文本模式等）
+ self._creationflags = 0x08000000 if os.name == "nt" else 0
+ self._popen_kwargs = dict(
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ cwd=str(self.iproxy_dir),
+ shell=False,
+ text=True,
+ encoding="utf-8",
+ bufsize=1,
+ creationflags=self._creationflags,
+ )
+
+ # 3) 准备一个“启动器”（闭包）：仅接受 (udid, local_port, remote_port) 参数
+ def _spawn_iproxy(udid: str, local_port: int, remote_port: int = 9100) -> subprocess.Popen:
+ args = [str(self.iproxy_path), "-u", udid, str(local_port), str(remote_port)]
+ p = subprocess.Popen(args, **self._popen_kwargs)
+
+ # 异步日志转发（可选）
+ def _pipe_to_log(name: str, stream):
+ try:
+ for line in iter(stream.readline, ''):
+ s = line.strip()
+ if s:
+ LogManager.info(f"[iproxy {name}] {s}", udid)
+ except Exception:
+ pass
+
+ try:
+ import threading
+ threading.Thread(target=_pipe_to_log, args=("STDOUT", p.stdout), daemon=True).start()
+ threading.Thread(target=_pipe_to_log, args=("STDERR", p.stderr), daemon=True).start()
+ except Exception:
+ pass
+
+ return p
+
+ self._spawn_iproxy = _spawn_iproxy # 保存启动器
+ LogManager.info(f"iproxy 启动器已就绪，目录: {self.iproxy_dir}")
+
+ except Exception as e:
+ # 没找到 iproxy 也允许实例化成功，但后续启动会失败并给出明确日志
+ self.iproxy_path = None
+ self.iproxy_dir = None
+ self._spawn_iproxy = None
+ LogManager.error(f"初始化 iproxy 失败：{e}")
# ----------------------------
# 监听设备连接（死循环，内部捕获异常）
@@ -42,13 +104,13 @@ class Deviceinfo(object):
lists = Usbmux().device_list()
except Exception as e:
# 另一台电脑常见：usbmuxd 连接失败（未安装 iTunes/Apple Mobile Device Support）
- LogManager.warning(f"usbmuxd 连接失败: {e}。请确认已安装 iTunes/Apple Mobile Device Support，并在手机上“信任此电脑”", "listener")
+ LogManager.warning(f"usbmuxd 连接失败: {e}。请确认已安装 iTunes/Apple Mobile Device Support，并在手机上“信任此电脑”")
time.sleep(2)
continue
# 新接入设备
for device in lists:
- if device not in self.deviceArray:
+ if (device not in self.deviceArray) and (len(self.deviceArray) < self.maxDeviceCount):
self.screenProxy += 1
try:
self.connectDevice(device.udid)
@@ -143,91 +205,33 @@ class Deviceinfo(object):
# 根目录与 iproxy 可执行文件定位
# ----------------------------
def _base_dir(self) -> Path:
- """
- 打包后：返回 exe 所在目录；
- 源码运行：返回项目根目录（Module 的上一级）
- """
if getattr(sys, "frozen", False):
return Path(sys.executable).resolve().parent
return Path(__file__).resolve().parents[1] # iOSAI/ 作为根
def _iproxy_path(self) -> Path:
- """返回 iproxy 可执行文件的完整路径"""
exe = "iproxy.exe" if os.name == "nt" else "iproxy"
base = self._base_dir()
- # 常见放置位置（按优先级）
candidates = [
- base / "resources" / "iproxy" / exe # 推荐：打包资源目录
+ base / "resources" / "iproxy" / exe, # 推荐放置
]
for p in candidates:
if p.exists():
return p
-
- tried = [str(c) for c in candidates]
- raise FileNotFoundError(f"iproxy not found, tried: {tried}")
+ raise FileNotFoundError(f"iproxy not found, tried: {[str(c) for c in candidates]}")
# ----------------------------
- # 端口映射：启动 iproxy
+ # 端口映射：仅做“转发端口”这件事（调用已准备好的启动器）
# ----------------------------
def relayDeviceScreenPort(self, udid: str) -> Optional[subprocess.Popen]:
+ if not self._spawn_iproxy:
+ LogManager.error("iproxy 启动器未就绪，无法建立端口映射（初始化时未找到 iproxy）。", udid)
+ return None
+
try:
- iproxy = self._iproxy_path() # 例如 .../resources/iproxy/iproxy.exe
- iproxy_dir = iproxy.parent
-
- # 继承环境并把 iproxy 目录加入 PATH（放最前）
- env = os.environ.copy()
- env["PATH"] = str(iproxy_dir) + os.pathsep + env.get("PATH", "")
-
- # 可选：帮助本进程解析该目录下 DLL（py3.8+）
- try:
- os.add_dll_directory(str(iproxy_dir))
- except Exception:
- pass
-
- # Windows 隐藏子进程窗口
- creationflags = 0x08000000 if os.name == "nt" else 0
-
- # 绝对路径 + shell=False，避免 PATH/别名干扰
- args = [str(iproxy), "-u", udid, str(self.screenProxy), "9100"]
-
-
- # （可选）把子进程输出写到你的日志里，排查更方便
- def _pipe_to_log(name: str, stream):
- try:
- for line in iter(stream.readline, ''):
- line = line.rstrip('\r\n')
- if line:
- LogManager.info(f"[iproxy {name}] {line}", udid)
- except Exception:
- print("遇到错误了")
- pass
-
- p = subprocess.Popen(
- args,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
- cwd=str(iproxy_dir),
- env=env,
- shell=False,
- text=True,
- encoding="utf-8",
- bufsize=1,
- creationflags=creationflags,
- )
-
- # 启动异步日志转发（不要阻塞主线程；需要时可删除）
- try:
- import threading
- threading.Thread(target=_pipe_to_log, args=("STDOUT", p.stdout), daemon=True).start()
- threading.Thread(target=_pipe_to_log, args=("STDERR", p.stderr), daemon=True).start()
- except Exception as e:
- print("这里有错误")
- print(e)
- pass
-
+ p = self._spawn_iproxy(udid, self.screenProxy, 9100)
LogManager.info(f"启动 iproxy 成功，本地 {self.screenProxy} -> 设备 9100", udid)
return p
-
except Exception as e:
LogManager.error(f"启动 iproxy 失败：{e}", udid)
return None
\ No newline at end of file
diff --git a/Module/FlaskService.py b/Module/FlaskService.py
index 358ebc4..9478665 100644
--- a/Module/FlaskService.py
+++ b/Module/FlaskService.py
@@ -16,7 +16,6 @@ from Entity.ResultData import ResultData
from Utils.ControlUtils import ControlUtils
from Utils.ThreadManager import ThreadManager
from script.ScriptManager import ScriptManager
-from Entity.Variables import accountToken
from Entity.Variables import anchorList, addModelToAnchorList
app = Flask(__name__)
@@ -75,28 +74,41 @@ listener_thread.start()
@app.route('/passToken', methods=['POST'])
def passToken():
+ try:
+ data = request.get_json()
+ token = data['token']
+ Requester.requestPrologue(token)
+ return ResultData(data="").toJson()
+ except Exception as e:
+ print(e)
+ return ResultData(data="").toJson()
+
+@app.route('/getName', methods=['POST'])
+def getName():
data = request.get_json()
accountToken = data['token']
print(accountToken)
+ return accountToken
- Requester.requestPrologue()
- return ResultData(data="").toJson()
# 获取设备列表
@app.route('/deviceList', methods=['GET'])
def deviceList():
- while not dataQueue.empty():
- obj = dataQueue.get()
- type = obj["type"]
- if type == 1:
- listData.append(obj)
- else:
- for data in listData:
- if data.get("deviceId") == obj.get("deviceId") and data.get("screenPort") == obj.get("screenPort"):
- listData.remove(data)
- return ResultData(data=listData).toJson()
-
+ try:
+ while not dataQueue.empty():
+ obj = dataQueue.get()
+ type = obj["type"]
+ if type == 1:
+ listData.append(obj)
+ else:
+ for data in listData:
+ if data.get("deviceId") == obj.get("deviceId") and data.get("screenPort") == obj.get("screenPort"):
+ listData.remove(data)
+ return ResultData(data=listData).toJson()
+ except Exception as e:
+ print(e)
+ return ResultData(data=[]).toJson()
# 获取设备应用列表
@app.route('/deviceAppList', methods=['POST'])
diff --git a/Utils/LogManager.py b/Utils/LogManager.py
index 804067b..fb6b53e 100644
--- a/Utils/LogManager.py
+++ b/Utils/LogManager.py
@@ -41,15 +41,15 @@ class LogManager:
return logger
@classmethod
- def info(cls, text, udid):
+ def info(cls, text, udid="system"):
cls._setupLogger(udid, "infoLogger", "info.log", level=logging.INFO).info(f"[{udid}] {text}")
@classmethod
- def warning(cls, text, udid):
+ def warning(cls, text, udid="system"):
cls._setupLogger(udid, "warningLogger", "warning.log", level=logging.WARNING).warning(f"[{udid}] {text}")
@classmethod
- def error(cls, text, udid):
+ def error(cls, text, udid="system"):
cls._setupLogger(udid, "errorLogger", "error.log", level=logging.ERROR).error(f"[{udid}] {text}")
@classmethod
diff --git a/Utils/Requester.py b/Utils/Requester.py
index cf48aa4..f628acf 100644
--- a/Utils/Requester.py
+++ b/Utils/Requester.py
@@ -1,5 +1,5 @@
import requests
-from Entity.Variables import accountToken, prologueList
+from Entity.Variables import prologueList
BaseUrl = "https://crawlclient.api.yolozs.com/api/common/"
# BaseUrl = "http://192.168.1.174:8101/api/common/"
@@ -10,9 +10,9 @@ class Requester():
prologue = "prologue"
@classmethod
- def requestPrologue(cls):
+ def requestPrologue(cls, token):
headers = {
- "vvtoken": accountToken,
+ "vvtoken": token,
}
url = BaseUrl + cls.prologue
result = requests.get(headers=headers, url=url)