Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-11-04 22:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code clean

Browse source
This commit is contained in:
2dust 2025-11-02 15:25:41 +08:00
parent b218f0b501
commit ab6a6b879e
45 changed files with 326 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
v2rayN/Directory.Build.props
View file

@ -8,7 +8,7 @@
<TargetFramework>net8.0</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<NoWarn>CA1031;CS1591;NU1507;CA1416;IDE0058</NoWarn>
<NoWarn>CA1031;CS1591;NU1507;CA1416;IDE0058;IDE0053;IDE0200</NoWarn>
<Nullable>annotations</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Authors>2dust</Authors>

31
v2rayN/ServiceLib/Common/Utils.cs
View file

@ -306,7 +306,10 @@ public class Utils
public static bool IsBase64String(string? plainText)
{
if (plainText.IsNullOrEmpty())
{
return false;
}
var buffer = new Span<byte>(new byte[plainText.Length]);
return Convert.TryFromBase64String(plainText, buffer, out var _);
}
@ -520,43 +523,65 @@ public class Utils
{
// Loopback address check (127.0.0.1 for IPv4, ::1 for IPv6)
if (IPAddress.IsLoopback(address))
{
return true;
}
var ipBytes = address.GetAddressBytes();
if (address.AddressFamily == AddressFamily.InterNetwork)
{
// IPv4 private address check
if (ipBytes[0] == 10)
{
return true;
}
if (ipBytes[0] == 172 && ipBytes[1] >= 16 && ipBytes[1] <= 31)
{
return true;
}
if (ipBytes[0] == 192 && ipBytes[1] == 168)
{
return true;
}
}
else if (address.AddressFamily == AddressFamily.InterNetworkV6)
{
// IPv6 private address check
// Link-local address fe80::/10
if (ipBytes[0] == 0xfe && (ipBytes[1] & 0xc0) == 0x80)
{
return true;
}
// Unique local address fc00::/7 (typically fd00::/8)
if ((ipBytes[0] & 0xfe) == 0xfc)
{
return true;
}
// Private portion in IPv4-mapped addresses ::ffff:0:0/96
if (address.IsIPv4MappedToIPv6)
{
var ipv4Bytes = ipBytes.Skip(12).ToArray();
if (ipv4Bytes[0] == 10)
{
return true;
}
if (ipv4Bytes[0] == 172 && ipv4Bytes[1] >= 16 && ipv4Bytes[1] <= 31)
{
return true;
}
if (ipv4Bytes[0] == 192 && ipv4Bytes[1] == 168)
{
return true;
}
}
}
}
return false;
}
@ -708,10 +733,16 @@ public class Utils
foreach (var host in hostsList)
{
if (host.StartsWith("#"))
{
continue;
}
var hostItem = host.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
if (hostItem.Length < 2)
{
continue;
}
systemHosts.Add(hostItem[1], hostItem[0]);
}
}

24
v2rayN/ServiceLib/Handler/ConfigHandler.cs
View file

@ -1651,7 +1651,9 @@ public static class ConfigHandler
var uri = Utils.TryUri(url);
if (uri == null)
{
return -1;
}
//Do not allow http protocol
if (url.StartsWith(Global.HttpProtocol) && !Utils.IsPrivateNetwork(uri.IdnHost))
{
@ -2018,11 +2020,15 @@ public static class ConfigHandler
var downloadHandle = new DownloadService();
var templateContent = await downloadHandle.TryDownloadString(config.ConstItem.RouteRulesTemplateSourceUrl, true, "");
if (templateContent.IsNullOrEmpty())
{
return await InitBuiltinRouting(config, blImportAdvancedRules); // fallback
}
var template = JsonUtils.Deserialize<RoutingTemplate>(templateContent);
if (template == null)
{
return await InitBuiltinRouting(config, blImportAdvancedRules); // fallback
}
var items = await AppManager.Instance.RoutingItems();
var maxSort = items.Count;
@ -2035,14 +2041,18 @@ public static class ConfigHandler
var item = template.RoutingItems[i];
if (item.Url.IsNullOrEmpty() && item.RuleSet.IsNullOrEmpty())
{
continue;
}
var ruleSetsString = !item.RuleSet.IsNullOrEmpty()
? item.RuleSet
: await downloadHandle.TryDownloadString(item.Url, true, "");
if (ruleSetsString.IsNullOrEmpty())
{
continue;
}
item.Remarks = $"{template.Version}-{item.Remarks}";
item.Enabled = true;
@ -2238,17 +2248,25 @@ public static class ConfigHandler
var downloadHandle = new DownloadService();
var templateContent = await downloadHandle.TryDownloadString(url, true, "");
if (templateContent.IsNullOrEmpty())
{
return currentItem;
}
var template = JsonUtils.Deserialize<DNSItem>(templateContent);
if (template == null)
{
return currentItem;
}
if (!template.NormalDNS.IsNullOrEmpty())
{
template.NormalDNS = await downloadHandle.TryDownloadString(template.NormalDNS, true, "");
}
if (!template.TunDNS.IsNullOrEmpty())
{
template.TunDNS = await downloadHandle.TryDownloadString(template.TunDNS, true, "");
}
template.Id = currentItem.Id;
template.Enabled = currentItem.Enabled;
@ -2282,10 +2300,16 @@ public static class ConfigHandler
var downloadHandle = new DownloadService();
var templateContent = await downloadHandle.TryDownloadString(url, true, "");
if (templateContent.IsNullOrEmpty())
{
return null;
}
var template = JsonUtils.Deserialize<SimpleDNSItem>(templateContent);
if (template == null)
{
return null;
}
return template;
}

