HI-VPN/hi-client
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: HI-VPN:4fdf4da4f3a8d5fafe9bf006d6d52122e8b9a5b5
Branches Tags
HI-VPN:main
HI-VPN:re-main
HI-VPN:dev
..
compare: HI-VPN:1809c11473479e108de65b63f44a4558ce3fcef4
Branches Tags
HI-VPN:main
HI-VPN:re-main
HI-VPN:dev

No commits in common. "4fdf4da4f3a8d5fafe9bf006d6d52122e8b9a5b5" and "1809c11473479e108de65b63f44a4558ce3fcef4" have entirely different histories.
4fdf4da4f3 ... 1809c11473

10 changed files with 1213 additions and 1087 deletions
Show Stats Expand all files Collapse all files

373
lib/app/model/business/kr_outbound_item.dart
View File

@ -28,11 +28,66 @@ class KROutboundItem {
/// URL
String url = "";
// ✅ 1. 将传入的 nodeListItem 保存为类的 final 成员变量
final KrNodeListItem nodeListItem;
/// 服务器类型
/// 构造函数，接受 KrItem 对象并初始化 KROutboundItem
KROutboundItem(KrNodeListItem nodeListItem) {
KROutboundItem(this.nodeListItem) {
_initFromNodeListItem();
}
/// 静态工厂：构造虚拟 urltest 节点（用于 ${country}-auto）
factory KROutboundItem.fromVirtual(String tag, String country, Map<String, dynamic> config) {
// 构造一个虚拟 KrNodeListItem，仅填充必要字段
final virtualNode = KrNodeListItem(
id: 0,
name: tag,
protocol: 'urltest',
serverAddr: '',
port: 0,
uuid: '',
config: jsonEncode(config),
city: '',
country: country,
tags: [],
latitude: 0,
longitude: 0,
latitudeCountry: 0,
longitudeCountry: 0,
relayNode: '',
relayMode: 'none',
protocols: '',
method: '',
speedLimit: 0,
traffic: 0,
trafficRatio: 0,
upload: 0,
download: 0,
startTime: '',
expireTime: '',
);
return KROutboundItem._virtual(virtualNode);
}
/// 私有构造：用于虚拟节点，避免重复解析
KROutboundItem._virtual(this.nodeListItem) {
// 直接填充虚拟节点所需字段
id = nodeListItem.id.toString();
protocol = nodeListItem.protocol;
tag = nodeListItem.name;
serverAddr = nodeListItem.serverAddr;
city = nodeListItem.city;
country = nodeListItem.country;
latitude = nodeListItem.latitude;
latitudeCountry = nodeListItem.latitudeCountry;
longitude = nodeListItem.longitude;
longitudeCountry = nodeListItem.longitudeCountry;
config = jsonDecode(nodeListItem.config); // 已知 config 有效
}
/// 初始化逻辑提取，供主构造调用
void _initFromNodeListItem() {
id = nodeListItem.id.toString();
protocol = nodeListItem.protocol;
latitude = nodeListItem.latitude;
@ -55,160 +110,163 @@ class KROutboundItem {
return;
}
// 兜底：尝试解析 config 字段（旧API格式）
if (nodeListItem.config.isEmpty) {
if (kDebugMode) {
print('❌ 节点 ${nodeListItem.name} 缺少配置信息（无port或config）');
}
config = {};
return;
}
late Map<String, dynamic> json;
try {
json = jsonDecode(nodeListItem.config) as Map<String, dynamic>;
} catch (e) {
if (kDebugMode) {
print('❌ 节点 ${nodeListItem.name} 的 config 解析失败: $e，尝试使用直接字段');
}
if (kDebugMode) {
print('📄 Config 内容: ${nodeListItem.config}');
}
_buildConfigFromFields(nodeListItem);
return;
}
switch (nodeListItem.protocol) {
case "vless":
final securityConfig =
json["security_config"] as Map<String, dynamic>? ?? {};
// 智能设置 server_name
String serverName = securityConfig["sni"] ?? "";
if (serverName.isEmpty) {
serverName = nodeListItem.serverAddr;
// 兜底：尝试从 config 字段解析（旧API格式）
if (nodeListItem.config.isNotEmpty) {
try {
final json = jsonDecode(nodeListItem.config) as Map<String, dynamic>;
if (kDebugMode) {
print('📄 解析到 config JSON: $json');
}
config = {
"type": "vless",
"tag": nodeListItem.name,
"server": nodeListItem.serverAddr,
"server_port": json["port"],
"uuid": nodeListItem.uuid,
if (json["flow"] != null && json["flow"] != "none")
"flow": json["flow"],
if (json["transport"] != null && json["transport"] != "tcp")
"transport": _buildTransport(json),
"tls": {
"enabled": json["security"] == "tls",
"server_name": serverName,
"insecure": securityConfig["allow_insecure"] ?? true,
"utls": {
"enabled": true,
"fingerprint": securityConfig["fingerprint"] ?? "chrome"
// 提取 transport 配置
Map<String, dynamic>? transportConfig;
if (json['transport'] != null && json['transport'] != 'tcp') {
transportConfig = _buildTransport(json);
if (kDebugMode) {
print('✅ 找到 transport 配置: $transportConfig');
}
}
// 提取 security_config
Map<String, dynamic>? securityConfig;
if (json['security_config'] != null) {
securityConfig = json['security_config'] as Map<String, dynamic>;
if (kDebugMode) {
print('✅ 找到 security_config: $securityConfig');
}
}
// 根据协议类型构建配置
switch (nodeListItem.protocol) {
case "shadowsocks":
config = {
"type": "shadowsocks",
"tag": nodeListItem.name,
"server": nodeListItem.serverAddr,
"server_port": json["port"],
"method": json["method"],
"password": nodeListItem.uuid
};
break;
case "vless":
final bool isDomain = !RegExp(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$')
.hasMatch(nodeListItem.serverAddr);
config = {
"type": "vless",
"tag": nodeListItem.name,
"server": nodeListItem.serverAddr,
"server_port": json["port"],
"uuid": nodeListItem.uuid,
if (transportConfig != null) "transport": transportConfig,
if (json["security"] == "tls") "tls": {
"enabled": true,
if (isDomain) "server_name": securityConfig?["sni"] ?? nodeListItem.serverAddr,
"insecure": securityConfig?["allow_insecure"] ?? true,
"utls": {
"enabled": true,
"fingerprint": securityConfig?["fingerprint"] ?? "chrome"
}
}
};
break;
case "vmess":
final bool isDomain = !RegExp(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$')
.hasMatch(nodeListItem.serverAddr);
config = {
"type": "vmess",
"tag": nodeListItem.name,
"server": nodeListItem.serverAddr,
"server_port": json["port"],
"uuid": nodeListItem.uuid,
"alter_id": 0,
"security": "auto",
if (transportConfig != null) "transport": transportConfig,
if (json["security"] == "tls") "tls": {
"enabled": true,
if (isDomain) "server_name": securityConfig?["sni"] ?? nodeListItem.serverAddr,
"insecure": securityConfig?["allow_insecure"] ?? true,
"utls": {
"enabled": true,
"fingerprint": securityConfig?["fingerprint"] ?? "chrome"
}
}
};
break;
case "trojan":
final bool isDomain = !RegExp(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$')
.hasMatch(nodeListItem.serverAddr);
config = {
"type": "trojan",
"tag": nodeListItem.name,
"server": nodeListItem.serverAddr,
"server_port": json["port"],
"password": nodeListItem.uuid,
if (transportConfig != null) "transport": transportConfig,
"tls": {
"enabled": json["security"] == "tls",
if (isDomain) "server_name": securityConfig?["sni"] ?? nodeListItem.serverAddr,
"insecure": securityConfig?["allow_insecure"] ?? true,
"utls": {
"enabled": true,
"fingerprint": securityConfig?["fingerprint"] ?? "chrome"
}
}
};
break;
case "hysteria":
case "hysteria2":
final securityConfig = json["security_config"] as Map<String, dynamic>? ?? {};
config = {
"type": "hysteria2",
"tag": nodeListItem.name,
"server": nodeListItem.serverAddr,
"server_port": json["port"],
"password": nodeListItem.uuid,
"up_mbps": 100,
"down_mbps": 100,
"obfs": {
"type": "salamander",
"password": json["obfs_password"] ?? nodeListItem.uuid
},
"tls": {
"enabled": true,
"server_name": securityConfig["sni"] ?? "",
"insecure": securityConfig["allow_insecure"] ?? true
}
};
break;
default:
if (kDebugMode) {
print('⚠️ 不支持的协议类型: ${nodeListItem.protocol}');
}
}
};
break;
case "vmess":
final securityConfig =
json["security_config"] as Map<String, dynamic>? ?? {};
// 智能设置 server_name
String serverName = securityConfig["sni"] ?? "";
if (serverName.isEmpty) {
serverName = nodeListItem.serverAddr;
config = {};
}
config = {
"type": "vmess",
"tag": nodeListItem.name,
"server": nodeListItem.serverAddr,
"server_port": json["port"],
"uuid": nodeListItem.uuid,
"alter_id": 0,
"security": "auto",
if (json["transport"] != null && json["transport"] != "tcp")
"transport": _buildTransport(json),
"tls": {
"enabled": json["security"] == "tls",
"server_name": serverName,
"insecure": securityConfig["allow_insecure"] ?? true,
"utls": {"enabled": true, "fingerprint": "chrome"}
// 检查 relayNode 是否为 JSON 字符串并解析
if (nodeListItem.relayNode.isNotEmpty && nodeListItem.relayMode != "none") {
final relayNodeJson = jsonDecode(nodeListItem.relayNode);
if (relayNodeJson is List && nodeListItem.relayMode != "none") {
// 随机选择一个元素
final randomNode = (relayNodeJson..shuffle()).first;
config["server"] = randomNode["host"]; // 提取 host
config["server_port"] = randomNode["port"]; // 提取 port
}
};
break;
case "shadowsocks":
config = {
"type": "shadowsocks",
"tag": nodeListItem.name,
"server": nodeListItem.serverAddr,
"server_port": json["port"],
"method": json["method"],
"password": nodeListItem.uuid
};
break;
case "hysteria":
case "hysteria2":
// 后端的 "hysteria" 实际上是 Hysteria2 协议
final securityConfig =
json["security_config"] as Map<String, dynamic>? ?? {};
config = {
"type": "hysteria2",
"tag": nodeListItem.name,
"server": nodeListItem.serverAddr,
"server_port": json["port"],
"password": nodeListItem.uuid,
"up_mbps": 100,
"down_mbps": 100,
"obfs": {
"type": "salamander",
"password": json["obfs_password"] ?? nodeListItem.uuid
},
"tls": {
"enabled": true,
"server_name": securityConfig["sni"] ?? "",
"insecure": securityConfig["allow_insecure"] ?? true
}
};
break;
case "trojan":
final securityConfig =
json["security_config"] as Map<String, dynamic>? ?? {};
// 智能设置 server_name
String serverName = securityConfig["sni"] ?? "";
if (serverName.isEmpty) {
// 如果没有配置 SNI，使用服务器地址
serverName = nodeListItem.serverAddr;
}
config = {
"type": "trojan",
"tag": nodeListItem.name,
"server": nodeListItem.serverAddr,
"server_port": json["port"],
"password": nodeListItem.uuid,
"tls": {
"enabled": json["security"] == "tls",
"server_name": serverName,
"insecure": securityConfig["allow_insecure"] ?? true,
"utls": {"enabled": true, "fingerprint": "chrome"}
}
};
break;
}
// 检查 relayNode 是否为 JSON 字符串并解析
if (nodeListItem.relayNode.isNotEmpty && nodeListItem.relayMode != "none") {
final relayNodeJson = jsonDecode(nodeListItem.relayNode);
if (relayNodeJson is List && nodeListItem.relayMode != "none") {
// 随机选择一个元素
final randomNode = (relayNodeJson..shuffle()).first;
config["server"] = randomNode["host"]; // 提取 host
config["server_port"] = randomNode["port"]; // 提取 port
} catch (e) {
if (kDebugMode) {
print('⚠️ 解析 config 字段失败: $e');
}
config = {};
}
}
// 解析配置
}
@override
String toString() {
return 'KROutboundItem(name: ${nodeListItem.name}, protocol: ${nodeListItem.protocol}, server: ${nodeListItem.serverAddr}, port: ${nodeListItem.port})';
}
/// 构建传输配置
@ -246,27 +304,6 @@ class KROutboundItem {
if (kDebugMode) {
print('🔧 开始构建节点配置 - 协议: ${nodeListItem.protocol}, 名称: ${nodeListItem.name}');
}
if (kDebugMode) {
print('📋 节点详细信息:');
}
if (kDebugMode) {
print(' - serverAddr: ${nodeListItem.serverAddr}');
}
if (kDebugMode) {
print(' - port: ${nodeListItem.port}');
}
if (kDebugMode) {
print(' - uuid: ${nodeListItem.uuid}');
}
if (kDebugMode) {
print(' - method: ${nodeListItem.method}');
}
if (kDebugMode) {
print(' - config: ${nodeListItem.config}');
}
if (kDebugMode) {
print(' - protocols: ${nodeListItem.protocols}');
}
// 🔧 尝试从 config 字段解析 transport 配置
Map<String, dynamic>? transportConfig;

51
lib/app/model/business/kr_outbounds_list.dart
View File

@ -8,7 +8,7 @@ import 'package:flutter/foundation.dart';
/// 表示出站项列表的模型类
class KrOutboundsList {
/// 服务器分组
final List<KRGroupOutboundList> groupOutboundList = []; // 存储服务器分组的列表
@ -18,20 +18,20 @@ class KrOutboundsList {
/// 全部列表
final List<KROutboundItem> allList = []; // 存储国家分组的列表
// 配置json
final List<Map<String,dynamic>> configJsonList = [];
final List<Map<String,dynamic>> configJsonList = [];
/// 标签列表
final Map<String,KROutboundItem> keyList = {}; // 存储国家分组的列表
/// 处理出站项并将其分组
/// [list] 是要处理的出站项列表
void processOutboundItems(List<KrNodeListItem> list,List<KRNodeGroupListItem> groupList) {
final Map<String, List<KROutboundItem>> tagGroups = {};
final Map<String, List<KROutboundItem>> countryGroups = {};
// 用于追踪已使用的标签
final Map<String, int> tagCounter = {};
@ -88,11 +88,14 @@ class KrOutboundsList {
}
}
// 生成国家自动选择虚拟节点
_generateCountryAutoNodes(countryGroups);
// 将标签分组转换为 KRGroupOutboundList 并添加到 groupOutboundList
for (var tag in tagGroups.keys) {
final item = KRGroupOutboundList(
final item = KRGroupOutboundList(
tag: tag, outboundList: tagGroups[tag]!);
for (var group in groupList) {
if (item.tag == group.name) {
item.icon = group.icon;
@ -108,7 +111,41 @@ class KrOutboundsList {
country: country,
outboundList: countryGroups[country]!)); // 添加国家分组到列表
}
}
/// 生成国家自动选择虚拟节点
void _generateCountryAutoNodes(Map<String, List<KROutboundItem>> countryGroups) {
for (var entry in countryGroups.entries) {
final country = entry.key;
final nodes = entry.value;
final autoTag = '${country}-auto';
if (kDebugMode) {
print('🤖 生成国家自动选择节点: $autoTag, 包含 ${nodes.length} 个节点');
}
// 构建 urltest 配置
final urltestConfig = {
'type': 'urltest',
'tag': autoTag,
'outbounds': nodes.map((node) => node.tag).toList(),
'url': 'https://www.google.com/generate_204',
'interval': '10m',
'tolerance': 50,
"interrupt_exist_connections": true,
};
// 创建虚拟节点
final virtualNode = KROutboundItem.fromVirtual(autoTag, country, urltestConfig);
// 添加到各个列表
allList.add(virtualNode);
keyList[autoTag] = virtualNode;
// configJsonList.add(urltestConfig);
if (kDebugMode) {
print('✅ 生成虚拟节点: $autoTag, 配置: ${urltestConfig.toString()}');
}
}
}
}

66
lib/app/modules/hi_node_list/controllers/hi_node_list_controller.dart
View File

@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
import 'package:kaer_with_panels/app/utils/kr_log_util.dart';
import 'package:kaer_with_panels/app/services/kr_subscribe_service.dart';
import 'package:kaer_with_panels/app/services/singbox_imp/kr_sing_box_imp.dart';
import 'package:kaer_with_panels/app/utils/kr_secure_storage.dart';
import '../../../localization/app_translations.dart';
import 'package:kaer_with_panels/app/modules/kr_home/controllers/kr_home_controller.dart';
@ -41,34 +40,52 @@ class HINodeListController extends GetxController with WidgetsBindingObserver {
KRLogUtil.kr_i('连接类型已更新为: $type', tag: 'HINodeListController');
// 这里可以添加其他需要的逻辑
}
// 如果当前有选择的国家，触发重选检查
if (homeController.currentSelectedCountry.isNotEmpty) {
KRLogUtil.kr_i('连接类型更新后，检查是否需要重选节点', tag: 'HINodeListController');
// 延迟一下让连接类型更新完成
Future.delayed(const Duration(milliseconds: 500), () {
// homeController.checkCountryReselection(KRSingBoxImp.instance.kr_activeGroups);
});
}
}
/// 处理模式按钮点击（用于激活调试模式）
void kr_handleModeButtonClick() {
final now = DateTime.now();
// 检查是否在2秒内连续点击
if (lastModeButtonClickTime != null &&
if (lastModeButtonClickTime != null &&
now.difference(lastModeButtonClickTime!).inSeconds > 2) {
// 超过2秒，重置计数器
modeButtonClickCount = 0;
}
modeButtonClickCount++;
lastModeButtonClickTime = now;
KRLogUtil.kr_i('模式按钮点击次数: $modeButtonClickCount',
tag: 'HINodeListController');
KRLogUtil.kr_i('模式按钮点击次数: $modeButtonClickCount', tag: 'HINodeListController');
if (modeButtonClickCount >= 5) {
// 激活调试模式
isDebugMode.value = true;
modeButtonClickCount = 0; // 重置计数器
KRLogUtil.kr_i('🐛 调试模式已激活！', tag: 'HINodeListController');
}
}
/// 获取要显示的节点列表（根据调试模式过滤）
List<dynamic> kr_getFilteredNodeList() {
if (isDebugMode.value) {
// 调试模式：显示所有节点
return kr_subscribeService.allList;
} else {
// 正常模式：只显示 country-auto 节点
return kr_subscribeService.allList.where((node) => node.tag.endsWith('-auto')).toList();
}
}
/// 重置调试模式
void kr_resetDebugMode() {
@ -78,27 +95,15 @@ class HINodeListController extends GetxController with WidgetsBindingObserver {
KRLogUtil.kr_i('调试模式已重置', tag: 'HINodeListController');
}
Future<void> kr_handleRefresh() async {
await kr_subscribeService.kr_refreshAll();
try {
final savedNode =
await KRSecureStorage().kr_readData(key: 'SELECTED_NODE_TAG');
if (savedNode != null && savedNode.isNotEmpty) {
homeController.kr_currentNodeName.value = savedNode;
homeController.kr_cutTag.value = savedNode;
homeController.kr_cutSeletedTag.value = savedNode;
}
} catch (_) {}
if (!homeController.kr_isLatency.value) {
homeController.kr_urlTest();
}
}
@override
void onInit() {
super.onInit();
WidgetsBinding.instance.addObserver(this);
_loadSelectedCountry();
ever(homeController.kr_cutTag, (tag) {
if (homeController.kr_isLatency.value) return;
KRLogUtil.kr_i('🔄 节点切换成功 - 自动触发延迟测试', tag: 'HINodeListView');
homeController.kr_urlTest();
});
}
@override
@ -114,7 +119,7 @@ class HINodeListController extends GetxController with WidgetsBindingObserver {
super.didChangeAppLifecycleState(state);
// 当应用从后台切换回前台时
if (state == AppLifecycleState.resumed) {
if (homeController.kr_isLatency.value) return;
if (homeController.kr_isLatency.value) return;
KRLogUtil.kr_i('🔄 节点列表显示 - 自动触发延迟测试', tag: 'HINodeListView');
homeController.kr_urlTest();
}
@ -126,13 +131,4 @@ class HINodeListController extends GetxController with WidgetsBindingObserver {
super.onClose();
}
Future<void> _loadSelectedCountry() async {
try {
final v =
await KRSecureStorage().kr_readData(key: 'SELECTED_COUNTRY_TAG');
if (v != null && v.isNotEmpty) {
homeController.kr_coutryText.value = v;
}
} catch (_) {}
}
}

436
lib/app/modules/hi_node_list/views/hi_node_list_view.dart
View File

@ -8,7 +8,6 @@ import 'package:kaer_with_panels/app/widgets/kr_app_text_style.dart';
import 'package:kaer_with_panels/app/widgets/kr_country_flag.dart';
import '../../../model/business/kr_outbound_item.dart';
import '../../../utils/kr_log_util.dart';
import 'package:kaer_with_panels/app/utils/kr_secure_storage.dart';
import '../controllers/hi_node_list_controller.dart';
import 'package:kaer_with_panels/app/modules/kr_home/models/kr_home_views_status.dart';
import 'package:kaer_with_panels/app/services/singbox_imp/kr_sing_box_imp.dart';
@ -24,17 +23,32 @@ class HINodeListView extends GetView<HINodeListController> {
static const Color krModernGreen = Color(0xFF4CAF50);
static const Color krModernGreenLight = Color(0xFF81C784);
// 存储随机延迟值，用于UI展示
static final Map<String, int> _fakeDelays = {};
/// 获取用于显示的延迟值
int _getDisplayDelay(HINodeListController controller, KROutboundItem item) {
return item.urlTestDelay.value;
// if (controller.homeController.kr_isConnected.value) {
//
// }
// if (!_fakeDelays.containsKey(item.tag)) {
// final random = Random();
// _fakeDelays[item.tag] = 30 + random.nextInt(71); // 30-100ms
// }
// return _fakeDelays[item.tag] ?? 0;
}
/// 获取分组内最快节点的延迟值（单位：ms）
/// 如果列表为空，返回 0
int getFastestNodeDelay(
HINodeListController controller,
List<KROutboundItem> outboundList,
) {
HINodeListController controller,
List<KROutboundItem> outboundList,
) {
if (outboundList.isEmpty) return 0;
// 返回最小延迟值
outboundList
.sort((a, b) => a.urlTestDelay.value.compareTo(b.urlTestDelay.value));
outboundList.sort((a, b) => a.urlTestDelay.value.compareTo(b.urlTestDelay.value));
return outboundList.first.urlTestDelay.value;
}
@ -63,18 +77,14 @@ class HINodeListView extends GetView<HINodeListController> {
Widget build(BuildContext context) {
// 1. 使用 Material 作为根组件，确保 InkWell 的水波纹效果正常
// 并设置透明背景，让父组件的背景可以透出来
return Obx(() {
// Material 保持透明背景，让 InkWell 水波纹正常
return Material(
color: Colors.transparent,
child: controller.isDebugMode.value
? _buildSubscribeList(context)
: _kr_buildRegionList(context),
);
});
return Material(
color: Colors.transparent,
child: _buildSubscribeList(context)
// child: _kr_buildRegionList(context)
);
}
/// 构建国家/地区分组列表
/// 构建国家/地区分组列表（废弃不使用）
Widget _kr_buildRegionList(BuildContext context) {
return Obx(() {
return _kr_buildListContainer(
@ -84,24 +94,21 @@ class HINodeListView extends GetView<HINodeListController> {
// 2. 使用 children 属性，并一次性构建所有列表项
children: [
if (controller.kr_subscribeService.countryOutboundList.isEmpty)
_buildEmptyListPlaceholder(
context, AppTranslations.kr_home.noRegions)
_buildEmptyListPlaceholder(context, AppTranslations.kr_home.noRegions)
else ...[
InkWell(
// 🔧 修复：改为 async，等待节点切换完成后再关闭列表
onTap: () async {
try {
await KRSecureStorage().kr_saveData(
key: 'SELECTED_COUNTRY_TAG', value: 'auto');
controller.homeController.kr_coutryText.value = 'auto';
final success = await controller.homeController
.kr_performNodeSwitch('auto');
final success =
await controller.homeController.kr_performNodeSwitch('auto');
if (success) {
controller.homeController.kr_currentListStatus.value =
KRHomeViewsListStatus.kr_none;
}
} catch (e) {
KRLogUtil.kr_e('Auto选项切换异常: $e', tag: 'NodeListView');
KRLogUtil.kr_e('Auto选项切换异常: $e',
tag: 'NodeListView');
}
},
child: Container(
@ -113,8 +120,7 @@ class HINodeListView extends GetView<HINodeListController> {
),
),
),
padding:
EdgeInsets.symmetric(vertical: 12.w, horizontal: 16.w),
padding: EdgeInsets.symmetric(vertical: 12.w, horizontal: 16.w),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
@ -158,44 +164,38 @@ class HINodeListView extends GetView<HINodeListController> {
],
),
),
Obx(() =>
controller.homeController.kr_coutryText.value ==
'auto'
? KrLocalImage(
imageName: 'radio-active-icon',
imageType: ImageType.svg,
width: 16.w, // 适当缩小 SVG 尺寸，留出白边
height: 16.h,
)
: KrLocalImage(
imageName: 'radio-icon',
imageType: ImageType.svg,
width: 16.w, // 适当缩小 SVG 尺寸，留出白边
height: 16.h,
)),
Obx(() => controller.homeController.kr_coutryText.value == 'auto'
? KrLocalImage(
imageName: 'radio-active-icon',
imageType: ImageType.svg,
width: 16.w, // 适当缩小 SVG 尺寸，留出白边
height: 16.h,
)
: KrLocalImage(
imageName: 'radio-icon',
imageType: ImageType.svg,
width: 16.w, // 适当缩小 SVG 尺寸，留出白边
height: 16.h,
)),
],
),
),
),
...controller.kr_subscribeService.countryOutboundList
.map((country) {
...controller.kr_subscribeService.countryOutboundList.map((country) {
return InkWell(
onTap: () async {
try {
await KRSecureStorage().kr_saveData(
key: 'SELECTED_COUNTRY_TAG',
value: country.country);
controller.homeController.kr_coutryText.value =
country.country;
final fastest = findFastestNode(country.outboundList);
final success = await controller.homeController
.kr_performNodeSwitch(fastest.tag);
final success =
await controller.homeController.kr_performNodeSwitch('${country.country}-auto');
print('node 点击 ${country.country} 节点数量${country.outboundList.length} 节点详情 ${country.outboundList}');
if (success) {
controller.homeController.kr_currentListStatus.value =
KRHomeViewsListStatus.kr_none;
}
} catch (e) {
KRLogUtil.kr_e('国家选择切换异常: $e', tag: 'NodeListView');
KRLogUtil.kr_e('Auto选项切换异常: $e',
tag: 'NodeListView');
}
},
child: _kr_buildCountryListItem(context, country: country),
@ -203,87 +203,89 @@ class HINodeListView extends GetView<HINodeListController> {
}).toList(),
]
] //
),
),
);
});
}
/// 构建默认的订阅节点列表
Widget _buildSubscribeList(BuildContext context) {
return Obx(() {
return _kr_buildListContainer(
context,
child: ListView(
padding: EdgeInsets.symmetric(vertical: 8.w),
// 2. 使用 children 属性，并一次性构建所有列表项
children: [
...[
InkWell(
// 🔧 修复：改为 async，等待节点切换完成后再关闭列表
onTap: () async {
try {
final success = await controller.homeController
.kr_performNodeSwitch('auto');
if (success) {
controller.homeController.kr_currentListStatus.value =
KRHomeViewsListStatus.kr_none;
}
} catch (e) {
KRLogUtil.kr_e('Auto选项切换异常: $e', tag: 'NodeListView');
}
},
child: Container(
padding: EdgeInsets.symmetric(vertical: 8.w),
// 2. 使用 children 属性，并一次性构建所有列表项
children: [
if (controller.kr_getFilteredNodeList().isEmpty)
_buildEmptyListPlaceholder(context,
controller.isDebugMode.value ? '调试模式：无节点数据' : AppTranslations.kr_home.noNodes)
else ...[
InkWell(
// 🔧 修复：改为 async，等待节点切换完成后再关闭列表
onTap: () async {
try {
final success =
await controller.homeController.kr_performNodeSwitch('auto');
if (success) {
controller.homeController.kr_currentListStatus.value =
KRHomeViewsListStatus.kr_none;
}
} catch (e) {
KRLogUtil.kr_e('Auto选项切换异常: $e',
tag: 'NodeListView');
}
},
child: Container(
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: Colors.white.withOpacity(0.3),
width: 1.0,
),
),
),
padding: EdgeInsets.symmetric(vertical: 12.w, horizontal: 16.w),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width: 32.w,
height: 22.w,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: Colors.white.withOpacity(0.3),
width: 1.0,
),
// 2. 设置背景色为主题色
color: Theme.of(context).primaryColor,
),
// 4. 使用 Center 来确保内部的图片水平和垂直居中
child: Center(
child: KrLocalImage(
imageName: "hi-home-logo",
width: 14.w,
height: 14.h,
),
),
padding:
EdgeInsets.symmetric(vertical: 12.w, horizontal: 16.w),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
),
SizedBox(width: 8.w),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 32.w,
height: 22.w,
decoration: BoxDecoration(
// 2. 设置背景色为主题色
color: Theme.of(context).primaryColor,
),
// 4. 使用 Center 来确保内部的图片水平和垂直居中
child: Center(
child: KrLocalImage(
imageName: "hi-home-logo",
width: 14.w,
height: 14.h,
),
Text(
'自动匹配最快网络', // 您指定的文本
style: KrAppTextStyle(
fontSize: 14,
color: Colors.white,
fontWeight: FontWeight.w600, // 600 加粗
),
),
SizedBox(width: 8.w),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'自动匹配最快网络', // 您指定的文本
style: KrAppTextStyle(
fontSize: 14,
color: Colors.white,
fontWeight: FontWeight.w600, // 600 加粗
),
),
// 2. 第二个 Text: "根据网络IP自动匹配最快线路"
Text(
'根据网络IP自动匹配最快线路', // 默认文本
style: KrAppTextStyle(
fontSize: 10,
color: Colors.white,
),
),
/* Obx(() {
// 2. 第二个 Text: "根据网络IP自动匹配最快线路"
Text(
'根据网络IP自动匹配最快线路', // 默认文本
style: KrAppTextStyle(
fontSize: 10,
color: Colors.white,
),
),
/* Obx(() {
// 当选择全局 auto 时，显示当前选中的节点信息
if (controller.homeController.kr_cutTag.value == 'auto') {
final autoNodeInfo = controller.homeController.kr_getGlobalAutoSelectedNode();
@ -305,49 +307,51 @@ class HINodeListView extends GetView<HINodeListController> {
),
);
}),*/
],
),
),
Obx(() =>
controller.homeController.kr_cutTag.value == 'auto'
? KrLocalImage(
imageName: 'radio-active-icon',
imageType: ImageType.svg,
width: 16.w, // 适当缩小 SVG 尺寸，留出白边
height: 16.h,
)
: KrLocalImage(
imageName: 'radio-icon',
imageType: ImageType.svg,
width: 16.w, // 适当缩小 SVG 尺寸，留出白边
height: 16.h,
)),
],
),
),
),
...controller.kr_subscribeService.allList().map((item) {
return InkWell(
// 🔧 修复：改为 async，等待节点切换完成后再关闭列表
onTap: () async {
try {
KRLogUtil.kr_i('🔄 用户点击节点: ${item.tag}');
final success = await controller.homeController
.kr_performNodeSwitch(item.tag);
if (success) {
controller.homeController.kr_currentListStatus.value =
KRHomeViewsListStatus.kr_none;
}
} catch (e) {
KRLogUtil.kr_e('节点切换异常: $e', tag: 'NodeListView');
}
},
child: _kr_buildNodeListItem(context, item: item),
);
}).toList(),
]
] //
Obx(() => controller.homeController.kr_cutTag.value == 'auto'
? KrLocalImage(
imageName: 'radio-active-icon',
imageType: ImageType.svg,
width: 16.w, // 适当缩小 SVG 尺寸，留出白边
height: 16.h,
)
: KrLocalImage(
imageName: 'radio-icon',
imageType: ImageType.svg,
width: 16.w, // 适当缩小 SVG 尺寸，留出白边
height: 16.h,
)),
],
),
),
),
...controller.kr_getFilteredNodeList().map((item) {
return InkWell(
// 🔧 修复：改为 async，等待节点切换完成后再关闭列表
onTap: () async {
try {
KRLogUtil.kr_i(
'🔄 用户点击节点: ${item.tag}');
final success = await controller.homeController
.kr_performNodeSwitch(item.tag);
if (success) {
controller.homeController.kr_currentListStatus.value =
KRHomeViewsListStatus.kr_none;
}
} catch (e) {
KRLogUtil.kr_e(
'节点切换异常: $e',
tag: 'NodeListView');
}
},
child: _kr_buildNodeListItem(context, item: item),
);
}).toList(),
]
] //
),
);
});
}
@ -359,8 +363,7 @@ class HINodeListView extends GetView<HINodeListController> {
alignment: Alignment.center,
child: Text(
text,
style: KrAppTextStyle(
fontSize: 14, color: Theme.of(context).textTheme.bodySmall?.color),
style: KrAppTextStyle(fontSize: 14, color: Theme.of(context).textTheme.bodySmall?.color),
),
);
}
@ -377,8 +380,7 @@ class HINodeListView extends GetView<HINodeListController> {
}
/// 构建单个节点列表项的UI
Widget _kr_buildNodeListItem(BuildContext context,
{required KROutboundItem item}) {
Widget _kr_buildNodeListItem(BuildContext context, {required KROutboundItem item}) {
return Container(
key: ValueKey(item.id),
decoration: BoxDecoration(
@ -393,12 +395,7 @@ class HINodeListView extends GetView<HINodeListController> {
padding: EdgeInsets.symmetric(vertical: 12.w, horizontal: 16.w),
child: Row(
children: [
KRCountryFlag(
countryCode: item.country,
width: 30.w,
height: 20.w,
isCircle: false,
maintainSize: false),
KRCountryFlag(countryCode: item.country, width: 30.w, height: 20.w, isCircle: false, maintainSize: false),
SizedBox(width: 12.w),
Expanded(
child: Obx(() {
@ -424,12 +421,20 @@ class HINodeListView extends GetView<HINodeListController> {
bool isTesting = controller.homeController.kr_isLatency.value;
// 极简逻辑：只根据节点类型决定显示方式
print(
'🔄 _kr_buildNodeListItem节点: item.tag=${item.tag}, country=${item.country}');
print('🔄 _kr_buildNodeListItem节点: item.tag=${item.tag}, country=${item.country}');
// 普通节点，直接显示节点自身的速度
displayDelay = item.urlTestDelay.value;
print('🔄 _kr_buildNodeListItem使用普通节点延迟: $displayDelay');
// 如果节点本身是auto组节点，显示组内最快节点的速度
if (item.tag.endsWith('-auto')) {
print('🎯 检测到auto组节点，获取最快节点信息');
final autoNodeInfo = controller.homeController.kr_getCountryAutoSelectedNode(item.country);
print('📊 _kr_buildNodeListItem获取auto最快节点: $autoNodeInfo');
displayDelay = autoNodeInfo?['delay'] ?? 0;
print('✅ _kr_buildNodeListItem使用auto最快节点延迟: $displayDelay');
} else {
// 普通节点，直接显示节点自身的速度
displayDelay = item.urlTestDelay.value;
print('🔄 _kr_buildNodeListItem使用普通节点延迟: $displayDelay');
}
// 2. 声明文本和颜色变量
String delayText;
@ -462,23 +467,19 @@ class HINodeListView extends GetView<HINodeListController> {
);
}),
SizedBox(width: 12.w),
Obx(() {
final selected =
controller.homeController.kr_cutSeletedTag.value == item.tag;
return selected
? KrLocalImage(
imageName: 'radio-active-icon',
imageType: ImageType.svg,
width: 16.w,
height: 16.h,
)
: KrLocalImage(
imageName: 'radio-icon',
imageType: ImageType.svg,
width: 16.w,
height: 16.h,
);
}),
Obx(() => controller.homeController.kr_cutTag.value == item.tag
? KrLocalImage(
imageName: 'radio-active-icon',
imageType: ImageType.svg,
width: 16.w, // 适当缩小 SVG 尺寸，留出白边
height: 16.h,
)
: KrLocalImage(
imageName: 'radio-icon',
imageType: ImageType.svg,
width: 16.w, // 适当缩小 SVG 尺寸，留出白边
height: 16.h,
)),
],
),
);
@ -486,6 +487,7 @@ class HINodeListView extends GetView<HINodeListController> {
/// 构建国家列表项的UI
Widget _kr_buildCountryListItem(BuildContext context, {required country}) {
return Container(
key: ValueKey(country),
decoration: BoxDecoration(
@ -500,26 +502,17 @@ class HINodeListView extends GetView<HINodeListController> {
padding: EdgeInsets.symmetric(vertical: 12.w, horizontal: 16.w),
child: Row(
children: [
KRCountryFlag(
countryCode: country.country,
width: 30.w,
height: 20.w,
isCircle: false,
maintainSize: false),
KRCountryFlag(countryCode: country.country, width: 30.w, height: 20.w, isCircle: false, maintainSize: false),
SizedBox(width: 12.w),
Expanded(
child: Text(
controller.homeController.kr_getCountryFullName(country.country),
style: KrAppTextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
color: Colors.white),
style: KrAppTextStyle(fontSize: 16, fontWeight: FontWeight.w500, color: Colors.white),
),
),
Obx(() {
// 1. 获取延迟值和测速状态
int displayDelay =
getFastestNodeDelay(controller, country.outboundList);
int displayDelay = getFastestNodeDelay(controller, country.outboundList);
bool isTesting = controller.homeController.kr_isLatency.value;
// 2. 声明文本和颜色变量
@ -553,34 +546,21 @@ class HINodeListView extends GetView<HINodeListController> {
);
}),
SizedBox(width: 12.w),
Obx(() {
final selectedCountryField =
controller.homeController.kr_coutryText.value;
if (selectedCountryField == 'auto') {
return KrLocalImage(
imageName: 'radio-icon',
imageType: ImageType.svg,
width: 16.w,
height: 16.h,
);
}
final selected = selectedCountryField == country.country;
return selected
? KrLocalImage(
imageName: 'radio-active-icon',
imageType: ImageType.svg,
width: 16.w,
height: 16.h,
)
: KrLocalImage(
imageName: 'radio-icon',
imageType: ImageType.svg,
width: 16.w,
height: 16.h,
);
}),
Obx(() => controller.homeController.kr_cutTag.value == '${country.country}-auto'
? KrLocalImage(
imageName: 'radio-active-icon',
imageType: ImageType.svg,
width: 16.w, // 适当缩小 SVG 尺寸，留出白边
height: 16.h,
)
: KrLocalImage(
imageName: 'radio-icon',
imageType: ImageType.svg,
width: 16.w, // 适当缩小 SVG 尺寸，留出白边
height: 16.h,
)),
],
),
);
}
}
}

5
lib/app/modules/hi_node_list/views/hi_page_node_view.dart
View File

@ -159,7 +159,8 @@ class HINodePageView extends GetView<HINodeListController> {
padding: EdgeInsets.only(left: 60.w, right: 60.w, bottom: 90.w), // 为HIHelpEntrance预留空间
// 2. 在 Padding 内部使用 EasyRefresh
child: EasyRefresh(
onRefresh: controller.kr_handleRefresh,
// 3. 绑定 onRefresh 回调
onRefresh: controller.kr_subscribeService.kr_refreshAll,
// 4. 自定义 Header 样式
header: ClassicHeader(
dragText: '下拉刷新',
@ -227,4 +228,4 @@ class HINodePageView extends GetView<HINodeListController> {
),
);
}
}
}

1110
lib/app/modules/kr_home/controllers/kr_home_controller.dart
View File

File diff suppressed because it is too large Load Diff

2
lib/app/modules/kr_home/views/hi_animated_connect_button.dart
View File

@ -34,7 +34,7 @@ class HIAnimatedConnectButton extends GetView<KRHomeController> {
print('🔵 Switch UI 更新: status=${status.runtimeType}, isConnected=$isConnected, isSwitching=$isSwitching');
final isShow = delay == -1 || isConnected;
final isShow = isConnected; // delay == -1 || isConnected;
final Color buttonColor = Theme.of(context).primaryColor;
final double screenWidth = Get.width;

3
lib/app/services/kr_subscribe_service.dart
View File

@ -309,6 +309,7 @@ class KRSubscribeService {
// 保存配置
KRSingBoxImp.instance.kr_saveOutbounds(listModel.configJsonList);
KRSingBoxImp.instance.kr_saveAllOutbounds(listModel.countryOutboundList);
// 更新试用和订阅状态
_kr_updateSubscribeStatus();
@ -661,6 +662,7 @@ class KRSubscribeService {
// 保存配置
KRSingBoxImp.instance.kr_saveOutbounds(listModel.configJsonList);
KRSingBoxImp.instance.kr_saveAllOutbounds(listModel.countryOutboundList);
// 更新试用和订阅状态
_kr_updateSubscribeStatus();
@ -723,6 +725,7 @@ class KRSubscribeService {
// 保存配置
KRSingBoxImp.instance.kr_saveOutbounds([]);
KRSingBoxImp.instance.kr_saveAllOutbounds([]);
}

251
lib/app/services/singbox_imp/kr_sing_box_imp.dart
View File

@ -12,12 +12,15 @@ import 'package:kaer_with_panels/singbox/service/singbox_service.dart';
import 'package:kaer_with_panels/singbox/service/singbox_service_provider.dart';
import 'package:path_provider/path_provider.dart';
import 'package:path/path.dart' as p;
import 'package:device_info_plus/device_info_plus.dart';
import '../../../core/model/directories.dart';
import '../../../singbox/model/singbox_config_option.dart';
import '../../../singbox/model/singbox_outbound.dart';
import '../../../singbox/model/singbox_stats.dart';
import '../../../singbox/model/singbox_status.dart';
import '../../model/business/kr_group_outbound_list.dart';
import '../../model/business/kr_outbound_item.dart';
import '../../utils/kr_country_util.dart';
import '../../utils/kr_log_util.dart';
import '../../utils/kr_secure_storage.dart';
@ -65,6 +68,7 @@ class KRSingBoxImp {
Map<String, dynamic> kr_configOption = {};
List<Map<String, dynamic>> kr_outbounds = [];
List<KRCountryOutboundList> Kr_allOutbounds = [];
/// 首次启动
RxBool kr_isFristStart = false.obs;
@ -99,9 +103,6 @@ class KRSingBoxImp {
/// 活动的出站分组
RxList<SingboxOutboundGroup> kr_activeGroups = <SingboxOutboundGroup>[].obs;
// 🔒 Windows DNS 优化：标志位，记录 DNS 是否已备份
bool _dnsBackedUp = false;
/// 所有的出站分组
RxList<SingboxOutboundGroup> kr_allGroups = <SingboxOutboundGroup>[].obs;
@ -114,6 +115,62 @@ class KRSingBoxImp {
/// 初始化进行中共享 Future（single-flight 防并发）
Future<void>? _kr_initFuture;
/// 是否为Android模拟器
bool _kr_isAndroidEmulator = false;
/// 检测并缓存模拟器标识
///
/// - 仅在 Android 上进行模拟器特征识别
/// - 通过 brand/model/product/manufacturer 的常见模拟器特征判断
/// 返回：无（结果写入 `_kr_isAndroidEmulator`）
Future<void> _kr_detectEmulator() async {
try {
if (!Platform.isAndroid) {
_kr_isAndroidEmulator = false;
return;
}
final info = await DeviceInfoPlugin().androidInfo;
final brand = (info.brand ?? '').toLowerCase();
final model = (info.model ?? '').toLowerCase();
final product = (info.product ?? '').toLowerCase();
final manufacturer = (info.manufacturer ?? '').toLowerCase();
final device = (info.device ?? '').toLowerCase();
bool containsAny(String s, List<String> keys) => keys.any((k) => s.contains(k));
final indicators = <bool>[
containsAny(brand, [
'generic', 'unknown', 'google', 'vbox', 'virtualbox',
'bluestacks', 'nox', 'ldplayer', 'genymotion', 'mumu', 'netease', 'leidian'
]),
containsAny(model, [
'emulator', 'sdk', 'sdk_gphone', 'google_sdk', 'android sdk built for x86',
'bluestacks', 'genymotion', 'nox', 'ldplayer', 'mumu'
]),
containsAny(product, [
'sdk', 'google_sdk', 'sdk_gphone', 'emulator', 'vbox', 'virtualbox'
]),
containsAny(manufacturer, [
'genymotion', 'unknown', 'bluestacks', 'nox', 'ld', 'netease', 'mumu'
]),
containsAny(device, [
'emulator', 'generic', 'vbox', 'virtualbox', 'sdk'
]),
];
_kr_isAndroidEmulator = indicators.any((v) => v);
KRLogUtil.kr_i(
'🔍 Android 模拟器检测: ${_kr_isAndroidEmulator ? '是模拟器' : '非模拟器'}'
' (brand=$brand, model=$model, product=$product, manufacturer=$manufacturer, device=$device)',
tag: 'SingBox',
);
} catch (e) {
_kr_isAndroidEmulator = false;
KRLogUtil.kr_w('⚠️ 模拟器检测失败，按真机处理: $e', tag: 'SingBox');
}
}
/// 当前混合代理端口是否就绪
bool get kr_isProxyReady => kr_status.value is SingboxStarted;
@ -169,6 +226,9 @@ class KRSingBoxImp {
await KRCountryUtil.kr_init();
KRLogUtil.kr_i('国家工具初始化完成');
// 设备环境检测（Android模拟器）
await _kr_detectEmulator();
final oOption = SingboxConfigOption.fromJson(_getConfigOption());
KRLogUtil.kr_i('配置选项初始化完成');
@ -557,9 +617,11 @@ class KRSingBoxImp {
"log-level": "info", // 调试阶段使用 info，生产环境改为 warn
"resolve-destination": false,
"ipv6-mode": "ipv4_only", // 参考 hiddify-app: 仅使用 IPv4 (有效值: ipv4_only, prefer_ipv4, prefer_ipv6, ipv6_only)
"remote-dns-address": "https://dns.google/dns-query", // 使用 Google DoH，避免中转节点 DNS 死锁
"remote-dns-address": _kr_isAndroidEmulator
? "local"
: "https://dns.google/dns-query",
"remote-dns-domain-strategy": "prefer_ipv4",
"direct-dns-address": "local", // 使用系统 DNS，确保中转服务器域名能被解析
"direct-dns-address": "local",
"direct-dns-domain-strategy": "prefer_ipv4",
"mixed-port": kr_port,
"tproxy-port": kr_port,
@ -681,9 +743,56 @@ class KRSingBoxImp {
addFromOutbound(g);
}
for (final g in Kr_allOutbounds) {
for (final it in g.outboundList) {
addFromOutbound(it.config);
}
}
return set;
}
/// 动态构建 DNS 配置
///
/// - 真机：使用远程 DoH + 本地系统 DNS，final 指向远程
/// - 模拟器：仅使用系统 DNS，final 指向直连，避免覆盖系统 DNS
/// 返回：Sing-box `dns` 段配置 Map
Map<String, dynamic> _kr_buildDnsConfig() {
if (_kr_isAndroidEmulator) {
KRLogUtil.kr_i('🛡️ 模拟器兼容模式：强制使用系统 DNS', tag: 'SingBox');
return {
"servers": [
{
"tag": "dns-direct",
"address": "local",
"detour": "direct"
}
],
"rules": [],
"final": "dns-direct",
"strategy": "prefer_ipv4"
};
}
return {
"servers": [
{
"tag": "dns-remote",
"address": "https://1.1.1.1/dns-query",
"address_resolver": "dns-direct"
},
{
"tag": "dns-direct",
"address": "local",
"detour": "direct"
}
],
"rules": _kr_buildDnsRules(),
"final": "dns-remote",
"strategy": "prefer_ipv4"
};
}
/// 订阅状态变化流
/// 参考 hiddify-app: 监听 libcore 发送的状态事件来自动更新 UI
void _kr_subscribeToStatus() {
@ -1097,7 +1206,7 @@ class KRSingBoxImp {
await Future.delayed(const Duration(milliseconds: 2000));
final savedNode = await KRSecureStorage().kr_readData(key: _keySelectedNode);
if (savedNode != null && savedNode.isNotEmpty && savedNode != 'auto') {
if (savedNode != null && savedNode.isNotEmpty && savedNode != 'auto' && !savedNode.endsWith('-auto')) {
KRLogUtil.kr_i('🔄 恢复用户选择的节点: $savedNode', tag: 'SingBox');
try {
@ -1138,7 +1247,14 @@ class KRSingBoxImp {
// print("错误堆栈: $stack");
// }
// }
void kr_saveAllOutbounds(List<KRCountryOutboundList> outbounds) {
Kr_allOutbounds = outbounds;
KRLogUtil.kr_i('📊 保存国家分组: ${Kr_allOutbounds.length}', tag: 'SingBox');
for (int i = 0; i < Kr_allOutbounds.length; i++) {
final c = Kr_allOutbounds[i];
KRLogUtil.kr_i(' group[$i] country="${c.country}" outbounds=${c.outboundList.length}', tag: 'SingBox');
}
}
/// 保存配置文件
void kr_saveOutbounds(List<Map<String, dynamic>> outbounds) async {
KRLogUtil.kr_i('💾 开始保存配置文件...', tag: 'SingBox');
@ -1187,23 +1303,7 @@ class KRSingBoxImp {
"level": "debug",
"timestamp": true
},
"dns": {
"servers": [
{
"tag": "dns-remote",
"address": "https://1.1.1.1/dns-query",
"address_resolver": "dns-direct"
},
{
"tag": "dns-direct",
"address": "local",
"detour": "direct"
}
],
"rules": _kr_buildDnsRules(), // ✅ 使用动态构建的 DNS 规则
"final": "dns-remote",
"strategy": "prefer_ipv4"
},
"dns": _kr_buildDnsConfig(),
"inbounds": [
{
"type": "tun",
@ -1406,21 +1506,55 @@ class KRSingBoxImp {
// 🔧 强制重新生成配置文件（确保最新的路由规则生效）
if (kr_outbounds.isNotEmpty) {
KRLogUtil.kr_i('🔄 启动前强制重新生成配置文件...', tag: 'SingBox');
kr_saveOutbounds(kr_outbounds);
// 等待配置文件写入完成
final selectedNode = await KRSecureStorage().kr_readData(key: _keySelectedNode);
KRLogUtil.kr_i('📊 国家分组数量: ${Kr_allOutbounds.length}', tag: 'SingBox');
for (int i = 0; i < Kr_allOutbounds.length; i++) {
final g = Kr_allOutbounds[i];
KRLogUtil.kr_i('Kr_allOutbounds[$i] country="${g.country}" outbounds=${g.outboundList.length}', tag: 'SingBox');
}
List<Map<String, dynamic>> toSave = [];
if (selectedNode != null && selectedNode.endsWith('-auto')) {
KRLogUtil.kr_i('🤖 检测到自动国家节点: $selectedNode', tag: 'SingBox');
String selectedCountry = selectedNode.replaceAll(RegExp(r'-auto$'), '');
final selectedCountryLower = selectedCountry.toLowerCase();
final matchedGroup = Kr_allOutbounds.firstWhere(
(g) => g.country.toLowerCase() == selectedCountryLower,
orElse: () => KRCountryOutboundList(country: '', outboundList: []),
);
if (matchedGroup.country.isNotEmpty) {
KRLogUtil.kr_i('🎯 命中分组: ${matchedGroup.country}, 节点数: ${matchedGroup.outboundList.length}', tag: 'SingBox');
toSave = matchedGroup.outboundList.map((it) => it.config).toList();
} else {
for (final g in Kr_allOutbounds) {
for (final it in g.outboundList) {
final tagLower = it.tag.toLowerCase();
if (tagLower == selectedNode.toLowerCase() || tagLower.contains(selectedCountryLower)) {
toSave.add(it.config);
}
}
}
}
KRLogUtil.kr_i('✅ 自动国家过滤: ${toSave.length}', tag: 'SingBox');
} else {
for (final g in Kr_allOutbounds) {
for (final it in g.outboundList) {
toSave.add(it.config);
}
}
}
kr_saveOutbounds(toSave);
await Future.delayed(const Duration(milliseconds: 100));
}
KRLogUtil.kr_i('📁 配置文件路径: $_cutPath', tag: 'SingBox');
KRLogUtil.kr_i('📝 配置名称: $kr_configName', tag: 'SingBox');
// 🔑 Windows 平台：仅在首次启动时备份 DNS 设置（优化：避免重复备份）
if (Platform.isWindows && !_dnsBackedUp) {
KRLogUtil.kr_i('🪟 Windows 平台，首次启动备份 DNS 设置...', tag: 'SingBox');
// 🔑 Windows 平台：在启动前备份 DNS 设置
if (Platform.isWindows) {
KRLogUtil.kr_i('🪟 Windows 平台，备份 DNS 设置...', tag: 'SingBox');
try {
final backupSuccess = await KRWindowsDnsUtil.instance.kr_backupDnsSettings();
if (backupSuccess) {
_dnsBackedUp = true; // 标记已备份
KRLogUtil.kr_i('✅ Windows DNS 备份成功', tag: 'SingBox');
} else {
KRLogUtil.kr_w('⚠️ Windows DNS 备份失败，将在停止时使用兜底恢复', tag: 'SingBox');
@ -1428,8 +1562,6 @@ class KRSingBoxImp {
} catch (e) {
KRLogUtil.kr_w('⚠️ Windows DNS 备份异常: $e，将在停止时使用兜底恢复', tag: 'SingBox');
}
} else if (Platform.isWindows && _dnsBackedUp) {
KRLogUtil.kr_i('⏭️ Windows 平台，DNS 已备份，跳过重复备份（节点切换优化）', tag: 'SingBox');
}
// 🔑 先尝试停止旧实例，避免 command.sock 冲突
@ -1599,42 +1731,12 @@ class KRSingBoxImp {
// 继续执行清理操作
}
// 🔑 Windows 平台：仅在有备份时恢复 DNS 设置
if (Platform.isWindows && _dnsBackedUp) {
KRLogUtil.kr_i('🪟 Windows 平台，等待 sing-box 完全停止...', tag: 'SingBox');
// 🔑 Windows 平台：停止后立即恢复 DNS 设置
if (Platform.isWindows) {
KRLogUtil.kr_i('🪟 Windows 平台，开始恢复 DNS 设置...', tag: 'SingBox');
// 🔧 P3优化: 监听状态而非固定延迟，确保 sing-box 真正停止后再恢复 DNS
try {
// 如果当前已经是停止状态，直接继续
if (kr_status.value is SingboxStopped) {
KRLogUtil.kr_i('✅ sing-box 已经是停止状态，立即恢复 DNS', tag: 'SingBox');
} else {
// 等待状态变为停止，最多等待3秒
final completer = Completer<void>();
late final Worker worker;
worker = ever(kr_status, (status) {
if (status is SingboxStopped) {
if (!completer.isCompleted) {
completer.complete();
worker.dispose();
}
}
});
await completer.future.timeout(
const Duration(seconds: 3),
onTimeout: () {
KRLogUtil.kr_w('⏱️ 等待停止状态超时，继续执行 DNS 恢复', tag: 'SingBox');
worker.dispose();
},
);
KRLogUtil.kr_i('✅ sing-box 已完全停止，开始恢复 DNS...', tag: 'SingBox');
}
} catch (e) {
KRLogUtil.kr_w('⚠️ 状态监听异常: $e，继续执行 DNS 恢复', tag: 'SingBox');
}
// 等待 sing-box 完全停止
await Future.delayed(const Duration(milliseconds: 1000));
try {
// 尝试恢复 DNS
@ -1647,14 +1749,7 @@ class KRSingBoxImp {
} catch (e) {
KRLogUtil.kr_e('❌ Windows DNS 恢复异常: $e', tag: 'SingBox');
// 异常时也会在工具类内部执行兜底恢复
} finally {
// 🔧 P0修复2: 使用 finally 确保标志位始终被重置，避免下次启动跳过备份
_dnsBackedUp = false;
KRLogUtil.kr_i('🔄 重置 DNS 备份标志位', tag: 'SingBox');
}
} else if (Platform.isWindows && !_dnsBackedUp) {
KRLogUtil.kr_i('⏭️ Windows 平台，DNS 未备份，跳过恢复', tag: 'SingBox');
await Future.delayed(const Duration(milliseconds: 500));
} else {
// 非 Windows 平台正常等待
await Future.delayed(const Duration(milliseconds: 500));
@ -1682,16 +1777,12 @@ class KRSingBoxImp {
KRLogUtil.kr_e('错误堆栈: $stackTrace');
// 🔑 即使出错，也要尝试恢复 Windows DNS
if (Platform.isWindows && _dnsBackedUp) {
if (Platform.isWindows) {
KRLogUtil.kr_w('⚠️ 停止异常，强制执行 DNS 恢复', tag: 'SingBox');
try {
await KRWindowsDnsUtil.instance.kr_restoreDnsSettings();
} catch (dnsError) {
KRLogUtil.kr_e('❌ 强制 DNS 恢复失败: $dnsError', tag: 'SingBox');
} finally {
// 🔧 P0修复2: 异常路径也要重置标志位
_dnsBackedUp = false;
KRLogUtil.kr_i('🔄 异常后重置 DNS 备份标志位', tag: 'SingBox');
}
}
@ -1898,7 +1989,7 @@ class KRSingBoxImp {
// 🔄 如果用户选择了具体节点（不是 auto），启动定期检查和重新选择
// 这是为了防止 urltest 自动覆盖用户的手动选择
_nodeSelectionTimer?.cancel();
if (tag != 'auto') {
if (tag != 'auto' && !tag.endsWith('-auto')) {
KRLogUtil.kr_i('🔁 启动节点选择监控，防止被 auto 覆盖', tag: 'SingBox');
_nodeSelectionTimer = Timer.periodic(const Duration(seconds: 20), (timer) {
// 每 20 秒重新选择一次，确保用户选择不被覆盖

3
macos/Runner.xcodeproj/project.pbxproj
View File

@ -586,7 +586,6 @@
MACOSX_DEPLOYMENT_TARGET = 10.15;
PRODUCT_BUNDLE_IDENTIFIER = com.taw.hifastvpn.mac;
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
SWIFT_VERSION = 5.0;
};
name = Profile;
@ -721,7 +720,6 @@
MACOSX_DEPLOYMENT_TARGET = 10.15;
PRODUCT_BUNDLE_IDENTIFIER = com.taw.hifastvpn.mac;
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
@ -750,7 +748,6 @@
MACOSX_DEPLOYMENT_TARGET = 10.15;
PRODUCT_BUNDLE_IDENTIFIER = com.taw.hifastvpn.mac;
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
SWIFT_VERSION = 5.0;
};
name = Release;