mir/pyrogram
2
0
Fork 0
mirror of https://github.com/pyrogram/pyrogram synced 2025-08-27 20:37:54 +00:00
Code Issues Releases Wiki Activity

Reformat connection classes to accommodate proxy settings

Browse Source
This commit is contained in:
Dan 2018-01-16 16:28:50 +01:00
parent 0aed7bf24a
commit e9f6bce579
5 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyrogram/connection/connection.py
View File

@ -56,7 +56,7 @@ class Connection:
def send(self, data: bytes): def send(self, data: bytes):
with self.lock: with self.lock:
self.connection.send(data) self.connection.sendall(data)
def recv(self) -> bytes or None: def recv(self) -> bytes or None:
return self.connection.recv() return self.connection.recvall()

6
pyrogram/connection/transport/tcp/tcp.py
View File

@ -28,12 +28,6 @@ class TCP(socks.socksocket):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
def send(self, *args):
pass
def recv(self, *args):
pass
def close(self): def close(self):
try: try:
self.shutdown(socket.SHUT_RDWR) self.shutdown(socket.SHUT_RDWR)

10
pyrogram/connection/transport/tcp/tcp_abridged.py
View File

@ -33,7 +33,7 @@ class TCPAbridged(TCP):
self.is_first_packet = True self.is_first_packet = True
log.info("Connected!") log.info("Connected!")
def send(self, data: bytes): def sendall(self, data: bytes, *args):
length = len(data) // 4 length = len(data) // 4
data = ( data = (
@ -48,20 +48,20 @@ class TCPAbridged(TCP):
super().sendall(data) super().sendall(data)
def recv(self) -> bytes or None: def recvall(self, length: int = 0) -> bytes or None:
length = self.recvall(1) length = super().recvall(1)
if length is None: if length is None:
return None return None
if length == b"\x7f": if length == b"\x7f":
length = self.recvall(3) length = super().recvall(3)
if length is None: if length is None:
return None return None
length = int.from_bytes(length, "little") * 4 length = int.from_bytes(length, "little") * 4
packet = self.recvall(length) packet = super().recvall(length)
return packet return packet

8
pyrogram/connection/transport/tcp/tcp_full.py
View File

@ -35,7 +35,7 @@ class TCPFull(TCP):
self.seq_no = 0 self.seq_no = 0
log.info("Connected!") log.info("Connected!")
def send(self, data: bytes): def sendall(self, data: bytes, *args):
# 12 = packet_length (4), seq_no (4), crc32 (4) (at the end) # 12 = packet_length (4), seq_no (4), crc32 (4) (at the end)
data = pack("<II", len(data) + 12, self.seq_no) + data data = pack("<II", len(data) + 12, self.seq_no) + data
data += pack("<I", crc32(data)) data += pack("<I", crc32(data))
@ -43,13 +43,13 @@ class TCPFull(TCP):
super().sendall(data) super().sendall(data)
def recv(self) -> bytes or None: def recvall(self, length: int = 0) -> bytes or None:
length = self.recvall(4) length = super().recvall(4)
if length is None: if length is None:
return None return None
packet = self.recvall(unpack("<I", length)[0] - 4) packet = super().recvall(unpack("<I", length)[0] - 4)
if packet is None: if packet is None:
return None return None

8
pyrogram/connection/transport/tcp/tcp_intermediate.py
View File

@ -34,7 +34,7 @@ class TCPIntermediate(TCP):
self.is_first_packet = True self.is_first_packet = True
log.info("Connected!") log.info("Connected!")
def send(self, data: bytes): def sendall(self, data: bytes, *args):
length = len(data) length = len(data)
data = pack("<i", length) + data data = pack("<i", length) + data
@ -44,12 +44,12 @@ class TCPIntermediate(TCP):
super().sendall(data) super().sendall(data)
def recv(self) -> bytes or None: def recvall(self, length: int = 0) -> bytes or None:
length = self.recvall(4) length = super().recvall(4)
if length is None: if length is None:
return None return None
packet = self.recvall(unpack("<I", length)[0]) packet = super().recvall(unpack("<I", length)[0])
return packet return packet