Added WS4Net Provider
This commit is contained in:
RogueException
@@ -0,0 +1,29 @@
|
||||
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Description>An optional WebSocket client provider for Discord.Net using WebSocket4Net</Description>
|
||||
<VersionPrefix>1.0.0-beta2</VersionPrefix>
|
||||
<TargetFrameworks>net45</TargetFrameworks>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<AssemblyName>Discord.Net.Providers.WS4Net</AssemblyName>
|
||||
<PackageTags>discord;discordapp</PackageTags>
|
||||
<PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
|
||||
<PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
|
||||
<RepositoryType>git</RepositoryType>
|
||||
<RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="**\*.cs" />
|
||||
<EmbeddedResource Include="**\*.resx" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="WebSocket4Net" Version="0.14.1" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
|
||||
<WarningsAsErrors>true</WarningsAsErrors>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
166
src/Discord.Net.Providers.WS4Net/WS4NetClient.cs
Normal file
166
src/Discord.Net.Providers.WS4Net/WS4NetClient.cs
Normal file
@@ -0,0 +1,166 @@
|
||||
using Discord.Net.WebSockets;
|
||||
using System;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using WebSocket4Net;
|
||||
using WS4NetSocket = WebSocket4Net.WebSocket;
|
||||
|
||||
namespace Discord.Net.Providers.WS4Net
|
||||
{
|
||||
internal class WS4NetClient : IWebSocketClient, IDisposable
|
||||
{
|
||||
public event Func<byte[], int, int, Task> BinaryMessage;
|
||||
public event Func<string, Task> TextMessage;
|
||||
public event Func<Exception, Task> Closed;
|
||||
|
||||
private readonly SemaphoreSlim _lock;
|
||||
private readonly Dictionary<string, string> _headers;
|
||||
private WS4NetSocket _client;
|
||||
private CancellationTokenSource _cancelTokenSource;
|
||||
private CancellationToken _cancelToken, _parentToken;
|
||||
private ManualResetEventSlim _waitUntilConnect;
|
||||
private bool _isDisposed;
|
||||
|
||||
public WS4NetClient()
|
||||
{
|
||||
_headers = new Dictionary<string, string>();
|
||||
_lock = new SemaphoreSlim(1, 1);
|
||||
_cancelTokenSource = new CancellationTokenSource();
|
||||
_cancelToken = CancellationToken.None;
|
||||
_parentToken = CancellationToken.None;
|
||||
_waitUntilConnect = new ManualResetEventSlim();
|
||||
}
|
||||
private void Dispose(bool disposing)
|
||||
{
|
||||
if (!_isDisposed)
|
||||
{
|
||||
if (disposing)
|
||||
DisconnectInternalAsync(true).GetAwaiter().GetResult();
|
||||
_isDisposed = true;
|
||||
}
|
||||
}
|
||||
public void Dispose()
|
||||
{
|
||||
Dispose(true);
|
||||
}
|
||||
|
||||
public async Task ConnectAsync(string host)
|
||||
{
|
||||
await _lock.WaitAsync().ConfigureAwait(false);
|
||||
try
|
||||
{
|
||||
await ConnectInternalAsync(host).ConfigureAwait(false);
|
||||
}
|
||||
finally
|
||||
{
|
||||
_lock.Release();
|
||||
}
|
||||
}
|
||||
private async Task ConnectInternalAsync(string host)
|
||||
{
|
||||
await DisconnectInternalAsync().ConfigureAwait(false);
|
||||
|
||||
_cancelTokenSource = new CancellationTokenSource();
|
||||
_cancelToken = CancellationTokenSource.CreateLinkedTokenSource(_parentToken, _cancelTokenSource.Token).Token;
|
||||
|
||||
_client = new WS4NetSocket(host, customHeaderItems: _headers.ToList())
|
||||
{
|
||||
EnableAutoSendPing = false,
|
||||
NoDelay = true,
|
||||
Proxy = null
|
||||
};
|
||||
|
||||
_client.MessageReceived += OnTextMessage;
|
||||
_client.DataReceived += OnBinaryMessage;
|
||||
_client.Opened += OnConnected;
|
||||
_client.Closed += OnClosed;
|
||||
|
||||
_client.Open();
|
||||
_waitUntilConnect.Wait(_cancelToken);
|
||||
}
|
||||
|
||||
public async Task DisconnectAsync()
|
||||
{
|
||||
await _lock.WaitAsync().ConfigureAwait(false);
|
||||
try
|
||||
{
|
||||
await DisconnectInternalAsync().ConfigureAwait(false);
|
||||
}
|
||||
finally
|
||||
{
|
||||
_lock.Release();
|
||||
}
|
||||
}
|
||||
private Task DisconnectInternalAsync(bool isDisposing = false)
|
||||
{
|
||||
_cancelTokenSource.Cancel();
|
||||
if (_client == null)
|
||||
return Task.Delay(0);
|
||||
|
||||
if (_client.State == WebSocketState.Open)
|
||||
{
|
||||
try { _client.Close(1000, ""); }
|
||||
catch { }
|
||||
}
|
||||
|
||||
_client.MessageReceived -= OnTextMessage;
|
||||
_client.DataReceived -= OnBinaryMessage;
|
||||
_client.Opened -= OnConnected;
|
||||
_client.Closed -= OnClosed;
|
||||
|
||||
try { _client.Dispose(); }
|
||||
catch { }
|
||||
_client = null;
|
||||
|
||||
_waitUntilConnect.Reset();
|
||||
return Task.Delay(0);
|
||||
}
|
||||
|
||||
public void SetHeader(string key, string value)
|
||||
{
|
||||
_headers[key] = value;
|
||||
}
|
||||
public void SetCancelToken(CancellationToken cancelToken)
|
||||
{
|
||||
_parentToken = cancelToken;
|
||||
_cancelToken = CancellationTokenSource.CreateLinkedTokenSource(_parentToken, _cancelTokenSource.Token).Token;
|
||||
}
|
||||
|
||||
public async Task SendAsync(byte[] data, int index, int count, bool isText)
|
||||
{
|
||||
await _lock.WaitAsync(_cancelToken).ConfigureAwait(false);
|
||||
try
|
||||
{
|
||||
if (isText)
|
||||
_client.Send(Encoding.UTF8.GetString(data, index, count));
|
||||
else
|
||||
_client.Send(data, index, count);
|
||||
}
|
||||
finally
|
||||
{
|
||||
_lock.Release();
|
||||
}
|
||||
}
|
||||
|
||||
private void OnTextMessage(object sender, MessageReceivedEventArgs e)
|
||||
{
|
||||
TextMessage(e.Message).GetAwaiter().GetResult();
|
||||
}
|
||||
private void OnBinaryMessage(object sender, DataReceivedEventArgs e)
|
||||
{
|
||||
BinaryMessage(e.Data, 0, e.Data.Count()).GetAwaiter().GetResult();
|
||||
}
|
||||
private void OnConnected(object sender, object e)
|
||||
{
|
||||
_waitUntilConnect.Set();
|
||||
}
|
||||
private void OnClosed(object sender, object e)
|
||||
{
|
||||
var ex = (e as SuperSocket.ClientEngine.ErrorEventArgs)?.Exception ?? new Exception("Unexpected close");
|
||||
Closed(ex).GetAwaiter().GetResult();
|
||||
}
|
||||
}
|
||||
}
|
||||
9
src/Discord.Net.Providers.WS4Net/WS4NetProvider.cs
Normal file
9
src/Discord.Net.Providers.WS4Net/WS4NetProvider.cs
Normal file
@@ -0,0 +1,9 @@
|
||||
using Discord.Net.WebSockets;
|
||||
|
||||
namespace Discord.Net.Providers.WS4Net
|
||||
{
|
||||
public static class WS4NetProvider
|
||||
{
|
||||
public static readonly WebSocketProvider Instance = () => new WS4NetClient();
|
||||
}
|
||||
}
|
||||
38
src/Discord.Net.Providers.WS4Net/project.json
Normal file
38
src/Discord.Net.Providers.WS4Net/project.json
Normal file
@@ -0,0 +1,38 @@
|
||||
{
|
||||
"version": "1.0.0-*",
|
||||
"description": "An optional WebSocket client provider for Discord.Net using WebSocket4Net.",
|
||||
"authors": [ "RogueException", "foxbot" ],
|
||||
|
||||
"packOptions": {
|
||||
"tags": [ "discord", "discordapp" ],
|
||||
"licenseUrl": "http://opensource.org/licenses/MIT",
|
||||
"projectUrl": "https://github.com/RogueException/Discord.Net",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git://github.com/RogueException/Discord.Net"
|
||||
}
|
||||
},
|
||||
|
||||
"configurations": {
|
||||
"Release": {
|
||||
"buildOptions": {
|
||||
"define": [ "RELEASE" ],
|
||||
"nowarn": [ "CS1573", "CS1591" ],
|
||||
"optimize": true,
|
||||
"warningsAsErrors": true,
|
||||
"xmlDoc": true
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"dependencies": {
|
||||
"Discord.Net.Core": {
|
||||
"target": "project"
|
||||
},
|
||||
"WebSocket4Net": "0.14.1"
|
||||
},
|
||||
|
||||
"frameworks": {
|
||||
"net45": {}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user