* Fix tun

* Format
This commit is contained in:
DHR60
2026-06-18 02:33:58 +00:00
committed by GitHub
parent be005abf9e
commit 2126ea5a87
@@ -35,7 +35,7 @@ public class CoreConfigContextBuilder
{ {
var runCoreType = AppManager.Instance.GetCoreType(node, node.ConfigType); var runCoreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
var coreType = runCoreType == ECoreType.sing_box ? ECoreType.sing_box : ECoreType.Xray; var coreType = runCoreType == ECoreType.sing_box ? ECoreType.sing_box : ECoreType.Xray;
var context = new CoreConfigContext() var context = new CoreConfigContext
{ {
Node = node, Node = node,
RunCoreType = runCoreType, RunCoreType = runCoreType,
@@ -61,7 +61,8 @@ public class CoreConfigContextBuilder
if (!(context.RoutingItem?.RuleSet.IsNullOrEmpty() ?? true)) if (!(context.RoutingItem?.RuleSet.IsNullOrEmpty() ?? true))
{ {
var rules = JsonUtils.Deserialize<List<RulesItem>>(context.RoutingItem?.RuleSet) ?? []; var rules = JsonUtils.Deserialize<List<RulesItem>>(context.RoutingItem?.RuleSet) ?? [];
foreach (var ruleItem in rules.Where(ruleItem => ruleItem.Enabled && !Global.OutboundTags.Contains(ruleItem.OutboundTag))) foreach (var ruleItem in rules.Where(ruleItem =>
ruleItem.Enabled && !Global.OutboundTags.Contains(ruleItem.OutboundTag)))
{ {
if (ruleItem.OutboundTag.IsNullOrEmpty()) if (ruleItem.OutboundTag.IsNullOrEmpty())
{ {
@@ -72,7 +73,8 @@ public class CoreConfigContextBuilder
var ruleOutboundNode = await AppManager.Instance.GetProfileItemViaRemarks(ruleItem.OutboundTag); var ruleOutboundNode = await AppManager.Instance.GetProfileItemViaRemarks(ruleItem.OutboundTag);
if (ruleOutboundNode == null) if (ruleOutboundNode == null)
{ {
validatorResult.Warnings.Add(string.Format(ResUI.MsgRoutingRuleOutboundNodeNotFound, ruleItem.Remarks, ruleItem.OutboundTag)); validatorResult.Warnings.Add(string.Format(ResUI.MsgRoutingRuleOutboundNodeNotFound,
ruleItem.Remarks, ruleItem.OutboundTag));
ruleItem.OutboundTag = Global.ProxyTag; ruleItem.OutboundTag = Global.ProxyTag;
continue; continue;
} }
@@ -83,7 +85,8 @@ public class CoreConfigContextBuilder
if (!ruleNodeValidatorResult.Success) if (!ruleNodeValidatorResult.Success)
{ {
validatorResult.Warnings.AddRange(ruleNodeValidatorResult.Errors.Select(e => validatorResult.Warnings.AddRange(ruleNodeValidatorResult.Errors.Select(e =>
string.Format(ResUI.MsgRoutingRuleOutboundNodeError, ruleItem.Remarks, ruleItem.OutboundTag, e))); string.Format(ResUI.MsgRoutingRuleOutboundNodeError, ruleItem.Remarks, ruleItem.OutboundTag,
e)));
ruleItem.OutboundTag = Global.ProxyTag; ruleItem.OutboundTag = Global.ProxyTag;
continue; continue;
} }
@@ -132,10 +135,25 @@ public class CoreConfigContextBuilder
{ {
Context = mainResult.Context with Context = mainResult.Context with
{ {
IsTunEnabled = false, // main core doesn't handle tun directly when pre-socks is used IsTunEnabled = false,
// main core doesn't handle tun directly when pre-socks is used
ProtectDomainList = [.. mainResult.Context.ProtectDomainList, .. preResult.Context.ProtectDomainList], ProtectDomainList = [.. mainResult.Context.ProtectDomainList, .. preResult.Context.ProtectDomainList],
} },
}; };
if (mainResult.Context.IsTunEnabled
&& mainResult.Context.AppConfig.TunModeItem.StrictRoute)
{
var appConfig = JsonUtils.DeepCopy(mainResult.Context.AppConfig);
appConfig.CoreBasicItem.BindInterface = string.Empty;
appConfig.CoreBasicItem.SendThrough = string.Empty;
resolvedMainResult = resolvedMainResult with
{
Context = resolvedMainResult.Context with
{
AppConfig = appConfig,
},
};
}
return new CoreConfigContextBuilderAllResult(resolvedMainResult, preResult); return new CoreConfigContextBuilderAllResult(resolvedMainResult, preResult);
} }
@@ -157,8 +175,9 @@ public class CoreConfigContextBuilder
{ {
Context = preSocksResult.Context with Context = preSocksResult.Context with
{ {
ProtectDomainList = [.. nodeContext.ProtectDomainList ?? [], .. preSocksResult.Context.ProtectDomainList ?? []], ProtectDomainList =
} [.. nodeContext.ProtectDomainList ?? [], .. preSocksResult.Context.ProtectDomainList ?? []],
},
}; };
} }
@@ -207,7 +226,8 @@ public class CoreConfigContextBuilder
/// Returns <c>null</c> as the chain item when no chain is needed. /// Returns <c>null</c> as the chain item when no chain is needed.
/// Any warnings (e.g. missing prev/next profile) are returned in the validator result. /// Any warnings (e.g. missing prev/next profile) are returned in the validator result.
/// </summary> /// </summary>
private static async Task<(ProfileItem? ChainNode, NodeValidatorResult ValidatorResult)> BuildSubscriptionChainNodeAsync(ProfileItem node) private static async Task<(ProfileItem? ChainNode, NodeValidatorResult ValidatorResult)>
BuildSubscriptionChainNodeAsync(ProfileItem node)
{ {
var result = NodeValidatorResult.Empty(); var result = NodeValidatorResult.Empty();
@@ -248,7 +268,7 @@ public class CoreConfigContextBuilder
} }
// Build new proxy chain node // Build new proxy chain node
var chainNode = new ProfileItem() var chainNode = new ProfileItem
{ {
IndexId = $"inner-{Utils.GetGuid(false)}", IndexId = $"inner-{Utils.GetGuid(false)}",
ConfigType = EConfigType.ProxyChain, ConfigType = EConfigType.ProxyChain,
@@ -275,11 +295,8 @@ public class CoreConfigContextBuilder
{ {
return await RegisterGroupNodeAsync(context, node); return await RegisterGroupNodeAsync(context, node);
} }
else
{
return RegisterSingleNodeAsync(context, node); return RegisterSingleNodeAsync(context, node);
} }
}
/// <summary> /// <summary>
/// Validates a single (non-group) node and, on success, adds it to the proxy map /// Validates a single (non-group) node and, on success, adds it to the proxy map
@@ -430,13 +447,10 @@ public class CoreConfigContextBuilder
childNodeValidatorResult.Errors.Add(string.Format(ResUI.MsgGroupNoValidChildNode, node.Remarks)); childNodeValidatorResult.Errors.Add(string.Format(ResUI.MsgGroupNoValidChildNode, node.Remarks));
return childNodeValidatorResult; return childNodeValidatorResult;
} }
else
{
childNodeValidatorResult.Warnings.AddRange(childNodeValidatorResult.Errors); childNodeValidatorResult.Warnings.AddRange(childNodeValidatorResult.Errors);
childNodeValidatorResult.Errors.Clear(); childNodeValidatorResult.Errors.Clear();
}
node.SetProtocolExtra(node.GetProtocolExtra() with { ChildItems = Utils.List2String(childIndexIdList), }); node.SetProtocolExtra(node.GetProtocolExtra() with { ChildItems = Utils.List2String(childIndexIdList) });
context.AllProxiesMap[node.IndexId] = node; context.AllProxiesMap[node.IndexId] = node;
return childNodeValidatorResult; return childNodeValidatorResult;
} }