anna
/
NoSoliciting
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: make multi-boxing work

This commit is contained in:
Anna 2021-03-02 12:53:56 -05:00
parent 090c4eff3c
commit f6ba0106ed
2 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NoSoliciting.MessageClassifier/Program.cs
View File

@ -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();
});
})

45
NoSoliciting/Ml/MlFilter.cs
View File

@ -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();