Avoid uncaught exceptions from OnExit handler. (#30)

tmds · Jun 24, 2024 · 499af3b · 499af3b
1 parent bfdf6a9
commit 499af3b
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 5 deletions.
diff --git a/src/Tmds.ExecFunction/ExecFunction.cs b/src/Tmds.ExecFunction/ExecFunction.cs
@@ -136,17 +136,31 @@ private static (Process process, Task exitedTask) Start(MethodInfo method, strin
                     tcs = new TaskCompletionSource<bool>();
                 }
 
-                if (options.OnExit != null || tcs != null)
+                if ((options.OnExit != null && !!waitForExit) || tcs != null)
                 {
                     process.EnableRaisingEvents = true;
                     process.Exited += (_1, _2) =>
                     {
-                        options.OnExit(process);
-
                         if (tcs != null)
                         {
-                            tcs?.SetResult(true);
-                            process.Dispose();
+                            try
+                            {
+                                options.OnExit?.Invoke(process);
+                                tcs.SetResult(true);
+                            }
+                            catch (Exception ex)
+                            {
+                                tcs.SetException(ex);
+                            }
+                            finally
+                            {
+                                process.Dispose();
+                            }
+                        }
+                        else if (!waitForExit)
+                        {
+                            // If this throws, the exception is uncaught.
+                            options.OnExit?.Invoke(process);
                         }
                     };
                 }
@@ -156,6 +170,7 @@ private static (Process process, Task exitedTask) Start(MethodInfo method, strin
                 if (waitForExit)
                 {
                     process.WaitForExit();
+                    options.OnExit?.Invoke(process);
                 }
 
                 return (process, tcs?.Task);

diff --git a/test/Tmds.ExecFunction.Tests/UnitTest1.cs b/test/Tmds.ExecFunction.Tests/UnitTest1.cs
@@ -131,5 +131,32 @@ await FunctionExecutor.RunAsync(
             Assert.Equal("hello world", outText);
         }
 
+        [Fact]
+        public async Task RunAsyncCapturesOnExitException()
+        {
+            await Assert.ThrowsAsync<ApplicationException>(() =>
+                ExecFunction.RunAsync(
+                    () => 42,
+                    o =>
+                    {
+                        o.OnExit = process => { throw new ApplicationException(); };
+                    }
+            ));
+        }
+
+        [Fact]
+        public void RunThrowsOnExitException()
+        {
+            Assert.Throws<ApplicationException>(() =>
+            {
+                ExecFunction.Run(
+                    () => 42,
+                    o =>
+                    {
+                        o.OnExit = process => { throw new ApplicationException(); };
+                    }
+                );
+            });
+    }
     }
 }