Merge pull request #1 from throwarray/master

latest

Author: Hellslicer

README.md

@@ -24,9 +24,24 @@ Convars available:
 ### Add a listener to receive messages
 
 ```lua
--- Add a new listener with a string parameter
-AddEventHandler("WebSocketServer:onMessage", function(message)
-    print("Received message: " .. message)
+AddEventHandler("WebSocketServer:onMessage", function(message, endpoint)
+    print("Received message from " .. endpoint .. ": " .. message)
+end)
+```
+
+### Add a listener to get new connected remote endpoints
+
+```lua
+AddEventHandler("WebSocketServer:onConnect", function(endpoint)
+    print("New WS remote endpoint: " .. endpoint)
+end)
+```
+
+### Add a listener to get disconnected remote endpoints
+
+```lua
+AddEventHandler("WebSocketServer:onDisconnect", function(endpoint)
+    print("WS remote endpoint " .. endpoint .. " has been disconnected")
 end)
 ```
 
@@ -36,6 +51,12 @@ end)
 TriggerEvent("WebSocketServer:broadcast", "This message will be broadcasted to all connected webSocket clients.");
 ```
 
+### Send a message to a specific WebSocket client
+
+```lua
+TriggerEvent("WebSocketServer:send", "This message will be sent to a specific webSocket client.", someValidAndConnectedRemoteEndpoint);
+```
+
 ## Built With
 
 * [deniszykov/WebSocketListener](https://github.com/deniszykov/WebSocketListener)

WebSocketServer.cs

@@ -52,6 +52,9 @@ public WebSocketServer()
 			server.OnConnect += (ws) =>
 			{
 				Log ("Connection from " + ws.RemoteEndpoint.ToString (), LogLevels.Debug);
+
+				TriggerEvent("WebSocketServer:onConnect", ws.RemoteEndpoint.ToString ());
+
 				lock (webSockets)
 				{
 					webSockets.Add(ws);
@@ -60,6 +63,9 @@ public WebSocketServer()
 			server.OnDisconnect += (ws) =>
 			{
 				Log ("Disconnection from " + ws.RemoteEndpoint.ToString (), LogLevels.Debug);
+
+				TriggerEvent("WebSocketServer:onDisconnect", ws.RemoteEndpoint.ToString ());
+
 				lock (webSockets)
 				{
 					webSockets.Remove(ws);
@@ -70,7 +76,7 @@ public WebSocketServer()
 			{
 				Log("Received message: " + msg, LogLevels.Debug);
 
-				TriggerEvent("WebSocketServer:onMessage", msg);
+				TriggerEvent("WebSocketServer:onMessage", msg, ws.RemoteEndpoint.ToString ());
 			};
 
 			EventHandlers["onResourceStart"] += new Action<dynamic>((dynamic resourceName) =>
@@ -128,6 +134,36 @@ public WebSocketServer()
 					}
 				}
 			});
+
+			EventHandlers["WebSocketServer:send"] += new Action<dynamic, dynamic>((dynamic message, dynamic client) =>
+			{
+				lock (webSockets)
+				{
+					foreach (var webSocket in webSockets)
+					{
+						if (webSocket.IsConnected)
+						{
+							if (webSocket.RemoteEndpoint.ToString () == client) {
+								try
+								{
+									await webSocket.WriteStringAsync((string) message, CancellationToken.None);
+								}
+								catch (Exception e)
+								{
+									Log("An error occurred while sending a message to " + webSocket.RemoteEndpoint.ToString() + ": " + e.Message, LogLevels.Debug);
+								}
+							}
+						}
+						else
+						{
+							webSockets.Remove(webSocket);
+						}
+					}
+				}
+			});
+
+
+
 		}
 
 		private void Log(string message, LogLevels level = LogLevels.Info)

WebSocketServer.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -22,7 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Externalconsole>true</Externalconsole>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>full</DebugType>
@@ -37,13 +37,13 @@
     <Reference Include="CitizenFX.Core">
       <HintPath>..\..\..\..\FX\alpine\opt\cfx-server\citizen\clr2\lib\mono\4.5\CitizenFX.Core.dll</HintPath>
     </Reference>
+    <Reference Include="deniszykov.WebSocketListener, Version=4.2.2.0, Culture=neutral, PublicKeyToken=7f78616efb4a208d, processorArchitecture=MSIL">
+      <HintPath>packages\deniszykov.WebSocketListener.4.2.2\lib\net45\deniszykov.WebSocketListener.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp">
       <HintPath>bin\Debug\Microsoft.CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="deniszykov.WebSocketListener">
-      <HintPath>packages\deniszykov.WebSocketListener.4.0.0\lib\net45\deniszykov.WebSocketListener.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -54,4 +54,4 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="deniszykov.WebSocketListener" version="4.0.0" targetFramework="net452" />
+  <package id="deniszykov.WebSocketListener" version="4.2.2" targetFramework="net452" />
 </packages>