Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-02-28 13:13:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Upgrade config version and rename

Browse source
This commit is contained in:
DHR60 2026-01-19 13:24:42 +08:00
parent 1c2d086a71
commit 2d450357d1
15 changed files with 152 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
v2rayN/ServiceLib/Handler/ConfigHandler.cs
View file

@ -237,6 +237,8 @@ public static class ConfigHandler
item.Security = profileItem.Security; item.Security = profileItem.Security;
item.Flow = profileItem.Flow; item.Flow = profileItem.Flow;
item.Password = profileItem.Password;
item.Network = profileItem.Network; item.Network = profileItem.Network;
item.HeaderType = profileItem.HeaderType; item.HeaderType = profileItem.HeaderType;
item.RequestHost = profileItem.RequestHost; item.RequestHost = profileItem.RequestHost;
@ -258,7 +260,7 @@ public static class ConfigHandler
item.CertSha = profileItem.CertSha; item.CertSha = profileItem.CertSha;
item.EchConfigList = profileItem.EchConfigList; item.EchConfigList = profileItem.EchConfigList;
item.EchForceQuery = profileItem.EchForceQuery; item.EchForceQuery = profileItem.EchForceQuery;
item.JsonData = profileItem.JsonData; item.ProtoExtra = profileItem.ProtoExtra;
} }
var ret = item.ConfigType switch var ret = item.ConfigType switch
@ -963,11 +965,11 @@ public static class ConfigHandler
profileItem.Path = profileItem.Path.TrimEx(); profileItem.Path = profileItem.Path.TrimEx();
profileItem.StreamSecurity = profileItem.StreamSecurity.TrimEx(); profileItem.StreamSecurity = profileItem.StreamSecurity.TrimEx();
var extraItem = profileItem.GetExtraItem(); var protocolExtra = profileItem.GetProtocolExtra();
if (!Global.Flows.Contains(extraItem.Flow ?? string.Empty)) if (!Global.Flows.Contains(protocolExtra.Flow ?? string.Empty))
{ {
extraItem.Flow = Global.Flows.First(); protocolExtra.Flow = Global.Flows.First();
} }
if (profileItem.Id.IsNullOrEmpty()) if (profileItem.Id.IsNullOrEmpty())
{ {
@ -978,7 +980,7 @@ public static class ConfigHandler
profileItem.Security = Global.None; profileItem.Security = Global.None;
} }
profileItem.SetExtraItem(extraItem); profileItem.SetProtocolExtra(protocolExtra);
await AddServerCommon(config, profileItem, toFile); await AddServerCommon(config, profileItem, toFile);
@ -1033,7 +1035,7 @@ public static class ConfigHandler
/// <returns>0 if successful</returns> /// <returns>0 if successful</returns>
public static async Task<int> AddServerCommon(Config config, ProfileItem profileItem, bool toFile = true) public static async Task<int> AddServerCommon(Config config, ProfileItem profileItem, bool toFile = true)
{ {
profileItem.ConfigVersion = 2; profileItem.ConfigVersion = 3;
if (profileItem.StreamSecurity.IsNotEmpty()) if (profileItem.StreamSecurity.IsNotEmpty())
{ {
@ -1097,7 +1099,7 @@ public static class ConfigHandler
return false; return false;
} }
var extraItem = o.GetExtraItem(); var protocolExtra = o.GetProtocolExtra();
return o.ConfigType == n.ConfigType return o.ConfigType == n.ConfigType
&& AreEqual(o.Address, n.Address) && AreEqual(o.Address, n.Address)
@ -1109,7 +1111,7 @@ public static class ConfigHandler
&& AreEqual(o.RequestHost, n.RequestHost) && AreEqual(o.RequestHost, n.RequestHost)
&& AreEqual(o.Path, n.Path) && AreEqual(o.Path, n.Path)
&& (o.ConfigType == EConfigType.Trojan || o.StreamSecurity == n.StreamSecurity) && (o.ConfigType == EConfigType.Trojan || o.StreamSecurity == n.StreamSecurity)
&& AreEqual(extraItem.Flow, extraItem.Flow) && AreEqual(protocolExtra.Flow, protocolExtra.Flow)
&& AreEqual(o.Sni, n.Sni) && AreEqual(o.Sni, n.Sni)
&& AreEqual(o.Alpn, n.Alpn) && AreEqual(o.Alpn, n.Alpn)
&& AreEqual(o.Fingerprint, n.Fingerprint) && AreEqual(o.Fingerprint, n.Fingerprint)
@ -1208,7 +1210,7 @@ public static class ConfigHandler
{ {
ChildItems = childProfileIndexId, MultipleLoad = multipleLoad, ChildItems = childProfileIndexId, MultipleLoad = multipleLoad,
}; };
profile.SetExtraItem(extraItem); profile.SetProtocolExtra(extraItem);
var ret = await AddServerCommon(config, profile, true); var ret = await AddServerCommon(config, profile, true);
result.Success = ret == 0; result.Success = ret == 0;
result.Data = indexId; result.Data = indexId;

12
v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
View file

@ -21,10 +21,10 @@ public class BaseFmt
protected static int ToUriQuery(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery) protected static int ToUriQuery(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
{ {
var extraItem = item.GetExtraItem(); var protocolExtra = item.GetProtocolExtra();
if (!extraItem.Flow.IsNullOrEmpty()) if (!protocolExtra.Flow.IsNullOrEmpty())
{ {
dicQuery.Add("flow", extraItem.Flow); dicQuery.Add("flow", protocolExtra.Flow);
} }
if (item.StreamSecurity.IsNotEmpty()) if (item.StreamSecurity.IsNotEmpty())
@ -209,9 +209,9 @@ public class BaseFmt
protected static int ResolveUriQuery(NameValueCollection query, ref ProfileItem item) protected static int ResolveUriQuery(NameValueCollection query, ref ProfileItem item)
{ {
var extraItem = item.GetExtraItem(); var protocolExtra = item.GetProtocolExtra();
extraItem.Flow = GetQueryValue(query, "flow"); protocolExtra.Flow = GetQueryValue(query, "flow");
item.SetExtraItem(extraItem); item.SetProtocolExtra(protocolExtra);
item.StreamSecurity = GetQueryValue(query, "security"); item.StreamSecurity = GetQueryValue(query, "security");
item.Sni = GetQueryValue(query, "sni"); item.Sni = GetQueryValue(query, "sni");
item.Alpn = GetQueryDecoded(query, "alpn"); item.Alpn = GetQueryDecoded(query, "alpn");

8
v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs
View file

@ -32,7 +32,7 @@ public class Hysteria2Fmt : BaseFmt
{ {
Ports = GetQueryDecoded(query, "mport") Ports = GetQueryDecoded(query, "mport")
}; };
item.SetExtraItem(extraItem); item.SetProtocolExtra(extraItem);
return item; return item;
} }
@ -59,10 +59,10 @@ public class Hysteria2Fmt : BaseFmt
dicQuery.Add("obfs", "salamander"); dicQuery.Add("obfs", "salamander");
dicQuery.Add("obfs-password", Utils.UrlEncode(item.Path)); dicQuery.Add("obfs-password", Utils.UrlEncode(item.Path));
} }
var extra = item.GetExtraItem(); var protocolExtra = item.GetProtocolExtra();
if (extra?.Ports?.IsNotEmpty() ?? false) if (protocolExtra?.Ports?.IsNotEmpty() ?? false)
{ {
dicQuery.Add("mport", Utils.UrlEncode(extra.Ports.Replace(':', '-'))); dicQuery.Add("mport", Utils.UrlEncode(protocolExtra.Ports.Replace(':', '-')));
} }
if (!item.CertSha.IsNullOrEmpty()) if (!item.CertSha.IsNullOrEmpty())
{ {

10
v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs
View file

@ -24,15 +24,15 @@ public class VmessFmt : BaseFmt
return null; return null;
} }
var extraItem = item?.GetExtraItem(); var protocolExtra = item?.GetProtocolExtra();
var vmessQRCode = new VmessQRCode var vmessQRCode = new VmessQRCode
{ {
v = item.ConfigVersion, v = 2,
ps = item.Remarks.TrimEx(), ps = item.Remarks.TrimEx(),
add = item.Address, add = item.Address,
port = item.Port, port = item.Port,
id = item.Id, id = item.Id,
aid = int.TryParse(extraItem?.AlterId, out var result) ? result : 0, aid = int.TryParse(protocolExtra?.AlterId, out var result) ? result : 0,
scy = item.Security, scy = item.Security,
net = item.Network, net = item.Network,
type = item.HeaderType, type = item.HeaderType,
@ -73,12 +73,12 @@ public class VmessFmt : BaseFmt
item.Network = Global.DefaultNetwork; item.Network = Global.DefaultNetwork;
item.HeaderType = Global.None; item.HeaderType = Global.None;
item.ConfigVersion = vmessQRCode.v; //item.ConfigVersion = vmessQRCode.v;
item.Remarks = Utils.ToString(vmessQRCode.ps); item.Remarks = Utils.ToString(vmessQRCode.ps);
item.Address = Utils.ToString(vmessQRCode.add); item.Address = Utils.ToString(vmessQRCode.add);
item.Port = vmessQRCode.port; item.Port = vmessQRCode.port;
item.Id = Utils.ToString(vmessQRCode.id); item.Id = Utils.ToString(vmessQRCode.id);
item.SetExtraItem(new ProtocolExtraItem item.SetProtocolExtra(new ProtocolExtraItem
{ {
AlterId = vmessQRCode.aid.ToString(), AlterId = vmessQRCode.aid.ToString(),
}); });

6
v2rayN/ServiceLib/Manager/ActionPrecheckManager.cs
View file

@ -128,7 +128,7 @@ public class ActionPrecheckManager
} }
} }
var extraItem = item.GetExtraItem(); var protocolExtra = item.GetProtocolExtra();
switch (item.ConfigType) switch (item.ConfigType)
{ {
@ -146,7 +146,7 @@ public class ActionPrecheckManager
errors.Add(string.Format(ResUI.InvalidProperty, "Id")); errors.Add(string.Format(ResUI.InvalidProperty, "Id"));
} }
if (!Global.Flows.Contains(extraItem.Flow ?? string.Empty)) if (!Global.Flows.Contains(protocolExtra.Flow ?? string.Empty))
{ {
errors.Add(string.Format(ResUI.InvalidProperty, "Flow")); errors.Add(string.Format(ResUI.InvalidProperty, "Flow"));
} }
@ -204,7 +204,7 @@ public class ActionPrecheckManager
{ {
var errors = new List<string>(); var errors = new List<string>();
var hasCycle = await GroupProfileManager.HasCycle(item.IndexId, item.GetExtraItem()); var hasCycle = await GroupProfileManager.HasCycle(item.IndexId, item.GetProtocolExtra());
if (hasCycle) if (hasCycle)
{ {
errors.Add(string.Format(ResUI.GroupSelfReference, item.Remarks)); errors.Add(string.Format(ResUI.GroupSelfReference, item.Remarks));

32
v2rayN/ServiceLib/Manager/AppManager.cs
View file

@ -81,7 +81,9 @@ public sealed class AppManager
SQLiteHelper.Instance.CreateTable<ProfileExItem>(); SQLiteHelper.Instance.CreateTable<ProfileExItem>();
SQLiteHelper.Instance.CreateTable<DNSItem>(); SQLiteHelper.Instance.CreateTable<DNSItem>();
SQLiteHelper.Instance.CreateTable<FullConfigTemplateItem>(); SQLiteHelper.Instance.CreateTable<FullConfigTemplateItem>();
#pragma warning disable CS0618
SQLiteHelper.Instance.CreateTable<ProfileGroupItem>(); SQLiteHelper.Instance.CreateTable<ProfileGroupItem>();
#pragma warning restore CS0618
return true; return true;
} }
@ -259,19 +261,28 @@ public sealed class AppManager
public async Task MigrateProfileExtra() public async Task MigrateProfileExtra()
{ {
var list = await SQLiteHelper.Instance.TableAsync<ProfileItem>().ToListAsync(); #pragma warning disable CS0618
foreach (var item in list) const int pageSize = 500;
int offset = 0;
while (true)
{ {
if (!item.JsonData.IsNullOrEmpty()) var sql = $"SELECT * FROM ProfileItem WHERE ConfigVersion < 3 LIMIT {pageSize} OFFSET {offset}";
var batch = await SQLiteHelper.Instance.QueryAsync<ProfileItem>(sql);
if (batch is null || batch.Count == 0)
{ {
return; break;
} }
foreach (var item in batch)
{
ProtocolExtraItem extra = new() ProtocolExtraItem extra = new()
{ {
AlterId = item.AlterId.ToString(), AlterId = item.AlterId.ToString(),
Flow = item.Flow.IsNotEmpty() ? item.Flow : null, Flow = item.Flow.IsNotEmpty() ? item.Flow : null,
Ports = item.Ports.IsNotEmpty() ? item.Ports : null, Ports = item.Ports.IsNotEmpty() ? item.Ports : null,
}; };
if (item.ConfigType is EConfigType.PolicyGroup or EConfigType.ProxyChain) if (item.ConfigType is EConfigType.PolicyGroup or EConfigType.ProxyChain)
{ {
extra.GroupType = nameof(item.ConfigType); extra.GroupType = nameof(item.ConfigType);
@ -284,11 +295,20 @@ public sealed class AppManager
extra.MultipleLoad = groupItem.MultipleLoad; extra.MultipleLoad = groupItem.MultipleLoad;
} }
} }
item.SetExtraItem(extra);
item.SetProtocolExtra(extra);
item.Password = item.Id;
item.ConfigVersion = 3;
await SQLiteHelper.Instance.UpdateAsync(item); await SQLiteHelper.Instance.UpdateAsync(item);
} }
await ProfileGroupItemManager.Instance.ClearAll(); offset += pageSize;
}
//await ProfileGroupItemManager.Instance.ClearAll();
#pragma warning restore CS0618
} }
#endregion SqliteHelper #endregion SqliteHelper

16
v2rayN/ServiceLib/Manager/GroupProfileManager.cs
View file

@ -4,7 +4,7 @@ public class GroupProfileManager
{ {
public static async Task<bool> HasCycle(ProfileItem item) public static async Task<bool> HasCycle(ProfileItem item)
{ {
return await HasCycle(item.IndexId, item.GetExtraItem()); return await HasCycle(item.IndexId, item.GetProtocolExtra());
} }
public static async Task<bool> HasCycle(string? indexId, ProtocolExtraItem? extraInfo) public static async Task<bool> HasCycle(string? indexId, ProtocolExtraItem? extraInfo)
@ -55,7 +55,7 @@ public class GroupProfileManager
foreach (var child in childIds) foreach (var child in childIds)
{ {
var childItem = await AppManager.Instance.GetProfileItem(child); var childItem = await AppManager.Instance.GetProfileItem(child);
if (await HasCycle(child, childItem?.GetExtraItem(), visited, stack)) if (await HasCycle(child, childItem?.GetProtocolExtra(), visited, stack))
{ {
return true; return true;
} }
@ -71,16 +71,12 @@ public class GroupProfileManager
public static async Task<(List<ProfileItem> Items, ProtocolExtraItem? Extra)> GetChildProfileItems(ProfileItem profileItem) public static async Task<(List<ProfileItem> Items, ProtocolExtraItem? Extra)> GetChildProfileItems(ProfileItem profileItem)
{ {
var profileExtra = profileItem?.GetExtraItem(); var protocolExtra = profileItem?.GetProtocolExtra();
if (profileExtra == null) var items = await GetChildProfileItems(protocolExtra);
{ var subItems = await GetSubChildProfileItems(protocolExtra);
return ([], null);
}
var items = await GetChildProfileItems(profileExtra);
var subItems = await GetSubChildProfileItems(profileExtra);
items.AddRange(subItems); items.AddRange(subItems);
return (items, profileExtra); return (items, protocolExtra);
} }
public static async Task<List<ProfileItem>> GetChildProfileItems(ProtocolExtraItem? extra) public static async Task<List<ProfileItem>> GetChildProfileItems(ProtocolExtraItem? extra)

1
v2rayN/ServiceLib/Manager/ProfileGroupItemManager.cs
View file

@ -1,5 +1,6 @@
namespace ServiceLib.Manager; namespace ServiceLib.Manager;
[Obsolete("Use GroupProfileManager instead.")]
public class ProfileGroupItemManager public class ProfileGroupItemManager
{ {
private static readonly Lazy<ProfileGroupItemManager> _instance = new(() => new()); private static readonly Lazy<ProfileGroupItemManager> _instance = new(() => new());

2
v2rayN/ServiceLib/Models/ProfileGroupItem.cs
View file

@ -1,6 +1,6 @@
namespace ServiceLib.Models; namespace ServiceLib.Models;
// deprecated [Obsolete("Use ProtocolExtraItem instead.")]
[Serializable] [Serializable]
public class ProfileGroupItem public class ProfileGroupItem
{ {

28
v2rayN/ServiceLib/Models/ProfileItem.cs
View file

@ -7,9 +7,10 @@ public class ProfileItem : ReactiveObject
{ {
IndexId = string.Empty; IndexId = string.Empty;
ConfigType = EConfigType.VMess; ConfigType = EConfigType.VMess;
ConfigVersion = 2; ConfigVersion = 3;
Address = string.Empty; Address = string.Empty;
Port = 0; Port = 0;
Password = string.Empty;
Id = string.Empty; Id = string.Empty;
AlterId = 0; AlterId = 0;
Security = string.Empty; Security = string.Empty;
@ -94,7 +95,7 @@ public class ProfileItem : ReactiveObject
return false; return false;
} }
if (!Global.Flows.Contains(GetExtraItem().Flow ?? string.Empty)) if (!Global.Flows.Contains(GetProtocolExtra().Flow ?? string.Empty))
{ {
return false; return false;
} }
@ -125,18 +126,18 @@ public class ProfileItem : ReactiveObject
return true; return true;
} }
public void SetExtraItem(ProtocolExtraItem extraItem) public void SetProtocolExtra(ProtocolExtraItem extraItem)
{ {
JsonData = JsonUtils.Serialize(extraItem, false); ProtoExtra = JsonUtils.Serialize(extraItem, false);
} }
public ProtocolExtraItem GetExtraItem() public ProtocolExtraItem GetProtocolExtra()
{ {
if (JsonData.IsNullOrEmpty()) if (ProtoExtra.IsNullOrEmpty())
{ {
return new ProtocolExtraItem(); return new ProtocolExtraItem();
} }
return JsonUtils.Deserialize<ProtocolExtraItem>(JsonData); return JsonUtils.Deserialize<ProtocolExtraItem>(ProtoExtra);
} }
#endregion function #endregion function
@ -148,8 +149,7 @@ public class ProfileItem : ReactiveObject
public int ConfigVersion { get; set; } public int ConfigVersion { get; set; }
public string Address { get; set; } public string Address { get; set; }
public int Port { get; set; } public int Port { get; set; }
public string Id { get; set; } public string Password { get; set; }
public string Security { get; set; }
public string Network { get; set; } public string Network { get; set; }
public string Remarks { get; set; } public string Remarks { get; set; }
public string HeaderType { get; set; } public string HeaderType { get; set; }
@ -175,9 +175,15 @@ public class ProfileItem : ReactiveObject
public string CertSha { get; set; } public string CertSha { get; set; }
public string EchConfigList { get; set; } public string EchConfigList { get; set; }
public string EchForceQuery { get; set; } public string EchForceQuery { get; set; }
public string JsonData { get; set; } public string ProtoExtra { get; set; }
// deprecated [Obsolete("Use ProtocolExtraItem.Ports instead.")]
public string Ports { get; set; } public string Ports { get; set; }
[Obsolete("Use ProtocolExtraItem.AlterId instead.")]
public int AlterId { get; set; } public int AlterId { get; set; }
[Obsolete("Use ProtocolExtraItem.Flow instead.")]
public string Flow { get; set; } public string Flow { get; set; }
[Obsolete("Use ProfileItem.Password instead.")]
public string Id { get; set; }
[Obsolete("Use ProtocolExtraItem.xxx instead.")]
public string Security { get; set; }
} }

13
v2rayN/ServiceLib/Models/ProtocolExtraItem.cs
View file

@ -4,13 +4,26 @@ public class ProtocolExtraItem
{ {
// vmess // vmess
public string? AlterId { get; set; } public string? AlterId { get; set; }
public string? VmessSecurity { get; set; }
// vless // vless
public string? Flow { get; set; } public string? Flow { get; set; }
public string? VlessEncryption { get; set; }
//public string? VisionSeed { get; set; } //public string? VisionSeed { get; set; }
// shadowsocks // shadowsocks
//public string? PluginArgs { get; set; } //public string? PluginArgs { get; set; }
public string? SsMethod { get; set; }
// socks and http
public string? Username { get; set; }
// wireguard
public string? WgPublicKey { get; set; }
public string? WgPresharedKey { get; set; }
public string? WgInterfaceAddress { get; set; }
public string? WgReserved { get; set; }
public int? WgMtu { get; set; }
// hysteria2 // hysteria2
public int? UpMbps { get; set; } public int? UpMbps { get; set; }

16
v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs
View file

@ -6,7 +6,7 @@ public partial class CoreConfigSingboxService
{ {
try try
{ {
var extraItem = node.GetExtraItem(); var protocolExtra = node.GetProtocolExtra();
outbound.server = node.Address; outbound.server = node.Address;
outbound.server_port = node.Port; outbound.server_port = node.Port;
outbound.type = Global.ProtocolTypes[node.ConfigType]; outbound.type = Global.ProtocolTypes[node.ConfigType];
@ -16,7 +16,7 @@ public partial class CoreConfigSingboxService
case EConfigType.VMess: case EConfigType.VMess:
{ {
outbound.uuid = node.Id; outbound.uuid = node.Id;
outbound.alter_id = int.TryParse(extraItem?.AlterId, out var result) ? result : 0; outbound.alter_id = int.TryParse(protocolExtra?.AlterId, out var result) ? result : 0;
if (Global.VmessSecurities.Contains(node.Security)) if (Global.VmessSecurities.Contains(node.Security))
{ {
outbound.security = node.Security; outbound.security = node.Security;
@ -113,13 +113,13 @@ public partial class CoreConfigSingboxService
outbound.packet_encoding = "xudp"; outbound.packet_encoding = "xudp";
if (extraItem.Flow.IsNullOrEmpty()) if (protocolExtra.Flow.IsNullOrEmpty())
{ {
await GenOutboundMux(node, outbound); await GenOutboundMux(node, outbound);
} }
else else
{ {
outbound.flow = extraItem.Flow; outbound.flow = protocolExtra.Flow;
} }
await GenOutboundTransport(node, outbound); await GenOutboundTransport(node, outbound);
@ -146,13 +146,13 @@ public partial class CoreConfigSingboxService
}; };
} }
outbound.up_mbps = extraItem?.UpMbps is { } su and >= 0 outbound.up_mbps = protocolExtra?.UpMbps is { } su and >= 0
? su ? su
: _config.HysteriaItem.UpMbps > 0 ? _config.HysteriaItem.UpMbps : null; : _config.HysteriaItem.UpMbps > 0 ? _config.HysteriaItem.UpMbps : null;
outbound.down_mbps = extraItem?.DownMbps is { } sd and >= 0 outbound.down_mbps = protocolExtra?.DownMbps is { } sd and >= 0
? sd ? sd
: _config.HysteriaItem.DownMbps > 0 ? _config.HysteriaItem.DownMbps : null; : _config.HysteriaItem.DownMbps > 0 ? _config.HysteriaItem.DownMbps : null;
var ports = extraItem?.Ports?.IsNullOrEmpty() == false ? extraItem.Ports : null; var ports = protocolExtra?.Ports?.IsNullOrEmpty() == false ? protocolExtra.Ports : null;
if ((!ports.IsNullOrEmpty()) && (ports.Contains(':') || ports.Contains('-') || ports.Contains(','))) if ((!ports.IsNullOrEmpty()) && (ports.Contains(':') || ports.Contains('-') || ports.Contains(',')))
{ {
outbound.server_port = null; outbound.server_port = null;
@ -165,7 +165,7 @@ public partial class CoreConfigSingboxService
return port.Contains(':') ? port : $"{port}:{port}"; return port.Contains(':') ? port : $"{port}:{port}";
}) })
.ToList(); .ToList();
outbound.hop_interval = extraItem?.HopInterval is { } hi and >= 5 outbound.hop_interval = protocolExtra?.HopInterval is { } hi and >= 5
? $"{hi}s" ? $"{hi}s"
: _config.HysteriaItem.HopInterval >= 5 ? $"{_config.HysteriaItem.HopInterval}s" : $"{Global.Hysteria2DefaultHopInt}s"; : _config.HysteriaItem.HopInterval >= 5 ? $"{_config.HysteriaItem.HopInterval}s" : $"{Global.Hysteria2DefaultHopInt}s";
} }

18
v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs
View file

@ -6,7 +6,7 @@ public partial class CoreConfigV2rayService
{ {
try try
{ {
var extraItem = node.GetExtraItem(); var protocolExtra = node.GetProtocolExtra();
var muxEnabled = node.MuxEnabled ?? _config.CoreBasicItem.MuxEnabled; var muxEnabled = node.MuxEnabled ?? _config.CoreBasicItem.MuxEnabled;
switch (node.ConfigType) switch (node.ConfigType)
{ {
@ -37,7 +37,7 @@ public partial class CoreConfigV2rayService
} }
usersItem.id = node.Id; usersItem.id = node.Id;
usersItem.alterId = int.TryParse(extraItem?.AlterId, out var result) ? result : 0; usersItem.alterId = int.TryParse(protocolExtra?.AlterId, out var result) ? result : 0;
usersItem.email = Global.UserEMail; usersItem.email = Global.UserEMail;
if (Global.VmessSecurities.Contains(node.Security)) if (Global.VmessSecurities.Contains(node.Security))
{ {
@ -143,13 +143,13 @@ public partial class CoreConfigV2rayService
usersItem.email = Global.UserEMail; usersItem.email = Global.UserEMail;
usersItem.encryption = node.Security; usersItem.encryption = node.Security;
if (extraItem.Flow.IsNullOrEmpty()) if (protocolExtra.Flow.IsNullOrEmpty())
{ {
await GenOutboundMux(node, outbound, muxEnabled, muxEnabled); await GenOutboundMux(node, outbound, muxEnabled, muxEnabled);
} }
else else
{ {
usersItem.flow = extraItem.Flow; usersItem.flow = protocolExtra.Flow;
await GenOutboundMux(node, outbound, false, muxEnabled); await GenOutboundMux(node, outbound, false, muxEnabled);
} }
outbound.settings.servers = null; outbound.settings.servers = null;
@ -510,15 +510,15 @@ public partial class CoreConfigV2rayService
break; break;
case "hysteria": case "hysteria":
var extraItem = node.GetExtraItem(); var protocolExtra = node.GetProtocolExtra();
var ports = extraItem?.Ports; var ports = protocolExtra?.Ports;
int? upMbps = extraItem?.UpMbps is { } su and >= 0 int? upMbps = protocolExtra?.UpMbps is { } su and >= 0
? su ? su
: _config.HysteriaItem.UpMbps > 0 ? _config.HysteriaItem.UpMbps : null; : _config.HysteriaItem.UpMbps > 0 ? _config.HysteriaItem.UpMbps : null;
int? downMbps = extraItem?.DownMbps is { } sd and >= 0 int? downMbps = protocolExtra?.DownMbps is { } sd and >= 0
? sd ? sd
: _config.HysteriaItem.DownMbps > 0 ? _config.HysteriaItem.DownMbps : null; : _config.HysteriaItem.DownMbps > 0 ? _config.HysteriaItem.DownMbps : null;
var hopInterval = extraItem?.HopInterval is { } hi and >= 5 var hopInterval = protocolExtra?.HopInterval is { } hi and >= 5
? hi ? hi
: _config.HysteriaItem.HopInterval >= 5 ? _config.HysteriaItem.HopInterval : Global.Hysteria2DefaultHopInt; : _config.HysteriaItem.HopInterval >= 5 ? _config.HysteriaItem.HopInterval : Global.Hysteria2DefaultHopInt;
HysteriaUdpHop4Ray? udpHop = null; HysteriaUdpHop4Ray? udpHop = null;

24
v2rayN/ServiceLib/ViewModels/AddGroupServerViewModel.cs
View file

@ -79,8 +79,8 @@ public class AddGroupServerViewModel : MyReactiveObject
public async Task Init() public async Task Init()
{ {
var extra = SelectedSource.GetExtraItem(); var protocolExtra = SelectedSource.GetProtocolExtra();
PolicyGroupType = (extra?.MultipleLoad ?? EMultipleLoad.LeastPing) switch PolicyGroupType = (protocolExtra?.MultipleLoad ?? EMultipleLoad.LeastPing) switch
{ {
EMultipleLoad.LeastPing => ResUI.TbLeastPing, EMultipleLoad.LeastPing => ResUI.TbLeastPing,
EMultipleLoad.Fallback => ResUI.TbFallback, EMultipleLoad.Fallback => ResUI.TbFallback,
@ -93,10 +93,10 @@ public class AddGroupServerViewModel : MyReactiveObject
var subs = await AppManager.Instance.SubItems(); var subs = await AppManager.Instance.SubItems();
subs.Add(new SubItem()); subs.Add(new SubItem());
SubItems.AddRange(subs); SubItems.AddRange(subs);
SelectedSubItem = SubItems.FirstOrDefault(s => s.Id == extra?.SubChildItems); SelectedSubItem = SubItems.FirstOrDefault(s => s.Id == protocolExtra?.SubChildItems);
Filter = extra?.Filter; Filter = protocolExtra?.Filter;
var childIndexIds = Utils.String2List(extra?.ChildItems) ?? []; var childIndexIds = Utils.String2List(protocolExtra?.ChildItems) ?? [];
foreach (var item in childIndexIds) foreach (var item in childIndexIds)
{ {
var child = await AppManager.Instance.GetProfileItem(item); var child = await AppManager.Instance.GetProfileItem(item);
@ -202,10 +202,10 @@ public class AddGroupServerViewModel : MyReactiveObject
return; return;
} }
var extra = SelectedSource.GetExtraItem(); var protocolExtra = SelectedSource.GetProtocolExtra();
extra.ChildItems = protocolExtra.ChildItems =
Utils.List2String(ChildItemsObs.Where(s => !s.IndexId.IsNullOrEmpty()).Select(s => s.IndexId).ToList()); Utils.List2String(ChildItemsObs.Where(s => !s.IndexId.IsNullOrEmpty()).Select(s => s.IndexId).ToList());
extra.MultipleLoad = PolicyGroupType switch protocolExtra.MultipleLoad = PolicyGroupType switch
{ {
var s when s == ResUI.TbLeastPing => EMultipleLoad.LeastPing, var s when s == ResUI.TbLeastPing => EMultipleLoad.LeastPing,
var s when s == ResUI.TbFallback => EMultipleLoad.Fallback, var s when s == ResUI.TbFallback => EMultipleLoad.Fallback,
@ -215,17 +215,17 @@ public class AddGroupServerViewModel : MyReactiveObject
_ => EMultipleLoad.LeastPing, _ => EMultipleLoad.LeastPing,
}; };
extra.SubChildItems = SelectedSubItem?.Id; protocolExtra.SubChildItems = SelectedSubItem?.Id;
extra.Filter = Filter; protocolExtra.Filter = Filter;
var hasCycle = await GroupProfileManager.HasCycle(SelectedSource.IndexId, extra); var hasCycle = await GroupProfileManager.HasCycle(SelectedSource.IndexId, protocolExtra);
if (hasCycle) if (hasCycle)
{ {
NoticeManager.Instance.Enqueue(string.Format(ResUI.GroupSelfReference, remarks)); NoticeManager.Instance.Enqueue(string.Format(ResUI.GroupSelfReference, remarks));
return; return;
} }
SelectedSource.SetExtraItem(extra); SelectedSource.SetProtocolExtra(protocolExtra);
if (await ConfigHandler.AddServerCommon(_config, SelectedSource) == 0) if (await ConfigHandler.AddServerCommon(_config, SelectedSource) == 0)
{ {

30
v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs
View file

@ -82,13 +82,13 @@ public class AddServerViewModel : MyReactiveObject
Cert = SelectedSource?.Cert?.ToString() ?? string.Empty; Cert = SelectedSource?.Cert?.ToString() ?? string.Empty;
CertSha = SelectedSource?.CertSha?.ToString() ?? string.Empty; CertSha = SelectedSource?.CertSha?.ToString() ?? string.Empty;
var extraItem = SelectedSource?.GetExtraItem(); var protocolExtra = SelectedSource?.GetProtocolExtra();
Ports = extraItem?.Ports ?? string.Empty; Ports = protocolExtra?.Ports ?? string.Empty;
AlterId = int.TryParse(extraItem?.AlterId, out var result) ? result : 0; AlterId = int.TryParse(protocolExtra?.AlterId, out var result) ? result : 0;
Flow = extraItem?.Flow ?? string.Empty; Flow = protocolExtra?.Flow ?? string.Empty;
UpMbps = extraItem?.UpMbps ?? 0; UpMbps = protocolExtra?.UpMbps ?? 0;
DownMbps = extraItem?.DownMbps ?? 0; DownMbps = protocolExtra?.DownMbps ?? 0;
HopInterval = extraItem?.HopInterval ?? Global.Hysteria2DefaultHopInt; HopInterval = protocolExtra?.HopInterval ?? Global.Hysteria2DefaultHopInt;
} }
private async Task SaveServerAsync() private async Task SaveServerAsync()
@ -135,14 +135,14 @@ public class AddServerViewModel : MyReactiveObject
SelectedSource.CoreType = CoreType.IsNullOrEmpty() ? null : (ECoreType)Enum.Parse(typeof(ECoreType), CoreType); SelectedSource.CoreType = CoreType.IsNullOrEmpty() ? null : (ECoreType)Enum.Parse(typeof(ECoreType), CoreType);
SelectedSource.Cert = Cert.IsNullOrEmpty() ? string.Empty : Cert; SelectedSource.Cert = Cert.IsNullOrEmpty() ? string.Empty : Cert;
SelectedSource.CertSha = CertSha.IsNullOrEmpty() ? string.Empty : CertSha; SelectedSource.CertSha = CertSha.IsNullOrEmpty() ? string.Empty : CertSha;
var extraItem = SelectedSource.GetExtraItem(); var protocolExtra = SelectedSource.GetProtocolExtra();
extraItem.Ports = Ports; protocolExtra.Ports = Ports;
extraItem.AlterId = AlterId > 0 ? AlterId.ToString() : string.Empty; protocolExtra.AlterId = AlterId > 0 ? AlterId.ToString() : string.Empty;
extraItem.Flow = Flow; protocolExtra.Flow = Flow;
extraItem.UpMbps = UpMbps; protocolExtra.UpMbps = UpMbps;
extraItem.DownMbps = DownMbps; protocolExtra.DownMbps = DownMbps;
extraItem.HopInterval = HopInterval >= 5 ? HopInterval : Global.Hysteria2DefaultHopInt; protocolExtra.HopInterval = HopInterval >= 5 ? HopInterval : Global.Hysteria2DefaultHopInt;
SelectedSource.SetExtraItem(extraItem); SelectedSource.SetProtocolExtra(protocolExtra);
if (await ConfigHandler.AddServer(_config, SelectedSource) == 0) if (await ConfigHandler.AddServer(_config, SelectedSource) == 0)
{ {