Skip to content

fix: recover Telegram polling from connection pool timeouts - #10396

Open
wcqqq1214 wants to merge 2 commits into
AstrBotDevs:masterfrom
wcqqq1214:fix/telegram-polling-pool-timeout
Open

wcqqq1214 wants to merge 2 commits into
AstrBotDevs:masterfrom
wcqqq1214:fix/telegram-polling-pool-timeout

Conversation

@wcqqq1214

@wcqqq1214 wcqqq1214 commented Oct 5, 2026 •

Copy link
Copy Markdown
Contributor

Telegram polling can retry forever after a proxy connection exhausts its pool: PTB retries TimedOut without invoking AstrBot's error callback.

Modifications

  • Detect three consecutive pool timeouts in the polling request and trigger existing client recovery; reset the counter on other outcomes.

  • Honor the restart delay after rebuilding the client.

  • This is NOT a breaking change. / 这不是一个破坏性变更。

Screenshots or Test Results

.venv/bin/python -m pytest tests/test_telegram_adapter.py tests/test_telegram_polling.py -q
46 passed

ruff format .
966 files left unchanged
ruff check .
All checks passed!

Regression coverage includes the real SDK retry loop, counter resets, cancellation, old-client closure, and receiving an update after recovery.


Checklist

  • 😊 If there are new features added in the PR, I have discussed it with the authors through issues/emails, etc.
    / 如果 PR 中有新加入的功能,已经通过 Issue / 邮件等方式和作者讨论过。

  • 👀 My changes have been well-tested, and "Verification Steps" and "Screenshots" have been provided above.
    / 我的更改经过了良好的测试,并已在上方提供了“验证步骤”和“运行截图”。

  • 📚 I checked the affected WebUI instructions and screenshots in docs/zh and docs/en against the changed navigation, page structure, and labels, and updated them in this PR (or explained why no documentation update is needed). For renamed, moved, or merged entry points, I included an old entry → new entry mapping in the documentation and changelog.
    / 我已对照变化后的 WebUI 入口、页面结构和术语,核对并在本 PR 中更新 docs/zh 和 docs/en 的相关操作说明与截图(或说明无需更新文档的原因)。入口改名、移动或合并时,已在文档和 changelog 中补充 旧入口 → 新入口 对照。

  • 🤓 I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations in requirements.txt and pyproject.toml.
    / 我确保没有引入新依赖库,或者引入了新依赖库的同时将其添加到 requirements.txt 和 pyproject.toml 文件相应位置。

  • 😮 My changes do not introduce malicious code.
    / 我的更改没有引入恶意代码。

Summary by Sourcery

Restore Telegram polling after repeated connection pool timeouts while preserving normal retry and error-handling behavior.

Bug Fixes:

  • Recover Telegram polling by rebuilding the client after repeated connection pool timeouts that are otherwise hidden by the SDK retry loop.

Enhancements:

  • Honor the configured delay before restarting Telegram polling with a rebuilt client.
  • Reset pool-timeout detection after successful requests, other network outcomes, and cancellation.

Tests:

  • Add regression coverage for SDK retry behavior, timeout streak resets, cancellation, client cleanup, delayed recovery, and receiving updates after rebuilding.

@wcqqq1214
wcqqq1214 marked this pull request as ready for review October 5, 2026 10:11

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've reviewed your changes and they look great!

Sourcery assessment

Needs a human reviewer. A faulty timeout classification or recovery threshold could repeatedly rebuild the Telegram client, causing polling outages and potentially missed updates before the issue is noticed. Reverting stops future rebuilds, but it cannot undo downtime or any updates lost during the faulty recovery behavior.


Sourcery is free for open source - if you like our reviews please consider sharing them ✨

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant