Добавлен вывод кнопок для файлов

BotPages.Core/Abstractions/IAlbumBuilder.cs

@@ -6,7 +6,7 @@
 public interface IAlbumBuilder
 {
     /// <summary>Добавить элемент в альбом.</summary>
-    IAlbumBuilder Add(FileDescriptor file, string? caption = null);
+    IAlbumBuilder Add(FileDescriptor file, string? caption = null, MessageFormat? captionFormat = null);
     /// <summary>Отправить альбом.</summary>
     Task SendAsync(CancellationToken ct = default);
 }

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;
 
@@ -8,35 +9,55 @@ namespace BotPages.Core.Abstractions;
 /// </summary>
 public interface IMessengerAdapter
 {
+    /// <summary>
+    /// Доступные возможности мессенджера.
+    /// </summary>
+    Capabilities Capabilities { get; }
+
     /// <summary>
     /// Отправить текстовое сообщение в чат.
     /// </summary>
-    Task SendTextAsync(PageContext ctx, string text, MessageFormat format,
+    Task<string?> SendTextAsync(string chatId, 
-        IEnumerable<IEnumerable<InlineButton>>? inline,
+        string text, 
-        IEnumerable<IEnumerable<ReplyButton>>? reply, CancellationToken ct);
+        MessageFormat format = MessageFormat.Plain,
+        IEnumerable<IEnumerable<InlineButton>>? inline = null,
+        IEnumerable<IEnumerable<ReplyButton>>? reply = null,
+        string? messageId = null, 
+        CancellationToken ct = default
+    );
 
     /// <summary>
     /// Отправить файл в чат.
     /// </summary>
-    Task SendFileAsync(PageContext ctx, FileDescriptor file, string? caption, CancellationToken ct);
+    Task SendFileAsync(string chatId, 
+        FileDescriptor file, 
+        string? caption = null, 
+        MessageFormat? captionFormat = null,
+        IEnumerable<IEnumerable<InlineButton>>? inline = null,
+        IEnumerable<IEnumerable<ReplyButton>>? reply = null,
+        CancellationToken ct = default);
 
     /// <summary>
     /// Создать билдер альбома для отправки медиагруппы.
     /// </summary>
     IAlbumBuilder CreateAlbumBuilder(PageContext ctx);
 
-    /// <summary>
-    /// Начать отображение прогресса операции.
-    /// </summary>
-    Task<string?> StartProgressAsync(PageContext ctx, string title, CancellationToken ct);
-
-    /// <summary>
-    /// Обновить прогресс операции.
-    /// </summary>
-    Task UpdateProgressAsync(PageContext ctx, string messageId, string title, int percent, CancellationToken ct);
-
     /// <summary>
     /// Вызывается при выходе со страницы.
     /// </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

@@ -4,6 +4,7 @@ using BotPages.Core.Abstractions;
 using BotPages.Core.Context;
 using BotPages.Core.Logging;
 using BotPages.Core.Routing;
+using System.Reflection;
 
 /// <summary>
 /// Основное приложение BotPages.
@@ -19,16 +20,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>
@@ -76,6 +91,45 @@ public sealed class BotPagesApp
         return this;
     }
 
+    /// <summary>
+    /// Зарегистрировать все маршруты для страницы.
+    /// Маршрутом является <see cref="RouteAttribute"/>.
+    /// Так же берется полное название класса.
+    /// </summary>
+    public BotPagesApp AutoMapRoute()
+    {
+        // Берём все загруженные сборки в текущем AppDomain
+        var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+
+        // Находим все типы, которые наследуются от Page
+        var pageTypes = assemblies
+            .SelectMany(a =>
+            {
+                try
+                {
+                    return a.GetTypes();
+                }
+                catch (ReflectionTypeLoadException ex)
+                {
+                    // Если часть типов не загрузилась — берём только успешные
+                    return ex.Types.Where(t => t != null)!;
+                }
+            })
+            .Where(t => t != null
+                        && t.IsClass
+                        && !t.IsAbstract
+                        && t.IsSubclassOf(typeof(Page)))
+            .ToList();
+
+        // Выводим полные имена
+        foreach (var type in pageTypes)
+        {
+            _routes.Map(type);
+        }
+
+        return this;
+    }
+
     /// <summary>
     /// Обработать входящее обновление.
     /// </summary>
@@ -147,7 +201,7 @@ public sealed class BotPagesApp
 
         if (page is null)
         {
-            await ctx.Navigation.GoToHome(ctx, ct);
+            await ctx.Navigation.GoToHomeAsync(ctx, ct);
             return;
         }
 
@@ -173,4 +227,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/Context/ChatContext.cs

@@ -15,7 +15,4 @@ public sealed class ChatContext
 
     /// <summary>Идентификатор треда (опционально).</summary>
     public string? ThreadId { get; init; }
