Supported unregister the service by kill cmd

GenshinMatrix · Mar 29, 2023 · 563bd1b · 563bd1b
1 parent b7a6300
commit 563bd1b
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/src/GenshinSwitch.Fetch/Service/MainService.cs b/src/GenshinSwitch.Fetch/Service/MainService.cs
@@ -9,6 +9,19 @@ public static class MainService
 {
     public static bool ServiceEnabled { get; set; } = false;
 
+    public static void Kill()
+    {
+        using NamedPipeClientStream pipeClient = new(".", "GenshinSwitch.WindowsService", PipeDirection.InOut);
+        pipeClient.Connect(2000);
+        using StreamWriter writer = new(pipeClient);
+        writer.WriteLine(JsonConvert.SerializeObject(new
+        {
+            Command = MainServiceCommmand.Kill.GetHashCode(),
+        }));
+        writer.Flush();
+        return;
+    }
+
     internal static void SetGameAccountRegisty(string key, string value, GameType type = GameType.CN)
     {
         using NamedPipeClientStream pipeClient = new(".", "GenshinSwitch.WindowsService", PipeDirection.InOut);

diff --git a/src/GenshinSwitch.Fetch/Service/MainServiceCommmand.cs b/src/GenshinSwitch.Fetch/Service/MainServiceCommmand.cs
@@ -5,4 +5,5 @@ public enum MainServiceCommmand
     None = 0x00,
     SetGameAccountRegisty = 0x01,
     GetGameAccountRegisty = 0x02,
+    Kill = 0x88,
 }
diff --git a/src/GenshinSwitch.WindowsService/CommandRunner.cs b/src/GenshinSwitch.WindowsService/CommandRunner.cs
@@ -60,6 +60,11 @@ internal static class CommandRunner
                     obj.Key,
                 };
             }
+            else if ((int)obj.Command == (int)MainServiceCommmand.Kill)
+            {
+                new AutoStartRegistyHelper().Disable();
+                Environment.Exit((int)MainServiceCommmand.Kill);
+            }
         }
         return null!;
     }
@@ -70,6 +75,7 @@ file enum MainServiceCommmand
     None = 0x00,
     SetGameAccountRegisty = 0x01,
     GetGameAccountRegisty = 0x02,
+    Kill = 0x88,
 }
 
 file enum GameType

diff --git a/src/GenshinSwitch/ViewModels/SettingsViewModel.cs b/src/GenshinSwitch/ViewModels/SettingsViewModel.cs
@@ -9,6 +9,7 @@
 using GenshinSwitch.Core.Settings;
 using GenshinSwitch.Fetch.Lazy;
 using GenshinSwitch.Fetch.Muter;
+using GenshinSwitch.Fetch.Service;
 using GenshinSwitch.Helpers;
 using GenshinSwitch.Models;
 using GenshinSwitch.Models.Messages;
@@ -73,8 +74,9 @@ partial void OnDoubleClickBehaviorIndexChanged(int value)
     }
 
     [RelayCommand]
-    private void StopDoubleClickBehaviorService()
+    private async Task StopDoubleClickBehaviorServiceAsync()
     {
+#if false
         try
         {
             foreach (Process proc in Process.GetProcessesByName("GenshinSwitch.WindowsService"))
@@ -93,6 +95,15 @@ private void StopDoubleClickBehaviorService()
         {
             Debug.WriteLine(e);
         }
+#endif
+        try
+        {
+            await Task.Run(MainService.Kill);
+        }
+        catch (Exception e)
+        {
+            Debug.WriteLine(e);
+        }
     }
 
     [ObservableProperty]

diff --git a/src/GenshinSwitch/Views/SettingsPage.xaml b/src/GenshinSwitch/Views/SettingsPage.xaml
@@ -710,7 +710,7 @@
                             <StackPanel Orientation="Horizontal">
                                 <Button HorizontalAlignment="Right"
                                     Command="{x:Bind ViewModel.StopDoubleClickBehaviorServiceCommand}"
-                                    Content="取消服务" Margin="0,0,5,0" ToolTipService.ToolTip="服务动作属于额外的选项功能，需要自行启动并自动注册，此处可以取消服务注册。"/>
+                                    Content="取消服务" Margin="0,0,5,0" ToolTipService.ToolTip="服务动作属于额外的选项功能，需要自行启动并自动注册，此处可以取消服务注册。需要服务已启动时才能取消服务注册。"/>
                                 <ComboBox MinWidth="104"
                                           HorizontalAlignment="Right"
                                           VerticalAlignment="Center"