Merge pull request #21631 from 1d0n7kn0w/stream-and-resource-management

Optimization of Stream and Resource Management

framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProvider.cs

@@ -86,7 +86,7 @@ public class AliyunBlobProvider : BlobProviderBase, ITransientDependency
             return null;
         }
         var result = ossClient.GetObject(containerName, blobName);
-        return await TryCopyToMemoryStreamAsync(result.Content, args.CancellationToken);
+        return result.ResponseStream;
     }
 
     protected virtual string GetContainerName(BlobProviderArgs args)

framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobProvider.cs

@@ -103,7 +103,7 @@ public class AwsBlobProvider : BlobProviderBase, ITransientDependency
                 Key = blobName
             });
 
-            return await TryCopyToMemoryStreamAsync(response.ResponseStream, args.CancellationToken);
+            return response.ResponseStream;
         }
     }
 

framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProvider.cs

@@ -66,8 +66,7 @@ public class AzureBlobProvider : BlobProviderBase, ITransientDependency
         }
 
         var blobClient = GetBlobClient(args, blobName);
-        var download = await blobClient.DownloadAsync();
-        return await TryCopyToMemoryStreamAsync(download.Value.Content, args.CancellationToken);
+        return await blobClient.OpenReadAsync(cancellationToken: args.CancellationToken);
     }
 
     protected virtual BlobClient GetBlobClient(BlobProviderArgs args, string blobName)

framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobProvider.cs

@@ -70,13 +70,7 @@ public class FileSystemBlobProvider : BlobProviderBase, ITransientDependency
 
         return await Policy.Handle<IOException>()
             .WaitAndRetryAsync(2, retryCount => TimeSpan.FromSeconds(retryCount))
-            .ExecuteAsync(async () =>
-            {
-                using (var fileStream = File.OpenRead(filePath))
-                {
-                    return await TryCopyToMemoryStreamAsync(fileStream, args.CancellationToken);
-                }
-            });
+            .ExecuteAsync(() => Task.FromResult(File.OpenRead(filePath)));
     }
 
     protected virtual Task<bool> ExistsAsync(string filePath)

framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageCompressorContributor.cs

@@ -5,9 +5,6 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats;
-using SixLabors.ImageSharp.Formats.Jpeg;
-using SixLabors.ImageSharp.Formats.Png;
-using SixLabors.ImageSharp.Formats.Webp;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http;
 
@@ -32,7 +29,7 @@ public class ImageSharpImageCompressorContributor : IImageCompressorContributor,
             return new ImageCompressResult<Stream>(stream, ImageProcessState.Unsupported);
         }
 
-        var image = await Image.LoadAsync(stream, cancellationToken);
+        using var image = await Image.LoadAsync(stream, cancellationToken);
 
         if (!CanCompress(image.Metadata.DecodedImageFormat!.DefaultMimeType))
         {
@@ -46,7 +43,7 @@ public class ImageSharpImageCompressorContributor : IImageCompressorContributor,
             return new ImageCompressResult<Stream>(memoryStream, ImageProcessState.Done);
         }
 
-        memoryStream.Dispose();
+        await memoryStream.DisposeAsync();
         return new ImageCompressResult<Stream>(stream, ImageProcessState.Canceled);
     }
 
@@ -69,7 +66,7 @@ public class ImageSharpImageCompressorContributor : IImageCompressorContributor,
         }
 
         var newBytes = await result.Result.GetAllBytesAsync(cancellationToken);
-        result.Result.Dispose();
+        await result.Result.DisposeAsync();
         return new ImageCompressResult<byte[]>(newBytes, result.State);
     }
 
@@ -100,7 +97,7 @@ public class ImageSharpImageCompressorContributor : IImageCompressorContributor,
         }
         catch
         {
-            memoryStream.Dispose();
+            await memoryStream.DisposeAsync();
             throw;
         }
     }
@@ -110,11 +107,11 @@ public class ImageSharpImageCompressorContributor : IImageCompressorContributor,
         switch (format.DefaultMimeType)
         {
             case MimeTypes.Image.Jpeg:
-                return Options.JpegEncoder ?? new JpegEncoder();
+                return Options.JpegEncoder;
             case MimeTypes.Image.Png:
-                return Options.PngEncoder ?? new PngEncoder();
+                return Options.PngEncoder;
             case MimeTypes.Image.Webp:
-                return Options.WebpEncoder ?? new WebpEncoder();
+                return Options.WebpEncoder;
             default:
                 throw new NotSupportedException($"No encoder available for the given format: {format.Name}");
         }

framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageResizerContributor.cs

@@ -23,7 +23,7 @@ public class ImageSharpImageResizerContributor : IImageResizerContributor, ITran
             return new ImageResizeResult<Stream>(stream, ImageProcessState.Unsupported);
         }
 
-        var image = await Image.LoadAsync(stream, cancellationToken);
+        using var image = await Image.LoadAsync(stream, cancellationToken);
 
         if (!CanResize(image.Metadata.DecodedImageFormat!.DefaultMimeType))
         {
@@ -49,7 +49,7 @@ public class ImageSharpImageResizerContributor : IImageResizerContributor, ITran
         }
         catch
         {
-            memoryStream.Dispose();
+            await memoryStream.DisposeAsync();
             throw;
         }
     }
@@ -76,7 +76,7 @@ public class ImageSharpImageResizerContributor : IImageResizerContributor, ITran
 
         var newBytes = await result.Result.GetAllBytesAsync(cancellationToken);
 
-        result.Result.Dispose();
+        await result.Result.DisposeAsync();
 
         return new ImageResizeResult<byte[]>(newBytes, result.State);
     }

framework/src/Volo.Abp.Imaging.SkiaSharp/Volo/Abp/Imaging/SkiaSharpImageResizerContributor.cs

@@ -25,21 +25,19 @@ public class SkiaSharpImageResizerContributor : IImageResizerContributor, ITrans
             return new ImageResizeResult<byte[]>(bytes, ImageProcessState.Unsupported);
         }
 
-        using (var memoryStream = new MemoryStream(bytes))
-        {
-            var result = await TryResizeAsync(memoryStream, resizeArgs, mimeType, cancellationToken);
+        using var memoryStream = new MemoryStream(bytes);
+        var result = await TryResizeAsync(memoryStream, resizeArgs, mimeType, cancellationToken);
 
-            if (result.State != ImageProcessState.Done)
-            {
-                return new ImageResizeResult<byte[]>(bytes, result.State);
-            }
+        if (result.State != ImageProcessState.Done)
+        {
+            return new ImageResizeResult<byte[]>(bytes, result.State);
+        }
 
-            var newBytes = await result.Result.GetAllBytesAsync(cancellationToken);
+        var newBytes = await result.Result.GetAllBytesAsync(cancellationToken);
 
-            result.Result.Dispose();
+        result.Result.Dispose();
 
-            return new ImageResizeResult<byte[]>(newBytes, result.State);
-        }
+        return new ImageResizeResult<byte[]>(newBytes, result.State);
     }
 
     public virtual async Task<ImageResizeResult<Stream>> TryResizeAsync(Stream stream, ImageResizeArgs resizeArgs, string? mimeType = null, CancellationToken cancellationToken = default)
@@ -51,21 +49,14 @@ public class SkiaSharpImageResizerContributor : IImageResizerContributor, ITrans
 
         var (memoryBitmapStream, memorySkCodecStream) = await CreateMemoryStream(stream);
 
-        using (var original = SKBitmap.Decode(memoryBitmapStream))
-        {
-            using (var resized = original.Resize(new SKImageInfo(resizeArgs.Width, resizeArgs.Height), Options.SKFilterQuality))
-            {
-                using (var image = SKImage.FromBitmap(resized))
-                {
-                    using (var codec = SKCodec.Create(memorySkCodecStream))
-                    {
-                        var memoryStream = new MemoryStream();
-                        image.Encode(codec.EncodedFormat, Options.Quality).SaveTo(memoryStream);
-                        return new ImageResizeResult<Stream>(memoryStream, ImageProcessState.Done);
-                    }
-                }
-            }
-        }
+        using var original = SKBitmap.Decode(memoryBitmapStream);
+        using var resized = original.Resize(new SKImageInfo(resizeArgs.Width, resizeArgs.Height), Options.SKFilterQuality);
+        using var image = SKImage.FromBitmap(resized);
+        using var codec = SKCodec.Create(memorySkCodecStream);
+        var memoryStream = new MemoryStream();
+        using var skData = image.Encode(codec.EncodedFormat, Options.Quality);
+        skData.SaveTo(memoryStream);
+        return new ImageResizeResult<Stream>(memoryStream, ImageProcessState.Done);
     }
 
     protected virtual async Task<(MemoryStream, MemoryStream)> CreateMemoryStream(Stream stream)