From 08ffc6694e0d7b38dc22bb7ca8db49ab6e23f16a Mon Sep 17 00:00:00 2001 From: Toutsu Date: Thu, 21 May 2026 14:19:02 +0300 Subject: [PATCH 1/7] chore(discord): add DISCORD_BOT_TOKEN to .env.example Issue #32 --- .env.example | 4 ++++ .../Discord/DiscordProjectStructureTests.cs | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/.env.example b/.env.example index 0df8b59..6f92bc9 100644 --- a/.env.example +++ b/.env.example @@ -10,6 +10,10 @@ TELEGRAM_BOT_USERNAME=YOUR_BOT_USERNAME_HERE # Используется ботом для кнопки меню Telegram и кнопки /start. TELEGRAM_MINI_APP_URL= +# Токен Discord application bot +# Можно получить в Discord Developer Portal (https://discord.com/developers/applications) +DISCORD_BOT_TOKEN=YOUR_DISCORD_BOT_TOKEN_HERE + # Пароль для базы данных PostgreSQL POSTGRES_PASSWORD=StrongPasswordForDatabase diff --git a/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs b/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs index 0cdaec7..f555442 100644 --- a/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs +++ b/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs @@ -84,4 +84,13 @@ public sealed class DiscordProjectStructureTests "v2.7.0", File.ReadAllText(Path.Combine(repoRoot, "src", "GmRelay.Web", "Components", "Layout", "NavMenu.razor"))); } + + [Fact] + public void EnvExample_ShouldContainDiscordBotToken() + { + var repoRoot = GetRepoRoot(); + var envExample = File.ReadAllText(Path.Combine(repoRoot, ".env.example")); + + Assert.Contains("DISCORD_BOT_TOKEN", envExample); + } } From f1d8f56feccb2eb0d3095c42ff6ad146e0ed1169 Mon Sep 17 00:00:00 2001 From: Toutsu Date: Thu, 21 May 2026 14:19:50 +0300 Subject: [PATCH 2/7] feat(discord): add health check hosted service Issue #32 --- .../Health/DiscordHealthCheckHostedService.cs | 101 ++++++++++++++++++ .../DiscordHealthCheckHostedServiceTests.cs | 53 +++++++++ 2 files changed, 154 insertions(+) create mode 100644 src/GmRelay.DiscordBot/Infrastructure/Health/DiscordHealthCheckHostedService.cs create mode 100644 tests/GmRelay.Bot.Tests/Infrastructure/Health/DiscordHealthCheckHostedServiceTests.cs diff --git a/src/GmRelay.DiscordBot/Infrastructure/Health/DiscordHealthCheckHostedService.cs b/src/GmRelay.DiscordBot/Infrastructure/Health/DiscordHealthCheckHostedService.cs new file mode 100644 index 0000000..b40f204 --- /dev/null +++ b/src/GmRelay.DiscordBot/Infrastructure/Health/DiscordHealthCheckHostedService.cs @@ -0,0 +1,101 @@ +using System.Net; + +namespace GmRelay.DiscordBot.Infrastructure.Health; + +public sealed class DiscordHealthCheckHostedService : IHostedService +{ + private readonly ILogger _logger; + private readonly string _prefix; + private HttpListener? _listener; + private CancellationTokenSource? _cts; + private Task? _listenerTask; + + public DiscordHealthCheckHostedService( + ILogger logger, + IConfiguration configuration) + { + _logger = logger; + _prefix = configuration.GetValue("HealthCheck:Prefix", "http://+:8082/")!; + } + + public Task StartAsync(CancellationToken cancellationToken) + { + _cts = new CancellationTokenSource(); + _listener = new HttpListener(); + _listener.Prefixes.Add(_prefix); + _listener.Start(); + + _logger.LogInformation("Discord health check server started on {Prefix}", _prefix); + + _listenerTask = Task.Run(async () => await ListenAsync(_cts.Token), cancellationToken); + + return Task.CompletedTask; + } + + public async Task StopAsync(CancellationToken cancellationToken) + { + _cts?.Cancel(); + _listener?.Stop(); + + if (_listenerTask != null) + { + await Task.WhenAny(_listenerTask, Task.Delay(TimeSpan.FromSeconds(5), cancellationToken)); + } + + _listener?.Close(); + _logger.LogInformation("Discord health check server stopped"); + } + + private async Task ListenAsync(CancellationToken cancellationToken) + { + while (_listener?.IsListening == true && !cancellationToken.IsCancellationRequested) + { + try + { + var context = await _listener.GetContextAsync(); + _ = Task.Run(() => HandleRequestAsync(context), cancellationToken); + } + catch (HttpListenerException) when (cancellationToken.IsCancellationRequested) + { + break; + } + catch (ObjectDisposedException) + { + break; + } + catch (Exception ex) + { + _logger.LogError(ex, "Error in Discord health check listener"); + } + } + } + + private async Task HandleRequestAsync(HttpListenerContext context) + { + var response = context.Response; + try + { + var request = context.Request; + + if (request.Url?.AbsolutePath == "/health") + { + response.StatusCode = (int)HttpStatusCode.OK; + response.ContentType = "application/json"; + var body = "{\"status\":\"healthy\"}"u8.ToArray(); + await response.OutputStream.WriteAsync(body); + } + else + { + response.StatusCode = (int)HttpStatusCode.NotFound; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Error handling Discord health check request"); + } + finally + { + response.Close(); + } + } +} diff --git a/tests/GmRelay.Bot.Tests/Infrastructure/Health/DiscordHealthCheckHostedServiceTests.cs b/tests/GmRelay.Bot.Tests/Infrastructure/Health/DiscordHealthCheckHostedServiceTests.cs new file mode 100644 index 0000000..98daa65 --- /dev/null +++ b/tests/GmRelay.Bot.Tests/Infrastructure/Health/DiscordHealthCheckHostedServiceTests.cs @@ -0,0 +1,53 @@ +using System.Net; +using System.Net.Sockets; +using GmRelay.DiscordBot.Infrastructure.Health; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging.Abstractions; + +namespace GmRelay.Bot.Tests.Infrastructure.Health; + +public sealed class DiscordHealthCheckHostedServiceTests : IDisposable +{ + private readonly DiscordHealthCheckHostedService _service; + private readonly int _port; + + public DiscordHealthCheckHostedServiceTests() + { + _port = GetAvailablePort(); + var config = new ConfigurationBuilder() + .AddInMemoryCollection(new Dictionary + { + ["HealthCheck:Prefix"] = $"http://localhost:{_port}/" + }) + .Build(); + + _service = new DiscordHealthCheckHostedService( + NullLogger.Instance, + config); + } + + public void Dispose() + { + _service.StopAsync(CancellationToken.None).Wait(TimeSpan.FromSeconds(5)); + } + + [Fact] + public async Task HealthEndpoint_ShouldReturn200_WhenServiceIsRunning() + { + await _service.StartAsync(CancellationToken.None); + + using var client = new HttpClient { Timeout = TimeSpan.FromSeconds(5) }; + var response = await client.GetAsync($"http://localhost:{_port}/health"); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + } + + private static int GetAvailablePort() + { + var listener = new TcpListener(IPAddress.Loopback, 0); + listener.Start(); + var port = ((IPEndPoint)listener.LocalEndpoint).Port; + listener.Stop(); + return port; + } +} From feb3e08b63d5fcdd506a03285dc6016081f03fe5 Mon Sep 17 00:00:00 2001 From: Toutsu Date: Thu, 21 May 2026 14:20:40 +0300 Subject: [PATCH 3/7] feat(discord): register health check hosted service in Program.cs Issue #32 --- src/GmRelay.DiscordBot/Program.cs | 2 ++ tests/GmRelay.Bot.Tests/Discord/DiscordStartupTests.cs | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/src/GmRelay.DiscordBot/Program.cs b/src/GmRelay.DiscordBot/Program.cs index 8cac081..59ccd05 100644 --- a/src/GmRelay.DiscordBot/Program.cs +++ b/src/GmRelay.DiscordBot/Program.cs @@ -2,6 +2,7 @@ using GmRelay.DiscordBot; using GmRelay.DiscordBot.Features.Sessions; using GmRelay.DiscordBot.Infrastructure; using GmRelay.DiscordBot.Infrastructure.Discord; +using GmRelay.DiscordBot.Infrastructure.Health; using GmRelay.DiscordBot.Infrastructure.Logging; using GmRelay.Shared.Features.Confirmation.HandleRsvp; using GmRelay.Shared.Features.Confirmation.SendConfirmation; @@ -73,6 +74,7 @@ builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddHostedService(); builder.Services.AddHostedService(); +builder.Services.AddHostedService(); builder.Services .AddDiscordGateway(options => diff --git a/tests/GmRelay.Bot.Tests/Discord/DiscordStartupTests.cs b/tests/GmRelay.Bot.Tests/Discord/DiscordStartupTests.cs index 5656855..cadff0a 100644 --- a/tests/GmRelay.Bot.Tests/Discord/DiscordStartupTests.cs +++ b/tests/GmRelay.Bot.Tests/Discord/DiscordStartupTests.cs @@ -87,6 +87,14 @@ public sealed class DiscordStartupTests Assert.Contains("HandleRsvpHandler", program); } + [Fact] + public void Program_ShouldRegisterDiscordHealthCheckHostedService() + { + var program = ReadProgram(); + Assert.Contains("DiscordHealthCheckHostedService", program); + Assert.Contains("AddHostedService", program); + } + private static string ReadProgram() { var repoRoot = GetRepoRoot(); From 5b65ac4a2f82f7c675ee644a8a874b083bad850d Mon Sep 17 00:00:00 2001 From: Toutsu Date: Thu, 21 May 2026 14:21:35 +0300 Subject: [PATCH 4/7] chore(discord): add healthcheck to compose.yaml discord service Issue #32 --- compose.yaml | 5 +++++ .../Discord/DiscordProjectStructureTests.cs | 17 +++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/compose.yaml b/compose.yaml index b56b02b..4d0ac8e 100644 --- a/compose.yaml +++ b/compose.yaml @@ -77,6 +77,11 @@ services: - "Discord__Token=${DISCORD_BOT_TOKEN:?Set DISCORD_BOT_TOKEN in .env}" networks: - gmrelay + healthcheck: + test: ["CMD-SHELL", "wget -qO- http://localhost:8082/health || exit 1"] + interval: 10s + timeout: 5s + retries: 3 web: image: git.codeanddice.ru/toutsu/gmrelay-web:2.7.0 diff --git a/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs b/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs index f555442..23590fb 100644 --- a/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs +++ b/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs @@ -93,4 +93,21 @@ public sealed class DiscordProjectStructureTests Assert.Contains("DISCORD_BOT_TOKEN", envExample); } + + [Fact] + public void Compose_ShouldIncludeDiscordHealthcheck() + { + var repoRoot = GetRepoRoot(); + var compose = File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")); + + var discordIndex = compose.IndexOf("discord:", StringComparison.Ordinal); + Assert.True(discordIndex >= 0, "compose.yaml should contain discord service"); + + var nextServiceIndex = compose.IndexOf(" web:", StringComparison.Ordinal); + var discordBlock = compose[discordIndex..nextServiceIndex]; + + Assert.Contains("healthcheck:", discordBlock); + Assert.Contains("test:", discordBlock); + Assert.Contains("localhost:8082/health", discordBlock); + } } From a2fa9aaa6c460f027d7663a704ee3a3af5c4a50c Mon Sep 17 00:00:00 2001 From: Toutsu Date: Thu, 21 May 2026 14:24:17 +0300 Subject: [PATCH 5/7] chore(release): bump version to 2.7.1 Issue #32 --- .gitea/workflows/deploy.yml | 2 +- Directory.Build.props | 2 +- compose.yaml | 6 +++--- src/GmRelay.Web/Components/Layout/NavMenu.razor | 2 +- .../Discord/DiscordProjectStructureTests.cs | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index d95354f..98ee087 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -6,7 +6,7 @@ on: - main env: - VERSION: 2.7.0 + VERSION: 2.7.1 jobs: # ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами) diff --git a/Directory.Build.props b/Directory.Build.props index 329a37a..81baf5f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 2.7.0 + 2.7.1 net10.0 preview enable diff --git a/compose.yaml b/compose.yaml index 4d0ac8e..bf3e556 100644 --- a/compose.yaml +++ b/compose.yaml @@ -49,7 +49,7 @@ services: crond -f bot: - image: git.codeanddice.ru/toutsu/gmrelay-bot:2.7.0 + image: git.codeanddice.ru/toutsu/gmrelay-bot:2.7.1 restart: always depends_on: db: @@ -67,7 +67,7 @@ services: retries: 3 discord: - image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:2.7.0 + image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:2.7.1 restart: always depends_on: db: @@ -84,7 +84,7 @@ services: retries: 3 web: - image: git.codeanddice.ru/toutsu/gmrelay-web:2.7.0 + image: git.codeanddice.ru/toutsu/gmrelay-web:2.7.1 restart: always depends_on: db: diff --git a/src/GmRelay.Web/Components/Layout/NavMenu.razor b/src/GmRelay.Web/Components/Layout/NavMenu.razor index 42d00dc..5d7699a 100644 --- a/src/GmRelay.Web/Components/Layout/NavMenu.razor +++ b/src/GmRelay.Web/Components/Layout/NavMenu.razor @@ -56,7 +56,7 @@ -
v2.7.0
+
v2.7.1
diff --git a/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs b/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs index 23590fb..8b630ca 100644 --- a/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs +++ b/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs @@ -75,13 +75,13 @@ public sealed class DiscordProjectStructureTests { var repoRoot = GetRepoRoot(); - Assert.Contains("2.7.0", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props"))); - Assert.Contains("VERSION: 2.7.0", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml"))); - Assert.Contains("gmrelay-bot:2.7.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); - Assert.Contains("gmrelay-web:2.7.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); - Assert.Contains("gmrelay-discord-bot:2.7.0", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); + Assert.Contains("2.7.1", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props"))); + Assert.Contains("VERSION: 2.7.1", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml"))); + Assert.Contains("gmrelay-bot:2.7.1", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); + Assert.Contains("gmrelay-web:2.7.1", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); + Assert.Contains("gmrelay-discord-bot:2.7.1", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml"))); Assert.Contains( - "v2.7.0", + "v2.7.1", File.ReadAllText(Path.Combine(repoRoot, "src", "GmRelay.Web", "Components", "Layout", "NavMenu.razor"))); } From fe8d5fe02640438383294f56135557da3ff9d3dc Mon Sep 17 00:00:00 2001 From: Toutsu Date: Thu, 21 May 2026 14:26:02 +0300 Subject: [PATCH 6/7] test(discord): update version assertions to 2.7.1 Issue #32 --- tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs b/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs index 8b630ca..c6577ce 100644 --- a/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs +++ b/tests/GmRelay.Bot.Tests/Discord/DiscordProjectStructureTests.cs @@ -61,7 +61,7 @@ public sealed class DiscordProjectStructureTests var prChecks = File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "pr-checks.yml")); var deploy = File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml")); - Assert.Contains("gmrelay-discord-bot:2.7.0", compose); + Assert.Contains("gmrelay-discord-bot:2.7.1", compose); Assert.Contains("Discord__Token=${DISCORD_BOT_TOKEN:?Set DISCORD_BOT_TOKEN in .env}", compose); Assert.Contains("src/GmRelay.DiscordBot/Dockerfile", deploy); Assert.Contains("DISCORD_BOT_TOKEN", deploy); From 492d47a86367c66432028033cef6edec0cb3541d Mon Sep 17 00:00:00 2001 From: Toutsu Date: Thu, 21 May 2026 14:40:45 +0300 Subject: [PATCH 7/7] fix(discord): add wget to Dockerfile for healthcheck Issue #32 --- src/GmRelay.DiscordBot/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/GmRelay.DiscordBot/Dockerfile b/src/GmRelay.DiscordBot/Dockerfile index d075a80..a8589ea 100644 --- a/src/GmRelay.DiscordBot/Dockerfile +++ b/src/GmRelay.DiscordBot/Dockerfile @@ -15,6 +15,11 @@ RUN dotnet publish "GmRelay.DiscordBot.csproj" -c Release -o /app/publish /p:Use # Stage 2: Runtime FROM mcr.microsoft.com/dotnet/runtime:10.0-noble AS final WORKDIR /app + +# Install wget for healthcheck +RUN apt-get update && apt-get install -y --no-install-recommends wget \ + && rm -rf /var/lib/apt/lists/* + COPY --from=build /app/publish . USER $APP_UID ENTRYPOINT ["dotnet", "GmRelay.DiscordBot.dll"]