Implement PipeBody Features and add to HttpContext (#6394)

Author: jkotalik

src/Http/Http.Abstractions/src/HttpRequest.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.IO;
+using System.IO.Pipelines;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Routing;
@@ -102,6 +103,11 @@ public abstract class HttpRequest
         /// <returns>The RequestBody Stream.</returns>
         public abstract Stream Body { get; set; }
 
+        /// <summary>
+        /// Gets or sets the request body pipe <see cref="PipeReader"/>.
+        /// </summary>
+        public abstract PipeReader BodyPipe { get; set; }
+
         /// <summary>
         /// Checks the Content-Type header for form types.
         /// </summary>

src/Http/Http.Abstractions/src/HttpResponse.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.IO.Pipelines;
 using System.Threading.Tasks;
 
 namespace Microsoft.AspNetCore.Http
@@ -39,6 +40,11 @@ public abstract class HttpResponse
         /// </summary>
         public abstract Stream Body { get; set; }
 
+        /// <summary>
+        /// Gets or sets the response body pipe <see cref="PipeWriter"/>
+        /// </summary>
+        public abstract PipeWriter BodyPipe { get; set; }
+
         /// <summary>
         /// Gets or sets the value for the <c>Content-Length</c> response header.
         /// </summary>

src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj

@@ -22,6 +22,7 @@ Microsoft.AspNetCore.Http.HttpResponse</Description>
     <Reference Include="Microsoft.AspNetCore.Http.Features" />
     <Reference Include="Microsoft.Extensions.ActivatorUtilities.Sources" PrivateAssets="All" />
     <Reference Include="System.Text.Encodings.Web" />
+    <Reference Include="System.IO.Pipelines" />
   </ItemGroup>
 
 </Project>

src/Http/Http.Features/src/IRequestBodyPipeFeature.cs

@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO.Pipelines;
+
+namespace Microsoft.AspNetCore.Http.Features
+{
+    /// <summary>
+    /// Represents the HttpRequestBody as a PipeReader.
+    /// </summary>
+    public interface IRequestBodyPipeFeature
+    {
+        /// <summary>
+        /// A <see cref="PipeWriter"/> representing the request body, if any.
+        /// </summary>
+        PipeReader RequestBodyPipe { get; set; }
+    }
+}

src/Http/Http.Features/src/IResponseBodyPipeFeature.cs

@@ -0,0 +1,19 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO.Pipelines;
+
+namespace Microsoft.AspNetCore.Http.Features
+{
+    /// <summary>
+    ///     Represents the HttpResponseBody as a PipeWriter
+    /// </summary>
+    public interface IResponseBodyPipeFeature
+    {
+        /// <summary>
+        /// A <see cref="PipeWriter"/> representing the response body, if any.
+        /// </summary>
+        PipeWriter ResponseBodyPipe { get; set; }
+    }
+}

src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj

@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.Extensions.Primitives" />
+    <Reference Include="System.IO.Pipelines" />
   </ItemGroup>
 
 </Project>

src/Http/Http/src/Features/RequestBodyPipeFeature.cs

@@ -0,0 +1,49 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO.Pipelines;
+
+namespace Microsoft.AspNetCore.Http.Features
+{
+    public class RequestBodyPipeFeature : IRequestBodyPipeFeature
+    {
+        private StreamPipeReader _internalPipeReader;
+        private PipeReader _userSetPipeReader;
+        private HttpContext _context;
+
+        public RequestBodyPipeFeature(HttpContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+            _context = context;
+        }
+
+        public PipeReader RequestBodyPipe
+        {
+            get
+            {
+                if (_userSetPipeReader != null)
+                {
+                    return _userSetPipeReader;
+                }
+
+                if (_internalPipeReader == null ||
+                    !object.ReferenceEquals(_internalPipeReader.InnerStream, _context.Request.Body))
+                {
+                    _internalPipeReader = new StreamPipeReader(_context.Request.Body);
+                    _context.Response.RegisterForDispose(_internalPipeReader);
+                }
+
+                return _internalPipeReader;
+            }
+            set
+            {
+                _userSetPipeReader = value ?? throw new ArgumentNullException(nameof(value));
+                // TODO set the request body Stream to an adapted pipe https://github.com/aspnet/AspNetCore/issues/3971
+            }
+        }
+    }
+}

src/Http/Http/src/Features/ResponseBodyPipeFeature.cs

@@ -0,0 +1,49 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO.Pipelines;
+
+namespace Microsoft.AspNetCore.Http.Features
+{
+    public class ResponseBodyPipeFeature : IResponseBodyPipeFeature
+    {
+        private StreamPipeWriter _internalPipeWriter;
+        private PipeWriter _userSetPipeWriter;
+        private HttpContext _context;
+
+        public ResponseBodyPipeFeature(HttpContext context)
+        {
+            if (context == null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+            _context = context;
+        }
+
+        public PipeWriter ResponseBodyPipe
+        {
+            get
+            {
+                if (_userSetPipeWriter != null)
+                {
+                    return _userSetPipeWriter;
+                }
+
+                if (_internalPipeWriter == null ||
+                    !object.ReferenceEquals(_internalPipeWriter.InnerStream, _context.Response.Body))
+                {
+                    _internalPipeWriter = new StreamPipeWriter(_context.Response.Body);
+                    _context.Response.RegisterForDispose(_internalPipeWriter);
+                }
+
+                return _internalPipeWriter;
+            }
+            set
+            {
+                _userSetPipeWriter = value ?? throw new ArgumentNullException(nameof(value));
+                // TODO set the response body Stream to an adapted pipe https://github.com/aspnet/AspNetCore/issues/3971
+            }
+        }
+    }
+}

src/Http/Http/src/Internal/DefaultHttpRequest.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.IO.Pipelines;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http.Features;
@@ -19,6 +20,7 @@ public class DefaultHttpRequest : HttpRequest
         private readonly static Func<HttpRequest, IFormFeature> _newFormFeature = r => new FormFeature(r);
         private readonly static Func<IFeatureCollection, IRequestCookiesFeature> _newRequestCookiesFeature = f => new RequestCookiesFeature(f);
         private readonly static Func<IFeatureCollection, IRouteValuesFeature> _newRouteValuesFeature = f => new RouteValuesFeature();
+        private readonly static Func<HttpContext, IRequestBodyPipeFeature> _newRequestBodyPipeFeature = context => new RequestBodyPipeFeature(context);
 
         private HttpContext _context;
         private FeatureReferences<FeatureInterfaces> _features;
@@ -57,6 +59,9 @@ public virtual void Uninitialize()
         private IRouteValuesFeature RouteValuesFeature =>
             _features.Fetch(ref _features.Cache.RouteValues, _newRouteValuesFeature);
 
+        private IRequestBodyPipeFeature RequestBodyPipeFeature =>
+            _features.Fetch(ref _features.Cache.BodyPipe, this.HttpContext, _newRequestBodyPipeFeature);
+
         public override PathString PathBase
         {
             get { return new PathString(HttpRequestFeature.PathBase); }
@@ -162,13 +167,20 @@ public override RouteValueDictionary RouteValues
             set { RouteValuesFeature.RouteValues = value; }
         }
 
+        public override PipeReader BodyPipe
+        {
+            get { return RequestBodyPipeFeature.RequestBodyPipe; }
+            set { RequestBodyPipeFeature.RequestBodyPipe = value; }
+        }
+
         struct FeatureInterfaces
         {
             public IHttpRequestFeature Request;
             public IQueryFeature Query;
             public IFormFeature Form;
             public IRequestCookiesFeature Cookies;
             public IRouteValuesFeature RouteValues;
+            public IRequestBodyPipeFeature BodyPipe;
         }
     }
 }

