Upgrade WebSocketListener

Author: Hellslicer

Properties/AssemblyInfo.cs

@@ -14,7 +14,7 @@
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("0.2.0")]
+[assembly: AssemblyVersion("0.2.1")]
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.
 //[assembly: AssemblyDelaySign(false)]

README.md

@@ -8,13 +8,6 @@ This library exposes a simple WebSocket server into FXServer.
 * Text messages
 * Authorization header support
 
-## Prerequisites
-
-* `System.Web.dll`
-* `System.Security.dll`
-* `System.ServiceModel.dll`
-* `System.IdentityModel.dll`
-
 ## Configuration
 
 Convars available:
@@ -45,7 +38,7 @@ TriggerEvent("WebSocketServer:broadcast", "This message will be broadcasted to a
 
 ## Built With
 
-* [vtortola/WebSocketListener](https://github.com/vtortola/WebSocketListener)
+* [deniszykov/WebSocketListener](https://github.com/deniszykov/WebSocketListener)
 
 ## License
 

WebSocketEventListener.cs

@@ -27,18 +27,18 @@ public class WebSocketEventListener : IDisposable
 
 		public WebSocketEventListener(IPEndPoint endpoint, WebSocketListenerOptions options)
 		{
+			options.Standards.RegisterRfc6455();
 			_listener = new WebSocketListener(endpoint, options);
-			_listener.Standards.RegisterStandard(new WebSocketFactoryRfc6455(_listener));
 		}
 
 		public void Start()
 		{
-			_listener.Start();
+			_listener.StartAsync().Wait();
 		}
 
 		public void Stop()
 		{
-			_listener.Stop();
+			_listener.StopAsync().Wait();
 		}
 
 		public async Task ListenAsync()

WebSocketServer.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Net;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Collections.Generic;
 using vtortola.WebSockets;
 
@@ -16,6 +17,24 @@ private enum LogLevels { Debug, Info, Warn, Error };
 		private string authorization;
 		private List<WebSocket> webSockets;
 
+		private async Task<bool> CheckHttpHeaders(WebSocketHttpRequest request, WebSocketHttpResponse response)
+		{
+			await Task.Run(() =>
+			{
+				if (authorization.Length > 0)
+				{
+					var authHeader = request.Headers["Authorization"];
+					if (authHeader == null || authHeader != authorization)
+					{
+						response.Status = HttpStatusCode.Unauthorized;
+						Log("Rejected Authorization header: " + authHeader, LogLevels.Debug);
+					}
+				}
+			});
+
+			return true;
+		}
+
 		public WebSocketServer()
 		{
 			logLevel = Function.Call<string>(Hash.GET_CONVAR, "websocket_debug", "false") == "true" ? LogLevels.Debug : LogLevels.Info;
@@ -47,18 +66,7 @@ public WebSocketServer()
 
 			var server = new WebSocketEventListener (endpoint, new WebSocketListenerOptions () {
 				SubProtocols = new String[]{ "text" },
-				OnHttpNegotiation = (request, response) =>
-				{
-					if (authorization.Length > 0)
-					{
-						var authHeader = request.Headers["Authorization"];
-						if (authHeader == null || authHeader != authorization)
-						{
-							response.Status = HttpStatusCode.Unauthorized;
-							Log("Rejected Authorization header: " + authHeader, LogLevels.Debug);
-						}
-					}
-				}
+				HttpAuthenticationHandler = CheckHttpHeaders
 			});
 			server.OnConnect += (ws) =>
 			{

WebSocketServer.csproj

@@ -41,17 +41,8 @@
     <Reference Include="Microsoft.CSharp">
       <HintPath>bin\Debug\Microsoft.CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.5.24.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Tpl.Dataflow.4.5.24\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
-    </Reference>
-    <Reference Include="vtortola.WebSockets, Version=2.2.3.0, Culture=neutral, PublicKeyToken=7f78616efb4a208d, processorArchitecture=MSIL">
-      <HintPath>packages\vtortola.WebSocketListener.2.2.3.0\lib\net45\vtortola.WebSockets.dll</HintPath>
-    </Reference>
-    <Reference Include="vtortola.WebSockets.Deflate, Version=2.2.3.0, Culture=neutral, PublicKeyToken=7f78616efb4a208d, processorArchitecture=MSIL">
-      <HintPath>packages\vtortola.WebSocketListener.2.2.3.0\lib\net45\vtortola.WebSockets.Deflate.dll</HintPath>
-    </Reference>
-    <Reference Include="vtortola.WebSockets.Rfc6455, Version=2.2.3.0, Culture=neutral, PublicKeyToken=7f78616efb4a208d, processorArchitecture=MSIL">
-      <HintPath>packages\vtortola.WebSocketListener.2.2.3.0\lib\net45\vtortola.WebSockets.Rfc6455.dll</HintPath>
+    <Reference Include="deniszykov.WebSocketListener">
+      <HintPath>packages\deniszykov.WebSocketListener.4.0.0\lib\net45\deniszykov.WebSocketListener.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

packages.config

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Tpl.Dataflow" version="4.5.24" targetFramework="net452" />
-  <package id="vtortola.WebSocketListener" version="2.2.3.0" targetFramework="net452" />
+  <package id="deniszykov.WebSocketListener" version="4.0.0" targetFramework="net452" />
 </packages>