Merge 4301415b4c into e96a4818c4

v2rayN/Directory.Packages.props

@@ -20,7 +20,7 @@
     <PackageVersion Include="ReactiveUI.WPF" Version="20.4.1" />
     <PackageVersion Include="Semi.Avalonia" Version="11.2.1.10" />
     <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.10" />
-    <PackageVersion Include="NLog" Version="6.0.4" />
+    <PackageVersion Include="Splat.NLog" Version="17.0.1" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageVersion Include="TaskScheduler" Version="2.12.2" />
     <PackageVersion Include="WebDav.Client" Version="2.9.0" />

v2rayN/ServiceLib/Enums/EViewAction.cs

@@ -12,6 +12,7 @@ public enum EViewAction
     ProfilesFocus,
     ShareSub,
     ShareServer,
+    ShowHideWindow,
     ScanScreenTask,
     ScanImageTask,
     BrowseServer,

v2rayN/ServiceLib/Handler/AppEvents.cs

@@ -5,12 +5,6 @@ namespace ServiceLib.Handler;
 
 public static class AppEvents
 {
-    public static readonly Subject<Unit> ReloadRequested = new();
-    public static readonly Subject<bool?> ShowHideWindowRequested = new();
-    public static readonly Subject<Unit> AddServerViaScanRequested = new();
-    public static readonly Subject<Unit> AddServerViaClipboardRequested = new();
-    public static readonly Subject<bool> SubscriptionsUpdateRequested = new();
-
     public static readonly Subject<Unit> ProfilesRefreshRequested = new();
     public static readonly Subject<Unit> SubscriptionsRefreshRequested = new();
     public static readonly Subject<Unit> ProxiesReloadRequested = new();

v2rayN/ServiceLib/Manager/AppManager.cs

@@ -122,12 +122,6 @@ public sealed class AppManager
         AppEvents.ShutdownRequested.OnNext(byUser);
     }
 
-    public async Task RebootAsAdmin()
-    {
-        ProcUtils.RebootAsAdmin();
-        await AppManager.Instance.AppExitAsync(true);
-    }
-
     #endregion App
 
     #region Config

v2rayN/ServiceLib/ServiceLib.csproj

@@ -11,7 +11,7 @@
 		</PackageReference>
 		<PackageReference Include="ReactiveUI.Fody" />
 		<PackageReference Include="sqlite-net-pcl" />
-		<PackageReference Include="NLog" />
+		<PackageReference Include="Splat.NLog" />
 		<PackageReference Include="WebDav.Client" />
 		<PackageReference Include="YamlDotNet" />
 		<PackageReference Include="QRCoder" />

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -2,9 +2,11 @@ using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Runtime.InteropServices;
+using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using Splat;
 
 namespace ServiceLib.ViewModels;
 
@@ -223,11 +225,11 @@ public class CheckUpdateViewModel : MyReactiveObject
     {
         if (blReload)
         {
-            AppEvents.ReloadRequested.OnNext(Unit.Default);
+            Locator.Current.GetService<MainWindowViewModel>()?.Reload();
         }
         else
         {
-            await CoreManager.Instance.CoreStop();
+            Locator.Current.GetService<MainWindowViewModel>()?.CloseCore();
         }
     }
 

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -1,6 +1,5 @@
 using System.Reactive;
 using System.Reactive.Concurrency;
-using System.Reactive.Linq;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 
@@ -184,7 +183,7 @@ public class MainWindowViewModel : MyReactiveObject
         });
         RebootAsAdminCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            await AppManager.Instance.RebootAsAdmin();
