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

Fixed the problem of traffic statistics api url

Browse source
This commit is contained in:
2dust 2024-11-30 10:58:53 +08:00
parent f685682214
commit e4d3a98aa8
5 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
v2rayN/ServiceLib/Handler/AppHandler.cs
View file

@ -27,7 +27,7 @@
get
{
_statePort2 ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api2));
return _statePort2.Value;
return _statePort2.Value + (_config.TunModeItem.EnableTun ? 1 : 0);
}
}
@ -79,6 +79,13 @@
return true;
}
public bool Reset()
{
_statePort = null;
_statePort2 = null;
return true;
}
#endregion Init
#region Config

13
v2rayN/ServiceLib/Handler/CoreHandler.cs
View file

@ -97,12 +97,12 @@ namespace ServiceLib.Handler
{
if (_process != null)
{
await KillProcess(_process);
_process = await KillProcess(_process);
}
if (_processPre != null)
{
await KillProcess(_processPre);
_processPre = await KillProcess(_processPre);
}
if (_linuxSudoPid > 0)
@ -321,17 +321,18 @@ namespace ServiceLib.Handler
}
}
private async Task KillProcess(Process? proc)
private async Task<Process?> KillProcess(Process? proc)
{
if (proc is null)
{
return;
return null;
}
try { proc?.Kill(true); } catch { }
try { proc?.Close(); } catch { }
try { proc?.Dispose(); } catch { }
proc = null;
await Task.Delay(100);
return null;
}
#endregion Process
@ -394,7 +395,7 @@ namespace ServiceLib.Handler
private async Task<string> CreateLinuxShellFile(string cmdLine, string fileName)
{
//Shell scripts
var shFilePath = Utils.GetBinPath(fileName);
var shFilePath = Utils.GetBinPath(AppHandler.Instance.IsAdministrator ? "root_" + fileName : fileName);
File.Delete(shFilePath);
var sb = new StringBuilder();
sb.AppendLine("#!/bin/sh");

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

@ -8,8 +8,8 @@ namespace ServiceLib.Services.Statistics
private Config _config;
private bool _exitFlag;
private ClientWebSocket? webSocket;
private string url = string.Empty;
private Action<ServerSpeedItem>? _updateFunc;
private string Url => $"ws://{Global.Loopback}:{AppHandler.Instance.StatePort2}/traffic";
public StatisticsSingboxService(Config config, Action<ServerSpeedItem> updateFunc)
{
@ -26,12 +26,10 @@ namespace ServiceLib.Services.Statistics
try
{
url = $"ws://{Global.Loopback}:{AppHandler.Instance.StatePort2}/traffic";
if (webSocket == null)
{
webSocket = new ClientWebSocket();
await webSocket.ConnectAsync(new Uri(url), CancellationToken.None);
await webSocket.ConnectAsync(new Uri(Url), CancellationToken.None);
}
}
catch { }

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

@ -3,18 +3,17 @@
public class StatisticsXrayService
{
private const long linkBase = 1024;
private string _url;
private ServerSpeedItem _serverSpeedItem = new();
private Config _config;
private bool _exitFlag;
private Action<ServerSpeedItem>? _updateFunc;
private string Url => $"{Global.HttpProtocol}{Global.Loopback}:{AppHandler.Instance.StatePort}/debug/vars";
public StatisticsXrayService(Config config, Action<ServerSpeedItem> updateFunc)
{
_config = config;
_updateFunc = updateFunc;
_exitFlag = false;
_url = $"{Global.HttpProtocol}{Global.Loopback}:{AppHandler.Instance.StatePort}/debug/vars";
Task.Run(Run);
}
@ -36,7 +35,7 @@
continue;
}
var result = await HttpClientHelper.Instance.TryGetAsync(_url);
var result = await HttpClientHelper.Instance.TryGetAsync(Url);
if (result != null)
{
var server = ParseOutput(result) ?? new ServerSpeedItem();

1
v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
View file

@ -356,6 +356,7 @@ namespace ServiceLib.ViewModels
if (await ConfigHandler.SaveConfig(_config) == 0)
{
await AutoStartupHandler.UpdateTask(_config);
AppHandler.Instance.Reset();
NoticeHandler.Instance.Enqueue(needReboot ? ResUI.NeedRebootTips : ResUI.OperationSuccess);
_updateView?.Invoke(EViewAction.CloseWindow, null);