Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-04-19 21:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2dust:master' into patch-1

Browse source
This commit is contained in:
Alphax-Hue3682 2025-02-10 06:43:43 +03:30 committed by GitHub
commit b3df0d0776
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 93 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
v2rayN/ServiceLib/Enums/EMsgCommand.cs
View file

@ -1,4 +1,4 @@
namespace ServiceLib.Enums
namespace ServiceLib.Enums
{
public enum EMsgCommand
{
@ -6,7 +6,6 @@
SendMsgView,
SendSnackMsg,
RefreshProfiles,
StopSpeedtest,
AppExit
}
}

10
v2rayN/ServiceLib/Handler/ClashApiHandler.cs
View file

@ -1,4 +1,4 @@
using static ServiceLib.Models.ClashProxies;
using static ServiceLib.Models.ClashProxies;
namespace ServiceLib.Handler
{
@ -41,7 +41,7 @@ namespace ServiceLib.Handler
{
if (blAll)
{
for (int i = 0; i < 5; i++)
for (var i = 0; i < 5; i++)
{
if (_proxies != null)
{
@ -75,7 +75,7 @@ namespace ServiceLib.Handler
var urlBase = $"{GetApiUrl()}/proxies";
urlBase += @"/{0}/delay?timeout=10000&url=" + AppHandler.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
List<Task> tasks = new List<Task>();
var tasks = new List<Task>();
foreach (var it in lstProxy)
{
if (Global.notAllowTestType.Contains(it.Type.ToLower()))
@ -120,7 +120,7 @@ namespace ServiceLib.Handler
try
{
var url = $"{GetApiUrl()}/proxies/{name}";
Dictionary<string, string> headers = new Dictionary<string, string>();
var headers = new Dictionary<string, string>();
headers.Add("name", nameNode);
await HttpClientHelper.Instance.PutAsync(url, headers);
}
@ -148,7 +148,7 @@ namespace ServiceLib.Handler
try
{
var url = $"{GetApiUrl()}/configs?force=true";
Dictionary<string, string> headers = new Dictionary<string, string>();
var headers = new Dictionary<string, string>();
headers.Add("path", filePath);
await HttpClientHelper.Instance.PutAsync(url, headers);
}

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

@ -1,34 +1,47 @@
using System.Collections.Concurrent;
using System.Diagnostics;
using System.Net;
using System.Net.Sockets;
using ReactiveUI;
namespace ServiceLib.Services
{
public class SpeedtestService
{
private static readonly string _tag = "SpeedtestService";
private Config? _config;
private Action<SpeedTestResult>? _updateFunc;
private static readonly ConcurrentBag<string> _lstExitLoop = new();
private bool _exitLoop = false;
private static readonly string _tag = "SpeedtestService";
public SpeedtestService(Config config, ESpeedActionType actionType, List<ProfileItem> selecteds, Action<SpeedTestResult> updateFunc)
public SpeedtestService(Config config, Action<SpeedTestResult> updateFunc)
{
_config = config;
_updateFunc = updateFunc;
}
MessageBus.Current.Listen<string>(EMsgCommand.StopSpeedtest.ToString()).Subscribe(ExitLoop);
public void RunLoop(ESpeedActionType actionType, List<ProfileItem> selecteds)
{
Task.Run(async () =>
{
var exitLoopKey = Utils.GetGuid(false);
_lstExitLoop.Add(exitLoopKey);
var lstSelected = GetClearItem(actionType, selecteds);
await RunAsync(actionType, lstSelected);
await RunAsync(actionType, lstSelected, exitLoopKey);
UpdateFunc("", ResUI.SpeedtestingCompleted);
});
}
private async Task RunAsync(ESpeedActionType actionType, List<ServerTestItem> lstSelected, int pageSize = 0)
public void ExitLoop()
{
if (_lstExitLoop.Count > 0)
{
UpdateFunc("", ResUI.SpeedtestingStop);
_lstExitLoop.Clear();
}
}
private async Task RunAsync(ESpeedActionType actionType, List<ServerTestItem> lstSelected, string exitLoopKey, int pageSize = 0)
{
if (actionType == ESpeedActionType.Tcping)
{
@ -47,9 +60,9 @@ namespace ServiceLib.Services
{
var ret = actionType switch
{
ESpeedActionType.Realping => await RunRealPingAsync(lst),
ESpeedActionType.Speedtest => await RunSpeedTestAsync(lst),
ESpeedActionType.Mixedtest => await RunMixedTestAsync(lst),
ESpeedActionType.Realping => await RunRealPingAsync(lst, exitLoopKey),
ESpeedActionType.Speedtest => await RunSpeedTestAsync(lst, exitLoopKey),
ESpeedActionType.Mixedtest => await RunMixedTestAsync(lst, exitLoopKey),
_ => true
};
if (ret == false)
@ -63,14 +76,14 @@ namespace ServiceLib.Services
var pageSizeNext = pageSize / 2;
if (lstFailed.Count > 0 && pageSizeNext > 0)
{
if (_exitLoop)
if (_lstExitLoop.Any(p => p == exitLoopKey) == false)
{
UpdateFunc("", ResUI.SpeedtestingSkip);
return;
}
UpdateFunc("", string.Format(ResUI.SpeedtestingTestFailedPart, lstFailed.Count));
await RunAsync(actionType, lstFailed, pageSizeNext);
await RunAsync(actionType, lstFailed, exitLoopKey, pageSizeNext);
}
}
@ -143,14 +156,6 @@ namespace ServiceLib.Services
return lstTest;
}
private void ExitLoop(string x)
{
if (_exitLoop)
return;
_exitLoop = true;
UpdateFunc("", ResUI.SpeedtestingStop);
}
private async Task RunTcpingAsync(List<ServerTestItem> selecteds)
{
try
@ -190,7 +195,7 @@ namespace ServiceLib.Services
}
}
private async Task<bool> RunRealPingAsync(List<ServerTestItem> selecteds)
private async Task<bool> RunRealPingAsync(List<ServerTestItem> selecteds, string exitLoopKey)
{
var pid = -1;
try
@ -249,7 +254,7 @@ namespace ServiceLib.Services
return true;
}
private async Task<bool> RunSpeedTestAsync(List<ServerTestItem> selecteds)
private async Task<bool> RunSpeedTestAsync(List<ServerTestItem> selecteds, string exitLoopKey)
{
var pid = -1;
pid = await CoreHandler.Instance.LoadCoreConfigSpeedtest(selecteds);
@ -265,11 +270,12 @@ namespace ServiceLib.Services
foreach (var it in selecteds)
{
if (_exitLoop)
if (_lstExitLoop.Any(p => p == exitLoopKey) == false)
{
UpdateFunc(it.IndexId, "", ResUI.SpeedtestingSkip);
continue;
}
if (!it.AllowTest)
{
continue;
@ -311,7 +317,7 @@ namespace ServiceLib.Services
return true;
}
private async Task<bool> RunSpeedTestMulti(List<ServerTestItem> selecteds)
private async Task<bool> RunSpeedTestMultiAsync(List<ServerTestItem> selecteds, string exitLoopKey)
{
var pid = -1;
pid = await CoreHandler.Instance.LoadCoreConfigSpeedtest(selecteds);
@ -327,7 +333,7 @@ namespace ServiceLib.Services
foreach (var it in selecteds)
{
if (_exitLoop)
if (_lstExitLoop.Any(p => p == exitLoopKey) == false)
{
UpdateFunc(it.IndexId, "", ResUI.SpeedtestingSkip);
continue;
@ -376,9 +382,9 @@ namespace ServiceLib.Services
return true;
}
private async Task<bool> RunMixedTestAsync(List<ServerTestItem> selecteds)
private async Task<bool> RunMixedTestAsync(List<ServerTestItem> selecteds, string exitLoopKey)
{
var ret = await RunRealPingAsync(selecteds);
var ret = await RunRealPingAsync(selecteds, exitLoopKey);
if (ret == false)
{
return false;
@ -386,7 +392,7 @@ namespace ServiceLib.Services
await Task.Delay(1000);
var ret2 = await RunSpeedTestMulti(selecteds);
var ret2 = await RunSpeedTestMultiAsync(selecteds, exitLoopKey);
if (ret2 == false)
{
return false;

8
v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs
View file

@ -21,7 +21,7 @@ namespace ServiceLib.Services.Statistics
Task.Run(Run);
}
private async void Init()
private async Task Init()
{
await Task.Delay(5000);
@ -53,9 +53,9 @@ namespace ServiceLib.Services.Statistics
}
}
private async void Run()
private async Task Run()
{
Init();
await Init();
while (!_exitFlag)
{
@ -73,7 +73,7 @@ namespace ServiceLib.Services.Statistics
{
webSocket.Abort();
webSocket = null;
Init();
await Init();
continue;
}

2
v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs
View file

@ -23,7 +23,7 @@ namespace ServiceLib.Services.Statistics
_exitFlag = true;
}
private async void Run()
private async Task Run()
{
while (!_exitFlag)
{

9
v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
View file

@ -16,6 +16,7 @@ namespace ServiceLib.ViewModels
private List<ProfileItem> _lstProfile;
private string _serverFilter = string.Empty;
private Dictionary<string, bool> _dicHeaderSort = new();
private SpeedtestService? _speedtestService;
#endregion private prop
@ -722,15 +723,13 @@ namespace ServiceLib.ViewModels
return;
}
_ = new SpeedtestService(_config, actionType, lstSelecteds, (SpeedTestResult result) =>
{
_updateView?.Invoke(EViewAction.DispatcherSpeedTest, result);
});
_speedtestService ??= new SpeedtestService(_config, (SpeedTestResult result) => _updateView?.Invoke(EViewAction.DispatcherSpeedTest, result));
_speedtestService?.RunLoop(actionType, lstSelecteds);
}
public void ServerSpeedtestStop()
{
MessageBus.Current.SendMessage("", EMsgCommand.StopSpeedtest.ToString());
_speedtestService?.ExitLoop();
}
private async Task Export2ClientConfigAsync(bool blClipboard)