Use Rx event subscription to replace MessageBus refresh configuration file function

2dust · 2dust · commit ea1d438e4072 · 2025-08-29T14:46:08.000+08:00
diff --git a/v2rayN/ServiceLib/Enums/EMsgCommand.cs b/v2rayN/ServiceLib/Enums/EMsgCommand.cs
@@ -5,6 +5,5 @@ public enum EMsgCommand
     ClearMsg,
     SendMsgView,
     SendSnackMsg,
-    RefreshProfiles,
     AppExit
 }
diff --git a/v2rayN/ServiceLib/Handler/AppEvents.cs b/v2rayN/ServiceLib/Handler/AppEvents.cs
@@ -0,0 +1,9 @@
+using System.Reactive;
+using System.Reactive.Subjects;
+
+namespace ServiceLib.Handler;
+
+public static class AppEvents
+{
+    public static readonly Subject<Unit> ProfilesRefreshRequested = new();
+}
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -260,7 +260,7 @@ private async Task UpdateTaskHandler(bool success, string msg)
         if (success)
         {
             var indexIdOld = _config.IndexId;
-            RefreshServers();
+            await RefreshServers();
             if (indexIdOld != _config.IndexId)
             {
                 await Reload();
@@ -350,9 +350,11 @@ public void Shutdown(bool byUser)
 
     #region Servers && Groups
 
-    private void RefreshServers()
+    private async Task RefreshServers()
     {
-        MessageBus.Current.SendMessage("", EMsgCommand.RefreshProfiles.ToString());
+        AppEvents.ProfilesRefreshRequested.OnNext(Unit.Default);
+
+        await Task.Delay(200);
     }
 
     private void RefreshSubscriptions()
@@ -384,7 +386,7 @@ public async Task AddServerAsync(bool blNew, EConfigType eConfigType)
         }
         if (ret == true)
         {
-            RefreshServers();
+            await RefreshServers();
             if (item.IndexId == _config.IndexId)
             {
                 await Reload();
@@ -399,11 +401,11 @@ public async Task AddServerViaClipboardAsync(string? clipboardData)
             await _updateView?.Invoke(EViewAction.AddServerViaClipboard, null);
             return;
         }
-        int ret = await ConfigHandler.AddBatchServers(_config, clipboardData, _config.SubIndexId, false);
+        var ret = await ConfigHandler.AddBatchServers(_config, clipboardData, _config.SubIndexId, false);
         if (ret > 0)
         {
             RefreshSubscriptions();
-            RefreshServers();
+            await RefreshServers();
             NoticeManager.Instance.Enqueue(string.Format(ResUI.SuccessfullyImportedServerViaClipboard, ret));
         }
         else
@@ -449,11 +451,11 @@ private async Task AddScanResultAsync(string? result)
         }
         else
         {
-            int ret = await ConfigHandler.AddBatchServers(_config, result, _config.SubIndexId, false);
+            var ret = await ConfigHandler.AddBatchServers(_config, result, _config.SubIndexId, false);
             if (ret > 0)
             {
                 RefreshSubscriptions();
-                RefreshServers();
+                await RefreshServers();
                 NoticeManager.Instance.Enqueue(ResUI.SuccessfullyImportedServerViaScan);
             }
             else
@@ -532,7 +534,7 @@ public async Task RebootAsAdmin()
     private async Task ClearServerStatistics()
     {
         await StatisticsManager.Instance.ClearAllServerStatistics();
-        RefreshServers();
+        await RefreshServers();
     }
 
     private async Task OpenTheFileLocation()
diff --git a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
@@ -126,7 +126,7 @@ public ProfilesViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
         this.WhenAnyValue(
           x => x.ServerFilter,
           y => y != null && _serverFilter != y)
-              .Subscribe(c => ServerFilterChanged(c));
+              .Subscribe(async c => await ServerFilterChanged(c));
 
         //servers delete
         EditServerCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -249,7 +249,10 @@ public ProfilesViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
 
         if (_updateView != null)
         {
-            MessageBus.Current.Listen<string>(EMsgCommand.RefreshProfiles.ToString()).Subscribe(OnNext);
+            AppEvents.ProfilesRefreshRequested
+            .AsObservable()
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(async _ => await RefreshServersBiz());//.DisposeWith(_disposables);
         }
 
         _ = Init();
@@ -263,18 +266,13 @@ private async Task Init()
         SelectedServer = new();
 
         await RefreshSubscriptions();
-        RefreshServers();
+        await RefreshServers();
     }
 
     #endregion Init
 
     #region Actions
 
-    private async void OnNext(string x)
-    {
-        await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);
-    }
-
     private void Reload()
     {
         Locator.Current.GetService<MainWindowViewModel>()?.Reload();
@@ -353,12 +351,12 @@ private async Task SubSelectedChangedAsync(bool c)
         }
         _config.SubIndexId = SelectedSub?.Id;
 
