feat: improve desktop path selection and USB connection recovery
This commit is contained in:
1 parent
5aa575f182
commit
6490665af8
28 files changed
+846
-51
No files matched your search
@@ -113,3 +113,15 @@ USB 模式禁用网络 adb connect,等待租约后挂载,ADB 与 scrcpy 使
|
||||
Windows 下 Flutter 和 Avalonia 两个桌面入口共享会话级单实例锁,安装版、便携版和 Agent 托盘入口都不能重复启动第二个 ADS 桌面实例。重复启动会退出新进程并唤起已有窗口(包括托盘隐藏或最小化状态)。仅限制桌面管理 UI,不限制无界面 Agent/client 或多个设备的 scrcpy 子进程。非 Windows 平台尚未接入此单实例机制。
|
||||
|
||||
本轮验证:Flutter 17 项测试与 Avalonia 20 项测试通过。真实虚拟 USB 上验证内嵌转独立窗口实际显示、USB 连接与桥接进程保持不变;重复启动退出并恢复隐藏主窗口通过。Avalonia 作为主实例时,重复启动 Avalonia 或 Flutter 均退出,主实例正常保留。
|
||||
|
||||
## 文件位置与 USB 自动恢复
|
||||
|
||||
工具/凭据/Agent 配置的文件路径输入框带文件选择按钮,选中后立即保存位置;取消不修改设置。服务器 URL、IP 和端口仍为网络地址输入。保存的只是文件路径,不保存凭据内容。Agent 路径随连接设置一同记忆。
|
||||
|
||||
USB ADB 连续 3 轮监控缺失(约 9 秒)、USB 后端退出或 scrcpy 以设备断开退出时,自动关闭本次旧导出、选择新的回环端口、等待租约并重新挂载。ads-client 异常退出时按该连接启动时的参数重启。失败按 2/4/8/16/30 秒退避,等待手机授权时不循环重挂载;多个恢复不会并行操作同一设备。
|
||||
|
||||
记住用户是否希望投屏及原内嵌/独立模式,USB/ADB 就绪后恢复投屏。主动停止投屏、关闭独立窗口、主动断开和退出取消相应恢复,不重启已停止的投屏,也不操作物理 USB 手机或其他客户端的设备。这是断线后的恢复流程,不承诺原有视频/ADB 字节流无缝续传,也不等于已消除网络断开的根因。
|
||||
|
||||
内嵌投屏的自动恢复遵循页面可见性:离开投屏页或缩到托盘时继续修复 USB 连接,但暂不重新创建内嵌画面;返回投屏页并显示窗口后恢复。独立窗口模式按原模式恢复。
|
||||
|
||||
本轮验证:文件路径选择/取消及立即保存测试、USB 恢复状态机与窗口可见性测试通过。真机主动结束本次 ads-client 后,USB 和软件渲染投屏自动恢复并重新出图;主动停止不再自动启动。测试使用了仅中继对照,恢复逻辑不依赖选择 P2P 或中继。Avalonia 真机亦验证客户端故障后 USB 重挂载及 scrcpy 重新出图。
|
||||
@@ -5,11 +5,13 @@ import 'dart:io';
|
||||
import 'package:path/path.dart' as p;
|
||||
|
||||
import 'windows_usb.dart';
|
||||
import 'usb_recovery.dart';
|
||||
|
||||
class Settings {
|
||||
String server = 'wss://ttstd.com/ads';
|
||||
String origin = '175.178.213.60:443';
|
||||
String credential = '';
|
||||
Map<String, String> agentPaths = {};
|
||||
String client = '', adb = '', scrcpy = '';
|
||||
bool relayOnly = false, usbMode = false;
|
||||
String usbip = UsbDriver.defaultUsbip();
|
||||
@@ -17,6 +19,7 @@ class Settings {
|
||||
'server': server,
|
||||
'origin': origin,
|
||||
'credential': credential,
|
||||
'agentPaths': agentPaths,
|
||||
'client': client,
|
||||
'adb': adb,
|
||||
'scrcpy': scrcpy,
|
||||
@@ -28,6 +31,7 @@ class Settings {
|
||||
server = j['server'] as String? ?? server;
|
||||
origin = j['origin'] as String? ?? origin;
|
||||
credential = j['credential'] as String? ?? credential;
|
||||
agentPaths = Map<String, String>.from(j['agentPaths'] as Map? ?? {});
|
||||
client = j['client'] as String? ?? client;
|
||||
adb = j['adb'] as String? ?? adb;
|
||||
scrcpy = j['scrcpy'] as String? ?? scrcpy;
|
||||
@@ -64,7 +68,16 @@ class Session {
|
||||
WindowsUsbSession? usb;
|
||||
String get endpoint => usb?.serial ?? tunnel;
|
||||
String get mode => usb == null ? "网络 ADB" : "虚拟 USB";
|
||||
final Process process;
|
||||
Process process;
|
||||
Future<Process> Function()? restartClient;
|
||||
final recovery = UsbRecoveryPolicy();
|
||||
String usbip = '', usbExecutable = '';
|
||||
bool recovering = false,
|
||||
initialized = false,
|
||||
screenWanted = false,
|
||||
usbBroken = false;
|
||||
Future<void>? recoveryTask;
|
||||
bool screenPageVisible = false;
|
||||
Process? screen;
|
||||
bool screenEmbedded = false;
|
||||
String state = '连接中', route = '协商中';
|
||||
@@ -77,6 +90,7 @@ class ManagerRepository {
|
||||
final Map<String, Session> sessions = {};
|
||||
final Set<int> reservedPorts = {};
|
||||
final void Function(String) log;
|
||||
bool allowEmbeddedResume = true;
|
||||
String token = '';
|
||||
Directory? root;
|
||||
late Directory storage;
|
||||
@@ -336,19 +350,24 @@ class ManagerRepository {
|
||||
'transport-$id-${DateTime.now().microsecondsSinceEpoch}.json',
|
||||
);
|
||||
final lease = usbMode ? "$status.lease" : null;
|
||||
final proc = await Process.start(
|
||||
settings.client,
|
||||
final clientExecutable = settings.client, adbExecutable = settings.adb;
|
||||
final serverAddress = settings.server.trim(),
|
||||
originAddress = settings.origin.trim();
|
||||
final transportMode = settings.relayOnly ? 'relay' : 'auto';
|
||||
final clientEnvironment = environment()..['ADS_CLIENT_TOKEN'] = token;
|
||||
Future<Process> startClient() => Process.start(
|
||||
clientExecutable,
|
||||
[
|
||||
'--server',
|
||||
settings.server.trim(),
|
||||
serverAddress,
|
||||
'--device',
|
||||
id,
|
||||
'--listen',
|
||||
endpoint,
|
||||
'--adb',
|
||||
settings.adb,
|
||||
adbExecutable,
|
||||
'--transport',
|
||||
settings.relayOnly ? 'relay' : 'auto',
|
||||
transportMode,
|
||||
'--status-file',
|
||||
status,
|
||||
if (lease != null) ...[
|
||||
@@ -356,26 +375,21 @@ class ManagerRepository {
|
||||
'--lease-status-file',
|
||||
lease,
|
||||
],
|
||||
if (settings.origin.trim().isNotEmpty) ...[
|
||||
'--connect-address',
|
||||
settings.origin.trim(),
|
||||
],
|
||||
if (originAddress.isNotEmpty) ...['--connect-address', originAddress],
|
||||
],
|
||||
environment: environment()..['ADS_CLIENT_TOKEN'] = token,
|
||||
environment: clientEnvironment,
|
||||
includeParentEnvironment: false,
|
||||
);
|
||||
final proc = await startClient();
|
||||
watch(proc, id);
|
||||
session = Session(id, endpoint, settings.adb, status, proc);
|
||||
final current = session;
|
||||
sessions[id] = current;
|
||||
current.leaseFile = lease;
|
||||
unawaited(
|
||||
proc.exitCode.then((code) {
|
||||
current.exited = true;
|
||||
current.ready = false;
|
||||
current.state = '连接程序已退出 ($code)';
|
||||
}),
|
||||
);
|
||||
current.restartClient = startClient;
|
||||
current.usbip = usbip;
|
||||
current.usbExecutable = findTool('ads-usb');
|
||||
observeClient(current, proc);
|
||||
if (usbMode) {
|
||||
final usb = WindowsUsbSession(id, usbPort!);
|
||||
current.usb = usb;
|
||||
@@ -392,6 +406,7 @@ class ManagerRepository {
|
||||
);
|
||||
log('USB 已挂载:${usb.serial}');
|
||||
}
|
||||
current.initialized = true;
|
||||
return current;
|
||||
} catch (_) {
|
||||
if (session != null) {
|
||||
@@ -442,11 +457,11 @@ class ManagerRepository {
|
||||
Future<void> monitor() async {
|
||||
final listings = <String, String>{};
|
||||
for (final s in sessions.values.toList()) {
|
||||
if (!s.stopping && (s.exited || s.usb?.exited == true)) {
|
||||
if (s.usb == null && !s.stopping && s.exited) {
|
||||
await disconnect(s.id);
|
||||
continue;
|
||||
}
|
||||
if (s.stopping) {
|
||||
if (s.stopping || s.recovering || !s.initialized) {
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
@@ -458,6 +473,29 @@ class ManagerRepository {
|
||||
.where((r) => r.length >= 2 && r[0] == s.endpoint)
|
||||
.firstOrNull;
|
||||
s.ready = row?[1] == 'device';
|
||||
if (s.usb != null &&
|
||||
s.recovery.due(
|
||||
DateTime.now(),
|
||||
ready: s.ready,
|
||||
unauthorized: row?[1] == 'unauthorized',
|
||||
broken: s.exited || s.usb!.exited || s.usbBroken,
|
||||
)) {
|
||||
scheduleUsbRecovery(s);
|
||||
continue;
|
||||
}
|
||||
if (s.ready &&
|
||||
s.screenWanted &&
|
||||
(!s.screenEmbedded ||
|
||||
(s.screenPageVisible && allowEmbeddedResume)) &&
|
||||
s.screen == null &&
|
||||
!DateTime.now().isBefore(s.recovery.retryAt)) {
|
||||
s.recovery.attempted(DateTime.now());
|
||||
try {
|
||||
await screen(s, embedded: s.screenEmbedded);
|
||||
} catch (e) {
|
||||
log('[${s.id}] 恢复投屏失败:$e');
|
||||
}
|
||||
}
|
||||
s.state = row == null ? '等待设备 / 自动重连' : row[1];
|
||||
final file = File(s.statusFile);
|
||||
if (await file.exists()) {
|
||||
@@ -473,16 +511,107 @@ class ManagerRepository {
|
||||
}
|
||||
}
|
||||
|
||||
void observeClient(Session s, Process process) {
|
||||
unawaited(
|
||||
process.exitCode.then((code) {
|
||||
if (s.process != process) {
|
||||
return;
|
||||
}
|
||||
s.exited = true;
|
||||
s.ready = false;
|
||||
s.state = '连接程序已退出 ($code)';
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> stopScreen(Session s) async {
|
||||
s.screenWanted = false;
|
||||
final process = s.screen;
|
||||
s.screen = null;
|
||||
await stop(process);
|
||||
log('[${s.id}] 用户停止投屏,取消自动恢复');
|
||||
}
|
||||
|
||||
void scheduleUsbRecovery(Session s) {
|
||||
if (s.stopping || s.recovering) {
|
||||
return;
|
||||
}
|
||||
s.recovering = true;
|
||||
s.ready = false;
|
||||
s.recovery.attempted(DateTime.now());
|
||||
s.state = 'USB 会话中断 · 正在重新挂载';
|
||||
log('[${s.id}] USB 自动恢复,第 ${s.recovery.attempts} 次');
|
||||
s.recoveryTask = recoverUsb(s).whenComplete(() => s.recovering = false);
|
||||
}
|
||||
|
||||
Future<void> recoverUsb(Session s) async {
|
||||
try {
|
||||
final screen = s.screen;
|
||||
s.screen = null;
|
||||
await stop(screen);
|
||||
final old = s.usb!;
|
||||
await stop(old.bridge);
|
||||
reservedPorts.remove(old.port);
|
||||
if (s.stopping) {
|
||||
return;
|
||||
}
|
||||
if (s.exited) {
|
||||
final lease = File(s.leaseFile!);
|
||||
if (await lease.exists()) {
|
||||
await lease.delete();
|
||||
}
|
||||
s.process = await s.restartClient!();
|
||||
s.exited = false;
|
||||
watch(s.process, s.id);
|
||||
observeClient(s, s.process);
|
||||
}
|
||||
if (s.stopping) {
|
||||
return;
|
||||
}
|
||||
final port = await allocateUsbPort();
|
||||
final usb = WindowsUsbSession(s.id, port);
|
||||
s.usb = usb;
|
||||
await usb.start(
|
||||
leaseFile: s.leaseFile!,
|
||||
upstream: s.tunnel,
|
||||
executable: s.usbExecutable,
|
||||
usbip: s.usbip,
|
||||
environment: environment(),
|
||||
run: run,
|
||||
watch: watch,
|
||||
cancelled: () => s.stopping || s.exited,
|
||||
);
|
||||
s.usbBroken = false;
|
||||
s.recovery.missing = 0;
|
||||
s.state = 'USB 已重新挂载 · 等待 ADB 就绪';
|
||||
log('[${s.id}] USB 已重新挂载;设备就绪后恢复投屏');
|
||||
} catch (e) {
|
||||
// No unhandled async exception; monitor retries with bounded backoff.
|
||||
try {
|
||||
await stop(s.usb?.bridge);
|
||||
} catch (_) {}
|
||||
if (!s.stopping) {
|
||||
s.state = 'USB 恢复失败 · 稍后重试';
|
||||
log('[${s.id}] USB 恢复失败:$e');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> screen(Session s, {bool embedded = false}) async {
|
||||
if (!s.ready) {
|
||||
if (s.stopping) {
|
||||
return;
|
||||
}
|
||||
s.screenWanted = true;
|
||||
if (!s.ready || s.recovering || s.stopping) {
|
||||
return;
|
||||
}
|
||||
if (s.screen != null) {
|
||||
if (s.screenEmbedded == embedded) {
|
||||
return;
|
||||
}
|
||||
await stop(s.screen);
|
||||
final previous = s.screen;
|
||||
s.screen = null;
|
||||
await stop(previous);
|
||||
}
|
||||
final proc = await launchScreen(
|
||||
s.endpoint,
|
||||
@@ -490,6 +619,10 @@ class ManagerRepository {
|
||||
s.id,
|
||||
embedded: embedded,
|
||||
);
|
||||
if (s.stopping || !s.screenWanted) {
|
||||
await stop(proc);
|
||||
return;
|
||||
}
|
||||
s.screen = proc;
|
||||
s.screenEmbedded = embedded;
|
||||
watch(proc, 'scrcpy ${s.id}');
|
||||
@@ -497,6 +630,11 @@ class ManagerRepository {
|
||||
proc.exitCode.then((code) {
|
||||
if (s.screen == proc) {
|
||||
s.screen = null;
|
||||
if (code == 0) {
|
||||
s.screenWanted = false;
|
||||
} else if (!s.stopping && code == 2 && s.usb != null) {
|
||||
s.usbBroken = true;
|
||||
}
|
||||
}
|
||||
log('投屏窗口关闭 ($code)');
|
||||
}),
|
||||
@@ -549,6 +687,8 @@ class ManagerRepository {
|
||||
return;
|
||||
}
|
||||
s.stopping = true;
|
||||
s.screenWanted = false;
|
||||
await s.recoveryTask;
|
||||
for (final proc in [s.screen, s.usb?.bridge, s.process]) {
|
||||
try {
|
||||
await stop(proc);
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
/// Poll-based hysteresis and bounded retry delay, independent of processes/UI.
|
||||
class UsbRecoveryPolicy {
|
||||
int missing = 0, attempts = 0, stable = 0;
|
||||
DateTime retryAt = DateTime.fromMillisecondsSinceEpoch(0);
|
||||
bool due(
|
||||
DateTime now, {
|
||||
required bool ready,
|
||||
bool unauthorized = false,
|
||||
bool broken = false,
|
||||
}) {
|
||||
if (unauthorized) {
|
||||
missing = 0;
|
||||
stable = 0;
|
||||
return false;
|
||||
}
|
||||
if (ready && !broken) {
|
||||
missing = 0;
|
||||
if (++stable >= 10) {
|
||||
attempts = 0;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
stable = 0;
|
||||
missing++;
|
||||
return (broken || missing >= 3) && !now.isBefore(retryAt);
|
||||
}
|
||||
|
||||
void attempted(DateTime now) {
|
||||
final seconds = [2, 4, 8, 16, 30][attempts.clamp(0, 4)];
|
||||
attempts++;
|
||||
missing = 0;
|
||||
retryAt = now.add(Duration(seconds: seconds));
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,7 @@ class UsbDriver {
|
||||
static const hash =
|
||||
'38cad6d4432b52d5bb9409d9ad03b72fdffc4ada4cd3a48fbeca1a2752a8518a';
|
||||
static String defaultUsbip() => p.join(
|
||||
Platform.environment['ProgramFiles'] ?? r'C:Program Files',
|
||||
Platform.environment['ProgramFiles'] ?? 'C:/Program Files',
|
||||
'USBip',
|
||||
'usbip.exe',
|
||||
);
|
||||
|
||||
@@ -82,6 +82,7 @@ class _ManagerAppState extends State<ManagerApp>
|
||||
@override
|
||||
void onWindowClose() {
|
||||
if (trayReady) {
|
||||
widget.model.repository.allowEmbeddedResume = false;
|
||||
unawaited(windowManager.hide());
|
||||
} else {
|
||||
unawaited(quit());
|
||||
@@ -90,10 +91,26 @@ class _ManagerAppState extends State<ManagerApp>
|
||||
|
||||
@override
|
||||
void onTrayIconMouseDown() {
|
||||
widget.model.repository.allowEmbeddedResume = true;
|
||||
unawaited(windowManager.show());
|
||||
unawaited(windowManager.focus());
|
||||
}
|
||||
|
||||
@override
|
||||
void onWindowMinimize() {
|
||||
widget.model.repository.allowEmbeddedResume = false;
|
||||
}
|
||||
|
||||
@override
|
||||
void onWindowRestore() {
|
||||
widget.model.repository.allowEmbeddedResume = true;
|
||||
}
|
||||
|
||||
@override
|
||||
void onWindowFocus() {
|
||||
widget.model.repository.allowEmbeddedResume = true;
|
||||
}
|
||||
|
||||
@override
|
||||
void onTrayIconRightMouseDown() {
|
||||
unawaited(trayManager.popUpContextMenu());
|
||||
|
||||
@@ -18,6 +18,7 @@ class AgentModel extends ChangeNotifier {
|
||||
ManagedAgent? get selected =>
|
||||
_agents.where((a) => a.id == selectedId).firstOrNull;
|
||||
bool localMode = false, busy = false, autoRefresh = true, followLogs = false;
|
||||
Future<void> Function(String, String)? savePath;
|
||||
String adminPath = '',
|
||||
enrollmentPath = '',
|
||||
enrollmentToken = '',
|
||||
|
||||
@@ -3,6 +3,7 @@ import 'package:material_ui/material_ui.dart';
|
||||
import '../data/agent_models.dart';
|
||||
|
||||
import 'agent_model.dart';
|
||||
import 'path_picker.dart';
|
||||
|
||||
class AgentView extends StatefulWidget {
|
||||
const AgentView({super.key, required this.model});
|
||||
@@ -42,6 +43,24 @@ class _AgentViewState extends State<AgentView> {
|
||||
: null,
|
||||
decoration: InputDecoration(
|
||||
labelText: label,
|
||||
suffixIcon: ['configPath', 'admin', 'enroll'].contains(key)
|
||||
? IconButton(
|
||||
tooltip: '选择文件并保存',
|
||||
icon: const Icon(Icons.folder_open),
|
||||
onPressed: m.busy
|
||||
? null
|
||||
: () => m.run(() async {
|
||||
final selected = await pickPath(controller.text);
|
||||
if (selected == null || !mounted) {
|
||||
return;
|
||||
}
|
||||
controller.text = selected;
|
||||
change(selected);
|
||||
await m.savePath?.call(key, selected);
|
||||
m.notice = '文件位置已保存';
|
||||
}),
|
||||
)
|
||||
: null,
|
||||
border: const OutlineInputBorder(),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -172,7 +172,13 @@ class ScreenPage extends StatelessWidget {
|
||||
const SizedBox(height: 12),
|
||||
Expanded(
|
||||
child: pid == null
|
||||
? const Center(child: Text('投屏已停止,请返回设备重新打开。'))
|
||||
? Center(
|
||||
child: Text(
|
||||
s?.screenWanted == true
|
||||
? '连接中断,正在恢复 USB 和投屏…'
|
||||
: '投屏已停止,请返回设备重新打开。',
|
||||
),
|
||||
)
|
||||
: s?.screenEmbedded == true
|
||||
? EmbeddedScreen(key: ValueKey(pid), pid: pid)
|
||||
: const Center(child: Text('投屏已在独立窗口运行,设备连接保持不变。')),
|
||||
|
||||
@@ -47,13 +47,28 @@ class ManagerModel extends ChangeNotifier {
|
||||
Future<void> init() async {
|
||||
await action(() async {
|
||||
await repository.init();
|
||||
agents.savePath = (key, value) async {
|
||||
repository.settings.agentPaths[key] = value;
|
||||
await repository.save();
|
||||
};
|
||||
await agents.initialize(
|
||||
adminFile: repository.root == null
|
||||
? p.join(p.dirname(Platform.resolvedExecutable), 'admin.env')
|
||||
: p.join(repository.root!.path, 'config', 'private', 'admin.env'),
|
||||
adminFile:
|
||||
repository.settings.agentPaths['admin'] ??
|
||||
(repository.root == null
|
||||
? p.join(p.dirname(Platform.resolvedExecutable), 'admin.env')
|
||||
: p.join(
|
||||
repository.root!.path,
|
||||
'config',
|
||||
'private',
|
||||
'admin.env',
|
||||
)),
|
||||
server: repository.settings.server,
|
||||
origin: repository.settings.origin,
|
||||
);
|
||||
agents.configPath =
|
||||
repository.settings.agentPaths['configPath'] ?? agents.configPath;
|
||||
agents.enrollmentPath =
|
||||
repository.settings.agentPaths['enroll'] ?? agents.enrollmentPath;
|
||||
notice = '准备就绪';
|
||||
});
|
||||
await refresh();
|
||||
|
||||
@@ -9,6 +9,7 @@ import '../data/manager_repository.dart';
|
||||
import 'manager_model.dart';
|
||||
import 'agent_view.dart';
|
||||
import 'embedded_screen.dart';
|
||||
import 'path_picker.dart';
|
||||
|
||||
class ManagerView extends StatefulWidget {
|
||||
final ManagerModel model;
|
||||
@@ -82,7 +83,13 @@ class _ManagerViewState extends State<ManagerView> {
|
||||
fontSize: 14,
|
||||
),
|
||||
),
|
||||
onTap: () => setState(() => page = i),
|
||||
onTap: () {
|
||||
for (final session
|
||||
in m.repository.sessions.values) {
|
||||
session.screenPageVisible = false;
|
||||
}
|
||||
setState(() => page = i);
|
||||
},
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
@@ -183,12 +190,18 @@ class _ManagerViewState extends State<ManagerView> {
|
||||
}
|
||||
}),
|
||||
session: m.repository.sessions[screenDevice],
|
||||
onBack: () => setState(() => page = 0),
|
||||
onBack: () {
|
||||
m
|
||||
.repository
|
||||
.sessions[screenDevice]
|
||||
?.screenPageVisible =
|
||||
false;
|
||||
setState(() => page = 0);
|
||||
},
|
||||
onStop: () => m.deviceAction(screenDevice!, () async {
|
||||
final s = m.repository.sessions[screenDevice];
|
||||
if (s != null) {
|
||||
await m.repository.stop(s.screen);
|
||||
s.screen = null;
|
||||
await m.repository.stopScreen(s);
|
||||
}
|
||||
}),
|
||||
),
|
||||
@@ -384,6 +397,7 @@ class _ManagerViewState extends State<ManagerView> {
|
||||
await m.repository.screen(s, embedded: true);
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
s.screenPageVisible = true;
|
||||
screenDevice = s.id;
|
||||
page = 6;
|
||||
});
|
||||
@@ -529,7 +543,13 @@ class _ManagerViewState extends State<ManagerView> {
|
||||
class SettingsView extends StatefulWidget {
|
||||
final ManagerModel model;
|
||||
final Future<bool> Function()? driverInstalled;
|
||||
const SettingsView({super.key, required this.model, this.driverInstalled});
|
||||
final Future<String?> Function(String, bool)? chooseFile;
|
||||
const SettingsView({
|
||||
super.key,
|
||||
required this.model,
|
||||
this.driverInstalled,
|
||||
this.chooseFile,
|
||||
});
|
||||
@override
|
||||
State<SettingsView> createState() => _SettingsViewState();
|
||||
}
|
||||
@@ -692,7 +712,33 @@ class _SettingsViewState extends State<SettingsView> {
|
||||
padding: const EdgeInsets.only(bottom: 18),
|
||||
child: TextField(
|
||||
controller: fields[key],
|
||||
decoration: InputDecoration(labelText: label),
|
||||
decoration: InputDecoration(
|
||||
labelText: label,
|
||||
suffixIcon: ['server', 'origin'].contains(key)
|
||||
? null
|
||||
: IconButton(
|
||||
tooltip: '选择文件并保存',
|
||||
icon: const Icon(Icons.folder_open),
|
||||
onPressed: () => widget.model.action(() async {
|
||||
final selected =
|
||||
await (widget.chooseFile?.call(
|
||||
fields[key]!.text,
|
||||
key != "credential",
|
||||
) ??
|
||||
pickPath(
|
||||
fields[key]!.text,
|
||||
executable: key != 'credential',
|
||||
));
|
||||
if (selected == null || !mounted) {
|
||||
return;
|
||||
}
|
||||
fields[key]!.text = selected;
|
||||
apply();
|
||||
await widget.model.repository.save();
|
||||
widget.model.notice = '文件位置已保存';
|
||||
}),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
SwitchListTile(
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:file_selector/file_selector.dart';
|
||||
import 'package:path/path.dart' as p;
|
||||
|
||||
Future<String?> pickPath(String value, {bool executable = false}) async {
|
||||
final directory = value.isEmpty ? null : p.dirname(value);
|
||||
final selected = await openFile(
|
||||
initialDirectory: directory != null && Directory(directory).existsSync()
|
||||
? directory
|
||||
: null,
|
||||
acceptedTypeGroups: executable
|
||||
? [
|
||||
const XTypeGroup(label: '可执行程序', extensions: ['exe']),
|
||||
]
|
||||
: [],
|
||||
);
|
||||
return selected?.path;
|
||||
}
|
||||
@@ -137,6 +137,14 @@ packages:
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "3.1.2"
|
||||
cross_file:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: cross_file
|
||||
sha256: f141ea4f277af142a0356955707f6556f37b03947d39d55585981a06ca437bd6
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "0.3.5+5"
|
||||
crypto:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -185,6 +193,70 @@ packages:
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "7.0.1"
|
||||
file_selector:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: file_selector
|
||||
sha256: bd15e43e9268db636b53eeaca9f56324d1622af30e5c34d6e267649758c84d9a
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.1.0"
|
||||
file_selector_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_android
|
||||
sha256: d670cd0ce77a2e785b18d8b4d0a8d6a222d6a813ec9b7ddf2790a1b4fb6fa92c
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "0.5.2+11"
|
||||
file_selector_ios:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_ios
|
||||
sha256: "5b42ec0ef7626124b4624ea244341e9df780406793c204e89fa68a2e71af115c"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "0.5.3+7"
|
||||
file_selector_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_linux
|
||||
sha256: da76400e7872ce7637ffdce12749ec24169c25f6195c28372208e65a24bcd2ab
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "0.9.4+1"
|
||||
file_selector_macos:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_macos
|
||||
sha256: d785431f1910aac8a50e5c492cae912320158030a88703c67b9ef7f1f96fd7ba
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "0.9.5+2"
|
||||
file_selector_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_platform_interface
|
||||
sha256: "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "2.7.0"
|
||||
file_selector_web:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_web
|
||||
sha256: "73181fbc5257776d8ecaa6a94ab3c8e920ad143b9132a6d984a9271dfc6928d3"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "0.9.5"
|
||||
file_selector_windows:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: file_selector_windows
|
||||
sha256: fbefc5fb92c6d3cbe8d284a2cd971b593bb07d2cd6da8557b81a862250b4acec
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "0.9.3+6"
|
||||
fixnum:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -216,6 +288,11 @@ packages:
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
flutter_web_plugins:
|
||||
dependency: transitive
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
freezed:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
@@ -248,6 +325,14 @@ packages:
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "2.3.2"
|
||||
http:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: http
|
||||
sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.6.0"
|
||||
http_multi_server:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
||||
@@ -40,6 +40,7 @@ dependencies:
|
||||
path: ^1.9.1
|
||||
freezed_annotation: ^3.1.0
|
||||
crypto: ^3.0.8
|
||||
file_selector: ^1.1.0
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
|
||||
@@ -7,6 +7,7 @@ Future<void> main(List<String> args) async {
|
||||
try {
|
||||
await repo.init();
|
||||
repo.settings.usbMode = args.contains('--usb');
|
||||
repo.settings.relayOnly = args.contains('--relay-only');
|
||||
final devices = await repo.devices();
|
||||
stdout.writeln(
|
||||
'API devices: ${devices.map((d) => "${d.id} busy=${d.busy}").join(", ")}',
|
||||
@@ -23,6 +24,7 @@ Future<void> main(List<String> args) async {
|
||||
return;
|
||||
}
|
||||
final s = await repo.connect(device.id);
|
||||
s.screenPageVisible = true;
|
||||
for (var i = 0; i < 20 && !s.ready && !s.exited; i++) {
|
||||
await Future<void>.delayed(const Duration(seconds: 3));
|
||||
await repo.monitor();
|
||||
@@ -34,13 +36,53 @@ Future<void> main(List<String> args) async {
|
||||
'Remote model: ${await repo.run(s.adb, ['-s', s.endpoint, 'shell', 'getprop', 'ro.product.model'])}',
|
||||
);
|
||||
if (args.contains('--screen')) {
|
||||
await repo.screen(s);
|
||||
await repo.screen(s, embedded: args.contains('--embedded'));
|
||||
await Future<void>.delayed(const Duration(seconds: 8));
|
||||
if (s.screen == null) {
|
||||
throw StateError('scrcpy exited early');
|
||||
}
|
||||
stdout.writeln('scrcpy process alive: ${s.screen!.pid}');
|
||||
}
|
||||
if (args.contains('--recover')) {
|
||||
final original = s.process.pid;
|
||||
final oldBridge = s.usb!.bridge!.pid;
|
||||
final wantedMode = s.screenEmbedded;
|
||||
await repo.stop(s.process);
|
||||
var recovered = false;
|
||||
for (var i = 0; i < 80; i++) {
|
||||
await Future<void>.delayed(const Duration(seconds: 1));
|
||||
await repo.monitor();
|
||||
if (!s.recovering &&
|
||||
s.ready &&
|
||||
s.process.pid != original &&
|
||||
s.usb!.bridge!.pid != oldBridge &&
|
||||
s.screen != null) {
|
||||
recovered = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!recovered) {
|
||||
throw StateError(
|
||||
'USB/client/screen automatic recovery did not complete: ${s.state}',
|
||||
);
|
||||
}
|
||||
if (s.screenEmbedded != wantedMode) {
|
||||
throw StateError('Screen mode was not preserved');
|
||||
}
|
||||
await Future<void>.delayed(const Duration(seconds: 8));
|
||||
if (s.screen == null || !s.ready) {
|
||||
throw StateError('Recovered screen did not remain running');
|
||||
}
|
||||
stdout.writeln('RECOVERY PASS: client + USB remount + scrcpy restored');
|
||||
await repo.stopScreen(s);
|
||||
for (var i = 0; i < 4; i++) {
|
||||
await Future<void>.delayed(const Duration(seconds: 1));
|
||||
await repo.monitor();
|
||||
}
|
||||
if (s.screen != null || s.screenWanted) {
|
||||
throw StateError('Manual stop restarted screen');
|
||||
}
|
||||
}
|
||||
if (args.contains('--usb')) {
|
||||
final path = await repo.run(s.adb, ['-s', s.endpoint, 'get-devpath']);
|
||||
// Windows ADB may return "unknown" for get-devpath. USB-only selection
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
import 'dart:io';
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:material_ui/material_ui.dart';
|
||||
import 'package:ads_manager/ui/manager_model.dart';
|
||||
import 'package:ads_manager/ui/manager_view.dart';
|
||||
|
||||
void main() {
|
||||
for (final cancelled in [false, true]) {
|
||||
testWidgets('file picker saves immediately; cancelled=$cancelled', (
|
||||
tester,
|
||||
) async {
|
||||
tester.view.physicalSize = const Size(1280, 1800);
|
||||
tester.view.devicePixelRatio = 1;
|
||||
addTearDown(tester.view.resetPhysicalSize);
|
||||
addTearDown(tester.view.resetDevicePixelRatio);
|
||||
final folder = Directory.systemTemp.createTempSync('ads-path-test');
|
||||
final model = ManagerModel();
|
||||
model.repository.storage = folder;
|
||||
try {
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
home: Scaffold(
|
||||
body: SettingsView(
|
||||
model: model,
|
||||
chooseFile: (current, executable) async {
|
||||
expect(executable, true);
|
||||
return cancelled ? null : 'C:/SDK/adb.exe';
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
final buttons = find.byTooltip('选择文件并保存');
|
||||
expect(buttons, findsNWidgets(5));
|
||||
await tester.ensureVisible(buttons.at(2));
|
||||
await tester.runAsync(() async {
|
||||
await tester.tap(buttons.at(2));
|
||||
for (
|
||||
var i = 0;
|
||||
i < 100 && !cancelled && model.notice != '文件位置已保存';
|
||||
i++
|
||||
) {
|
||||
await Future<void>.delayed(const Duration(milliseconds: 20));
|
||||
}
|
||||
});
|
||||
await tester.pumpAndSettle();
|
||||
final file = File('${folder.path}/settings.json');
|
||||
if (cancelled) {
|
||||
expect(file.existsSync(), false);
|
||||
} else {
|
||||
expect(model.repository.settings.adb, 'C:/SDK/adb.exe');
|
||||
final saved =
|
||||
jsonDecode(file.readAsStringSync()) as Map<String, dynamic>;
|
||||
expect(saved['adb'], 'C:/SDK/adb.exe');
|
||||
expect(saved.containsKey('token'), false);
|
||||
}
|
||||
await tester.pumpWidget(const SizedBox());
|
||||
model.dispose();
|
||||
} finally {
|
||||
folder.deleteSync(recursive: true);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,159 @@
|
||||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:ads_manager/data/manager_repository.dart';
|
||||
import 'package:ads_manager/data/windows_usb.dart';
|
||||
import 'package:ads_manager/data/usb_recovery.dart';
|
||||
|
||||
class FakeProcess extends Fake implements Process {
|
||||
final exit = Completer<int>();
|
||||
@override
|
||||
int get pid => 123;
|
||||
@override
|
||||
Future<int> get exitCode => exit.future;
|
||||
@override
|
||||
bool kill([ProcessSignal signal = ProcessSignal.sigterm]) {
|
||||
if (!exit.isCompleted) {
|
||||
exit.complete(-1);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
class RecoveryRepo extends ManagerRepository {
|
||||
RecoveryRepo() : super((_) {});
|
||||
@override
|
||||
void watch(Process process, String label) {}
|
||||
String listing = '';
|
||||
int remounts = 0, screens = 0;
|
||||
bool? resumedEmbedded;
|
||||
Completer<void>? hold;
|
||||
@override
|
||||
Future<String> run(String exe, List<String> args) async => listing;
|
||||
@override
|
||||
Future<void> recoverUsb(Session s) async {
|
||||
remounts++;
|
||||
if (hold != null) {
|
||||
await hold!.future;
|
||||
}
|
||||
s.usbBroken = false;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<Process> launchScreen(
|
||||
String endpoint,
|
||||
String adb,
|
||||
String id, {
|
||||
bool embedded = false,
|
||||
}) async {
|
||||
screens++;
|
||||
resumedEmbedded = embedded;
|
||||
return FakeProcess();
|
||||
}
|
||||
}
|
||||
|
||||
void main() {
|
||||
test('embedded video waits for its page and visible main window', () async {
|
||||
final repo = RecoveryRepo();
|
||||
final s =
|
||||
Session('phone', '127.0.0.1:15555', 'adb', 'missing', FakeProcess())
|
||||
..usb = WindowsUsbSession('phone', 3240)
|
||||
..initialized = true
|
||||
..screenWanted = true
|
||||
..screenEmbedded = true;
|
||||
repo.sessions[s.id] = s;
|
||||
repo.listing = '${s.endpoint}\tdevice\n';
|
||||
await repo.monitor();
|
||||
expect(repo.screens, 0);
|
||||
s.screenPageVisible = true;
|
||||
repo.allowEmbeddedResume = false;
|
||||
await repo.monitor();
|
||||
expect(repo.screens, 0);
|
||||
repo.allowEmbeddedResume = true;
|
||||
await repo.monitor();
|
||||
expect(repo.screens, 1);
|
||||
await repo.stopScreen(s);
|
||||
});
|
||||
test('requires three missed polls; ignores unauthorized and backs off', () {
|
||||
final policy = UsbRecoveryPolicy();
|
||||
final now = DateTime(2026);
|
||||
expect(policy.due(now, ready: false), false);
|
||||
expect(policy.due(now, ready: false), false);
|
||||
expect(policy.due(now, ready: false), true);
|
||||
policy.attempted(now);
|
||||
expect(policy.due(now, ready: false, broken: true), false);
|
||||
expect(
|
||||
policy.due(
|
||||
now.add(const Duration(seconds: 2)),
|
||||
ready: false,
|
||||
broken: true,
|
||||
),
|
||||
true,
|
||||
);
|
||||
expect(
|
||||
policy.due(
|
||||
now.add(const Duration(seconds: 30)),
|
||||
ready: false,
|
||||
unauthorized: true,
|
||||
broken: true,
|
||||
),
|
||||
false,
|
||||
);
|
||||
for (var i = 0; i < 12; i++) {
|
||||
policy.attempted(now);
|
||||
}
|
||||
expect(policy.retryAt.difference(now).inSeconds, 30);
|
||||
});
|
||||
test('one remount task at a time, then resumes the requested mode', () async {
|
||||
final repo = RecoveryRepo();
|
||||
final session =
|
||||
Session('phone', '127.0.0.1:15555', 'adb', 'missing', FakeProcess())
|
||||
..usb = WindowsUsbSession('phone', 3240)
|
||||
..initialized = true
|
||||
..screenWanted = true
|
||||
..screenPageVisible = true
|
||||
..screenEmbedded = true;
|
||||
repo.sessions[session.id] = session;
|
||||
repo.hold = Completer<void>();
|
||||
for (var i = 0; i < 5; i++) {
|
||||
await repo.monitor();
|
||||
}
|
||||
expect(repo.remounts, 1);
|
||||
expect(session.recovering, true);
|
||||
repo.hold!.complete();
|
||||
await session.recoveryTask;
|
||||
session.recovery.retryAt = DateTime(2026);
|
||||
repo.listing = '${session.endpoint}\tdevice\n';
|
||||
await repo.monitor();
|
||||
expect(repo.screens, 1);
|
||||
expect(repo.resumedEmbedded, true);
|
||||
expect(session.screenWanted, true);
|
||||
await repo.stopScreen(session);
|
||||
await repo.monitor();
|
||||
expect(repo.screens, 1);
|
||||
expect(session.screenWanted, false);
|
||||
});
|
||||
test('stopping a session prevents remount and screen restart', () async {
|
||||
final repo = RecoveryRepo();
|
||||
final session =
|
||||
Session('phone', '127.0.0.1:15555', 'adb', 'missing', FakeProcess())
|
||||
..usb = WindowsUsbSession('phone', 3240)
|
||||
..initialized = true
|
||||
..stopping = true;
|
||||
repo.sessions[session.id] = session;
|
||||
for (var i = 0; i < 5; i++) {
|
||||
await repo.monitor();
|
||||
}
|
||||
await repo.screen(session, embedded: true);
|
||||
expect(repo.remounts, 0);
|
||||
expect(repo.screens, 0);
|
||||
expect(session.screenWanted, false);
|
||||
});
|
||||
test('path settings persist paths, not credential contents', () {
|
||||
final settings = Settings()
|
||||
..agentPaths = {'admin': 'C:/admin.env', 'configPath': 'C:/agent.json'};
|
||||
final loaded = Settings()..load(settings.toJson());
|
||||
expect(loaded.agentPaths, settings.agentPaths);
|
||||
});
|
||||
}
|
||||
@@ -6,11 +6,14 @@
|
||||
|
||||
#include "generated_plugin_registrant.h"
|
||||
|
||||
#include <file_selector_windows/file_selector_windows.h>
|
||||
#include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
|
||||
#include <tray_manager/tray_manager_plugin.h>
|
||||
#include <window_manager/window_manager_plugin.h>
|
||||
|
||||
void RegisterPlugins(flutter::PluginRegistry* registry) {
|
||||
FileSelectorWindowsRegisterWithRegistrar(
|
||||
registry->GetRegistrarForPlugin("FileSelectorWindows"));
|
||||
ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(
|
||||
registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
|
||||
TrayManagerPluginRegisterWithRegistrar(
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#
|
||||
|
||||
list(APPEND FLUTTER_PLUGIN_LIST
|
||||
file_selector_windows
|
||||
screen_retriever_windows
|
||||
tray_manager
|
||||
window_manager
|
||||
|
||||
Reference in new issue
Block a user