TerribleDev/CompressR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed require compression (#3)

Browse Source
This commit is contained in:
Brian Kennedy
2016-06-21 10:22:43 -04:00
committed by Tommy Parnell
parent 2a7036ff5a
commit 854e8ec626
4 changed files with 44 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/CompressR.Sample/Controllers/ValuesController.cs
View File

@@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using System.Web.Http;
namespace CompressR.Sample.Controllers
@@ -23,19 +24,29 @@ namespace CompressR.Sample.Controllers
return "value";
}
// POST api/values
public void Post([FromBody]string value)
[Compress]
[HttpGet, Route("TestJsonSerialization")]
public async Task<IHttpActionResult> TestJsonSerialization()
{
return Ok(new
{
A = 1,
B = new string[] { "1", "A", "B" }
});
}
// PUT api/values/5
public void Put(int id, [FromBody]string value)
[Compress(requireCompression: true)]
[HttpGet, Route("TestJsonSerialization2")]
public async Task<HttpResponseMessage> TestJsonSerialization2()
{
return Request.CreateResponse(new
{
A = 1,
B = new string[] { "1", "A", "B" }
});
}
// DELETE api/values/5
public void Delete(int id)
{
}
}
}

28
src/CompressR.WebApi/CompressAttribute.cs
View File

@@ -23,6 +23,12 @@ namespace CompressR.WebApi
}
public override void OnActionExecuted(HttpActionExecutedContext actionExecutedContext)
{
OnActionExecutedAsync(actionExecutedContext, CancellationToken.None).Wait();
}
public override async Task OnActionExecutedAsync(HttpActionExecutedContext actionExecutedContext, CancellationToken cancellationToken)
{
if(actionExecutedContext.Response.Content == null)
{
@@ -47,31 +53,9 @@ namespace CompressR.WebApi
{
return;
}
}
actionExecutedContext.Response.Content = new CompressedContent(actionExecutedContext.Response.Content, acceptedEncoding);
}
public override async Task OnActionExecutedAsync(HttpActionExecutedContext actionExecutedContext, CancellationToken cancellationToken)
{
if(actionExecutedContext.Response.Content == null)
{
return;
}
var acceptedEncoding = actionExecutedContext
.Response
.RequestMessage
.Headers
.AcceptEncoding
.Select(a => a.Value)
.Intersect(Constants.Compressors, StringComparer.OrdinalIgnoreCase)
.FirstOrDefault();
if (string.IsNullOrWhiteSpace(acceptedEncoding))
{
return;
}
actionExecutedContext.Response.Content = new CompressedContent(actionExecutedContext.Response.Content, acceptedEncoding);
}
}

27
src/CompressR.WebApi/DeflateAttribute.cs
View File

@@ -1,4 +1,5 @@
using System;
using CompressR.Exceptions;
using System;
using System.Collections.Generic;
using System.IO.Compression;
using System.Linq;
@@ -23,23 +24,7 @@ namespace CompressR.WebApi
public override void OnActionExecuted(HttpActionExecutedContext actionExecutedContext)
{
if(actionExecutedContext.Response.Content == null)
{
return;
}
var acceptedEncoding = actionExecutedContext
.Response
.RequestMessage
.Headers
.AcceptEncoding
.Select(a => a.Value)
.Any(a => a.Equals(Constants.Deflate, StringComparison.OrdinalIgnoreCase));
if (!acceptedEncoding)
{
return;
}
actionExecutedContext.Response.Content = new CompressedContent(actionExecutedContext.Response.Content, Constants.Deflate);
OnActionExecutedAsync(actionExecutedContext, CancellationToken.None).Wait();
}
public override async Task OnActionExecutedAsync(HttpActionExecutedContext actionExecutedContext, CancellationToken cancellationToken)
@@ -56,10 +41,16 @@ namespace CompressR.WebApi
.Select(a => a.Value)
.Any(a => a.Equals(Constants.Deflate, StringComparison.OrdinalIgnoreCase));
if (!acceptedEncoding && RequireCompression)
{
throw new CompressRException("Compression required but client did not send accept header");
}
if (!acceptedEncoding)
{
return;
}
actionExecutedContext.Response.Content = new CompressedContent(actionExecutedContext.Response.Content, Constants.Deflate);
}
}

28
src/CompressR.WebApi/GzipAttribute.cs
View File

@@ -1,4 +1,5 @@
using System;
using CompressR.Exceptions;
using System;
using System.IO.Compression;
using System.Linq;
using System.Net.Http;
@@ -22,23 +23,7 @@ namespace CompressR.WebApi
public override void OnActionExecuted(HttpActionExecutedContext actionExecutedContext)
{
if(actionExecutedContext.Response.Content == null)
{
return;
}
var acceptedEncoding = actionExecutedContext
.Response
.RequestMessage
.Headers
.AcceptEncoding
.Select(a => a.Value)
.Any(a => a.Equals(Constants.Gzip, StringComparison.OrdinalIgnoreCase));
if (!acceptedEncoding)
{
return;
}
actionExecutedContext.Response.Content = new CompressedContent(actionExecutedContext.Response.Content, Constants.Gzip);
OnActionExecutedAsync(actionExecutedContext, CancellationToken.None).Wait();
}
public override async Task OnActionExecutedAsync(HttpActionExecutedContext actionExecutedContext, CancellationToken cancellationToken)
@@ -55,10 +40,17 @@ namespace CompressR.WebApi
.Select(a => a.Value)
.Any(a => a.Equals(Constants.Gzip, StringComparison.OrdinalIgnoreCase));
if (!acceptedEncoding && RequireCompression)
{
throw new CompressRException("Compression required but client did not send accept header");
}
if (!acceptedEncoding)
{
return;
}
actionExecutedContext.Response.Content = new CompressedContent(actionExecutedContext.Response.Content, Constants.Gzip);
}
}