исправлен парсер команд

BotPages.Core/Abstractions/IMessengerAdapter.cs

@@ -59,5 +59,5 @@ public interface IMessangerAdapterSetup : IMessengerAdapter
     /// <param name="onUpdate"></param>
     /// <param name="ct"></param>
     /// <returns></returns>
-    Task StartAdapterAsync(Func<UpdateContext, Task> onUpdate, CancellationToken ct);
+    Task StartAdapterAsync(Func<UpdateContext, Task> onUpdate, List<Routing.Command> commands, CancellationToken ct);
 }

BotPages.Core/BotPagesApp.cs

@@ -69,16 +69,34 @@ public sealed class BotPagesApp
     /// </summary>
     public BotPagesApp MapCommand<TPage>(string commandTemplate) where TPage : Page
     {
-        _commands.Map<TPage>(commandTemplate);
+        _commands.Map<TPage>(commandTemplate, false, null);
+        return this;
+    }
+
+    /// <summary>
+    /// Зарегистрировать команду, ведущую на страницу.
+    /// </summary>
+    public BotPagesApp MapCommand<TPage>(string commandTemplate, bool publish, string description) where TPage : Page
+    {
+        _commands.Map<TPage>(commandTemplate, publish, description);
         return this;
     }
 
     /// <summary>
     /// Зарегистрировать команду с кастомным обработчиком.
     /// </summary>
-    public BotPagesApp MapCommand(string template, Func<PageContext, CancellationToken, Task> handler)
+    public BotPagesApp MapCommand(string template, CommandHandler handler)
     {
-        _commands.Map(template, handler);
+        _commands.Map(template, handler, false, null);
+        return this;
+    }
+
+    /// <summary>
+    /// Зарегистрировать команду с кастомным обработчиком.
+    /// </summary>
+    public BotPagesApp MapCommand(string template, CommandHandler handler, bool publish, string description)
+    {
+        _commands.Map(template, handler, publish, description);
         return this;
     }
 
@@ -142,7 +160,6 @@ public sealed class BotPagesApp
         {
             if (_commands.TryDispatch(ctx, update.Text, ct, out var dispatched) && dispatched is not null)
             {
-                _logger.Log(LogLevel.Info, $"Command '{update.Text}' dispatched.");
                 await dispatched;
                 return;
             }
@@ -237,7 +254,7 @@ public sealed class BotPagesApp
     {
         foreach (var adapter in _adapterFactory.Adapters)
         {
-            await adapter.Value.StartAdapterAsync(update => HandleUpdateAsync(update, cancellationToken), cancellationToken);
+            await adapter.Value.StartAdapterAsync(update => HandleUpdateAsync(update, cancellationToken), _commands.Commands, cancellationToken);
         }
     }
 }

BotPages.Core/Routing/Command.cs

@@ -0,0 +1,34 @@
+namespace BotPages.Core.Routing;
+
+using System.Text.RegularExpressions;
+
+/// <summary>
+/// Команда действий. Например "/start"
+/// </summary>
+public class Command
+{
+    /// <summary>
+    /// Название команды.
+    /// </summary>
+    public required string Name { get; init; }
+
+    /// <summary>
+    /// Шаблон команды.
+    /// </summary>
+    public required Regex Pattern { get; init; }
+
+    /// <summary>
+    /// Обработчик команды.
+    /// </summary>
+    public required CommandHandler Handler { get; init; }
+
+    /// <summary>
+    /// Описание команды.
+    /// </summary>
+    public string? Description { get; init; }
+
+    /// <summary>
+    /// Публичный? нужно ли регистрировать в боте.
+    /// </summary>
+    public required bool Publish { get; init; }
+}

BotPages.Core/Routing/CommandHandler.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BotPages.Core.Routing;
+
+/// <summary>
+/// Обработчик команды: получает контекст страницы, аргументы команды и токен отмены.
+/// </summary>
+public delegate Task CommandHandler(PageContext context, IReadOnlyDictionary<string, string>? args, CancellationToken cancellationToken);

