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

pymax/infra/self.py

@@ -1,5 +1,7 @@
 from typing import Any
 
+from pymax.api.self import PrivacySettingsUpdate
+from pymax.files import Photo
 from pymax.types import FolderList, FolderUpdate
 
 from .protocol import IClientProtocol
@@ -19,7 +21,7 @@ class SelfMixin(IClientProtocol):
         first_name: str,
         last_name: str | None = None,
         description: str | None = None,
-        photo: Any | None = None,
+        photo: Photo | None = None,
         *,
         photo_token: str | None = None,
     ) -> bool:
@@ -133,3 +135,25 @@ class SelfMixin(IClientProtocol):
             ``True``, если сервер принял запрос на выход.
         """
         return await self._app.api.account.logout()
+
+    def set_presence(self, *, online: bool) -> None:
+        """Устанавливает статус присутствия текущего аккаунта.
+
+        Статус применяется не мгновенно, а при следующем запросе login/ping.
+
+        Args:
+            online: ``True``, если нужно установить статус "в сети", иначе
+                ``False``.
+        """
+        self._app.api.account.set_presence(online)
+
+    async def change_profile_settings(self, settings: PrivacySettingsUpdate) -> bool:
+        """Обновляет настройки приватности текущего аккаунта.
+
+        Args:
+            settings: Объект с новыми настройками приватности.
+
+        Returns:
+            ``True``, если сервер принял запрос.
+        """
+        return await self._app.api.account.change_profile_settings(settings=settings)

pymax/protocol/enums.py

@@ -18,6 +18,7 @@ class Opcode(int, Enum):
     RECONNECT = 3
     LOG = 5
     SESSION_INIT = 6
+    LOGIN2 = 8
     PROFILE = 16
     AUTH_REQUEST = 17
     AUTH = 18
@@ -152,6 +153,18 @@ class Opcode(int, Enum):
     PROFILE_DELETE = 199
     PROFILE_DELETE_TIME = 200
     TRANSCRIBE_MEDIA = 202
+    STORIES_LIST = 208
+    STORIES_LIST_BY_OWNER_ID = 209
+    STORIES_GET_BY_OWNER_ID = 210
+    STORIES_GET_STATS = 211
+    STORIES_GET_DETAILED_STATS = 212
+    STORIES_REACT = 213
+    STORIES_MARK = 214
+    STORIES_SEND = 215
+    NOTIF_STORIES_UPDATE = 216
+    STORIES_EDIT = 217
+    STORIES_DELETE = 218
+    STORIES_GET_BY_STORY_ID = 220
     ORG_INFO = 256
     CHAT_REACTIONS_SETTINGS_SET = 257
     REACTIONS_SETTINGS_GET_BY_CHAT_ID = 258

pymax/protocol/tcp/compression.py

@@ -1,3 +1,8 @@
+from io import BytesIO
+
+import zstandard
+
+
 class Lz4BlockCompression:
     def decompress(self, src: bytes, max_output: int = 5 * 1024 * 1024) -> bytes:
         dst = bytearray()
@@ -95,3 +100,16 @@ class Lz4BlockCompression:
                 dst.extend(src[lit_start : lit_start + lit_len])
 
         return bytes(dst)
+
+
+class ZstdCompression:
+    def decompress(self, src: bytes, max_output: int = 5 * 1024 * 1024) -> bytes:
+        try:
+            with zstandard.ZstdDecompressor().stream_reader(BytesIO(src)) as reader:
+                result = reader.read(max_output + 1)
+        except zstandard.ZstdError as e:
+            raise ValueError("Zstd: failed to decompress payload") from e
+
+        if len(result) > max_output:
+            raise ValueError("Zstd: output too large")
+        return result

pymax/protocol/tcp/payload.py

@@ -5,12 +5,14 @@ import msgpack
 
 from pymax.logging import get_logger
 
-from .compression import Lz4BlockCompression
+from .compression import Lz4BlockCompression, ZstdCompression
 
 logger = get_logger(__name__)
 
 
 class MsgpackPayloadCodec:
+    WRAPPED_VALUE_EXT_CODE = 1
+
     def _to_msgpack_value(self, value: Any) -> Any:
         if isinstance(value, Enum):
             return value.value
@@ -30,10 +32,25 @@ class MsgpackPayloadCodec:
     def _unpack_stream(
         self, payload_bytes: bytes, *, raw: bool
     ) -> list[Any]:  # TODO: deprecate? idk
-        unpacker = msgpack.Unpacker(raw=raw, strict_map_key=False)
+        unpacker = msgpack.Unpacker(
+            raw=raw,
+            strict_map_key=False,
+            ext_hook=self._decode_ext,
+        )
         unpacker.feed(payload_bytes)
         return list(unpacker)
 
+    def _decode_ext(self, code: int, data: bytes) -> Any:
+        if code != self.WRAPPED_VALUE_EXT_CODE:
+            return msgpack.ExtType(code, data)
+
+        return msgpack.unpackb(
+            data,
+            raw=False,
+            strict_map_key=False,
+            ext_hook=self._decode_ext,
+        )
+
     def decode(self, payload_bytes: bytes) -> Any:
         if not payload_bytes:
             return {}
@@ -43,6 +60,7 @@ class MsgpackPayloadCodec:
                 payload_bytes,
                 raw=False,
                 strict_map_key=False,
+                ext_hook=self._decode_ext,
             )
 
         except msgpack.exceptions.ExtraData as e:
@@ -70,15 +88,19 @@ class TcpPayloadDecoder:
         *,
         serializer: MsgpackPayloadCodec,
         compression: Lz4BlockCompression | None = None,
+        zstd_compression: ZstdCompression | None = None,
     ) -> None:
         self.serializer = serializer
         self.compression = compression
+        self.zstd_compression = zstd_compression
 
     def _normalize_keys(self, obj: Any) -> Any:
         if isinstance(obj, dict):
             return {self._normalize_key(k): self._normalize_keys(v) for k, v in obj.items()}
         if isinstance(obj, list):
             return [self._normalize_keys(item) for item in obj]
+        if isinstance(obj, msgpack.ExtType):
+            return obj
         if isinstance(obj, tuple):
             return tuple(self._normalize_keys(item) for item in obj)
         return obj
@@ -97,12 +119,26 @@ class TcpPayloadDecoder:
         if not payload_bytes:
             return {}
 
-        if flags & 0x03 and self.compression:
+        if flags == 0xFF:
+            if self.zstd_compression is None:
+                raise ValueError("Zstd-compressed TCP payload without a decoder")
+            try:
+                payload_bytes = self.zstd_compression.decompress(payload_bytes)
+                logger.debug("tcp payload decompressed with Zstd")
+            except ValueError:
+                logger.debug("tcp Zstd payload decompression failed", exc_info=True)
+                raise
+        elif flags > 0x7F:
+            raise ValueError(f"invalid TCP compression factor: {flags}")
+        elif flags > 0:
+            if self.compression is None:
+                raise ValueError("LZ4-compressed TCP payload without a decoder")
             try:
                 payload_bytes = self.compression.decompress(payload_bytes)
-                logger.debug("tcp payload decompressed flags=%s", flags)
+                logger.debug("tcp payload decompressed cof=%s", flags)
             except ValueError:
-                logger.debug("tcp payload decompress skipped flags=%s", flags)
+                logger.debug("tcp payload decompression failed cof=%s", flags, exc_info=True)
+                raise
 
         result = self.serializer.decode(payload_bytes)
         return self._normalize_keys(result)

pymax/protocol/tcp/protocol.py

@@ -7,6 +7,7 @@ from .payload import (
     Lz4BlockCompression,
     MsgpackPayloadCodec,
     TcpPayloadDecoder,
+    ZstdCompression,
 )
 
 logger = get_logger(__name__)
@@ -20,8 +21,11 @@ class TcpProtocol(BaseProtocol):
         self.framer = TcpPacketFramer()
         self.serializer = MsgpackPayloadCodec()
         self.compression = Lz4BlockCompression()
+        self.zstd_compression = ZstdCompression()
         self.payload_decoder = TcpPayloadDecoder(
-            serializer=self.serializer, compression=self.compression
+            serializer=self.serializer,
+            compression=self.compression,
+            zstd_compression=self.zstd_compression,
         )
 
     def encode(self, frame: OutboundFrame) -> bytes:

pymax/transport/tcp.py

@@ -7,6 +7,7 @@ from pymax.logging import get_logger
 from .base import Transport
 
 logger = get_logger(__name__)
+_CLOSE_TIMEOUT = 5.0
 
 
 class TCPTransport(Transport):
@@ -66,7 +67,11 @@ class TCPTransport(Transport):
         if writer:
             logger.debug("tcp close")
             writer.close()
-            await writer.wait_closed()
+            try:
+                await asyncio.wait_for(writer.wait_closed(), _CLOSE_TIMEOUT)
+            except (OSError, TimeoutError) as e:
+                logger.warning("tcp close did not finish cleanly: %s", e)
+                writer.transport.abort()
             logger.debug("tcp closed")
 
     async def send(self, data: bytes | str) -> None:

pymax/transport/websocket.py

@@ -17,11 +17,14 @@ class WebSocketTransport(Transport):
     async def connect(self) -> None:
         if self.proxy:
             self.ws = await client.connect(
-                self.url, origin=Origin("https://web.max.ru"), proxy=self.proxy
+                self.url,
+                origin=Origin("https://web.max.ru"),
+                proxy=self.proxy,
+                max_size=1024 * 1024 * 10,  # 10 MB
             )
         else:
             self.ws = await client.connect(
-                self.url, origin=Origin("https://web.max.ru")
+                self.url, origin=Origin("https://web.max.ru"), max_size=1024 * 1024 * 10
             )  # TODO: origin should be configurable
 
     async def close(self) -> None:
@@ -41,7 +44,7 @@ class WebSocketTransport(Transport):
         if self.ws is None or not self.connected:
             raise ConnectionError("Not connected to the server")
 
-        return await self.ws.recv(decode=True)
+        return await self.ws.recv(decode=False)
 
     @property
     def connected(self) -> bool:

pymax/types/domain/__init__.py

@@ -3,7 +3,8 @@ from .bots import InitData
 from .chat import Chat
 from .error import MaxApiError
 from .folder import Folder, FolderList, FolderUpdate
-from .login import LoginResponse
+from .handshake import HandshakeResponse
+from .login import Login2Flags, Login2Response, LoginResponse
 from .member import Member
 from .message import Message, ReactionCounter, ReactionInfo, ReadState
 from .name import Name

pymax/types/domain/attachments/__init__.py

@@ -2,10 +2,11 @@ from .audio import AudioAttachment
 from .call import CallAttachment
 from .contact import ContactAttachment
 from .control import ControlAttachment
-from .enums import AttachmentType
+from .enums import AttachmentType, PollFlags
 from .file import FileAttachment, FileRequest
 from .keyboards import InlineKeyboardAttachment
 from .photo import PhotoAttachment
+from .poll import Poll, PollAnswer, PollAttachment, PollState
 from .share import ShareAttachment
 from .sticker import StickerAttachment
 from .unknown import UnknownAttachment

pymax/types/domain/attachments/enums.py

@@ -1,4 +1,4 @@
-from enum import Enum
+from enum import Enum, IntFlag
 
 
 class AttachmentType(str, Enum):
@@ -14,6 +14,7 @@ class AttachmentType(str, Enum):
     CALL = "CALL"
     SHARE = "SHARE"
     INLINE_KEYBOARD = "INLINE_KEYBOARD"
+    POLL = "POLL"
     UNKNOWN = "UNKNOWN"
 
 
@@ -26,3 +27,18 @@ class TranscriptionStatus(str, Enum):
     PROCESSING = "PROCESSING"
     SUCCESS = "SUCCESS"
     UNKNOWN = "UNKNOWN"
+
+
+class PollFlags(IntFlag):
+    """Настройки опроса, представленные битовой маской.
+
+    Несколько настроек объединяются оператором ``|``. Числовые значения,
+    полученные от Max, автоматически преобразуются в ``PollFlags``.
+    """
+
+    FLAG_SETTINGS_ANONYMOUS = 1
+    FLAG_SETTINGS_MULTISELECT = 2
+    FLAG_SETTINGS_REVOTE = 4
+    FLAG_SETTINGS_CLOSED = 8
+    FLAG_SETTINGS_QUIZ = 16
+    FLAG_SETTINGS_CAN_FORWARD = 32

pymax/types/domain/attachments/poll.py

@@ -0,0 +1,111 @@
+from typing import Literal
+
+from pydantic import Field
+
+from pymax.types.domain.base import CamelModel
+
+from .enums import AttachmentType, PollFlags
+
+
+class PollAnswer(CamelModel):
+    """Вариант ответа в опросе.
+
+    :ivar text: Текст варианта ответа.
+    :vartype text: str
+    :ivar answer_id: ID варианта, назначенный Max.
+    :vartype answer_id: int | None
+    """
+
+    text: str
+    answer_id: int | None = None
+
+
+class PollVote(CamelModel):
+    """Голос пользователя за один вариант ответа.
+
+    :ivar timestamp: Время голосования в формате Unix time.
+    :vartype timestamp: int
+    :ivar user_id: ID проголосовавшего пользователя.
+    :vartype user_id: int
+    """
+
+    timestamp: int
+    user_id: int
+
+
+class PollResult(CamelModel):
+    """Результат голосования по одному варианту ответа.
+
+    :ivar answer_id: ID варианта ответа.
+    :vartype answer_id: int
+    :ivar vote_count: Количество голосов.
+    :vartype vote_count: int
+    :ivar votes: Голоса пользователей, доступные текущему аккаунту.
+    :vartype votes: list[PollVote]
+    :ivar rate: Доля голосов в формате, возвращаемом Max.
+    :vartype rate: int
+    :ivar options: Дополнительные параметры результата от Max.
+    :vartype options: int
+    """
+
+    answer_id: int
+    vote_count: int
+    votes: list[PollVote]
+    rate: int
+    options: int
+
+
+class PollState(CamelModel):
+    """Текущее состояние голосования.
+
+    :ivar total: Общее количество голосов.
+    :vartype total: int
+    :ivar result: Результаты по вариантам ответа.
+    :vartype result: list[PollResult] | None
+    :ivar voter_preview_ids: ID пользователей для предпросмотра списка
+        проголосовавших.
+    :vartype voter_preview_ids: list[int]
+    """
+
+    total: int = 0
+    result: list[PollResult] | None = None
+    voter_preview_ids: list[int]
+
+
+class Poll(CamelModel):
+    """Опрос для отправки в сообщении.
+
+    :ivar title: Вопрос или заголовок опроса.
+    :vartype title: str
+    :ivar answers: Варианты ответа.
+    :vartype answers: list[PollAnswer]
+    :ivar settings: Настройки опроса. Несколько ``PollFlags`` объединяются
+        оператором ``|``.
+    :vartype settings: PollFlags
+    :ivar type: Тип вложения.
+    :vartype type: Literal[AttachmentType.POLL]
+    """
+
+    title: str
+    answers: list[PollAnswer]
+    settings: PollFlags
+    type: Literal[AttachmentType.POLL] = Field(alias="_type", default=AttachmentType.POLL)
+
+
+class PollAttachment(Poll):
+    """Опрос, полученный как вложение сообщения.
+
+    Помимо параметров опроса содержит назначенный Max ID, версию и текущее
+    состояние голосования.
+
+    :ivar poll_id: ID опроса.
+    :vartype poll_id: int
+    :ivar version: Версия данных опроса.
+    :vartype version: int
+    :ivar state: Текущее состояние голосования.
+    :vartype state: PollState
+    """
+
+    poll_id: int
+    version: int
+    state: PollState

pymax/types/domain/attachments/sticker.py

@@ -42,7 +42,7 @@ class StickerAttachment(CamelModel):
     sticker_id: int
     tags: list[str] | None = None
     width: int
-    set_id: int
+    set_id: int | None = None
     time: int
     sticker_type: str
     audio: bool

pymax/types/domain/attachments/video.py

@@ -62,18 +62,18 @@ class VideoRequest(CamelModel):
     :vartype external: str | bool | None
     :ivar cache: Использовать ли кеш.
     :vartype cache: bool
-    :ivar url: URL видео.
-    :vartype url: str
+    :ivar url: Прямой URL видео или ``None`` для внешнего видео.
+    :vartype url: str | None
     """
 
     external: str | bool | None = Field(default=None, alias="EXTERNAL")
