aiogram-webhook 1.1.0__tar.gz → 2.0.0__tar.gz

{aiogram_webhook-1.1.0 → aiogram_webhook-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aiogram-webhook
-Version: 1.1.0
+Version: 2.0.0
 Summary: A python library for integrating webhook support with multiple web frameworks in aiogram. Organizes bot operation via webhooks for both single and multi-bot setups.
 Keywords: aiogram,telegram,webhook,fastapi,aiohttp,multibot
 Author: m-xim
@@ -201,7 +201,7 @@ from aiogram import Dispatcher, Router
 from aiogram.client.default import DefaultBotProperties
 from aiogram.types import Message
 from aiogram.filters import Command, CommandObject
-from aiogram_webhook import TokenEngine, FastApiWebAdapter, WebhookConfig
+from aiogram_webhook import TokenEngine, FastApiWebAdapter, WebhookConfig, BotConfig
 from aiogram_webhook.routing import PathRouting
 
 router = Router()
@@ -225,7 +225,7 @@ engine = TokenEngine(
     dispatcher,
     web_adapter=FastApiWebAdapter(),
     routing=PathRouting(url="https://example.com/webhook/{bot_token}"),
-    bot_settings={"default": DefaultBotProperties(parse_mode="HTML")},
+    bot_config=BotConfig(default=DefaultBotProperties(parse_mode="HTML")),
     webhook_config=WebhookConfig(allowed_updates=["message", "callback_query"]),
     # security=Security(...)
 )

{aiogram_webhook-1.1.0 → aiogram_webhook-2.0.0}/README.md

@@ -166,7 +166,7 @@ from aiogram import Dispatcher, Router
 from aiogram.client.default import DefaultBotProperties
 from aiogram.types import Message
 from aiogram.filters import Command, CommandObject
-from aiogram_webhook import TokenEngine, FastApiWebAdapter, WebhookConfig
+from aiogram_webhook import TokenEngine, FastApiWebAdapter, WebhookConfig, BotConfig
 from aiogram_webhook.routing import PathRouting
 
 router = Router()
@@ -190,7 +190,7 @@ engine = TokenEngine(
     dispatcher,
     web_adapter=FastApiWebAdapter(),
     routing=PathRouting(url="https://example.com/webhook/{bot_token}"),
-    bot_settings={"default": DefaultBotProperties(parse_mode="HTML")},
+    bot_config=BotConfig(default=DefaultBotProperties(parse_mode="HTML")),
     webhook_config=WebhookConfig(allowed_updates=["message", "callback_query"]),
     # security=Security(...)
 )

{aiogram_webhook-1.1.0 → aiogram_webhook-2.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aiogram-webhook"
-version = "1.1.0"
+version = "2.0.0"
 description = "A python library for integrating webhook support with multiple web frameworks in aiogram. Organizes bot operation via webhooks for both single and multi-bot setups."
 readme = "README.md"
 license = { text = "MIT" }

aiogram_webhook-2.0.0/src/aiogram_webhook/__init__.py

@@ -0,0 +1,21 @@
+from aiogram_webhook.config.bot import BotConfig
+from aiogram_webhook.config.webhook import WebhookConfig
+from aiogram_webhook.engines.simple import SimpleEngine
+from aiogram_webhook.engines.token import TokenEngine
+
+__all__ = ["BotConfig", "SimpleEngine", "TokenEngine", "WebhookConfig"]
+
+
+try:
+    from aiogram_webhook.adapters.aiohttp.adapter import AiohttpWebAdapter  # noqa: F401
+
+    __all__.insert(0, "AiohttpWebAdapter")
+except ImportError:
+    pass
+
+try:
+    from aiogram_webhook.adapters.fastapi.adapter import FastApiWebAdapter  # noqa: F401
+
+    __all__.insert(1, "FastApiWebAdapter")
+except ImportError:
+    pass

aiogram_webhook-1.1.0/src/aiogram_webhook/adapters/aiohttp.py → aiogram_webhook-2.0.0/src/aiogram_webhook/adapters/aiohttp/adapter.py

@@ -3,48 +3,44 @@ from typing import TYPE_CHECKING, Any, cast
 from aiohttp.web import Application, Request
 from aiohttp.web_response import Response, json_response
 
-from aiogram_webhook.adapters.base import BoundRequest, WebAdapter
-from aiogram_webhook.security.checks.ip import IPAddress
+from aiogram_webhook.adapters.aiohttp.mapping import AiohttpHeadersMapping, AiohttpQueryMapping
+from aiogram_webhook.adapters.base_adapter import BoundRequest, WebAdapter
 
 if TYPE_CHECKING:
     from asyncio import Transport
 
 
-class AiohttpBoundRequest(BoundRequest):
-    adapter: "AiohttpWebAdapter"
-    request: Request
+class AiohttpBoundRequest(BoundRequest[Request]):
+    def __init__(self, request: Request):
+        super().__init__(request)
+        self._headers = AiohttpHeadersMapping(self.request.headers)
+        self._query_params = AiohttpQueryMapping(self.request.query)
 
-    async def json(self) -> dict[str, Any]:
+    async def json(self):
         return await self.request.json()
 
-    def header(self, name: str) -> Any | None:
-        return self.request.headers.get(name)
-
-    def query_param(self, name: str) -> Any | None:
-        return self.request.query.get(name)
-
-    def path_param(self, name: str) -> Any | None:
-        return self.request.match_info.get(name)
-
-    def ip(self) -> IPAddress | str | None:
+    @property
+    def client_ip(self):
         if peer_name := cast("Transport", self.request.transport).get_extra_info("peername"):
             return peer_name[0]
-
         return None
 
-    def json_response(self, status: int, payload: dict[str, Any]) -> Response:
-        return json_response(status=status, data=payload)
+    @property
+    def headers(self) -> AiohttpHeadersMapping:
+        return self._headers
 
+    @property
+    def query_params(self) -> AiohttpQueryMapping:
+        return self._query_params
 
-class AiohttpWebAdapter(WebAdapter):
-    """
-    Adapter for aiohttp web servers.
+    @property
+    def path_params(self):
+        return self.request.match_info
 
-    This adapter integrates with aiohttp to handle webhook requests.
-    """
 
+class AiohttpWebAdapter(WebAdapter):
     def bind(self, request: Request) -> AiohttpBoundRequest:
-        return AiohttpBoundRequest(adapter=self, request=request)
+        return AiohttpBoundRequest(request=request)
 
     def register(self, app: Application, path, handler, on_startup=None, on_shutdown=None) -> None:
         async def endpoint(request: Request):
@@ -55,3 +51,6 @@ class AiohttpWebAdapter(WebAdapter):
             app.on_startup.append(on_startup)
         if on_shutdown is not None:
             app.on_shutdown.append(on_shutdown)
+
+    def create_json_response(self, status: int, payload: dict[str, Any]) -> Response:
+        return json_response(status=status, data=payload)

aiogram_webhook-2.0.0/src/aiogram_webhook/adapters/aiohttp/mapping.py

@@ -0,0 +1,15 @@
+from typing import Any
+
+from multidict import CIMultiDictProxy, MultiMapping
+
+from aiogram_webhook.adapters.base_mapping import MappingABC
+
+
+class AiohttpHeadersMapping(MappingABC[CIMultiDictProxy[str]]):
+    def getlist(self, name: str) -> list[Any]:
+        return self._mapping.getall(name, [])
+
+
+class AiohttpQueryMapping(MappingABC[MultiMapping[str]]):
+    def getlist(self, name: str) -> list[Any]:
+        return self._mapping.getall(name, [])

aiogram_webhook-2.0.0/src/aiogram_webhook/adapters/base_adapter.py

@@ -0,0 +1,86 @@
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+from typing import TYPE_CHECKING, Any, Generic, TypeVar
+
+if TYPE_CHECKING:
+    from collections.abc import Awaitable, Callable
+
+    from aiogram_webhook.adapters.base_mapping import MappingABC
+    from aiogram_webhook.security.checks.ip import IPAddress
+
+R = TypeVar("R")
+
+
+class BoundRequest(ABC, Generic[R]):
+    """
+    Unified abstraction for requests across frameworks.
+    """
+
+    __slots__ = ("request",)
+
+    def __init__(self, request: R) -> None:
+        self.request = request
+
+    @abstractmethod
+    async def json(self) -> dict[str, Any]:
+        """Get JSON data from request."""
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def client_ip(self) -> IPAddress | str | None:
+        """Get client IP address."""
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def headers(self) -> MappingABC:
+        """Get request headers."""
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def query_params(self) -> MappingABC:
+        """Get request query parameters."""
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def path_params(self) -> dict[str, Any]:
+        """Get request path parameters."""
+        raise NotImplementedError
+
+
+class WebAdapter(ABC):
+    """Abstraction for web framework adapters."""
+
+    @abstractmethod
+    def bind(self, request: Any) -> BoundRequest:
+        """Bind request to BoundRequest."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def register(
+        self,
+        app: Any,
+        path: str,
+        handler: Callable[[BoundRequest], Awaitable[Any]],
+        on_startup: Callable[..., Awaitable[Any]] | None = None,
+        on_shutdown: Callable[..., Awaitable[Any]] | None = None,
+    ) -> None:
+        """
+        Register webhook handler.
+
+        :param app: Web application instance.
+        :param path: Webhook path.
+        :param handler: Handler function.
+        :param on_startup: Optional startup callback.
+        :param on_shutdown: Optional shutdown callback.
+        """
+        raise NotImplementedError
+
+    @abstractmethod
+    def create_json_response(self, status: int, payload: dict[str, Any]) -> Any:
+        """Create JSON response with given status and data."""
+        raise NotImplementedError

aiogram_webhook-2.0.0/src/aiogram_webhook/adapters/base_mapping.py

@@ -0,0 +1,38 @@
+from abc import ABC, abstractmethod
+from collections.abc import ItemsView, KeysView, Mapping, ValuesView
+from typing import Any, Generic, TypeVar
+
+M = TypeVar("M", bound=Mapping)
+
+
+class MappingABC(ABC, Generic[M]):
+    def __init__(self, mapping: M):
+        self._mapping = mapping
+
+    def get(self, name: str, default=None):
+        return self._mapping.get(name, default)
+
+    @abstractmethod
+    def getlist(self, name: str) -> list[Any]:
+        raise NotImplementedError
+
+    def __getitem__(self, name: str) -> Any:
+        return self._mapping[name]
+
+    def __contains__(self, name: str) -> bool:
+        return name in self.keys()
+
+    def __len__(self) -> int:
+        return len(self._mapping)
+
+    def __iter__(self):
+        return iter(self._mapping)
+
+    def keys(self) -> KeysView:
+        return self._mapping.keys()
+
+    def values(self) -> ValuesView:
+        return self._mapping.values()
+
+    def items(self) -> ItemsView:
+        return self._mapping.items()

aiogram_webhook-2.0.0/src/aiogram_webhook/adapters/fastapi/adapter.py

@@ -0,0 +1,49 @@
+from typing import Any
+
+from fastapi import FastAPI, Request
+from fastapi.responses import JSONResponse
+
+from aiogram_webhook.adapters.base_adapter import BoundRequest, WebAdapter
+from aiogram_webhook.adapters.fastapi.mapping import FastAPIHeadersMapping, FastAPIQueryMapping
+
+
+class FastAPIBoundRequest(BoundRequest[Request]):
+    def __init__(self, request: Request):
+        super().__init__(request)
+        self._headers = FastAPIHeadersMapping(self.request.headers)
+        self._query_params = FastAPIQueryMapping(self.request.query_params)
+
+    async def json(self) -> dict[str, Any]:
+        return await self.request.json()
+
+    @property
+    def client_ip(self):
+        if self.request.client:
+            return self.request.client.host
+        return None
+
+    @property
+    def headers(self) -> FastAPIHeadersMapping:
+        return self._headers
+
+    @property
+    def query_params(self) -> FastAPIQueryMapping:
+        return self._query_params
+
+    @property
+    def path_params(self):
+        return self.request.path_params
+
+
+class FastApiWebAdapter(WebAdapter):
+    def bind(self, request: Request) -> FastAPIBoundRequest:
+        return FastAPIBoundRequest(request=request)
+
+    def register(self, app: FastAPI, path, handler, on_startup=None, on_shutdown=None) -> None:  # noqa: ARG002
+        async def endpoint(request: Request):
+            return await handler(self.bind(request))
+
+        app.add_api_route(path=path, endpoint=endpoint, methods=["POST"])
+
+    def create_json_response(self, status: int, payload: dict[str, Any]) -> JSONResponse:
+        return JSONResponse(status_code=status, content=payload)

aiogram_webhook-2.0.0/src/aiogram_webhook/adapters/fastapi/mapping.py

@@ -0,0 +1,15 @@
+from typing import Any
+
+from starlette.datastructures import Headers, QueryParams
+
+from aiogram_webhook.adapters.base_mapping import MappingABC
+
+
+class FastAPIHeadersMapping(MappingABC[Headers]):
+    def getlist(self, name: str) -> list[Any]:
+        return self._mapping.getlist(name)
+
+
+class FastAPIQueryMapping(MappingABC[QueryParams]):
+    def getlist(self, name: str) -> list[Any]:
+        return self._mapping.getlist(name)

aiogram_webhook-2.0.0/src/aiogram_webhook/config/bot.py

@@ -0,0 +1,12 @@
+from aiogram.client.default import DefaultBotProperties
+from aiogram.client.session.base import BaseSession
+from pydantic import BaseModel, ConfigDict
+
+
+class BotConfig(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    session: BaseSession | None = None
+    """HTTP Client session (For example AiohttpSession). If not specified it will be automatically created."""
+    default: DefaultBotProperties | None = None
+    """Default bot properties. If specified it will be propagated into the API methods at runtime."""

{aiogram_webhook-1.1.0 → aiogram_webhook-2.0.0}/src/aiogram_webhook/engines/base.py

@@ -6,14 +6,14 @@ from typing import TYPE_CHECKING, Any
 
 from aiogram.methods import TelegramMethod
 
-from aiogram_webhook.config import WebhookConfig
+from aiogram_webhook.config.webhook import WebhookConfig
 
 if TYPE_CHECKING:
     from aiogram import Bot, Dispatcher
     from aiogram.methods.base import TelegramType
     from aiogram.types import InputFile
 
-    from aiogram_webhook.adapters.base import BoundRequest, WebAdapter
+    from aiogram_webhook.adapters.base_adapter import BoundRequest, WebAdapter
     from aiogram_webhook.routing.base import BaseRouting
     from aiogram_webhook.security.security import Security
 
@@ -37,10 +37,10 @@ class WebhookEngine(ABC):
         webhook_config: WebhookConfig | None = None,
         handle_in_background: bool = True,
     ) -> None:
-        self.security = security
         self.dispatcher = dispatcher
         self.web_adapter = web_adapter
         self.routing = routing
+        self.security = security
         self.webhook_config = webhook_config or WebhookConfig()
         self.handle_in_background = handle_in_background
         self._background_feed_update_tasks: set[asyncio.Task[Any]] = set()
@@ -74,17 +74,17 @@ class WebhookEngine(ABC):
     async def handle_request(self, bound_request: BoundRequest):
         bot = self._get_bot_from_request(bound_request)
         if bot is None:
-            return bound_request.json_response(status=400, payload={"detail": "Bot not found"})
+            return self.web_adapter.create_json_response(status=400, payload={"detail": "Bot not found"})
+
+        if self.security is not None and not await self.security.verify(bot=bot, bound_request=bound_request):
+            return self.web_adapter.create_json_response(status=403, payload={"detail": "Forbidden"})
 
-        if self.security:
-            is_allowed = await self.security.verify(bot=bot, bound_request=bound_request)
-            if not is_allowed:
-                return bound_request.json_response(status=403, payload={"detail": "Forbidden"})
+        update = await bound_request.json()
 
         if self.handle_in_background:
-            return await self._handle_request_background(bot=bot, bound_request=bound_request)
+            return await self._handle_request_background(bot=bot, update=update)
 
-        return await self._handle_request(bot=bot, bound_request=bound_request)
+        return await self._handle_request(bot=bot, update=update)
 
     def register(self, app: Any) -> None:
         self.web_adapter.register(
@@ -95,33 +95,33 @@ class WebhookEngine(ABC):
             on_shutdown=self.on_shutdown,
         )
 
-    async def _handle_request(self, bot: Bot, bound_request: BoundRequest) -> dict[str, Any]:
-        result = await self.dispatcher.feed_webhook_update(bot=bot, update=await bound_request.json())
+    async def _handle_request(self, bot: Bot, update: dict[str, Any]) -> dict[str, Any]:
+        result = await self.dispatcher.feed_webhook_update(bot=bot, update=update)
 
         if not isinstance(result, TelegramMethod):
-            return bound_request.json_response(status=200, payload={})
+            return self.web_adapter.create_json_response(status=200, payload={})
 
         payload = self._build_webhook_payload(bot, result)
         if payload is None:
             # Has new files (InputFile) — execute directly via API
             await self.dispatcher.silent_call_request(bot=bot, result=result)
-            return bound_request.json_response(status=200, payload={})
+            return self.web_adapter.create_json_response(status=200, payload={})
 
-        return bound_request.json_response(status=200, payload=payload)
+        return self.web_adapter.create_json_response(status=200, payload=payload)
 
     async def _background_feed_update(self, bot: Bot, update: dict[str, Any]) -> None:
         result = await self.dispatcher.feed_raw_update(bot=bot, update=update)  # **self.data
         if isinstance(result, TelegramMethod):
             await self.dispatcher.silent_call_request(bot=bot, result=result)
 
-    async def _handle_request_background(self, bot: Bot, bound_request: BoundRequest):
+    async def _handle_request_background(self, bot: Bot, update: dict[str, Any]):
         feed_update_task = asyncio.create_task(
-            self._background_feed_update(bot=bot, update=await bound_request.json()),
+            self._background_feed_update(bot=bot, update=update),
         )
         self._background_feed_update_tasks.add(feed_update_task)
         feed_update_task.add_done_callback(self._background_feed_update_tasks.discard)
 
-        return bound_request.json_response(status=200, payload={})
+        return self.web_adapter.create_json_response(status=200, payload={})
 
     @staticmethod
     def _build_webhook_payload(bot: Bot, method: TelegramMethod[TelegramType]) -> dict[str, Any] | None:

{aiogram_webhook-1.1.0 → aiogram_webhook-2.0.0}/src/aiogram_webhook/engines/simple.py

@@ -7,8 +7,8 @@ from aiogram_webhook.engines.base import WebhookEngine
 if TYPE_CHECKING:
     from aiogram import Bot, Dispatcher
 
-    from aiogram_webhook.adapters.base import BoundRequest, WebAdapter
-    from aiogram_webhook.config import WebhookConfig
+    from aiogram_webhook.adapters.base_adapter import BoundRequest, WebAdapter
+    from aiogram_webhook.config.webhook import WebhookConfig
     from aiogram_webhook.routing.base import BaseRouting
     from aiogram_webhook.security.security import Security
 
@@ -51,13 +51,6 @@ class SimpleEngine(WebhookEngine):
         """
         return self.bot
 
-    async def on_startup(self, app: Any, *args, **kwargs) -> None:  # noqa: ARG002
-        """
-        Called on application startup. Emits dispatcher startup event.
-        """
-        workflow_data = self._build_workflow_data(app=app, bot=self.bot, **kwargs)
-        await self.dispatcher.emit_startup(**workflow_data)
-
     async def set_webhook(
         self,
         *,
@@ -84,7 +77,7 @@ class SimpleEngine(WebhookEngine):
         )
         params = config.model_dump(exclude_none=True)
 
-        if self.security:
+        if self.security is not None:
             secret_token = await self.security.get_secret_token(bot=self.bot)
             if secret_token is not None:
                 params["secret_token"] = secret_token
@@ -92,6 +85,13 @@ class SimpleEngine(WebhookEngine):
         await self.bot.set_webhook(url=self.routing.webhook_point(self.bot), request_timeout=request_timeout, **params)
         return self.bot
 
+    async def on_startup(self, app: Any, *args, **kwargs) -> None:  # noqa: ARG002
+        """
+        Called on application startup. Emits dispatcher startup event.
+        """
+        workflow_data = self._build_workflow_data(app=app, bot=self.bot, **kwargs)
+        await self.dispatcher.emit_startup(**workflow_data)
+
     async def on_shutdown(self, app: Any, *args, **kwargs) -> None:  # noqa: ARG002
         """
         Called on application shutdown. Emits dispatcher shutdown event and closes bot session.

{aiogram_webhook-1.1.0 → aiogram_webhook-2.0.0}/src/aiogram_webhook/engines/token.py

@@ -5,11 +5,12 @@ from typing import TYPE_CHECKING, Any
 from aiogram import Bot, Dispatcher
 from aiogram.utils.token import extract_bot_id
 
+from aiogram_webhook.config.bot import BotConfig
 from aiogram_webhook.engines.base import WebhookEngine
 
 if TYPE_CHECKING:
-    from aiogram_webhook.adapters.base import BoundRequest, WebAdapter
-    from aiogram_webhook.config import WebhookConfig
+    from aiogram_webhook.adapters.base_adapter import BoundRequest, WebAdapter
+    from aiogram_webhook.config.webhook import WebhookConfig
     from aiogram_webhook.routing.base import TokenRouting
     from aiogram_webhook.security.security import Security
 
@@ -29,7 +30,7 @@ class TokenEngine(WebhookEngine):
         web_adapter: WebAdapter,
         routing: TokenRouting,
         security: Security | None = None,
-        bot_settings: dict[str, Any] | None = None,
+        bot_config: BotConfig | None = None,
         webhook_config: WebhookConfig | None = None,
         handle_in_background: bool = True,
     ) -> None:
@@ -42,7 +43,7 @@ class TokenEngine(WebhookEngine):
             handle_in_background=handle_in_background,
         )
         self.routing: TokenRouting = routing  # for type checker
-        self.bot_settings = bot_settings
+        self.bot_config = bot_config or BotConfig()
         self._bots: dict[int, Bot] = {}
 
     def _get_bot_from_request(self, bound_request: BoundRequest) -> Bot | None:
@@ -70,7 +71,7 @@ class TokenEngine(WebhookEngine):
         """
         bot = self._bots.get(extract_bot_id(token))
         if not bot:
-            bot = Bot(token=token, **(self.bot_settings or {}))
+            bot = Bot(token=token, session=self.bot_config.session, default=self.bot_config.default)
             self._bots[bot.id] = bot
         return bot
 
@@ -103,7 +104,7 @@ class TokenEngine(WebhookEngine):
         )
         params = config.model_dump(exclude_none=True)
 
-        if self.security:
+        if self.security is not None:
             secret_token = await self.security.get_secret_token(bot=bot)
             if secret_token is not None:
                 params["secret_token"] = secret_token

{aiogram_webhook-1.1.0 → aiogram_webhook-2.0.0}/src/aiogram_webhook/routing/base.py

@@ -3,7 +3,7 @@ from abc import ABC, abstractmethod
 from aiogram import Bot
 from yarl import URL
 
-from aiogram_webhook.adapters.base import BoundRequest
+from aiogram_webhook.adapters.base_adapter import BoundRequest
 
 
 class BaseRouting(ABC):

{aiogram_webhook-1.1.0 → aiogram_webhook-2.0.0}/src/aiogram_webhook/routing/path.py

@@ -25,4 +25,4 @@ class PathRouting(TokenRouting):
         return self.url_template.format_map({self.param: bot.token})
 
     def extract_token(self, bound_request) -> str | None:
-        return bound_request.path_param(self.param)
+        return bound_request.path_params.get(self.param)

{aiogram_webhook-1.1.0 → aiogram_webhook-2.0.0}/src/aiogram_webhook/routing/query.py

@@ -15,4 +15,4 @@ class QueryRouting(TokenRouting):
         return self.url.update_query({self.param: bot.token}).human_repr()
 
     def extract_token(self, bound_request) -> str | None:
-        return bound_request.query_param(self.param)
+        return bound_request.query_params.get(self.param)

{aiogram_webhook-1.1.0 → aiogram_webhook-2.0.0}/src/aiogram_webhook/security/checks/check.py

@@ -2,7 +2,7 @@ from typing import Protocol
 
 from aiogram import Bot
 
-from aiogram_webhook.adapters.base import BoundRequest
+from aiogram_webhook.adapters.base_adapter import BoundRequest
 
 
 class SecurityCheck(Protocol):

{aiogram_webhook-1.1.0 → aiogram_webhook-2.0.0}/src/aiogram_webhook/security/checks/ip.py

@@ -1,13 +1,9 @@
-from __future__ import annotations
-
 from ipaddress import IPv4Address, IPv4Network, IPv6Address, IPv6Network, ip_address, ip_network
-from typing import TYPE_CHECKING, Final
+from typing import Final
 
+from aiogram_webhook.adapters.base_adapter import BoundRequest
 from aiogram_webhook.security.checks.check import SecurityCheck
 
-if TYPE_CHECKING:
-    from aiogram_webhook.adapters.base import BoundRequest
-
 IPNetwork = IPv4Network | IPv6Network
 IPAddress = IPv4Address | IPv6Address
 
@@ -47,29 +43,7 @@ class IPCheck(SecurityCheck):
             else:
                 self._addresses.add(parsed)
 
-    def _extract_ip_from_x_forwarded_for(self, bound_request: BoundRequest) -> IPv4Address | IPv6Address | str | None:
-        """
-        Extract client IP from X-Forwarded-For header.
-
-        Request got through multiple proxy/load balancers
-        https://github.com/aiogram/aiogram/issues/672
-        """
-        header_value = bound_request.header("X-Forwarded-For")
-        if not header_value:
-            return None
-        forwarded_for, *_ = header_value.split(",", maxsplit=1)
-        return forwarded_for.strip()
-
-    def _get_client_ip(self, bound_request: BoundRequest) -> IPAddress | str | None:
-        """Get client IP, first trying X-Forwarded-For header, then direct connection."""
-        # Try to resolve client IP over reverse proxy
-        if forwarded_for := self._extract_ip_from_x_forwarded_for(bound_request):
-            return forwarded_for
-
-        # Get direct IP from connection
-        return bound_request.ip()
-
-    async def verify(self, bot, bound_request) -> bool:  # noqa: ARG002
+    async def verify(self, bot, bound_request: BoundRequest) -> bool:  # noqa: ARG002
         raw_ip = self._get_client_ip(bound_request)
         if not raw_ip:
             return False
@@ -79,6 +53,27 @@ class IPCheck(SecurityCheck):
             return False
         return (ip_addr in self._addresses) or any(ip_addr in network for network in self._networks)
 
+    def _get_client_ip(self, bound_request: BoundRequest) -> IPAddress | str | None:
+        # Try to resolve client IP over reverse proxy
+        # See: https://github.com/aiogram/aiogram/issues/672
+        if forwarded_for := self._extract_first_ip_from_header(bound_request.headers.get("X-Forwarded-For")):
+            return forwarded_for
+
+        # Get direct IP from connection
+        return bound_request.client_ip
+
+    @staticmethod
+    def _extract_first_ip_from_header(header_value: str | None) -> str | None:
+        """
+        Extract the first IP from a comma-separated header value (e.g., X-Forwarded-For).
+
+        :param header_value: header value with possible IP chain
+        :return: first IP or None
+        """
+        if header_value:
+            return header_value.split(",", maxsplit=1)[0].strip()
+        return None
+
     @staticmethod
     def _parse(item: IPAddress | IPNetwork | str) -> IPAddress | IPNetwork | None:
         if isinstance(item, (IPNetwork, IPAddress)):

{aiogram_webhook-1.1.0 → aiogram_webhook-2.0.0}/src/aiogram_webhook/security/secret_token.py

@@ -1,25 +1,29 @@
 import re
+from abc import ABC, abstractmethod
 from hmac import compare_digest
-from typing import Protocol
 
 from aiogram import Bot
 
-from aiogram_webhook.adapters.base import BoundRequest
+from aiogram_webhook.adapters.base_adapter import BoundRequest
 
 SECRET_TOKEN_PATTERN = re.compile(r"^[A-Za-z0-9_-]{1,256}$")
 
 
-class SecretToken(Protocol):
+class SecretToken(ABC):
     """
-    Protocol for secret token verification in webhook requests.
+    Abstract base class for secret token verification in webhook requests.
     """
 
+    secret_header: str = "x-telegram-bot-api-secret-token"  # noqa: S105
+
+    @abstractmethod
     async def verify(self, bot: Bot, bound_request: BoundRequest) -> bool:
         """
         Verify the secret token in the incoming request.
         """
         raise NotImplementedError
 
+    @abstractmethod
     def secret_token(self, bot: Bot) -> str:
         """
         Return the secret token for the given bot.
@@ -41,7 +45,7 @@ class StaticSecretToken(SecretToken):
         self._token = token
 
     async def verify(self, bot: Bot, bound_request: BoundRequest) -> bool:  # noqa: ARG002
-        incoming = bound_request.secret_token()
+        incoming = bound_request.headers.get(self.secret_header)
         if incoming is None:
             return False
         return compare_digest(incoming, self._token)

{aiogram_webhook-1.1.0 → aiogram_webhook-2.0.0}/src/aiogram_webhook/security/security.py

@@ -1,6 +1,6 @@
 from aiogram import Bot
 
-from aiogram_webhook.adapters.base import BoundRequest
+from aiogram_webhook.adapters.base_adapter import BoundRequest
 from aiogram_webhook.security.checks.check import SecurityCheck
 from aiogram_webhook.security.secret_token import SecretToken
 
@@ -28,8 +28,7 @@ class Security:
                 return False
 
         for checker in self._checks:
-            ok = await checker.verify(bot=bot, bound_request=bound_request)
-            if not ok:
+            if not await checker.verify(bot=bot, bound_request=bound_request):
                 return False
 
         return True

aiogram_webhook-1.1.0/src/aiogram_webhook/__init__.py

@@ -1,21 +0,0 @@
-from aiogram_webhook.adapters.base import WebAdapter
-from aiogram_webhook.config import WebhookConfig
-from aiogram_webhook.engines.simple import SimpleEngine
-from aiogram_webhook.engines.token import TokenEngine
-
-__all__ = ["SimpleEngine", "TokenEngine", "WebAdapter", "WebhookConfig"]
-
-
-try:
-    from aiogram_webhook.adapters.aiohttp import AiohttpWebAdapter  # noqa: F401
-
-    __all__.insert(0, "AiohttpWebAdapter")
-except ImportError:
-    pass
-
-try:
-    from aiogram_webhook.adapters.fastapi import FastApiWebAdapter  # noqa: F401
-
-    __all__.insert(1, "FastApiWebAdapter")
-except ImportError:
-    pass

aiogram_webhook-1.1.0/src/aiogram_webhook/adapters/base.py

@@ -1,92 +0,0 @@
-from __future__ import annotations
-
-from abc import ABC, abstractmethod
-from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any
-
-if TYPE_CHECKING:
-    from collections.abc import Awaitable, Callable
-
-    from aiogram_webhook.security.checks.ip import IPAddress
-
-
-@dataclass(slots=True)
-class BoundRequest(ABC):
-    """
-    Abstract base class for a request bound to a web adapter.
-
-    Provides interface for extracting data from incoming requests and generating responses.
-    """
-
-    request: Any
-    adapter: WebAdapter
-
-    @abstractmethod
-    async def json(self) -> dict[str, Any]:
-        """Parse the request body as JSON and return the resulting dictionary."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def header(self, name: str) -> Any | None:
-        """Get a header value from the request."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def query_param(self, name: str) -> Any | None:
-        """Get a query parameter from the request URL."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def path_param(self, name: str) -> Any | None:
-        """Get a path parameter from the request URL."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def ip(self) -> IPAddress | str | None:
-        """Get IP directly from client connection (implementation-specific)."""
-        raise NotImplementedError
-
-    def secret_token(self) -> str | None:
-        """Get the secret token from the request header."""
-        return self.header(self.adapter.secret_header)
-
-    @abstractmethod
-    def json_response(self, status: int, payload: dict[str, Any]) -> Any:
-        """Create a JSON response with the given status and payload."""
-        raise NotImplementedError
-
-
-@dataclass
-class WebAdapter(ABC):
-    """
-    Abstract base class for web framework adapters.
-
-    Provides interface for binding requests and registering webhook handlers.
-    """
-
-    secret_header: str = "x-telegram-bot-api-secret-token"  # noqa: S105
-
-    @abstractmethod
-    def bind(self, request: Any) -> BoundRequest:
-        """Bind a request to a BoundRequest instance."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def register(
-        self,
-        app: Any,
-        path: str,
-        handler: Callable[[BoundRequest], Awaitable[Any]],
-        on_startup: Callable[..., Awaitable[Any]] | None = None,
-        on_shutdown: Callable[..., Awaitable[Any]] | None = None,
-    ) -> None:
-        """
-        Register a webhook handler with the adapter.
-
-        :param app: The web application instance.
-        :param path: The path for the webhook endpoint.
-        :param handler: The handler function to process incoming requests.
-        :param on_startup: Optional startup callback.
-        :param on_shutdown: Optional shutdown callback.
-        """
-        raise NotImplementedError