BotPages.Core/Routing/CommandsRegistry.cs

@@ -2,30 +2,40 @@
 
 using System.Text.RegularExpressions;
 
+
 /// <summary>
 /// Реестр команд, доступных из любого места.
 /// </summary>
 internal sealed class CommandsRegistry
 {
-    private readonly List<(Regex pattern, Func<PageContext, CancellationToken, Task> handler)> _commands = new();
+    private readonly List<Command> _commands = new();
+
+    public List<Command> Commands => _commands;
 
     /// <summary>
     /// Зарегистрировать команду, ведущую на страницу.
     /// </summary>
-    public CommandsRegistry Map<TPage>(string commandTemplate) where TPage : Page
+    public CommandsRegistry Map<TPage>(string commandTemplate, bool publish = false, string? description = null) where TPage : Page
     {
         var pattern = ToRegex(commandTemplate);
-        _commands.Add((pattern, (ctx, ct) => ctx.Navigation.GoToAsync<TPage>(ctx, ct)));
-        return this;
+
+        return Map(commandTemplate, (ctx, args, ct) => ctx.Navigation.GoToAsync<TPage>(ctx, ct), publish, description);
     }
 
     /// <summary>
     /// Зарегистрировать команду с кастомным обработчиком.
     /// </summary>
-    public CommandsRegistry Map(string commandTemplate, Func<PageContext, CancellationToken, Task> handler)
+    public CommandsRegistry Map(string commandTemplate, CommandHandler handler, bool publish = false, string? description = null)
     {
         var pattern = ToRegex(commandTemplate);
-        _commands.Add((pattern, handler));
+        _commands.Add(new Command()
+        {
+            Name = ToCommandName(commandTemplate),
+            Pattern = pattern,
+            Handler = handler,
+            Publish = publish,
+            Description = string.IsNullOrWhiteSpace(description) ? null : description
+        });
         return this;
     }
 
@@ -34,11 +44,17 @@ internal sealed class CommandsRegistry
     /// </summary>
     public bool TryDispatch(PageContext ctx, string command, CancellationToken ct, out Task? task)
     {
-        foreach (var (pattern, handler) in _commands)
+        foreach (var cmd in _commands)
         {
-            if (pattern.IsMatch(command))
+            var match = cmd.Pattern.Match(command);
+            if (match.Success)
             {
-                task = handler(ctx, ct);
+                // Собираем именованные группы (без числовых)
+                var args = cmd.Pattern.GetGroupNames()
+                    .Where(n => !int.TryParse(n, out _))
+                    .ToDictionary(n => n, n => match.Groups[n].Value);
+
+                task = cmd.Handler(ctx, args, ct);
                 return true;
             }
         }
@@ -46,14 +62,27 @@ internal sealed class CommandsRegistry
         return false;
     }
 
+    /// <summary>
+    /// Универсальный парсер шаблонов: /cmd {a} {b?} {c}
+    /// </summary>
     private static Regex ToRegex(string template)
     {
-        // Простейшее преобразование шаблона: "/open {page} {id?}" -> Regex
         var escaped = Regex.Escape(template)
             .Replace("\\{", "{").Replace("\\}", "}");
-        var pattern = "^" + escaped
-            .Replace("{page}", "(?<page>\\S+)")
-            .Replace("{id?}", "(?<id>\\S+)?") + "$";
+
+        var pattern = "^" + Regex.Replace(escaped, @"\{(\w+)(\?)?\}", m =>
+        {
+            var name = m.Groups[1].Value;
+            var optional = m.Groups[2].Success;
+            return optional ? $"(?<{name}>\\S+)?" : $"(?<{name}>\\S+)";
+        }) + "$";
+
         return new Regex(pattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
     }
+
+    private static string ToCommandName(string template)
+    {
+        // Простейшее преобразование шаблона: "/open {page} {id?}" -> "/open"
+        return template.Split(" ", StringSplitOptions.RemoveEmptyEntries).First().ToLowerInvariant();
+    }
 }

BotPages.Telegram/TelegramAdapter.cs

@@ -56,7 +56,7 @@ public sealed class TelegramAdapter : IMessangerAdapterSetup
     /// <summary>
     /// Запустить polling для приема обновлений от Telegram.
     /// </summary>
-    public async Task StartAdapterAsync(Func<UpdateContext, Task> onUpdate, CancellationToken ct)
+    public async Task StartAdapterAsync(Func<UpdateContext, Task> onUpdate, List<BotPages.Core.Routing.Command> commands, CancellationToken ct)
     {
         _client = new TelegramBotClient(_token);
 
@@ -77,6 +77,7 @@ public sealed class TelegramAdapter : IMessangerAdapterSetup
             cancellationToken: ct
         );
 
+        await _client.SetMyCommands(commands.Where(t => t.Publish).Select(t => new BotCommand(t.Name, t.Description ?? t.Name.TrimStart('/'))), cancellationToken: ct);
 
         var me = await _client.GetMe();
         _logger.Log(LogLevel.Info, $"{MessengerType} started: @{me.Username}");

BotPages/BotPages.csproj

@@ -1,9 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+	  <TargetFramework>net8.0</TargetFramework>
+	  <Nullable>enable</Nullable>
+	  <ImplicitUsings>enable</ImplicitUsings>
+	  <GenerateDocumentationFile>true</GenerateDocumentationFile>
+	  <PackageId>BotPages</PackageId>
+	  <Version>1.0.0</Version>
+	  <Authors>FrigaT</Authors>
+	  <Company>FrigaT</Company>
+	  <Product>BotPages</Product>
+	  <Description>Платформонезависимый framework для создания диалоговых ботов с системой страниц.</Description>
+	  <Copyright>Copyright © 2025 FrigaT</Copyright>
+	  <RepositoryUrl>https://git.frigat.duckdns.org/FrigaT/BotPages</RepositoryUrl>
+	  <RepositoryType>git</RepositoryType>
+	  <PackageProjectUrl>https://git.frigat.duckdns.org/FrigaT/BotPages</PackageProjectUrl>
+	  <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>

Demo/Pages/DetailsPage.cs

@@ -1,5 +1,6 @@
 using BotPages.Core;
 using BotPages.Core.Messaging;
+using BotPages.Core.Routing;
 
 namespace Demo.Pages;
 
@@ -7,20 +8,20 @@ namespace Demo.Pages;
 /// Страница ввода деталей заявки.
 /// Страница с параметрами и получением состояния.
 /// </summary>
-public sealed class DetailsPage : StatefullPage<DetailsArgs>
+public sealed class DetailsPage : StatefullPage<string>
 {
     [Statefull("Request")]
     private Models.Request Request;
 
-    public override Task OnEnter(PageContext ctx, DetailsArgs args, CancellationToken ct)
+    public override Task OnEnter(PageContext ctx, string args, CancellationToken ct)
     {
         Request = new()
         {
-            Title = args.Title,
+            Title = args,
         };
 
         return new MessageBuilder(ctx)
-            .Text($"Заголовок: {args.Title}\nДобавьте детали или нажмите Далее.")
+            .Text($"Заголовок: {args}\nДобавьте детали или нажмите Далее.")
             .Inline(new InlineButton("Далее", "next"), new InlineButton("Назад", "back"))
             .Reply("Отмена")
             .SendAsync(ct);
@@ -52,12 +53,15 @@ public sealed class DetailsPage : StatefullPage<DetailsArgs>
         await SaveState(ctx, ct);
         await ctx.Navigation.GoToAsync<FilesPage>(ctx, ct);
     }
-}
 
-/// <summary>
-/// Аргументы для страницы DetailsPage.
-/// </summary>
-public sealed class DetailsArgs
-{
-    public string Title { get; set; } = "";
+    internal static string Command => "/create_request {title}";
+    internal static string CommandDescription => "создание заявки /create_request {title";
+    internal static CommandHandler CommandHandler = async (ctx, args, ct) =>
+    {
+        string? title = "";
+        args?.TryGetValue("title", out title);
+
+        // Навигация на страницу по имени
+        await ctx.Navigation.GoToAsync<DetailsPage, string>(ctx, title ?? "", ct);
+    };
 }

Demo/Pages/FileSendPage.cs

@@ -1,9 +1,11 @@
 using BotPages.Core;
 using BotPages.Core.Abstractions;
 using BotPages.Core.Messaging;
+using BotPages.Core.Routing;
 
 namespace Demo.Pages;
 
+[Route("FileSend")]
 public sealed class FileSendPage : SingletonPage
 {
     public override Task OnEnter(PageContext ctx, CancellationToken ct)

Demo/Pages/TitlePage.cs

@@ -1,6 +1,7 @@
 using BotPages.Core;
 using BotPages.Core.Abstractions;
 using BotPages.Core.Messaging;
+using BotPages.Core.Routing;
 
 namespace Demo.Pages;
 /// <summary>
@@ -23,7 +24,7 @@ public sealed class TitlePage : SingletonPage
         }
         else
         {
-            return ctx.Navigation.GoToAsync<DetailsPage, DetailsArgs>(ctx, new DetailsArgs { Title = text }, ct);
+            return ctx.Navigation.GoToAsync<DetailsPage, string>(ctx, text, ct);
         }
     }
 }