-    cache: bool
-    url: str
+    cache: bool = False  # TODO: idk maybe | None = None better
+    url: str | None = None
 
     @model_validator(mode="before")
     @classmethod
-    def unwrap_dynamic_url(cls, value: Any) -> Any:
-        """Нормализует динамический ключ URL в поле ``url``.
+    def select_video_url(cls, value: Any) -> Any:
+        """Выбирает прямой URL с максимальным доступным MP4-качеством.
 
         :param value: Значение, переданное в валидатор модели.
         :type value: Any
@@ -83,8 +83,29 @@ class VideoRequest(CamelModel):
         if not isinstance(value, dict) or "url" in value:
             return value
 
+        mp4_urls: list[tuple[int, str]] = []
         for key, url in value.items():
-            if key not in ("EXTERNAL", "cache"):
-                return {**value, "url": url}
+            if not isinstance(key, str) or not isinstance(url, str):
+                continue
+
+            normalized_key = key.upper()
+            if not normalized_key.startswith("MP4_"):
+                continue
+
+            try:
+                quality = int(normalized_key.removeprefix("MP4_"))
+            except ValueError:
+                continue
+
+            if quality > 0:
+                mp4_urls.append((quality, url))
+
+        if mp4_urls:
+            _, url = max(mp4_urls, key=lambda item: item[0])
+            return {**value, "url": url}
+
+        legacy_url = value.get("dynamicUrl", value.get("dynamic_url"))
+        if isinstance(legacy_url, str):
+            return {**value, "url": legacy_url}
 
         return value

pymax/types/domain/chat.py

@@ -156,25 +156,24 @@ class Chat(CamelModel):
 
     async def answer(
         self,
-        text: str,
+        text: str | None = None,
         reply_to: int | None = None,
         attachments: SendAttachments = None,
         *,
         notify: bool = True,
-    ) -> Message | None:
+    ) -> Message:
         """Отправляет сообщение в этот чат.
 
         :param text: Текст сообщения.
-        :type text: str
+        :type text: str | None
         :param reply_to: ID сообщения для ответа.
         :type reply_to: int | None
         :param attachments: Файлы, фотографии или видео для отправки.
         :type attachments: SendAttachments
         :param notify: Отправить ли получателям push-уведомление.
         :type notify: bool
-        :returns: Отправленное сообщение или ``None``, если сервер не вернул
-            его.
-        :rtype: Message | None
+        :returns: Отправленное сообщение.
+        :rtype: Message
         :raises RuntimeError: Если чат не привязан к клиенту.
         """
         actions, _ = self._bound()
@@ -198,7 +197,7 @@ class Chat(CamelModel):
         get_chat: bool = False,
         get_messages: bool = True,
         interactive: bool = False,
-    ) -> list[Message] | None:
+    ) -> list[Message]:
         """Загружает историю сообщений этого чата.
 
         ``from_time``, ``backward_time`` и ``forward_time`` передаются в
@@ -224,8 +223,9 @@ class Chat(CamelModel):
         :type get_messages: bool
         :param interactive: Пометить запрос как интерактивный.
         :type interactive: bool
-        :returns: Сообщения или ``None``, если сервер не вернул список.
-        :rtype: list[Message] | None
+        :returns: Список сообщений. Если сервер не вернул сообщения, список
+            пуст.
+        :rtype: list[Message]
         :raises RuntimeError: Если чат не привязан к клиенту.
         """
         actions, _ = self._bound()

