mirror of
https://github.com/openmax-server/server.git
synced 2026-05-22 19:41:41 +03:00
Common: фикс года
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,3 +2,4 @@ __pycache__
|
|||||||
.env
|
.env
|
||||||
*.pem
|
*.pem
|
||||||
*.sqlite
|
*.sqlite
|
||||||
|
*.crt
|
||||||
@@ -18,11 +18,11 @@ class MobileProto:
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
# Распаковываем заголовок
|
# Распаковываем заголовок
|
||||||
ver = int.from_bytes(data[0:1], "big")
|
ver = int.from_bytes(data[0:1], "big", signed=False)
|
||||||
cmd = int.from_bytes(data[1:3], "big")
|
cmd = int.from_bytes(data[1:2], "big", signed=False)
|
||||||
seq = int.from_bytes(data[3:4], "big")
|
seq = int.from_bytes(data[2:4], "big", signed=False)
|
||||||
opcode = int.from_bytes(data[4:6], "big")
|
opcode = int.from_bytes(data[4:6], "big", signed=False)
|
||||||
packed_len = int.from_bytes(data[6:10], "big")
|
packed_len = int.from_bytes(data[6:10], "big", signed=False)
|
||||||
|
|
||||||
# Флаг упаковки
|
# Флаг упаковки
|
||||||
comp_flag = packed_len >> 24
|
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:
|
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")
|
ver_b = ver.to_bytes(1, "big")
|
||||||
cmd_b = cmd.to_bytes(2, "big")
|
cmd_b = cmd.to_bytes(1, "big")
|
||||||
seq_b = seq.to_bytes(1, "big")
|
seq_b = seq.to_bytes(2, "big")
|
||||||
opcode_b = opcode.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
|
return ver_b + cmd_b + seq_b + opcode_b + payload_len_b + payload_bytes
|
||||||
|
|
||||||
### Констаты протокола
|
### Констаты протокола
|
||||||
CMD_OK = 0x100
|
CMD_OK = 1 # 0x100
|
||||||
CMD_NOF = 0x200
|
CMD_NOF = 2 # 0x200
|
||||||
CMD_ERR = 0x300
|
CMD_ERR = 3 # 0x300
|
||||||
PROTO_VER = 10
|
PROTO_VER = 10
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ class UserAgentModel(pydantic.BaseModel):
|
|||||||
timezone: str
|
timezone: str
|
||||||
release: int = None
|
release: int = None
|
||||||
screen: str
|
screen: str
|
||||||
pushDeviceType: str
|
pushDeviceType: str = None
|
||||||
arch: str = None
|
arch: str = None
|
||||||
locale: str
|
locale: str
|
||||||
buildNumber: int = None
|
buildNumber: int = None
|
||||||
|
|||||||
Reference in New Issue
Block a user