aiogram_webhook-1.1.0/src/aiogram_webhook/adapters/fastapi.py

@@ -1,43 +0,0 @@
-from typing import Any
-
-from fastapi import FastAPI, Request
-from fastapi.responses import JSONResponse
-
-from aiogram_webhook.adapters.base import BoundRequest, WebAdapter
-from aiogram_webhook.security.checks.ip import IPAddress
-
-
-class FastAPIBoundRequest(BoundRequest):
-    request: Request
-
-    async def json(self) -> dict[str, Any]:
-        return await self.request.json()
-
-    def header(self, name: str) -> Any | None:
-        return self.request.headers.get(name)
-
-    def query_param(self, name: str) -> Any | None:
-        return self.request.query_params.get(name)
-
-    def path_param(self, name: str) -> Any | None:
-        return self.request.path_params.get(name)
-
-    def ip(self) -> IPAddress | str | None:
-        if self.request.client:
-            return self.request.client.host
-
-        return None
-
-    def json_response(self, status: int, payload: dict[str, Any]) -> JSONResponse:
-        return JSONResponse(status_code=status, content=payload)
-
-
-class FastApiWebAdapter(WebAdapter):
-    def bind(self, request: Request) -> FastAPIBoundRequest:
-        return FastAPIBoundRequest(adapter=self, request=request)
-
-    def register(self, app: FastAPI, path, handler, on_startup=None, on_shutdown=None) -> None:  # noqa: ARG002
-        async def endpoint(request: Request):
-            return await handler(self.bind(request))
-
-        app.add_api_route(path=path, endpoint=endpoint, methods=["POST"])