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

Allow test group

Browse source
This commit is contained in:
DHR60 2026-02-27 22:09:11 +08:00
parent 2835862166
commit 7bafe35f1a
5 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -242,6 +242,12 @@ public sealed class AppManager
.ToListAsync(); .ToListAsync();
} }
public async Task<Dictionary<string, ProfileItem>> GetProfileItemsByIndexIdsAsMap(IEnumerable<string> indexIds)
{
var items = await GetProfileItemsByIndexIds(indexIds);
return items.ToDictionary(it => it.IndexId);
}
public async Task<ProfileItem?> GetProfileItemViaRemarks(string? remarks) public async Task<ProfileItem?> GetProfileItemViaRemarks(string? remarks)
{ {
if (remarks.IsNullOrEmpty()) if (remarks.IsNullOrEmpty())

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

@ -103,16 +103,7 @@ public class GroupProfileManager
return []; return [];
} }
var childProfiles = await AppManager.Instance.GetProfileItemsByIndexIds(childProfileIds); var profileMap = await AppManager.Instance.GetProfileItemsByIndexIdsAsMap(childProfileIds);
if (childProfiles == null || childProfiles.Count == 0)
{
return [];
}
var profileMap = childProfiles
.Where(p => p != null && !p.IndexId.IsNullOrEmpty())
.GroupBy(p => p!.IndexId!)
.ToDictionary(g => g.Key, g => g.First());
var ordered = new List<ProfileItem>(childProfileIds.Count); var ordered = new List<ProfileItem>(childProfileIds.Count);
foreach (var id in childProfileIds) foreach (var id in childProfileIds)

4
v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs
View file

@ -149,11 +149,11 @@ public partial class CoreConfigSingboxService(CoreConfigContext context)
foreach (var it in selecteds) foreach (var it in selecteds)
{ {
if (!Global.SingboxSupportConfigType.Contains(it.ConfigType)) if (!(Global.XraySupportConfigType.Contains(it.ConfigType) || it.ConfigType.IsGroupType()))
{ {
continue; continue;
} }
if (it.Port <= 0) if (!it.ConfigType.IsComplexType() && it.Port <= 0)
{ {
continue; continue;
} }

8
v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs
View file

@ -112,11 +112,11 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
foreach (var it in selecteds) foreach (var it in selecteds)
{ {
if (!Global.XraySupportConfigType.Contains(it.ConfigType)) if (!(Global.XraySupportConfigType.Contains(it.ConfigType) || it.ConfigType.IsGroupType()))
{ {
continue; continue;
} }
if (it.Port <= 0) if (!it.ConfigType.IsComplexType() && it.Port <= 0)
{ {
continue; continue;
} }
@ -180,13 +180,13 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
//rule //rule
RulesItem4Ray rule = new() RulesItem4Ray rule = new()
{ {
inboundTag = new List<string> { inbound.tag }, inboundTag = [inbound.tag],
outboundTag = tag, outboundTag = tag,
type = "field" type = "field"
}; };
if (isBalancer) if (isBalancer)
{ {
rule.balancerTag = tag; rule.balancerTag = tag + Global.BalancerTagSuffix;
rule.outboundTag = null; rule.outboundTag = null;
} }
_coreConfig.routing.rules.Add(rule); _coreConfig.routing.rules.Add(rule);

18
v2rayN/ServiceLib/Services/SpeedtestService.cs
View file

@ -61,21 +61,27 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
private async Task<List<ServerTestItem>> GetClearItem(ESpeedActionType actionType, List<ProfileItem> selecteds) private async Task<List<ServerTestItem>> GetClearItem(ESpeedActionType actionType, List<ProfileItem> selecteds)
{ {
var lstSelected = new List<ServerTestItem>(); var lstSelected = new List<ServerTestItem>(selecteds.Count);
var ids = selecteds.Where(it => !it.IndexId.IsNullOrEmpty()
&& it.ConfigType != EConfigType.Custom
&& (it.ConfigType.IsComplexType() || it.Port > 0))
.Select(it => it.IndexId)
.ToList();
var profileMap = await AppManager.Instance.GetProfileItemsByIndexIdsAsMap(ids);
for (var i = 0; i < selecteds.Count; i++) for (var i = 0; i < selecteds.Count; i++)
{ {
var it = selecteds[i]; var it = selecteds[i];
if (it.ConfigType.IsComplexType()) if (it.ConfigType == EConfigType.Custom)
{ {
continue; continue;
} }
if (it.Port <= 0) if (!it.ConfigType.IsComplexType() && it.Port <= 0)
{ {
continue; continue;
} }
var profile = await AppManager.Instance.GetProfileItem(it.IndexId) ?? it; var profile = profileMap.GetValueOrDefault(it.IndexId, it);
lstSelected.Add(new ServerTestItem() lstSelected.Add(new ServerTestItem()
{ {
IndexId = it.IndexId, IndexId = it.IndexId,
@ -357,8 +363,8 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
private List<List<ServerTestItem>> GetTestBatchItem(List<ServerTestItem> lstSelected, int pageSize) private List<List<ServerTestItem>> GetTestBatchItem(List<ServerTestItem> lstSelected, int pageSize)
{ {
List<List<ServerTestItem>> lstTest = new(); List<List<ServerTestItem>> lstTest = new();
var lst1 = lstSelected.Where(t => Global.XraySupportConfigType.Contains(t.ConfigType) && t.CoreType == ECoreType.Xray).ToList(); var lst1 = lstSelected.Where(t => t.CoreType == ECoreType.Xray).ToList();
var lst2 = lstSelected.Where(t => Global.SingboxSupportConfigType.Contains(t.ConfigType) && t.CoreType == ECoreType.sing_box).ToList(); var lst2 = lstSelected.Where(t => t.CoreType == ECoreType.sing_box).ToList();
for (var num = 0; num < (int)Math.Ceiling(lst1.Count * 1.0 / pageSize); num++) for (var num = 0; num < (int)Math.Ceiling(lst1.Count * 1.0 / pageSize); num++)
{ {