5
v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs
View file

@ -12,7 +12,9 @@ public class Hysteria2Fmt : BaseFmt
var url = Utils.TryUri(str);
if (url == null)
{
return null;
}
item.Address = url.IdnHost;
item.Port = url.Port;
@ -32,7 +34,10 @@ public class Hysteria2Fmt : BaseFmt
public static string? ToUri(ProfileItem? item)
{
if (item == null)
{
return null;
}
var url = string.Empty;
var remark = string.Empty;

15
v2rayN/ServiceLib/Manager/ActionPrecheckManager.cs
View file

@ -81,21 +81,36 @@ public class ActionPrecheckManager(Config config)
{
case EConfigType.VMess:
if (item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
{
errors.Add(string.Format(ResUI.InvalidProperty, "Id"));
}
break;
case EConfigType.VLESS:
if (item.Id.IsNullOrEmpty() || (!Utils.IsGuidByParse(item.Id) && item.Id.Length > 30))
{
errors.Add(string.Format(ResUI.InvalidProperty, "Id"));
}
if (!Global.Flows.Contains(item.Flow))
{
errors.Add(string.Format(ResUI.InvalidProperty, "Flow"));
}
break;
case EConfigType.Shadowsocks:
if (item.Id.IsNullOrEmpty())
{
errors.Add(string.Format(ResUI.InvalidProperty, "Id"));
}
if (string.IsNullOrEmpty(item.Security) || !Global.SsSecuritiesInSingbox.Contains(item.Security))
{
errors.Add(string.Format(ResUI.InvalidProperty, "Security"));
}
break;
}

8
v2rayN/ServiceLib/Manager/ProfileGroupItemManager.cs
View file

@ -173,13 +173,19 @@ public class ProfileGroupItemManager
public static bool HasCycle(string? indexId, HashSet<string> visited, HashSet<string> stack)
{
if (indexId.IsNullOrEmpty())
{
return false;
}
if (stack.Contains(indexId))
{
return true;
}
if (visited.Contains(indexId))
{
return false;
}
visited.Add(indexId);
stack.Add(indexId);
@ -289,7 +295,9 @@ public class ProfileGroupItemManager
{
var childNode = await AppManager.Instance.GetProfileItem(childId);
if (childNode == null)
{
continue;
}
if (!childNode.IsComplex())
{

19
v2rayN/ServiceLib/Models/ProfileItem.cs
View file

@ -69,30 +69,49 @@ public class ProfileItem : ReactiveObject
public bool IsValid()
{
if (IsComplex())
{
return true;
}
if (Address.IsNullOrEmpty() || Port is <= 0 or >= 65536)
{
return false;
}
switch (ConfigType)
{
case EConfigType.VMess:
if (Id.IsNullOrEmpty() || !Utils.IsGuidByParse(Id))
{
return false;
}
break;
case EConfigType.VLESS:
if (Id.IsNullOrEmpty() || (!Utils.IsGuidByParse(Id) && Id.Length > 30))
{
return false;
}
if (!Global.Flows.Contains(Flow))
{
return false;
}
break;
case EConfigType.Shadowsocks:
if (Id.IsNullOrEmpty())
{
return false;
}
if (string.IsNullOrEmpty(Security) || !Global.SsSecuritiesInSingbox.Contains(Security))
{
return false;
}
break;
}

2
v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
View file

@ -202,7 +202,9 @@ public partial class CoreConfigSingboxService
var routing = await ConfigHandler.GetDefaultRouting(_config);
if (routing == null)
{
return 0;
}
var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet) ?? [];
var expectedIPCidr = new List<string>();

3
v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs
View file

@ -679,7 +679,10 @@ public partial class CoreConfigSingboxService
{
var node = nodes[i];
if (node == null)
{
continue;
}
if (node.ConfigType.IsGroupType())
{
var (childProfiles, profileGroupItem) = await ProfileGroupItemManager.GetChildProfileItems(node.IndexId);

4
v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs
View file

@ -250,8 +250,10 @@ public partial class CoreConfigSingboxService
foreach (var it in item.Domain)
{
if (ParseV2Domain(it, rule1))
{
countDomain++;
}
}
if (countDomain > 0)
{
rules.Add(rule1);
@ -265,8 +267,10 @@ public partial class CoreConfigSingboxService
foreach (var it in item.Ip)
{
if (ParseV2Address(it, rule2))
{
countIp++;
}
}
if (countIp > 0)
{
rules.Add(rule2);

2
v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRulesetService.cs
View file

@ -7,8 +7,10 @@ public partial class CoreConfigSingboxService
static void AddRuleSets(List<string> ruleSets, List<string>? rule_set)
{
if (rule_set != null)
{
ruleSets.AddRange(rule_set);
}
}
var geosite = "geosite";
var geoip = "geoip";
var ruleSets = new List<string>();

2
v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs
View file

@ -137,7 +137,9 @@ public partial class CoreConfigV2rayService(Config config)
foreach (var rule in rules)
{
if (rule.outboundTag == null)
{
continue;
}
if (balancerTagSet.Contains(rule.outboundTag))
{

2
v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayBalancerService.cs
View file

@ -11,7 +11,9 @@ public partial class CoreConfigV2rayService
// Case 1: exact match already exists -> nothing to do
if (subjectSelectors.Any(baseTagName.StartsWith))
{
return await Task.FromResult(0);
}
// Case 2: prefix match exists -> reuse it and move to the first position
var matched = subjectSelectors.FirstOrDefault(s => s.StartsWith(baseTagName));

6
v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs
View file

@ -189,7 +189,10 @@ public partial class CoreConfigV2rayService
foreach (var domain in item.Domain)
{
if (domain.StartsWith('#'))
{
continue;
}
var normalizedDomain = domain.Replace(Global.RoutingRuleComma, ",");
if (item.OutboundTag == Global.DirectTag)
@ -368,7 +371,10 @@ public partial class CoreConfigV2rayService
foreach (var host in systemHosts)
{
if (normalHost1[host.Key] != null)
{
continue;
}
normalHost1[host.Key] = host.Value;
}
}

3
v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs
View file

@ -803,7 +803,10 @@ public partial class CoreConfigV2rayService
{
var node = nodes[i];
if (node == null)
{
continue;
}
if (node.ConfigType.IsGroupType())
{
var (childProfiles, _) = await ProfileGroupItemManager.GetChildProfileItems(node.IndexId);

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

@ -21,7 +21,7 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
{
if (_lstExitLoop.Count > 0)
{
UpdateFunc("", ResUI.SpeedtestingStop);
_ = UpdateFunc("", ResUI.SpeedtestingStop);
_lstExitLoop.Clear();
}

3
v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
View file

@ -209,6 +209,7 @@ public class CheckUpdateViewModel : MyReactiveObject
_ = UpdateFinishedResult(blReload);
return Disposable.Empty;
});
await Task.CompletedTask;
}
public async Task UpdateFinishedResult(bool blReload)
@ -321,6 +322,7 @@ public class CheckUpdateViewModel : MyReactiveObject
_ = UpdateViewResult(model);
return Disposable.Empty;
});
await Task.CompletedTask;
}
public async Task UpdateViewResult(CheckUpdateModel model)
@ -331,5 +333,6 @@ public class CheckUpdateViewModel : MyReactiveObject
return;
}
found.Remarks = model.Remarks;
await Task.CompletedTask;
}
}

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

@ -96,6 +96,7 @@ public class ClashConnectionsViewModel : MyReactiveObject
}
ConnectionItems.AddRange(lstModel);
await Task.CompletedTask;
}
public async Task ClashConnectionClose(bool all)

3
v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
View file

@ -245,6 +245,7 @@ public class ClashProxiesViewModel : MyReactiveObject
{
SelectedGroup = new();
}
await Task.CompletedTask;
}
private void RefreshProxyDetails(bool c)
@ -391,6 +392,7 @@ public class ClashProxiesViewModel : MyReactiveObject
_ = ProxiesDelayTestResult(model);
return Disposable.Empty;
});
await Task.CompletedTask;
});
await Task.CompletedTask;
}
@ -419,6 +421,7 @@ public class ClashProxiesViewModel : MyReactiveObject
detail.Delay = _delayTimeout;
detail.DelayName = string.Empty;
}
await Task.CompletedTask;
}
#endregion proxy function

