fix: исправить регрессии webhook и сетевых операций

- исполнять MaxoMethod, возвращённый webhook-хендлером

- логировать ID бота при остановке вместо секретного токена

- преобразовывать все aiohttp ClientError в MaxBotNetworkError

- сбрасывать пользовательский буфер после скачивания до seek

- добавить регрессионные тесты для каждого сценария

Изменения восстанавливают ответы webhook и ретраи повреждённых payload, исключают утечку токена и гарантируют видимость скачанных данных другим файловым дескрипторам.

Author: K1rL3s

src/maxo/bot/bot.py

@@ -227,6 +227,7 @@ async def download(
             binary_io = destination if destination is not None else io.BytesIO()
             async for chunk in stream:
                 binary_io.write(chunk)
+            binary_io.flush()
             if seek:
                 binary_io.seek(0)
             return binary_io

src/maxo/bot/middlewares/network_error.py

@@ -1,5 +1,6 @@
 from typing import Any
 
+from aiohttp import ClientError
 from unihttp.exceptions import NetworkError, RequestTimeoutError
 from unihttp.http import HTTPRequest, HTTPResponse
 from unihttp.middlewares import AsyncHandler, AsyncMiddleware
@@ -19,5 +20,5 @@ async def handle(
             return await next_handler(request)
         except RequestTimeoutError as error:
             raise MaxBotTimeoutError(str(error) or type(error).__name__) from error
-        except (NetworkError, TimeoutError) as error:
+        except (ClientError, NetworkError, TimeoutError) as error:
             raise to_network_error(error) from error

src/maxo/transport/webhook/engines/base.py

@@ -5,6 +5,7 @@
 from unihttp.serializers.adaptix.serialize import DEFAULT_RETORT
 
 from maxo import Bot, Dispatcher
+from maxo.bot.methods.base import MaxoMethod
 from maxo.loggers import webhook
 from maxo.routing.signals import MaxoUpdate
 from maxo.serialization import get_retort
@@ -98,7 +99,7 @@ async def handle_request(
             webhook.debug("New update: %s", update.update)
 
             self._get_task_tracker(bot).spawn(  # type: ignore[unused-awaitable]
-                self.dispatcher.feed_update(bot=bot, update=update),
+                self._feed_update(bot=bot, update=update),
             )
             return self.web.json_response(status_code=200, data={})
 
@@ -165,3 +166,8 @@ async def _build_webhook_kwargs(
             if secret is not None:
                 kwargs["secret"] = secret
         return kwargs
+
+    async def _feed_update(self, bot: Bot, update: MaxoUpdate[Any]) -> None:
+        result = await self.dispatcher.feed_update(bot=bot, update=update)
+        if isinstance(result, MaxoMethod):
+            await bot.silent_call_method(method=result)

src/maxo/transport/webhook/engines/single.py

@@ -81,9 +81,10 @@ async def _on_startup(self, app: AppT, *args: Any, **kwargs: Any) -> None:
         webhook.info("Starting single-bot webhook engine for bot %s", info.id)
 
     async def _on_shutdown(self, app: AppT, *args: Any, **kwargs: Any) -> None:
+        bot_id = self.bot.info.id if self.bot.started else "<unknown>"
         webhook.info(
             "Stopping single-bot webhook engine for bot %s",
-            self.bot.token,
+            bot_id,
         )
         await self._task_tracker.close(timeout=self.shutdown_timeout)
 

tests/maxo/bot/test_bot.py

@@ -1,3 +1,7 @@
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager
+from pathlib import Path
+from types import SimpleNamespace
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
@@ -198,3 +202,31 @@ async def test_get_my_info_always_hits_network(
     await mock_bot.get_my_info()
 
     assert mock_client.call_method.await_count == 2
+
+
+async def test_download_flushes_buffered_destination_with_seek_false(
+    tmp_path: Path,
+    bot: Bot,
+) -> None:
+    async def chunks() -> AsyncIterator[bytes]:
+        yield b"payload"
+
+    @asynccontextmanager
+    async def stream() -> AsyncIterator[AsyncIterator[bytes]]:
+        yield chunks()
+
+    path = tmp_path / "payload.bin"
+    response = SimpleNamespace(data=stream())
+
+    with (
+        patch.object(Bot, "call_method_stream", new=AsyncMock(return_value=response)),
+        path.open("wb") as destination,
+    ):
+        result = await bot.download(
+            "https://example.test/file.bin",
+            destination=destination,
+            seek=False,
+        )
+
+        assert result is destination
+        assert path.read_bytes() == b"payload"

tests/maxo/bot/test_network_error_middleware.py

@@ -1,6 +1,7 @@
 from unittest.mock import AsyncMock, MagicMock
 
 import pytest
+from aiohttp import ClientPayloadError
 from unihttp.exceptions import NetworkError, RequestTimeoutError
 
 from maxo.bot.middlewares import NetworkErrorMiddleware
@@ -12,6 +13,7 @@
     [
         (RequestTimeoutError("slow"), MaxBotTimeoutError),
         (NetworkError("dns"), MaxBotNetworkError),
+        (ClientPayloadError("payload"), MaxBotNetworkError),
         (TimeoutError("timed out"), MaxBotTimeoutError),
     ],
 )

tests/maxo_webhook/test_base_webhook_engine.py

@@ -1,9 +1,11 @@
 import asyncio
 from typing import Any
+from unittest.mock import AsyncMock, patch
 
 import pytest
 
 from maxo import Bot
+from maxo.bot.methods.base import MaxoMethod
 from maxo.routing.signals import MaxoUpdate
 from maxo.serialization import get_retort
 from maxo.transport.webhook.engines.base import BaseWebhookEngine
@@ -163,3 +165,19 @@ async def test_engine_lifespan_runs_startup_then_shutdown(
     assert engine._is_shutting_down
     response = await engine.handle_request(update_request)  # type: ignore[unreachable]
     assert response["status_code"] == 503
+
+
+@pytest.mark.asyncio
+async def test_engine_executes_method_returned_by_dispatcher(
+    bot: Bot,
+    adapter: CapturingAdapter,
+    update_request: DummyWebRequest,
+) -> None:
+    method: MaxoMethod[object] = MaxoMethod()
+    engine = EngineProbe(DummyDispatcher(result=method), bot, web=adapter)
+
+    with patch.object(bot, "silent_call_method", new_callable=AsyncMock) as call:
+        await engine.handle_request(update_request)
+        await asyncio.sleep(0)
+
+    call.assert_awaited_once_with(method=method)

tests/maxo_webhook/test_single_bot_engine.py

@@ -1,4 +1,5 @@
 import asyncio
+import logging
 
 import pytest
 
@@ -196,3 +197,26 @@ async def test_foreground_engine_rejects_request_after_shutdown_with_closed_bot_
     assert response["status_code"] == 503  # ty:ignore[not-subscriptable]
     assert dispatcher.foreground_updates == []
     assert dispatcher.foreground_session_closed == []
+
+
+@pytest.mark.asyncio
+async def test_single_bot_engine_logs_bot_id_without_token_on_shutdown(
+    adapter: CapturingAdapter,
+    bot_token: str,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    bot = Bot(bot_token, client=TrackableClient(bot_id=42), warming_up=False)
+    engine = SingleBotEngine(
+        DummyDispatcher(),
+        bot,
+        web=adapter,
+        route=DummyRoute(),
+    )
+    caplog.set_level(logging.INFO, logger="maxo.webhook")
+
+    await engine.on_startup(None)  # ty:ignore[invalid-argument-type]
+    caplog.clear()
+    await engine.on_shutdown(None)  # ty:ignore[invalid-argument-type]
+
+    assert "Stopping single-bot webhook engine for bot 42" in caplog.text
+    assert bot_token not in caplog.text