make sure to restore body stream in case on exception

reduce log level to debug

Author: msmolka

README.md

@@ -22,7 +22,7 @@ When you install the package, it should be added to your `package.json`. Alterna
 ```json
 {
   "dependencies" : {
-    "ZNetCS.AspNetCore.Compression": "1.0.2"
+    "ZNetCS.AspNetCore.Compression": "1.0.3"
   }
 }
 ```

src/ZNetCS.AspNetCore.Compression/CompressionMiddleware.cs

@@ -91,13 +91,13 @@ public async Task Invoke(HttpContext context)
             var decompressionExecutor = context.RequestServices.GetRequiredService<DecompressionExecutor>();
 
             // first decompress incoming request
-            this.logger.LogInformation("Checking request for decompression: " + context.Request.Path);
+            this.logger.LogDebug("Checking request for decompression: " + context.Request.Path);
             if (decompressionExecutor.CanDecompress(context, this.options.Decompressors))
             {
                 await decompressionExecutor.ExecuteAsync(context, this.options.Decompressors, cancellationToken);
             }
 
-            this.logger.LogInformation("Checking response for compression: " + context.Request.Path);
+            this.logger.LogDebug("Checking response for compression: " + context.Request.Path);
             var compressionExecutor = context.RequestServices.GetRequiredService<CompressionExecutor>();
 
             // check we are supporting accepted encodings and request path is not ignored
@@ -108,15 +108,22 @@ public async Task Invoke(HttpContext context)
                     Stream bodyStream = context.Response.Body;
                     context.Response.Body = bufferedStream;
 
-                    await this.next.Invoke(context);
+                    try
+                    {
+                        await this.next.Invoke(context);
+                    }
+                    finally
+                    {
+                        context.Response.Body = bodyStream;
+                    }
 
-                    context.Response.Body = bodyStream;
                     bufferedStream.Seek(0, SeekOrigin.Begin);
 
                     // skip compression for small requests, and not allowed media types
                     if ((bufferedStream.Length < this.options.MinimumCompressionThreshold) || !compressionExecutor.CanCompress(context, this.options.AllowedMediaTypes))
                     {
                         // simply copy buffed value to output stream
+                        this.logger.LogDebug("Continue response without compression");
                         await bufferedStream.CopyToAsync(context.Response.Body, Consts.DefaultBufferSize, cancellationToken);
                     }
                     else
@@ -128,11 +135,11 @@ public async Task Invoke(HttpContext context)
             }
             else
             {
-                this.logger.LogInformation("Continue response without compression");
+                this.logger.LogDebug("Continue response without compression");
                 await this.next.Invoke(context);
             }
 
-            this.logger.LogInformation("Finished handling request.");
+            this.logger.LogDebug("Finished handling request.");
         }
 
         #endregion

src/ZNetCS.AspNetCore.Compression/Infrastructure/CompressionExecutor.cs

@@ -144,7 +144,7 @@ public async Task ExecuteAsync(HttpContext context, Stream bufferedStream, IColl
 
             if (compressor != null)
             {
-                this.logger.LogInformation($"Compressing response using {compressor.ContentCoding} compressor.");
+                this.logger.LogDebug($"Compressing response using {compressor.ContentCoding} compressor.");
 
                 // we need to wrap to be able to count length after compression, body is unreadable
                 // also all headers needs to be set before data is starting to be copied to output body
@@ -175,7 +175,7 @@ public async Task ExecuteAsync(HttpContext context, Stream bufferedStream, IColl
                     await compressionStream.CopyToAsync(context.Response.Body, Consts.DefaultBufferSize, cancellationToken);
                 }
 
-                this.logger.LogInformation("Finished compressing request.");
+                this.logger.LogDebug("Finished compressing request.");
             }
         }
 

src/ZNetCS.AspNetCore.Compression/Infrastructure/DecompressionExecutor.cs

@@ -109,7 +109,7 @@ public async Task ExecuteAsync(HttpContext context, IEnumerable<IDecompressor> d
 
             if (decompressor != null)
             {
-                this.logger.LogInformation($"Decompressing request using {decompressor.ContentCoding} decompressor.");
+                this.logger.LogDebug($"Decompressing request using {decompressor.ContentCoding} decompressor.");
 
                 Stream decompressed = new MemoryStream();
 
@@ -141,7 +141,7 @@ public async Task ExecuteAsync(HttpContext context, IEnumerable<IDecompressor> d
                     context.Request.Body = decompressed;
                 }
 
-                this.logger.LogInformation("Finished decompressing request.");
+                this.logger.LogDebug("Finished decompressing request.");
             }
         }
 

src/ZNetCS.AspNetCore.Compression/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.2",
+  "version": "1.0.3",
   "packOptions": {
     "owners": [ "Marcin Smółka" ],
     "licenseUrl": "https://raw.githubusercontent.com/msmolka/ZNetCS.AspNetCore.Compression/master/LICENSE",