-        RefreshServers();
+        await RefreshServers();
 
         await _updateView?.Invoke(EViewAction.ProfilesFocus, null);
     }
 
-    private void ServerFilterChanged(bool c)
+    private async Task ServerFilterChanged(bool c)
     {
         if (!c)
         {
@@ -367,16 +365,18 @@ private void ServerFilterChanged(bool c)
         _serverFilter = ServerFilter;
         if (_serverFilter.IsNullOrEmpty())
         {
-            RefreshServers();
+            await RefreshServers();
         }
     }
 
-    public void RefreshServers()
+    public async Task RefreshServers()
     {
-        MessageBus.Current.SendMessage("", EMsgCommand.RefreshProfiles.ToString());
+        AppEvents.ProfilesRefreshRequested.OnNext(Unit.Default);
+
+        await Task.Delay(200);
     }
 
-    public async Task RefreshServersBiz()
+    private async Task RefreshServersBiz()
     {
         var lstModel = await GetProfileItemsEx(_config.SubIndexId, _serverFilter);
         _lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel)) ?? [];
@@ -395,6 +395,8 @@ public async Task RefreshServersBiz()
                 SelectedProfile = lstModel.First();
             }
         }
+
+        await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);
     }
 
     public async Task RefreshSubscriptions()
@@ -514,7 +516,7 @@ public async Task EditServerAsync(EConfigType eConfigType)
         }
         if (ret == true)
         {
-            RefreshServers();
+            await RefreshServers();
             if (item.IndexId == _config.IndexId)
             {
                 Reload();
@@ -541,7 +543,7 @@ public async Task RemoveServerAsync()
         {
             _profileItems.Clear();
         }
-        RefreshServers();
+        await RefreshServers();
         if (exists)
         {
             Reload();
@@ -553,7 +555,7 @@ private async Task RemoveDuplicateServer()
         var tuple = await ConfigHandler.DedupServerList(_config, _config.SubIndexId);
         if (tuple.Item1 > 0 || tuple.Item2 > 0)
         {
-            RefreshServers();
+            await RefreshServers();
             Reload();
         }
         NoticeManager.Instance.Enqueue(string.Format(ResUI.RemoveDuplicateServerResult, tuple.Item1, tuple.Item2));
@@ -568,7 +570,7 @@ private async Task CopyServer()
         }
         if (await ConfigHandler.CopyServer(_config, lstSelected) == 0)
         {
-            RefreshServers();
+            await RefreshServers();
             NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
         }
     }
@@ -601,7 +603,7 @@ public async Task SetDefaultServer(string? indexId)
 
         if (await ConfigHandler.SetDefaultServerIndex(_config, indexId) == 0)
         {
-            RefreshServers();
+            await RefreshServers();
             Reload();
         }
     }
@@ -652,7 +654,7 @@ private async Task SetDefaultMultipleServer(ECoreType coreType, EMultipleLoad mu
         }
         if (ret?.Data?.ToString() == _config.IndexId)
         {
-            RefreshServers();
+            await RefreshServers();
             Reload();
         }
         else