-
-    /// <summary>Возможности мессенджера.</summary>
-    public Capabilities Capabilities { get; init; } = new();
 }

BotPages.Core/Context/PageContext.cs

@@ -22,87 +22,9 @@ public sealed class PageContext
     /// <summary>Адаптер мессенджера.</summary>
     public required IMessengerAdapter Adapter { get; init; }
 
-    //Storage
-
-    /// <summary>Получить состояние по ключу.</summary>
-    public Task<T?> GetStorageAsync<T>(string key, CancellationToken ct)
-        => StateStorage.GetAsync<T>(SessionKey, key, ct);
-
-    /// <summary>Сохранить состояние по ключу.</summary>
-    public Task SetStorageAsync<T>(string key, T state, CancellationToken ct)
-        => StateStorage.SetAsync<T>(SessionKey, key, state, ct);
-
-    /// <summary>Удалить состояние по ключу.</summary>
-    public Task<bool> RemoveStorageAsync(string key, CancellationToken ct)
-        => StateStorage.RemoveAsync(SessionKey, key, ct);
-
-    /// <summary>Удалить все состояния по ключу.</summary>
-    public Task<bool> ClearStorageAsync(CancellationToken ct)
-        => StateStorage.ClearAsync(SessionKey, ct);
-
-    //Adapter
-
-    /// <summary>
-    /// Отправить текстовое сообщение.
-    /// </summary>
-    public Task SendTextAsync(string text, MessageFormat format = MessageFormat.Plain,
-        IEnumerable<IEnumerable<InlineButton>>? inline = null,
-        IEnumerable<IEnumerable<ReplyButton>>? reply = null,
-        CancellationToken ct = default)
-        => Adapter.SendTextAsync(this, text, format, inline, reply, ct);
-
-    /// <summary>
-    /// Отправить файл.
-    /// </summary>
-    public Task SendFileAsync(FileDescriptor file, string? caption = null, CancellationToken ct = default)
-        => Adapter.SendFileAsync(this, file, caption, ct);
-
     /// <summary>
     /// Получить билдер альбомов.
     /// </summary>
     public IAlbumBuilder Albums => Adapter.CreateAlbumBuilder(this);
 
-    /// <summary>
-    /// Начать прогресс операции.
-    /// </summary>
-    public async Task<string?> StartProgressAsync(string title, CancellationToken ct)
-    {
-        var messageId = await Adapter.StartProgressAsync(this, title, ct);
-
-        if (messageId != null)
-        {
-            _progressMessageId = messageId;
-            _progressTitle = title;
-        }
-
-        return messageId;
-    }
-
-    /// <summary>
-    /// Обновить прогресс операции.
-    /// </summary>
-    public Task UpdateProgressAsync(int percent, CancellationToken ct)
-    {
-        if (_progressMessageId != null)
-        {
-            return Adapter.UpdateProgressAsync(this, _progressMessageId, _progressTitle ?? "", percent, ct);
-        }
-        else
-        {
-            return Task.CompletedTask;
-        }
-    }
-
-    /// <summary>
-    /// Обновить прогресс операции.
-    /// </summary>
-    public Task UpdateProgressAsync(string messageId, int percent, CancellationToken ct)
-    {
-        return Adapter.UpdateProgressAsync(this, messageId, _progressTitle ?? "", percent, ct);
-    }
-
-
-    private string? _progressMessageId = null;
-    private string? _progressTitle = null;
-
 }

BotPages.Core/Context/PageContextAdapterExtensions.cs

@@ -0,0 +1,41 @@
+using BotPages.Core.Abstractions;
+using BotPages.Core.Messaging;
+
+namespace BotPages.Core;
+
+/// <summary>
+/// Расширения <see cref="PageContext"/> для работы с <see cref="IMessengerAdapter"/>
+/// </summary>
+public static class PageContextAdapterExtensions
+{
+    /// <summary>
+    /// Отправить текстовое сообщение.
+    /// </summary>
+    public static Task<string?> SendTextAsync(this PageContext ctx, 
+        string text, 
+        MessageFormat format = MessageFormat.Plain,
+        IEnumerable<IEnumerable<InlineButton>>? inline = null,
+        IEnumerable<IEnumerable<ReplyButton>>? reply = null,
+        string? messageId = null,
+        CancellationToken ct = default)
+        => ctx.Adapter.SendTextAsync(ctx.Update.Chat.Id, text, format, inline, reply, messageId, ct);
+
+    /// <summary>
+    /// Отправить файл.
+    /// </summary>
+    public static Task SendFileAsync(this PageContext ctx, 
+        FileDescriptor file, 
+        string? caption = null, 
+        MessageFormat? captionFormat = null,
+        IEnumerable<IEnumerable<InlineButton>>? inline = null,
+        IEnumerable<IEnumerable<ReplyButton>>? reply = null,
+        CancellationToken ct = default
+    )
+        => ctx.Adapter.SendFileAsync(chatId: ctx.Update.Chat.Id, 
+            file: file, 
+            caption: caption, 
+            captionFormat: captionFormat,
+            inline: inline,
+            reply: reply,
+            ct: ct);
+}

