Merge branch 'master' into pd-upscaler

Author: praydog

csharp-api/REFCoreDeps/PipeServer.cs

@@ -154,6 +154,7 @@ static void ServerLoop()
                     pipe = null; // prevent finally from disposing
                     var clientThread = new Thread(() => {
                         try { HandleClient(clientPipe, token); }
+                        catch (Exception ex) { Console.WriteLine("[PipeServer] Client error: " + ex.Message); }
                         finally { try { clientPipe.Dispose(); } catch { } }
                     }) { IsBackground = true, Name = "PipeServer.Client" };
                     clientThread.Start();
@@ -178,46 +179,54 @@ static void ServerLoop()
 
         static void HandleClient(NamedPipeServerStream pipe, CancellationToken token)
         {
-            using var reader = new StreamReader(pipe, s_utf8NoBom, detectEncodingFromByteOrderMarks: false, leaveOpen: true);
-            using var writer = new StreamWriter(pipe, s_utf8NoBom, leaveOpen: true) { AutoFlush = true };
+            var reader = new StreamReader(pipe, s_utf8NoBom, detectEncodingFromByteOrderMarks: false, leaveOpen: true);
+            var writer = new StreamWriter(pipe, s_utf8NoBom, leaveOpen: true) { AutoFlush = true };
 
-            while (!token.IsCancellationRequested && pipe.IsConnected)
+            try
             {
-                string line;
-                try
-                {
-                    line = reader.ReadLine();
-                }
-                catch
+                while (!token.IsCancellationRequested && pipe.IsConnected)
                 {
-                    break; // pipe broken
-                }
+                    string line;
+                    try
+                    {
+                        line = reader.ReadLine();
+                    }
+                    catch
+                    {
+                        break; // pipe broken
+                    }
 
-                if (line == null) break; // client disconnected
+                    if (line == null) break; // client disconnected
 
-                line = line.Trim();
-                if (line.Length == 0) continue;
+                    line = line.Trim();
+                    if (line.Length == 0) continue;
 
-                string response;
-                try
-                {
-                    response = DispatchRequest(line);
-                }
-                catch (Exception ex)
-                {
-                    response = JsonSerializer.Serialize(new { id = 0, error = ex.Message });
-                }
+                    string response;
+                    try
+                    {
+                        response = DispatchRequest(line);
+                    }
+                    catch (Exception ex)
+                    {
+                        response = JsonSerializer.Serialize(new { id = 0, error = ex.Message });
+                    }
 
-                try
-                {
-                    writer.WriteLine(response);
-                    pipe.Flush();
-                }
-                catch
-                {
-                    break; // pipe broken
+                    try
+                    {
+                        writer.WriteLine(response);
+                        pipe.Flush();
+                    }
+                    catch
+                    {
+                        break; // pipe broken
+                    }
                 }
             }
+            finally
+            {
+                try { writer.Dispose(); } catch { }
+                try { reader.Dispose(); } catch { }
+            }
 
             Console.WriteLine("[PipeServer] Client disconnected");
         }

csharp-api/cmake.toml

@@ -282,7 +282,7 @@ set_dotnet_references(CSharpAPITestWebAPI "mhwilds" "${MHWILDS_DLLS}")
 [target.CSharpAPITestRE9]
 condition = "build-csharp-test-re9"
 type = "CSharpSharedTarget"
-sources = ["test/Test/TestRE9.cs"]
+sources = ["test/Test/ZombieSpawner.cs"]
 link-libraries = ["csharp-api"]
 cmake-after = """
 set_dotnet_references(CSharpAPITestRE9 "re9" "${RE9_DLLS}")