* Added RemapWebhook method to WebHost

* Updatetd dependencues * Fixed some warnings
2026-04-03 19:23:53 +04:00
14 changed files with 184 additions and 183 deletions
@@ -84,9 +84,7 @@
            </summary>
        </member>
        <member name="T:Telegrator.Hosting.Web.TelegramBotWebHostBuilder">
-            <summary>
+            <inheritdoc/>
            Represents a web hosted telegram bots and services builder that helps manage configuration, logging, lifetime, and more.
            </summary>
        </member>
        <member name="P:Telegrator.Hosting.Web.TelegramBotWebHostBuilder.Handlers">
            <inheritdoc/>
@@ -109,37 +107,18 @@
        <member name="P:Telegrator.Hosting.Web.TelegramBotWebHostBuilder.Metrics">
            <inheritdoc/>
        </member>
-        <member name="M:Telegrator.Hosting.Web.TelegramBotWebHostBuilder.#ctor(Microsoft.AspNetCore.Builder.WebApplicationBuilder,Microsoft.AspNetCore.Builder.WebApplicationOptions)">
+        <member name="M:Telegrator.Hosting.Web.TelegramBotWebHostBuilder.#ctor(Microsoft.AspNetCore.Builder.WebApplicationBuilder)">
            <summary>
            Initializes a new instance of the <see cref="T:Telegrator.Hosting.Web.TelegramBotWebHostBuilder"/> class.
            </summary>
            <param name="webApplicationBuilder"></param>
            <param name="settings"></param>
        </member>
-        <member name="M:Telegrator.Hosting.Web.TelegramBotWebHostBuilder.#ctor(Microsoft.AspNetCore.Builder.WebApplicationBuilder,Telegrator.TelegratorOptions,Microsoft.AspNetCore.Builder.WebApplicationOptions)">
+        <member name="M:Telegrator.Hosting.Web.TelegramBotWebHostBuilder.#ctor(Microsoft.AspNetCore.Builder.WebApplicationBuilder,Telegrator.Core.IHandlersCollection)">
            <summary>
            Initializes a new instance of the <see cref="T:Telegrator.Hosting.Web.TelegramBotWebHostBuilder"/> class.
            </summary>
            <param name="webApplicationBuilder"></param>
            <param name="options"></param>
            <param name="settings"></param>
        </member>
        <member name="M:Telegrator.Hosting.Web.TelegramBotWebHostBuilder.#ctor(Microsoft.AspNetCore.Builder.WebApplicationBuilder,Telegrator.Core.IHandlersCollection,Microsoft.AspNetCore.Builder.WebApplicationOptions)">
            <summary>
            Initializes a new instance of the <see cref="T:Telegrator.Hosting.Web.TelegramBotWebHostBuilder"/> class.
            </summary>
            <param name="webApplicationBuilder"></param>
            <param name="handlers"></param>
            <param name="settings"></param>
        </member>
        <member name="M:Telegrator.Hosting.Web.TelegramBotWebHostBuilder.#ctor(Microsoft.AspNetCore.Builder.WebApplicationBuilder,Telegrator.Core.IHandlersCollection,Telegrator.TelegratorOptions,Microsoft.AspNetCore.Builder.WebApplicationOptions)">
            <summary>
            Initializes a new instance of the <see cref="T:Telegrator.Hosting.Web.TelegramBotWebHostBuilder"/> class.
            </summary>
            <param name="webApplicationBuilder"></param>
            <param name="handlers"></param>
            <param name="options"></param>
            <param name="settings"></param>
        </member>
        <member name="M:Telegrator.Hosting.Web.TelegramBotWebHostBuilder.Build">
            <summary>
@@ -188,7 +167,6 @@
            <summary>
            Initiallizes new instance of <see cref="T:Telegrator.Mediation.HostedUpdateWebhooker"/>
            </summary>
            <param name="botHost"></param>
            <param name="botClient"></param>
            <param name="updateRouter"></param>
            <param name="options"></param>
@@ -200,6 +178,16 @@
        <member name="M:Telegrator.Mediation.HostedUpdateWebhooker.StopAsync(System.Threading.CancellationToken)">
            <inheritdoc/>
        </member>
        <member name="M:Telegrator.Mediation.HostedUpdateWebhooker.RemapWebhook(Microsoft.AspNetCore.Routing.IEndpointRouteBuilder,System.String,System.Threading.CancellationToken)">
            <summary>
            Allows to remap receiving webhook endpoint and map new route to webhost.
            </summary>
            <param name="routeBuilder"></param>
            <param name="webhookUri"></param>
            <param name="cancellationToken"></param>
            <returns></returns>
            <exception cref="T:System.ArgumentException"></exception>
        </member>
        <member name="M:Telegrator.Mediation.HostedUpdateWebhooker.MapWebhook(Microsoft.AspNetCore.Routing.IEndpointRouteBuilder)">
            <summary>
            Maps bot webhook to application builder