BotPages.Core/Context/PageContextNavigationExtensions.cs

@@ -0,0 +1,38 @@
+namespace BotPages.Core;
+
+/// <summary>
+/// Расширения <see cref="PageContext"/> для работы с <see cref="NavigationService"/>
+/// </summary>
+public static class PageContextNavigationExtensions
+{
+
+    /// <summary>
+    /// Перейти по маршруту без аргументов.
+    /// </summary>
+    public static Task GoToHomeAsync(this PageContext ctx, CancellationToken ct)
+        => ctx.Navigation.GoToHomeAsync(ctx, ct);
+
+    /// <summary>
+    /// Перейти по маршруту без аргументов.
+    /// </summary>
+    public static Task GoToAsync(this PageContext ctx, string route, CancellationToken ct)
+        => ctx.Navigation.GoToAsync(route, ctx, ct);
+
+    /// <summary>
+    /// Перейти по маршруту с аргументами.
+    /// </summary>
+    public static Task GoToAsync<TArgs>(this PageContext ctx, string route, TArgs args, CancellationToken ct)
+        => ctx.Navigation.GoToAsync<TArgs>(route, args, ctx, ct);
+
+    /// <summary>
+    /// Перейти на страницу без аргументов.
+    /// </summary>
+    public static Task GoToAsync<TPage>(this PageContext ctx, CancellationToken ct) where TPage : Page
+        => ctx.Navigation.GoToAsync<TPage>(ctx, ct);
+
+    /// <summary>
+    /// Перейти на страницу с аргументами.
+    /// </summary>
+    public static Task GoToAsync<TPage, TArgs>(this PageContext ctx, TArgs args, CancellationToken ct) where TPage : StatefullPage<TArgs>
+        => ctx.Navigation.GoToAsync<TPage, TArgs>(ctx, args!, ct);
+}

BotPages.Core/Context/PageContextStorageExtensions.cs

@@ -0,0 +1,26 @@
+using BotPages.Core.Abstractions;
+
+namespace BotPages.Core;
+
+/// <summary>
+/// Расширения <see cref="PageContext"/> для работы с <see cref="IStateStorage"/>
+/// </summary>
+public static class PageContextStorageExtensions
+{
+
+    /// <summary>Получить состояние по ключу.</summary>
+    public static Task<T?> GetStorageAsync<T>(this PageContext ctx, string key, CancellationToken ct)
+        => ctx.StateStorage.GetAsync<T>(ctx.SessionKey, key, ct);
+
+    /// <summary>Сохранить состояние по ключу.</summary>
+    public static Task SetStorageAsync<T>(this PageContext ctx, string key, T state, CancellationToken ct)
+        => ctx.StateStorage.SetAsync<T>(ctx.SessionKey, key, state, ct);
+
+    /// <summary>Удалить состояние по ключу.</summary>
+    public static Task<bool> RemoveStorageAsync(this PageContext ctx, string key, CancellationToken ct)
+        => ctx.StateStorage.RemoveAsync(ctx.SessionKey, key, ct);
+
+    /// <summary>Удалить все состояния по ключу.</summary>
+    public static Task<bool> ClearStorageAsync(this PageContext ctx, CancellationToken ct)
+        => ctx.StateStorage.ClearAsync(ctx.SessionKey, ct);
+}

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/Messaging/MessageBuilder.cs

@@ -12,11 +12,10 @@ public sealed class MessageBuilder
     private MessageFormat _format = MessageFormat.Plain;
     private readonly List<List<InlineButton>> _inline = new();
     private readonly List<List<ReplyButton>> _reply = new();
-    private readonly List<(FileDescriptor file, string? caption)> _files = new();
+    private readonly List<(FileDescriptor file, string? caption, MessageFormat? captionFormat)> _files = new();
-    private readonly List<(FileDescriptor file, string? caption)> _album = new();
+    private readonly List<(FileDescriptor file, string? caption, MessageFormat? captionFormat)> _album = new();
-    private string? _progressTitle = null;
+    private bool _disableReplyKeyboard;
-    private int? _progressPercent = null;
+    private string? _editMessageId = null;
-    private string? _progressMessageId = null;
 
     /// <summary>Создать билдер сообщений.</summary>
     public MessageBuilder(PageContext ctx) => _ctx = ctx;
@@ -29,6 +28,13 @@ public sealed class MessageBuilder
         return this;
     }
 
+    /// <summary>Редактировать сообщение.</summary>
+    public MessageBuilder EditMessage(string messagId)
+    {
+        _editMessageId = messagId;
+        return this;
+    }
+
     /// <summary>Добавить inline‑кнопку.</summary>
     public MessageBuilder Inline(string label, string value)
     {
@@ -64,9 +70,20 @@ public sealed class MessageBuilder
         return this;
     }
 
