feat: 正式池断联设备自动重连——①扫描线程每轮顺带对断联的网络设备 adb_connect_light(幂等,连上即恢复,无需人工;此前只有启动时预连接一次,断联后不会自己回来);②断联设备不删不进待连接池(pending 语义=未授权新设备),GET discovery 返回 pool_offline(serial/型号/备注);③POST /api/devices/discovery/reconnect 手动立即重连;④发现面板加「设备池断联设备」区块(自动重连中 + 立即重连按钮)
This commit is contained in:
@@ -22,7 +22,7 @@ from config import (USB_ADB_HOST,
|
||||
DISCOVERY_PORT, DISCOVERY_SUBNETS, DISCOVERY_INTERVAL)
|
||||
from core.adb_helper import _adb, adb_connect_light
|
||||
from core.logger import get_logger
|
||||
from core.models import db, PendingDevice
|
||||
from core.models import db, Device, PendingDevice
|
||||
|
||||
_log = get_logger("core.disc")
|
||||
|
||||
@@ -220,8 +220,14 @@ def scan_once(manual=False):
|
||||
first_seen=now, last_seen=now))
|
||||
added += 1
|
||||
db.session.commit()
|
||||
# 6. 正式池断联设备自动重连:adb connect 会因 WiFi 波动/设备重启/
|
||||
# adb 服务重启而断开——扫描线程每轮顺带重试(幂等轻量,内部
|
||||
# 全局锁串行),连上即恢复在线,无需人工干预。pending 池是给
|
||||
# 「未授权新设备」的,正式池设备断联不进 pending,而是自动重连。
|
||||
back = _reconnect_offline(configured)
|
||||
_log.info(f"发现: 探测开放 {len(open_ips)} 台,可连 {len(verified)} 台,"
|
||||
f"新增待连接 {added} 台")
|
||||
f"新增待连接 {added} 台"
|
||||
+ (f",自动重连恢复 {len(back)} 台 {back}" if back else ""))
|
||||
_last_scan = (now, len(open_ips), len(verified), added)
|
||||
_last_error = ""
|
||||
return True, {"found": len(open_ips), "verified": len(verified), "new": added}
|
||||
@@ -240,6 +246,39 @@ def device_pool_list_configured():
|
||||
return device_pool.list_configured()
|
||||
|
||||
|
||||
# ================== 正式池断联设备:自动重连 ==================
|
||||
def _reconnect_offline(configured):
|
||||
"""对正式池中断联的网络设备逐个 adb 重连,返回恢复的 serial 列表。
|
||||
|
||||
只重连网络设备(IP:5555;USB 设备插着就在,无需 connect)。
|
||||
幂等轻量:内部 adb 全局锁串行,失败静默(下轮扫描再试)。
|
||||
"""
|
||||
online_now = _parse_adb_devices(_adb("devices"))
|
||||
targets = [s for s in (configured or [])
|
||||
if ":" in s and s not in online_now]
|
||||
if not targets:
|
||||
return []
|
||||
for serial in targets:
|
||||
adb_connect_light(serial)
|
||||
online_after = _parse_adb_devices(_adb("devices"))
|
||||
return [s for s in targets if s in online_after]
|
||||
|
||||
|
||||
def list_pool_offline():
|
||||
"""正式设备池中断联的设备(serial + 型号 + 备注名),面板展示用。
|
||||
|
||||
断联设备仍是正式池成员(不删除、不进 pending)——pending 是给未授权
|
||||
新设备的;它们由扫描线程每轮自动重连,也可前端手动立即重连。
|
||||
"""
|
||||
online = _parse_adb_devices(_adb("devices"))
|
||||
with _ctx():
|
||||
rows = [d.to_dict() for d in Device.query.filter_by(enabled=True)
|
||||
.order_by(Device.serial).all()]
|
||||
return [{"serial": r["serial"], "model": r.get("model") or "",
|
||||
"name": r.get("name") or ""}
|
||||
for r in rows if r["serial"] not in online]
|
||||
|
||||
|
||||
# ================== 定时扫描线程 ==================
|
||||
def _discovery_loop():
|
||||
"""定时扫描 daemon 线程。每轮重读配置(开关/周期即时生效)。
|
||||
|
||||
Reference in New Issue
Block a user