Skip to content

Правки работы функции polling #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Deskri merged 6 commits into from
Apr 16, 2026
Merged

Правки работы функции polling #3

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87560fd
fix: различаем отмену пользователя и HTTP-таймаут в polling loop
JeyDim Apr 16, 2026
6353ee6
fix: защита errorHandler от выброса исключений в polling loop
JeyDim Apr 16, 2026
1d079c7
fix: добавлен backoff (5 сек) между ошибками в polling loop
JeyDim Apr 16, 2026
f4d061a
fix: установлен бесконечный таймаут HttpClient для long polling
JeyDim Apr 16, 2026
0a357ce
fix: StartReceiving возвращает Task вместо void
JeyDim Apr 16, 2026
86271ca
fix: не переопределяем глобальный Timeout
JeyDim Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 46 additions & 15 deletions src/Max.BotClient/Max.BotClient.Polling.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,19 @@ public static partial class BotClientApiMethods
/// <param name="errorHandler">Обработчик ошибок (необязательно).</param>
/// <param name="options">Опции polling.</param>
/// <param name="cancellationToken">Токен отмены.</param>
public static void StartReceiving(
public static Task StartReceiving(
this IBotClient botClient,
Func<IBotClient, Update, CancellationToken, Task> updateHandler,
Func<IBotClient, Exception, CancellationToken, Task>? errorHandler = null,
ReceiverOptions? options = null,
CancellationToken cancellationToken = default
) => Task.Run(() =>
) => Task.Run(() =>
botClient.ReceiveAsync(
updateHandler,
errorHandler,
options,
updateHandler,
errorHandler,
options,
cancellationToken
),
),
cancellationToken
);

Expand Down Expand Up @@ -92,14 +92,21 @@ public static async Task ReceiveAsync(
);
marker = newMarker;
}
catch (OperationCanceledException)
catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
{
return;
}
catch (Exception ex)
{
if (errorHandler != null)
await errorHandler(botClient, ex, cancellationToken);
try
{
if (errorHandler != null)
await errorHandler(botClient, ex, cancellationToken);
}
catch
{
// Не позволяем errorHandler убить polling loop
}
}
}

Expand All @@ -120,14 +127,31 @@ public static async Task ReceiveAsync(
updates = result.Item1;
marker = result.Item2 ?? marker;
}
catch (OperationCanceledException)
catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
{
break;
}
catch (Exception ex)
{
if (errorHandler != null)
await errorHandler(botClient, ex, cancellationToken);
try
{
if (errorHandler != null)
await errorHandler(botClient, ex, cancellationToken);
}
catch
{
// Не позволяем errorHandler убить polling loop
}

// Backoff перед повторной попыткой, чтобы не забивать API при длительном сбое
try
{
await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
}
catch (OperationCanceledException)
{
break;
}

continue;
}
Expand All @@ -138,14 +162,21 @@ public static async Task ReceiveAsync(
{
await updateHandler(botClient, update, cancellationToken);
}
catch (OperationCanceledException)
catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
{
return;
}
catch (Exception ex)
{
if (errorHandler != null)
await errorHandler(botClient, ex, cancellationToken);
try
{
if (errorHandler != null)
await errorHandler(botClient, ex, cancellationToken);
}
catch
{
// Не позволяем errorHandler убить polling loop
}
}
}
}
Expand Down