maxapi-python 0.1.3__py3-none-any.whl → 1.1.1__py3-none-any.whl

{maxapi_python-0.1.3.dist-info → maxapi_python-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maxapi-python
-Version: 0.1.3
+Version: 1.1.1
 Summary: Python wrapper для API мессенджера Max
 Project-URL: Homepage, https://github.com/noxzion/PyMax
 Project-URL: Repository, https://github.com/noxzion/PyMax

maxapi_python-1.1.1.dist-info/RECORD

@@ -0,0 +1,28 @@
+pymax/__init__.py,sha256=Wu5eniruWbotDUHBymdAyDNzt4g40r7Lb2pb9usQgjU,939
+pymax/core.py,sha256=cayfz0kmHSLou_i7IQLFRCnNVg48e5BfmPFny7Db8c4,7785
+pymax/crud.py,sha256=Mk-c87GItS91BlJu6INDbw1-ovXyoB2D9rXHK8voxpU,3207
+pymax/exceptions.py,sha256=msS11MD7qZPm0qZ6O8fobTm-GTldm2IA3uQLTX6eDxc,919
+pymax/files.py,sha256=Tpv-43gS7I4Pwlaimb8mZ2B-ZkF3aMsrLYT20NPaqhE,2656
+pymax/filters.py,sha256=EejNuJMmSBhw3bUqDoqXEnCnLjGy_sw5aH3Vynpxc0A,1306
+pymax/interfaces.py,sha256=_D6iMQI74Gdtl6-HMoE1acRFRHeITgOZPVFpt5pvoow,2394
+pymax/models.py,sha256=PsPGbOkERxesZZltjNrmqhOfRcO44Is2ThbEToREcB8,201
+pymax/navigation.py,sha256=16c1_FZrw24uFlP6W5-F8OrEQE73bkQA3HSFqTdBtgo,5725
+pymax/payloads.py,sha256=yeBRxiMq6ixUQjMBBFcBDtBpYzqqfaEII3Z1kJq8pe8,3907
+pymax/static.py,sha256=wwSV1ue5s5buqWz6TvCzjzN2ZWI-wITposTRvcS151g,4738
+pymax/types.py,sha256=SFjCG9GlFtJBDydd6pWtzFbJ6kTADZlxBIbKKRk7E1A,17820
+pymax/utils.py,sha256=F2TdoWfSwDLeh2uIcMIE_GTdXd7hU7gWti2i5P727bA,1364
+pymax/mixins/__init__.py,sha256=-PSMwTVioS-VTy-EGfV-epaKFLy58R4N2b-rX6wJf-M,649
+pymax/mixins/auth.py,sha256=vTNSZ6AunvDIMPQAvgYozpIZaCWMYiMDiabCBI7Sm6c,3079
+pymax/mixins/channel.py,sha256=Stnf63GPtlQnsMPVEC9P0oardEOz50I4DCXN5H5s1SM,823
+pymax/mixins/group.py,sha256=QJCd5MLYCVRrClcuAuRkLV3oylJRAOaGw0xUqFm2uXk,7820
+pymax/mixins/handler.py,sha256=I1iNPaEgpvFnphaxV6liLwVaBCJ8sN6-h7908-_tPFk,2104
+pymax/mixins/message.py,sha256=0y7fO61zg9XG46SKxOPCOLMJW1LJBWfTi-PR3HjJfJo,10249
+pymax/mixins/self.py,sha256=V0gbkY3jfX9fnd7v06n4_s7P3HTPcS1KNPqUzA0vNi8,1169
+pymax/mixins/socket.py,sha256=sgGxX7FmLyO3M82Nu2L-n00dCn0W2fV5TnrCipiKhaE,15738
+pymax/mixins/telemetry.py,sha256=0sQl6kvFVxobLthNAPNS9LzMrwwzZFA1xmOnvfiHWos,3522
+pymax/mixins/user.py,sha256=U-epgvLruTDHBCrLDE0N0iWeOypGE1_SU8cKD3TE90U,3045
+pymax/mixins/websocket.py,sha256=ndgcezJ1xqYCpaxc17rXxiXDQrTwTmtrgvx_d1H2Pcc,10094
+maxapi_python-1.1.1.dist-info/METADATA,sha256=kwB6ryURXiw-Cyf59AUQFyqUEKSSc5RVK34_umD7VYY,5930
+maxapi_python-1.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+maxapi_python-1.1.1.dist-info/licenses/LICENSE,sha256=oe-AGp86WMKawV4KmqF28Q0m-kGAhPfAOPrEUm4MnVw,1064
+maxapi_python-1.1.1.dist-info/RECORD,,

{maxapi_python-0.1.3.dist-info → maxapi_python-1.1.1.dist-info}/licenses/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2025 noxzion
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2025 noxzion
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

pymax/__init__.py

@@ -1,55 +1,57 @@
-"""
-Python wrapper для API мессенджера Max
-"""
-
-from .core import (
-    InvalidPhoneError,
-    MaxClient,
-    WebSocketNotConnectedError,
-)
-from .static import (
-    AccessType,
-    AuthType,
-    ChatType,
-    Constants,
-    DeviceType,
-    ElementType,
-    MessageStatus,
-    MessageType,
-    Opcode,
-)
-from .types import (
-    Channel,
-    Chat,
-    Dialog,
-    Element,
-    Message,
-    User,
-)
-
-__author__ = "noxzion"
-
-__all__ = [
-    # Перечисления и константы
-    "AccessType",
-    "AuthType",
-    # Типы данных
-    "Channel",
-    "Chat",
-    "ChatType",
-    "Constants",
-    "DeviceType",
-    "Dialog",
-    "Element",
-    "ElementType",
-    # Исключения
-    "InvalidPhoneError",
-    # Клиент
-    "MaxClient",
-    "Message",
-    "MessageStatus",
-    "MessageType",
-    "Opcode",
-    "User",
-    "WebSocketNotConnectedError",
-]
+"""
+Python wrapper для API мессенджера Max
+"""
+
+from .core import (
+    InvalidPhoneError,
+    MaxClient,
+    SocketMaxClient,
+    WebSocketNotConnectedError,
+)
+from .static import (
+    AccessType,
+    AuthType,
+    ChatType,
+    Constants,
+    DeviceType,
+    ElementType,
+    MessageStatus,
+    MessageType,
+    Opcode,
+)
+from .types import (
+    Channel,
+    Chat,
+    Dialog,
+    Element,
+    Message,
+    User,
+)
+
+__author__ = "noxzion"
+
+__all__ = [
+    # Перечисления и константы
+    "AccessType",
+    "AuthType",
+    # Типы данных
+    "Channel",
+    "Chat",
+    "ChatType",
+    "Constants",
+    "DeviceType",
+    "Dialog",
+    "Element",
+    "ElementType",
+    # Исключения
+    "InvalidPhoneError",
+    # Клиент
+    "MaxClient",
+    "Message",
+    "MessageStatus",
+    "MessageType",
+    "Opcode",
+    "SocketMaxClient",
+    "User",
+    "WebSocketNotConnectedError",
+]

pymax/core.py

@@ -1,156 +1,193 @@
-import asyncio
-import json
-import logging
-import re
-import time
-from collections.abc import Awaitable, Callable
-from pathlib import Path
-from typing import TYPE_CHECKING, Any
-
-import websockets
-
-from .crud import Database
-from .exceptions import InvalidPhoneError, WebSocketNotConnectedError
-from .mixins import ApiMixin, WebSocketMixin
-from .payloads import (
-    BaseWebSocketMessage,
-    SyncPayload,
-)
-from .static import ChatType, Constants, Opcode
-from .types import Channel, Chat, Dialog, Me, Message, User, override
-
-if TYPE_CHECKING:
-    from .filters import Filter
-
-logger = logging.getLogger(__name__)
-
-
-class MaxClient(ApiMixin, WebSocketMixin):
-    """
-    Основной клиент для работы с WebSocket API сервиса Max.
-
-
-    Args:
-        phone (str): Номер телефона для авторизации.
-        uri (str, optional): URI WebSocket сервера. По умолчанию Constants.WEBSOCKET_URI.value.
-        work_dir (str, optional): Рабочая директория для хранения базы данных. По умолчанию ".".
-        logger (logging.Logger | None): Пользовательский логгер. Если не передан — используется
-            логгер модуля с именем f"{__name__}.MaxClient".
-
-    Raises:
-        InvalidPhoneError: Если формат номера телефона неверный.
-    """
-
-    def __init__(
-        self,
-        phone: str,
-        uri: str = Constants.WEBSOCKET_URI.value,
-        headers: dict[str, Any] | None = Constants.DEFAULT_USER_AGENT.value,
-        token: str | None = None,
-        work_dir: str = ".",
-        logger: logging.Logger | None = None,
-    ) -> None:
-        self.uri: str = uri
-        self.is_connected: bool = False
-        self.phone: str = phone
-        self.chats: list[Chat] = []
-        self.dialogs: list[Dialog] = []
-        self.channels: list[Channel] = []
-        self.me: Me | None = None
-        self._users: dict[int, User] = {}
-        if not self._check_phone():
-            raise InvalidPhoneError(self.phone)
-        self._work_dir: str = work_dir
-        self._database_path: Path = Path(work_dir) / "session.db"
-        self._database_path.parent.mkdir(parents=True, exist_ok=True)
-        self._database_path.touch(exist_ok=True)
-        self._database = Database(self._work_dir)
-        self._ws: websockets.ClientConnection | None = None
-        self._seq: int = 0
-        self._pending: dict[int, asyncio.Future[dict[str, Any]]] = {}
-        self._recv_task: asyncio.Task[Any] | None = None
-        self._incoming: asyncio.Queue[dict[str, Any]] | None = None
-        self._device_id = self._database.get_device_id()
-        self._token = self._database.get_auth_token() or token
-        self.user_agent = headers
-        self._on_message_handlers: list[
-            tuple[Callable[[Message], Any], Filter | None]
-        ] = []
-        self._on_start_handler: Callable[[], Any | Awaitable[Any]] | None = None
-        self._background_tasks: set[asyncio.Task[Any]] = set()
-        self.logger = logger or logging.getLogger(f"{__name__}.MaxClient")
-        self._setup_logger()
-
-        self.logger.debug(
-            "Initialized MaxClient uri=%s work_dir=%s", self.uri, self._work_dir
-        )
-
-    def _setup_logger(self) -> None:
-        self.logger.setLevel(logging.INFO)
-
-        if not logger.handlers:
-            handler = logging.StreamHandler()
-            formatter = logging.Formatter(
-                "%(asctime)s [%(levelname)s] %(name)s: %(message)s"
-            )
-            handler.setFormatter(formatter)
-            logger.addHandler(handler)
-
-    async def close(self) -> None:
-        try:
-            self.logger.info("Closing client")
-            if self._recv_task:
-                self._recv_task.cancel()
-                try:
-                    await self._recv_task
-                except asyncio.CancelledError:
-                    self.logger.debug("recv_task cancelled")
-            if self._ws:
-                await self._ws.close()
-            self.is_connected = False
-            self.logger.info("Client closed")
-        except Exception:
-            self.logger.exception("Error closing client")
-
-    async def start(self) -> None:
-        """
-        Запускает клиент, подключается к WebSocket, авторизует
-        пользователя (если нужно) и запускает фоновый цикл.
-        """
-        try:
-            self.logger.info("Client starting")
-            await self._connect(self.user_agent)
-
-            if self._token and self._database.get_auth_token() is None:
-                self._database.update_auth_token(self._device_id, self._token)
-
-            if self._token is None:
-                await self._login()
-            else:
-                await self._sync()
-
-            if self._on_start_handler:
-                self.logger.debug("Calling on_start handler")
-                result = self._on_start_handler()
-                if asyncio.iscoroutine(result):
-                    await result
-
-            if self._ws:
-                ping_task = asyncio.create_task(self._send_interactive_ping())
-                self._background_tasks.add(ping_task)
-                ping_task.add_done_callback(
-                    lambda t: self._background_tasks.discard(t)
-                    or self._log_task_exception(t)
-                )
-
-                try:
-                    await self._ws.wait_closed()
-                except asyncio.CancelledError:
-                    self.logger.debug("wait_closed cancelled")
-        except Exception:
-            self.logger.exception("Client start failed")
-
-
-class SocketMaxClient:
-    pass  # нокс займись
-    # нет не займусь 
+import asyncio
+import logging
+import socket
+import ssl
+import time
+from collections.abc import Awaitable, Callable
+from pathlib import Path
+from typing import TYPE_CHECKING, Any
+
+from typing_extensions import override
+
+from .crud import Database
+from .exceptions import InvalidPhoneError
+from .mixins import ApiMixin, SocketMixin, WebSocketMixin
+from .static import Constants
+from .types import Channel, Chat, Dialog, Me, Message, User
+
+if TYPE_CHECKING:
+    import websockets
+
+    from .filters import Filter
+
+logger = logging.getLogger(__name__)
+
+
+class MaxClient(ApiMixin, WebSocketMixin):
+    """
+    Основной клиент для работы с WebSocket API сервиса Max.
+
+
+    Args:
+        phone (str): Номер телефона для авторизации.
+        uri (str, optional): URI WebSocket сервера. По умолчанию Constants.WEBSOCKET_URI.value.
+        work_dir (str, optional): Рабочая директория для хранения базы данных. По умолчанию ".".
+        logger (logging.Logger | None): Пользовательский логгер. Если не передан — используется
+            логгер модуля с именем f"{__name__}.MaxClient".
+        headers (dict[str, Any] | None): Заголовки для подключения к WebSocket. По умолчанию
+            Constants.DEFAULT_USER_AGENT.value.
+        token (str | None, optional): Токен авторизации. Если не передан, будет выполнен
+            процесс логина по номеру телефона.
+        host (str, optional): Хост API сервера. По умолчанию Constants.HOST.value.
+        port (int, optional): Порт API сервера. По умолчанию Constants.PORT.value.
+
+    Raises:
+        InvalidPhoneError: Если формат номера телефона неверный.
+    """
+
+    def __init__(
+        self,
+        phone: str,
+        uri: str = Constants.WEBSOCKET_URI.value,
+        headers: dict[str, Any] | None = Constants.DEFAULT_USER_AGENT.value,
+        token: str | None = None,
+        send_fake_telemetry: bool = True,
+        host: str = Constants.HOST.value,
+        port: int = Constants.PORT.value,
+        work_dir: str = ".",
+        logger: logging.Logger | None = None,
+    ) -> None:
+        self.uri: str = uri
+        self.is_connected: bool = False
+        self.phone: str = phone
+        self.chats: list[Chat] = []
+        self.dialogs: list[Dialog] = []
+        self.channels: list[Channel] = []
+        self.me: Me | None = None
+        self._users: dict[int, User] = {}
+        if not self._check_phone():
+            raise InvalidPhoneError(self.phone)
+        self.host: str = host
+        self.port: int = port
+        self._work_dir: str = work_dir
+        self._database_path: Path = Path(work_dir) / "session.db"
+        self._database_path.parent.mkdir(parents=True, exist_ok=True)
+        self._database_path.touch(exist_ok=True)
+        self._database = Database(self._work_dir)
+        self._ws: websockets.ClientConnection | None = None
+        self._seq: int = 0
+        self._pending: dict[int, asyncio.Future[dict[str, Any]]] = {}
+        self._recv_task: asyncio.Task[Any] | None = None
+        self._incoming: asyncio.Queue[dict[str, Any]] | None = None
+        self._device_id = self._database.get_device_id()
+        self._token = self._database.get_auth_token() or token
+        self.user_agent = headers
+
+        self._send_fake_telemetry: bool = send_fake_telemetry
+        self._session_id: int = int(time.time() * 1000)
+        self._action_id: int = 1
+        self._current_screen: str = "chats_list_tab"
+
+        self._on_message_handlers: list[
+            tuple[Callable[[Message], Any], Filter | None]
+        ] = []
+        self._on_start_handler: Callable[[], Any | Awaitable[Any]] | None = None
+        self._background_tasks: set[asyncio.Task[Any]] = set()
+        self._ssl_context = ssl.create_default_context()
+        self._ssl_context.set_ciphers("DEFAULT")
+        self._ssl_context.check_hostname = True
+        self._ssl_context.verify_mode = ssl.CERT_REQUIRED
+        self._ssl_context.minimum_version = ssl.TLSVersion.TLSv1_2
+        self._ssl_context.load_default_certs()
+        self._socket: socket.socket | None = None
+        self.logger = logger or logging.getLogger(f"{__name__}.MaxClient")
+        self._setup_logger()
+
+        self.logger.debug(
+            "Initialized MaxClient uri=%s work_dir=%s", self.uri, self._work_dir
+        )
+
+    def _setup_logger(self) -> None:
+        self.logger.setLevel(logging.INFO)
+
+        if not logger.handlers:
+            handler = logging.StreamHandler()
+            formatter = logging.Formatter(
+                "%(asctime)s [%(levelname)s] %(name)s: %(message)s"
+            )
+            handler.setFormatter(formatter)
+            logger.addHandler(handler)
+
+    async def _wait_forever(self):
+        try:
+            await self.ws.wait_closed()
+        except asyncio.CancelledError:
+            self.logger.debug("wait_closed cancelled")
+
+    async def close(self) -> None:
+        try:
+            self.logger.info("Closing client")
+            if self._recv_task:
+                self._recv_task.cancel()
+                try:
+                    await self._recv_task
+                except asyncio.CancelledError:
+                    self.logger.debug("recv_task cancelled")
+            if self._ws:
+                await self._ws.close()
+            self.is_connected = False
+            self.logger.info("Client closed")
+        except Exception:
+            self.logger.exception("Error closing client")
+
+    async def start(self) -> None:
+        """
+        Запускает клиент, подключается к WebSocket, авторизует
+        пользователя (если нужно) и запускает фоновый цикл.
+        """
+        try:
+            self.logger.info("Client starting")
+            await self._connect(self.user_agent)
+
+            if self._token and self._database.get_auth_token() is None:
+                self._database.update_auth_token(self._device_id, self._token)
+
+            if self._token is None:
+                await self._login()
+            else:
+                await self._sync()
+
+            if self._on_start_handler:
+                self.logger.debug("Calling on_start handler")
+                result = self._on_start_handler()
+                if asyncio.iscoroutine(result):
+                    await result
+
+            ping_task = asyncio.create_task(self._send_interactive_ping())
+            self._background_tasks.add(ping_task)
+            if self._send_fake_telemetry:
+                telemetry_task = asyncio.create_task(self._start())
+                self._background_tasks.add(telemetry_task)
+                telemetry_task.add_done_callback(
+                    lambda t: self._background_tasks.discard(t)
+                    or self._log_task_exception(t)
+                )
+            ping_task.add_done_callback(
+                lambda t: self._background_tasks.discard(t)
+                or self._log_task_exception(t)
+            )
+            await self._wait_forever()
+        except Exception:
+            self.logger.exception("Client start failed")
+
+
+class SocketMaxClient(SocketMixin, MaxClient):
+    @override
+    async def _wait_forever(self):
+        if self._recv_task:
+            try:
+                await self._recv_task
+            except asyncio.CancelledError:
+                self.logger.debug("Socket recv_task cancelled")
+            except Exception as e:
+                self.logger.exception("Socket recv_task failed: %s", e)