maxapi-python 1.2.3__py3-none-any.whl → 1.2.5__py3-none-any.whl

{maxapi_python-1.2.3.dist-info → maxapi_python-1.2.5.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: maxapi-python
-Version: 1.2.3
+Version: 1.2.5
 Summary: Python wrapper для API мессенджера Max
-Project-URL: Homepage, https://github.com/ink-developer/PyMax
-Project-URL: Repository, https://github.com/ink-developer/PyMax
-Project-URL: Issues, https://github.com/ink-developer/PyMax/issues
+Project-URL: Homepage, https://github.com/MaxApiTeam/PyMax
+Project-URL: Repository, https://github.com/MaxApiTeam/PyMax
+Project-URL: Issues, https://github.com/MaxApiTeam/PyMax/issues
 Author-email: ink <mail@gmail.com>
 License-Expression: MIT
 License-File: LICENSE
@@ -18,6 +18,7 @@ Requires-Dist: lz4>=4.4.4
 Requires-Dist: msgpack>=1.1.1
 Requires-Dist: qrcode>=8.2
 Requires-Dist: sqlmodel>=0.0.24
+Requires-Dist: ua-generator>=2.0.19
 Requires-Dist: websockets>=15.0
 Provides-Extra: test
 Requires-Dist: flake8; extra == 'test'
@@ -36,6 +37,7 @@ Description-Content-Type: text/markdown
     <strong>Python wrapper для API мессенджера Max</strong>
 </p>
 
+
 <p align="center">
     <img src="https://img.shields.io/badge/python-3.10+-3776AB.svg" alt="Python 3.11+">
     <img src="https://img.shields.io/badge/License-MIT-2f9872.svg" alt="License: MIT">
@@ -92,12 +94,12 @@ uv add -U maxapi-python
 **Вход по номеру телефона (DESKTOP):**
 
 ```python
-from pymax import MaxClient
+from pymax import SocketMaxClient
 from pymax.payloads import UserAgentPayload
 
 ua = UserAgentPayload(device_type="DESKTOP", app_version="25.12.13")
 
-client = MaxClient(
+client = SocketMaxClient(
     phone="+79111111111",
     work_dir="cache",
     headers=ua,
@@ -195,6 +197,6 @@ if __name__ == "__main__":
 
 Спасибо всем за помощь в разработке!
 
-<a href="https://github.com/ink-developer/PyMax/graphs/contributors">
+<a href="https://github.com/MaxApiTeam/PyMax/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=ink-developer/PyMax" />
 </a>

maxapi_python-1.2.5.dist-info/RECORD

@@ -0,0 +1,33 @@
+pymax/__init__.py,sha256=6wUKKwsyxFpWG3b7kwptOvHd-w78C-ygw42iCDBYQvc,1915
+pymax/core.py,sha256=rJKUFlFjdCPywkOP5-lFUwIMnxNHk4oJLf1VYfEhqak,16137
+pymax/crud.py,sha256=YC92TyhA2mr1tJCcfd-tvh8umtXKgqJfgiLo7nXUl3Q,3076
+pymax/exceptions.py,sha256=nDUNx7bM-Yjugj-qfIllcrnwLg9JpZroYqfXapjYbMQ,3178
+pymax/files.py,sha256=nx7oZfIJ8ZvO-TuG5LzSmk8esbBtNrkKdFQgTQVbUA8,4063
+pymax/filters.py,sha256=gSHPJ1Vi37HKPxf0jRRv9Q3iGwhiQjw1MGrCaouqHzs,4325
+pymax/formatter.py,sha256=RJ_5VbY7Li8UM3xL1AvcXo8v1iYnY8GvDDkreaFqtnY,860
+pymax/formatting.py,sha256=XRtuXJGweuNZevJFdPxksDftIrfuMGEA-AOUc_v6IhQ,2484
+pymax/interfaces.py,sha256=GXHi4TjmXPb60KtLXe7CduQ8hSIVHXhA5Ak1OcvSS2w,19793
+pymax/models.py,sha256=PsPGbOkERxesZZltjNrmqhOfRcO44Is2ThbEToREcB8,201
+pymax/navigation.py,sha256=4ia6RGY2pXMArboNhHkbWlWX7LtcYK1VGVXorPX0Pb4,5747
+pymax/payloads.py,sha256=-hUgJYwCFfWFcWedAGYg1v82NliEfoTEteEEI7sgUEQ,8756
+pymax/protocols.py,sha256=PoNvri9jFH6WBXGwugrkU6lwtwJEw0DO2s13HOH8_KI,4025
+pymax/types.py,sha256=z1HXNl8CP_X3jTUlENlF9_vzZKdb7gF5PHG5d4rG3BY,37209
+pymax/utils.py,sha256=HK6E6UYyjtUoJ2KXWeDycyiXm_9j5shZme6VFA2ixeM,2960
+pymax/mixins/__init__.py,sha256=5sXJME34S1EssuDETaN4DLRH7vhMw_Q3Jmay9myAIZM,775
+pymax/mixins/auth.py,sha256=f6IH_gvwB8hLvj7hNI21vgVhR1kju7ABRNjcRS656_o,22843
+pymax/mixins/channel.py,sha256=Qi5ujw5X7QYx4Lq1XnvlJ3BYjmTFmYDfu7_jRcx4Mx8,5335
+pymax/mixins/group.py,sha256=6bsWSx0ULZonDM_dJSC0EkqpZWd6tv9lmmKWj_gEaaw,15903
+pymax/mixins/handler.py,sha256=duL3Q5Bvv8tjUhOKaDr_k7w09BeCwjVdws2ga7v_zNE,12432
+pymax/mixins/message.py,sha256=MpUED92iWONkJRjb0f7lwPj9gYJhDuv0KKzbveOEaAk,33397
+pymax/mixins/scheduler.py,sha256=K4HB9IfksnXPujJnkipIS5um9nuzC8EjbtQn65RtbfI,963
+pymax/mixins/self.py,sha256=Wn9l3zDF5VzFzzisryOQknf3Ngl81Q98_9jqqbE9ZAw,9174
+pymax/mixins/socket.py,sha256=0WCK9FDzkfgRpKeTfCB9GwuNkccww3RTI7P-W8_409c,10904
+pymax/mixins/telemetry.py,sha256=9gbzEXTp9W9BLJ1wJVXOaHU7Q4inL981b-xq93xJyrw,3913
+pymax/mixins/user.py,sha256=Xwb2fWM8RCq0SbVhlRyr1RBQGyjlaImtp0lT2PbgEqE,9420
+pymax/mixins/websocket.py,sha256=CvrfMv0iNYpPtfwZXKm0V-ZOlSohtXZ7QH5fDET5Pec,5223
+pymax/static/constant.py,sha256=hZby1gZmzWTzDgwW_EX1NGgqwdQxwcjl7pOE0thfxT0,2304
+pymax/static/enum.py,sha256=YWNzDfPqSBBT8w9m3XesedjiTETn1juJn5UEOZ3zMe0,5477
+maxapi_python-1.2.5.dist-info/METADATA,sha256=BbvzqfDdavSaBRJSDJ0DqxV_f5Nrzs-2-V0LXMlV52o,6790
+maxapi_python-1.2.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+maxapi_python-1.2.5.dist-info/licenses/LICENSE,sha256=hOR249ItqMdcly1A0amqEWRNRTq4Gv5NJtmQ3A5qK4E,1070
+maxapi_python-1.2.5.dist-info/RECORD,,

pymax/core.py

@@ -17,15 +17,12 @@ from .crud import Database
 from .exceptions import (
     InvalidPhoneError,
     SocketNotConnectedError,
+    WebSocketNotConnectedError,
 )
 from .interfaces import BaseClient
 from .mixins import ApiMixin, SocketMixin, WebSocketMixin
 from .payloads import UserAgentPayload
-from .static.constant import (
-    HOST,
-    PORT,
-    WEBSOCKET_URI,
-)
+from .static.constant import HOST, PORT, SESSION_STORAGE_DB, WEBSOCKET_URI
 
 if TYPE_CHECKING:
     from collections.abc import Callable
@@ -34,7 +31,6 @@ if TYPE_CHECKING:
 
     from pymax.filters import BaseFilter
 
-    from .filters import Filters
     from .types import Channel, Chat, Dialog, Me, Message, ReactionInfo, User
 
 
@@ -42,6 +38,7 @@ logger = logging.getLogger(__name__)
 
 
 class MaxClient(ApiMixin, WebSocketMixin, BaseClient):
+    allowed_device_types: set[str] = {"WEB"}
     """
     Основной клиент для работы с WebSocket API сервиса Max.
 
@@ -49,6 +46,8 @@ class MaxClient(ApiMixin, WebSocketMixin, BaseClient):
     :type phone: str
     :param uri: URI WebSocket сервера.
     :type uri: str, optional
+    :param session_name: Название сессии для хранения базы данных.
+    :type session_name: str, optional
     :param work_dir: Рабочая директория для хранения базы данных.
     :type work_dir: str, optional
     :param logger: Пользовательский логгер. Если не передан, используется логгер модуля с именем f"{__name__}.MaxClient".
@@ -81,7 +80,8 @@ class MaxClient(ApiMixin, WebSocketMixin, BaseClient):
         self,
         phone: str,
         uri: str = WEBSOCKET_URI,
-        headers: UserAgentPayload = UserAgentPayload(),
+        session_name: str = SESSION_STORAGE_DB,
+        headers: UserAgentPayload | None = None,
         token: str | None = None,
         send_fake_telemetry: bool = True,
         host: str = HOST,
@@ -120,7 +120,7 @@ class MaxClient(ApiMixin, WebSocketMixin, BaseClient):
         self._users: dict[int, User] = {}
 
         self._work_dir: str = work_dir
-        self._database_path: Path = Path(work_dir) / "session.db"
+        self._database_path: Path = Path(work_dir) / session_name
         self._database_path.parent.mkdir(parents=True, exist_ok=True)
         self._database_path.touch(exist_ok=True)
         self._database = Database(self._work_dir)
@@ -132,6 +132,7 @@ class MaxClient(ApiMixin, WebSocketMixin, BaseClient):
         self._pending: dict[int, asyncio.Future[dict[str, Any]]] = {}
         self._file_upload_waiters: dict[int, asyncio.Future[dict[str, Any]]] = {}
         self._background_tasks: set[asyncio.Task[Any]] = set()
+        self._stop_event = asyncio.Event()
 
         self._seq: int = 0
         self._error_count: int = 0
@@ -142,7 +143,10 @@ class MaxClient(ApiMixin, WebSocketMixin, BaseClient):
         self._file_upload_waiters: dict[int, asyncio.Future[dict[str, Any]]] = {}
 
         self._token = self._database.get_auth_token() or token
+        if headers is None:
+            headers = self._default_headers()
         self.user_agent = headers
+        self._validate_device_type()
         self._send_fake_telemetry: bool = send_fake_telemetry
         self._session_id: int = int(time.time() * 1000)
         self._action_id: int = 1
@@ -180,11 +184,24 @@ class MaxClient(ApiMixin, WebSocketMixin, BaseClient):
             self._work_dir,
         )
 
+    @staticmethod
+    def _default_headers() -> UserAgentPayload:
+        return UserAgentPayload(device_type="WEB")
+
+    def _validate_device_type(self) -> None:
+        if self.user_agent.device_type not in self.allowed_device_types:
+            raise ValueError(
+                f"{self.__class__.__name__} does not support "
+                f"device_type={self.user_agent.device_type}"
+            )
+
     async def _wait_forever(self) -> None:
         try:
             await self.ws.wait_closed()
         except asyncio.CancelledError:
             self.logger.debug("wait_closed cancelled")
+        except WebSocketNotConnectedError:
+            self.logger.info("WebSocket not connected, exiting wait_forever")
 
     async def close(self) -> None:
         """
@@ -194,22 +211,7 @@ class MaxClient(ApiMixin, WebSocketMixin, BaseClient):
         """
         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._outgoing_task:
-                self._outgoing_task.cancel()
-                try:
-                    await self._outgoing_task
-                except asyncio.CancelledError:
-                    self.logger.debug("outgoing_task cancelled")
-            if self._ws:
-                await self._ws.close()
-            self.is_connected = False
-            self.logger.info("Client closed")
+            self._stop_event.set()
         except Exception:
             self.logger.exception("Error closing client")
 
@@ -250,7 +252,15 @@ class MaxClient(ApiMixin, WebSocketMixin, BaseClient):
         :rtype: None
         """
         resp = await self._send_code(code, temp_token)
-        token = resp.get("tokenAttrs", {}).get("LOGIN", {}).get("token")
+
+        login_attrs = resp.get("tokenAttrs", {}).get("LOGIN", {})
+        password_challenge = resp.get("passwordChallenge")
+
+        if password_challenge and not login_attrs:
+            token = await self._two_factor_auth(password_challenge)
+        else:
+            token = login_attrs.get("token")
+
         if not token:
             raise ValueError("Login response did not contain tokenAttrs.LOGIN.token")
         self._token = token
@@ -279,10 +289,9 @@ class MaxClient(ApiMixin, WebSocketMixin, BaseClient):
         :return: None
         :rtype: None
         """
-
-        while True:
+        self.logger.info("Client starting")
+        while not self._stop_event.is_set():
             try:
-                self.logger.info("Client starting")
                 await self.connect(self.user_agent)
 
                 if self.registration:
@@ -297,29 +306,45 @@ class MaxClient(ApiMixin, WebSocketMixin, BaseClient):
                     await self._login()
 
                 await self._sync(self.user_agent)
-
                 await self._post_login_tasks(sync=False)
 
-                await self._wait_forever()
-                self.logger.info("WebSocket closed (wait_forever exited)")
+                wait_task = asyncio.create_task(self._wait_forever())
+                stop_task = asyncio.create_task(self._stop_event.wait())
+
+                done, pending = await asyncio.wait(
+                    [wait_task, stop_task], return_when=asyncio.FIRST_COMPLETED
+                )
+
+                for task in pending:
+                    task.cancel()
+                    with contextlib.suppress(asyncio.CancelledError):
+                        await task
+
+            except asyncio.CancelledError:
+                self.logger.info("Client task cancelled, stopping")
+                break
             except Exception as e:
                 self.logger.exception("Client start iteration failed")
-                raise e
-
             finally:
-                self.logger.debug("Cleaning up background tasks and pending futures")
-
                 await self._cleanup_client()
 
-            if not self.reconnect:
-                self.logger.info("Reconnect disabled — exiting start()")
-                return
+            if not self.reconnect or self._stop_event.is_set():
+                self.logger.info("Reconnect disabled or stop requested — exiting start()")
+                break
 
             self.logger.info("Reconnect enabled — restarting client")
             await asyncio.sleep(self.reconnect_delay)
 
+        self.logger.info("Client exited cleanly")
+
 
 class SocketMaxClient(SocketMixin, MaxClient):
+    allowed_device_types = {"ANDROID", "IOS", "DESKTOP"}
+
+    @staticmethod
+    def _default_headers() -> UserAgentPayload:
+        return UserAgentPayload(device_type="DESKTOP")
+
     @override
     async def _wait_forever(self):
         if self._recv_task:

pymax/files.py

@@ -9,7 +9,10 @@ from typing_extensions import override
 
 
 class BaseFile(ABC):
-    def __init__(self, url: str | None = None, path: str | None = None) -> None:
+    def __init__(
+        self, raw: bytes | None = None, *, url: str | None = None, path: str | None = None
+    ) -> None:
+        self.raw = raw
         self.url = url
         self.path = path
 
@@ -21,6 +24,9 @@ class BaseFile(ABC):
 
     @abstractmethod
     async def read(self) -> bytes:
+        if self.raw is not None:
+            return self.raw
+
         if self.url:
             async with (
                 ClientSession() as session,
@@ -45,13 +51,24 @@ class Photo(BaseFile):
         ".bmp",
     }  # FIXME: костыль ✅
 
-    def __init__(self, url: str | None = None, path: str | None = None) -> None:
+    def __init__(
+        self,
+        raw: bytes | None = None,
+        *,
+        url: str | None = None,
+        path: str | None = None,
+        name: str | None = None,
+    ) -> None:
         if path:
             self.file_name = Path(path).name
         elif url:
             self.file_name = Path(url).name
+        elif name:
+            self.file_name = name
+        else:
+            self.file_name = ""
 
-        super().__init__(url, path)
+        super().__init__(raw=raw, url=url, path=path)
 
     def validate_photo(self) -> tuple[str, str] | None:
         if self.path:
@@ -83,7 +100,9 @@ class Photo(BaseFile):
 
 
 class Video(BaseFile):
-    def __init__(self, url: str | None = None, path: str | None = None) -> None:
+    def __init__(
+        self, raw: bytes | None = None, *, url: str | None = None, path: str | None = None
+    ) -> None:
         self.file_name: str = ""
         if path:
             self.file_name = Path(path).name
@@ -92,7 +111,7 @@ class Video(BaseFile):
 
         if not self.file_name:
             raise ValueError("Either url or path must be provided.")
-        super().__init__(url, path)
+        super().__init__(raw=raw, url=url, path=path)
 
     @override
     async def read(self) -> bytes:
@@ -100,7 +119,9 @@ class Video(BaseFile):
 
 
 class File(BaseFile):
-    def __init__(self, url: str | None = None, path: str | None = None) -> None:
+    def __init__(
+        self, raw: bytes | None = None, *, url: str | None = None, path: str | None = None
+    ) -> None:
         self.file_name: str = ""
         if path:
             self.file_name = Path(path).name
@@ -110,7 +131,7 @@ class File(BaseFile):
         if not self.file_name:
             raise ValueError("Either url or path must be provided.")
 
-        super().__init__(url, path)
+        super().__init__(raw=raw, url=url, path=path)
 
     @override
     async def read(self) -> bytes: