maxapi-python 2.4.0__py3-none-any.whl → 2.5.0__py3-none-any.whl

pymax/client.py

@@ -7,12 +7,15 @@ from pymax.auth import (
     SmsAuthFlow,
     SmsCodeProvider,
 )
+from pymax.config import ClientConfig
 from pymax.connection import ConnectionManager
 from pymax.connection.readers import TCPReader
+from pymax.dispatch import Router
 from pymax.logging import configure_logging, get_logger
 from pymax.protocol.tcp import TcpProtocol
 from pymax.protocol.tcp.framing import TcpPacketFramer
 from pymax.transport.tcp import TCPTransport
+from pymax.versions.catalog import VersionCatalog
 
 from .base import BaseClient
 from .config import ExtraConfig
@@ -37,6 +40,15 @@ class Client(BaseClient["Client"]):
         auth_flow: Полностью пользовательский сценарий авторизации.
         sms_code_provider: Провайдер SMS-кода для стандартного ``SmsAuthFlow``.
         password_provider: Провайдер пароля 2FA, если аккаунт его требует.
+        app_version: Версия Android-клиента для user-agent и fingerprint.
+            По умолчанию используется ``VersionCatalog.recommended()``.
+        catalog: Каталог fingerprints. Если не передан, используется
+            встроенный каталог. Каталог и версия разрешаются при
+            :meth:`connect` или :meth:`start`.
+
+    Raises:
+        VersionNotFoundError: При запуске, если ``app_version`` отсутствует в
+            итоговом каталоге.
     """
 
     def __init__(  # noqa: PLR0913
@@ -48,12 +60,15 @@ class Client(BaseClient["Client"]):
         auth_flow: AuthFlow | None = None,
         sms_code_provider: SmsCodeProvider | None = None,
         password_provider: PasswordProvider | None = None,
+        app_version: str = VersionCatalog.RECOMMENDED_APP_VERSION,
+        catalog: VersionCatalog | None = None,
     ) -> None:
-
-        self.phone = phone
-        self.extra_config = extra_config or ExtraConfig()
-        self.session_name = session_name
-        self.work_dir = work_dir
+        self.phone: str = phone
+        self.extra_config: ExtraConfig = extra_config or ExtraConfig()
+        self.session_name: str = session_name
+        self.work_dir: str = work_dir
+        self.app_version: str = app_version
+        self.catalog: VersionCatalog = catalog or VersionCatalog()
 
         configure_logging(self.extra_config.log_level)
         logger.debug(
@@ -65,17 +80,13 @@ class Client(BaseClient["Client"]):
             self.extra_config.reconnect,
         )
 
-        self._config = self._build_config(
-            phone=phone,
-            user_agent=(self.extra_config.user_agent or self.extra_config.generate_user_agent()),
-        )
-
         if auth_flow is None:
             auth_flow = SmsAuthFlow(
                 sms_code_provider or ConsoleSmsCodeProvider(),
                 password_provider,
             )
-        self._init_runtime(auth_flow=auth_flow)
+        self._auth_flow = auth_flow
+        self._router = Router()
 
         logger.debug(
             "client created transport=tcp host=%s port=%s",
@@ -83,6 +94,23 @@ class Client(BaseClient["Client"]):
             self.extra_config.port,
         )
 
+    async def _prepare_config(self) -> ClientConfig:
+        catalog = await self.catalog.load()
+        fingerprint = catalog.resolve(self.app_version)
+
+        user_agent = self.extra_config.user_agent or self.extra_config.generate_user_agent(
+            self.app_version, fingerprint.build_number
+        )
+
+        config = self._build_config(
+            phone=self.phone,
+            user_agent=user_agent,
+            version=self.app_version,
+            fingerprint=fingerprint,
+        )
+        config.restore_user_agent_from_session = self.extra_config.user_agent is None
+        return config
+
     def _build_connection(self) -> ConnectionManager:
         logger.debug(
             "building tcp connection host=%s port=%s ssl=%s",

pymax/client_web.py

@@ -5,12 +5,13 @@ from pymax.auth.providers import ConsoleQrHandler, QrHandler
 from pymax.auth.qr import QrAuthFlow
 from pymax.connection import ConnectionManager
 from pymax.connection.readers import WSReader
+from pymax.dispatch import Router
 from pymax.logging import configure_logging, get_logger
 from pymax.protocol.tcp import TcpProtocol
 from pymax.transport.websocket import WebSocketTransport
 
 from .base import BaseClient
-from .config import ExtraConfig
+from .config import ClientConfig, ExtraConfig
 
 logger = get_logger(__name__)
 
@@ -38,9 +39,9 @@ class WebClient(BaseClient["WebClient"]):
         auth_flow: AuthFlow | None = None,
         qr_provider: QrHandler | None = None,
     ) -> None:
-        self.extra_config = extra_config or ExtraConfig()
-        self.session_name = session_name
-        self.work_dir = work_dir
+        self.extra_config: ExtraConfig = extra_config or ExtraConfig()
+        self.session_name: str = session_name
+        self.work_dir: str = work_dir
 
         configure_logging(self.extra_config.log_level)
         logger.debug(
@@ -51,22 +52,24 @@ class WebClient(BaseClient["WebClient"]):
             self.extra_config.reconnect,
         )
 
-        self._config = self._build_config(
-            phone=None,
-            user_agent=(
-                self.extra_config.user_agent or self.extra_config.generate_web_user_agent()
-            ),
-        )
-
         if auth_flow is None:
             auth_flow = QrAuthFlow(qr_provider or ConsoleQrHandler())
-        self._init_runtime(auth_flow=auth_flow)
+        self._auth_flow = auth_flow
+        self._router = Router()
 
         logger.debug(
             "web client created transport=ws url=%s",
             self.extra_config.url,
         )
 
+    async def _prepare_config(self) -> ClientConfig:
+        user_agent = self.extra_config.user_agent or self.extra_config.generate_web_user_agent()
+        config = self._build_config(
+            phone=None, user_agent=user_agent, version=None, fingerprint=None
+        )
+        config.restore_user_agent_from_session = self.extra_config.user_agent is None
+        return config
+
     def _build_connection(self) -> ConnectionManager:
         logger.debug(
             "building websocket connection url=%s",

pymax/config.py

@@ -1,5 +1,5 @@
-from random import choice, randint, random
-from uuid import uuid4
+import secrets
+from random import choice, randint
 
 from pydantic import BaseModel, ConfigDict, Field
 
@@ -8,8 +8,10 @@ from pymax.api.session.payloads import (
     DEFAULT_WEB_HEADER_USER_AGENT,
     MobileUserAgentPayload,
 )
+from pymax.fingerprint.models import ApkBuildFingerprint
 from pymax.session import StoreProtocol
 from pymax.types.domain.sync import SyncOverrides
+from pymax.versions.catalog import VersionCatalog
 
 MIN_PREFERRED_BUILD = 6712
 APP_VERSIONS: tuple[tuple[str, int], ...] = (
@@ -47,50 +49,56 @@ APP_VERSIONS: tuple[tuple[str, int], ...] = (
     ("26.12.2", 6681),
     ("26.12.1", 6679),
     ("26.12.0", 6676),
-    ("26.11.3", 6670),
-    ("26.11.2", 6669),
-    ("26.11.1", 6665),
-    ("26.10.1", 6653),
-    ("26.10.0", 6648),
-    ("26.9.1", 6643),
+    # ("26.11.3", 6670), # Not supported TODO: delete maybe
+    # ("26.11.2", 6669),
+    # ("26.11.1", 6665),
+    # ("26.10.1", 6653),
+    # ("26.10.0", 6648),
+    # ("26.9.1", 6643),
 )
 ANDROID_DEVICES: tuple[tuple[str, str, str, str], ...] = (
-    ("Samsung SM-A525F", "Android 13", "405dpi 405dpi 1080x2400", "arm64-v8a"),
-    ("Samsung SM-A536B", "Android 14", "405dpi 405dpi 1080x2400", "arm64-v8a"),
-    ("Samsung SM-A546E", "Android 14", "405dpi 405dpi 1080x2340", "arm64-v8a"),
-    ("Samsung SM-G991B", "Android 14", "421dpi 421dpi 1080x2400", "arm64-v8a"),
-    ("Samsung SM-G998B", "Android 13", "515dpi 515dpi 1440x3200", "arm64-v8a"),
-    ("Samsung SM-S901B", "Android 14", "425dpi 425dpi 1080x2340", "arm64-v8a"),
-    ("Samsung SM-S911B", "Android 14", "425dpi 425dpi 1080x2340", "arm64-v8a"),
-    ("Xiaomi 2109119DG", "Android 13", "395dpi 395dpi 1080x2400", "arm64-v8a"),
-    ("Xiaomi 2201117TG", "Android 13", "395dpi 395dpi 1080x2400", "arm64-v8a"),
-    ("Xiaomi 2201123G", "Android 14", "526dpi 526dpi 1440x3200", "arm64-v8a"),
-    ("Xiaomi 2210132G", "Android 14", "446dpi 446dpi 1220x2712", "arm64-v8a"),
     (
-        "Xiaomi 23049PCD8G",
+        "Google Pixel 6a",
+        "Android 13",
+        "420dpi 420dpi 1080x2400",
+        "arm64-v8a",
+    ),
+    (
+        "Google Pixel 7",
+        "Android 13",
+        "420dpi 420dpi 1080x2400",
+        "arm64-v8a",
+    ),
+    (
+        "Google Pixel 7 Pro",
+        "Android 13",
+        "560dpi 560dpi 1440x3120",
+        "arm64-v8a",
+    ),
+    (
+        "Google Pixel 8",
+        "Android 14",
+        "420dpi 420dpi 1080x2400",
+        "arm64-v8a",
+    ),
+    (
+        "samsung SM-G991B",
         "Android 14",
-        "446dpi 446dpi 1220x2712",
+        "xxhdpi 480dpi 1080x2400",
+        "arm64-v8a",
+    ),
+    (
+        "samsung SM-S911B",
+        "Android 15",
+        "xxhdpi 480dpi 1080x2340",
+        "arm64-v8a",
+    ),
+    (
+        "Xiaomi 2201117TG",
+        "Android 13",
+        "440dpi 440dpi 1080x2400",
         "arm64-v8a",
     ),
-    ("Redmi 2201116TG", "Android 13", "395dpi 395dpi 1080x2400", "arm64-v8a"),
-    ("Redmi 22101316G", "Android 13", "395dpi 395dpi 1080x2400", "arm64-v8a"),
-    ("Redmi 23021RAA2Y", "Android 14", "395dpi 395dpi 1080x2400", "arm64-v8a"),
-    ("POCO 22011211G", "Android 13", "395dpi 395dpi 1080x2400", "arm64-v8a"),
-    ("POCO 23049PCD8G", "Android 14", "446dpi 446dpi 1220x2712", "arm64-v8a"),
-    ("Pixel 6", "Android 14", "411dpi 411dpi 1080x2400", "arm64-v8a"),
-    ("Pixel 6a", "Android 14", "429dpi 429dpi 1080x2400", "arm64-v8a"),
-    ("Pixel 7", "Android 14", "416dpi 416dpi 1080x2400", "arm64-v8a"),
-    ("Pixel 7 Pro", "Android 14", "512dpi 512dpi 1440x3120", "arm64-v8a"),
-    ("Pixel 8", "Android 14", "428dpi 428dpi 1080x2400", "arm64-v8a"),
-    ("OnePlus NE2213", "Android 14", "525dpi 525dpi 1440x3216", "arm64-v8a"),
-    ("OnePlus CPH2449", "Android 14", "451dpi 451dpi 1240x2772", "arm64-v8a"),
-    ("realme RMX3085", "Android 13", "409dpi 409dpi 1080x2400", "arm64-v8a"),
-    ("realme RMX3370", "Android 13", "409dpi 409dpi 1080x2400", "arm64-v8a"),
-    ("realme RMX3630", "Android 13", "400dpi 400dpi 1080x2412", "arm64-v8a"),
-    ("HUAWEI ELS-NX9", "Android 12", "441dpi 441dpi 1080x2340", "arm64-v8a"),
-    ("HUAWEI VOG-L29", "Android 12", "398dpi 398dpi 1080x2340", "arm64-v8a"),
-    ("HONOR RMO-NX1", "Android 13", "391dpi 391dpi 1080x2388", "arm64-v8a"),
-    ("HONOR REA-NX9", "Android 13", "435dpi 435dpi 1200x2664", "arm64-v8a"),
 )
 LOCALE_TIMEZONES: tuple[tuple[str, str], ...] = (
     ("ru", "Europe/Moscow"),
@@ -104,17 +112,21 @@ LOCALE_TIMEZONES: tuple[tuple[str, str], ...] = (
     ("ru", "Asia/Yakutsk"),
     ("ru", "Asia/Vladivostok"),
 )
-WEB_APP_VERSION = "26.7.15"
+WEB_APP_VERSION = "26.8.4"
 WEB_SCREEN = "1080x1920 1.0x"
 
 PREFERRED_VERSION = [version for version in APP_VERSIONS if version[1] >= MIN_PREFERRED_BUILD]
 LEGACY_VERSIONS = [version for version in APP_VERSIONS if version[1] < MIN_PREFERRED_BUILD]
 
 
+def generate_device_id() -> str:
+    return secrets.token_hex(8)
+
+
 class DeviceConfig(BaseModel):
     mt_instance_id: str
     user_agent: MobileUserAgentPayload
-    device_id: str = Field(default_factory=lambda: str(uuid4()))
+    device_id: str = Field(default_factory=generate_device_id)
     client_session_id: int = Field(default_factory=lambda: randint(1, 70))
 
 
@@ -136,6 +148,9 @@ class RegistrationConfig(BaseModel):
 class ClientConfig(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
+    app_version: str | None = VersionCatalog.RECOMMENDED_APP_VERSION
+    fingering: ApkBuildFingerprint | None
+
     phone: str | None = None
     work_dir: str = "."
     session_name: str = "session.db"
@@ -143,17 +158,21 @@ class ClientConfig(BaseModel):
     token: str | None = None
     proxy: str | None = None
     registration_config: RegistrationConfig | None = None
-
-    host: str = "api.oneme.ru"
+    upload_timeout: int = 900
+    relogin: bool = True
+    host: str = "api2.oneme.ru"
     port: int = 443
     use_ssl: bool = True
+    persist_session: bool = True
 
+    password_max_attempts: int | None = None
     protocol_version: int = 10
     request_timeout: float = 30.0
     log_level: str = "INFO"
     telemetry: bool = False
 
     interactive: bool = True
+    restore_user_agent_from_session: bool = True
 
     store: StoreProtocol | None = None
 
@@ -181,13 +200,35 @@ class ExtraConfig(BaseModel):
         proxy: Proxy URL для TCP- или WebSocket-транспорта.
         reconnect: Переподключаться после сетевых ошибок.
         reconnect_delay: Пауза перед reconnect.
-        device_id: Явный device ID. Если не передан, генерируется UUID.
+        upload_timeout: Общий timeout HTTP-загрузки файлов, видео, голосовых и
+            видеосообщений в секундах. По умолчанию ``900``; не применяется к
+            фотографиям и 60-секундному ожиданию обработки вложения. ``0`` и
+            отрицательные значения отключают общий timeout, но не отдельный
+            60-секундный socket/read timeout.
+        relogin: Автоматически сбрасывать сессию и повторять авторизацию, если
+            Max отозвал login token. По умолчанию ``True``.
+        password_max_attempts: Максимальное число попыток ввода пароля 2FA.
+            ``None`` означает отсутствие лимита; ``0`` и отрицательные значения
+            сразу завершают авторизацию с ``PasswordAttemptsExceededError``.
+        persist_session: Сохранять token, device/user-agent и sync-state между
+            runtime в SQLite или переданном ``store``. По умолчанию ``True``.
+            При ``False`` используется отдельный ``InMemoryStore`` и значение
+            ``store`` игнорируется; после пересоздания runtime, в том числе при
+            reconnect, сохраненная сессия недоступна.
+        device_id: Явный device ID. Если не передан, генерируется строка из
+            16 шестнадцатеричных символов.
         device_type: Тип устройства для mobile user-agent.
-        user_agent: Полностью заданный user-agent payload.
-        mt_instance_id: Instance ID устройства.
+        user_agent: Полностью заданный user-agent payload. Явное значение имеет
+            приоритет над user-agent из сохраненной сессии. Автоматически
+            сгенерированный user-agent восстанавливает характеристики устройства
+            из сессии, сохраняя версию приложения и build number текущего запуска.
+        mt_instance_id: Instance ID устройства. По умолчанию генерируется
+            строка из 16 шестнадцатеричных символов.
         request_timeout: Timeout API-запросов в секундах.
         log_level: Уровень логов ``pymax``.
         telemetry: Отправлять telemetry-события Max.
+        store: Пользовательское хранилище сессии. Используется только при
+            ``persist_session=True``.
         sync: Переопределения sync-маркеров для login.
 
     Example:
@@ -210,18 +251,22 @@ class ExtraConfig(BaseModel):
     token: str | None = None
     registration_config: RegistrationConfig | None = None
 
-    host: str = "api.oneme.ru"
+    host: str = "api2.oneme.ru"
     port: int = 443
     url: str = "wss://api.oneme.ru/websocket"
     use_ssl: bool = True
     proxy: str | None = None
     reconnect: bool = True
     reconnect_delay: float = 1.0
+    upload_timeout: int = 900
+    relogin: bool = True
+    password_max_attempts: int | None = None
+    persist_session: bool = True
 
     device_id: str | None = None
     device_type: DeviceType = DeviceType.ANDROID
     user_agent: MobileUserAgentPayload | None = None
-    mt_instance_id: str = Field(default_factory=lambda: str(uuid4()))
+    mt_instance_id: str = Field(default_factory=generate_device_id)
 
     request_timeout: float = 30.0
     log_level: str = "INFO"
@@ -231,14 +276,17 @@ class ExtraConfig(BaseModel):
 
     sync: SyncOverrides = Field(default_factory=SyncOverrides)
 
-    def generate_user_agent(self) -> MobileUserAgentPayload:
+    def generate_user_agent(self, app_version: str, build_number: int) -> MobileUserAgentPayload:
         """Создает mobile user-agent payload для TCP-клиента.
 
