Доработан стартер адаптеров

BotPages.Core/Abstractions/IMessengerAdapter.cs

@@ -1,4 +1,5 @@
-using BotPages.Core.Messaging;
+using BotPages.Core.Context;
+using BotPages.Core.Messaging;
 
 namespace BotPages.Core.Abstractions;
 
@@ -40,3 +41,17 @@ public interface IMessengerAdapter
     /// </summary>
     Task OnLeaveAsync(PageContext ctx, CancellationToken ct);
 }
+
+/// <summary>
+/// Контракт конфигурации адаптера.
+/// </summary>
+public interface IMessangerAdapterSetup : IMessengerAdapter
+{
+    /// <summary>
+    /// Запуск работы адаптера
+    /// </summary>
+    /// <param name="onUpdate"></param>
+    /// <param name="ct"></param>
+    /// <returns></returns>
+    Task StartAdapterAsync(Func<UpdateContext, Task> onUpdate, CancellationToken ct);
+}

BotPages.Core/Abstractions/IMessengerAdapterFactory.cs

@@ -4,16 +4,35 @@ namespace BotPages.Core.Abstractions;
 
 /// <summary>
 /// Фабрика адаптеров мессенджеров.
-/// Используется для разрешения конкретного <see cref="IMessengerAdapter"/> по типу мессенджера.
+/// Используется для разрешения конкретного <see cref="IMessangerAdapterSetup"/> по типу мессенджера.
 /// </summary>
 public interface IMessengerAdapterFactory
 {
+    /// <summary>
+    /// Список зарегистрированных адаптеров.
+    /// </summary>
+    Dictionary<string, IMessangerAdapterSetup> Adapters { get; }
+
+    /// <summary>
+    /// Зарегистрировать адаптер для указанного типа мессенджера.
+    /// </summary>
+    /// <param name="messengerType">
+    /// Тип мессенджера (например, "Telegram", "Slack", "VK").
+    /// </param>
+    /// <param name="adapter">
+    /// Экземпляр адаптера, реализующий <see cref="IMessengerAdapter"/>.
+    /// </param>
+    /// <returns>
+    /// Текущий экземпляр <see cref="MultiAdapterFactory"/> для цепочки вызовов.
+    /// </returns>
+    IMessengerAdapterFactory Register(string messengerType, IMessangerAdapterSetup adapter);
+
     /// <summary>
     /// Получить адаптер для указанного мессенджера.
     /// </summary>
     /// <param name="messengerType">
     /// Тип мессенджера (например, "Telegram", "Slack", "VK").
-    /// Значение должно совпадать с <see cref="UpdateContext.User"/>.<see cref="UserContext.MessengerType"/>.
+    /// Значение должно совпадать с <see cref="UpdateContext.MessengerType"/>.
     /// </param>
     /// <returns>
     /// Экземпляр <see cref="IMessengerAdapter"/>, зарегистрированный для данного типа мессенджера.

BotPages.Core/Abstractions/MultiAdapterFactory.cs

@@ -6,7 +6,12 @@
 /// </summary>
 public sealed class MultiAdapterFactory : IMessengerAdapterFactory
 {
-    private readonly Dictionary<string, IMessengerAdapter> _adapters = new(StringComparer.OrdinalIgnoreCase);
+    private readonly Dictionary<string, IMessangerAdapterSetup> _adapters = new(StringComparer.OrdinalIgnoreCase);
+
+    /// <summary>
+    /// Список зарегистрированных адаптеров.
+    /// </summary>
+    public Dictionary<string, IMessangerAdapterSetup> Adapters => _adapters;
 
     /// <summary>
     /// Зарегистрировать адаптер для указанного типа мессенджера.
@@ -20,7 +25,7 @@ public sealed class MultiAdapterFactory : IMessengerAdapterFactory
     /// <returns>
     /// Текущий экземпляр <see cref="MultiAdapterFactory"/> для цепочки вызовов.
     /// </returns>
-    public MultiAdapterFactory Register(string messengerType, IMessengerAdapter adapter)
+    public IMessengerAdapterFactory Register(string messengerType, IMessangerAdapterSetup adapter)
     {
         _adapters[messengerType] = adapter;
         return this;

BotPages.Core/BotPagesApp.cs

@@ -19,16 +19,30 @@ public sealed class BotPagesApp
     private readonly ILogger _logger;
     private readonly NavigationService _navigation;
 
+    /// <summary>
+    /// Серсвис логирования.
+    /// </summary>
+    public ILogger Logger => _logger;
+
     /// <summary>
     /// Создать приложение BotPages.
     /// </summary>
-    public BotPagesApp(IMessengerAdapterFactory adapterFactory, IStateStorage state, ILogger logger)
+    public BotPagesApp(IStateStorage state, ILogger logger)
     {
-        _adapterFactory = adapterFactory;
         _state = state;
         _logger = logger;
 
         _navigation = new NavigationService(_routes);
+        _adapterFactory = new MultiAdapterFactory();
+    }
+
+    /// <summary>
+    /// Добавить адаптер.
+    /// </summary>
+    public BotPagesApp AddAdapter(string messengerType, IMessangerAdapterSetup adapter)
+    {
+        _adapterFactory.Register(messengerType, adapter);
+        return this;
     }
 
     /// <summary>
@@ -173,4 +187,17 @@ public sealed class BotPagesApp
     /// </summary>
     private Page? ResolveCurrentPage(PageContext ctx)
         => _navigation.ResolveCurrentPage(ctx);
+
+    /// <summary>
+    /// Сборка и запуск приложения.
+    /// </summary>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public async Task Build(CancellationToken cancellationToken)
+    {
+        foreach (var adapter in _adapterFactory.Adapters)
+        {
+            await adapter.Value.StartAdapterAsync(update => HandleUpdateAsync(update, cancellationToken), cancellationToken);
+        }
+    }
 }

BotPages.Core/Messaging/ButtonAttribute.cs

@@ -25,6 +25,9 @@ public class ButtonAttribute : Attribute
     public string? Value { get; }
 }
 
+/// <summary>
+/// Расширение для работы с кнопками.
+/// </summary>
 public static class ButtonExtensions
 {
     private static readonly Dictionary<Type, Dictionary<string, object>> _cacheName = new();

BotPages.Core/Storage/InMemoryStateStorage.cs

@@ -31,6 +31,7 @@ public sealed class InMemoryStateStorage : IStateStorage
     public Task<bool> RemoveAsync(CompositeSessionKey session, string key, CancellationToken ct)
         => Task.FromResult(_store.TryGetValue(session, out var dict) ? dict.TryRemove(key, out _) : true);
 
+    /// <inheritdoc />
     public Task<bool> ClearAsync(CompositeSessionKey session, CancellationToken ct)
         => Task.FromResult(_store.TryRemove(session, out _));
 }

BotPages.Telegram/BotPagesAppExtension.cs

@@ -0,0 +1,22 @@
+using BotPages.Core;
+
+namespace BotPages.Telegram;
+
+/// <summary>
+/// Расширения для <see cref="BotPagesApp"/>.
+/// </summary>
+public static class BotPagesAppExtension
+{
+    /// <summary>
+    /// Добавление адаптера для телеграмм в <see cref="BotPages.Core.Abstractions.IMessengerAdapterFactory"/>
+    /// </summary>
+    /// <param name="app"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public static BotPagesApp AddTelegramAdapter(this BotPagesApp app, string token)
+    {
+        var telegram = new TelegramAdapter(app.Logger, token);
+        app.AddAdapter(telegram.MessagerType, telegram);
+        return app;
+    }
+}

BotPages.Telegram/TelegramAdapter.cs

@@ -21,32 +21,44 @@ namespace BotPages.Telegram;
 /// Адаптер для Telegram на базе Telegram.Bot.
 /// Реализует отправку текста, кнопок, файлов, альбомов и прогресса.
 /// </summary>
-public sealed class TelegramAdapter : IMessengerAdapter
+public sealed class TelegramAdapter : IMessangerAdapterSetup
 {
     private readonly ILogger _logger;
     private TelegramBotClient? _client;
+    private string _token;
+    private string _messagerType;
 
     /// <summary>Создать адаптер Telegram.</summary>
-    public TelegramAdapter(ILogger logger) => _logger = logger;
+    public TelegramAdapter(ILogger logger, string token)
+    {
+        _logger = logger;
+        _token = token;
+        _messagerType = "Telegram: " + Guid.NewGuid().ToString();
+    }
+
+    /// <summary>
+    ///Идентификатор мессенджера / адаптера
+    /// </summary>
+    public string MessagerType => _messagerType;
 
     /// <summary>
     /// Запустить polling для приема обновлений от Telegram.
     /// </summary>
-    public async Task StartPollingAsync(string token, Func<UpdateContext, Task> onUpdate, CancellationToken ct)
+    public async Task StartAdapterAsync(Func<UpdateContext, Task> onUpdate, CancellationToken ct)
     {
-        _client = new TelegramBotClient(token);
+        _client = new TelegramBotClient(_token);
 
         _client.StartReceiving(
             updateHandler: async (_, update, ct2) =>
             {
-                var mapped = TelegramUpdateMapper.Map(update, _client);
+                var mapped = TelegramUpdateMapper.Map(_messagerType, update, _client);
                 if (mapped is not null)
                     await onUpdate(mapped);
             },
 
             errorHandler: async (_, ex, ct2) =>
             {
-                _logger.Log(LogLevel.Warn, "Telegram error.", ex);
+                _logger.Log(LogLevel.Warn, $"{_messagerType} error.", ex);
                 await Task.CompletedTask;
             },
 
@@ -55,7 +67,7 @@ public sealed class TelegramAdapter : IMessengerAdapter
 
 
         var me = await _client.GetMe();
-        _logger.Log(LogLevel.Info, $"Telegram started: @{me.Username}");
+        _logger.Log(LogLevel.Info, $"{_messagerType} started: @{me.Username}");
 
         return;
     }
@@ -67,7 +79,7 @@ public sealed class TelegramAdapter : IMessengerAdapter
     {
         if (_client is null)
         {
-            _logger.Log(LogLevel.Critical, "Telegram client is not initialized.");
+            _logger.Log(LogLevel.Critical, $"{_messagerType} client is not initialized.");
             return;
         }
 
@@ -137,7 +149,7 @@ public sealed class TelegramAdapter : IMessengerAdapter
     {
         if (_client is null)
         {
-            _logger.Log(LogLevel.Critical, "Telegram client is not initialized.");
+            _logger.Log(LogLevel.Critical, $"{_messagerType} client is not initialized.");
             return;
         }
 
@@ -192,7 +204,7 @@ public sealed class TelegramAdapter : IMessengerAdapter
     {
         if (_client is null)
         {
-            _logger.Log(LogLevel.Critical, "Telegram client is not initialized.");
+            _logger.Log(LogLevel.Critical, $"{_messagerType} client is not initialized.");
             return null;
         }
 
@@ -216,7 +228,7 @@ public sealed class TelegramAdapter : IMessengerAdapter
     {
         if (_client is null)
         {
-            _logger.Log(LogLevel.Critical, "Telegram client is not initialized.");
+            _logger.Log(LogLevel.Critical, $"{_messagerType} client is not initialized.");
             return;
         }
 

BotPages.Telegram/TelegramUpdateMapper.cs

@@ -19,7 +19,7 @@ public static class TelegramUpdateMapper
     /// <summary>
     /// Маппинг Telegram Update в UpdateContext BotPages.
     /// </summary>
-    public static UpdateContext Map(Update update, TelegramBotClient client)
+    public static UpdateContext Map(string MessagerType, Update update, TelegramBotClient client)
     {
         var chat = update.Message?.Chat ?? update.CallbackQuery?.Message?.Chat;
         var user = update.Message?.From ?? update.CallbackQuery?.From;
@@ -131,7 +131,7 @@ public static class TelegramUpdateMapper
 
         return new UpdateContext
         {
-            MessengerType = "Telegram",
+            MessengerType = MessagerType,
             User = userContext,
             Chat = chatContext,
             Text = text,

Demo/Models/Request.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Demo.Models
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Demo.Models
 {
     internal class Request
     {

Demo/Pages/DetailsPage.cs

@@ -1,6 +1,5 @@
 using BotPages.Core;
 using BotPages.Core.Messaging;
-using System.Xml;
 
 namespace Demo.Pages;
 
@@ -38,12 +37,13 @@ public sealed class DetailsPage : StatefullPage<DetailsArgs>
                     break;
                 }
 
-            case "back": 
+            case "back":
                 {
                     await ctx.Navigation.GoToAsync<TitlePage>(ctx, ct);
                     break;
                 }
-        };
+        }
+        ;
     }
 
     public override async Task OnText(PageContext ctx, string text, CancellationToken ct)

Demo/Program.cs

@@ -1,5 +1,4 @@
 using BotPages.Core;
-using BotPages.Core.Abstractions;
 using BotPages.Core.Logging;
 using BotPages.Core.Middleware;
 using BotPages.Core.Storage;
@@ -17,22 +16,15 @@ namespace Demo
 
             var logger = new ConsoleLogger();
             var state = new InMemoryStateStorage();
+            using var cts = new CancellationTokenSource();
 
-            var telegram = new TelegramAdapter(logger);
+            var app = new BotPagesApp(state, logger)
-            var factory = new MultiAdapterFactory()
-                .Register("Telegram", telegram);
-
-            var app = new BotPagesApp(factory, state, logger)
                 .AddDefaultPage<WelcomePage>()
                 .MapCommand<WelcomePage>("/start")
                 .AddMiddleware(new ErrorHandlingMiddleware(logger))
-                .AddMiddleware(new LoggingMiddleware(logger));
+                .AddMiddleware(new LoggingMiddleware(logger))
-
+                .AddTelegramAdapter(token)
-            using var cts = new CancellationTokenSource();
+                .Build(cts.Token);
-
-            await telegram.StartPollingAsync(token,
-                update => app.HandleUpdateAsync(update, CancellationToken.None),
-                cts.Token);
 
             Console.ReadKey();
             cts.Cancel();