фиксы сокета + добавил аппрув qr логина

Author: ink-developer

src/pymax/mixins/auth.py

@@ -8,6 +8,7 @@
 
 from pymax.exceptions import Error
 from pymax.payloads import (
+    ApproveQrLoginPayload,
     Capability,
     CheckPasswordChallengePayload,
     CreateTrackPayload,
@@ -222,8 +223,8 @@ def version_tuple(v: str) -> tuple[int, ...]:
     async def _login(self) -> None:
         self.logger.info("Starting login flow")
 
-        if self.user_agent.device_type == DeviceType.WEB.value and self._ws:
-            if not self._validate_version(self.user_agent.app_version, "25.12.13"):
+        if self.headers.device_type == DeviceType.WEB.value and self._ws:
+            if not self._validate_version(self.headers.app_version, "25.12.13"):
                 self.logger.error("Your app version is too old")
                 raise ValueError("Your app version is too old")
 
@@ -659,3 +660,33 @@ async def set_password(
             MixinsUtils.handle_error(data)
 
         return True
+
+    async def approve_qr_login(self, qr_link: str) -> bool:
+        """
+        Подтверждает вход по QR-коду, используя предоставленную ссылку.
+
+        :param qr_link: Ссылка на QR-код для подтверждения входа.
+        :type qr_link: str
+        :return: True, если вход успешно подтвержден, иначе выбрасывается исключение.
+        :rtype: bool
+        """
+        self.logger.info("Approving QR login")
+
+        payload = ApproveQrLoginPayload(
+            qr_link=qr_link,
+        ).model_dump(by_alias=True)
+
+        data = await self._send_and_wait(
+            opcode=Opcode.AUTH_QR_APPROVE,
+            payload=payload,
+        )
+        payload = data.get("payload", {})
+        if payload and payload.get("error"):
+            MixinsUtils.handle_error(data)
+
+        self.logger.debug(
+            "QR login approval response opcode=%s seq=%s",
+            data.get("opcode"),
+            data.get("seq"),
+        )
+        return True

src/pymax/mixins/socket.py

@@ -70,7 +70,7 @@ def _unpack_packet(self, data: bytes) -> dict[str, Any] | None:
             "cmd": cmd,
             "seq": seq,
             "opcode": opcode,
-            "payload": payload,
+            "payload": payload,  #
         }
 
     def _pack_packet(
@@ -80,17 +80,20 @@ def _pack_packet(
         seq: int,
         opcode: int,
         payload: dict[str, Any],
+        compress: bool = False,
     ) -> bytes:
         ver_b = ver.to_bytes(1, "big")
         cmd_b = cmd.to_bytes(1, "big")
         seq_b = seq.to_bytes(2, "big")
         opcode_b = opcode.to_bytes(2, "big")
-        payload_bytes: bytes | None = msgpack.packb(payload)
-        if payload_bytes is None:
-            payload_bytes = b""
+
+        payload_bytes = msgpack.packb(payload) or b""
+
+        comp_flag = 1 if compress else 0
         payload_len = len(payload_bytes) & 0xFFFFFF
-        self.logger.debug("Packing message: payload size=%d bytes", len(payload_bytes))
-        payload_len_b = payload_len.to_bytes(4, "big")
+        packed_len = (comp_flag << 24) | payload_len
+        payload_len_b = packed_len.to_bytes(4, "big")
+
         return ver_b + cmd_b + seq_b + opcode_b + payload_len_b + payload_bytes
 
     def _create_socket_with_proxy(self, proxy: str) -> socket.socket:
@@ -260,6 +263,7 @@ async def connect(self, user_agent: UserAgentPayload | None = None) -> dict[str,
                 "recv_task done: cancelled=%s, exc=%r", t.cancelled(), t.exception()
             )
         )
+
         self._outgoing_task = self._create_safe_task(
             self._outgoing_loop(), name="outgoing_loop socket task"
         )
@@ -383,7 +387,7 @@ async def _recv_loop(self) -> None:
                 for data_item in datas:
                     seq = data_item.get("seq")
 
-                    if self._handle_pending(seq % 256 if seq is not None else None, data_item):
+                    if self._handle_pending(seq, data_item):
                         continue
 
                     if self._incoming is not None:
@@ -469,7 +473,7 @@ async def _send_and_wait(
         msg = self._make_message(opcode, payload, cmd)
         loop = asyncio.get_running_loop()
         fut: asyncio.Future[dict[str, Any]] = loop.create_future()
-        seq_key = msg["seq"] % 256
+        seq_key = msg["seq"]
 
         old_fut = self._pending.get(seq_key)
         if old_fut and not old_fut.done():
@@ -510,7 +514,7 @@ async def _send_and_wait(
             raise SocketSendError from exc
 
         finally:
-            self._pending.pop(msg["seq"] % 256, None)
+            self._pending.pop(msg["seq"], None)
 
     @override
     async def _get_chat(self, chat_id: int) -> Chat | None:

src/pymax/payloads.py

@@ -409,3 +409,7 @@ class AddContactByPhonePayload(CamelModel):
 
 class ContactPresencePayload(CamelModel):
     contact_ids: list[int]
+
+
+class ApproveQrLoginPayload(CamelModel):
+    qr_link: str

src/pymax/static/enum.py

@@ -144,6 +144,7 @@ class Opcode(int, Enum):
 
     GET_QR = 288  # ✅
     GET_QR_STATUS = 289  # ✅
+    AUTH_QR_APPROVE = 290  # ✅
     LOGIN_BY_QR = 291  # ✅