+        Args:
+            app_version: Версия Android-клиента Max.
+            build_number: Build number той же версии из ``VersionCatalog``.
+
         Returns:
-            Случайная, но правдоподобная конфигурация Android-клиента Max.
+            Случайная конфигурация Android-устройства с переданными версией и
+            build number.
         """
-        versions = PREFERRED_VERSION if random() < 0.9 else LEGACY_VERSIONS
-        app_version, build_number = choice(versions)
         device_name, os_version, screen, arch = choice(ANDROID_DEVICES)
         locale, timezone = choice(LOCALE_TIMEZONES)
 

pymax/di/__init__.py

@@ -0,0 +1,2 @@
+from .context import DiContext
+from .resolver import DiResolver

pymax/di/context.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Generic, TypeVar
+
+if TYPE_CHECKING:
+    from pymax.app import App
+    from pymax.base import BaseClient
+    from pymax.dispatch.mapping import DispatchEvent
+
+ClientT = TypeVar("ClientT", bound="BaseClient")
+
+
+@dataclass(slots=True)
+class DiContext(Generic[ClientT]):
+    app: App[ClientT]
+    event: DispatchEvent
+    client: ClientT

pymax/di/resolver.py

@@ -0,0 +1,38 @@
+from __future__ import annotations
+
+from collections.abc import Awaitable, Callable
+from logging import getLogger
+from typing import Any, TypeAlias
+
+from pymax.fsm import FSMContext
+from pymax.types import Message
+
+from .context import DiContext
+
+logger = getLogger()
+
+
+async def resolve_fsm(ctx: DiContext) -> FSMContext | None:
+    if not isinstance(ctx.event, Message):
+        raise ValueError("Fsm is not currently working for non-message handlers.")
+
+    if not ctx.event.chat_id or not ctx.event.sender:
+        logger.warning("Not enough data in message event. Skipping fsm")
+        return None
+
+    return ctx.app.fsm_storage.get_context(ctx.client, ctx.event)
+
+
+Resolver: TypeAlias = Callable[[DiContext], Awaitable[Any]]
+
+DI_MAP: dict[type, Resolver] = {FSMContext: resolve_fsm}
+
+
+class DiResolver:
+    async def resolve(self, annotation: Any, ctx: DiContext) -> None | Any:
+        resolver = DI_MAP.get(annotation)
+
+        if resolver is None:
+            return None
+
+        return await resolver(ctx)

pymax/dispatch/__init__.py

@@ -1,11 +1,14 @@
 from .dispatcher import Dispatcher
 from .enums import EventType
+from .mapping import DispatchEvent
+from .middleware import Middleware, MiddlewareNext
 from .router import (
     ClientRouter,
     DisconnectCallback,
     DisconnectDecorator,
     ErrorContext,
     ErrorScope,
+    HandlerCallback,
     Router,
 )
 
@@ -13,9 +16,13 @@ __all__ = (
     "ClientRouter",
     "DisconnectCallback",
     "DisconnectDecorator",
+    "DispatchEvent",
     "Dispatcher",
     "ErrorContext",
     "ErrorScope",
     "EventType",
+    "HandlerCallback",
+    "Middleware",
+    "MiddlewareNext",
     "Router",
 )