src/Http/Http/src/Internal/DefaultHttpResponse.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.IO.Pipelines;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Net.Http.Headers;
@@ -14,6 +15,7 @@ public class DefaultHttpResponse : HttpResponse
         // Lambdas hoisted to static readonly fields to improve inlining https://github.com/dotnet/roslyn/issues/13624
         private readonly static Func<IFeatureCollection, IHttpResponseFeature> _nullResponseFeature = f => null;
         private readonly static Func<IFeatureCollection, IResponseCookiesFeature> _newResponseCookiesFeature = f => new ResponseCookiesFeature(f);
+        private readonly static Func<HttpContext, IResponseBodyPipeFeature> _newResponseBodyPipeFeature = context => new ResponseBodyPipeFeature(context);
 
         private HttpContext _context;
         private FeatureReferences<FeatureInterfaces> _features;
@@ -41,6 +43,8 @@ public virtual void Uninitialize()
         private IResponseCookiesFeature ResponseCookiesFeature =>
             _features.Fetch(ref _features.Cache.Cookies, _newResponseCookiesFeature);
 
+        private IResponseBodyPipeFeature ResponseBodyPipeFeature =>
+            _features.Fetch(ref _features.Cache.BodyPipe, this.HttpContext, _newResponseBodyPipeFeature);
 
         public override HttpContext HttpContext { get { return _context; } }
 
@@ -96,6 +100,12 @@ public override bool HasStarted
             get { return HttpResponseFeature.HasStarted; }
         }
 
+        public override PipeWriter BodyPipe
+        {
+            get { return ResponseBodyPipeFeature.ResponseBodyPipe; }
+            set { ResponseBodyPipeFeature.ResponseBodyPipe = value; }
+        }
+
         public override void OnStarting(Func<object, Task> callback, object state)
         {
             if (callback == null)
@@ -134,6 +144,7 @@ struct FeatureInterfaces
         {
             public IHttpResponseFeature Response;
             public IResponseCookiesFeature Cookies;
+            public IResponseBodyPipeFeature BodyPipe;
         }
     }
 }