+    /// <summary>
+    /// Отключение Reply клавиатуры.
+    /// </summary>
+    /// <returns></returns>
+    public MessageBuilder DisableReply()
+    {
+        _disableReplyKeyboard = true;
+        return this;
+    }
+
     /// <summary>Добавить reply‑кнопку.</summary>
     public MessageBuilder Reply(params ReplyButton[] label)
     {
+        _disableReplyKeyboard = false;
         _reply.Add(label.ToList());
         return this;
     }
@@ -74,6 +91,7 @@ public sealed class MessageBuilder
     /// <summary>Добавить строку reply‑кнопок.</summary>
     public MessageBuilder Reply(IEnumerable<ReplyButton> row)
     {
+        _disableReplyKeyboard = false;
         _reply.Add(row.ToList());
         return this;
     }
@@ -81,73 +99,65 @@ public sealed class MessageBuilder
     /// <summary>Добавить строку reply‑кнопок.</summary>
     public MessageBuilder Reply(IEnumerable<IEnumerable<ReplyButton>> row)
     {
+        _disableReplyKeyboard = false;
         _reply.AddRange(row.Select(t => t.ToList()).ToList());
         return this;
     }
 
     /// <summary>Добавить файл для отправки.</summary>
-    public MessageBuilder File(FileDescriptor file, string? caption = null)
+    public MessageBuilder File(FileDescriptor file, string? caption = null, MessageFormat? captionFormat = null)
     {
-        _files.Add((file, caption));
+        _files.Add((file, caption, captionFormat));
         return this;
     }
 
     /// <summary>Добавить файл в альбом.</summary>
-    public MessageBuilder Album(FileDescriptor file, string? caption = null)
+    public MessageBuilder Album(FileDescriptor file, string? caption = null, MessageFormat? captionFormat = null)
     {
-        _album.Add((file, caption));
+        _album.Add((file, caption, captionFormat));
-        return this;
-    }
-
-    /// <summary>Установить прогресс операции.</summary>
-    public MessageBuilder Progress(string title, int percent = 0)
-    {
-        _progressTitle = title;
-        _progressPercent = percent;
         return this;
     }
 
     /// <summary>Отправить собранное сообщение.</summary>
-    public async Task SendAsync(CancellationToken ct = default)
+    public async Task<string?> SendAsync(CancellationToken ct = default)
     {
+        string? messageId = null;
+
+        List<List<ReplyButton>>? reply = null;
+        if (_disableReplyKeyboard) reply = new();
+        else if (_reply.Any()) reply = _reply;
+
         // Текст
         if (!string.IsNullOrWhiteSpace(_text))
         {
-            await _ctx.SendTextAsync(_text, _format, _inline, _reply, ct);
+            messageId = await _ctx.SendTextAsync(_text, _format, _inline, reply, _editMessageId, ct);
         }
 
         // Файлы
-        foreach (var (file, caption) in _files)
+        foreach (var (file, caption, captionFormat) in _files)
-            await _ctx.SendFileAsync(file, caption, ct);
+            await _ctx.SendFileAsync(file: file
+                , caption: caption
+                , captionFormat: captionFormat
+                , reply: reply
+                , inline: _inline
+                , ct: ct
+            );
 
         // Альбом
         if (_album.Count > 0)
         {
             var builder = _ctx.Albums;
-            foreach (var (file, caption) in _album)
+            foreach (var (file, caption, captionFormat) in _album)
-                builder.Add(file, caption);
+                builder.Add(file, caption, captionFormat);
             await builder.SendAsync(ct);
         }
 
-        // Прогресс
-        if (_progressTitle is not null)
-        {
-            if (_progressMessageId is null)
-                _progressMessageId = await _ctx.StartProgressAsync(_progressTitle, ct);
-
-            if (_progressPercent > 0 && !string.IsNullOrEmpty(_progressMessageId))
-                await _ctx.UpdateProgressAsync(_progressMessageId, _progressPercent.Value, ct);
-        }
-
         _text = null;
         _files.Clear();
         _album.Clear();
 
-        if (_progressPercent >= 100)
+        _editMessageId = null;
-        {
+
-            _progressTitle = null;
+        return messageId;
-            _progressMessageId = null;
-            _progressPercent = null;
-        }
     }
 }

BotPages.Core/Navigation/NavigationService.cs

@@ -31,7 +31,7 @@ public sealed class NavigationService
     /// <summary>
     /// Перейти по маршруту без аргументов.
     /// </summary>
-    public Task GoToHome(PageContext ctx, CancellationToken ct)
+    public Task GoToHomeAsync(PageContext ctx, CancellationToken ct)
     {
         return NavigateAsync(_defaultPage!, ctx, null, ct);
     }

