Changed AspNetCoreWebSocketTransport's Open method

Elad Zelingher · Elad Zelingher · commit 62fcac0566c9 · 2016-07-30T12:39:39.000+03:00
diff --git a/src/net45/Extensions/WampSharp.AspNetCore.WebSockets.Server/AspNetCoreWebSocketTransport.cs b/src/net45/Extensions/WampSharp.AspNetCore.WebSockets.Server/AspNetCoreWebSocketTransport.cs
@@ -15,19 +15,20 @@ namespace WampSharp.AspNetCore.WebSockets.Server
 {
     public class AspNetCoreWebSocketTransport : WebSocketTransport<WebSocketData>
     {
-        private readonly IApplicationBuilder mApp;
+        private Func<HttpContext, Func<Task>, Task> mHandler;
 
         public AspNetCoreWebSocketTransport
             (IApplicationBuilder app,
              ICookieAuthenticatorFactory authenticatorFactory = null) :
                  base(authenticatorFactory)
         {
-            mApp = app;
+            mHandler = this.EmptyHandler;
+            app.Use(HttpHandler);
         }
 
         public override void Dispose()
         {
-            throw new NotImplementedException();
+            mHandler = this.EmptyHandler;
         }
 
         protected override void OpenConnection<TMessage>(WebSocketData original, IWampConnection<TMessage> connection)
@@ -68,10 +69,20 @@ protected override IWampConnection<TMessage> CreateTextConnection<TMessage>
 
         public override void Open()
         {
-            mApp.Use(HttpHandler);
+            mHandler = this.WebSocketHandler;
         }
 
-        private async Task HttpHandler(HttpContext context, Func<Task> next)
+        private Task HttpHandler(HttpContext context, Func<Task> next)
+        {
+            return mHandler(context, next);
+        }
+
+        private async Task EmptyHandler(HttpContext context, Func<Task> next)
+        {
+            await next();
+        }
+
+        private async Task WebSocketHandler(HttpContext context, Func<Task> next)
         {
             if (context.WebSockets.IsWebSocketRequest)
             {
diff --git a/src/net45/WampSharpDotNet.sln b/src/net45/WampSharpDotNet.sln
@@ -32,6 +32,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WampSharp.RawSocket", "Exte
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WampSharp.Default.Client", "WampSharp.Default.Client\WampSharp.Default.Client.xproj", "{1485A2E0-E225-47D8-A26B-077C44094C07}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WampSharp.AspNetCore.WebSockets.Server", "Extensions\WampSharp.AspNetCore.WebSockets.Server\WampSharp.AspNetCore.WebSockets.Server.xproj", "{841605EB-80CE-48C7-8CAE-0366FECFAED1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -70,6 +72,10 @@ Global
 		{1485A2E0-E225-47D8-A26B-077C44094C07}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1485A2E0-E225-47D8-A26B-077C44094C07}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1485A2E0-E225-47D8-A26B-077C44094C07}.Release|Any CPU.Build.0 = Release|Any CPU
+		{841605EB-80CE-48C7-8CAE-0366FECFAED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{841605EB-80CE-48C7-8CAE-0366FECFAED1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{841605EB-80CE-48C7-8CAE-0366FECFAED1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{841605EB-80CE-48C7-8CAE-0366FECFAED1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -85,5 +91,6 @@ Global
 		{500B79FA-CAD0-4692-85BD-9682124DA872} = {EF15CA4F-CCAA-4435-A0B3-0E7FC1B955CD}
 		{F3EAF470-1D65-45F5-BD49-EE4BB1D42A3A} = {234FC630-9975-4DD9-8A28-DAA75BB1DD7E}
 		{1485A2E0-E225-47D8-A26B-077C44094C07} = {A034FCD9-A025-4F24-9E26-3D438944A526}
+		{841605EB-80CE-48C7-8CAE-0366FECFAED1} = {234FC630-9975-4DD9-8A28-DAA75BB1DD7E}
 	EndGlobalSection
 EndGlobal

Original file line number	Diff line number	Diff line change
`@@ -15,19 +15,20 @@ namespace WampSharp.AspNetCore.WebSockets.Server`
`15`	`15`	`{`
`16`	`16`	`public class AspNetCoreWebSocketTransport : WebSocketTransport<WebSocketData>`
`17`	`17`	`{`
`18`		`- private readonly IApplicationBuilder mApp;`
	`18`	`+ private Func<HttpContext, Func<Task>, Task> mHandler;`
`19`	`19`
`20`	`20`	`public AspNetCoreWebSocketTransport`
`21`	`21`	`(IApplicationBuilder app,`
`22`	`22`	`ICookieAuthenticatorFactory authenticatorFactory = null) :`
`23`	`23`	`base(authenticatorFactory)`
`24`	`24`	`{`
`25`		`- mApp = app;`
	`25`	`+ mHandler = this.EmptyHandler;`
	`26`	`+ app.Use(HttpHandler);`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`public override void Dispose()`
`29`	`30`	`{`
`30`		`- throw new NotImplementedException();`
	`31`	`+ mHandler = this.EmptyHandler;`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`protected override void OpenConnection<TMessage>(WebSocketData original, IWampConnection<TMessage> connection)`
`@@ -68,10 +69,20 @@ protected override IWampConnection<TMessage> CreateTextConnection<TMessage>`
`68`	`69`
`69`	`70`	`public override void Open()`
`70`	`71`	`{`
`71`		`- mApp.Use(HttpHandler);`
	`72`	`+ mHandler = this.WebSocketHandler;`
`72`	`73`	`}`
`73`	`74`
`74`		`- private async Task HttpHandler(HttpContext context, Func<Task> next)`
	`75`	`+ private Task HttpHandler(HttpContext context, Func<Task> next)`
	`76`	`+ {`
	`77`	`+ return mHandler(context, next);`
	`78`	`+ }`
	`79`	`+`
	`80`	`+ private async Task EmptyHandler(HttpContext context, Func<Task> next)`
	`81`	`+ {`
	`82`	`+ await next();`
	`83`	`+ }`
	`84`	`+`
	`85`	`+ private async Task WebSocketHandler(HttpContext context, Func<Task> next)`
`75`	`86`	`{`
`76`	`87`	`if (context.WebSockets.IsWebSocketRequest)`
`77`	`88`	`{`