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

speedtest

Browse source
This commit is contained in:
2dust 2020-04-21 20:24:54 +08:00
parent b632dee0ce
commit 88c87aec0e
3 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
v2rayN/v2rayN/Forms/MainForm.cs
View file

@ -1257,11 +1257,11 @@ namespace v2rayN.Forms
{ {
int httpPort = config.GetLocalPort(Global.InboundHttp); int httpPort = config.GetLocalPort(Global.InboundHttp);
WebProxy webProxy = new WebProxy(Global.Loopback, httpPort); WebProxy webProxy = new WebProxy(Global.Loopback, httpPort);
downloadHandle.DownloadFileAsync(url, webProxy, 60); downloadHandle.DownloadFileAsync(url, webProxy, 600);
} }
else else
{ {
downloadHandle.DownloadFileAsync(url, null, 60); downloadHandle.DownloadFileAsync(url, null, 600);
} }
} }
} }

22
v2rayN/v2rayN/Handler/DownloadHandle.cs
View file

@ -228,19 +228,33 @@ namespace v2rayN.Handler
} }
} }
} }
void ws_DownloadFileCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e) void ws_DownloadFileCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e)
{ {
try try
{ {
if (UpdateCompleted != null) if (UpdateCompleted != null)
{ {
if (e.Error != null) throw e.Error; if (e.Cancelled)
{
((WebClientEx)sender).Dispose(); ((WebClientEx)sender).Dispose();
TimeSpan ts = (DateTime.Now - totalDatetime); TimeSpan ts = (DateTime.Now - totalDatetime);
string speed = string.Format("<{0} MB/s", (totalBytesToReceive / ts.TotalMilliseconds / 1000).ToString("#0.##")); string speed = string.Format("{0} M/s", (totalBytesToReceive / ts.TotalMilliseconds / 1000).ToString("#0.##"));
UpdateCompleted(this, new ResultEventArgs(true, speed)); UpdateCompleted(this, new ResultEventArgs(true, speed));
return;
}
if (e.Error == null
|| Utils.IsNullOrEmpty(e.Error.ToString()))
{
TimeSpan ts = (DateTime.Now - totalDatetime);
string speed = string.Format("{0} M/s", (totalBytesToReceive / ts.TotalMilliseconds / 1000).ToString("#0.##"));
UpdateCompleted(this, new ResultEventArgs(true, speed));
}
else
{
throw e.Error;
}
} }
} }
catch (Exception ex) catch (Exception ex)

2
v2rayN/v2rayN/Handler/SpeedtestHandler.cs
View file

@ -219,7 +219,7 @@ namespace v2rayN.Handler
testCounter++; testCounter++;
WebProxy webProxy = new WebProxy(Global.Loopback, httpPort + index); WebProxy webProxy = new WebProxy(Global.Loopback, httpPort + index);
downloadHandle2.DownloadFileAsync(url, webProxy, 20); downloadHandle2.DownloadFileAsync(url, webProxy, 10);
} }
} }