BotPages.Core/Routing/RoutesRegistry.cs

@@ -1,4 +1,6 @@
-namespace BotPages.Core.Routing;
+using System.Reflection;
+
+namespace BotPages.Core.Routing;
 
 /// <summary>
 /// Реестр маршрутов страниц.
@@ -26,4 +28,14 @@ internal sealed class RoutesRegistry
     /// Получить снимок всех маршрутов.
     /// </summary>
     public IReadOnlyDictionary<string, Type> Snapshot() => _routes;
+
+    internal void Map(Type? type)
+    {
+        foreach(var attr in type.GetCustomAttributes<RouteAttribute>(inherit: true))
+        {
+            _routes.Add(attr.Template, type);
+        }
+
+        _routes.Add(type.FullName, type);
+    }
 }

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,26 @@
+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>
+    /// <param name="messengerType"></param>
+    /// <returns></returns>
+    public static BotPagesApp AddTelegramAdapter(this BotPagesApp app, string token, string messengerType = "")
+    {
+        var telegram = new TelegramAdapter(app.Logger, token);
+
+        if (!string.IsNullOrWhiteSpace(messengerType)) telegram.MessengerType = messengerType;
+
+        app.AddAdapter(telegram.MessengerType, telegram);
+        return app;
+    }
+}

BotPages.Telegram/TelegramAdapter.cs

@@ -21,32 +21,56 @@ 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 static Capabilities _capabilities = new()
+    {
+        SupportsInlineButtons = true,
+        SupportsReplyButtons = true,
+        SupportsAlbums = true,
+        SupportsFormattingMarkdown = true,
+        SupportsFormattingHtml = true,
+        MaxMessageLength = 4096,
+    };
 
     /// <summary>Создать адаптер Telegram.</summary>
-    public TelegramAdapter(ILogger logger) => _logger = logger;
+    public TelegramAdapter(ILogger logger, string token)
+    {
+        _logger = logger;
+        _token = token;
+    }
+
+    /// <summary>
+    ///Идентификатор мессенджера / адаптера
+    /// </summary>
+    public string MessengerType { get; set; } = "Telegram: " + Guid.NewGuid().ToString();
+
+    /// <summary>
+    /// Доступные возможности адаптера.
+    /// </summary>
+    public Capabilities Capabilities => _capabilities;
 
     /// <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(MessengerType, 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, $"{MessengerType} error.", ex);
                 await Task.CompletedTask;
             },
 
@@ -55,39 +79,50 @@ public sealed class TelegramAdapter : IMessengerAdapter
 
 
         var me = await _client.GetMe();
-        _logger.Log(LogLevel.Info, $"Telegram started: @{me.Username}");
+        _logger.Log(LogLevel.Info, $"{MessengerType} started: @{me.Username}");
 
         return;
     }
 
     /// <inheritdoc />
-    public async Task SendTextAsync(PageContext ctx, string text, MessageFormat format,
+    public async Task<string?> SendTextAsync(string chatId, string text, 
-        IEnumerable<IEnumerable<InlineButton>>? inline,
+        MessageFormat format = MessageFormat.Plain,
-        IEnumerable<IEnumerable<ReplyButton>>? reply, CancellationToken ct)
+        IEnumerable<IEnumerable<InlineButton>>? inline = null,
+        IEnumerable<IEnumerable<ReplyButton>>? reply = null,
+        string? messageId = null, 
+        CancellationToken ct = default)
     {
         if (_client is null)
         {
-            _logger.Log(LogLevel.Critical, "Telegram client is not initialized.");
+            _logger.Log(LogLevel.Critical, $"{MessengerType} client is not initialized.");
-            return;
+            return null;
         }
 
+        InlineKeyboardMarkup? inlineMarkup = null;
         ReplyMarkup? markup = null;
 
         if (inline is not null && inline.Any())
         {
-            markup = new InlineKeyboardMarkup(
+            inlineMarkup = new InlineKeyboardMarkup(
                 inline.Select(row => row.Select(b => new InlineKeyboardButton(b.Label, b.Value)).ToArray())
                       .ToArray()
             );
         }
-        else if (reply is not null && reply.Any())
+        else if (reply is not null)
         {
-            markup = new ReplyKeyboardMarkup(
+            if (reply.Any())
-                reply.Select(row => row.Select(b => new KeyboardButton(b.Label)).ToArray()).ToArray()
-            )
             {
-                ResizeKeyboard = true
+                markup = new ReplyKeyboardMarkup(
-            };
+                    reply.Select(row => row.Select(b => new KeyboardButton(b.Label)).ToArray()).ToArray()
+                )
+                {
+                    ResizeKeyboard = true
+                };
+            }
+            else
+            {
+                markup = new ReplyKeyboardRemove();
+            }
         }
 
         var parseMode = ParseMode.None;
@@ -117,32 +152,57 @@ public sealed class TelegramAdapter : IMessengerAdapter
         }
 
         // Длина сообщения
