From f6ba0106ed4f27d9da58778cb1d0b9ea757dcb9c Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Tue, 2 Mar 2021 12:53:56 -0500
Subject: [PATCH] fix: make multi-boxing work

---
 NoSoliciting.MessageClassifier/Program.cs |  3 +-
 NoSoliciting/Ml/MlFilter.cs               | 45 +++++------------------
 2 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/NoSoliciting.MessageClassifier/Program.cs b/NoSoliciting.MessageClassifier/Program.cs
index 10ce7ca..103c8ce 100644
--- a/NoSoliciting.MessageClassifier/Program.cs
+++ b/NoSoliciting.MessageClassifier/Program.cs
@@ -18,6 +18,7 @@ namespace NoSoliciting.MessageClassifier {
             }
 
             var gameName = args[1];
+            var pipeId = args[2];
 
             var host = Host.CreateDefaultBuilder()
                 .ConfigureServices(services => {
@@ -25,7 +26,7 @@ namespace NoSoliciting.MessageClassifier {
                 })
                 .ConfigureIpcHost(builder => {
                     builder.AddNamedPipeEndpoint<IClassifier>(options => {
-                        options.PipeName = "NoSoliciting.MessageClassifier";
+                        options.PipeName = $"NoSoliciting.MessageClassifier-{pipeId}";
                         options.Serializer = new BetterIpcSerialiser();
                     });
                 })
diff --git a/NoSoliciting/Ml/MlFilter.cs b/NoSoliciting/Ml/MlFilter.cs
index 2b035af..76bc027 100644
--- a/NoSoliciting/Ml/MlFilter.cs
+++ b/NoSoliciting/Ml/MlFilter.cs
@@ -89,15 +89,12 @@ namespace NoSoliciting.Ml {
 
             var pluginFolder = Util.PluginFolder(plugin);
 
-            var pidPath = Path.Combine(pluginFolder, "classifier.pid");
-
-            // close the old classifier if it's still open
-            CloseOldClassifier(pidPath);
-
             var exePath = await ExtractClassifier(pluginFolder);
 
-            var process = StartClassifier(exePath, pidPath);
-            var client = await CreateClassifierClient(data);
+            var pipeId = Guid.NewGuid();
+
+            var process = StartClassifier(exePath, pipeId);
+            var client = await CreateClassifierClient(pipeId, data);
 
             return new MlFilter(
                 manifest.Item1!.Version,
@@ -107,10 +104,10 @@ namespace NoSoliciting.Ml {
             );
         }
 
-        private static async Task<IIpcClient<IClassifier>> CreateClassifierClient(byte[] data) {
+        private static async Task<IIpcClient<IClassifier>> CreateClassifierClient(Guid pipeId, byte[] data) {
             var serviceProvider = new ServiceCollection()
                 .AddNamedPipeIpcClient<IClassifier>("client", (_, options) => {
-                    options.PipeName = "NoSoliciting.MessageClassifier";
+                    options.PipeName = $"NoSoliciting.MessageClassifier-{pipeId}";
                     options.Serializer = new BetterIpcSerialiser();
                 })
                 .BuildServiceProvider();
@@ -122,17 +119,15 @@ namespace NoSoliciting.Ml {
             return client;
         }
 
-        private static Process StartClassifier(string exePath, string pidPath) {
+        private static Process StartClassifier(string exePath, Guid pipeId) {
             var game = Process.GetCurrentProcess();
 
             var startInfo = new ProcessStartInfo(exePath) {
                 CreateNoWindow = true,
                 UseShellExecute = false,
-                Arguments = $"{game.Id} \"{game.ProcessName}\"",
+                Arguments = $"\"{game.Id}\" \"{game.ProcessName}\" \"{pipeId}\"",
             };
-            var process = Process.Start(startInfo);
-            File.WriteAllText(pidPath, process!.Id.ToString());
-            return process;
+            return Process.Start(startInfo)!;
         }
 
         private static async Task<string> ExtractClassifier(string pluginFolder) {
@@ -145,28 +140,6 @@ namespace NoSoliciting.Ml {
             return exePath;
         }
 
-        private static void CloseOldClassifier(string pidPath) {
-            if (!File.Exists(pidPath)) {
-                return;
-            }
-
-            if (!int.TryParse(File.ReadAllText(pidPath).Trim(), out var pid)) {
-                return;
-            }
-
-            try {
-                var old = Process.GetProcessById(pid);
-                if (old.ProcessName != "NoSoliciting.MessageClassifier.exe") {
-                    return;
-                }
-
-                old.Kill();
-                old.WaitForExit();
-            } catch (ArgumentException) {
-                // ignore
-            }
-        }
-
         private static async Task<byte[]?> DownloadModel(Uri url) {
             try {
                 using var client = new WebClient();