+            await RebootAsAdmin();
         });
         ClearServerStatisticsCmd = ReactiveCommand.CreateFromTask(async () =>
         {
@@ -217,30 +216,6 @@ public class MainWindowViewModel : MyReactiveObject
 
         #endregion WhenAnyValue && ReactiveCommand
 
-        #region AppEvents
-
-        AppEvents.ReloadRequested
-            .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
-            .Subscribe(async _ => await Reload());
-
-        AppEvents.AddServerViaScanRequested
-            .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
-            .Subscribe(async _ => await AddServerViaScanAsync());
-
-        AppEvents.AddServerViaClipboardRequested
-            .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
-            .Subscribe(async _ => await AddServerViaClipboardAsync(null));
-
-        AppEvents.SubscriptionsUpdateRequested
-            .AsObservable()
-            .ObserveOn(RxApp.MainThreadScheduler)
-            .Subscribe(async blProxy => await UpdateSubscriptionProcess("", blProxy));
-
-        #endregion AppEvents
-
         _ = Init();
     }
 
@@ -306,6 +281,11 @@ public class MainWindowViewModel : MyReactiveObject
         AppEvents.DispatcherStatisticsRequested.OnNext(update);
     }
 
+    public void ShowHideWindow(bool? blShow)
+    {
+        _updateView?.Invoke(EViewAction.ShowHideWindow, blShow);
+    }
+
     #endregion Actions
 
     #region Servers && Groups
@@ -485,6 +465,12 @@ public class MainWindowViewModel : MyReactiveObject
         }
     }
 
+    public async Task RebootAsAdmin()
+    {
+        ProcUtils.RebootAsAdmin();
+        await AppManager.Instance.AppExitAsync(true);
+    }
+
     private async Task ClearServerStatistics()
     {
         await StatisticsManager.Instance.ClearAllServerStatistics();
@@ -561,11 +547,17 @@ public class MainWindowViewModel : MyReactiveObject
         await CoreManager.Instance.LoadCore(node);
     }
 
+    public async Task CloseCore()
+    {
+        await ConfigHandler.SaveConfig(_config);
+        await CoreManager.Instance.CoreStop();
+    }
+
     private async Task AutoHideStartup()
     {
         if (_config.UiItem.AutoHideStartup)
         {
-            AppEvents.ShowHideWindowRequested.OnNext(false);
+            ShowHideWindow(false);
         }
         await Task.CompletedTask;
     }

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -6,6 +6,7 @@ using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using Splat;
 
 namespace ServiceLib.ViewModels;
 
@@ -275,7 +276,7 @@ public class ProfilesViewModel : MyReactiveObject
 
     private void Reload()
     {
-        AppEvents.ReloadRequested.OnNext(Unit.Default);
+        Locator.Current.GetService<MainWindowViewModel>()?.Reload();
     }
 
     public async Task SetSpeedTestResult(SpeedTestResult result)

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -5,6 +5,7 @@ using System.Text;
 using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using Splat;
 
 namespace ServiceLib.ViewModels;
 
@@ -148,17 +149,17 @@ public class StatusBarViewModel : MyReactiveObject
 
         NotifyLeftClickCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            AppEvents.ShowHideWindowRequested.OnNext(null);
+            Locator.Current.GetService<MainWindowViewModel>()?.ShowHideWindow(null);
             await Task.CompletedTask;
         });
         ShowWindowCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            AppEvents.ShowHideWindowRequested.OnNext(true);
+            Locator.Current.GetService<MainWindowViewModel>()?.ShowHideWindow(true);
             await Task.CompletedTask;
         });
         HideWindowCmd = ReactiveCommand.CreateFromTask(async () =>
         {
-            AppEvents.ShowHideWindowRequested.OnNext(false);
+            Locator.Current.GetService<MainWindowViewModel>()?.ShowHideWindow(false);
             await Task.CompletedTask;
         });
 
@@ -274,20 +275,23 @@ public class StatusBarViewModel : MyReactiveObject
 
     private async Task AddServerViaClipboard()
     {
-        AppEvents.AddServerViaClipboardRequested.OnNext(Unit.Default);
+        var service = Locator.Current.GetService<MainWindowViewModel>();
-        await Task.Delay(1000);
+        if (service != null)
+            await service.AddServerViaClipboardAsync(null);
     }
 
     private async Task AddServerViaScan()
     {
-        AppEvents.AddServerViaScanRequested.OnNext(Unit.Default);
+        var service = Locator.Current.GetService<MainWindowViewModel>();
-        await Task.Delay(1000);
+        if (service != null)
+            await service.AddServerViaScanAsync();
     }
 
     private async Task UpdateSubscriptionProcess(bool blProxy)
     {
-        AppEvents.SubscriptionsUpdateRequested.OnNext(blProxy);
+        var service = Locator.Current.GetService<MainWindowViewModel>();
-        await Task.Delay(1000);
+        if (service != null)
+            await service.UpdateSubscriptionProcess("", blProxy);
     }
 
     private async Task RefreshServersBiz()
