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

修复bug。临时提交

Browse Source
This commit is contained in:
zw
2025-08-20 13:48:32 +08:00
parent 019166f730
commit a8d8c8ee5d
6 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Module/FlaskService.py
View File

@@ -6,6 +6,7 @@ import warnings
from queue import Queue
from typing import Any, Dict
from Utils.AiUtils import AiUtils
from Utils.LogManager import LogManager
from Utils.Requester import Requester
import tidevice
@@ -27,11 +28,12 @@ dataQueue = Queue()
def start_socket_listener():
port = int(os.getenv('FLASK_COMM_PORT', 0))
LogManager.info(f"Received port from environment: {port}")
print(f"Received port from environment: {port}")
if port <= 0:
print("⚠️ 未获取到通信端口，跳过Socket监听")
LogManager.info("未获取到通信端口，跳过Socket监听")
print("未获取到通信端口，跳过Socket监听")
return
try:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
# 设置端口复用，避免端口被占用时无法绑定
@@ -41,30 +43,38 @@ def start_socket_listener():
try:
s.bind(('127.0.0.1', port))
print(f"[INFO] Socket successfully bound to port {port}")
LogManager.info(f"[INFO] Socket successfully bound to port {port}")
except Exception as bind_error:
print(f"[ERROR] ❌ 端口绑定失败: {bind_error}")
print(f"[ERROR]端口绑定失败: {bind_error}")
LogManager.info(f"[ERROR]端口绑定失败: {bind_error}")
return
# 开始监听
s.listen()
LogManager.info(f"[INFO] Socket listener started on port {port}, waiting for connections...")
print(f"[INFO] Socket listener started on port {port}, waiting for connections...")
while True:
try:
LogManager.info(f"[INFO] Waiting for a new connection on port {port}...")
print(f"[INFO] Waiting for a new connection on port {port}...")
conn, addr = s.accept()
LogManager.info(f"[INFO] Connection accepted from: {addr}")
print(f"[INFO] Connection accepted from: {addr}")
raw_data = conn.recv(1024).decode('utf-8').strip()
LogManager.info(f"[INFO] Raw data received: {raw_data}")
print(f"[INFO] Raw data received: {raw_data}")
data = json.loads(raw_data)
LogManager.info(f"[INFO] Parsed data: {data}")
print(f"[INFO] Parsed data: {data}")
dataQueue.put(data)
except Exception as conn_error:
print(f"[ERROR] ❌ 连接处理失败: {conn_error}")
LogManager.error(f"[ERROR]连接处理失败: {conn_error}")
print(f"[ERROR]连接处理失败: {conn_error}")
except Exception as e:
print(f"[ERROR] ❌ Socket服务启动失败: {e}")
LogManager.error(f"[ERROR]Socket服务启动失败: {e}")
print(f"[ERROR]Socket服务启动失败: {e}")
# 在独立线程中启动Socket服务
@@ -83,15 +93,6 @@ def passToken():
print(e)
return ResultData(data="").toJson()
@app.route('/getName', methods=['POST'])
def getName():
data = request.get_json()
accountToken = data['token']
print(accountToken)
return accountToken
# 获取设备列表
@app.route('/deviceList', methods=['GET'])
def deviceList():
@@ -108,6 +109,7 @@ def deviceList():
return ResultData(data=listData).toJson()
except Exception as e:
print(e)
LogManager.error("获取设备列表失败：", e)
return ResultData(data=[]).toJson()
# 获取设备应用列表

14
Module/FlaskSubprocessManager.py
View File

@@ -9,6 +9,9 @@ import time
from pathlib import Path
from typing import Optional, Union, Dict, List
from Utils.LogManager import LogManager
class FlaskSubprocessManager:
_instance: Optional['FlaskSubprocessManager'] = None
_lock: threading.Lock = threading.Lock()
@@ -22,7 +25,7 @@ class FlaskSubprocessManager:
def _init_manager(self):
self.process: Optional[subprocess.Popen] = None
self.comm_port = 34567
self.comm_port = 34566
self._stop_event = threading.Event()
atexit.register(self.stop)
@@ -37,6 +40,7 @@ class FlaskSubprocessManager:
"""启动 Flask 子进程（兼容打包后的 exe 和源码运行）"""
with self._lock:
if self.process is not None:
LogManager.warning("子进程正在运行中！")
raise RuntimeError("子进程已在运行中！")
env = os.environ.copy()
@@ -59,6 +63,7 @@ class FlaskSubprocessManager:
cmd = [sys.executable, "-m", "Module.Main", "--role=flask"]
cwd = str(Path(__file__).resolve().parent) # Module 目录
LogManager.info(f"[DEBUG] spawn: {cmd} (cwd={cwd}) exists(exe)={os.path.exists(cmd[0])}")
print(f"[DEBUG] spawn: {cmd} (cwd={cwd}) exists(exe)={os.path.exists(cmd[0])}")
self.process = subprocess.Popen(
@@ -73,6 +78,8 @@ class FlaskSubprocessManager:
env=env,
cwd=cwd,
)
LogManager.info(f"Flask子进程启动 (PID: {self.process.pid}, 端口: {self.comm_port})")
print(f"Flask子进程启动 (PID: {self.process.pid}, 端口: {self.comm_port})")
def print_output(stream, stream_name):
@@ -97,9 +104,11 @@ class FlaskSubprocessManager:
s.sendall((data + "\n").encode('utf-8'))
return True
except ConnectionRefusedError:
LogManager.error(f"连接被拒绝，确保子进程在端口 {self.comm_port} 上监听")
print(f"连接被拒绝，确保子进程在端口 {self.comm_port} 上监听")
return False
except Exception as e:
LogManager.error(f"发送失败: {e}")
print(f"发送失败: {e}")
return False
@@ -107,11 +116,14 @@ class FlaskSubprocessManager:
with self._lock:
if self.process and self.process.poll() is None:
print(f"[INFO] Stopping Flask child process (PID: {self.process.pid})...")
LogManager.info(f"[INFO] Stopping Flask child process (PID: {self.process.pid})...")
self.process.terminate()
self.process.wait()
print("[INFO] Flask child process stopped.")
LogManager.info("[INFO] Flask child process stopped.")
self._stop_event.set()
else:
LogManager.info("[INFO] No Flask child process to stop.")
print("[INFO] No Flask child process to stop.")
@classmethod

5
Module/Main.py
View File

@@ -1,6 +1,5 @@
import os
import sys
import time
from pathlib import Path
from Module.DeviceInfo import Deviceinfo
@@ -19,15 +18,13 @@ def _run_flask_role():
port = int(os.getenv("FLASK_COMM_PORT", "34567")) # 固定端口的兜底仍是 34567
app_factory = getattr(FlaskService, "create_app", None)
app = app_factory() if callable(app_factory) else FlaskService.app
app.run(host="0.0.0.0", port=port, debug=False, use_reloader=False)
app.run(host="0.0.0.0", port=port + 1, debug=False, use_reloader=False)
if "--role=flask" in sys.argv:
_run_flask_role()
sys.exit(0)
# 项目入口
# ... 省略前面的 import 和函数 ...
if __name__ == "__main__":
# 清空日志等
LogManager.clearLogs()