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

Bumped package version to 1.1.6 and removed RouteListenerContext in favor of built in HttpListenerContext since it's already apart of .Net. Cleaned up code and build passes.

Browse Source
This commit is contained in:
MattMo 2023-02-02 09:51:34 -08:00
parent 7dcc28d5e0
commit cd6dd40fe2
8 changed files with 59 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Rest.Net.Example/Program.cs
View File

@ -34,12 +34,12 @@ namespace MontoyaTech.Rest.Net.Example
new Route(HttpRequestMethod.Get, "/json", Json)
);
listener.RequestPreProcessEvent += (RouteListenerContext context) => {
listener.RequestPreProcessEvent += (HttpListenerContext context) => {
Console.WriteLine("Request start: " + context.Request.RawUrl);
return true;
};
listener.RequestPostProcessEvent += (RouteListenerContext context) =>
listener.RequestPostProcessEvent += (HttpListenerContext context) =>
{
Console.WriteLine("Request end: " + context.Request.RawUrl);
};
@ -56,22 +56,22 @@ namespace MontoyaTech.Rest.Net.Example
listener.Block();
}
public static HttpListenerResponse Status(RouteListenerContext context)
public static HttpListenerResponse Status(HttpListenerContext context)
{
return context.Response.WithStatus(HttpStatusCode.OK).WithText("Everything is operational. 👍");
}
public static HttpListenerResponse Add(RouteListenerContext context, double a, double b)
public static HttpListenerResponse Add(HttpListenerContext context, double a, double b)
{
return context.Response.WithStatus(HttpStatusCode.OK).WithText((a + b).ToString());
}
public static HttpListenerResponse Signup(RouteListenerContext context, User user)
public static HttpListenerResponse Signup(HttpListenerContext context, User user)
{
return context.Response.WithStatus(HttpStatusCode.OK).WithText("User:" + user.Name);
}
public static HttpListenerResponse Json(RouteListenerContext context)
public static HttpListenerResponse Json(HttpListenerContext context)
{
return context.Response.WithStatus(HttpStatusCode.OK).WithJson(new User("Rest.Net"));
}

3
Rest.Net/RequestPostProcessEventHandler.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Net;
namespace MontoyaTech.Rest.Net
{
@ -10,5 +11,5 @@ namespace MontoyaTech.Rest.Net
/// A delegate to post process requests.
/// </summary>
/// <param name="context"></param>
public delegate void RequestPostProcessEventHandler(RouteListenerContext context);
public delegate void RequestPostProcessEventHandler(HttpListenerContext context);
}

3
Rest.Net/RequestPreProcessEventHandler.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Net;
namespace MontoyaTech.Rest.Net
{
@ -11,5 +12,5 @@ namespace MontoyaTech.Rest.Net
/// </summary>
/// <param name="context"></param>
/// <returns></returns>
public delegate bool RequestPreProcessEventHandler(RouteListenerContext context);
public delegate bool RequestPreProcessEventHandler(HttpListenerContext context);
}

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.1.5</Version>
<Version>1.1.6</Version>
<PackageReleaseNotes>Upgraded to latest version of Newtonsoft.Json</PackageReleaseNotes>
<PackageIcon>Logo_Symbol_Black_Outline.png</PackageIcon>
</PropertyGroup>

75
Rest.Net/Route.cs
View File

@ -25,13 +25,16 @@ namespace MontoyaTech.Rest.Net
/// <summary>
/// The target function to invoke if this route is invoked.
/// </summary>
private Func<RouteListenerContext, HttpListenerResponse> Target;
private Func<HttpListenerContext, HttpListenerResponse> Target;
/// <summary>
/// Whether or not to close the response after the route is invoked.
/// </summary>
public bool CloseResponse = true;
/// <summary>
/// Creates a default Route.
/// </summary>
internal Route() { }
/// <summary>
@ -42,7 +45,7 @@ namespace MontoyaTech.Rest.Net
/// <param name="syntax"></param>
/// <param name="target"></param>
/// <param name="closeResponse"></param>
public Route(string method, string syntax, Func<RouteListenerContext, HttpListenerResponse> target, bool closeResponse = true)
public Route(string method, string syntax, Func<HttpListenerContext, HttpListenerResponse> target, bool closeResponse = true)
{
this.Method = method;
this.Syntax = syntax;
@ -58,7 +61,7 @@ namespace MontoyaTech.Rest.Net
/// <param name="syntax"></param>
/// <param name="target"></param>
/// <param name="closeResponse"></param>
public Route(HttpRequestMethod method, string syntax, Func<RouteListenerContext, HttpListenerResponse> target, bool closeResponse = true)
public Route(HttpRequestMethod method, string syntax, Func<HttpListenerContext, HttpListenerResponse> target, bool closeResponse = true)
: this(method.ToString(), syntax, target, closeResponse) { }
/// <summary>
@ -110,7 +113,7 @@ namespace MontoyaTech.Rest.Net
/// </summary>
/// <param name="context"></param>
/// <param name="arguments"></param>
public virtual void Invoke(RouteListenerContext context, params string[] arguments)
public virtual void Invoke(HttpListenerContext context, params string[] arguments)
{
this.Target.Invoke(context);
}
@ -118,9 +121,9 @@ namespace MontoyaTech.Rest.Net
public class Route<T1> : Route
{
private Func<RouteListenerContext, T1, HttpListenerResponse> Target;
private Func<HttpListenerContext, T1, HttpListenerResponse> Target;
public Route(string method, string syntax, Func<RouteListenerContext, T1, HttpListenerResponse> target, bool closeResponse = true)
public Route(string method, string syntax, Func<HttpListenerContext, T1, HttpListenerResponse> target, bool closeResponse = true)
{
this.Method = method;
this.Syntax = syntax;
@ -128,10 +131,10 @@ namespace MontoyaTech.Rest.Net
this.CloseResponse = closeResponse;
}
public Route(HttpRequestMethod method, string syntax, Func<RouteListenerContext, T1, HttpListenerResponse> target, bool closeResponse = true)
public Route(HttpRequestMethod method, string syntax, Func<HttpListenerContext, T1, HttpListenerResponse> target, bool closeResponse = true)
: this(method.ToString(), syntax, target, closeResponse) { }
public override void Invoke(RouteListenerContext context, params string[] arguments)
public override void Invoke(HttpListenerContext context, params string[] arguments)
{
this.Target.DynamicInvoke(context, RouteArgumentConverter.Convert<T1>(arguments[0]));
}
@ -139,9 +142,9 @@ namespace MontoyaTech.Rest.Net
public class Route<T1, T2> : Route
{
private Func<RouteListenerContext, T1, T2, HttpListenerResponse> Target;
private Func<HttpListenerContext, T1, T2, HttpListenerResponse> Target;
public Route(string method, string syntax, Func<RouteListenerContext, T1, T2, HttpListenerResponse> target, bool closeResponse = true)
public Route(string method, string syntax, Func<HttpListenerContext, T1, T2, HttpListenerResponse> target, bool closeResponse = true)
{
this.Method = method;
this.Syntax = syntax;
@ -149,10 +152,10 @@ namespace MontoyaTech.Rest.Net
this.CloseResponse = closeResponse;
}
public Route(HttpRequestMethod method, string syntax, Func<RouteListenerContext, T1, T2, HttpListenerResponse> target, bool closeResponse = true)
public Route(HttpRequestMethod method, string syntax, Func<HttpListenerContext, T1, T2, HttpListenerResponse> target, bool closeResponse = true)
: this(method.ToString(), syntax, target, closeResponse) { }
public override void Invoke(RouteListenerContext context, params string[] arguments)
public override void Invoke(HttpListenerContext context, params string[] arguments)
{
this.Target.DynamicInvoke(
context,
@ -164,9 +167,9 @@ namespace MontoyaTech.Rest.Net
public class Route<T1, T2, T3> : Route
{
private Func<RouteListenerContext, T1, T2, T3, HttpListenerResponse> Target;
private Func<HttpListenerContext, T1, T2, T3, HttpListenerResponse> Target;
public Route(string method, string syntax, Func<RouteListenerContext, T1, T2, T3, HttpListenerResponse> target, bool closeResponse = true)
public Route(string method, string syntax, Func<HttpListenerContext, T1, T2, T3, HttpListenerResponse> target, bool closeResponse = true)
{
this.Method = method;
this.Syntax = syntax;
@ -174,10 +177,10 @@ namespace MontoyaTech.Rest.Net
this.CloseResponse = closeResponse;
}
public Route(HttpRequestMethod method, string syntax, Func<RouteListenerContext, T1, T2, T3, HttpListenerResponse> target, bool closeResponse = true)
public Route(HttpRequestMethod method, string syntax, Func<HttpListenerContext, T1, T2, T3, HttpListenerResponse> target, bool closeResponse = true)
: this(method.ToString(), syntax, target, closeResponse) { }
public override void Invoke(RouteListenerContext context, params string[] arguments)
public override void Invoke(HttpListenerContext context, params string[] arguments)
{
this.Target.DynamicInvoke(
context,
@ -190,9 +193,9 @@ namespace MontoyaTech.Rest.Net
public class Route<T1, T2, T3, T4> : Route
{
private Func<RouteListenerContext, T1, T2, T3, T4, HttpListenerResponse> Target;
private Func<HttpListenerContext, T1, T2, T3, T4, HttpListenerResponse> Target;
public Route(string method, string syntax, Func<RouteListenerContext, T1, T2, T3, T4, HttpListenerResponse> target, bool closeResponse = true)
public Route(string method, string syntax, Func<HttpListenerContext, T1, T2, T3, T4, HttpListenerResponse> target, bool closeResponse = true)
{
this.Method = method;
this.Syntax = syntax;
@ -200,10 +203,10 @@ namespace MontoyaTech.Rest.Net
this.CloseResponse = closeResponse;
}
public Route(HttpRequestMethod method, string syntax, Func<RouteListenerContext, T1, T2, T3, T4, HttpListenerResponse> target, bool closeResponse = true)
public Route(HttpRequestMethod method, string syntax, Func<HttpListenerContext, T1, T2, T3, T4, HttpListenerResponse> target, bool closeResponse = true)
: this(method.ToString(), syntax, target, closeResponse) { }
public override void Invoke(RouteListenerContext context, params string[] arguments)
public override void Invoke(HttpListenerContext context, params string[] arguments)
{
this.Target.DynamicInvoke(
context,
@ -217,9 +220,9 @@ namespace MontoyaTech.Rest.Net
public class Route<T1, T2, T3, T4, T5> : Route
{
private Func<RouteListenerContext, T1, T2, T3, T4, T5, HttpListenerResponse> Target;
private Func<HttpListenerContext, T1, T2, T3, T4, T5, HttpListenerResponse> Target;
public Route(string method, string syntax, Func<RouteListenerContext, T1, T2, T3, T4, T5, HttpListenerResponse> target, bool closeResponse = true)
public Route(string method, string syntax, Func<HttpListenerContext, T1, T2, T3, T4, T5, HttpListenerResponse> target, bool closeResponse = true)
{
this.Method = method;
this.Syntax = syntax;
@ -227,10 +230,10 @@ namespace MontoyaTech.Rest.Net
this.CloseResponse = closeResponse;
}
public Route(HttpRequestMethod method, string syntax, Func<RouteListenerContext, T1, T2, T3, T4, T5, HttpListenerResponse> target, bool closeResponse = true)
public Route(HttpRequestMethod method, string syntax, Func<HttpListenerContext, T1, T2, T3, T4, T5, HttpListenerResponse> target, bool closeResponse = true)
: this(method.ToString(), syntax, target, closeResponse) { }
public override void Invoke(RouteListenerContext context, params string[] arguments)
public override void Invoke(HttpListenerContext context, params string[] arguments)
{
this.Target.DynamicInvoke(
context,
@ -245,9 +248,9 @@ namespace MontoyaTech.Rest.Net
public class Route<T1, T2, T3, T4, T5, T6> : Route
{
private Func<RouteListenerContext, T1, T2, T3, T4, T5, T6, HttpListenerResponse> Target;
private Func<HttpListenerContext, T1, T2, T3, T4, T5, T6, HttpListenerResponse> Target;
public Route(string method, string syntax, Func<RouteListenerContext, T1, T2, T3, T4, T5, T6, HttpListenerResponse> target, bool closeResponse = true)
public Route(string method, string syntax, Func<HttpListenerContext, T1, T2, T3, T4, T5, T6, HttpListenerResponse> target, bool closeResponse = true)
{
this.Method = method;
this.Syntax = syntax;
@ -255,10 +258,10 @@ namespace MontoyaTech.Rest.Net
this.CloseResponse = closeResponse;
}
public Route(HttpRequestMethod method, string syntax, Func<RouteListenerContext, T1, T2, T3, T4, T5, T6, HttpListenerResponse> target, bool closeResponse = true)
public Route(HttpRequestMethod method, string syntax, Func<HttpListenerContext, T1, T2, T3, T4, T5, T6, HttpListenerResponse> target, bool closeResponse = true)
: this(method.ToString(), syntax, target, closeResponse) { }
public override void Invoke(RouteListenerContext context, params string[] arguments)
public override void Invoke(HttpListenerContext context, params string[] arguments)
{
this.Target.DynamicInvoke(
context,
@ -274,9 +277,9 @@ namespace MontoyaTech.Rest.Net
public class Route<T1, T2, T3, T4, T5, T6, T7> : Route
{
private Func<RouteListenerContext, T1, T2, T3, T4, T5, T6, T7, HttpListenerResponse> Target;
private Func<HttpListenerContext, T1, T2, T3, T4, T5, T6, T7, HttpListenerResponse> Target;
public Route(string method, string syntax, Func<RouteListenerContext, T1, T2, T3, T4, T5, T6, T7, HttpListenerResponse> target, bool closeResponse = true)
public Route(string method, string syntax, Func<HttpListenerContext, T1, T2, T3, T4, T5, T6, T7, HttpListenerResponse> target, bool closeResponse = true)
{
this.Method = method;
this.Syntax = syntax;
@ -284,10 +287,10 @@ namespace MontoyaTech.Rest.Net
this.CloseResponse = closeResponse;
}
public Route(HttpRequestMethod method, string syntax, Func<RouteListenerContext, T1, T2, T3, T4, T5, T6, T7, HttpListenerResponse> target, bool closeResponse = true)
public Route(HttpRequestMethod method, string syntax, Func<HttpListenerContext, T1, T2, T3, T4, T5, T6, T7, HttpListenerResponse> target, bool closeResponse = true)
: this(method.ToString(), syntax, target, closeResponse) { }
public override void Invoke(RouteListenerContext context, params string[] arguments)
public override void Invoke(HttpListenerContext context, params string[] arguments)
{
this.Target.DynamicInvoke(
context,
@ -304,9 +307,9 @@ namespace MontoyaTech.Rest.Net
public class Route<T1, T2, T3, T4, T5, T6, T7, T8> : Route
{
private Func<RouteListenerContext, T1, T2, T3, T4, T5, T6, T7, T8, HttpListenerResponse> Target;
private Func<HttpListenerContext, T1, T2, T3, T4, T5, T6, T7, T8, HttpListenerResponse> Target;
public Route(string method, string syntax, Func<RouteListenerContext, T1, T2, T3, T4, T5, T6, T7, T8, HttpListenerResponse> target, bool closeResponse = true)
public Route(string method, string syntax, Func<HttpListenerContext, T1, T2, T3, T4, T5, T6, T7, T8, HttpListenerResponse> target, bool closeResponse = true)
{
this.Method = method;
this.Syntax = syntax;
@ -314,10 +317,10 @@ namespace MontoyaTech.Rest.Net
this.CloseResponse = closeResponse;
}
public Route(HttpRequestMethod method, string syntax, Func<RouteListenerContext, T1, T2, T3, T4, T5, T6, T7, T8, HttpListenerResponse> target, bool closeResponse = true)
public Route(HttpRequestMethod method, string syntax, Func<HttpListenerContext, T1, T2, T3, T4, T5, T6, T7, T8, HttpListenerResponse> target, bool closeResponse = true)
: this(method.ToString(), syntax, target, closeResponse) { }
public override void Invoke(RouteListenerContext context, params string[] arguments)
public override void Invoke(HttpListenerContext context, params string[] arguments)
{
this.Target.DynamicInvoke(
context,

3
Rest.Net/RouteExceptionEventHandler.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
@ -12,5 +13,5 @@ namespace MontoyaTech.Rest.Net
/// <param name="route"></param>
/// <param name="context"></param>
/// <param name="ex"></param>
public delegate void RouteExceptionEventHandler(Route route, RouteListenerContext context, Exception ex);
public delegate void RouteExceptionEventHandler(Route route, HttpListenerContext context, Exception ex);
}

16
Rest.Net/RouteListener.cs
View File

@ -113,7 +113,7 @@ namespace MontoyaTech.Rest.Net
{
ThreadPool.QueueUserWorkItem((item) =>
{
var ctx = item as HttpListenerContext;
var context = item as HttpListenerContext;
try
{
@ -121,8 +121,6 @@ namespace MontoyaTech.Rest.Net
bool close = true;
string[] arguments = null;
var context = new RouteListenerContext(ctx.Request, ctx.Response);
//Preprocess the route context, if it returns false, then we have to not invoke the route.
try
{
@ -133,7 +131,7 @@ namespace MontoyaTech.Rest.Net
for (int i = 0; i < this.Routes.Count && !handled; i++)
{
if (this.Routes[i].Method.ToUpper() == ctx.Request.HttpMethod.ToUpper() && RouteMatcher.Matches(ctx.Request.Url.AbsolutePath, this.Routes[i].Syntax, out arguments))
if (this.Routes[i].Method.ToUpper() == context.Request.HttpMethod.ToUpper() && RouteMatcher.Matches(context.Request.Url.AbsolutePath, this.Routes[i].Syntax, out arguments))
{
handled = true;
close = this.Routes[i].CloseResponse;
@ -148,7 +146,7 @@ namespace MontoyaTech.Rest.Net
if (this.RouteExceptionEvent != null)
this.RouteExceptionEvent.Invoke(this.Routes[i], context, ex);
ctx.Response.WithStatus(HttpStatusCode.InternalServerError);
context.Response.WithStatus(HttpStatusCode.InternalServerError);
}
break;
@ -164,15 +162,15 @@ namespace MontoyaTech.Rest.Net
catch { }
if (!handled)
ctx.Response.WithStatus(HttpStatusCode.NotFound);
context.Response.WithStatus(HttpStatusCode.NotFound);
if (close)
ctx.Response.Close();
context.Response.Close();
}
catch (Exception ex)
{
ctx.Response.WithStatus(HttpStatusCode.InternalServerError);
ctx.Response.Close();
context.Response.WithStatus(HttpStatusCode.InternalServerError);
context.Response.Close();
}
}, this.HttpListener.GetContext());
}

37
Rest.Net/RouteListenerContext.cs
View File

@ -1,37 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Net;
namespace MontoyaTech.Rest.Net
{
/// <summary>
/// An outline of a Listener Context which includes
/// the given request and a resposne.
/// </summary>
public class RouteListenerContext
{
/// <summary>
/// The Http Request that requested this route.
/// </summary>
public HttpListenerRequest Request = null;
/// <summary>
/// The Http Response for this route.
/// </summary>
public HttpListenerResponse Response = null;
/// <summary>
/// Creates a new ListenerContext with a given request and response.
/// </summary>
/// <param name="request"></param>
/// <param name="response"></param>
public RouteListenerContext(HttpListenerRequest request, HttpListenerResponse response)
{
this.Request = request;
this.Response = response;
}
}
}