-        if (text.Length > ctx.Update.Chat.Capabilities.MaxMessageLength)
+        if (text.Length > Capabilities.MaxMessageLength)
         {
-            _logger.Log(LogLevel.Warn, $"Message too long ({text.Length}). Truncated to {ctx.Update.Chat.Capabilities.MaxMessageLength}.");
+            _logger.Log(LogLevel.Warn, $"Message too long ({text.Length}). Truncated to {Capabilities.MaxMessageLength}.");
-            text = text.Substring(0, ctx.Update.Chat.Capabilities.MaxMessageLength);
+            text = text.Substring(0, Capabilities.MaxMessageLength);
         }
 
-        await _client.SendMessage(
+        if (!string.IsNullOrWhiteSpace(messageId))
-            chatId: long.Parse(ctx.Update.Chat.Id),
+        {
-            text: text,
+            await _client.EditMessageText(
-            parseMode: parseMode,
+                messageId: int.Parse(messageId),
-            replyMarkup: markup,
+                chatId: long.Parse(chatId),
-            cancellationToken: ct
+                text: text,
-        );
+                parseMode: parseMode,
+                replyMarkup: inlineMarkup,
+                cancellationToken: ct
+            );
+
+            return messageId;
+        }
+        else
+        {
+            if (inlineMarkup is not null) markup = inlineMarkup;
+
+            var message = await _client.SendMessage(
+                chatId: long.Parse(chatId),
+                text: text,
+                parseMode: parseMode,
+                replyMarkup: markup,
+                cancellationToken: ct
+            );
+
+            return message.Id.ToString();
+        }
     }
 
     /// <inheritdoc />
-    public async Task SendFileAsync(PageContext ctx, FileDescriptor file, string? caption, CancellationToken ct)
+    public async Task SendFileAsync(string chatId, 
+        FileDescriptor file, 
+        string? caption = null, 
+        MessageFormat? captionFormat = null,
+        IEnumerable<IEnumerable<InlineButton>>? inline = null,
+        IEnumerable<IEnumerable<ReplyButton>>? reply = null,
+        CancellationToken ct = default
+    )
     {
         if (_client is null)
         {
-            _logger.Log(LogLevel.Critical, "Telegram client is not initialized.");
+            _logger.Log(LogLevel.Critical, $"{MessengerType} client is not initialized.");
             return;
         }
 
-        var chatId = long.Parse(ctx.Update.Chat.Id);
-
         // Получаем поток, если он задан
         Stream? stream = null;
         if (file.GetStreamAsync is not null)
@@ -166,20 +226,77 @@ public sealed class TelegramAdapter : IMessengerAdapter
             inputFile = new InputFileId(file.Id);
         }
 
+        var parseMode = ParseMode.None;
+
+        switch (captionFormat)
+        {
+            case MessageFormat.Html:
+                {
+                    parseMode = ParseMode.Html;
+                    break;
+                }
+            case MessageFormat.Plain:
+                {
+                    parseMode = ParseMode.None;
+                    break;
+                }
+            case MessageFormat.Markdown:
+                {
+                    parseMode = ParseMode.MarkdownV2;
+                    break;
+                }
+            case null:
+                {
+                    parseMode = ParseMode.None;
+                    break;
+                }
+            default:
+                {
+                    _logger.Log(LogLevel.Warn, $"MessageFormat '{captionFormat}' not supported. Degraded to plain text.");
+                    break;
+                }
+        }
+
+        ReplyMarkup? markup = null;
+
+        if (inline is not null && inline.Any())
+        {
+            markup = new InlineKeyboardMarkup(
+                inline.Select(row => row.Select(b => new InlineKeyboardButton(b.Label, b.Value)).ToArray())
+                      .ToArray()
+            );
+        }
+        else if (reply is not null)
+        {
+            if (reply.Any())
+            {
+                markup = new ReplyKeyboardMarkup(
+                    reply.Select(row => row.Select(b => new KeyboardButton(b.Label)).ToArray()).ToArray()
+                )
+                {
+                    ResizeKeyboard = true
+                };
+            }
+            else
+            {
+                markup = new ReplyKeyboardRemove();
+            }
+        }
+
         // В зависимости от FileKind выбираем подходящий метод
         switch (file.Kind)
         {
             case FileKind.Photo:
-                await _client.SendPhoto(chatId, inputFile, caption ?? "", cancellationToken: ct);
+                await _client.SendPhoto(long.Parse(chatId), inputFile, caption ?? "", parseMode, replyMarkup: markup, cancellationToken: ct);
                 break;
             case FileKind.Video:
-                await _client.SendVideo(chatId, inputFile, caption: caption ?? "", cancellationToken: ct);
+                await _client.SendVideo(long.Parse(chatId), inputFile, caption: caption ?? "", parseMode, replyMarkup: markup, cancellationToken: ct);
                 break;
             case FileKind.Audio:
-                await _client.SendAudio(chatId, inputFile, caption ?? "", cancellationToken: ct);
+                await _client.SendAudio(long.Parse(chatId), inputFile, caption ?? "", parseMode, replyMarkup: markup, cancellationToken: ct);
                 break;
             default:
-                await _client.SendDocument(chatId, inputFile, caption ?? "", cancellationToken: ct);
+                await _client.SendDocument(long.Parse(chatId), inputFile, caption ?? "", parseMode, replyMarkup: markup, cancellationToken: ct);
                 break;
         }
     }