@@ -230,17 +218,34 @@
            Replaces TelegramBotWebHostBuilder. Configures DI, options, and handlers.
            </summary>
        </member>
-        <member name="M:Telegrator.ServicesCollectionExtensions.AddTelegratorWebInternal(Microsoft.Extensions.Hosting.IHostApplicationBuilder,Telegrator.TelegratorOptions,Telegrator.Core.IHandlersCollection)">
+        <member name="M:Telegrator.ServicesCollectionExtensions.AddTelegratorWebInternal(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration,System.Collections.Generic.IDictionary{System.Object,System.Object},Telegrator.Core.IHandlersCollection@,Telegrator.TelegratorOptions)">
            <summary>
            Replaces TelegramBotWebHostBuilder. Configures DI, options, and handlers.
            </summary>
        </member>
-        <member name="M:Telegrator.ServicesCollectionExtensions.UseTelegratorWeb``1(``0)">
+        <member name="M:Telegrator.ServicesCollectionExtensions.TryFindWebhooker(System.IServiceProvider,Telegrator.Mediation.HostedUpdateWebhooker@)">
            <summary>
            Searchs for <see cref="T:Telegrator.Mediation.HostedUpdateWebhooker"/> hosted service inside hosts services
            </summary>
            <param name="services"></param>
            <param name="webhooker"></param>
            <returns></returns>
        </member>
        <member name="M:Telegrator.ServicesCollectionExtensions.UseTelegratorWeb``1(``0,System.Boolean)">
            <summary>
            Replaces the initialization logic from TelegramBotWebHost constructor. 
            Initializes the bot and logs handlers on application startup.
            </summary>
        </member>
        <member name="M:Telegrator.ServicesCollectionExtensions.RemapWebhook``1(``0,System.String)">
            <summary>
            Allows to remap receiving webhook endpoint and map new route to webhost.
            </summary>
            <param name="app"></param>
            <param name="webhookUri"></param>
            <returns></returns>
            <exception cref="T:System.ArgumentException"></exception>
        </member>
        <member name="M:Telegrator.ServicesCollectionExtensions.AddTelegramWebhook(Microsoft.Extensions.DependencyInjection.IServiceCollection)">
            <summary>
            Registers <see cref="T:Telegram.Bot.ITelegramBotClient"/> service with <see cref="T:Telegrator.Mediation.HostedUpdateWebhooker"/> to receive updates using webhook
@@ -35,6 +35,11 @@
            Provides access to configuration of this Hosted telegram bot
            </summary>
        </member>
        <member name="T:Telegrator.Hosting.ITelegramBotHostBuilder">
            <summary>
            Represents a hosted telegram bots and services builder that helps manage configuration, logging, lifetime, and more.
            </summary>
        </member>
        <member name="T:Telegrator.Hosting.TelegramBotHost">
            <summary>
            Represents a hosted telegram bot
@@ -93,9 +98,7 @@
            </summary>
        </member>
        <member name="T:Telegrator.Hosting.TelegramBotHostBuilder">
-            <summary>
+            <inheritdoc/>
            Represents a hosted telegram bots and services builder that helps manage configuration, logging, lifetime, and more.
            </summary>
        </member>
        <member name="P:Telegrator.Hosting.TelegramBotHostBuilder.Handlers">
            <inheritdoc/>
@@ -118,37 +121,18 @@
        <member name="P:Telegrator.Hosting.TelegramBotHostBuilder.Metrics">
            <inheritdoc/>
        </member>
-        <member name="M:Telegrator.Hosting.TelegramBotHostBuilder.#ctor(Microsoft.Extensions.Hosting.HostApplicationBuilder,Microsoft.Extensions.Hosting.HostApplicationBuilderSettings)">
+        <member name="M:Telegrator.Hosting.TelegramBotHostBuilder.#ctor(Microsoft.Extensions.Hosting.HostApplicationBuilder)">
            <summary>
            Initializes a new instance of the <see cref="T:Telegrator.Hosting.TelegramBotHostBuilder"/> class.
            </summary>
            <param name="hostApplicationBuilder"></param>
            <param name="settings"></param>
        </member>
