This commit is contained in:
Maxim Khomutov 2023-07-18 04:10:56 +03:00
parent 3d33eec5fd
commit 041883644c
2 changed files with 23 additions and 26 deletions

View File

@ -10,42 +10,36 @@ import traceback
from core import utils from core import utils
class UDPServer: class UDPServer(asyncio.DatagramTransport):
def __init__(self, core, host, port): def __init__(self, core, host=None, port=None):
super().__init__()
self.log = utils.get_logger("UDPServer") self.log = utils.get_logger("UDPServer")
self.loop = asyncio.get_event_loop() self.loop = asyncio.get_event_loop()
self.Core = core self.Core = core
self.host = host self.host = host
self.port = port self.port = port
self.run = False self.run = False
self.transport = None
async def handle_client(self, reader, writer): def connection_made(self, transport):
while True: self.transport = transport
try:
data = await reader.read(1) def datagram_received(self, data, addr):
if not data: message = data.decode()
break print('Received %r from %s' % (message, addr))
code = data.decode() print('Send %r to %s' % (message, addr))
self.log.debug(f"Received {code!r} from {writer.get_extra_info('sockname')!r}") self.transport.sendto(data, addr)
# await self.handle_code(code, reader, writer)
# task = asyncio.create_task(self.handle_code(code, reader, writer))
# await asyncio.wait([task], return_when=asyncio.FIRST_EXCEPTION)
if not writer.is_closing():
writer.close()
self.log.debug("Disconnected.")
break
except Exception as e:
self.log.error("Error while connecting..")
self.log.error(f"Error: {e}")
traceback.print_exc()
break
async def start(self): async def start(self):
self.log.debug("Starting UDP server.") self.log.debug("Starting UDP server.")
self.run = True self.run = True
try: try:
pass self.transport, _ = await self.loop.create_datagram_endpoint(
lambda: self,
local_addr=(self.host, self.port),
reuse_port=True
)
except OSError as e: except OSError as e:
self.log.error("Cannot bind port or other error") self.log.error("Cannot bind port or other error")
raise e raise e
@ -58,3 +52,4 @@ class UDPServer:
def stop(self): def stop(self):
self.log.debug("Stopping UDP server") self.log.debug("Stopping UDP server")
self.transport.close()

View File

@ -5,20 +5,22 @@
# Licence: FPA # Licence: FPA
# (c) kuitoi.su 2023 # (c) kuitoi.su 2023
import asyncio import asyncio
from typing import Tuple
from core import utils from core import utils
class UDPServer: class UDPServer:
def __init__(self, core, host, port): def __init__(self, core, host=None, port=None):
self.log = utils.get_logger("UDPServer") self.log = utils.get_logger("UDPServer")
self.loop = asyncio.get_event_loop() self.loop = asyncio.get_event_loop()
self.Core = core self.Core = core
self.host = host self.host = host
self.port = port self.port = port
self.run = False self.run = False
async def handle_client(self, srv_sock) -> None: ... self.transport = None
def connection_made(self, transport: asyncio.DatagramTransport): ...
def datagram_received(self, data: bytes, addr: Tuple[str, int]): ...
async def start(self) -> None: ... async def start(self) -> None: ...
async def stop(self) -> None: ... async def stop(self) -> None: ...