From 52949602afa54605ad65b0501add244808291343 Mon Sep 17 00:00:00 2001
From: Alexey Polyakov <starwear3000@mail.ru>
Date: Fri, 3 Apr 2026 23:02:49 +0300
Subject: [PATCH] =?UTF-8?q?Common:=20=D1=84=D0=B8=D0=BA=D1=81=20=D0=B3?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore              |  3 ++-
 src/common/proto_tcp.py | 20 ++++++++++----------
 src/oneme/models.py     |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index babc0d7..8ee9d44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 __pycache__
 .env
 *.pem
-*.sqlite
\ No newline at end of file
+*.sqlite
+*.crt
\ No newline at end of file
diff --git a/src/common/proto_tcp.py b/src/common/proto_tcp.py
index d2049d1..0501a02 100644
--- a/src/common/proto_tcp.py
+++ b/src/common/proto_tcp.py
@@ -18,11 +18,11 @@ class MobileProto:
             return None
 
         # Распаковываем заголовок
-        ver = int.from_bytes(data[0:1], "big")
-        cmd = int.from_bytes(data[1:3], "big")
-        seq = int.from_bytes(data[3:4], "big")
-        opcode = int.from_bytes(data[4:6], "big")
-        packed_len = int.from_bytes(data[6:10], "big")
+        ver = int.from_bytes(data[0:1], "big", signed=False)
+        cmd = int.from_bytes(data[1:2], "big", signed=False)
+        seq = int.from_bytes(data[2:4], "big", signed=False)
+        opcode = int.from_bytes(data[4:6], "big", signed=False)
+        packed_len = int.from_bytes(data[6:10], "big", signed=False)
 
         # Флаг упаковки
         comp_flag = packed_len >> 24
@@ -74,8 +74,8 @@ class MobileProto:
     def pack_packet(self, ver: int = 10, cmd: int = 0x100, seq: int = 1, opcode: int = 6, payload: dict = None) -> bytes:
         # Запаковываем заголовок
         ver_b = ver.to_bytes(1, "big")
-        cmd_b = cmd.to_bytes(2, "big")
-        seq_b = seq.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")
 
         # Запаковываем данные пакета
@@ -91,7 +91,7 @@ class MobileProto:
         return ver_b + cmd_b + seq_b + opcode_b + payload_len_b + payload_bytes
     
     ### Констаты протокола
-    CMD_OK = 0x100
-    CMD_NOF = 0x200
-    CMD_ERR = 0x300
+    CMD_OK = 1 # 0x100
+    CMD_NOF = 2 # 0x200
+    CMD_ERR = 3 # 0x300
     PROTO_VER = 10
diff --git a/src/oneme/models.py b/src/oneme/models.py
index 8730784..97e3c47 100644
--- a/src/oneme/models.py
+++ b/src/oneme/models.py
@@ -7,7 +7,7 @@ class UserAgentModel(pydantic.BaseModel):
     timezone: str
     release: int = None
     screen: str
-    pushDeviceType: str
+    pushDeviceType: str = None
     arch: str = None
     locale: str
     buildNumber: int = None