Adding back middleware initialization with options instance

This commit is contained in:
John Luo 2015-12-23 15:43:52 -08:00
parent fe41412eeb
commit 8872037812
1 changed files with 22 additions and 8 deletions

View File

@ -8,21 +8,21 @@ namespace Microsoft.AspNet.Builder
{ {
public static class WebSocketMiddlewareExtensions public static class WebSocketMiddlewareExtensions
{ {
public static IApplicationBuilder UseWebSockets(this IApplicationBuilder builder) public static IApplicationBuilder UseWebSockets(this IApplicationBuilder app)
{ {
if (builder == null) if (app == null)
{ {
throw new ArgumentNullException(nameof(builder)); throw new ArgumentNullException(nameof(app));
} }
return builder.UseWebSockets(options => { }); return app.UseWebSockets(options => { });
} }
public static IApplicationBuilder UseWebSockets(this IApplicationBuilder builder, Action<WebSocketOptions> configureOptions) public static IApplicationBuilder UseWebSockets(this IApplicationBuilder app, Action<WebSocketOptions> configureOptions)
{ {
if (builder == null) if (app == null)
{ {
throw new ArgumentNullException(nameof(builder)); throw new ArgumentNullException(nameof(app));
} }
if (configureOptions == null) if (configureOptions == null)
{ {
@ -32,7 +32,21 @@ namespace Microsoft.AspNet.Builder
var options = new WebSocketOptions(); var options = new WebSocketOptions();
configureOptions(options); configureOptions(options);
return builder.Use(next => new WebSocketMiddleware(next, options).Invoke); return app.UseMiddleware<WebSocketMiddleware>(options);
}
public static IApplicationBuilder UseWebSockets(this IApplicationBuilder app, WebSocketOptions options)
{
if (app == null)
{
throw new ArgumentNullException(nameof(app));
}
if (options == null)
{
throw new ArgumentNullException(nameof(options));
}
return app.UseMiddleware<WebSocketMiddleware>(options);
} }
} }
} }