@@ -449,7 +453,7 @@ public class StatusBarViewModel : MyReactiveObject
         if (await ConfigHandler.SetDefaultRouting(_config, item) == 0)
         {
             NoticeManager.Instance.SendMessageEx(ResUI.TipChangeRouting);
-            AppEvents.ReloadRequested.OnNext(Unit.Default);
+            Locator.Current.GetService<MainWindowViewModel>()?.Reload();
             _updateView?.Invoke(EViewAction.DispatcherRefreshIcon, null);
         }
     }
@@ -482,7 +486,7 @@ public class StatusBarViewModel : MyReactiveObject
             if (Utils.IsWindows())
             {
                 _config.TunModeItem.EnableTun = false;
-                await AppManager.Instance.RebootAsAdmin();
+                Locator.Current.GetService<MainWindowViewModel>()?.RebootAsAdmin();
                 return;
             }
             else
@@ -496,7 +500,7 @@ public class StatusBarViewModel : MyReactiveObject
             }
         }
         await ConfigHandler.SaveConfig(_config);
-        AppEvents.ReloadRequested.OnNext(Unit.Default);
+        Locator.Current.GetService<MainWindowViewModel>()?.Reload();
     }
 
     private bool AllowEnableTun()

v2rayN/v2rayN.Desktop/App.axaml.cs

@@ -1,7 +1,8 @@
-using System.Reactive;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
+using Splat;
+using v2rayN.Desktop.Common;
 using v2rayN.Desktop.Views;
 
 namespace v2rayN.Desktop;
@@ -54,8 +55,16 @@ public partial class App : Application
         {
             if (desktop.MainWindow != null)
             {
-                AppEvents.AddServerViaClipboardRequested.OnNext(Unit.Default);
+                var clipboardData = await AvaUtils.GetClipboardData(desktop.MainWindow);
-                await Task.Delay(1000);
+                if (clipboardData.IsNullOrEmpty())
+                {
+                    return;
+                }
+                var service = Locator.Current.GetService<MainWindowViewModel>();
+                if (service != null)
+                {
+                    _ = service.AddServerViaClipboardAsync(clipboardData);
+                }
             }
         }
     }

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -10,6 +10,7 @@ using Avalonia.Threading;
 using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
+using Splat;
 using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
 using v2rayN.Desktop.Manager;
@@ -39,6 +40,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
         menuClose.Click += MenuClose_Click;
 
         ViewModel = new MainWindowViewModel(UpdateViewHandler);
+        Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));
 
         switch (_config.UiItem.MainGirdOrientation)
         {
@@ -151,12 +153,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
               .ObserveOn(RxApp.MainThreadScheduler)
               .Subscribe(content => Shutdown(content))
               .DisposeWith(disposables);
-
-            AppEvents.ShowHideWindowRequested
-             .AsObservable()
-             .ObserveOn(RxApp.MainThreadScheduler)
-             .Subscribe(blShow => ShowHideWindow(blShow))
-             .DisposeWith(disposables);
         });
 
         if (Utils.IsWindows())
@@ -225,6 +221,12 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
             case EViewAction.SubSettingWindow:
                 return await new SubSettingWindow().ShowDialog<bool>(this);
 
+            case EViewAction.ShowHideWindow:
+                Dispatcher.UIThread.Post(() =>
+                    ShowHideWindow((bool?)obj),
+                DispatcherPriority.Default);
+                break;
+
             case EViewAction.ScanScreenTask:
                 await ScanScreenTaskAsync();
                 break;
@@ -234,7 +236,11 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
                 break;
 
             case EViewAction.AddServerViaClipboard:
-                await AddServerViaClipboardAsync();
+                var clipboardData = await AvaUtils.GetClipboardData(this);
+                if (clipboardData.IsNotEmpty() && ViewModel != null)
+                {
+                    await ViewModel.AddServerViaClipboardAsync(clipboardData);
+                }
                 break;
         }
 