-        <member name="M:Telegrator.Hosting.TelegramBotHostBuilder.#ctor(Microsoft.Extensions.Hosting.HostApplicationBuilder,Telegrator.TelegratorOptions,Microsoft.Extensions.Hosting.HostApplicationBuilderSettings)">
+        <member name="M:Telegrator.Hosting.TelegramBotHostBuilder.#ctor(Microsoft.Extensions.Hosting.HostApplicationBuilder,Telegrator.Core.IHandlersCollection)">
            <summary>
            Initializes a new instance of the <see cref="T:Telegrator.Hosting.TelegramBotHostBuilder"/> class.
            </summary>
            <param name="hostApplicationBuilder"></param>
            <param name="options"></param>
            <param name="settings"></param>
        </member>
        <member name="M:Telegrator.Hosting.TelegramBotHostBuilder.#ctor(Microsoft.Extensions.Hosting.HostApplicationBuilder,Telegrator.Core.IHandlersCollection,Microsoft.Extensions.Hosting.HostApplicationBuilderSettings)">
            <summary>
            Initializes a new instance of the <see cref="T:Telegrator.Hosting.TelegramBotHostBuilder"/> class.
            </summary>
            <param name="hostApplicationBuilder"></param>
            <param name="handlers"></param>
            <param name="settings"></param>
        </member>
        <member name="M:Telegrator.Hosting.TelegramBotHostBuilder.#ctor(Microsoft.Extensions.Hosting.HostApplicationBuilder,Telegrator.Core.IHandlersCollection,Telegrator.TelegratorOptions,Microsoft.Extensions.Hosting.HostApplicationBuilderSettings)">
            <summary>
            Initializes a new instance of the <see cref="T:Telegrator.Hosting.TelegramBotHostBuilder"/> class.
            </summary>
            <param name="hostApplicationBuilder"></param>
            <param name="handlers"></param>
            <param name="options"></param>
            <param name="settings"></param>
        </member>
        <member name="M:Telegrator.Hosting.TelegramBotHostBuilder.Build">
            <summary>
@@ -268,7 +252,17 @@
            Replaces TelegramBotHostBuilder. Configures DI, options, and handlers.
            </summary>
        </member>
-        <member name="M:Telegrator.HostBuilderExtensions.AddTelegratorInternal(Microsoft.Extensions.Hosting.IHostApplicationBuilder,Telegrator.TelegratorOptions,Telegrator.Core.IHandlersCollection)">
+        <member name="M:Telegrator.HostBuilderExtensions.AddTelegrator(Microsoft.Extensions.Hosting.IHostApplicationBuilder,Telegrator.TelegratorOptions,Telegrator.Core.IHandlersCollection)">
            <summary>
            Replaces TelegramBotHostBuilder. Configures DI, options, and handlers.
            </summary>
        </member>
        <member name="M:Telegrator.HostBuilderExtensions.AddTelegrator(Microsoft.Extensions.Hosting.IHostBuilder,Telegrator.TelegratorOptions,Telegrator.Core.IHandlersCollection)">
            <summary>
            Replaces TelegramBotHostBuilder. Configures DI, options, and handlers.
            </summary>
        </member>
        <member name="M:Telegrator.HostBuilderExtensions.AddTelegratorInternal(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfiguration,System.Collections.Generic.IDictionary{System.Object,System.Object},Telegrator.Core.IHandlersCollection@,Telegrator.TelegratorOptions)">
            <summary>
            Replaces TelegramBotHostBuilder. Configures DI, options, and handlers.
            </summary>
@@ -31,7 +31,7 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="StackExchange.Redis" Version="2.11.8" />
+    <PackageReference Include="StackExchange.Redis" Version="2.12.14" />
  </ItemGroup>
  <ItemGroup>
@@ -65,11 +65,11 @@ public class TelegramBotWebHost : IHost, IApplicationBuilder, IEndpointRouteBuil
    /// Creates new <see cref="TelegramBotHostBuilder"/> with default services and webhook update receiving scheme
    /// </summary>
    /// <returns></returns>
-    public static TelegramBotWebHostBuilder CreateBuilder(WebApplicationOptions settings)
+    public static TelegramBotWebHostBuilder CreateBuilder(WebApplicationOptions? settings)
    {
        ArgumentNullException.ThrowIfNull(settings, nameof(settings));
        WebApplicationBuilder innerApp = WebApplication.CreateBuilder(settings);
-        TelegramBotWebHostBuilder builder = new TelegramBotWebHostBuilder(innerApp, settings);
+        TelegramBotWebHostBuilder builder = new TelegramBotWebHostBuilder(innerApp);
        builder.AddTelegratorWeb();
        return builder;
    }
@@ -78,11 +78,11 @@ public class TelegramBotWebHost : IHost, IApplicationBuilder, IEndpointRouteBuil
    /// Creates new SLIM <see cref="TelegramBotHostBuilder"/> with default services and webhook update receiving scheme
    /// </summary>
    /// <returns></returns>
-    public static TelegramBotWebHostBuilder CreateSlimBuilder(WebApplicationOptions settings)
+    public static TelegramBotWebHostBuilder CreateSlimBuilder(WebApplicationOptions? settings)
    {
        ArgumentNullException.ThrowIfNull(settings, nameof(settings));
        WebApplicationBuilder innerApp = WebApplication.CreateSlimBuilder(settings);
-        TelegramBotWebHostBuilder builder = new TelegramBotWebHostBuilder(innerApp, settings);
+        TelegramBotWebHostBuilder builder = new TelegramBotWebHostBuilder(innerApp);
        builder.AddTelegratorWeb();
        return builder;
    }
