SantaSpeen/KuiToi-Server
1
0
Fork 0
mirror of https://github.com/kuitoi/kuitoi-Server.git synced 2025-08-17 16:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add codes to _looper();

Browse Source 
Rewrite _tcp_send(to_all=True)
This commit is contained in:
Maxim Khomutov 2023-07-15 19:00:21 +03:00
parent aa5725e8a5
commit a9dad5ab8f
2 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/core/Client.py
View File

@ -22,6 +22,7 @@ class Client:
self._roles = None self._roles = None
self._guest = True self._guest = True
self._ready = False self._ready = False
self._cars = []
@property @property
def log(self): def log(self):
@ -55,8 +56,12 @@ class Client:
def ready(self): def ready(self):
return self._ready return self._ready
@property
def cars(self):
return self.cars
def _update_logger(self): def _update_logger(self):
self._log = utils.get_logger(f"{self.nick}:{self.cid})") self._log = utils.get_logger(f"{self.nick}:{self.cid}")
self.log.debug(f"Update logger") self.log.debug(f"Update logger")
def is_disconnected(self): def is_disconnected(self):
@ -81,7 +86,7 @@ class Client:
await self._tcp_send(b"K" + bytes(reason, "utf-8")) await self._tcp_send(b"K" + bytes(reason, "utf-8"))
self.__alive = False self.__alive = False
async def _tcp_send(self, data, to_all=False, writer=None): async def _tcp_send(self, data, to_all=False, to_self=True, to_udp=False, writer=None):
# TNetwork.cpp; Line: 383 # TNetwork.cpp; Line: 383
# BeamMP TCP protocol sends a header of 4 bytes, followed by the data. # BeamMP TCP protocol sends a header of 4 bytes, followed by the data.
@ -93,14 +98,21 @@ class Client:
writer = self.__writer writer = self.__writer
if to_all: if to_all:
code = data[:1]
for client in self.__Core.clients: for client in self.__Core.clients:
if not client: if not client or (client == self and not to_self):
continue continue
await client._tcp_send(data) if not to_udp or code in [b'W', b'Y', b'V', b'E']:
if code in [b'O', b'T'] or len(data) > 1000:
# TODO: Compress data
await client._tcp_send(data)
else:
await client._tcp_send(data)
else:
# TODO: UDP send
pass
return return
if len(data) == 10:
data += b"."
header = len(data).to_bytes(4, "little", signed=True) header = len(data).to_bytes(4, "little", signed=True)
self.log.debug(f'len: {len(data)}; send: {header + data!r}') self.log.debug(f'len: {len(data)}; send: {header + data!r}')
try: try:
@ -238,13 +250,14 @@ class Client:
# TODO: GlobalParser # TODO: GlobalParser
while self.__alive: while self.__alive:
data = await self._recv() data = await self._recv()
if data == b"": if not data:
if not self.__alive: self.__alive = False
break break
else:
await asyncio.sleep(.1) if 89 >= data[0] >= 86:
self.is_disconnected() # TODO: Network.SendToAll
continue pass
code = data.decode()[0] code = data.decode()[0]
self.log.debug(f"Received code: {code}, data: {data}") self.log.debug(f"Received code: {code}, data: {data}")
match code: match code:
@ -260,16 +273,36 @@ class Client:
await self._tcp_send(b"JWelcome" + bnick + b"!", to_all=True) # Hello message await self._tcp_send(b"JWelcome" + bnick + b"!", to_all=True) # Hello message
# TODO: Sync cars # TODO: Sync cars
# for client in self.__Core.clients:
# for car in client.cars:
# await self._tcp_send(car)
case "C": case "C":
# Chat # Chat
self.log.info(f"Received message: {data!r}") msg = data[2:].decode()
if not msg:
self.log.debug("Tried to send an empty event, ignoring")
continue
self.log.info(f"Received message: {msg}")
# TODO: Handle chat event # TODO: Handle chat event
ev_data = ev.call_event("chat_receive", f"{data}") ev_data = ev.call_event("chat_receive", msg)
d2 = await ev.call_async_event("chat_receive", f"{data}") d2 = await ev.call_async_event("chat_receive", msg)
ev_data.extend(d2) ev_data.extend(d2)
self.log.info(f"TODO: Handle chat event; {ev_data}") self.log.info(f"TODO: Handle chat event; {ev_data}")
await self._tcp_send(data, to_all=True) await self._tcp_send(data, to_all=True)
case "O":
# TODO: ParseVehicle
pass
case "E":
# TODO: HandleEvent
pass
case "N":
# TODO: N
pass
case _: case _:
pass pass

2
src/core/Client.pyi
View File

@ -48,7 +48,7 @@ class Client:
return self._ready return self._ready
def is_disconnected(self) -> bool: ... def is_disconnected(self) -> bool: ...
async def kick(self, reason: str) -> None: ... async def kick(self, reason: str) -> None: ...
async def _tcp_send(self, data: bytes, to_all:bool = False, writer: StreamWriter = None) -> None: ... async def _tcp_send(self, data: bytes, to_all: bool = False, to_self: bool = True, to_udp: bool = False, writer: StreamWriter = None) -> None: ...
async def _sync_resources(self) -> None: ... async def _sync_resources(self) -> None: ...
async def _recv(self) -> bytes: ... async def _recv(self) -> bytes: ...
async def _split_load(self, start: int, end: int, d_sock: bool, filename: str) -> None: ... async def _split_load(self, start: int, end: int, d_sock: bool, filename: str) -> None: ...