4
v2rayN/ServiceLib/ViewModels/FullConfigTemplateViewModel.cs
View file

@ -66,10 +66,14 @@ public class FullConfigTemplateViewModel : MyReactiveObject
private async Task SaveSettingAsync()
{
if (!await SaveXrayConfigAsync())
{
return;
}
if (!await SaveSingboxConfigAsync())
{
return;
}
NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
_ = _updateView?.Invoke(EViewAction.CloseWindow, null);

30
v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
View file

@ -78,55 +78,55 @@ public class MainWindowViewModel : MyReactiveObject
//servers
AddVmessServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
await AddServerAsync(true, EConfigType.VMess);
await AddServerAsync(EConfigType.VMess);
});
AddVlessServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
await AddServerAsync(true, EConfigType.VLESS);
await AddServerAsync(EConfigType.VLESS);
});
AddShadowsocksServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
await AddServerAsync(true, EConfigType.Shadowsocks);
await AddServerAsync(EConfigType.Shadowsocks);
});
AddSocksServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
await AddServerAsync(true, EConfigType.SOCKS);
await AddServerAsync(EConfigType.SOCKS);
});
AddHttpServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
await AddServerAsync(true, EConfigType.HTTP);
await AddServerAsync(EConfigType.HTTP);
});
AddTrojanServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
await AddServerAsync(true, EConfigType.Trojan);
await AddServerAsync(EConfigType.Trojan);
});
AddHysteria2ServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
await AddServerAsync(true, EConfigType.Hysteria2);
await AddServerAsync(EConfigType.Hysteria2);
});
AddTuicServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
await AddServerAsync(true, EConfigType.TUIC);
await AddServerAsync(EConfigType.TUIC);
});
AddWireguardServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
await AddServerAsync(true, EConfigType.WireGuard);
await AddServerAsync(EConfigType.WireGuard);
});
AddAnytlsServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
await AddServerAsync(true, EConfigType.Anytls);
await AddServerAsync(EConfigType.Anytls);
});
AddCustomServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
await AddServerAsync(true, EConfigType.Custom);
await AddServerAsync(EConfigType.Custom);
});
AddPolicyGroupServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
await AddServerAsync(true, EConfigType.PolicyGroup);
await AddServerAsync(EConfigType.PolicyGroup);
});
AddProxyChainServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
await AddServerAsync(true, EConfigType.ProxyChain);
await AddServerAsync(EConfigType.ProxyChain);
});
AddServerViaClipboardCmd = ReactiveCommand.CreateFromTask(async () =>
{
@ -283,6 +283,7 @@ public class MainWindowViewModel : MyReactiveObject
{
NoticeManager.Instance.Enqueue(msg);
}
await Task.CompletedTask;
}
private async Task UpdateTaskHandler(bool success, string msg)
@ -310,6 +311,7 @@ public class MainWindowViewModel : MyReactiveObject
return;
}
AppEvents.DispatcherStatisticsRequested.Publish(update);
await Task.CompletedTask;
}
#endregion Actions
@ -332,7 +334,7 @@ public class MainWindowViewModel : MyReactiveObject
#region Add Servers
public async Task AddServerAsync(bool blNew, EConfigType eConfigType)
public async Task AddServerAsync(EConfigType eConfigType)
{
ProfileItem item = new()
{

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

@ -110,7 +110,7 @@ public class ProfilesViewModel : MyReactiveObject
//servers delete
EditServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
await EditServerAsync(EConfigType.Custom);
await EditServerAsync();
}, canEditRemove);
RemoveServerCmd = ReactiveCommand.CreateFromTask(async () =>
{
@ -300,14 +300,14 @@ public class ProfilesViewModel : MyReactiveObject
if (result.Delay.IsNotEmpty())
{
int.TryParse(result.Delay, out var temp);
item.Delay = temp;
item.Delay = result.Delay.ToInt();
item.DelayVal = result.Delay ?? string.Empty;
}
if (result.Speed.IsNotEmpty())
{
item.SpeedVal = result.Speed ?? string.Empty;
}
await Task.CompletedTask;
}
public async Task UpdateStatistics(ServerSpeedItem update)
@ -333,6 +333,7 @@ public class ProfilesViewModel : MyReactiveObject
catch
{
}
await Task.CompletedTask;
}
#endregion Actions
@ -487,7 +488,7 @@ public class ProfilesViewModel : MyReactiveObject
return lstSelected;
}
public async Task EditServerAsync(EConfigType eConfigType)
public async Task EditServerAsync()
{
if (string.IsNullOrEmpty(SelectedProfile?.IndexId))
{
@ -499,7 +500,7 @@ public class ProfilesViewModel : MyReactiveObject
NoticeManager.Instance.Enqueue(ResUI.PleaseSelectServer);
return;
}
eConfigType = item.ConfigType;
var eConfigType = item.ConfigType;
bool? ret = false;
if (eConfigType == EConfigType.Custom)
@ -753,6 +754,7 @@ public class ProfilesViewModel : MyReactiveObject
_ = SetSpeedTestResult(result);
return Disposable.Empty;
});
await Task.CompletedTask;
});
_speedtestService?.RunLoop(actionType, lstSelected);
}

