Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-05-07 15:48:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions4

Code clean

Browse source
This commit is contained in:
2dust 2025-02-09 20:17:56 +08:00
parent c3fdfcc4bd
commit 31a179e647
3 changed files with 51 additions and 51 deletions

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

@ -1,4 +1,4 @@
using static ServiceLib.Models.ClashProxies; using static ServiceLib.Models.ClashProxies;
namespace ServiceLib.Handler namespace ServiceLib.Handler
{ {
@ -38,63 +38,63 @@ namespace ServiceLib.Handler
public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Action<ClashProxyModel?, string> updateFunc) public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Action<ClashProxyModel?, string> updateFunc)
{ {
Task.Run(() => Task.Run(() =>
{
if (blAll)
{ {
for (int i = 0; i < 5; i++) if (blAll)
{ {
if (_proxies != null) for (var i = 0; i < 5; i++)
{ {
break; if (_proxies != null)
{
break;
}
Task.Delay(5000).Wait();
}
if (_proxies == null)
{
return;
}
lstProxy = new List<ClashProxyModel>();
foreach (KeyValuePair<string, ProxiesItem> kv in _proxies)
{
if (Global.notAllowTestType.Contains(kv.Value.type.ToLower()))
{
continue;
}
lstProxy.Add(new ClashProxyModel()
{
Name = kv.Value.name,
Type = kv.Value.type.ToLower(),
});
} }
Task.Delay(5000).Wait();
} }
if (_proxies == null)
if (lstProxy == null)
{ {
return; return;
} }
lstProxy = new List<ClashProxyModel>(); var urlBase = $"{GetApiUrl()}/proxies";
foreach (KeyValuePair<string, ProxiesItem> kv in _proxies) urlBase += @"/{0}/delay?timeout=10000&url=" + AppHandler.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
var tasks = new List<Task>();
foreach (var it in lstProxy)
{ {
if (Global.notAllowTestType.Contains(kv.Value.type.ToLower())) if (Global.notAllowTestType.Contains(it.Type.ToLower()))
{ {
continue; continue;
} }
lstProxy.Add(new ClashProxyModel() var name = it.Name;
var url = string.Format(urlBase, name);
tasks.Add(Task.Run(async () =>
{ {
Name = kv.Value.name, var result = await HttpClientHelper.Instance.TryGetAsync(url);
Type = kv.Value.type.ToLower(), updateFunc?.Invoke(it, result);
}); }));
} }
} Task.WaitAll(tasks.ToArray());
if (lstProxy == null) Task.Delay(1000).Wait();
{ updateFunc?.Invoke(null, "");
return; });
}
var urlBase = $"{GetApiUrl()}/proxies";
urlBase += @"/{0}/delay?timeout=10000&url=" + AppHandler.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
List<Task> tasks = new List<Task>();
foreach (var it in lstProxy)
{
if (Global.notAllowTestType.Contains(it.Type.ToLower()))
{
continue;
}
var name = it.Name;
var url = string.Format(urlBase, name);
tasks.Add(Task.Run(async () =>
{
var result = await HttpClientHelper.Instance.TryGetAsync(url);
updateFunc?.Invoke(it, result);
}));
}
Task.WaitAll(tasks.ToArray());
Task.Delay(1000).Wait();
updateFunc?.Invoke(null, "");
});
} }
public List<ProxiesItem>? GetClashProxyGroups() public List<ProxiesItem>? GetClashProxyGroups()
@ -120,7 +120,7 @@ namespace ServiceLib.Handler
try try
{ {
var url = $"{GetApiUrl()}/proxies/{name}"; var url = $"{GetApiUrl()}/proxies/{name}";
Dictionary<string, string> headers = new Dictionary<string, string>(); var headers = new Dictionary<string, string>();
headers.Add("name", nameNode); headers.Add("name", nameNode);
await HttpClientHelper.Instance.PutAsync(url, headers); await HttpClientHelper.Instance.PutAsync(url, headers);
} }
@ -148,7 +148,7 @@ namespace ServiceLib.Handler
try try
{ {
var url = $"{GetApiUrl()}/configs?force=true"; var url = $"{GetApiUrl()}/configs?force=true";
Dictionary<string, string> headers = new Dictionary<string, string>(); var headers = new Dictionary<string, string>();
headers.Add("path", filePath); headers.Add("path", filePath);
await HttpClientHelper.Instance.PutAsync(url, headers); await HttpClientHelper.Instance.PutAsync(url, headers);
} }

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

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

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

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