Attempt to avoid leaving local deploy process hanging with named pipes

src/Bicep.Local.Deploy.IntegrationTests/KestrelProviderExtension.cs

@@ -35,9 +35,11 @@ protected override async Task RunServer(ConnectionOptions connectionOptions, Res
 
         builder.Services.AddGrpc();
         builder.Services.AddSingleton(dispatcher);
-        var app = builder.Build();
+        using var app = builder.Build();
         app.MapGrpcService<BicepExtensionImpl>();
 
-        await app.RunAsync();
+        await Task.WhenAll(
+            Task.Delay(Timeout.Infinite, cancellationToken),
+            app.RunAsync());
     }
 }

src/Bicep.Local.Deploy/Extensibility/GrpcBuiltInLocalExtension.cs

@@ -21,10 +21,11 @@ public class GrpcBuiltInLocalExtension : LocalExtensibilityHost
     private readonly BicepExtension.BicepExtensionClient client;
     private readonly Process process;
 
-    private GrpcBuiltInLocalExtension(BicepExtension.BicepExtensionClient client, Process process)
+    private GrpcBuiltInLocalExtension(BicepExtension.BicepExtensionClient client, Process process, Uri binaryPath)
     {
         this.client = client;
         this.process = process;
+        this.BinaryPath = binaryPath;
     }
 
     public static async Task<LocalExtensibilityHost> Start(Uri pathToBinary)
@@ -84,7 +85,7 @@ public static async Task<LocalExtensibilityHost> Start(Uri pathToBinary)
 
             await GrpcChannelHelper.WaitForConnectionAsync(client, cts.Token);
 
-            return new GrpcBuiltInLocalExtension(client, process);
+            return new GrpcBuiltInLocalExtension(client, process, pathToBinary);
         }
         catch (Exception ex)
         {
@@ -93,6 +94,8 @@ public static async Task<LocalExtensibilityHost> Start(Uri pathToBinary)
         }
     }
 
+    public override Uri BinaryPath { get; }
+
     public override async Task<LocalExtensibilityOperationResponse> CreateOrUpdate(ExtensibilityV2.ResourceSpecification request, CancellationToken cancellationToken)
         => Convert(await client.CreateOrUpdateAsync(Convert(request), cancellationToken: cancellationToken));
 
@@ -172,14 +175,8 @@ public override async ValueTask DisposeAsync()
 
     private static async Task TerminateProcess(Process process)
     {
-        try
-        {
-            var cts = new CancellationTokenSource(TimeSpan.FromSeconds(15));
-            await process.WaitForExitAsync(cts.Token);
-        }
-        finally
-        {
-            process.Kill();
-        }
+        var cts = new CancellationTokenSource(TimeSpan.FromSeconds(15));
+        process.Kill();
+        await process.WaitForExitAsync(cts.Token);
     }
 }

src/Bicep.Local.Deploy/Extensibility/LocalExtensibilityHost.cs

@@ -30,6 +30,8 @@ public static class LocalExtensibilityOperationResponseJsonDefaults
 
 public abstract class LocalExtensibilityHost : IAsyncDisposable
 {
+    public abstract Uri BinaryPath { get; }
+
     public abstract Task<LocalExtensibilityOperationResponse> Delete(ResourceReference request, CancellationToken cancellationToken);
 
     public abstract Task<LocalExtensibilityOperationResponse> Get(ResourceReference request, CancellationToken cancellationToken);

src/Bicep.Local.Deploy/Extensibility/LocalExtensibilityHostManager.cs

@@ -190,9 +190,9 @@ await Task.WhenAll(RegisteredExtensions.Values.Select(async extension =>
             {
                 await extension.DisposeAsync();
             }
-            catch
+            catch (Exception ex)
             {
-                // TODO: handle errors shutting down processes gracefully
+                Trace.WriteLine($"Failed to gracefully shut down extension '{extension.BinaryPath}'. Exception: {ex}");
             }
         }));
     }

src/Bicep.Local.Extension.Mock/Program.cs

@@ -54,9 +54,11 @@ protected override async Task RunServer(ConnectionOptions connectionOptions, Res
 
         builder.Services.AddGrpc();
         builder.Services.AddSingleton(dispatcher);
-        var app = builder.Build();
+        using var app = builder.Build();
         app.MapGrpcService<BicepExtensionImpl>();
 
-        await app.RunAsync();
+        await Task.WhenAll(
+            Task.Delay(Timeout.Infinite, cancellationToken),
+            app.RunAsync());
     }
 }

src/Bicep.Local.Extension/Rpc/GrpcChannelHelper.cs

@@ -15,23 +15,16 @@ namespace Bicep.Local.Extension.Rpc;
 
 public static class GrpcChannelHelper
 {
-    public class UnixDomainSocketsConnectionFactory
+    public static GrpcChannel CreateDomainSocketChannel(string socketPath)
     {
-        private readonly EndPoint endPoint;
-
-        public UnixDomainSocketsConnectionFactory(EndPoint endPoint)
-        {
-            this.endPoint = endPoint;
-        }
-
-        public async ValueTask<Stream> ConnectAsync(SocketsHttpConnectionContext _,
-            CancellationToken cancellationToken = default)
+        static async ValueTask<Stream> connectSocket(string socketPath, CancellationToken cancellationToken)
         {
+            var udsEndPoint = new UnixDomainSocketEndPoint(socketPath);
             var socket = new Socket(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified);
 
             try
             {
-                await socket.ConnectAsync(this.endPoint, cancellationToken).ConfigureAwait(false);
+                await socket.ConnectAsync(udsEndPoint, cancellationToken).ConfigureAwait(false);
                 return new NetworkStream(socket, true);
             }
             catch
@@ -40,15 +33,10 @@ public async ValueTask<Stream> ConnectAsync(SocketsHttpConnectionContext _,
                 throw;
             }
         }
-    }
 
-    public static GrpcChannel CreateDomainSocketChannel(string socketPath)
-    {
-        var udsEndPoint = new UnixDomainSocketEndPoint(socketPath);
-        var connectionFactory = new UnixDomainSocketsConnectionFactory(udsEndPoint);
         var socketsHttpHandler = new SocketsHttpHandler
         {
-            ConnectCallback = connectionFactory.ConnectAsync
+            ConnectCallback = (context, cancellationToken) => connectSocket(socketPath, cancellationToken),
         };
 
         // The URL is not used, but it must be a valid URI.
@@ -86,6 +74,7 @@ static async ValueTask<Stream> connectPipe(string pipeName, CancellationToken ca
             ConnectCallback = (context, cancellationToken) => connectPipe(pipeName, cancellationToken),
         };
 
+        // The URL is not used, but it must be a valid URI.
         return GrpcChannel.ForAddress("http://localhost", new GrpcChannelOptions
         {
             HttpHandler = socketsHttpHandler