@@ -289,7 +295,11 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
             switch (e.Key)
             {
                 case Key.V:
-                    await AddServerViaClipboardAsync();
+                    var clipboardData = await AvaUtils.GetClipboardData(this);
+                    if (clipboardData.IsNotEmpty() && ViewModel != null)
+                    {
+                        await ViewModel.AddServerViaClipboardAsync(clipboardData);
+                    }
                     break;
 
                 case Key.S:
@@ -316,15 +326,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
         ProcUtils.ProcessStart(Utils.GetBinPath("EnableLoopback.exe"));
     }
 
-    public async Task AddServerViaClipboardAsync()
-    {
-        var clipboardData = await AvaUtils.GetClipboardData(this);
-        if (clipboardData.IsNotEmpty() && ViewModel != null)
-        {
-            await ViewModel.AddServerViaClipboardAsync(clipboardData);
-        }
-    }
-
     public async Task ScanScreenTaskAsync()
     {
         //ShowHideWindow(false);

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -6,8 +6,10 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
+using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
+using Splat;
 using v2rayN.Manager;
 
 namespace v2rayN.Views;
@@ -35,6 +37,7 @@ public partial class MainWindow
         menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
 
         ViewModel = new MainWindowViewModel(UpdateViewHandler);
+        Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));
 
         switch (_config.UiItem.MainGirdOrientation)
         {
@@ -143,16 +146,10 @@ public partial class MainWindow
               .DisposeWith(disposables);
 
             AppEvents.ShutdownRequested
-             .AsObservable()
+            .AsObservable()
-             .ObserveOn(RxApp.MainThreadScheduler)
+            .ObserveOn(RxApp.MainThreadScheduler)
-             .Subscribe(content => Shutdown(content))
+            .Subscribe(content => Shutdown(content))
-             .DisposeWith(disposables);
+            .DisposeWith(disposables);
-
-            AppEvents.ShowHideWindowRequested
-             .AsObservable()
-             .ObserveOn(RxApp.MainThreadScheduler)
-             .Subscribe(blShow => ShowHideWindow(blShow))
-             .DisposeWith(disposables);
         });
 
         this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
@@ -213,6 +210,13 @@ public partial class MainWindow
             case EViewAction.SubSettingWindow:
                 return (new SubSettingWindow().ShowDialog() ?? false);
 
+            case EViewAction.ShowHideWindow:
+                Application.Current?.Dispatcher.Invoke((() =>
+                {
+                    ShowHideWindow((bool?)obj);
+                }), DispatcherPriority.Normal);
+                break;
+
             case EViewAction.ScanScreenTask:
                 await ScanScreenTaskAsync();
                 break;
@@ -222,7 +226,11 @@ public partial class MainWindow
                 break;
 
             case EViewAction.AddServerViaClipboard:
-                await AddServerViaClipboardAsync();
+                var clipboardData = WindowsUtils.GetClipboardData();
+                if (clipboardData.IsNotEmpty())
+                {
+                    ViewModel?.AddServerViaClipboardAsync(clipboardData);
+                }
                 break;
         }
 
@@ -275,7 +283,12 @@ public partial class MainWindow
                     {
                         return;
                     }
-                    AddServerViaClipboardAsync().ContinueWith(_ => { });
+
+                    var clipboardData = WindowsUtils.GetClipboardData();
+                    if (clipboardData.IsNotEmpty())
+                    {
+                        ViewModel?.AddServerViaClipboardAsync(clipboardData);
+                    }
 
                     break;
 
@@ -309,15 +322,6 @@ public partial class MainWindow
         ProcUtils.ProcessStart(Utils.GetBinPath("EnableLoopback.exe"));
     }
 
-    public async Task AddServerViaClipboardAsync()
-    {
-        var clipboardData = WindowsUtils.GetClipboardData();
-        if (clipboardData.IsNotEmpty() && ViewModel != null)
-        {
-            await ViewModel.AddServerViaClipboardAsync(clipboardData);
-        }
-    }
-
     private async Task ScanScreenTaskAsync()
     {
         ShowHideWindow(false);