Demo/Pages/WelcomePage.cs

@@ -1,6 +1,7 @@
 using BotPages.Core;
 using BotPages.Core.Abstractions;
 using BotPages.Core.Messaging;
+using BotPages.Core.Routing;
 
 namespace Demo.Pages;
 
@@ -8,6 +9,7 @@ namespace Demo.Pages;
 /// Стартовая страница демо‑бота.
 /// Обычная страница с кнопками
 /// </summary>
+[Route("Welcome")]
 public sealed class WelcomePage : SingletonPage
 {
     public override async Task OnEnter(PageContext ctx, CancellationToken ct)

Demo/Program.cs

@@ -1,6 +1,7 @@
 using BotPages.Core;
 using BotPages.Core.Logging;
 using BotPages.Core.Middleware;
+using BotPages.Core.Routing;
 using BotPages.Core.Storage;
 using BotPages.Telegram;
 using Demo.Pages;
@@ -18,9 +19,27 @@ namespace Demo
             var state = new InMemoryStateStorage();
             using var cts = new CancellationTokenSource();
 
+            // Можно использовать команды для открытия страниц с роутингом
+            // /open Welcome
+            // /open FileSend
+            CommandHandler openHandler = async (ctx, args, ct) =>
+            {
+                if (args is null || !args.TryGetValue("page", out var pageName))
+                {
+                    await ctx.SendTextAsync("Не указана страница для открытия.", ct: ct);
+                    return;
+                }
+
+                // Навигация на страницу по имени
+                await ctx.Navigation.GoToAsync(pageName, ctx, ct);
+            };
+
             var app = new BotPagesApp(state, logger)
                 .AddDefaultPage<WelcomePage>()
-                .MapCommand<WelcomePage>("/start")
+                .MapCommand<WelcomePage>("/start", true, "Главная")
+                .MapCommand("/open {page}", openHandler, true, "открыть станицу /open {page}")
+                .MapCommand(DetailsPage.Command, DetailsPage.CommandHandler, true, DetailsPage.CommandDescription)
+                .AutoMapRoute()
                 .AddMiddleware(new ErrorHandlingMiddleware(logger))
                 .AddMiddleware(new LoggingMiddleware(logger))
                 .AddTelegramAdapter(token, "Telegram")