7
v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
View file

@ -120,7 +120,7 @@ public class StatusBarViewModel : MyReactiveObject
this.WhenAnyValue(
x => x.SelectedServer,
y => y != null && !y.Text.IsNullOrEmpty())
.Subscribe(c => ServerSelectedChanged(c));
.Subscribe(ServerSelectedChanged);
SystemProxySelected = (int)_config.SystemProxyItem.SysProxyType;
this.WhenAnyValue(
@ -367,11 +367,13 @@ public class StatusBarViewModel : MyReactiveObject
_ = TestServerAvailabilityResult(msg);
return Disposable.Empty;
});
await Task.CompletedTask;
}
public async Task TestServerAvailabilityResult(string msg)
{
RunningInfoDisplay = msg;
await Task.CompletedTask;
}
#region System proxy and Routings
@ -384,7 +386,7 @@ public class StatusBarViewModel : MyReactiveObject
}
_config.SystemProxyItem.SysProxyType = type;
await ChangeSystemProxyAsync(type, true);
NoticeManager.Instance.SendMessageEx($"{ResUI.TipChangeSystemProxy} - {_config.SystemProxyItem.SysProxyType.ToString()}");
NoticeManager.Instance.SendMessageEx($"{ResUI.TipChangeSystemProxy} - {_config.SystemProxyItem.SysProxyType}");
SystemProxySelected = (int)_config.SystemProxyItem.SysProxyType;
await ConfigHandler.SaveConfig(_config);
@ -561,6 +563,7 @@ public class StatusBarViewModel : MyReactiveObject
catch
{
}
await Task.CompletedTask;
}
#endregion UI

