Improved MessageBus contract

lowercase78 · Oct 11, 2024 · a0286ff · a0286ff
1 parent b172b03
commit a0286ff
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 deletions.
diff --git a/v2rayN/ServiceLib/Enums/EMsgCommand.cs b/v2rayN/ServiceLib/Enums/EMsgCommand.cs
@@ -0,0 +1,10 @@
+namespace ServiceLib.Enums
+{
+    public enum EMsgCommand
+    {
+        ClearMsg,
+        SendMsgView,
+        SendSnackMsg,
+        RefreshProfiles
+    }
+}
diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs
@@ -68,11 +68,6 @@ public class Global
         public const string GrpcGunMode = "gun";
         public const string GrpcMultiMode = "multi";
         public const int MaxPort = 65536;
-        public const string CommandClearMsg = "CommandClearMsg";
-        public const string CommandSendMsgView = "CommandSendMsgView";
-        public const string CommandSendSnackMsg = "CommandSendSnackMsg";
-        public const string CommandStopSpeedTest = "CommandStopSpeedTest";
-        public const string CommandRefreshProfiles = "CommandRefreshProfiles";
         public const string DelayUnit = "";
         public const string SpeedUnit = "";
         public const int MinFontSize = 10;

diff --git a/v2rayN/ServiceLib/Handler/NoticeHandler.cs b/v2rayN/ServiceLib/Handler/NoticeHandler.cs
@@ -13,7 +13,7 @@ public void Enqueue(string? content)
             {
                 return;
             }
-            MessageBus.Current.SendMessage(content, Global.CommandSendSnackMsg);
+            MessageBus.Current.SendMessage(content, EMsgCommand.SendSnackMsg.ToString());
         }
 
         public void SendMessage(string? content)
@@ -22,7 +22,7 @@ public void SendMessage(string? content)
             {
                 return;
             }
-            MessageBus.Current.SendMessage(content, Global.CommandSendMsgView);
+            MessageBus.Current.SendMessage(content, EMsgCommand.SendMsgView.ToString());
         }
 
         public void SendMessageEx(string? content)

diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -150,7 +150,7 @@ public MainWindowViewModel(bool isAdministrator, Func<EViewAction, object?, Task
             _updateView = updateView;
             _isAdministrator = isAdministrator;
 
-            MessageBus.Current.Listen<string>(Global.CommandRefreshProfiles).Subscribe(async x => await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null));
+            MessageBus.Current.Listen<string>(EMsgCommand.RefreshProfiles.ToString()).Subscribe(async x => await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null));
 
             SelectedRouting = new();
             SelectedServer = new();
@@ -453,7 +453,7 @@ public async Task UpgradeApp(string fileName)
 
         private void RefreshServers()
         {
-            MessageBus.Current.SendMessage("", Global.CommandRefreshProfiles);
+            MessageBus.Current.SendMessage("", EMsgCommand.RefreshProfiles.ToString());
         }
 
         public void RefreshServersBiz()

diff --git a/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs b/v2rayN/ServiceLib/ViewModels/MsgViewModel.cs
@@ -24,7 +24,7 @@ public MsgViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
             _config = AppHandler.Instance.Config;
             _updateView = updateView;
 
-            MessageBus.Current.Listen<string>(Global.CommandSendMsgView).Subscribe(async x => await AppendQueueMsg(x));
+            MessageBus.Current.Listen<string>(EMsgCommand.SendMsgView.ToString()).Subscribe(async x => await AppendQueueMsg(x));
 
             MsgFilter = _config.msgUIItem.mainMsgFilter ?? string.Empty;
             AutoRefresh = _config.msgUIItem.autoRefresh ?? true;

diff --git a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
@@ -101,7 +101,7 @@ public ProfilesViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
 
             _updateView = updateView;
 
-            MessageBus.Current.Listen<string>(Global.CommandRefreshProfiles).Subscribe(async x => await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null));
+            MessageBus.Current.Listen<string>(EMsgCommand.RefreshProfiles.ToString()).Subscribe(async x => await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null));
 
             SelectedProfile = new();
             SelectedSub = new();
@@ -345,7 +345,7 @@ private void ServerFilterChanged(bool c)
 
         public void RefreshServers()
         {
-            MessageBus.Current.SendMessage("", Global.CommandRefreshProfiles);
+            MessageBus.Current.SendMessage("", EMsgCommand.RefreshProfiles.ToString());
         }
 
         public void RefreshServersBiz()

diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
@@ -41,7 +41,7 @@ public MainWindow()
             menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
 
             var IsAdministrator = Utils.IsAdministrator();
-            MessageBus.Current.Listen<string>(Global.CommandSendSnackMsg).Subscribe(x => DelegateSnackMsg(x));
+            MessageBus.Current.Listen<string>(EMsgCommand.SendSnackMsg.ToString()).Subscribe(x => DelegateSnackMsg(x));
             ViewModel = new MainWindowViewModel(IsAdministrator, UpdateViewHandler);
             Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));
 

diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -37,7 +37,7 @@ public MainWindow()
             menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
 
             var IsAdministrator = Utils.IsAdministrator();
-            MessageBus.Current.Listen<string>(Global.CommandSendSnackMsg).Subscribe(x => DelegateSnackMsg(x));
+            MessageBus.Current.Listen<string>(EMsgCommand.SendSnackMsg.ToString()).Subscribe(x => DelegateSnackMsg(x));
             ViewModel = new MainWindowViewModel(IsAdministrator, UpdateViewHandler);
             Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(MainWindowViewModel));