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

Added reconnection backoff for 7tv & hermes

Browse Source
This commit is contained in:
Tom
2024-08-11 21:41:22 +00:00
parent 0ad063cebd
commit 9f61295d2d
4 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,12 +15,13 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
_logger = logger;
}
public async Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
public Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
{
if (data is not ReconnectMessage message || message == null)
return;
return Task.CompletedTask;
_logger.Information($"7tv server wants this client to reconnect (reason: {message.Reason}).");
_logger.Information($"7tv server wants this client to reconnect [reason: {message.Reason}]");
return Task.CompletedTask;
}
}
}

41
Seven/Socket/SevenSocketClient.cs
View File

@@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
using Serilog;
using TwitchChatTTS.Seven.Socket.Data;
using System.Text.Json;
using CommonSocketLibrary.Backoff;
namespace TwitchChatTTS.Seven.Socket
{
@@ -14,12 +15,15 @@ namespace TwitchChatTTS.Seven.Socket
private readonly int[] _reconnectDelay;
private string? URL;
private readonly IBackoff _backoff;
public bool Connected { get; set; }
public SevenHelloMessage? ConnectionDetails { get; set; }
public SevenSocketClient(
User user,
[FromKeyedServices("7tv")] IBackoff backoff,
[FromKeyedServices("7tv")] IEnumerable<IWebSocketHandler> handlers,
[FromKeyedServices("7tv")] MessageTypeManager<IWebSocketHandler> typeManager,
ILogger logger
@@ -30,6 +34,7 @@ namespace TwitchChatTTS.Seven.Socket
}, logger)
{
_user = user;
_backoff = backoff;
ConnectionDetails = null;
_errorCodes = [
@@ -102,12 +107,6 @@ namespace TwitchChatTTS.Seven.Socket
{
_logger.Error(ex, "Could not connect to 7tv websocket.");
}
if (!Connected)
{
await Task.Delay(TimeSpan.FromSeconds(30));
await Connect();
}
}
private async void OnDisconnection(object? sender, SocketDisconnectionEventArgs e)
@@ -128,27 +127,29 @@ namespace TwitchChatTTS.Seven.Socket
_logger.Error($"7tv client will remain disconnected due to a bad client implementation.");
return;
}
else if (_reconnectDelay[code] > 0)
await Task.Delay(_reconnectDelay[code]);
else if (_reconnectDelay[code] > 1000)
await Task.Delay(_reconnectDelay[code] - 1000);
}
else
{
_logger.Warning("Unknown 7tv disconnection.");
await Task.Delay(TimeSpan.FromSeconds(30));
}
await Connect();
await Task.Delay(TimeSpan.FromMilliseconds(500));
Task.Run(async () =>
{
await Reconnect(_backoff, async () => await Connect());
await Task.Delay(TimeSpan.FromMilliseconds(500));
if (Connected && ConnectionDetails?.SessionId != null)
{
await Send(34, new ResumeMessage() { SessionId = ConnectionDetails.SessionId });
_logger.Debug("Resumed connection to 7tv websocket.");
}
else
{
_logger.Debug("Resumed connection to 7tv websocket on a different session.");
}
if (Connected && ConnectionDetails?.SessionId != null)
{
await Send(34, new ResumeMessage() { SessionId = ConnectionDetails.SessionId });
_logger.Debug("Resumed connection to 7tv websocket.");
}
else
{
_logger.Debug("Resumed connection to 7tv websocket on a different session.");
}
});
}
}
}