MontoyaTech/Rest.Net
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Bumped package version to 1.8.0. Added support for automatic gzip decompression in HttpListenerRequestExtensions. Added a new compress parameter for json requests in client generated code that auto compresses the json if set. Fixed a few bugs and cleaned up code.

Browse Source
This commit is contained in:
MattMo
2024-01-13 10:53:44 -08:00
parent 5f83b30cb2
commit 50861d5381
7 changed files with 377 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
Rest.Net/HttpListenerRequestExtensions.cs
View File

@@ -6,6 +6,7 @@ using System.Text;
using System.Threading.Tasks;
using System.IO;
using Newtonsoft.Json;
using System.IO.Compression;
namespace MontoyaTech.Rest.Net
{
@@ -23,9 +24,20 @@ namespace MontoyaTech.Rest.Net
{
try
{
using (var input = request.InputStream)
//If the request has been compressed, automatically handle it.
if (request.Headers["Content-Encoding"] == "gzip")
{
using (var inputStream = request.InputStream)
using (var gzipStream = new GZipStream(inputStream, CompressionMode.Decompress, true))
using (var stream = new StreamReader(gzipStream))
return stream.ReadToEnd();
}
else
{
using (var input = request.InputStream)
using (var stream = new StreamReader(input))
return stream.ReadToEnd();
}
}
catch
{
@@ -43,9 +55,20 @@ namespace MontoyaTech.Rest.Net
{
try
{
using (var input = request.InputStream)
using (var stream = new StreamReader(input))
//If the request has been compressed, automatically handle it.
if (request.Headers["Content-Encoding"] == "gzip")
{
using (var inputStream = request.InputStream)
using (var gzipStream = new GZipStream(inputStream, CompressionMode.Decompress, true))
using (var stream = new StreamReader(gzipStream))
return JsonConvert.DeserializeObject<T>(stream.ReadToEnd());
}
else
{
using (var inputStream = request.InputStream)
using (var stream = new StreamReader(inputStream))
return JsonConvert.DeserializeObject<T>(stream.ReadToEnd());
}
}
catch
{
@@ -62,12 +85,31 @@ namespace MontoyaTech.Rest.Net
{
try
{
using (var input = request.InputStream)
//If the request has been compressed, automatically handle it.
if (request.Headers["Content-Encoding"] == "gzip")
{
using (var stream = new MemoryStream())
using (var inputStream = request.InputStream)
{
input.CopyTo(stream);
return stream.ToArray();
using (var gzipStream = new GZipStream(inputStream, CompressionMode.Decompress, true))
{
using (var memoryStream = new MemoryStream())
{
gzipStream.CopyTo(memoryStream);
return memoryStream.ToArray();
}
}
}
}
else
{
using (var input = request.InputStream)
{
using (var stream = new MemoryStream())
{
input.CopyTo(stream);
return stream.ToArray();
}
}
}
}
@@ -87,8 +129,22 @@ namespace MontoyaTech.Rest.Net
{
try
{
using (var input = request.InputStream)
input.CopyTo(stream);
//If the request has been compressed, automatically handle it.
if (request.Headers["Content-Encoding"] == "gzip")
{
using (var inputStream = request.InputStream)
{
using (var gzipStream = new GZipStream(inputStream, CompressionMode.Decompress, true))
{
gzipStream.CopyTo(stream);
}
}
}
else
{
using (var input = request.InputStream)
input.CopyTo(stream);
}
return true;
}

9
Rest.Net/HttpListenerResponseExtensions.cs
View File

@@ -82,10 +82,10 @@ namespace MontoyaTech.Rest.Net
response.Headers.Add("Content-Encoding", "gzip");
var bytes = Encoding.UTF8.GetBytes(text);
using (var memoryStream = new MemoryStream())
{
var bytes = Encoding.UTF8.GetBytes(text);
using (var compressedStream = new GZipStream(memoryStream, CompressionMode.Compress, true))
compressedStream.Write(bytes, 0, bytes.Length);
@@ -152,12 +152,13 @@ namespace MontoyaTech.Rest.Net
public static HttpListenerResponse WithCompressedJson(this HttpListenerResponse response, object obj)
{
response.ContentType = "application/json; charset=utf-8";
response.Headers.Add("Content-Encoding", "gzip");
var bytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(obj));
response.Headers.Add("Content-Encoding", "gzip");
using (var memoryStream = new MemoryStream())
{
var bytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(obj));
using (var compressedStream = new GZipStream(memoryStream, CompressionMode.Compress, true))
compressedStream.Write(bytes, 0, bytes.Length);

2
Rest.Net/Rest.Net.csproj
View File

@@ -17,7 +17,7 @@
<AssemblyName>MontoyaTech.Rest.Net</AssemblyName>
<RootNamespace>MontoyaTech.Rest.Net</RootNamespace>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<Version>1.7.6</Version>
<Version>1.8.0</Version>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageIcon>Logo_Symbol_Black_Outline.png</PackageIcon>
</PropertyGroup>

107
Rest.Net/RestCSharpClientGenerator.cs
View File

@@ -35,11 +35,6 @@ namespace MontoyaTech.Rest.Net
writer.WriteLine("//Generated using MontoyaTech.Rest.Net");
writer.WriteLine("using System;");
writer.WriteLine("using System.Net;");
writer.WriteLine("using System.Net.Http;");
writer.WriteLine("using Newtonsoft.Json;");
writer.WriteBreak().WriteLine($"public class {this.ClientName}").WriteLine("{").Indent();
//Create the base url field
@@ -50,21 +45,21 @@ namespace MontoyaTech.Rest.Net
//Create the cookie container field
if (this.StaticCode)
writer.WriteBreak().WriteLine("public static CookieContainer CookieContainer;");
writer.WriteBreak().WriteLine("public static System.Net.CookieContainer CookieContainer;");
else
writer.WriteBreak().WriteLine("public CookieContainer CookieContainer;");
writer.WriteBreak().WriteLine("public System.Net.CookieContainer CookieContainer;");
//Create the client handler field
if (this.StaticCode)
writer.WriteBreak().WriteLine("public static HttpMessageHandler MessageHandler;");
writer.WriteBreak().WriteLine("public static System.Net.Http.HttpMessageHandler MessageHandler;");
else
writer.WriteBreak().WriteLine("public HttpMessageHandler MessageHandler;");
writer.WriteBreak().WriteLine("public System.Net.Http.HttpMessageHandler MessageHandler;");
//Create the http client field
if (this.StaticCode)
writer.WriteBreak().WriteLine("public static HttpClient HttpClient;");
writer.WriteBreak().WriteLine("public static System.Net.Http.HttpClient HttpClient;");
else
writer.WriteBreak().WriteLine("public HttpClient HttpClient;");
writer.WriteBreak().WriteLine("public System.Net.Http.HttpClient HttpClient;");
//Create fields foreach route group so they can be accessed.
if (!this.StaticCode)
@@ -74,11 +69,11 @@ namespace MontoyaTech.Rest.Net
//Create the client constructor or init method
if (this.StaticCode)
{
writer.WriteBreak().WriteLine("public static void Init(string baseUrl, HttpMessageHandler handler = null)").WriteLine("{").Indent();
writer.WriteBreak().WriteLine("public static void Init(string baseUrl, System.Net.Http.HttpMessageHandler handler = null)").WriteLine("{").Indent();
//Make sure the base url isn't null or whitespace
writer.WriteBreak().WriteLine("if (string.IsNullOrWhiteSpace(baseUrl))");
writer.Indent().WriteLine(@"throw new ArgumentException(""baseUrl must not be null or whitespace."");").Outdent();
writer.Indent().WriteLine(@"throw new System.ArgumentException(""baseUrl must not be null or whitespace."");").Outdent();
//If the baseUrl ends with a /, remove it.
writer.WriteBreak().WriteLine("if (baseUrl.EndsWith('/'))");
@@ -88,17 +83,17 @@ namespace MontoyaTech.Rest.Net
writer.WriteBreak().WriteLine($"{this.ClientName}.BaseUrl = baseUrl;");
//Init the cookie container
writer.WriteBreak().WriteLine($"{this.ClientName}.CookieContainer = new CookieContainer();");
writer.WriteBreak().WriteLine($"{this.ClientName}.CookieContainer = new System.Net.CookieContainer();");
//Init the client handler
writer.WriteBreak().WriteLine("if (handler == null)");
writer.WriteLine("{").Indent();
writer.WriteLine($"handler = new HttpClientHandler()");
writer.WriteLine($"handler = new System.Net.Http.HttpClientHandler()");
writer.WriteLine("{").Indent();
writer.WriteLine("AllowAutoRedirect = true,");
writer.WriteLine("UseCookies = true,");
writer.WriteLine($"CookieContainer = {this.ClientName}.CookieContainer,");
writer.WriteLine("AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate");
writer.WriteLine("AutomaticDecompression = System.Net.DecompressionMethods.GZip | System.Net.DecompressionMethods.Deflate");
writer.Outdent().WriteLine("};");
writer.Outdent().WriteLine("}");
@@ -106,7 +101,7 @@ namespace MontoyaTech.Rest.Net
writer.WriteBreak().WriteLine($"{this.ClientName}.MessageHandler = handler;");
//Init the http client
writer.WriteBreak().WriteLine($"{this.ClientName}.HttpClient = new HttpClient(handler);");
writer.WriteBreak().WriteLine($"{this.ClientName}.HttpClient = new System.Net.Http.HttpClient(handler);");
writer.WriteBreak().WriteLine(@$"{this.ClientName}.HttpClient.DefaultRequestHeaders.Add(""Accept"", ""*/*"");");
writer.WriteBreak().WriteLine(@$"{this.ClientName}.HttpClient.DefaultRequestHeaders.Add(""Connection"", ""keep-alive"");");
writer.WriteBreak().WriteLine(@$"{this.ClientName}.HttpClient.DefaultRequestHeaders.Add(""Accept-Encoding"", ""identity"");");
@@ -115,11 +110,11 @@ namespace MontoyaTech.Rest.Net
}
else
{
writer.WriteBreak().WriteLine("public Client(string baseUrl, HttpMessageHandler handler = null)").WriteLine("{").Indent();
writer.WriteBreak().WriteLine($"public {this.ClientName}(string baseUrl, System.Net.Http.HttpMessageHandler handler = null)").WriteLine("{").Indent();
//Make sure the base url isn't null or whitespace
writer.WriteBreak().WriteLine("if (string.IsNullOrWhiteSpace(baseUrl))");
writer.Indent().WriteLine(@"throw new ArgumentException(""baseUrl must not be null or whitespace."");").Outdent();
writer.Indent().WriteLine(@"throw new System.ArgumentException(""baseUrl must not be null or whitespace."");").Outdent();
//If the baseUrl ends with a /, remove it.
writer.WriteBreak().WriteLine("if (baseUrl.EndsWith('/'))");
@@ -129,17 +124,17 @@ namespace MontoyaTech.Rest.Net
writer.WriteBreak().WriteLine("this.BaseUrl = baseUrl;");
//Init the cookie container
writer.WriteBreak().WriteLine("this.CookieContainer = new CookieContainer();");
writer.WriteBreak().WriteLine("this.CookieContainer = new System.Net.CookieContainer();");
//Init the client handler
writer.WriteBreak().WriteLine("if (handler == null)");
writer.WriteLine("{").Indent();
writer.WriteLine("handler = new HttpClientHandler()");
writer.WriteLine("handler = new System.Net.Http.HttpClientHandler()");
writer.WriteLine("{").Indent();
writer.WriteLine("AllowAutoRedirect = true,");
writer.WriteLine("UseCookies = true,");
writer.WriteLine("CookieContainer = this.CookieContainer,");
writer.WriteLine("AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate");
writer.WriteLine("AutomaticDecompression = System.Net.DecompressionMethods.GZip | System.Net.DecompressionMethods.Deflate");
writer.Outdent().WriteLine("};");
writer.Outdent().WriteLine("}");
@@ -147,7 +142,7 @@ namespace MontoyaTech.Rest.Net
writer.WriteBreak().WriteLine("this.MessageHandler = handler;");
//Init the http client
writer.WriteBreak().WriteLine("this.HttpClient = new HttpClient(handler);");
writer.WriteBreak().WriteLine("this.HttpClient = new System.Net.Http.HttpClient(handler);");
writer.WriteBreak().WriteLine(@"this.HttpClient.DefaultRequestHeaders.Add(""Accept"", ""*/*"");");
writer.WriteBreak().WriteLine(@"this.HttpClient.DefaultRequestHeaders.Add(""Connection"", ""keep-alive"");");
writer.WriteBreak().WriteLine(@"this.HttpClient.DefaultRequestHeaders.Add(""Accept-Encoding"", ""identity"");");
@@ -418,36 +413,43 @@ namespace MontoyaTech.Rest.Net
writer.Write(" input");
}
//If JSON, add a compress parameter to control compressing the content.
if (routeRequest != null && routeRequest.Json)
{
writer.WriteSeparator();
writer.Write("bool compress = false");
}
writer.WriteLine(")").WriteLine("{").Indent();
//Generate the message code
writer.WriteBreak().Write($"var message = new HttpRequestMessage(");
writer.WriteBreak().Write($"var message = new System.Net.Http.HttpRequestMessage(");
switch (route.Method.ToLower())
{
case "post":
writer.Write("HttpMethod.Post");
writer.Write("System.Net.Http.HttpMethod.Post");
break;
case "get":
writer.Write("HttpMethod.Get");
writer.Write("System.Net.Http.HttpMethod.Get");
break;
case "delete":
writer.Write("HttpMethod.Delete");
writer.Write("System.Net.Http.HttpMethod.Delete");
break;
case "put":
writer.Write("HttpMethod.Put");
writer.Write("System.Net.Http.HttpMethod.Put");
break;
case "options":
writer.Write("HttpMethod.Options");
writer.Write("System.Net.Http.HttpMethod.Options");
break;
case "patch":
writer.Write("HttpMethod.Patch");
writer.Write("System.Net.Http.HttpMethod.Patch");
break;
case "head":
writer.Write("HttpMethod.Head");
writer.Write("System.Net.Http.HttpMethod.Head");
break;
case "trace":
writer.Write("HttpMethod.Trace");
writer.Write("System.Net.Http.HttpMethod.Trace");
break;
default:
throw new NotSupportedException("Unsupport route method:" + route.Method);
@@ -496,23 +498,46 @@ namespace MontoyaTech.Rest.Net
{
writer.WriteBreak().WriteLine("request.Seek(0, System.IO.SeekOrigin.Begin);");
writer.WriteBreak().WriteLine("message.Content = new StreamContent(request);");
writer.WriteBreak().WriteLine("message.Content = new System.Net.Http.StreamContent(request);");
}
else if (routeRequest.Json)
{
writer.WriteBreak().WriteLine("message.Content = new StringContent(JsonConvert.SerializeObject(request));");
writer.WriteBreak().WriteLine("if (compress)").WriteLine("{").Indent();
writer.WriteLine("using (var uncompressedStream = new System.IO.MemoryStream(System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(request))))");
writer.WriteLine("{").Indent();
writer.WriteLine("using (var compressedStream = new System.IO.MemoryStream())");
writer.WriteLine("{").Indent();
writer.WriteLine("using (var gzipStream = new System.IO.Compression.GZipStream(compressedStream, System.IO.Compression.CompressionMode.Compress, true))");
writer.Indent().WriteLine("uncompressedStream.CopyTo(gzipStream);").Outdent();
writer.WriteBreak();
writer.WriteLine("message.Content = new System.Net.Http.ByteArrayContent(compressedStream.ToArray());");
writer.WriteLine("message.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(System.Net.Mime.MediaTypeNames.Application.Json);");
writer.WriteLine("message.Content.Headers.ContentEncoding.Add(\"gzip\");");
writer.Outdent().WriteLine("}");
writer.Outdent().WriteLine("}");
writer.Outdent().WriteLine("}");
writer.WriteLine("else").WriteLine("{").Indent();
writer.WriteBreak().WriteLine("message.Content = new System.Net.Http.StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(request));");
writer.WriteBreak().WriteLine("message.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(System.Net.Mime.MediaTypeNames.Application.Json);");
writer.Outdent().WriteLine("}");
}
else
{
writer.WriteBreak().WriteLine("message.Content = new StringContent(request.ToString());");
writer.WriteBreak().WriteLine("message.Content = new System.Net.Http.StringContent(request.ToString());");
}
}
//Generate the response code
if (this.StaticCode)
writer.WriteBreak().WriteLine($"var response = {this.ClientName}.HttpClient.Send(message, HttpCompletionOption.ResponseHeadersRead);");
writer.WriteBreak().WriteLine($"var response = {this.ClientName}.HttpClient.Send(message, System.Net.Http.HttpCompletionOption.ResponseHeadersRead);");
else
writer.WriteBreak().WriteLine("var response = this.Client.HttpClient.Send(message, HttpCompletionOption.ResponseHeadersRead);");
writer.WriteBreak().WriteLine("var response = this.Client.HttpClient.Send(message, System.Net.Http.HttpCompletionOption.ResponseHeadersRead);");
//Handle the response
if (routeResponse != null)
@@ -544,7 +569,7 @@ namespace MontoyaTech.Rest.Net
if (routeResponse.Json)
{
writer.WriteBreak().WriteLine($"return JsonConvert.DeserializeObject<{(routeResponse.Dynamic ? "dynamic" : this.GetTypeFullyResolvedName(routeResponse.ResponseType))}>(content);");
writer.WriteBreak().WriteLine($"return Newtonsoft.Json.JsonConvert.DeserializeObject<{(routeResponse.Dynamic ? "dynamic" : this.GetTypeFullyResolvedName(routeResponse.ResponseType))}>(content);");
}
else
{
@@ -563,7 +588,7 @@ namespace MontoyaTech.Rest.Net
break;
case TypeCode.DateTime:
writer.WriteBreak().WriteLine("return DateTime.Parse(content);");
writer.WriteBreak().WriteLine("return System.DateTime.Parse(content);");
break;
case TypeCode.Decimal:
@@ -617,13 +642,13 @@ namespace MontoyaTech.Rest.Net
}
writer.Outdent().WriteLine("}").WriteLine("else").WriteLine("{").Indent();
writer.WriteLine(@"throw new Exception(""Unexpected Http Response StatusCode:"" + response.StatusCode);");
writer.WriteLine(@"throw new System.Exception(""Unexpected Http Response StatusCode:"" + response.StatusCode);");
writer.Outdent().WriteLine("}");
}
else
{
writer.WriteBreak().WriteLine("if (!response.IsSuccessStatusCode)").Indent();
writer.WriteLine(@"throw new Exception(""Unexpected Http Response StatusCode:"" + response.StatusCode);").Outdent();
writer.WriteLine(@"throw new System.Exception(""Unexpected Http Response StatusCode:"" + response.StatusCode);").Outdent();
}
//Close off the route function.

2
Rest.Net/RestClientGenerator.cs
View File

@@ -248,7 +248,7 @@ namespace MontoyaTech.Rest.Net
case TypeCode.Char:
return "char";
case TypeCode.DateTime:
return "DateTime";
return "System.DateTime";
case TypeCode.Decimal:
return "decimal";
case TypeCode.Double: