7fdadace4e
日志显示每次节点加载,_maybeAutoConnect 回调抛 NoSuchMethodError:AsyncData 没有 valueOrNull (在判 autoConnect 之前就崩)→ 自动连接从未生效。根因:sub 声明成裸 ProviderSubscription (=<dynamic>),逼 listenManual 推断成 dynamic,next 变 dynamic;valueOrNull 是扩展 getter, dynamic 上不解析 → 运行期 NoSuchMethod。修:sub 标全泛型 ProviderSubscription<AsyncValue<List<Node>>>。 (1.0.18 的竞态修复是误判,真凶是这个崩溃。)诊断日志暂留,确认后清。 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
197 lines
7.3 KiB
Dart
197 lines
7.3 KiB
Dart
// main.dart — 入口(演示态)
|
|
// 串接:登录 → 引导 → 主框架(4 Tab);状态层统一走 Riverpod。
|
|
import 'dart:io';
|
|
import 'dart:ui' as ui;
|
|
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|
import 'package:window_manager/window_manager.dart';
|
|
|
|
import 'bridge/log.dart';
|
|
import 'bridge/vpn_bridge_provider.dart';
|
|
import 'models/node.dart';
|
|
import 'pangolin_theme.dart';
|
|
import 'services/token_store.dart';
|
|
import 'shell/home_shell.dart';
|
|
import 'state/app_providers.dart';
|
|
import 'state/auth_provider.dart';
|
|
import 'state/connection_provider.dart';
|
|
import 'state/nodes_provider.dart';
|
|
import 'state/settings_provider.dart';
|
|
import 'system_tray.dart';
|
|
import 'widgets/auth_screen.dart';
|
|
import 'widgets/onboarding_screen.dart';
|
|
import 'widgets/pangolin_logo.dart';
|
|
|
|
Future<void> main() async {
|
|
WidgetsFlutterBinding.ensureInitialized();
|
|
// 桌面端:单实例 + 常驻系统托盘(关闭窗口隐藏到托盘而非退出)。
|
|
if (isDesktop) {
|
|
if (!await ensureSingleInstance()) {
|
|
exit(0); // 已有实例在跑(已唤起其窗口),本进程退出。
|
|
}
|
|
await TrayService.instance.init();
|
|
// 桌面窗口尺寸:默认 920×640;最小宽 720(低于 form_factor 的 680 阈值会
|
|
// 掉进 MobileShell,侧栏消失)。init() 内已 windowManager.ensureInitialized()。
|
|
await windowManager.setMinimumSize(const Size(720, 560));
|
|
await windowManager.setSize(const Size(920, 640));
|
|
await windowManager.center();
|
|
// 窗口标题用中文品牌名(不带 "VPN" 字眼);英文环境下原生标题为 "Pangolin"。
|
|
await windowManager.setTitle('穿山甲');
|
|
}
|
|
runApp(const ProviderScope(child: PangolinApp()));
|
|
}
|
|
|
|
class PangolinApp extends ConsumerStatefulWidget {
|
|
const PangolinApp({super.key});
|
|
|
|
@override
|
|
ConsumerState<PangolinApp> createState() => _PangolinAppState();
|
|
}
|
|
|
|
class _PangolinAppState extends ConsumerState<PangolinApp> {
|
|
AppLifecycleListener? _lifecycle;
|
|
// 是否正在「真退出」(托盘「退出」菜单触发)。区分:点关闭只隐藏到托盘、保持隧道。
|
|
bool _isQuitting = false;
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
if (isDesktop) {
|
|
// 关闭 / 退出请求的处理:
|
|
// - Windows:点 X / Alt+F4 会触发 onExitRequested,但桌面端要常驻托盘、隧道不断
|
|
// → 取消退出并隐藏到托盘。真正退出只走托盘「退出」菜单(见 onBeforeQuit)。
|
|
// (否则会出现:连接被拆、窗口却只是隐藏,即「关掉就断网但进程还在」。)
|
|
// - macOS:Cmd+Q 等真退出 → 先停内核拆隧道再退出(红叉关闭走 onWindowClose 隐藏)。
|
|
_lifecycle = AppLifecycleListener(onExitRequested: () async {
|
|
if (Platform.isWindows && !_isQuitting) {
|
|
await windowManager.hide();
|
|
return ui.AppExitResponse.cancel;
|
|
}
|
|
await _teardownVpn();
|
|
return ui.AppExitResponse.exit;
|
|
});
|
|
// 托盘「退出」前置钩子:标记真退出 + 停内核拆隧道(避免 sing-box 孤儿 + TUN 残留)。
|
|
TrayService.instance.onBeforeQuit = () async {
|
|
_isQuitting = true;
|
|
await _teardownVpn();
|
|
};
|
|
}
|
|
}
|
|
|
|
Future<void> _teardownVpn() async {
|
|
try {
|
|
await ref.read(vpnBridgeProvider).stop().timeout(const Duration(seconds: 3));
|
|
} catch (_) {
|
|
// 内核未启动/已退出:忽略。
|
|
}
|
|
}
|
|
|
|
@override
|
|
void dispose() {
|
|
_lifecycle?.dispose();
|
|
super.dispose();
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final mode = ref.watch(themeModeProvider);
|
|
return MaterialApp(
|
|
title: '穿山甲',
|
|
debugShowCheckedModeBanner: false,
|
|
theme: PangolinTheme.light,
|
|
darkTheme: PangolinTheme.dark,
|
|
themeMode: mode,
|
|
home: const RootFlow(),
|
|
);
|
|
}
|
|
}
|
|
|
|
/// 应用根流转:启动时若已有有效会话(7 天内 refresh 有效)直接进主界面,
|
|
/// 免登陆;会话失效则回登录页。引导页仅首次注册/登录后看一次。
|
|
class RootFlow extends ConsumerStatefulWidget {
|
|
const RootFlow({super.key});
|
|
@override
|
|
ConsumerState<RootFlow> createState() => _RootFlowState();
|
|
}
|
|
|
|
class _RootFlowState extends ConsumerState<RootFlow> {
|
|
final _store = const TokenStore();
|
|
bool _forceOnboarding = false;
|
|
bool _autoConnectArmed = false; // 自动连接每进程只尝试一次
|
|
bool _homeLogged = false; // 仅日志:HomeShell 首次显示打一行
|
|
|
|
// 进入登录态主界面后:若开了「自动连接」且当前未连接,等节点就绪后自动连一次。
|
|
void _maybeAutoConnect() {
|
|
if (_autoConnectArmed) return;
|
|
_autoConnectArmed = true;
|
|
logLine('AutoConnect', 'armed; waiting for nodes ready');
|
|
// 注意:不在此处早读 settingsProvider.autoConnect —— 其 _load 是异步(SharedPreferences),
|
|
// 启动这一刻多半还没加载完,会读到默认 false 而永久跳过。改到「节点就绪」回调里再判:
|
|
// 节点要走网络拉取,远慢于本地设置读取,那时 autoConnect 必已加载到位。
|
|
// 必须标全泛型:裸 ProviderSubscription(=<dynamic>)会让 listenManual 推断成 dynamic,
|
|
// next 变 dynamic → valueOrNull(扩展 getter)在 dynamic 上不解析 → 运行期 NoSuchMethod。
|
|
late final ProviderSubscription<AsyncValue<List<Node>>> sub;
|
|
sub = ref.listenManual(nodesProvider, (prev, next) {
|
|
final nodes = next.valueOrNull ?? const <Node>[];
|
|
final ready = nodes.any((n) => n.uuid.isNotEmpty);
|
|
logLine('AutoConnect', 'nodes update: total=${nodes.length} ready=$ready loading=${next.isLoading} err=${next.hasError}');
|
|
if (!ready) return;
|
|
sub.close();
|
|
final ac = ref.read(settingsProvider).autoConnect;
|
|
final phase = ref.read(connectionProvider).phase;
|
|
logLine('AutoConnect', 'nodes ready → autoConnect=$ac phase=$phase');
|
|
if (ac && phase == VpnPhase.off) {
|
|
logLine('AutoConnect', 'triggering connect');
|
|
ref.read(connectionProvider.notifier).toggle();
|
|
} else {
|
|
logLine('AutoConnect', 'NOT connecting (autoConnect=$ac phase=$phase)');
|
|
}
|
|
}, fireImmediately: true);
|
|
}
|
|
|
|
// 登录/注册成功后:未看过引导才进引导,否则直接主界面。
|
|
Future<void> _afterAuth() async {
|
|
final onboarded = await _store.isOnboarded();
|
|
if (!mounted) return;
|
|
setState(() => _forceOnboarding = !onboarded);
|
|
}
|
|
|
|
Future<void> _afterOnboarding() async {
|
|
await _store.markOnboarded();
|
|
if (!mounted) return;
|
|
setState(() => _forceOnboarding = false);
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final t = ref.watch(appTextProvider);
|
|
final auth = ref.watch(authProvider);
|
|
|
|
if (auth.isLoading) return const _Splash();
|
|
if (!auth.isLoggedIn) {
|
|
return AuthScreen(t: t, onDone: () { _afterAuth(); });
|
|
}
|
|
if (_forceOnboarding) {
|
|
return OnboardingScreen(t: t, onDone: () { _afterOnboarding(); });
|
|
}
|
|
if (!_homeLogged) {
|
|
_homeLogged = true;
|
|
logLine('AutoConnect', 'HomeShell shown; scheduling auto-connect check');
|
|
}
|
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
|
if (mounted) _maybeAutoConnect();
|
|
});
|
|
return const HomeShell();
|
|
}
|
|
}
|
|
|
|
/// 会话恢复期间的极简启动屏(避免登录页一闪而过)。
|
|
class _Splash extends StatelessWidget {
|
|
const _Splash();
|
|
@override
|
|
Widget build(BuildContext context) => const Scaffold(
|
|
body: Center(child: PangolinMark(size: 56)),
|
|
);
|
|
}
|