Обновление транспорта

This commit is contained in:
2023-12-09 16:51:07 +03:00
parent 6217c89591
commit 9475338f65
2 changed files with 44 additions and 20 deletions
+20 -12
View File
@@ -1,27 +1,35 @@
import socket
import struct
class Client:
def __init__(self):
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
def connect(self, host, port):
def connect(self, host: str, port: int):
self.socket.connect((host, port))
def disconnect(self):
self.socket.close()
def send(self, data):
self.socket.sendall(data.encode())
request = struct.pack(">I", len(data)) + data.encode()
self.socket.sendall(request)
def receiveImpl(self, size):
data = bytearray()
while len(data) < size:
packet = self.socket.recv(size - len(data))
if not packet:
return None
data.extend(packet)
return data
def receive(self):
part_size = 4096
buffer = b""
raw_message_length = self.socket.recv(4)
if not raw_message_length:
return None
while True:
part = self.socket.recv(part_size)
buffer += part
if len(part) < part_size:
break
return buffer.decode()
message_length = struct.unpack(">I", raw_message_length)[0]
return self.receiveImpl(message_length).decode()
+24 -8
View File
@@ -1,4 +1,6 @@
import asyncio
import struct
from modules.logging.logger import *
class Server:
def __init__(self, host, port, callback):
@@ -7,6 +9,10 @@ class Server:
self.callback = callback
self.context = None
self.server = None
self.logger = Logger(LogLevel.Error, None)
def setLogger(self, max_log_level, callback):
self.logger = Logger(max_log_level, callback)
async def run(self):
self.server = await asyncio.start_server(self.handleClient, self.host, self.port)
@@ -18,20 +24,30 @@ class Server:
async def handleClient(self, reader, writer):
print("accepted new client")
part_size = 4096
request = b""
# Читаем длину сообщения
raw_message_length = await reader.read(4)
if not raw_message_length:
return None
while True:
part = await asyncio.wait_for(reader.read(part_size), timeout=5.0)
request += part
message_length = struct.unpack(">I", raw_message_length)[0]
if len(part) < part_size:
break
# Читаем сообщение
request = bytearray()
while len(request) < message_length:
packet = await reader.read(message_length - len(request))
if not packet:
return None
request.extend(packet)
request = request.decode()
# Вызываем коллбэк
response = self.callback(self.context, request)
writer.write(response.encode())
response = struct.pack(">I", len(response)) + response.encode()
# Отправляем ответ
writer.write(response)
def stop(self):
self.server.stop()