3
v2rayN/v2rayN.Desktop/Common/AvaUtils.cs
View file

@ -28,7 +28,10 @@ internal class AvaUtils
{
var clipboard = TopLevel.GetTopLevel(visual)?.Clipboard;
if (clipboard == null)
{
return;
}
await clipboard.SetTextAsync(strData);
}
catch

2
v2rayN/v2rayN.Desktop/Converters/DelayColorConverter.cs
View file

@ -6,7 +6,7 @@ public class DelayColorConverter : IValueConverter
{
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
{
_ = int.TryParse(value?.ToString(), out var delay);
var delay = value.ToString().ToInt();
return delay switch
{

2
v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
View file

@ -95,7 +95,9 @@ public class ThemeSettingViewModel : MyReactiveObject
{
double size = CurrentFontSize;
if (size < Global.MinFontSize)
{
return;
}
Style style = new(x => Selectors.Or(
x.OfType<Button>(),

2
v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml.cs
View file

@ -95,7 +95,9 @@ public partial class AddGroupServerWindow : WindowBase<AddGroupServerViewModel>
private void AddGroupServerWindow_KeyDown(object? sender, KeyEventArgs e)
{
if (!lstChild.IsKeyboardFocusWithin)
{
return;
}
if ((e.KeyModifiers & (KeyModifiers.Control | KeyModifiers.Meta)) != 0)
{

22
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
View file

@ -22,8 +22,8 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
_manager = new WindowNotificationManager(TopLevel.GetTopLevel(this)) { MaxItems = 3, Position = NotificationPosition.TopRight };
KeyDown += MainWindow_KeyDown;
menuSettingsSetUWP.Click += menuSettingsSetUWP_Click;
menuPromotion.Click += menuPromotion_Click;
menuSettingsSetUWP.Click += MenuSettingsSetUWP_Click;
menuPromotion.Click += MenuPromotion_Click;
menuCheckUpdate.Click += MenuCheckUpdate_Click;
menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
menuClose.Click += MenuClose_Click;
@ -188,6 +188,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
private async Task DelegateSnackMsg(string content)
{
_manager?.Show(new Notification(null, content, NotificationType.Information));
await Task.CompletedTask;
}
private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@ -196,17 +197,26 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
{
case EViewAction.AddServerWindow:
if (obj is null)
{
return false;
}
return await new AddServerWindow((ProfileItem)obj).ShowDialog<bool>(this);
case EViewAction.AddServer2Window:
if (obj is null)
{
return false;
}
return await new AddServer2Window((ProfileItem)obj).ShowDialog<bool>(this);
case EViewAction.AddGroupServerWindow:
if (obj is null)
{
return false;
}
return await new AddGroupServerWindow((ProfileItem)obj).ShowDialog<bool>(this);
case EViewAction.DNSSettingWindow:
@ -308,12 +318,12 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
}
}
private void menuPromotion_Click(object? sender, RoutedEventArgs e)
private void MenuPromotion_Click(object? sender, RoutedEventArgs e)
{
ProcUtils.ProcessStart($"{Utils.Base64Decode(Global.PromotionUrl)}?t={DateTime.Now.Ticks}");
}
private void menuSettingsSetUWP_Click(object? sender, RoutedEventArgs e)
private void MenuSettingsSetUWP_Click(object? sender, RoutedEventArgs e)
{
ProcUtils.ProcessStart(Utils.GetBinPath("EnableLoopback.exe"));
}
@ -478,8 +488,8 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
{
var coreInfo = CoreInfoManager.Instance.GetCoreInfo();
foreach (var it in coreInfo
.Where(t => t.CoreType != ECoreType.v2fly
&& t.CoreType != ECoreType.hysteria))
.Where(t => t.CoreType is not ECoreType.v2fly
and not ECoreType.hysteria))
{
var item = new MenuItem()
{

2
v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs
View file

@ -30,7 +30,9 @@ public partial class MsgView : ReactiveUserControl<MsgViewModel>
{
case EViewAction.DispatcherShowMsg:
if (obj is null)
{
return false;
}
Dispatcher.UIThread.Post(() => ShowMsg(obj),
DispatcherPriority.ApplicationIdle);

28
v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
View file

@ -124,7 +124,10 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
{
case EViewAction.SetClipboardData:
if (obj is null)
{
return false;
}
await AvaUtils.SetClipboardData(this, (string)obj);
break;
@ -141,7 +144,10 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
case EViewAction.SaveFileDialog:
if (obj is null)
{
return false;
}
var fileName = await UI.SaveFileDialog(_window, "");
if (fileName.IsNullOrEmpty())
{
@ -152,28 +158,43 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
case EViewAction.AddServerWindow:
if (obj is null)
{
return false;
}
return await new AddServerWindow((ProfileItem)obj).ShowDialog<bool>(_window);
case EViewAction.AddServer2Window:
if (obj is null)
{
return false;
}
return await new AddServer2Window((ProfileItem)obj).ShowDialog<bool>(_window);
case EViewAction.AddGroupServerWindow:
if (obj is null)
{
return false;
}
return await new AddGroupServerWindow((ProfileItem)obj).ShowDialog<bool>(_window);
case EViewAction.ShareServer:
if (obj is null)
{
return false;
}
await ShareServer((string)obj);
break;
case EViewAction.SubEditWindow:
if (obj is null)
{
return false;
}
return await new SubEditWindow((SubItem)obj).ShowDialog<bool>(_window);
case EViewAction.DispatcherRefreshServersBiz:
@ -215,14 +236,17 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
{
var source = e.Source as Border;
if (source?.Name == "HeaderBackground")
{
return;
}
if (_config.UiItem.DoubleClick2Activate)
{
ViewModel?.SetDefaultServer();
}
else
{
ViewModel?.EditServerAsync(EConfigType.Custom);
ViewModel?.EditServerAsync();
}
}
@ -263,7 +287,7 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
break;
case Key.D:
ViewModel?.EditServerAsync(EConfigType.Custom);
ViewModel?.EditServerAsync();
break;
case Key.F:

3
v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml.cs
View file

@ -83,7 +83,10 @@ public partial class RoutingRuleSettingWindow : WindowBase<RoutingRuleSettingVie
case EViewAction.RoutingRuleDetailsWindow:
if (obj is null)
{
return false;
}
return await new RoutingRuleDetailsWindow((RulesItem)obj).ShowDialog<bool>(this);
case EViewAction.ImportRulesFromFile:

3
v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
View file

@ -60,7 +60,10 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
case EViewAction.RoutingRuleSettingWindow:
if (obj is null)
{
return false;
}
return await new RoutingRuleSettingWindow((RoutingItem)obj).ShowDialog<bool>(this);
}
return await Task.FromResult(true);

3
v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
View file

@ -56,7 +56,10 @@ public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
case EViewAction.SetClipboardData:
if (obj is null)
{
return false;
}
await AvaUtils.SetClipboardData(this, (string)obj);
break;

6
v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs
View file

@ -49,14 +49,20 @@ public partial class SubSettingWindow : WindowBase<SubSettingViewModel>
case EViewAction.SubEditWindow:
if (obj is null)
{
return false;
}
var window = new SubEditWindow((SubItem)obj);
await window.ShowDialog(this);
break;
case EViewAction.ShareSub:
if (obj is null)
{
return false;
}
await ShareSub((string)obj);
break;
}

2
v2rayN/v2rayN/Common/WindowsUtils.cs
View file

@ -76,7 +76,7 @@ internal static class WindowsUtils
{
using var key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
var obj = key?.GetValue("AppsUseLightTheme");
int.TryParse(obj?.ToString(), out var value);
var value = obj?.ToString().ToInt();
return value == 0;
}

14
v2rayN/v2rayN/Converters/DelayColorConverter.cs
View file

@ -6,14 +6,14 @@ public class DelayColorConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
int.TryParse(value.ToString(), out var delay);
var delay = value.ToString().ToInt();
if (delay <= 0)
return new SolidColorBrush(Colors.Red);
if (delay <= 500)
return new SolidColorBrush(Colors.Green);
else
return new SolidColorBrush(Colors.IndianRed);
return delay switch
{
<= 0 => new SolidColorBrush(Colors.Red),
<= 500 => new SolidColorBrush(Colors.Green),
_ => new SolidColorBrush(Colors.IndianRed)
};
}
public object? ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)

2
v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs
View file

@ -138,7 +138,9 @@ public class ThemeSettingViewModel : MyReactiveObject
{
double size = (long)CurrentFontSize;
if (size < Global.MinFontSize)
{
return;
}
Application.Current.Resources["StdFontSize"] = size;
Application.Current.Resources["StdFontSize1"] = size + 1;

3
v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs
View file

@ -78,7 +78,10 @@ public partial class AddGroupServerWindow
private void AddGroupServerWindow_PreviewKeyDown(object sender, KeyEventArgs e)
{
if (!lstChild.IsKeyboardFocusWithin)
{
return;
}
if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
{
if (e.Key == Key.A)

26
v2rayN/v2rayN/Views/MainWindow.xaml.cs
View file

@ -21,9 +21,9 @@ public partial class MainWindow
App.Current.SessionEnding += Current_SessionEnding;
Closing += MainWindow_Closing;
PreviewKeyDown += MainWindow_PreviewKeyDown;
menuSettingsSetUWP.Click += menuSettingsSetUWP_Click;
menuPromotion.Click += menuPromotion_Click;
menuClose.Click += menuClose_Click;
menuSettingsSetUWP.Click += MenuSettingsSetUWP_Click;
menuPromotion.Click += MenuPromotion_Click;
menuClose.Click += MenuClose_Click;
menuCheckUpdate.Click += MenuCheckUpdate_Click;
menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
@ -178,6 +178,7 @@ public partial class MainWindow
private async Task DelegateSnackMsg(string content)
{
MainSnackbar.MessageQueue?.Enqueue(content);
await Task.CompletedTask;
}
private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@ -186,17 +187,26 @@ public partial class MainWindow
{
case EViewAction.AddServerWindow:
if (obj is null)
{
return false;
}
return new AddServerWindow((ProfileItem)obj).ShowDialog() ?? false;
case EViewAction.AddServer2Window:
if (obj is null)
{
return false;
}
return new AddServer2Window((ProfileItem)obj).ShowDialog() ?? false;
case EViewAction.AddGroupServerWindow:
if (obj is null)
{
return false;
}
return new AddGroupServerWindow((ProfileItem)obj).ShowDialog() ?? false;
case EViewAction.DNSSettingWindow:
@ -297,18 +307,18 @@ public partial class MainWindow
}
}
private void menuClose_Click(object sender, RoutedEventArgs e)
private void MenuClose_Click(object sender, RoutedEventArgs e)
{
StorageUI();
ShowHideWindow(false);
}
private void menuPromotion_Click(object sender, RoutedEventArgs e)
private void MenuPromotion_Click(object sender, RoutedEventArgs e)
{
ProcUtils.ProcessStart($"{Utils.Base64Decode(Global.PromotionUrl)}?t={DateTime.Now.Ticks}");
}
private void menuSettingsSetUWP_Click(object sender, RoutedEventArgs e)
private void MenuSettingsSetUWP_Click(object sender, RoutedEventArgs e)
{
ProcUtils.ProcessStart(Utils.GetBinPath("EnableLoopback.exe"));
}
@ -429,8 +439,8 @@ public partial class MainWindow
{
var coreInfo = CoreInfoManager.Instance.GetCoreInfo();
foreach (var it in coreInfo
.Where(t => t.CoreType != ECoreType.v2fly
&& t.CoreType != ECoreType.hysteria))
.Where(t => t.CoreType is not ECoreType.v2fly
and not ECoreType.hysteria))
{
var item = new MenuItem()
{

3
v2rayN/v2rayN/Views/MsgView.xaml.cs
View file

@ -30,7 +30,10 @@ public partial class MsgView
{
case EViewAction.DispatcherShowMsg:
if (obj is null)
{
return false;
}
Application.Current?.Dispatcher.Invoke(() =>
{
ShowMsg(obj);

37
v2rayN/v2rayN/Views/ProfilesView.xaml.cs
View file

@ -109,7 +109,10 @@ public partial class ProfilesView
{
case EViewAction.SetClipboardData:
if (obj is null)
{
return false;
}
WindowsUtils.SetClipboardData((string)obj);
break;
@ -126,7 +129,10 @@ public partial class ProfilesView
case EViewAction.SaveFileDialog:
if (obj is null)
{
return false;
}
if (UI.SaveFileDialog(out var fileName, "Config|*.json") != true)
{
return false;
@ -136,28 +142,43 @@ public partial class ProfilesView
case EViewAction.AddServerWindow:
if (obj is null)
{
return false;
}
return new AddServerWindow((ProfileItem)obj).ShowDialog() ?? false;
case EViewAction.AddServer2Window:
if (obj is null)
{
return false;
}
return new AddServer2Window((ProfileItem)obj).ShowDialog() ?? false;
case EViewAction.AddGroupServerWindow:
if (obj is null)
{
return false;
}
return new AddGroupServerWindow((ProfileItem)obj).ShowDialog() ?? false;
case EViewAction.ShareServer:
if (obj is null)
{
return false;
}
ShareServer((string)obj);
break;
case EViewAction.SubEditWindow:
if (obj is null)
{
return false;
}
return new SubEditWindow((SubItem)obj).ShowDialog() ?? false;
case EViewAction.DispatcherRefreshServersBiz:
@ -209,7 +230,7 @@ public partial class ProfilesView
}
else
{
ViewModel?.EditServerAsync(EConfigType.Custom);
ViewModel?.EditServerAsync();
}
}
@ -245,7 +266,7 @@ public partial class ProfilesView
break;
case Key.D:
ViewModel?.EditServerAsync(EConfigType.Custom);
ViewModel?.EditServerAsync();
break;
case Key.F:
@ -424,14 +445,21 @@ public partial class ProfilesView
{
// Get the dragged Item
if (sender is not DataGrid listView)
{
return;
}
var listViewItem = FindAncestor<DataGridRow>((DependencyObject)e.OriginalSource);
if (listViewItem == null)
{
return; // Abort
}
// Find the data behind the ListViewItem
var item = (ProfileItemModel)listView.ItemContainerGenerator.ItemFromContainer(listViewItem);
if (item == null)
{
return; // Abort
}
// Initialize the drag & drop operation
startIndex = lstProfiles.SelectedIndex;
DataObject dragData = new(formatData, item);
@ -453,7 +481,10 @@ public partial class ProfilesView
{
// Get the drop Item destination
if (sender is not DataGrid listView)
{
return;
}
var listViewItem = FindAncestor<DataGridRow>((DependencyObject)e.OriginalSource);
if (listViewItem == null)
{
@ -464,7 +495,9 @@ public partial class ProfilesView
// Find the data behind the Item
var item = (ProfileItemModel)listView.ItemContainerGenerator.ItemFromContainer(listViewItem);
if (item == null)
{
return;
}
// Move item into observable collection
// (this will be automatically reflected to lstView.ItemsSource)
e.Effects = DragDropEffects.Move;

9
v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
View file

@ -79,7 +79,10 @@ public partial class RoutingRuleSettingWindow
case EViewAction.RoutingRuleDetailsWindow:
if (obj is null)
{
return false;
}
return new RoutingRuleDetailsWindow((RulesItem)obj).ShowDialog() ?? false;
case EViewAction.ImportRulesFromFile:
@ -93,7 +96,10 @@ public partial class RoutingRuleSettingWindow
case EViewAction.SetClipboardData:
if (obj is null)
{
return false;
}
WindowsUtils.SetClipboardData((string)obj);
break;
@ -117,7 +123,10 @@ public partial class RoutingRuleSettingWindow
private void RoutingRuleSettingWindow_PreviewKeyDown(object sender, KeyEventArgs e)
{
if (!lstRules.IsKeyboardFocusWithin)
{
return;
}
if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
{
if (e.Key == Key.A)

3
v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
View file

@ -57,7 +57,10 @@ public partial class RoutingSettingWindow
case EViewAction.RoutingRuleSettingWindow:
if (obj is null)
{
return false;
}
return new RoutingRuleSettingWindow((RoutingItem)obj).ShowDialog() ?? false;
}
return await Task.FromResult(true);

3
v2rayN/v2rayN/Views/StatusBarView.xaml.cs
View file

@ -80,7 +80,10 @@ public partial class StatusBarView
case EViewAction.SetClipboardData:
if (obj is null)
{
return false;
}
WindowsUtils.SetClipboardData((string)obj);
break;
}

6
v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
View file

@ -46,12 +46,18 @@ public partial class SubSettingWindow
case EViewAction.SubEditWindow:
if (obj is null)
{
return false;
}
return new SubEditWindow((SubItem)obj).ShowDialog() ?? false;
case EViewAction.ShareSub:
if (obj is null)
{
return false;
}
ShareSub((string)obj);
break;
}