🎨 ASF 插件 Release 版进程残留问题修复，启动优化，打开文件夹提示优化

BeyondDimension · Sep 27, 2024 · 95c10da · 95c10da
1 parent 2883405
commit 95c10da
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 37 deletions.
diff --git a/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/Plugins/Plugin.cs b/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/Plugins/Plugin.cs
@@ -113,4 +113,22 @@ public override void OnAddAutoMapper(IMapperConfigurationExpression cfg)
     {
         yield return GetConfiguration<ASFSettings_>(directoryExists);
     }
+
+    public override async ValueTask OnExit()
+    {
+        if (ArchiSteamFarmServiceImpl.ASFProcessId.HasValue)
+        {
+            try
+            {
+                var process = Process.GetProcessById(ArchiSteamFarmServiceImpl.ASFProcessId.Value);
+                process.Kill();
+                process.Dispose();
+            }
+            catch (ArgumentException)
+            {
+                // 进程已经退出
+            }
+        }
+        await base.OnExit();
+    }
 }
diff --git a/...TS.Client.Plugins.ArchiSteamFarmPlus/Services.Implementation/ArchiSteamFarmServiceImpl.cs b/...TS.Client.Plugins.ArchiSteamFarmPlus/Services.Implementation/ArchiSteamFarmServiceImpl.cs
@@ -27,6 +27,8 @@ public ArchiSteamFarmServiceImpl()
     {
     }
 
+    public static int? ASFProcessId { get; private set; }
+
     public Process? ASFProcess { get; set; }
 
     public event Action<string>? OnConsoleWirteLine;
@@ -89,26 +91,48 @@ public async Task ShellMessageInput(string data)
     {
         var isStartSuccess = false;
         var ipcUrl = string.Empty;
-        try
+
+        if (ASFProcess != null || string.IsNullOrEmpty(SharedInfo.ASFExecuteFilePath))
         {
-            if (ASFProcess != null || string.IsNullOrEmpty(SharedInfo.ASFExecuteFilePath))
-            {
-                Toast.Show(ToastIcon.Error, BDStrings.ASF_SelectASFExePath);
-                return (isStartSuccess, ipcUrl);
-            }
+            Toast.Show(ToastIcon.Error, BDStrings.ASF_SelectASFExePath);
+            return (isStartSuccess, ipcUrl);
+        }
 
-            if (ASFSettings.CheckArchiSteamFarmExe && !await CheckFileConsistence()) // 检查文件是否被篡改
-            {
-                Toast.Show(ToastIcon.Error, BDStrings.ASF_ExecuteFileUnsafe);
-                return (isStartSuccess, ipcUrl);
-            }
+        if (ASFSettings.CheckArchiSteamFarmExe && !await CheckFileConsistence()) // 检查文件是否被篡改
+        {
+            Toast.Show(ToastIcon.Error, BDStrings.ASF_ExecuteFileUnsafe);
+            return (isStartSuccess, ipcUrl);
+        }
+
+        ipcUrl = GetIPCUrl();
+        webApiService.SetIPCUrl(ipcUrl); // 设置 IPC 接口地址
+
+        KillASFProcess(); // 杀死未关闭的 ASF 进程
+
+        ASFProcess = StartAsync(SharedInfo.ASFExecuteFilePath);
+        ASFProcessId = ASFProcess?.Id;
 
-            ipcUrl = GetIPCUrl();
-            webApiService.SetIPCUrl(ipcUrl); // 设置 IPC 接口地址
+        ASFService.Current.ConsoleLogText = string.Empty;
+        Task2.InBackground(ReadOutPutData, true);
+        AppDomain.CurrentDomain.ProcessExit += ExitHandler;
+        AppDomain.CurrentDomain.UnhandledException += ExitHandler;
 
-            KillASFProcess(); // 杀死未关闭的 ASF 进程
+        ASFProcess!.ErrorDataReceived += new DataReceivedEventHandler(ExitHandler);
+        ASFProcess.BeginErrorReadLine();
 
-            var options = new ProcessStartInfo(SharedInfo.ASFExecuteFilePath);
+        using var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(60));
+        while (
+            !(isStartSuccess = SocketHelper.IsUsePort(CurrentIPCPortValue)) &&
+            !cancellationTokenSource.IsCancellationRequested)
+        {
+            await Task.Delay(1000);
+            continue;
+        }
+        return (isStartSuccess, ipcUrl);
+
+        Process? StartAsync(string fileName)
+        {
+            var options = new ProcessStartInfo(fileName);
             options.CreateNoWindow = true;
             options.UseShellExecute = false;
             options.RedirectStandardOutput = true;
@@ -120,26 +144,8 @@ public async Task ShellMessageInput(string data)
                 options.ArgumentList.Add("--CRYPTKEY");
                 options.ArgumentList.Add(EncryptionKey);
             }
-            ASFProcess = Process.Start(options);
-
-            ASFService.Current.ConsoleLogText = string.Empty;
-            Task2.InBackground(ReadOutPutData, true);
-            AppDomain.CurrentDomain.ProcessExit += ExitHandler;
-            AppDomain.CurrentDomain.UnhandledException += ExitHandler;
-
-            ASFProcess!.ErrorDataReceived += new DataReceivedEventHandler(ExitHandler);
-            ASFProcess.BeginErrorReadLine();
-            while (!SocketHelper.IsUsePort(CurrentIPCPortValue))
-            {
-                Thread.Sleep(1000);
-                continue;
-            }
-            isStartSuccess = true;
+            return Process.Start(options);
         }
-        catch (Exception)
-        {
-        }
-        return (isStartSuccess, ipcUrl);
     }
 
     private void KillASFProcess()

diff --git a/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/Services/Mvvm/ASFService.cs b/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/Services/Mvvm/ASFService.cs
@@ -156,8 +156,20 @@ public async void RefreshConfig()
 
     public void OpenFolder(string tag)
     {
-        if (!Enum.TryParse<EPathFolder>(tag, true, out var folderASFPath)) return;
-        var folderASFPathValue = folderASFPath.GetFolderPath();
+        if (string.IsNullOrEmpty(ASFSettings.ArchiSteamFarmExePath.Value))
+        {
+            Toast.Show(ToastIcon.Error, BDStrings.ASF_SetExePathFirst);
+            return;
+        }
+
+        string folderASFPathValue = string.Empty;
+        if (!Enum.TryParse<EPathFolder>(tag, true, out var folderASFPath) ||
+            !Path.Exists(folderASFPathValue = folderASFPath.GetFolderPath()))
+        {
+            Toast.Show(ToastIcon.Error, BDStrings.ASF_SelectASFExePath);
+            return;
+        }
+
         IPlatformService.Instance.OpenFolder(folderASFPathValue);
     }
 

diff --git a/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/_/ArchiSteamFarm/SharedInfo.cs b/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/_/ArchiSteamFarm/SharedInfo.cs
@@ -32,7 +32,9 @@ internal static string HomeDirectory
     {
         get
         {
-            return Path.GetDirectoryName(ASFSettingsExecuteFilePath) ?? string.Empty;
+            return !string.IsNullOrWhiteSpace(ASFSettingsExecuteFilePath)
+                ? Path.GetDirectoryName(ASFSettingsExecuteFilePath) ?? string.Empty
+                : string.Empty;
         }
     }