@@ -187,62 +304,6 @@ public sealed class TelegramAdapter : IMessengerAdapter
     /// <inheritdoc />
     public IAlbumBuilder CreateAlbumBuilder(PageContext ctx) => new TelegramAlbumBuilder(this, ctx, _logger, _client);
 
-    /// <inheritdoc />
-    public async Task<string?> StartProgressAsync(PageContext ctx, string title, CancellationToken ct)
-    {
-        if (_client is null)
-        {
-            _logger.Log(LogLevel.Critical, "Telegram client is not initialized.");
-            return null;
-        }
-
-        string text = "0%";
-        if (!string.IsNullOrEmpty(title))
-        {
-            text = title + Environment.NewLine + text;
-        }
-
-        var message = await _client.SendMessage(
-            chatId: long.Parse(ctx.Update.Chat.Id),
-            text: text,
-            cancellationToken: ct
-        );
-
-        return message.Id.ToString();
-    }
-
-    /// <inheritdoc />
-    public async Task UpdateProgressAsync(PageContext ctx, string messageId, string title, int percent, CancellationToken ct)
-    {
-        if (_client is null)
-        {
-            _logger.Log(LogLevel.Critical, "Telegram client is not initialized.");
-            return;
-        }
-
-        percent = Math.Clamp(percent, 0, 100);
-
-        string text = $"{percent}%";
-        if (!string.IsNullOrEmpty(title))
-        {
-            text = title + Environment.NewLine + text;
-        }
-
-        try
-        {
-            await _client.EditMessageText(
-                messageId: int.Parse(messageId),
-                chatId: long.Parse(ctx.Update.Chat.Id),
-                text: text,
-                cancellationToken: ct
-            );
-        }
-        catch (Exception ex)
-        {
-            _logger.Log(LogLevel.Critical, ex.Message, ex);
-        }
-    }
-
     /// <inheritdoc />
     public Task OnLeaveAsync(PageContext ctx, CancellationToken ct) => Task.CompletedTask;
 }

BotPages.Telegram/TelegramAlbumBuilder.cs

@@ -20,7 +20,7 @@ public sealed class TelegramAlbumBuilder : IAlbumBuilder
     private readonly PageContext _ctx;
     private readonly ILogger _logger;
     private readonly TelegramBotClient? _client;
-    private readonly List<(FileDescriptor file, string? caption)> _items = new();
+    private readonly List<(FileDescriptor file, string? caption, MessageFormat? captionFormat)> _items = new();
 
     /// <summary>Создать билдер альбома.</summary>
     public TelegramAlbumBuilder(TelegramAdapter adapter, PageContext ctx, ILogger logger, TelegramBotClient? client)
@@ -32,9 +32,9 @@ public sealed class TelegramAlbumBuilder : IAlbumBuilder
     }
 
     /// <inheritdoc />
-    public IAlbumBuilder Add(FileDescriptor file, string? caption = null)
+    public IAlbumBuilder Add(FileDescriptor file, string? caption = null, MessageFormat? captionFormat = null)
     {
-        _items.Add((file, caption));
+        _items.Add((file, caption, captionFormat));
         return this;
     }
 
@@ -49,16 +49,16 @@ public sealed class TelegramAlbumBuilder : IAlbumBuilder
 
         var chatId = long.Parse(_ctx.Update.Chat.Id);
 
-        if (!_ctx.Update.Chat.Capabilities.SupportsAlbums)
+        if (!_adapter.Capabilities.SupportsAlbums)
         {
             _logger.Log(LogLevel.Warn, "Albums not supported. Degraded to sequential sends.");
-            foreach (var (file, caption) in _items)
+            foreach (var (file, caption, captionFormat) in _items)
-                await _adapter.SendFileAsync(_ctx, file, caption, ct);
+                await _adapter.SendFileAsync(_ctx.Update.Chat.Id, file, caption, captionFormat, ct: ct);
             return;
         }
 
         var media = new List<IAlbumInputMedia>();
