Merge pull request #107 from SixLabors/js/stream-pooling

Use RecyclableMemoryStream

Author: JimBobSquarePants

Directory.Build.targets

@@ -23,6 +23,7 @@
 
     <!--Src Dependencies-->
     <PackageReference Update="Azure.Storage.Blobs" Version="12.4.0" />
+    <PackageReference Update="Microsoft.IO.RecyclableMemoryStream" Version="1.3.5" />
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
     <PackageReference Update="MinVer" PrivateAssets="All" Version="2.3.0" />
     <PackageReference Update="SixLabors.ImageSharp" Version="1.0.1" />

README.md

@@ -45,7 +45,7 @@ Install stable releases via Nuget; development releases are available via MyGet.
 
 | Package Name                   | Release (NuGet) | Nightly (MyGet) |
 |--------------------------------|-----------------|-----------------|
-| `SixLabors.ImageSharp.Web`         | [![NuGet](https://img.shields.io/nuget/v/SixLabors.ImageSharp.Web.svg)](https://www.nuget.org/packages/SixLabors.ImageSharp.Web/) | [![MyGet](https://img.shields.io/myget/sixlabors/v/SixLabors.ImageSharp.Web.svg)](https://www.myget.org/feed/sixlabors/package/nuget/SixLabors.ImageSharp.Web) |
+| `SixLabors.ImageSharp.Web`         | [![NuGet](https://img.shields.io/nuget/v/SixLabors.ImageSharp.Web.svg)](https://www.nuget.org/packages/SixLabors.ImageSharp.Web/) | [![MyGet](https://img.shields.io/myget/sixlabors/vpre/SixLabors.ImageSharp.Web.svg)](https://www.myget.org/feed/sixlabors/package/nuget/SixLabors.ImageSharp.Web) |
 
 ## Manual build
 

src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProvider.cs

@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.Options;
+using Microsoft.IO;
 using SixLabors.ImageSharp.Web.Resolvers;
 using SixLabors.ImageSharp.Web.Resolvers.Azure;
 
@@ -34,6 +35,12 @@ private readonly Dictionary<string, BlobContainerClient> containers
         /// </summary>
         private readonly AzureBlobStorageImageProviderOptions storageOptions;
 
+        /// <summary>
+        /// The recyclable memorystream manager used for managing pooled stream
+        /// buffers independently from image buffer pooling.
+        /// </summary>
+        private readonly RecyclableMemoryStreamManager memoryStreamManager;
+
         /// <summary>
         /// Contains various helper methods based on the current configuration.
         /// </summary>
@@ -48,14 +55,21 @@ private readonly Dictionary<string, BlobContainerClient> containers
         /// Initializes a new instance of the <see cref="AzureBlobStorageImageProvider"/> class.
         /// </summary>
         /// <param name="storageOptions">The blob storage options.</param>
+        /// <param name="memoryStreamManager">
+        /// The recyclable memorystream manager used for managing pooled stream
+        /// buffers independently from image buffer pooling.
+        /// </param>
         /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
         public AzureBlobStorageImageProvider(
             IOptions<AzureBlobStorageImageProviderOptions> storageOptions,
+            RecyclableMemoryStreamManager memoryStreamManager,
             FormatUtilities formatUtilities)
         {
             Guard.NotNull(storageOptions, nameof(storageOptions));
+            Guard.NotNull(memoryStreamManager, nameof(memoryStreamManager));
 
             this.storageOptions = storageOptions.Value;
+            this.memoryStreamManager = memoryStreamManager;
             this.formatUtilities = formatUtilities;
 
             foreach (AzureBlobContainerClientOptions container in this.storageOptions.BlobContainers)
@@ -122,7 +136,7 @@ public async Task<IImageResolver> GetAsync(HttpContext context)
                 return null;
             }
 
-            return new AzureBlobStorageImageResolver(blob);
+            return new AzureBlobStorageImageResolver(blob, this.memoryStreamManager);
         }
 
         /// <inheritdoc/>

src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageImageResolver.cs

@@ -7,6 +7,7 @@
 using Azure;
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
+using Microsoft.IO;
 
 namespace SixLabors.ImageSharp.Web.Resolvers.Azure
 {
@@ -15,13 +16,22 @@ namespace SixLabors.ImageSharp.Web.Resolvers.Azure
     /// </summary>
     public class AzureBlobStorageImageResolver : IImageResolver
     {
+        private readonly RecyclableMemoryStreamManager memoryStreamManager;
         private readonly BlobClient blob;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AzureBlobStorageImageResolver"/> class.
         /// </summary>
         /// <param name="blob">The Azure blob.</param>
-        public AzureBlobStorageImageResolver(BlobClient blob) => this.blob = blob;
+        /// <param name="memoryStreamManager">
+        /// The recyclable memorystream manager used for managing pooled stream
+        /// buffers independently from image buffer pooling.
+        /// </param>
+        public AzureBlobStorageImageResolver(BlobClient blob, RecyclableMemoryStreamManager memoryStreamManager)
+        {
+            this.blob = blob;
+            this.memoryStreamManager = memoryStreamManager;
+        }
 
         /// <inheritdoc/>
         public async Task<ImageMetadata> GetMetaDataAsync()
@@ -36,7 +46,7 @@ public async Task<Stream> OpenReadAsync()
             // Copy to a MemoryStream first because RetriableStreamImpl
             // doesn't support Position.
             Stream blobStream = (await this.blob.DownloadAsync()).Value.Content;
-            var memoryStream = new ChunkedMemoryStream();
+            var memoryStream = new RecyclableMemoryStream(this.memoryStreamManager);
 
             await blobStream.CopyToAsync(memoryStream);
             memoryStream.Seek(0, SeekOrigin.Begin);