wintergram-userbot 1.3__tar.gz → 1.4__tar.gz

{wintergram_userbot-1.3/wintergram_userbot.egg-info → wintergram_userbot-1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wintergram-userbot
-Version: 1.3
+Version: 1.4
 Summary: WinterGram Userbot for custom MTProto server
 Author: WinterGram Team
 Requires-Python: >=3.8

{wintergram_userbot-1.3 → wintergram_userbot-1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wintergram-userbot"
-version = "1.3"
+version = "1.4"
 description = "WinterGram Userbot for custom MTProto server"
 readme = "README.md"
 authors = [{name = "WinterGram Team"}]

{wintergram_userbot-1.3 → wintergram_userbot-1.4}/wintergram_userbot/__init__.py

@@ -4,7 +4,7 @@
 Поддерживаются слои (layers) от 167 до 228 включительно.
 """
 
-__version__ = "1.3"
+__version__ = "1.4"
 
 from .client import WinterGramClient
 from .errors import (

{wintergram_userbot-1.3 → wintergram_userbot-1.4}/wintergram_userbot/network/mtproto.py

@@ -67,6 +67,21 @@ ID_PONG = 0x347773C5
 ID_GZIP_PACKED = 0x3072CFA1
 ID_PING = 0x7ABE77EC
 
+# little-endian сигнатура gzip_packed в начале тела ответа
+GZIP_MAGIC_LE = struct.pack("<I", ID_GZIP_PACKED)
+
+
+def inflate(data: bytes) -> bytes:
+    """Распаковывает gzip/zlib/deflate - сервер встречается со всеми тремя."""
+    if not data:
+        raise ValueError("empty packed payload")
+    for wbits in (16 + zlib.MAX_WBITS, zlib.MAX_WBITS, -zlib.MAX_WBITS):
+        try:
+            return zlib.decompress(data, wbits)
+        except zlib.error:
+            continue
+    raise ValueError("cannot inflate %d bytes" % len(data))
+
 # якоря эр (по убыванию) для определения layer
 ERA_ORDER = (228, 202, 198, 181, 167)
 
@@ -309,7 +324,33 @@ class MTProtoConnection:
         desc = self._schema.by_id(ident)
         if desc is None:
             raise TLParseError("unknown constructor 0x%08x" % ident)
-        return decode_constructor(r, desc, self._schema)
+        return self.unpack_object(decode_constructor(r, desc, self._schema))
+
+    @staticmethod
+    def _is_gzip(obj) -> bool:
+        if not isinstance(obj, dict):
+            return False
+        if obj.get("_id") == ID_GZIP_PACKED:
+            return True
+        return str(obj.get("_", "")).lower() == "gzip_packed"
+
+    def unpack_object(self, obj, depth=0):
+        """Распаковывает gzip_packed и декодирует то, что внутри.
+
+        Сервер заворачивает крупные ответы (messages.getDialogs и др.)
+        в gzip_packed: он приходит полем result у rpc_result, поэтому
+        проверка по сигнатуре тела ответа его не ловит.
+        """
+        while depth < 4 and self._is_gzip(obj):
+            packed = obj.get("packed_data") or obj.get("bytes") or b""
+            raw = inflate(packed)
+            rr = TLReader(raw)
+            desc = self._schema.by_id(rr.read_uint())
+            if desc is None:
+                raise TLParseError("unknown constructor inside gzip_packed")
+            obj = decode_constructor(rr, desc, self._schema)
+            depth += 1
+        return obj
 
     def _handle_rpc_result(self, req_msg_id: int, r: TLReader):
         raw = bytes(r.data[r.pos:])
@@ -323,10 +364,10 @@ class MTProtoConnection:
             self._pending.pop(req_msg_id, None)
             return
         body = raw
-        if body[:4] == b"\x30\xcf\xa1\x07":        # gzip_packed little-endian
+        if body[:4] == GZIP_MAGIC_LE:
             pack_r = TLReader(body)
             pack_r.read_uint()
-            body = zlib.decompress(pack_r.read_bytes())
+            body = inflate(pack_r.read_bytes())
         rr = TLReader(body)
         ident = rr.read_uint()
         if ident == ID_RPC_ERROR:
@@ -346,6 +387,7 @@ class MTProtoConnection:
             return
         try:
             obj = decode_constructor(rr, desc, self._schema)
+            obj = self.unpack_object(obj)
         except TLParseError as e:
             fut.set_exception(
                 RPCError(0, "parse failed for 0x%08x: %s (raw=%s)" % (ident, e, body.hex()))

{wintergram_userbot-1.3 → wintergram_userbot-1.4/wintergram_userbot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wintergram-userbot
-Version: 1.3
+Version: 1.4
 Summary: WinterGram Userbot for custom MTProto server
 Author: WinterGram Team
 Requires-Python: >=3.8