Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-05-26 07:53:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix (#9251)
Some checks failed
release Linux / build (push) Has been cancelled
Details
release Linux / build and release deb x64 & arm64 (push) Has been cancelled
Details
release Linux / build and release rpm x64 & arm64 (push) Has been cancelled
Details
release Linux / build and release rpm riscv64 (push) Has been cancelled
Details
release macOS / build (push) Has been cancelled
Details
release Windows desktop (Avalonia UI) / build (push) Has been cancelled
Details
release Windows / build (push) Has been cancelled
Details
release Linux / release-zip (push) Has been cancelled
Details
release macOS / release-zip (push) Has been cancelled
Details
release macOS / package and release macOS dmg (push) Has been cancelled
Details
release Windows desktop (Avalonia UI) / release-zip (push) Has been cancelled
Details
release Windows / release-zip (push) Has been cancelled
Details

Browse source
This commit is contained in:
DHR60 2026-05-07 02:11:41 +00:00 committed by GitHub
parent 75ea81dd69
commit 2dc967bc04
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1528,10 +1528,8 @@ public static class ConfigHandler
} }
var subFilter = string.Empty; var subFilter = string.Empty;
//remove sub items
if (isSub && subid.IsNotEmpty()) if (isSub && subid.IsNotEmpty())
{ {
await RemoveServersViaSubid(config, subid, isSub);
subFilter = (await AppManager.Instance.GetSubItem(subid))?.Filter ?? ""; subFilter = (await AppManager.Instance.GetSubItem(subid))?.Filter ?? "";
} }
@ -1634,10 +1632,6 @@ public static class ConfigHandler
} }
if (lstProfiles != null && lstProfiles.Count > 0) if (lstProfiles != null && lstProfiles.Count > 0)
{ {
if (isSub && subid.IsNotEmpty())
{
await RemoveServersViaSubid(config, subid, isSub);
}
var count = 0; var count = 0;
foreach (var it in lstProfiles) foreach (var it in lstProfiles)
{ {
@ -1674,11 +1668,6 @@ public static class ConfigHandler
return -1; return -1;
} }
if (isSub && subid.IsNotEmpty())
{
await RemoveServersViaSubid(config, subid, isSub);
}
profileItem.Subid = subid; profileItem.Subid = subid;
profileItem.IsSub = isSub; profileItem.IsSub = isSub;
profileItem.PreSocksPort = preSocksPort; profileItem.PreSocksPort = preSocksPort;
@ -1708,11 +1697,6 @@ public static class ConfigHandler
return -1; return -1;
} }
if (isSub && subid.IsNotEmpty())
{
await RemoveServersViaSubid(config, subid, isSub);
}
var lstSsServer = ShadowsocksFmt.ResolveSip008(strData); var lstSsServer = ShadowsocksFmt.ResolveSip008(strData);
if (lstSsServer?.Count > 0) if (lstSsServer?.Count > 0)
{ {
@ -1744,10 +1728,6 @@ public static class ConfigHandler
{ {
return -1; return -1;
} }
if (isSub && subid.IsNotEmpty())
{
await RemoveServersViaSubid(config, subid, isSub);
}
var lstServer = WireguardFmt.ResolveConfig(strData); var lstServer = WireguardFmt.ResolveConfig(strData);
if (lstServer?.Count > 0) if (lstServer?.Count > 0)
{ {
@ -1774,15 +1754,11 @@ public static class ConfigHandler
return -1; return -1;
} }
if (isSub && subid.IsNotEmpty())
{
await RemoveServersViaSubid(config, subid, isSub);
}
var lstServer = InnerFmt.Resolve(strData, subid); var lstServer = InnerFmt.Resolve(strData, subid);
if (lstServer?.Count > 0) if (lstServer?.Count > 0)
{ {
var counter = 0; var counter = 0;
List<ProfileItem> lstAdd = [];
foreach (var profileItem in lstServer) foreach (var profileItem in lstServer)
{ {
profileItem.Subid = subid; profileItem.Subid = subid;
@ -1790,25 +1766,30 @@ public static class ConfigHandler
var addStatus = profileItem.ConfigType switch var addStatus = profileItem.ConfigType switch
{ {
EConfigType.VMess => await AddVMessServer(config, profileItem), EConfigType.VMess => await AddVMessServer(config, profileItem, false),
EConfigType.Shadowsocks => await AddShadowsocksServer(config, profileItem), EConfigType.Shadowsocks => await AddShadowsocksServer(config, profileItem, false),
EConfigType.HTTP => await AddHttpServer(config, profileItem), EConfigType.HTTP => await AddHttpServer(config, profileItem, false),
EConfigType.SOCKS => await AddSocksServer(config, profileItem), EConfigType.SOCKS => await AddSocksServer(config, profileItem, false),
EConfigType.Trojan => await AddTrojanServer(config, profileItem), EConfigType.Trojan => await AddTrojanServer(config, profileItem, false),
EConfigType.VLESS => await AddVlessServer(config, profileItem), EConfigType.VLESS => await AddVlessServer(config, profileItem, false),
EConfigType.Hysteria2 => await AddHysteria2Server(config, profileItem), EConfigType.Hysteria2 => await AddHysteria2Server(config, profileItem, false),
EConfigType.TUIC => await AddTuicServer(config, profileItem), EConfigType.TUIC => await AddTuicServer(config, profileItem, false),
EConfigType.WireGuard => await AddWireguardServer(config, profileItem), EConfigType.WireGuard => await AddWireguardServer(config, profileItem, false),
EConfigType.Anytls => await AddAnytlsServer(config, profileItem), EConfigType.Anytls => await AddAnytlsServer(config, profileItem, false),
EConfigType.Naive => await AddNaiveServer(config, profileItem), EConfigType.Naive => await AddNaiveServer(config, profileItem, false),
EConfigType.PolicyGroup or EConfigType.ProxyChain => await AddServerCommon(config, profileItem), EConfigType.PolicyGroup or EConfigType.ProxyChain => await AddServerCommon(config, profileItem, false),
_ => -1, _ => -1,
}; };
if (addStatus == 0) if (addStatus == 0)
{ {
counter++; counter++;
lstAdd.Add(profileItem);
} }
} }
if (lstAdd.Count > 0)
{
await SQLiteHelper.Instance.InsertAllAsync(lstAdd);
}
await SaveConfig(config); await SaveConfig(config);
return counter; return counter;
} }
@ -1835,6 +1816,7 @@ public static class ConfigHandler
ProfileItem? activeProfile = null; ProfileItem? activeProfile = null;
if (isSub && subid.IsNotEmpty()) if (isSub && subid.IsNotEmpty())
{ {
await RemoveServersViaSubid(config, subid, true);
lstOriSub = await AppManager.Instance.ProfileItems(subid); lstOriSub = await AppManager.Instance.ProfileItems(subid);
activeProfile = lstOriSub?.FirstOrDefault(t => t.IndexId == config.IndexId); activeProfile = lstOriSub?.FirstOrDefault(t => t.IndexId == config.IndexId);
} }

2
v2rayN/ServiceLib/Handler/Fmt/InnerFmt.cs
View file

@ -18,7 +18,7 @@ public class InnerFmt
continue; continue;
} }
var trimmedLine = line.Trim(); var trimmedLine = line.Trim();
if (!line.StartsWith(Global.InnerUriProtocol, StringComparison.OrdinalIgnoreCase)) if (!trimmedLine.StartsWith(Global.InnerUriProtocol, StringComparison.OrdinalIgnoreCase))
{ {
continue; continue;
} }