pymax/types/domain/handshake.py

@@ -0,0 +1,16 @@
+from pydantic import Field
+
+from .base import CamelModel
+
+
+class HandshakeResponse(CamelModel):
+    """Результат рукопожатия.
+
+    :ivar calls_seed: Сид для генерации хэшей вызовов.
+    :vartype calls_seed: int
+    """
+
+    calls_seed: int | None = None
+    app_update_type: int | None = Field(
+        alias="app-update-type", default=None
+    )  # very bizarre casing

pymax/types/domain/login.py

@@ -13,14 +13,26 @@ class LoginConfig(CamelModel):
     hash: ConfigHash | None = None
 
 
+class Login2Flags(CamelModel):
+    config_enabled: bool = False
+    contact_enabled: bool = False
+    profile_enabled: bool = False
+
+    @property
+    def enabled(self) -> bool:
+        return self.config_enabled or self.contact_enabled or self.profile_enabled
+
+
 class LoginResponse(CamelModel):
     chats: list[Chat] = Field(default_factory=list)
-    profile: Profile
+    profile: Profile | None = None
     messages: dict[int, list[Message]] = Field(default_factory=dict)  # chat_id -> [message]
     contacts: list[User | None] = Field(default_factory=list)
     token: str | None = None
     time: int | None = None
     config: LoginConfig | None = None
+    updates: int | None = None
+    login2_flags: Login2Flags | None = None
 
     def update_sync_state(self, current: SyncState) -> SyncState:
         sync_time = self.time
@@ -33,3 +45,20 @@ class LoginResponse(CamelModel):
             presence_sync=(sync_time if sync_time is not None else current.presence_sync),
             config_hash=(config_hash if config_hash is not None else current.config_hash),
         )
+
+
+class Login2Response(CamelModel):
+    profile: Profile | None = None
+    contacts: list[User | None] = Field(default_factory=list, alias="contactInfos")
+    config: LoginConfig | None = None
+
+    def update_sync_state(self, current: SyncState) -> SyncState:
+        config_hash = self.config.hash if self.config is not None else None
+
+        return SyncState(
+            chats_sync=current.chats_sync,
+            contacts_sync=current.contacts_sync,
+            drafts_sync=current.drafts_sync,
+            presence_sync=current.presence_sync,
+            config_hash=(config_hash if config_hash is not None else current.config_hash),
+        )