tom/hermes-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revised the redeem system, activated via channel point redeems. Added OBS transformation to redeems. Logs changed & writes to logs folder as well. Removed most use of IServiceProvider.

Browse Source
This commit is contained in:
Tom
2024-06-24 22:11:36 +00:00
parent 706cd06930
commit 706eecf2d2
45 changed files with 964 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Seven/SevenApiClient.cs
View File

@ -9,33 +9,34 @@ public class SevenApiClient
public static readonly string API_URL = "https://7tv.io/v3";
public static readonly string WEBSOCKET_URL = "wss://events.7tv.io/v3";
private WebClientWrap Web { get; }
private ILogger Logger { get; }
private readonly WebClientWrap _web;
private readonly ILogger _logger;
public SevenApiClient(ILogger logger)
{
Logger = logger;
Web = new WebClientWrap(new JsonSerializerOptions()
_logger = logger;
_web = new WebClientWrap(new JsonSerializerOptions()
{
PropertyNameCaseInsensitive = false,
PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower
});
}
public async Task<EmoteSet?> FetchChannelEmoteSet(string twitchId) {
public async Task<EmoteSet?> FetchChannelEmoteSet(string twitchId)
{
try
{
var details = await Web.GetJson<UserDetails>($"{API_URL}/users/twitch/" + twitchId);
var details = await _web.GetJson<UserDetails>($"{API_URL}/users/twitch/" + twitchId);
return details?.EmoteSet;
}
catch (JsonException e)
{
Logger.Error(e, "Failed to fetch emotes from 7tv due to improper JSON.");
_logger.Error(e, "Failed to fetch emotes from 7tv due to improper JSON.");
}
catch (Exception e)
{
Logger.Error(e, "Failed to fetch emotes from 7tv.");
_logger.Error(e, "Failed to fetch emotes from 7tv.");
}
return null;
}
@ -44,16 +45,16 @@ public class SevenApiClient
{
try
{
var emoteSet = await Web.GetJson<EmoteSet>($"{API_URL}/emote-sets/6353512c802a0e34bac96dd2");
var emoteSet = await _web.GetJson<EmoteSet>($"{API_URL}/emote-sets/6353512c802a0e34bac96dd2");
return emoteSet?.Emotes;
}
catch (JsonException e)
{
Logger.Error(e, "Failed to fetch emotes from 7tv due to improper JSON.");
_logger.Error(e, "Failed to fetch emotes from 7tv due to improper JSON.");
}
catch (Exception e)
{
Logger.Error(e, "Failed to fetch emotes from 7tv.");
_logger.Error(e, "Failed to fetch emotes from 7tv.");
}
return null;
}

2
Seven/Socket/Data/ErrorMessage.cs
View File

@ -2,6 +2,6 @@ namespace TwitchChatTTS.Seven.Socket.Data
{
public class ErrorMessage
{
}
}

41
Seven/Socket/Handlers/DispatchHandler.cs
View File

@ -1,7 +1,6 @@
using System.Text.Json;
using CommonSocketLibrary.Abstract;
using CommonSocketLibrary.Common;
using Microsoft.Extensions.DependencyInjection;
using Serilog;
using TwitchChatTTS.Seven.Socket.Data;
@ -9,26 +8,26 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
{
public class DispatchHandler : IWebSocketHandler
{
private ILogger Logger { get; }
private EmoteDatabase Emotes { get; }
private object _lock = new object();
public int OperationCode { get; set; } = 0;
private readonly ILogger _logger;
private readonly EmoteDatabase _emotes;
private readonly object _lock = new object();
public int OperationCode { get; } = 0;
public DispatchHandler(ILogger logger, EmoteDatabase emotes)
{
Logger = logger;
Emotes = emotes;
_logger = logger;
_emotes = emotes;
}
public async Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data message)
public async Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
{
if (message is not DispatchMessage obj || obj == null)
if (data is not DispatchMessage message || message == null)
return;
ApplyChanges(obj?.Body?.Pulled, cf => cf.OldValue, true);
ApplyChanges(obj?.Body?.Pushed, cf => cf.Value, false);
ApplyChanges(obj?.Body?.Removed, cf => cf.OldValue, true);
ApplyChanges(obj?.Body?.Updated, cf => cf.OldValue, false, cf => cf.Value);
ApplyChanges(message?.Body?.Pulled, cf => cf.OldValue, true);
ApplyChanges(message?.Body?.Pushed, cf => cf.Value, false);
ApplyChanges(message?.Body?.Removed, cf => cf.OldValue, true);
ApplyChanges(message?.Body?.Updated, cf => cf.OldValue, false, cf => cf.Value);
}
private void ApplyChanges(IEnumerable<ChangeField>? fields, Func<ChangeField, object> getter, bool removing, Func<ChangeField, object>? updater = null)
@ -55,7 +54,7 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
if (removing)
{
RemoveEmoteById(o.Id);
Logger.Information($"Removed 7tv emote: {o.Name} (id: {o.Id})");
_logger.Information($"Removed 7tv emote [name: {o.Name}][id: {o.Id}]");
}
else if (updater != null)
{
@ -70,18 +69,18 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
if (u != null)
{
Emotes.Add(u.Name, u.Id);
Logger.Information($"Updated 7tv emote: from '{o.Name}' to '{u.Name}' (id: {u.Id})");
_emotes.Add(u.Name, u.Id);
_logger.Information($"Updated 7tv emote [old name: {o.Name}][new name: {u.Name}][id: {u.Id}]");
}
else
{
Logger.Warning("Failed to update 7tv emote.");
_logger.Warning("Failed to update 7tv emote.");
}
}
else
{
Emotes.Add(o.Name, o.Id);
Logger.Information($"Added 7tv emote: {o.Name} (id: {o.Id})");
_emotes.Add(o.Name, o.Id);
_logger.Information($"Added 7tv emote [name: {o.Name}][id: {o.Id}]");
}
}
}
@ -90,7 +89,7 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
private void RemoveEmoteById(string id)
{
string? key = null;
foreach (var e in Emotes.Emotes)
foreach (var e in _emotes.Emotes)
{
if (e.Value == id)
{
@ -99,7 +98,7 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
}
}
if (key != null)
Emotes.Remove(key);
_emotes.Remove(key);
}
}
}

