Load bundled personal defaults when no saved profile exists
This commit is contained in:
@@ -14,3 +14,5 @@
|
||||
*.app/
|
||||
*.keystore
|
||||
*.jks
|
||||
apps/meshport_lab/assets/config/default.private.toml
|
||||
apps/meshport_lab/assets/config/default.toml
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
# Personal builds: copy to default.private.toml and fill in your network.
|
||||
# This file is bundled only when no private default exists.
|
||||
hostname = "MeshPort"
|
||||
ipv4 = "10.77.0.11/24"
|
||||
listeners = []
|
||||
|
||||
[[peer]]
|
||||
uri = "tcp://relay.example.com:11010"
|
||||
|
||||
[network_identity]
|
||||
network_name = "game-net"
|
||||
network_secret = ""
|
||||
|
||||
[flags]
|
||||
no_tun = false
|
||||
use_smoltcp = false
|
||||
enable_encryption = true
|
||||
default_protocol = "udp"
|
||||
latency_first = true
|
||||
enable_ipv6 = true
|
||||
|
||||
[runtime]
|
||||
mode = "system_vpn"
|
||||
|
||||
[optimization]
|
||||
mode = "adaptive"
|
||||
prefer_udp = true
|
||||
relay_peer_ids = []
|
||||
@@ -73,6 +73,7 @@ class _LabScreenState extends State<LabScreen> {
|
||||
}
|
||||
client = applicationClient = opened;
|
||||
log('原生库已加载 · ABI v1');
|
||||
bool restored = false;
|
||||
if (profileSupported) {
|
||||
try {
|
||||
final stored = (await vpnChannel.invokeMethod<String>(
|
||||
@@ -80,6 +81,7 @@ class _LabScreenState extends State<LabScreen> {
|
||||
))?.replaceAll(RegExp(r'^subnet_routes\s*=.*$', multiLine: true), '');
|
||||
if (stored != null) {
|
||||
await loadForm(stored);
|
||||
restored = true;
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
savedConfig = stored;
|
||||
@@ -92,6 +94,29 @@ class _LabScreenState extends State<LabScreen> {
|
||||
log('读取已保存配置失败,请在设置中重试');
|
||||
}
|
||||
}
|
||||
if (!restored) {
|
||||
try {
|
||||
String defaults;
|
||||
try {
|
||||
defaults = await rootBundle.loadString(
|
||||
'assets/config/default.toml',
|
||||
);
|
||||
} on FlutterError {
|
||||
defaults = await rootBundle.loadString(
|
||||
'assets/config/default.example.toml',
|
||||
);
|
||||
}
|
||||
await loadForm(defaults);
|
||||
if (mounted) setState(() => rememberConfig = profileSupported);
|
||||
log(
|
||||
secret.text.isEmpty
|
||||
? '已载入默认配置,首次填写网络密钥后保存即可'
|
||||
: '已载入默认网络配置,点击连接即可组网',
|
||||
);
|
||||
} catch (_) {
|
||||
log('默认配置加载失败,请在设置中导入配置');
|
||||
}
|
||||
}
|
||||
final diagnostics = await opened.enableDiagnostics();
|
||||
log(diagnostics['enabled'] == true ? '穿透详细日志采集已开启' : '穿透日志未接管:宿主已有日志订阅器');
|
||||
if (Platform.isAndroid) {
|
||||
|
||||
@@ -62,6 +62,8 @@ flutter:
|
||||
uses-material-design: true
|
||||
assets:
|
||||
- assets/branding/meshport.png
|
||||
- assets/config/default.toml
|
||||
- assets/config/default.example.toml
|
||||
|
||||
# To add assets to your application, add an assets section, like this:
|
||||
# assets:
|
||||
|
||||
@@ -44,6 +44,16 @@ void main() {
|
||||
Future<void> openSettings(WidgetTester tester) async {
|
||||
await tester.pumpWidget(const MaterialApp(home: LabScreen()));
|
||||
await waitFor(tester, find.textContaining('原生库已加载'));
|
||||
await waitFor(
|
||||
tester,
|
||||
find.byWidgetPredicate(
|
||||
(widget) =>
|
||||
widget is Text &&
|
||||
(widget.data?.contains('已载入默认配置') == true ||
|
||||
widget.data?.contains('已载入默认网络配置') == true ||
|
||||
widget.data?.contains('已自动载入保存的网络配置') == true),
|
||||
),
|
||||
);
|
||||
await tester.tap(find.text('设置').last);
|
||||
await tester.pumpAndSettle();
|
||||
}
|
||||
|
||||
@@ -39,3 +39,11 @@ flutter test integration_test/android_network_test.dart -d DEVICE_SERIAL
|
||||
测试中的系统 VPN 授权必须由用户在手机上完成。测试结束应删除两条 adb reverse 并关闭夹具。测试使用固定地址,不覆盖公网打洞、移动网络切换、长期后台存活或实际游戏负载。
|
||||
|
||||
2026-10-10 在 OPPO PJZ110(API 37、4 KB 页面)完整通过:加密配置保存/重新读取/删除、SDK 应用内 TCP/UDP、Java 与 Dart 普通系统 TCP/UDP 经 VPN 通信、公告子网自动安装及撤销。隔离测试不修改用户配置。公网打洞、长期后台运行及移动网络切换尚未验证。
|
||||
|
||||
## 自用默认配置
|
||||
|
||||
自用配置文件为 `apps/meshport_lab/assets/config/default.private.toml`,不会提交 Git。可以从同目录的 `default.example.toml` 复制后填写网络身份、密钥、虚拟 IP 和初始节点。每台设备应使用不同的静态虚拟 IP。
|
||||
|
||||
Android 和 macOS 打包脚本会先执行 `sh scripts/prepare-lab-default.sh`,将私人文件复制为安装包资源 `default.toml`;没有私人文件时使用示例。直接运行 Flutter 命令之前也应先执行该脚本。APK 里的默认配置可以被提取,含密钥的自用安装包不要分发。
|
||||
|
||||
客户端优先读取安全存储中已保存的配置;没有可用保存配置时加载安装包默认配置,并默认开启配置保存。默认配置只预填表单,不会自动连接。保存后下次启动会恢复修改后的配置;删除保存配置后,下次启动重新使用安装包默认值。
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
cd "$(dirname "$0")/.."
|
||||
sh scripts/prepare-lab-default.sh
|
||||
mode="${1:---release}"
|
||||
case "$mode" in --debug|--release) ;; *) printf '%s\n' 'usage: build-lab-android.sh [--debug|--release]' >&2; exit 2;; esac
|
||||
sdk="${ANDROID_SDK_ROOT:-$HOME/Library/Android/sdk}"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
cd "$(dirname "$0")/.."
|
||||
sh scripts/prepare-lab-default.sh
|
||||
scripts/cargo-local.sh build -p meshport-ffi -p meshport-vpn-helper --locked
|
||||
root="$PWD"
|
||||
cd apps/meshport_lab
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
cd "$(dirname "$0")/.."
|
||||
config_dir=apps/meshport_lab/assets/config
|
||||
if [ -f "$config_dir/default.private.toml" ]; then
|
||||
cp "$config_dir/default.private.toml" "$config_dir/default.toml"
|
||||
else
|
||||
cp "$config_dir/default.example.toml" "$config_dir/default.toml"
|
||||
fi
|
||||
chmod 600 "$config_dir/default.toml"
|
||||
Reference in New Issue
Block a user