@@ -675,13 +677,13 @@ public async Task SortServer(string colName)
             return;
         }
         _dicHeaderSort[colName] = !asc;
-        RefreshServers();
+        await RefreshServers();
     }
 
     public async Task RemoveInvalidServerResult()
     {
         var count = await ConfigHandler.RemoveInvalidServerResult(_config, _config.SubIndexId);
-        RefreshServers();
+        await RefreshServers();
         NoticeManager.Instance.Enqueue(string.Format(ResUI.RemoveInvalidServerResultTip, count));
     }
 
@@ -702,7 +704,7 @@ private async Task MoveToGroup(bool c)
         await ConfigHandler.MoveToGroup(_config, lstSelected, SelectedMoveToGroup.Id);
         NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
 
-        RefreshServers();
+        await RefreshServers();
         SelectedMoveToGroup = null;
         SelectedMoveToGroup = new();
     }
@@ -723,7 +725,7 @@ public async Task MoveServer(EMove eMove)
         }
         if (await ConfigHandler.MoveServer(_config, _lstProfile, index, eMove) == 0)
         {
-            RefreshServers();
+            await RefreshServers();
         }
     }
 
@@ -734,7 +736,7 @@ public async Task MoveServerTo(int startIndex, ProfileItemModel targetItem)
         {
             if (await ConfigHandler.MoveServer(_config, _lstProfile, startIndex, EMove.Position, targetIndex) == 0)
             {
-                RefreshServers();
+                await RefreshServers();
             }
         }
     }
diff --git a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
@@ -1,4 +1,5 @@
 using System.Reactive;
+using System.Reactive.Linq;
 using System.Text;
 using DynamicData.Binding;
 using ReactiveUI;
@@ -216,15 +217,13 @@ public void InitUpdateView(Func<EViewAction, object?, Task<bool>>? updateView)
         _updateView = updateView;
         if (_updateView != null)
         {
-            MessageBus.Current.Listen<string>(EMsgCommand.RefreshProfiles.ToString()).Subscribe(OnNext);
+            AppEvents.ProfilesRefreshRequested
+              .AsObservable()
+              .ObserveOn(RxApp.MainThreadScheduler)
+              .Subscribe(async _ => await RefreshServersBiz()); //.DisposeWith(_disposables);
         }
     }
 
-    private async void OnNext(string x)
-    {
-        await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);
-    }
-
     private async Task CopyProxyCmdToClipboard()
     {
         var cmd = Utils.IsWindows() ? "set" : "export";
@@ -263,7 +262,7 @@ private async Task UpdateSubscriptionProcess(bool blProxy)
             await service.UpdateSubscriptionProcess("", blProxy);
     }
 
-    public async Task RefreshServersBiz()
+    private async Task RefreshServersBiz()
     {
         await RefreshServersMenu();
 
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
@@ -187,11 +187,7 @@ private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
                 break;
 
             case EViewAction.DispatcherRefreshServersBiz:
-                Dispatcher.UIThread.Post(() =>
-                {
-                    _ = RefreshServersBiz();
-                },
-                DispatcherPriority.Default);
+                Dispatcher.UIThread.Post(RefreshServersBiz, DispatcherPriority.Default);
                 break;
         }
 
@@ -209,13 +205,8 @@ public async Task ShareServer(string url)
         await DialogHost.Show(dialog);
     }
 
-    public async Task RefreshServersBiz()
+    public void RefreshServersBiz()
     {
-        if (ViewModel != null)
-        {
-            await ViewModel.RefreshServersBiz();
-        }
-
         if (lstProfiles.SelectedIndex >= 0)
         {
             lstProfiles.ScrollIntoView(lstProfiles.SelectedItem, null);
diff --git a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
@@ -63,12 +63,7 @@ private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
                     ViewModel?.TestServerAvailabilityResult((string)obj),
                 DispatcherPriority.Default);
                 break;
-
-            case EViewAction.DispatcherRefreshServersBiz:
-                Dispatcher.UIThread.Post(() =>
-                    ViewModel?.RefreshServersBiz(),
-                DispatcherPriority.Default);
-                break;
+                 
 
             case EViewAction.DispatcherRefreshIcon:
                 Dispatcher.UIThread.Post(() =>
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
@@ -168,10 +168,7 @@ private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
                 break;
 
             case EViewAction.DispatcherRefreshServersBiz:
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    _ = RefreshServersBiz();
-                }), DispatcherPriority.Normal);
+                Application.Current?.Dispatcher.Invoke(RefreshServersBiz, DispatcherPriority.Normal);
                 break;
         }
 
