Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-11-27 02:02:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix: tcping high latency and speedtest displayed 0 (#8374)

Browse source 
* Fix: High latency in tcping test due to thread blocking

* Fix: download to fast, speed displayed as 0.

---------

Co-authored-by: 2dust <31833384+2dust@users.noreply.github.com>
This commit is contained in:
jiuqianyuan 2025-11-24 19:01:04 +08:00 committed by GitHub
parent 693afe3560
commit 830dc89c32
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
v2rayN/ServiceLib/Helper/DownloaderHelper.cs
View file

@ -71,28 +71,25 @@ public class DownloaderHelper
} }
}; };
var totalDatetime = DateTime.Now; var lastUpdateTime = DateTime.Now;
var totalSecond = 0;
var hasValue = false; var hasValue = false;
double maxSpeed = 0; double maxSpeed = 0;
await using var downloader = new Downloader.DownloadService(downloadOpt); await using var downloader = new Downloader.DownloadService(downloadOpt);
//downloader.DownloadStarted += (sender, value) =>
//{
// if (progress != null)
// {
// progress.Report("Start download data...");
// }
//};
downloader.DownloadProgressChanged += (sender, value) => downloader.DownloadProgressChanged += (sender, value) =>
{ {
var ts = DateTime.Now - totalDatetime; if (progress != null && value.BytesPerSecondSpeed > 0)
if (progress != null && ts.Seconds > totalSecond)
{ {
hasValue = true; hasValue = true;
totalSecond = ts.Seconds;
if (value.BytesPerSecondSpeed > maxSpeed) if (value.BytesPerSecondSpeed > maxSpeed)
{ {
maxSpeed = value.BytesPerSecondSpeed; maxSpeed = value.BytesPerSecondSpeed;
}
var ts = DateTime.Now - lastUpdateTime;
if (ts.TotalMilliseconds >= 1000)
{
lastUpdateTime = DateTime.Now;
var speed = (maxSpeed / 1000 / 1000).ToString("#0.0"); var speed = (maxSpeed / 1000 / 1000).ToString("#0.0");
progress.Report(speed); progress.Report(speed);
} }
@ -102,10 +99,19 @@ public class DownloaderHelper
{ {
if (progress != null) if (progress != null)
{ {
if (!hasValue && value.Error != null) if (hasValue && maxSpeed > 0)
{
var finalSpeed = (maxSpeed / 1000 / 1000).ToString("#0.0");
progress.Report(finalSpeed);
}
else if (value.Error != null)
{ {
progress.Report(value.Error?.Message); progress.Report(value.Error?.Message);
} }
else
{
progress.Report("0");
}
} }
}; };
//progress.Report("......"); //progress.Report("......");

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

@ -323,8 +323,6 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
{ {
var responseTime = -1; var responseTime = -1;
try
{
if (!IPAddress.TryParse(url, out var ipAddress)) if (!IPAddress.TryParse(url, out var ipAddress))
{ {
var ipHostInfo = await Dns.GetHostEntryAsync(url); var ipHostInfo = await Dns.GetHostEntryAsync(url);
@ -335,19 +333,18 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
using Socket clientSocket = new(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp); using Socket clientSocket = new(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
var timer = Stopwatch.StartNew(); var timer = Stopwatch.StartNew();
var result = clientSocket.BeginConnect(endPoint, null, null); try
if (!result.AsyncWaitHandle.WaitOne(TimeSpan.FromSeconds(5)))
{ {
throw new TimeoutException("connect timeout (5s): " + url); using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
await clientSocket.ConnectAsync(endPoint, cts.Token).ConfigureAwait(false);
} }
catch (OperationCanceledException)
{
}
finally
{
timer.Stop(); timer.Stop();
responseTime = (int)timer.Elapsed.TotalMilliseconds; responseTime = (int)timer.Elapsed.TotalMilliseconds;
clientSocket.EndConnect(result);
}
catch (Exception ex)
{
Logging.SaveLog(_tag, ex);
} }
return responseTime; return responseTime;
} }