-        foreach (var (file, caption) in _items)
+        foreach (var (file, caption, captionFormat) in _items)
         {
             Stream? stream = null;
             if (file.GetStreamAsync is not null)
@@ -95,7 +95,7 @@ public sealed class TelegramAlbumBuilder : IAlbumBuilder
             {
                 // Telegram не поддерживает document в альбомах — деградация
                 _logger.Log(LogLevel.Warn, $"Document '{file.Kind}' in album not supported. Sending document separately.");
-                await _adapter.SendFileAsync(_ctx, file, caption, ct);
+                await _adapter.SendFileAsync(_ctx.Update.Chat.Id, file, caption, captionFormat, ct: ct);
             }
         }
 

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 MessengerType, Update update, TelegramBotClient client)
     {
         var chat = update.Message?.Chat ?? update.CallbackQuery?.Message?.Chat;
         var user = update.Message?.From ?? update.CallbackQuery?.From;
@@ -34,15 +34,6 @@ public static class TelegramUpdateMapper
         {
             Id = chat?.Id.ToString() ?? "unknown",
             Title = chat?.Title,
-            Capabilities = new Capabilities
-            {
-                SupportsInlineButtons = true,
-                SupportsReplyButtons = true,
-                SupportsAlbums = true,
-                SupportsFormattingMarkdown = true,
-                SupportsFormattingHtml = true,
-                MaxMessageLength = 4096,
-            }
         };
 
         string? text = null;
@@ -131,7 +122,7 @@ public static class TelegramUpdateMapper
 
         return new UpdateContext
         {
-            MessengerType = "Telegram",
+            MessengerType = MessengerType,
             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/Pages/FilesPage.cs

@@ -20,7 +20,7 @@ public sealed class FilesPage : SingletonPage
     {
         foreach (var file in files)
         {
-            await ctx.SendFileAsync(file, $"Файл '{file.Name}' получен и отправлен обратно.", ct);
+            await ctx.SendFileAsync(file, $"Файл '{file.Name}' получен и отправлен обратно.", ct: ct);
         }
 
         //Обращение через Storage

Demo/Pages/SubmitPage.cs

@@ -12,8 +12,8 @@ public sealed class SubmitPage : SingletonPage
     {
         var progress = new MessageBuilder(ctx);
 
-        await progress
+        var messageId = await progress
-            .Progress("Отправка заявки", 7)
+            .Text("Отправка заявки\n7%")
             .SendAsync(ct);
 
         int i = 7;
@@ -22,12 +22,13 @@ public sealed class SubmitPage : SingletonPage
             i += 25;
             Thread.Sleep(TimeSpan.FromMilliseconds(200));
             await progress
-                .Progress("Отправка заявки", i)
+                .Text($"Отправка заявки\n{i}%")
+                .EditMessage(messageId!)
                 .SendAsync(ct);
         }
         while (i < 100);
 
-        await ctx.Navigation.GoToHome(ctx, ct);
+        await ctx.Navigation.GoToHomeAsync(ctx, ct);
     }
 
     public override Task OnLeave(PageContext ctx, CancellationToken ct)

Demo/Pages/TitlePage.cs

@@ -19,7 +19,7 @@ public sealed class TitlePage : SingletonPage
     {
         if (text == "Меню")
         {
-            return ctx.Navigation.GoToHome(ctx, ct);
+            return ctx.Navigation.GoToHomeAsync(ctx, ct);
         }
         else
         {

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, "Telegram")
-            using var cts = new CancellationTokenSource();
+                .Build(cts.Token);
-
-            await telegram.StartPollingAsync(token,
-                update => app.HandleUpdateAsync(update, CancellationToken.None),
-                cts.Token);
 
             Console.ReadKey();
             cts.Cancel();

TZ.md

@@ -17,7 +17,6 @@
 - **Page** — класс, отвечающий за состояние экрана бота.  
   - `Page` — базовый класс.  
   - `Page<TArguments>` — страница с аргументами.  
-  - `ModalPage` / `ModalPage<TArguments>` — модальная страница (перехватывает ввод, блокирует переходы).  
 - **Контекст:**  
   - `UserContext` — данные пользователя (UserId, MessengerType).  
   - `ChatContext` — данные чата (ChatId, Title, ThreadId?, ленивое обновление).  
@@ -25,7 +24,7 @@
 - **Состояние:**  
   - `IStateStorage` — универсальный интерфейс хранения.  
   - Базовая реализация: InMemory.  
-  - Ключ: `CompositeSessionKey(MessengerType:string, ChatId, UserId?)`.  
+  - Ключ: `CompositeSessionKey(MessengerType:string, ChatId, UserId)`.  
   - История состояний: опционально (None, LastN, TimeWindow, Full).  
 
 ---
@@ -125,7 +124,7 @@
   ```
 - Пример:
   ```csharp
-  app.AddMiddleware<IUpdateMiddleware, LoggingMiddleware>();
+  app.AddMiddleware<LoggingMiddleware>();
   app.AddMiddleware<ErrorMiddleware>(params);
   ```
 - Порядок регистрации = порядок выполнения.