@@ -190,13 +187,8 @@ public async void ShareServer(string url)
         await DialogHost.Show(dialog, "RootDialog");
     }
 
-    public async Task RefreshServersBiz()
+    public void RefreshServersBiz()
     {
-        if (ViewModel != null)
-        {
-            await ViewModel.RefreshServersBiz();
-        }
-
         if (lstProfiles.SelectedIndex > 0)
         {
             lstProfiles.ScrollIntoView(lstProfiles.SelectedItem, null);
diff --git a/v2rayN/v2rayN/Views/StatusBarView.xaml.cs b/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
@@ -86,12 +86,7 @@ private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
                 }), DispatcherPriority.Normal);
                 break;
 
-            case EViewAction.DispatcherRefreshServersBiz:
-                Application.Current?.Dispatcher.Invoke((() =>
-                {
-                    ViewModel?.RefreshServersBiz();
-                }), DispatcherPriority.Normal);
-                break;
+        
 
             case EViewAction.DispatcherRefreshIcon:
                 Application.Current?.Dispatcher.Invoke((async () =>

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,5 @@ public enum EMsgCommand`
`5`	`5`	`ClearMsg,`
`6`	`6`	`SendMsgView,`
`7`	`7`	`SendSnackMsg,`
`8`		`- RefreshProfiles,`
`9`	`8`	`AppExit`
`10`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ private async Task UpdateTaskHandler(bool success, string msg)`
`260`	`260`	`if (success)`
`261`	`261`	`{`
`262`	`262`	`var indexIdOld = _config.IndexId;`
`263`		`- RefreshServers();`
	`263`	`+ await RefreshServers();`
`264`	`264`	`if (indexIdOld != _config.IndexId)`
`265`	`265`	`{`
`266`	`266`	`await Reload();`
`@@ -350,9 +350,11 @@ public void Shutdown(bool byUser)`
`350`	`350`
`351`	`351`	`#region Servers && Groups`
`352`	`352`
`353`		`- private void RefreshServers()`
	`353`	`+ private async Task RefreshServers()`
`354`	`354`	`{`
`355`		`- MessageBus.Current.SendMessage("", EMsgCommand.RefreshProfiles.ToString());`
	`355`	`+ AppEvents.ProfilesRefreshRequested.OnNext(Unit.Default);`
	`356`	`+`
	`357`	`+ await Task.Delay(200);`
`356`	`358`	`}`
`357`	`359`
`358`	`360`	`private void RefreshSubscriptions()`
`@@ -384,7 +386,7 @@ public async Task AddServerAsync(bool blNew, EConfigType eConfigType)`
`384`	`386`	`}`
`385`	`387`	`if (ret == true)`
`386`	`388`	`{`
`387`		`- RefreshServers();`
	`389`	`+ await RefreshServers();`
`388`	`390`	`if (item.IndexId == _config.IndexId)`
`389`	`391`	`{`
`390`	`392`	`await Reload();`
`@@ -399,11 +401,11 @@ public async Task AddServerViaClipboardAsync(string? clipboardData)`
`399`	`401`	`await _updateView?.Invoke(EViewAction.AddServerViaClipboard, null);`
`400`	`402`	`return;`
`401`	`403`	`}`
`402`		`- int ret = await ConfigHandler.AddBatchServers(_config, clipboardData, _config.SubIndexId, false);`
	`404`	`+ var ret = await ConfigHandler.AddBatchServers(_config, clipboardData, _config.SubIndexId, false);`
`403`	`405`	`if (ret > 0)`
`404`	`406`	`{`
`405`	`407`	`RefreshSubscriptions();`
`406`		`- RefreshServers();`
	`408`	`+ await RefreshServers();`
`407`	`409`	`NoticeManager.Instance.Enqueue(string.Format(ResUI.SuccessfullyImportedServerViaClipboard, ret));`
`408`	`410`	`}`
`409`	`411`	`else`
`@@ -449,11 +451,11 @@ private async Task AddScanResultAsync(string? result)`
`449`	`451`	`}`
`450`	`452`	`else`
`451`	`453`	`{`
`452`		`- int ret = await ConfigHandler.AddBatchServers(_config, result, _config.SubIndexId, false);`
	`454`	`+ var ret = await ConfigHandler.AddBatchServers(_config, result, _config.SubIndexId, false);`
`453`	`455`	`if (ret > 0)`
`454`	`456`	`{`
`455`	`457`	`RefreshSubscriptions();`
`456`		`- RefreshServers();`
	`458`	`+ await RefreshServers();`
`457`	`459`	`NoticeManager.Instance.Enqueue(ResUI.SuccessfullyImportedServerViaScan);`
`458`	`460`	`}`
`459`	`461`	`else`
`@@ -532,7 +534,7 @@ public async Task RebootAsAdmin()`
`532`	`534`	`private async Task ClearServerStatistics()`
`533`	`535`	`{`
`534`	`536`	`await StatisticsManager.Instance.ClearAllServerStatistics();`
`535`		`- RefreshServers();`
	`537`	`+ await RefreshServers();`
`536`	`538`	`}`
`537`	`539`
`538`	`540`	`private async Task OpenTheFileLocation()`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public ProfilesViewModel(Func<EViewAction, object?, Task<bool>>? updateView)`
`126`	`126`	`this.WhenAnyValue(`
`127`	`127`	`x => x.ServerFilter,`
`128`	`128`	`y => y != null && _serverFilter != y)`
`129`		`- .Subscribe(c => ServerFilterChanged(c));`
	`129`	`+ .Subscribe(async c => await ServerFilterChanged(c));`
`130`	`130`
`131`	`131`	`//servers delete`
`132`	`132`	`EditServerCmd = ReactiveCommand.CreateFromTask(async () =>`
`@@ -249,7 +249,10 @@ public ProfilesViewModel(Func<EViewAction, object?, Task<bool>>? updateView)`
`249`	`249`
`250`	`250`	`if (_updateView != null)`
`251`	`251`	`{`
`252`		`- MessageBus.Current.Listen<string>(EMsgCommand.RefreshProfiles.ToString()).Subscribe(OnNext);`
	`252`	`+ AppEvents.ProfilesRefreshRequested`
	`253`	`+ .AsObservable()`
	`254`	`+ .ObserveOn(RxApp.MainThreadScheduler)`
	`255`	`+ .Subscribe(async _ => await RefreshServersBiz());//.DisposeWith(_disposables);`
`253`	`256`	`}`
`254`	`257`
`255`	`258`	`_ = Init();`
`@@ -263,18 +266,13 @@ private async Task Init()`
`263`	`266`	`SelectedServer = new();`
`264`	`267`
`265`	`268`	`await RefreshSubscriptions();`
`266`		`- RefreshServers();`
	`269`	`+ await RefreshServers();`
`267`	`270`	`}`
`268`	`271`
`269`	`272`	`#endregion Init`
`270`	`273`
`271`	`274`	`#region Actions`
`272`	`275`
`273`		`- private async void OnNext(string x)`
`274`		`- {`
`275`		`- await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);`
`276`		`- }`
`277`		`-`
`278`	`276`	`private void Reload()`
`279`	`277`	`{`
`280`	`278`	`Locator.Current.GetService<MainWindowViewModel>()?.Reload();`
`@@ -353,12 +351,12 @@ private async Task SubSelectedChangedAsync(bool c)`
`353`	`351`	`}`
`354`	`352`	`_config.SubIndexId = SelectedSub?.Id;`
`355`	`353`
`356`		`- RefreshServers();`
	`354`	`+ await RefreshServers();`
`357`	`355`
`358`	`356`	`await _updateView?.Invoke(EViewAction.ProfilesFocus, null);`
`359`	`357`	`}`
`360`	`358`
`361`		`- private void ServerFilterChanged(bool c)`
	`359`	`+ private async Task ServerFilterChanged(bool c)`
`362`	`360`	`{`
`363`	`361`	`if (!c)`
`364`	`362`	`{`
`@@ -367,16 +365,18 @@ private void ServerFilterChanged(bool c)`
`367`	`365`	`_serverFilter = ServerFilter;`
`368`	`366`	`if (_serverFilter.IsNullOrEmpty())`
`369`	`367`	`{`
`370`		`- RefreshServers();`
	`368`	`+ await RefreshServers();`
`371`	`369`	`}`
`372`	`370`	`}`
`373`	`371`
`374`		`- public void RefreshServers()`
	`372`	`+ public async Task RefreshServers()`
`375`	`373`	`{`
`376`		`- MessageBus.Current.SendMessage("", EMsgCommand.RefreshProfiles.ToString());`
	`374`	`+ AppEvents.ProfilesRefreshRequested.OnNext(Unit.Default);`
	`375`	`+`
	`376`	`+ await Task.Delay(200);`
`377`	`377`	`}`
`378`	`378`
`379`		`- public async Task RefreshServersBiz()`
	`379`	`+ private async Task RefreshServersBiz()`
`380`	`380`	`{`
`381`	`381`	`var lstModel = await GetProfileItemsEx(_config.SubIndexId, _serverFilter);`
`382`	`382`	`_lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel)) ?? [];`
`@@ -395,6 +395,8 @@ public async Task RefreshServersBiz()`
`395`	`395`	`SelectedProfile = lstModel.First();`
`396`	`396`	`}`
`397`	`397`	`}`
	`398`	`+`
	`399`	`+ await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);`
`398`	`400`	`}`
`399`	`401`
`400`	`402`	`public async Task RefreshSubscriptions()`
`@@ -514,7 +516,7 @@ public async Task EditServerAsync(EConfigType eConfigType)`
`514`	`516`	`}`
`515`	`517`	`if (ret == true)`
`516`	`518`	`{`
`517`		`- RefreshServers();`
	`519`	`+ await RefreshServers();`
`518`	`520`	`if (item.IndexId == _config.IndexId)`
`519`	`521`	`{`
`520`	`522`	`Reload();`
`@@ -541,7 +543,7 @@ public async Task RemoveServerAsync()`
`541`	`543`	`{`
`542`	`544`	`_profileItems.Clear();`
`543`	`545`	`}`
`544`		`- RefreshServers();`
	`546`	`+ await RefreshServers();`
`545`	`547`	`if (exists)`
`546`	`548`	`{`
`547`	`549`	`Reload();`
`@@ -553,7 +555,7 @@ private async Task RemoveDuplicateServer()`
`553`	`555`	`var tuple = await ConfigHandler.DedupServerList(_config, _config.SubIndexId);`
`554`	`556`	`if (tuple.Item1 > 0 \|\| tuple.Item2 > 0)`
`555`	`557`	`{`
`556`		`- RefreshServers();`
	`558`	`+ await RefreshServers();`
`557`	`559`	`Reload();`
`558`	`560`	`}`
`559`	`561`	`NoticeManager.Instance.Enqueue(string.Format(ResUI.RemoveDuplicateServerResult, tuple.Item1, tuple.Item2));`
`@@ -568,7 +570,7 @@ private async Task CopyServer()`
`568`	`570`	`}`
`569`	`571`	`if (await ConfigHandler.CopyServer(_config, lstSelected) == 0)`
`570`	`572`	`{`
`571`		`- RefreshServers();`
	`573`	`+ await RefreshServers();`
`572`	`574`	`NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);`
`573`	`575`	`}`
`574`	`576`	`}`
`@@ -601,7 +603,7 @@ public async Task SetDefaultServer(string? indexId)`
`601`	`603`
`602`	`604`	`if (await ConfigHandler.SetDefaultServerIndex(_config, indexId) == 0)`
`603`	`605`	`{`
`604`		`- RefreshServers();`
	`606`	`+ await RefreshServers();`
`605`	`607`	`Reload();`
`606`	`608`	`}`
`607`	`609`	`}`
`@@ -652,7 +654,7 @@ private async Task SetDefaultMultipleServer(ECoreType coreType, EMultipleLoad mu`
`652`	`654`	`}`
`653`	`655`	`if (ret?.Data?.ToString() == _config.IndexId)`
`654`	`656`	`{`
`655`		`- RefreshServers();`
	`657`	`+ await RefreshServers();`
`656`	`658`	`Reload();`
`657`	`659`	`}`
`658`	`660`	`else`
`@@ -675,13 +677,13 @@ public async Task SortServer(string colName)`
`675`	`677`	`return;`
`676`	`678`	`}`
`677`	`679`	`_dicHeaderSort[colName] = !asc;`
`678`		`- RefreshServers();`
	`680`	`+ await RefreshServers();`
`679`	`681`	`}`
`680`	`682`
`681`	`683`	`public async Task RemoveInvalidServerResult()`
`682`	`684`	`{`
`683`	`685`	`var count = await ConfigHandler.RemoveInvalidServerResult(_config, _config.SubIndexId);`
`684`		`- RefreshServers();`
	`686`	`+ await RefreshServers();`
`685`	`687`	`NoticeManager.Instance.Enqueue(string.Format(ResUI.RemoveInvalidServerResultTip, count));`
`686`	`688`	`}`
`687`	`689`
`@@ -702,7 +704,7 @@ private async Task MoveToGroup(bool c)`
`702`	`704`	`await ConfigHandler.MoveToGroup(_config, lstSelected, SelectedMoveToGroup.Id);`
`703`	`705`	`NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);`
`704`	`706`
`705`		`- RefreshServers();`
	`707`	`+ await RefreshServers();`
`706`	`708`	`SelectedMoveToGroup = null;`
`707`	`709`	`SelectedMoveToGroup = new();`
`708`	`710`	`}`
`@@ -723,7 +725,7 @@ public async Task MoveServer(EMove eMove)`
`723`	`725`	`}`
`724`	`726`	`if (await ConfigHandler.MoveServer(_config, _lstProfile, index, eMove) == 0)`
`725`	`727`	`{`
`726`		`- RefreshServers();`
	`728`	`+ await RefreshServers();`
`727`	`729`	`}`
`728`	`730`	`}`
`729`	`731`
`@@ -734,7 +736,7 @@ public async Task MoveServerTo(int startIndex, ProfileItemModel targetItem)`
`734`	`736`	`{`
`735`	`737`	`if (await ConfigHandler.MoveServer(_config, _lstProfile, startIndex, EMove.Position, targetIndex) == 0)`
`736`	`738`	`{`
`737`		`- RefreshServers();`
	`739`	`+ await RefreshServers();`
`738`	`740`	`}`
`739`	`741`	`}`
`740`	`742`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Reactive;`
	`2`	`+using System.Reactive.Linq;`
`2`	`3`	`using System.Text;`
`3`	`4`	`using DynamicData.Binding;`
`4`	`5`	`using ReactiveUI;`
`@@ -216,15 +217,13 @@ public void InitUpdateView(Func<EViewAction, object?, Task<bool>>? updateView)`
`216`	`217`	`_updateView = updateView;`
`217`	`218`	`if (_updateView != null)`
`218`	`219`	`{`
`219`		`- MessageBus.Current.Listen<string>(EMsgCommand.RefreshProfiles.ToString()).Subscribe(OnNext);`
	`220`	`+ AppEvents.ProfilesRefreshRequested`
	`221`	`+ .AsObservable()`
	`222`	`+ .ObserveOn(RxApp.MainThreadScheduler)`
	`223`	`+ .Subscribe(async _ => await RefreshServersBiz()); //.DisposeWith(_disposables);`
`220`	`224`	`}`
`221`	`225`	`}`
`222`	`226`
`223`		`- private async void OnNext(string x)`
`224`		`- {`
`225`		`- await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null);`
`226`		`- }`
`227`		`-`
`228`	`227`	`private async Task CopyProxyCmdToClipboard()`
`229`	`228`	`{`
`230`	`229`	`var cmd = Utils.IsWindows() ? "set" : "export";`
`@@ -263,7 +262,7 @@ private async Task UpdateSubscriptionProcess(bool blProxy)`
`263`	`262`	`await service.UpdateSubscriptionProcess("", blProxy);`
`264`	`263`	`}`
`265`	`264`
`266`		`- public async Task RefreshServersBiz()`
	`265`	`+ private async Task RefreshServersBiz()`
`267`	`266`	`{`
`268`	`267`	`await RefreshServersMenu();`
`269`	`268`
Original file line number	Diff line number	Diff line change
`@@ -187,11 +187,7 @@ private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)`
`187`	`187`	`break;`
`188`	`188`
`189`	`189`	`case EViewAction.DispatcherRefreshServersBiz:`
`190`		`- Dispatcher.UIThread.Post(() =>`
`191`		`- {`
`192`		`- _ = RefreshServersBiz();`
`193`		`- },`
`194`		`- DispatcherPriority.Default);`
	`190`	`+ Dispatcher.UIThread.Post(RefreshServersBiz, DispatcherPriority.Default);`
`195`	`191`	`break;`
`196`	`192`	`}`
`197`	`193`
`@@ -209,13 +205,8 @@ public async Task ShareServer(string url)`
`209`	`205`	`await DialogHost.Show(dialog);`
`210`	`206`	`}`
`211`	`207`
`212`		`- public async Task RefreshServersBiz()`
	`208`	`+ public void RefreshServersBiz()`
`213`	`209`	`{`
`214`		`- if (ViewModel != null)`
`215`		`- {`
`216`		`- await ViewModel.RefreshServersBiz();`
`217`		`- }`
`218`		`-`
`219`	`210`	`if (lstProfiles.SelectedIndex >= 0)`
`220`	`211`	`{`
`221`	`212`	`lstProfiles.ScrollIntoView(lstProfiles.SelectedItem, null);`
Original file line number	Diff line number	Diff line change
`@@ -168,10 +168,7 @@ private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)`
`168`	`168`	`break;`
`169`	`169`
`170`	`170`	`case EViewAction.DispatcherRefreshServersBiz:`
`171`		`- Application.Current?.Dispatcher.Invoke((() =>`
`172`		`- {`
`173`		`- _ = RefreshServersBiz();`
`174`		`- }), DispatcherPriority.Normal);`
	`171`	`+ Application.Current?.Dispatcher.Invoke(RefreshServersBiz, DispatcherPriority.Normal);`
`175`	`172`	`break;`
`176`	`173`	`}`
`177`	`174`
`@@ -190,13 +187,8 @@ public async void ShareServer(string url)`
`190`	`187`	`await DialogHost.Show(dialog, "RootDialog");`
`191`	`188`	`}`
`192`	`189`
`193`		`- public async Task RefreshServersBiz()`
	`190`	`+ public void RefreshServersBiz()`
`194`	`191`	`{`
`195`		`- if (ViewModel != null)`
`196`		`- {`
`197`		`- await ViewModel.RefreshServersBiz();`
`198`		`- }`
`199`		`-`
`200`	`192`	`if (lstProfiles.SelectedIndex > 0)`
`201`	`193`	`{`
`202`	`194`	`lstProfiles.ScrollIntoView(lstProfiles.SelectedItem, null);`