Compare commits

..

2 commits

Author SHA1 Message Date
DHR60
c76c302e44 Fix 2026-02-25 22:44:31 +08:00
2dust
a9cd6394d0 Fix balancer tag 2026-02-25 21:01:24 +08:00
3 changed files with 48 additions and 31 deletions

View file

@ -1249,6 +1249,47 @@ public static class ConfigHandler
return itemSocks; return itemSocks;
} }
public static CoreConfigContext? GetPreSocksCoreConfigContext(CoreConfigContext nodeContext)
{
var config = nodeContext.AppConfig;
var node = nodeContext.Node;
var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
var preSocksItem = GetPreSocksItem(config, node, coreType);
if (preSocksItem != null)
{
return nodeContext with { Node = preSocksItem, };
}
if ((!nodeContext.IsTunEnabled)
|| coreType != ECoreType.Xray
|| node.ConfigType == EConfigType.Custom)
{
return null;
}
var tunProtectSsPort = Utils.GetFreePort();
var proxyRelaySsPort = Utils.GetFreePort();
var preItem = new ProfileItem()
{
CoreType = ECoreType.sing_box,
ConfigType = EConfigType.Shadowsocks,
Address = Global.Loopback,
Port = proxyRelaySsPort,
Password = Global.None,
};
preItem.SetProtocolExtra(preItem.GetProtocolExtra() with
{
SsMethod = Global.None,
});
var preContext = nodeContext with
{
Node = preItem,
TunProtectSsPort = tunProtectSsPort,
ProxyRelaySsPort = proxyRelaySsPort,
};
return preContext;
}
/// <summary> /// <summary>
/// Remove servers with invalid test results (timeout) /// Remove servers with invalid test results (timeout)
/// Useful for cleaning up subscription lists /// Useful for cleaning up subscription lists

View file

@ -67,37 +67,13 @@ public class CoreManager
var fileName = Utils.GetBinConfigPath(Global.CoreConfigFileName); var fileName = Utils.GetBinConfigPath(Global.CoreConfigFileName);
var context = await CoreConfigHandler.BuildCoreConfigContext(_config, node); var context = await CoreConfigHandler.BuildCoreConfigContext(_config, node);
CoreConfigContext? preContext = null; var preContext = ConfigHandler.GetPreSocksCoreConfigContext(context);
if (context.IsTunEnabled) if (preContext is not null)
{ {
var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType); context = context with
if (coreType == ECoreType.Xray && node.ConfigType != EConfigType.Custom)
{ {
var tunProtectSsPort = Utils.GetFreePort(); TunProtectSsPort = preContext.TunProtectSsPort, ProxyRelaySsPort = preContext.ProxyRelaySsPort,
var proxyRelaySsPort = Utils.GetFreePort();
context = context with { TunProtectSsPort = tunProtectSsPort, ProxyRelaySsPort = proxyRelaySsPort, };
var preItem = new ProfileItem()
{
CoreType = ECoreType.sing_box,
ConfigType = EConfigType.Shadowsocks,
Address = Global.Loopback,
Port = proxyRelaySsPort,
Password = Global.None,
}; };
preItem.SetProtocolExtra(preItem.GetProtocolExtra() with
{
SsMethod = Global.None,
});
preContext = context with { Node = preItem, };
}
else
{
var preItem = ConfigHandler.GetPreSocksItem(_config, node, coreType);
if (preItem is not null)
{
preContext = context with { Node = preItem, };
}
}
} }
var result = await CoreConfigHandler.GenerateClientConfig(context, fileName); var result = await CoreConfigHandler.GenerateClientConfig(context, fileName);
if (result.Success != true) if (result.Success != true)

View file

@ -304,7 +304,7 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
var protectNode = new ProfileItem() var protectNode = new ProfileItem()
{ {
CoreType = ECoreType.sing_box, CoreType = ECoreType.Xray,
ConfigType = EConfigType.Shadowsocks, ConfigType = EConfigType.Shadowsocks,
Address = Global.Loopback, Address = Global.Loopback,
Port = context.TunProtectSsPort, Port = context.TunProtectSsPort,
@ -333,7 +333,7 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
{ {
inboundTag = new List<string> { "proxy-relay-ss" }, inboundTag = new List<string> { "proxy-relay-ss" },
outboundTag = hasBalancer ? null : Global.ProxyTag, outboundTag = hasBalancer ? null : Global.ProxyTag,
balancerTag = hasBalancer ? Global.ProxyTag : null, balancerTag = hasBalancer ? Global.ProxyTag + Global.BalancerTagSuffix: null,
type = "field" type = "field"
} }
]; ];