@@ -91,11 +91,11 @@ public class TelegramBotWebHost : IHost, IApplicationBuilder, IEndpointRouteBuil
    /// Creates new EMPTY <see cref="TelegramBotHostBuilder"/> WITHOUT any services or update receiving schemes
    /// </summary>
    /// <returns></returns>
-    public static TelegramBotWebHostBuilder CreateEmptyBuilder(WebApplicationOptions settings)
+    public static TelegramBotWebHostBuilder CreateEmptyBuilder(WebApplicationOptions? settings)
    {
        ArgumentNullException.ThrowIfNull(settings, nameof(settings));
        WebApplicationBuilder innerApp = WebApplication.CreateEmptyBuilder(settings);
-        TelegramBotWebHostBuilder builder = new TelegramBotWebHostBuilder(innerApp, settings);
+        TelegramBotWebHostBuilder builder = new TelegramBotWebHostBuilder(innerApp);
        builder.AddTelegratorWeb();
        return builder;
    }
@@ -9,13 +9,10 @@ using Telegrator.Core;
 #pragma warning disable IDE0001
 namespace Telegrator.Hosting.Web;
-/// <summary>
+/// <inheritdoc/>
 /// Represents a web hosted telegram bots and services builder that helps manage configuration, logging, lifetime, and more.
 /// </summary>
 public class TelegramBotWebHostBuilder : ITelegramBotHostBuilder
 {
    private readonly WebApplicationBuilder _innerBuilder;
    private readonly WebApplicationOptions _settings;
    internal IHandlersCollection _handlers = null!;
    /// <inheritdoc/>
@@ -43,23 +40,9 @@ public class TelegramBotWebHostBuilder : ITelegramBotHostBuilder
    /// Initializes a new instance of the <see cref="TelegramBotWebHostBuilder"/> class.
    /// </summary>
    /// <param name="webApplicationBuilder"></param>
-    /// <param name="settings"></param>
+    public TelegramBotWebHostBuilder(WebApplicationBuilder webApplicationBuilder)
    public TelegramBotWebHostBuilder(WebApplicationBuilder webApplicationBuilder, WebApplicationOptions? settings = null)
    {
        _innerBuilder = webApplicationBuilder ?? throw new ArgumentNullException(nameof(webApplicationBuilder));
        _settings = settings ?? throw new ArgumentNullException(nameof(settings));
    }
    /// <summary>
    /// Initializes a new instance of the <see cref="TelegramBotWebHostBuilder"/> class.
    /// </summary>
    /// <param name="webApplicationBuilder"></param>
    /// <param name="options"></param>
    /// <param name="settings"></param>
    public TelegramBotWebHostBuilder(WebApplicationBuilder webApplicationBuilder, TelegratorOptions? options, WebApplicationOptions? settings)
    {
        _innerBuilder = webApplicationBuilder ?? throw new ArgumentNullException(nameof(webApplicationBuilder));
        _settings = settings ?? throw new ArgumentNullException(nameof(settings));
    }
    /// <summary>
@@ -67,24 +50,10 @@ public class TelegramBotWebHostBuilder : ITelegramBotHostBuilder
    /// </summary>
    /// <param name="webApplicationBuilder"></param>
    /// <param name="handlers"></param>
-    /// <param name="settings"></param>
+    public TelegramBotWebHostBuilder(WebApplicationBuilder webApplicationBuilder, IHandlersCollection handlers)
    public TelegramBotWebHostBuilder(WebApplicationBuilder webApplicationBuilder, IHandlersCollection handlers, WebApplicationOptions settings)
    {
        _innerBuilder = webApplicationBuilder ?? throw new ArgumentNullException(nameof(webApplicationBuilder));
-        _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+        _handlers = handlers ?? throw new ArgumentNullException(nameof(handlers));
    }
    /// <summary>
    /// Initializes a new instance of the <see cref="TelegramBotWebHostBuilder"/> class.
    /// </summary>
    /// <param name="webApplicationBuilder"></param>
    /// <param name="handlers"></param>
    /// <param name="options"></param>
    /// <param name="settings"></param>
    public TelegramBotWebHostBuilder(WebApplicationBuilder webApplicationBuilder, IHandlersCollection handlers, TelegratorOptions? options, WebApplicationOptions settings)
    {
        _innerBuilder = webApplicationBuilder ?? throw new ArgumentNullException(nameof(webApplicationBuilder));
        _settings = settings ?? throw new ArgumentNullException(nameof(settings));
    }
    /// <summary>
@@ -26,7 +26,6 @@ public class HostedUpdateWebhooker : IHostedService
    /// <summary>
    /// Initiallizes new instance of <see cref="HostedUpdateWebhooker"/>
    /// </summary>
    /// <param name="botHost"></param>
    /// <param name="botClient"></param>
    /// <param name="updateRouter"></param>
    /// <param name="options"></param>
@@ -48,17 +47,6 @@ public class HostedUpdateWebhooker : IHostedService
        return Task.CompletedTask;
    }
    private async void StartInternal(CancellationToken cancellationToken)
    {
        await _botClient.SetWebhook(
            url: _options.WebhookUri,
            maxConnections: _options.MaxConnections,
            allowedUpdates: _updateRouter.HandlersProvider.AllowedTypes,
            dropPendingUpdates: _options.DropPendingUpdates,
            secretToken: _options.SecretToken,
            cancellationToken: cancellationToken);
    }
    /// <inheritdoc/>
    public Task StopAsync(CancellationToken cancellationToken)
    {
@@ -66,16 +54,50 @@ public class HostedUpdateWebhooker : IHostedService
        return Task.CompletedTask;
    }
    /// <summary>
    /// Allows to remap receiving webhook endpoint and map new route to webhost.
    /// </summary>
    /// <param name="routeBuilder"></param>
    /// <param name="webhookUri"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    /// <exception cref="ArgumentException"></exception>
    public async Task RemapWebhook(IEndpointRouteBuilder routeBuilder, string webhookUri, CancellationToken cancellationToken = default)
    {
        if (!Uri.TryCreate(webhookUri, UriKind.Absolute, out Uri? result))
            throw new ArgumentException("invalid URL");
        _options.WebhookUri = result.ToString();
        await SetWebhook(cancellationToken);
        MapWebhook(routeBuilder);
    }
    /// <summary>
    /// Maps bot webhook to application builder
    /// </summary>
    /// <param name="routeBuilder"></param>