65
Seven/Socket/Handlers/EndOfStreamHandler.cs
View File

@ -9,22 +9,22 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
{
public class EndOfStreamHandler : IWebSocketHandler
{
private ILogger Logger { get; }
private User User { get; }
private IServiceProvider ServiceProvider { get; }
private string[] ErrorCodes { get; }
private int[] ReconnectDelay { get; }
private readonly ILogger _logger;
private readonly User _user;
private readonly IServiceProvider _serviceProvider;
private readonly string[] _errorCodes;
private readonly int[] _reconnectDelay;
public int OperationCode { get; set; } = 7;
public int OperationCode { get; } = 7;
public EndOfStreamHandler(ILogger logger, User user, IServiceProvider serviceProvider)
{
Logger = logger;
User = user;
ServiceProvider = serviceProvider;
_logger = logger;
_user = user;
_serviceProvider = serviceProvider;
ErrorCodes = [
_errorCodes = [
"Server Error",
"Unknown Operation",
"Invalid Payload",
@ -39,61 +39,62 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
"Insufficient Privilege",
"Inactivity?"
];
ReconnectDelay = [
_reconnectDelay = [
1000,
-1,
-1,
-1,
-1,
0,
0,
0,
0,
3000,
1000,
300000,
1000,
-1,
-1,
0,
0,
1000,
1000
];
}
public async Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data message)
public async Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
{
if (message is not EndOfStreamMessage obj || obj == null)
if (data is not EndOfStreamMessage message || message == null)
return;
var code = obj.Code - 4000;
if (code >= 0 && code < ErrorCodes.Length)
Logger.Warning($"Received end of stream message (reason: {ErrorCodes[code]}, code: {obj.Code}, message: {obj.Message}).");
var code = message.Code - 4000;
if (code >= 0 && code < _errorCodes.Length)
_logger.Warning($"Received end of stream message (reason: {_errorCodes[code]}, code: {message.Code}, message: {message.Message}).");
else
Logger.Warning($"Received end of stream message (code: {obj.Code}, message: {obj.Message}).");
_logger.Warning($"Received end of stream message (code: {message.Code}, message: {message.Message}).");
await sender.DisconnectAsync();
if (code >= 0 && code < ReconnectDelay.Length && ReconnectDelay[code] < 0)
if (code >= 0 && code < _reconnectDelay.Length && _reconnectDelay[code] < 0)
{
Logger.Error($"7tv client will remain disconnected due to a bad client implementation.");
_logger.Error($"7tv client will remain disconnected due to a bad client implementation.");
return;
}
if (string.IsNullOrWhiteSpace(User.SevenEmoteSetId))
if (string.IsNullOrWhiteSpace(_user.SevenEmoteSetId))
return;
var context = ServiceProvider.GetRequiredService<ReconnectContext>();
await Task.Delay(ReconnectDelay[code]);
var context = _serviceProvider.GetRequiredService<ReconnectContext>();
if (_reconnectDelay[code] > 0)
await Task.Delay(_reconnectDelay[code]);
var base_url = $"@emote_set.*<object_id={User.SevenEmoteSetId}>";
var base_url = $"@emote_set.*<object_id={_user.SevenEmoteSetId}>";
string url = $"{SevenApiClient.WEBSOCKET_URL}{base_url}";
Logger.Debug($"7tv websocket reconnecting to {url}.");
_logger.Debug($"7tv websocket reconnecting to {url}.");
await sender.ConnectAsync(url);
if (context.SessionId != null)
{
await sender.Send(34, new ResumeMessage() { SessionId = context.SessionId });
Logger.Information("Resumed connection to 7tv websocket.");
_logger.Information("Resumed connection to 7tv websocket.");
}
else
{
Logger.Information("Resumed connection to 7tv websocket on a different session.");
_logger.Information("Resumed connection to 7tv websocket on a different session.");
}
}
}

10
Seven/Socket/Handlers/ErrorHandler.cs
View File

@ -7,17 +7,17 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
{
public class ErrorHandler : IWebSocketHandler
{
private ILogger Logger { get; }
public int OperationCode { get; set; } = 6;
private readonly ILogger _logger;
public int OperationCode { get; } = 6;
public ErrorHandler(ILogger logger)
{
Logger = logger;
_logger = logger;
}
public async Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data message)
public async Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
{
if (message is not ErrorMessage obj || obj == null)
if (data is not ErrorMessage message || message == null)
return;
}
}

12
Seven/Socket/Handlers/ReconnectHandler.cs
View File

@ -7,20 +7,20 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
{
public class ReconnectHandler : IWebSocketHandler
{
private ILogger Logger { get; }
public int OperationCode { get; set; } = 4;
private readonly ILogger _logger;
public int OperationCode { get; } = 4;
public ReconnectHandler(ILogger logger)
{
Logger = logger;
_logger = logger;
}
public async Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data message)
public async Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
{
if (message is not ReconnectMessage obj || obj == null)
if (data is not ReconnectMessage message || message == null)
return;
Logger.Information($"7tv server wants us to reconnect (reason: {obj.Reason}).");
_logger.Information($"7tv server wants this client to reconnect (reason: {message.Reason}).");
}
}
}

18
Seven/Socket/Handlers/SevenHelloHandler.cs
View File

@ -7,27 +7,25 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
{
public class SevenHelloHandler : IWebSocketHandler
{
private ILogger Logger { get; }
private Configuration Configuration { get; }
public int OperationCode { get; set; } = 1;
private readonly ILogger _logger;
public int OperationCode { get; } = 1;
public SevenHelloHandler(ILogger logger, Configuration configuration)
public SevenHelloHandler(ILogger logger)
{
Logger = logger;
Configuration = configuration;
_logger = logger;
}
public async Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data message)
public async Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
{
if (message is not SevenHelloMessage obj || obj == null)
if (data is not SevenHelloMessage message || message == null)
return;
if (sender is not SevenSocketClient seven || seven == null)
return;
seven.Connected = true;
seven.ConnectionDetails = obj;
Logger.Information("Connected to 7tv websockets.");
seven.ConnectionDetails = message;
_logger.Information("Connected to 7tv websockets.");
}
}
}

4
Seven/Socket/Managers/SevenHandlerManager.cs
View File

@ -28,13 +28,13 @@ namespace TwitchChatTTS.Seven.Socket.Managers
continue;
}
Logger.Debug($"Linked type {type.AssemblyQualifiedName} to 7tv websocket handler {handler.GetType().AssemblyQualifiedName}.");
_logger.Debug($"Linked type {type.AssemblyQualifiedName} to 7tv websocket handler {handler.GetType().AssemblyQualifiedName}.");
Add(handler);
}
}
catch (Exception e)
{
Logger.Error(e, "Failed to load 7tv websocket handler types.");
_logger.Error(e, "Failed to load 7tv websocket handler types.");
}
}
}