Ensure PipeWriter is flushed (#485)

Author: twsouthwick

src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Features/HttpResponseAdapterFeature.cs

@@ -95,6 +95,11 @@ bool IHttpResponseBufferingFeature.IsEnabled
 
     private async ValueTask FlushInternalAsync()
     {
+        if (_pipeWriter is { })
+        {
+            await _pipeWriter.FlushAsync();
+        }
+
         if (_state is StreamState.Buffering && _bufferedStream is not null && !SuppressContent)
         {
             if (_filter is { } filter)
@@ -115,7 +120,23 @@ private async ValueTask FlushInternalAsync()
 
     Stream IHttpResponseBodyFeature.Stream => this;
 
-    PipeWriter IHttpResponseBodyFeature.Writer => _pipeWriter ??= PipeWriter.Create(this, new StreamPipeWriterOptions(leaveOpen: true));
+    PipeWriter IHttpResponseBodyFeature.Writer
+    {
+        get
+        {
+            if (_pipeWriter is null)
+            {
+                _pipeWriter = PipeWriter.Create(this, new StreamPipeWriterOptions(leaveOpen: true));
+
+                if (_state is StreamState.Complete)
+                {
+                    _pipeWriter.Complete();
+                }
+            }
+
+            return _pipeWriter;
+        }
+    }
 
     public bool SuppressContent
     {
@@ -233,6 +254,11 @@ private async Task CompleteAsync()
 
         _state = StreamState.Complete;
 
+        if (_pipeWriter is { })
+        {
+            await _pipeWriter.CompleteAsync();
+        }
+
         await _responseBodyFeature.CompleteAsync();
     }
 

test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/ResponseStreamTests.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -44,6 +45,32 @@ public async Task BufferedOutputIsFlushed()
         Assert.Equal(ContentValue, result);
     }
 
+    [Fact]
+    public async Task OutputPipeIsFlushed()
+    {
+        const string Message = "hello world from pipe!";
+
+        var result = await RunAsync(context =>
+        {
+            context.AsAspNetCore().Response.BodyWriter.Write(Encoding.UTF8.GetBytes(Message));
+        });
+
+        Assert.Equal(Message, result);
+    }
+
+    [Fact]
+    public async Task OutputPipeIsMarkedCompleteIfRequestIsComplete()
+    {
+        var result = await RunAsync(async context =>
+        {
+            await context.AsAspNetCore().Response.CompleteAsync();
+
+            Assert.Throws<InvalidOperationException>(() => context.AsAspNetCore().Response.BodyWriter.Write("Hello world"u8));
+        });
+
+        Assert.Empty(result);
+    }
+
     [Fact]
     public async Task BufferedOutputIsFlushedOnceWithStart()
     {