-    public void MapWebhook(IEndpointRouteBuilder routeBuilder)
+    internal void MapWebhook(IEndpointRouteBuilder routeBuilder)
    {
        string pattern = new UriBuilder(_options.WebhookUri).Path;
        routeBuilder.MapPost(pattern, (Delegate)ReceiveUpdate);
    }
    private async void StartInternal(CancellationToken cancellationToken)
    {
        await SetWebhook(cancellationToken);
    }
    private async Task SetWebhook(CancellationToken cancellationToken)
    {
        await _botClient.SetWebhook(
            url: _options.WebhookUri,
            maxConnections: _options.MaxConnections,
            allowedUpdates: _updateRouter.HandlersProvider.AllowedTypes,
            dropPendingUpdates: _options.DropPendingUpdates,
            secretToken: _options.SecretToken,
            cancellationToken: cancellationToken);
    }
    private async Task<IResult> ReceiveUpdate(HttpContext ctx)
    {
        if (_options.SecretToken != null)
@@ -15,7 +15,7 @@
    <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
    <Title>Telegrator.Hosting.Web</Title>
-    <Version>1.16.7</Version>
+    <Version>1.16.8</Version>
 	<Authors>Rikitav Tim4ik</Authors>
    <Company>Rikitav Tim4ik</Company>
    <RepositoryUrl>https://github.com/Rikitav/Telegrator</RepositoryUrl>
@@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System.Diagnostics.CodeAnalysis;
 using Telegram.Bot;
 using Telegrator.Core;
 using Telegrator.Hosting;
@@ -45,7 +46,10 @@ namespace Telegrator
        /// </summary>
        public static ITelegramBotHostBuilder AddTelegratorWeb(this ITelegramBotHostBuilder builder, TelegratorOptions? options = null, IHandlersCollection? handlers = null, Action<ITelegramBotHostBuilder>? action = null)
        {
-            builder.AddTelegratorWebInternal(options, handlers);
+            AddTelegratorWebInternal(builder.Services, builder.Configuration, builder.Properties, ref handlers, options);
            if (builder is TelegramBotWebHostBuilder telegramBotHostBuilder)
                telegramBotHostBuilder._handlers = handlers;
            action?.Invoke(builder);
            return builder;
        }
@@ -55,7 +59,7 @@ namespace Telegrator
        /// </summary>
        public static IHostApplicationBuilder AddTelegratorWeb(this WebApplicationBuilder builder, TelegratorOptions? options = null, IHandlersCollection? handlers = null, Action<ITelegramBotHostBuilder>? action = null)
        {
-            builder.AddTelegratorWebInternal(options, handlers);
+            AddTelegratorWebInternal(builder.Services, builder.Configuration, ((IHostApplicationBuilder)builder).Properties, ref handlers, options);
            action?.Invoke(new TelegramBotWebHostBuilder(builder));
            return builder;
        }
@@ -63,11 +67,8 @@ namespace Telegrator
        /// <summary>
        /// Replaces TelegramBotWebHostBuilder. Configures DI, options, and handlers.
        /// </summary>
-        internal static IHostApplicationBuilder AddTelegratorWebInternal(this IHostApplicationBuilder builder, TelegratorOptions? options = null, IHandlersCollection? handlers = null)
+        internal static void AddTelegratorWebInternal(IServiceCollection services, IConfiguration configuration, IDictionary<object, object> properties, [NotNull] ref IHandlersCollection? handlers, TelegratorOptions? options = null)
        {
            IServiceCollection services = builder.Services;
            IConfigurationManager configuration = builder.Configuration;
            if (options == null)
            {
                options = configuration.GetSection(nameof(TelegratorOptions)).Get<TelegratorOptions>();
@@ -92,10 +93,7 @@ namespace Telegrator
            handlers ??= new HostHandlersCollection(services, options);
            services.AddSingleton(handlers);
-
+            properties.Add(HandlersCollectionPropertyKey, handlers);
            builder.Properties.Add(HandlersCollectionPropertyKey, handlers);
            if (builder is TelegramBotWebHostBuilder botHostBuilder)
                botHostBuilder._handlers = handlers;
            if (!services.Any(srvc => srvc.ImplementationType == typeof(IOptions<WebhookerOptions>)))
            {
@@ -117,16 +115,27 @@ namespace Telegrator
            services.AddTelegramBotHostDefaults();
            services.AddTelegramWebhook();
-            return builder;
+        }
        /// <summary>
        /// Searchs for <see cref="HostedUpdateWebhooker"/> hosted service inside hosts services
        /// </summary>
        /// <param name="services"></param>
        /// <param name="webhooker"></param>
        /// <returns></returns>
        public static bool TryFindWebhooker(this IServiceProvider services, [NotNullWhen(true)] out HostedUpdateWebhooker? webhooker)
        {
            webhooker = services.GetServices<IHostedService>().FirstOrDefault(s => s is HostedUpdateWebhooker) as HostedUpdateWebhooker;
            return webhooker != null;
        }
        /// <summary>
        /// Replaces the initialization logic from TelegramBotWebHost constructor. 
        /// Initializes the bot and logs handlers on application startup.
        /// </summary>
-        public static T UseTelegratorWeb<T>(this T app) where T : IEndpointRouteBuilder, IHost
+        public static T UseTelegratorWeb<T>(this T app, bool dontMap = false) where T : IEndpointRouteBuilder, IHost
        {
-            if (app.ServiceProvider.GetServices<IHostedService>().FirstOrDefault(s => s is HostedUpdateWebhooker) is not HostedUpdateWebhooker webhooker)
+            if (!app.ServiceProvider.TryFindWebhooker(out HostedUpdateWebhooker? webhooker))
                throw new InvalidOperationException("No service for type 'Telegrator.Mediation.HostedUpdateWebhooker' has been registered.");
            ITelegramBotInfo info = app.ServiceProvider.GetRequiredService<ITelegramBotInfo>();
@@ -141,7 +150,25 @@ namespace Telegrator
                logger.LogHandlers(handlers);
            }
-            webhooker.MapWebhook(app);
+            if (!dontMap)
                webhooker.MapWebhook(app);
            return app;
        }
        /// <summary>
        /// Allows to remap receiving webhook endpoint and map new route to webhost.
        /// </summary>
        /// <param name="app"></param>
        /// <param name="webhookUri"></param>
        /// <returns></returns>
        /// <exception cref="ArgumentException"></exception>
        public static T RemapWebhook<T>(this T app, string webhookUri) where T : IEndpointRouteBuilder, IHost
        {
            if (!app.ServiceProvider.TryFindWebhooker(out HostedUpdateWebhooker? webhooker))
                throw new InvalidOperationException("No service for type 'Telegrator.Mediation.HostedUpdateWebhooker' has been registered.");
            webhooker.RemapWebhook(app, webhookUri, default).GetAwaiter().GetResult();
            return app;
        }
@@ -1,11 +1,11 @@
 using Microsoft.Extensions.Hosting;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using Telegrator.Core;
 namespace Telegrator.Hosting;
 /// <summary>
 /// Represents a hosted telegram bots and services builder that helps manage configuration, logging, lifetime, and more.
 /// </summary>
 public interface ITelegramBotHostBuilder : IHostApplicationBuilder, ICollectingProvider
 {
@@ -51,7 +51,7 @@ public class TelegramBotHost : IHost, ITelegratorBot
    public static TelegramBotHostBuilder CreateBuilder()
    {
        HostApplicationBuilder innerBuilder = new HostApplicationBuilder(settings: null);
-        TelegramBotHostBuilder builder = new TelegramBotHostBuilder(innerBuilder, null);
+        TelegramBotHostBuilder builder = new TelegramBotHostBuilder(innerBuilder);
        return builder;
    }
@@ -62,7 +62,7 @@ public class TelegramBotHost : IHost, ITelegratorBot
    public static TelegramBotHostBuilder CreateBuilder(HostApplicationBuilderSettings? settings)
    {
        HostApplicationBuilder innerBuilder = new HostApplicationBuilder(settings);
-        TelegramBotHostBuilder builder = new TelegramBotHostBuilder(innerBuilder, settings);
+        TelegramBotHostBuilder builder = new TelegramBotHostBuilder(innerBuilder);
        return builder;
    }
@@ -73,7 +73,7 @@ public class TelegramBotHost : IHost, ITelegratorBot
    public static TelegramBotHostBuilder CreateEmptyBuilder()
    {
        HostApplicationBuilder innerBuilder = Host.CreateEmptyApplicationBuilder(null);
-        return new TelegramBotHostBuilder(innerBuilder, null);
+        return new TelegramBotHostBuilder(innerBuilder);
    }
    /// <summary>
@@ -82,8 +82,8 @@ public class TelegramBotHost : IHost, ITelegratorBot
    /// <returns></returns>
    public static TelegramBotHostBuilder CreateEmptyBuilder(HostApplicationBuilderSettings? settings)
    {
-        HostApplicationBuilder innerBuilder = Host.CreateEmptyApplicationBuilder(null);
+        HostApplicationBuilder innerBuilder = Host.CreateEmptyApplicationBuilder(settings);
-        return new TelegramBotHostBuilder(innerBuilder, settings);
+        return new TelegramBotHostBuilder(innerBuilder);
    }
    /// <inheritdoc/>
@@ -8,13 +8,10 @@ using Telegrator.Core;
 #pragma warning disable IDE0001
 namespace Telegrator.Hosting;
-/// <summary>
+/// <inheritdoc/>
 /// Represents a hosted telegram bots and services builder that helps manage configuration, logging, lifetime, and more.
 /// </summary>
 public class TelegramBotHostBuilder : ITelegramBotHostBuilder
 {
    private readonly HostApplicationBuilder _innerBuilder;
    private readonly HostApplicationBuilderSettings _settings;
    internal IHandlersCollection _handlers = null!;
    /// <inheritdoc/>
@@ -42,23 +39,9 @@ public class TelegramBotHostBuilder : ITelegramBotHostBuilder
    /// Initializes a new instance of the <see cref="TelegramBotHostBuilder"/> class.
    /// </summary>
    /// <param name="hostApplicationBuilder"></param>
-    /// <param name="settings"></param>
+    public TelegramBotHostBuilder(HostApplicationBuilder hostApplicationBuilder)
    public TelegramBotHostBuilder(HostApplicationBuilder hostApplicationBuilder, HostApplicationBuilderSettings? settings = null)
    {
        _innerBuilder = hostApplicationBuilder ?? throw new ArgumentNullException(nameof(hostApplicationBuilder));
        _settings = settings ?? new HostApplicationBuilderSettings();
    }
    /// <summary>
    /// Initializes a new instance of the <see cref="TelegramBotHostBuilder"/> class.
    /// </summary>
    /// <param name="hostApplicationBuilder"></param>
    /// <param name="options"></param>
    /// <param name="settings"></param>
    public TelegramBotHostBuilder(HostApplicationBuilder hostApplicationBuilder, TelegratorOptions? options, HostApplicationBuilderSettings? settings)
    {
        _innerBuilder = hostApplicationBuilder ?? throw new ArgumentNullException(nameof(hostApplicationBuilder));
        _settings = settings ?? new HostApplicationBuilderSettings();
    }
    /// <summary>
@@ -66,24 +49,10 @@ public class TelegramBotHostBuilder : ITelegramBotHostBuilder
    /// </summary>
    /// <param name="hostApplicationBuilder"></param>
    /// <param name="handlers"></param>
-    /// <param name="settings"></param>
+    public TelegramBotHostBuilder(HostApplicationBuilder hostApplicationBuilder, IHandlersCollection handlers)
    public TelegramBotHostBuilder(HostApplicationBuilder hostApplicationBuilder, IHandlersCollection handlers, HostApplicationBuilderSettings? settings)
    {
        _innerBuilder = hostApplicationBuilder ?? throw new ArgumentNullException(nameof(hostApplicationBuilder));
-        _settings = settings ?? new HostApplicationBuilderSettings();
+        _handlers = handlers ?? throw new ArgumentNullException(nameof(handlers));
    }
    /// <summary>
    /// Initializes a new instance of the <see cref="TelegramBotHostBuilder"/> class.
    /// </summary>
    /// <param name="hostApplicationBuilder"></param>
    /// <param name="handlers"></param>
    /// <param name="options"></param>
    /// <param name="settings"></param>
    public TelegramBotHostBuilder(HostApplicationBuilder hostApplicationBuilder, IHandlersCollection handlers, TelegratorOptions? options, HostApplicationBuilderSettings? settings)
    {
        _innerBuilder = hostApplicationBuilder ?? throw new ArgumentNullException(nameof(hostApplicationBuilder));
        _settings = settings ?? new HostApplicationBuilderSettings();
    }
    /// <summary>
@@ -15,7 +15,7 @@
    <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
    <Title>Telegrator.Hosting</Title>
-    <Version>1.16.7</Version>
+    <Version>1.16.8</Version>
 	<Authors>Rikitav Tim4ik</Authors>
    <Company>Rikitav Tim4ik</Company>
    <RepositoryUrl>https://github.com/Rikitav/Telegrator</RepositoryUrl>
@@ -31,8 +31,8 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.5" />
  </ItemGroup>
  <ItemGroup>
@@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using Telegram.Bot;
 using Telegram.Bot.Polling;
@@ -49,7 +50,10 @@ public static class HostBuilderExtensions
    /// </summary>
    public static ITelegramBotHostBuilder AddTelegrator(this ITelegramBotHostBuilder builder, TelegratorOptions? options = null, IHandlersCollection? handlers = null, Action<ITelegramBotHostBuilder>? action = null)
    {
-        builder.AddTelegratorInternal(options, handlers);
+        AddTelegratorInternal(builder.Services, builder.Configuration, builder.Properties, ref handlers, options);
        if (builder is TelegramBotHostBuilder telegramBotHostBuilder)
            telegramBotHostBuilder._handlers = handlers;
        action?.Invoke(builder);
        return builder;
    }
@@ -59,19 +63,34 @@ public static class HostBuilderExtensions
    /// </summary>
    public static IHostApplicationBuilder AddTelegrator(this HostApplicationBuilder builder, TelegratorOptions? options = null, IHandlersCollection? handlers = null, Action<ITelegramBotHostBuilder>? action = null)
    {
-        builder.AddTelegratorInternal(options, handlers);
+        AddTelegratorInternal(builder.Services, builder.Configuration, ((IHostApplicationBuilder)builder).Properties, ref handlers, options);
-        action?.Invoke(new TelegramBotHostBuilder(builder));
+        action?.Invoke(new TelegramBotHostBuilder(builder, handlers));
        return builder;
    }
    /// <summary>
    /// Replaces TelegramBotHostBuilder. Configures DI, options, and handlers.
    /// </summary>
-    public static IHostApplicationBuilder AddTelegratorInternal(this IHostApplicationBuilder builder, TelegratorOptions? options = null, IHandlersCollection? handlers = null)
+    public static IHostApplicationBuilder AddTelegrator(this IHostApplicationBuilder builder, TelegratorOptions? options = null, IHandlersCollection? handlers = null)
    {
-        IServiceCollection services = builder.Services;
+        AddTelegratorInternal(builder.Services, builder.Configuration, builder.Properties, ref handlers, options);
-        IConfigurationManager configuration = builder.Configuration;
+        return builder;
    }
    /// <summary>
    /// Replaces TelegramBotHostBuilder. Configures DI, options, and handlers.
    /// </summary>
    public static IHostBuilder AddTelegrator(this IHostBuilder builder, TelegratorOptions? options = null, IHandlersCollection? handlers = null)
    {
        builder.ConfigureServices((ctx, sp) => AddTelegratorInternal(sp, ctx.Configuration, builder.Properties, ref handlers, options));
        return builder;
    }
    /// <summary>
    /// Replaces TelegramBotHostBuilder. Configures DI, options, and handlers.
    /// </summary>
    internal static void AddTelegratorInternal(IServiceCollection services, IConfiguration configuration, IDictionary<object, object> properties, [NotNull] ref IHandlersCollection? handlers, TelegratorOptions? options = null)
    {
        if (options == null)
        {
            options = configuration.GetSection(nameof(TelegratorOptions)).Get<TelegratorOptions>();
@@ -96,10 +115,7 @@ public static class HostBuilderExtensions
        handlers ??= new HostHandlersCollection(services, options);
        services.AddSingleton(handlers);
-
+        properties.Add(HandlersCollectionPropertyKey, handlers);
        builder.Properties.Add(HandlersCollectionPropertyKey, handlers);
        if (builder is TelegramBotHostBuilder botHostBuilder)
            botHostBuilder._handlers = handlers;
        if (!services.Any(srvc => srvc.ImplementationType == typeof(IOptions<ReceiverOptions>)))
        {
@@ -119,9 +135,8 @@ public static class HostBuilderExtensions
            }));
        }
        services.AddTelegramReceiver();
        services.AddTelegramBotHostDefaults();
-        return builder;
+        services.AddTelegramReceiver();
    }
 }
@@ -14,7 +14,7 @@
    <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
    <Title>Telegrator : Telegram.Bot mediator framework</Title>
-    <Version>1.16.7</Version>
+    <Version>1.16.8</Version>
 	<Authors>Rikitav Tim4ik</Authors>
 	<Company>Rikitav Tim4ik</Company>
    <RepositoryUrl>https://github.com/Rikitav/Telegrator</RepositoryUrl>
@@ -32,8 +32,8 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.5" />
-    <PackageReference Include="System.Threading.Channels" Version="10.0.3" />
+    <PackageReference Include="System.Threading.Channels" Version="10.0.5" />
    <PackageReference Include="Telegram.Bot" Version="22.9.5.3" />	  
  </ItemGroup>