feat(client): 三端布局架构 + macOS 桌面端 + app 图标

三端布局(mobile/tablet/desktop):
- core/responsive/form_factor.dart 形态判定 + shell/ 分发器(home_shell→desktop/mobile)
- desktop_shell 对照 ui_kits/desktop/dapp.jsx: 侧栏204·6项 + 套餐卡 + 顶栏(标题/状态/主题切换) + 连接页居中单列
- 新增组件 nav_sidebar / plan_badge_card / content_top_bar / bottom_tab_bar
- 新增一级页 contact_page / settings_page; navigation_provider(NavView)
- 删除旧 widgets/home_shell.dart(逻辑迁入 shell/)

macOS 桌面端:
- 窗口默认 920×600 + 最小 720×560(MainFlutterWindow.swift)
- app 图标替换为穿山甲(AppIcon.appiconset 全套, 由 app-icon.svg 渲染)

其余(本会话):
- Phase2 接线: auth_api/token_store/auth_provider/vpn_bridge_provider + 真实 connection/nodes
- lucide_icons 兼容补丁(packages/lucide_icons_patched) 修复 IconData final 报错
- 测试修复: connect_passthrough(UTF-8) / harness / golden @Skip
- l10n 新增 settingsTitle

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
wangjia
2026-06-16 09:23:20 +08:00
parent 71a4cddf0b
commit 4dc4127252
92 changed files with 4536 additions and 1187 deletions
@@ -1,71 +1,77 @@
// connection_controller_test.dart — 连接状态机:严格三态、禁乐观显示
//
// ConnectionController 通过 Riverpod ProviderContainer 测试。
// 使用演示节点(uuid 为空)→ 走 mock 分支(1.2s Timer 进入 on)。
// 覆盖 tokenStoreProvider 避免 FlutterSecureStorage 平台依赖。
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:pangolin_vpn/bridge/vpn_bridge_provider.dart';
import 'package:pangolin_vpn/bridge/vpn_bridge_mock.dart';
import 'package:pangolin_vpn/models/node.dart';
import 'package:pangolin_vpn/services/token_store.dart';
import 'package:pangolin_vpn/state/connection_provider.dart';
import 'package:pangolin_vpn/state/nodes_provider.dart';
import 'package:pangolin_vpn/state/auth_provider.dart';
// ── Stub TokenStore(无平台依赖)──────────────────────────────────
class _NullTokenStore implements TokenStore {
const _NullTokenStore();
@override
Future<void> saveTokens({required String access, required String refresh}) async {}
@override
Future<String?> loadAccessToken() async => null;
@override
Future<String?> loadRefreshToken() async => null;
@override
Future<void> clear() async {}
}
// ── 辅助 ──────────────────────────────────────────────────────────
/// 演示节点(uuid 为空 → _connect 走 1.2s mock 分支)。
const _demoNode = Node(
code: 'HK',
nameZh: '香港',
nameEn: 'Hong Kong',
ping: 18,
);
ProviderContainer makeContainer() => ProviderContainer(
overrides: [
tokenStoreProvider.overrideWithValue(const _NullTokenStore()),
effectiveNodeProvider.overrideWithValue(_demoNode),
vpnBridgeProvider.overrideWithValue(VpnBridgeMock()),
],
);
void main() {
// 注入极短握手时长,用真实计时器走完状态流转。
ConnectionController make() => ConnectionController(handshake: const Duration(milliseconds: 20));
test('初始为 off', () {
final ctl = make();
expect(ctl.state.phase, VpnPhase.off);
ctl.dispose();
final c = makeContainer();
addTearDown(c.dispose);
expect(c.read(connectionProvider).phase, VpnPhase.off);
});
test('connect: off → connecting → on', () async {
final ctl = make();
ctl.connect();
expect(ctl.state.phase, VpnPhase.connecting);
await Future<void>.delayed(const Duration(milliseconds: 60));
expect(ctl.state.phase, VpnPhase.on);
ctl.dispose();
test('toggle → off 态立即切为 connecting', () {
final c = makeContainer();
addTearDown(c.dispose);
c.read(connectionProvider.notifier).toggle();
expect(c.read(connectionProvider).phase, VpnPhase.connecting);
});
test('握手中再次 toggle 被忽略(禁止乐观回退)', () async {
final ctl = make();
ctl.toggle(); // off → connecting
expect(ctl.state.phase, VpnPhase.connecting);
ctl.toggle(); // connecting 中点击 → 仍 connecting
expect(ctl.state.phase, VpnPhase.connecting);
await Future<void>.delayed(const Duration(milliseconds: 60));
expect(ctl.state.phase, VpnPhase.on);
ctl.dispose();
test('connecting 时再次 toggle 被忽略禁止乐观回退', () {
final c = makeContainer();
addTearDown(c.dispose);
c.read(connectionProvider.notifier).toggle();
expect(c.read(connectionProvider).phase, VpnPhase.connecting);
c.read(connectionProvider.notifier).toggle(); // connecting 中点 → 无效
expect(c.read(connectionProvider).phase, VpnPhase.connecting);
});
test('ontoggle → off', () async {
final ctl = make();
ctl.connect();
await Future<void>.delayed(const Duration(milliseconds: 60));
expect(ctl.state.phase, VpnPhase.on);
ctl.toggle();
expect(ctl.state.phase, VpnPhase.off);
ctl.dispose();
});
test('已连接时切换节点 → 重连(回到 connecting)', () async {
final ctl = make();
ctl.connect();
await Future<void>.delayed(const Duration(milliseconds: 60));
expect(ctl.state.phase, VpnPhase.on);
ctl.onNodeChanged();
expect(ctl.state.phase, VpnPhase.connecting);
ctl.dispose();
});
test('on 态计时累加', () async {
final ctl = make();
ctl.connect();
await Future<void>.delayed(const Duration(milliseconds: 60));
expect(ctl.state.elapsed, Duration.zero);
await Future<void>.delayed(const Duration(milliseconds: 1100));
expect(ctl.state.elapsed.inSeconds, greaterThanOrEqualTo(1));
ctl.dispose();
});
test('off 态切换节点不会自动连接', () {
final ctl = make();
ctl.onNodeChanged();
expect(ctl.state.phase, VpnPhase.off);
ctl.dispose();
test('offonNodeChanged 不触发连接', () {
final c = makeContainer();
addTearDown(c.dispose);
c.read(connectionProvider.notifier).onNodeChanged();
expect(c.read(connectionProvider).phase, VpnPhase.off);
});
}