LcuWebsocket rework
This commit is contained in:
6 files changed
+166
-56
No files matched your search
+103
-32
@@ -11,22 +11,22 @@ public class LcuWebsocket : IDisposable
|
||||
private const int OPCODE_SUBSCRIBE = 5;
|
||||
private const int OPCODE_UNSUBSCRIBE = 6;
|
||||
private const int OPCODE_SEND = 8;
|
||||
private static readonly IReadOnlyList<string> SUBSCRIBE_EVENTS =
|
||||
[
|
||||
"OnJsonApiEvent_lol-champ-select_v1_session",
|
||||
"OnJsonApiEvent_lol-matchmaking_v1_ready-check",
|
||||
];
|
||||
|
||||
private bool _isDisposed;
|
||||
|
||||
private readonly ClientWebSocket _socket = new();
|
||||
|
||||
public bool IsConnected => _socket.State == WebSocketState.Open;
|
||||
|
||||
public event EventHandler? Connecting;
|
||||
public event EventHandler? Connected;
|
||||
public event EventHandler? Disconnected;
|
||||
public event EventHandler<LcuApiEvent>? LcuApiEvent;
|
||||
public event EventHandler<Exception>? LcuApiException;
|
||||
|
||||
private readonly HashSet<string> _subscribedEvents = [];
|
||||
public IReadOnlyCollection<string> SubscribedEvents => _subscribedEvents;
|
||||
|
||||
[MemberNotNull(nameof(RiotAuthentication))]
|
||||
public ProcessInfo? ProcessInfo { get; internal set; }
|
||||
public RiotAuthentication? RiotAuthentication
|
||||
@@ -42,7 +42,7 @@ public class LcuWebsocket : IDisposable
|
||||
}
|
||||
}
|
||||
|
||||
public async Task Connect()
|
||||
public async Task ConnectAsync()
|
||||
{
|
||||
Connecting?.Invoke(this, EventArgs.Empty);
|
||||
try
|
||||
@@ -70,12 +70,9 @@ public class LcuWebsocket : IDisposable
|
||||
{
|
||||
await _socket.ConnectAsync(uri, CancellationToken.None);
|
||||
|
||||
foreach (string eventName in SUBSCRIBE_EVENTS)
|
||||
foreach (string eventName in _subscribedEvents)
|
||||
{
|
||||
string message = $"[{OPCODE_SUBSCRIBE}, \"{eventName}\"]";
|
||||
byte[] buffer = Encoding.UTF8.GetBytes(message);
|
||||
Memory<byte> memory = new(buffer);
|
||||
await _socket.SendAsync(memory, WebSocketMessageType.Text, true, CancellationToken.None);
|
||||
await SendSubscribeAsync(eventName);
|
||||
}
|
||||
|
||||
Connected?.Invoke(this, EventArgs.Empty);
|
||||
@@ -88,30 +85,44 @@ public class LcuWebsocket : IDisposable
|
||||
if (result.MessageType is WebSocketMessageType.Close)
|
||||
{
|
||||
await _socket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
|
||||
break;
|
||||
}
|
||||
else
|
||||
|
||||
if (result.Message.Length == 0)
|
||||
{
|
||||
if (result.Message.Length == 0)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
JsonElement response = JsonElement.Parse(result.Message);
|
||||
if (response.ValueKind != JsonValueKind.Array
|
||||
|| response.GetArrayLength() != 3
|
||||
|| !response[0].TryGetInt32(out int value)
|
||||
|| value != OPCODE_SEND)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
LcuApiEvent? apiEvent = response[2].Deserialize<LcuApiEvent>();
|
||||
if (apiEvent is null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
LcuApiEvent?.Invoke(this, apiEvent);
|
||||
continue;
|
||||
}
|
||||
|
||||
ReadOnlySpan<byte> jsonSpan = result.Message;
|
||||
Utf8JsonReader reader = new(jsonSpan);
|
||||
// read array start
|
||||
if (!reader.Read() || reader.TokenType is not JsonTokenType.StartArray)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
// read first item: opcode
|
||||
if (!reader.Read() || reader.TokenType is not JsonTokenType.Number || !reader.TryGetInt32(out int value) || value != OPCODE_SEND)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
// skip second item (string api event name)
|
||||
if (!reader.Read() || !reader.TrySkip())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
// read third item: payload
|
||||
if (!reader.Read())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
LcuApiEvent? apiEvent = JsonSerializer.Deserialize<LcuApiEvent>(ref reader);
|
||||
if (apiEvent is not LcuApiEvent lcuApiEvent)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
LcuApiEvent?.Invoke(this, lcuApiEvent);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -129,6 +140,66 @@ public class LcuWebsocket : IDisposable
|
||||
}
|
||||
}
|
||||
|
||||
public async Task DisconnectAsync()
|
||||
{
|
||||
if (_socket.State == WebSocketState.Open || _socket.State == WebSocketState.Connecting)
|
||||
{
|
||||
try
|
||||
{
|
||||
await _socket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LcuApiException?.Invoke(this, ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Adds the event to <see cref="SubscribedEvents"/>.
|
||||
/// If the websocket is connected, it actively subscribes to this event.
|
||||
/// If it's not connected, it will subscribe the next time it connects.
|
||||
/// </summary>
|
||||
/// <param name="eventName">The LCU event name.</param>
|
||||
public async Task SubscribeAsync(string eventName)
|
||||
{
|
||||
bool isAdded = _subscribedEvents.Add(eventName);
|
||||
|
||||
if (!IsConnected || !isAdded)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
await SendSubscribeAsync(eventName);
|
||||
}
|
||||
|
||||
private async Task SendSubscribeAsync(string eventName)
|
||||
{
|
||||
string message = $"[{OPCODE_SUBSCRIBE}, \"{eventName}\"]";
|
||||
byte[] buffer = Encoding.UTF8.GetBytes(message);
|
||||
await _socket.SendAsync(buffer, WebSocketMessageType.Text, true, CancellationToken.None);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Removes the event from <see cref="SubscribedEvents"/>.
|
||||
/// If the websocket is connected, it actively unsubscribes from this event.
|
||||
/// If it's not connected, it will no longer subscribe to it the next time it connects.
|
||||
/// </summary>
|
||||
/// <param name="eventName">The LCU event name.</param>
|
||||
public async Task UnsubscribeAsync(string eventName)
|
||||
{
|
||||
bool isRemoved = _subscribedEvents.Remove(eventName);
|
||||
|
||||
if (!IsConnected || !isRemoved)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
string message = $"[{OPCODE_UNSUBSCRIBE}, \"{eventName}\"]";
|
||||
byte[] buffer = Encoding.UTF8.GetBytes(message);
|
||||
await _socket.SendAsync(buffer, WebSocketMessageType.Text, true, CancellationToken.None);
|
||||
}
|
||||
|
||||
#region IDisposable
|
||||
protected virtual void Dispose(bool disposing)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user