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

Disable __handle_packet...;

Browse Source 
Fix "Invalid packet - header negative";
Fix _get_cid_vid;
Add dta to _handle_vehicle_codes;
Fix disconnected message.
This commit is contained in:
Maxim Khomutov 2023-07-18 05:35:34 +03:00
parent a5b087f8b4
commit 792884d7b0
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/core/Client.py
View File

@ -182,13 +182,22 @@ class Client:
self.__packets_queue.append(None) self.__packets_queue.append(None)
continue continue
data = await self.__reader.read(100 * MB) data = await self.__reader.read(int_header)
self.log.debug(f"int_header: {int_header}; data: `{data}`;")
abg = b"ABG:"
if len(data) > len(abg) and data.startswith(abg):
data = zlib.decompress(data[len(abg):])
self.log.debug(f"ABG Packet: {len(data)}")
if one: if one:
self.log.debug(f"int_header: `{int_header}`; data: `{data}`;") # self.log.debug(f"int_header: `{int_header}`; data: `{data}`;")
return data return data
else: # FIXME
t = asyncio.create_task(self.__handle_packet(data, int_header)) # else:
self.__tasks.append(t) # t = asyncio.create_task(self.__handle_packet(data, int_header))
# self.__tasks.append(t)
self.__packets_queue.append(data)
except ConnectionError: except ConnectionError:
self.__alive = False self.__alive = False
@ -280,7 +289,8 @@ class Client:
return return
def _get_cid_vid(self, data: str): def _get_cid_vid(self, data: str):
s = data[:data.find(":", 1)] sep = data.find(":", 1) + 1
s = data[sep:sep + 3]
id_sep = s.find('-') id_sep = s.find('-')
if id_sep == -1: if id_sep == -1:
self.log.debug(f"Invalid packet: Could not parse pid/vid from packet, as there is no '-' separator: '{data}'") self.log.debug(f"Invalid packet: Could not parse pid/vid from packet, as there is no '-' separator: '{data}'")
@ -299,11 +309,11 @@ class Client:
self.log.debug(f"Invalid packet: Could not parse pid/vid from packet: '{data}'") self.log.debug(f"Invalid packet: Could not parse pid/vid from packet: '{data}'")
return -1, -1 return -1, -1
async def _handle_vehicle_codes(self, data): async def _handle_vehicle_codes(self, dta):
if len(data) < 6: if len(dta) < 6:
return return
sub_code = data[1] sub_code = dta[1]
data = data[3:] data = dta[3:]
match sub_code: match sub_code:
case "s": # Spawn car case "s": # Spawn car
self.log.debug("Trying to spawn car") self.log.debug("Trying to spawn car")
@ -341,10 +351,10 @@ class Client:
await self._send(des) await self._send(des)
case "d": # Delete car case "d": # Delete car
self.log.debug("Trying to delete car") self.log.debug("Trying to delete car")
cid, car_id = self._get_cid_vid(data) cid, car_id = self._get_cid_vid(dta)
if car_id != -1 and cid == self.cid: if car_id != -1 and cid == self.cid:
# TODO: Call event onCarDelete # TODO: Call event onCarDelete
await self._send(data, to_all=True, to_self=True) await self._send(dta, to_all=True, to_self=True)
try: try:
car = self.cars[car_id] car = self.cars[car_id]
if car['unicycle']: if car['unicycle']:
@ -359,7 +369,7 @@ class Client:
self.log.debug("Trying to edit car") self.log.debug("Trying to edit car")
allow = True allow = True
# TODO: Call event onCarEdited # TODO: Call event onCarEdited
cid, car_id = self._get_cid_vid(data) cid, car_id = self._get_cid_vid(dta)
if car_id != -1 and cid == self.cid: if car_id != -1 and cid == self.cid:
try: try:
car = self.cars[car_id] car = self.cars[car_id]
@ -367,7 +377,7 @@ class Client:
self._cars.pop(car_id) self._cars.pop(car_id)
await self._send(f"Od:{self.cid}-{car_id}", to_all=True, to_self=True) await self._send(f"Od:{self.cid}-{car_id}", to_all=True, to_self=True)
elif allow: elif allow:
await self._send(data, to_all=True, to_self=False) await self._send(dta, to_all=True, to_self=False)
if car['json_ok']: if car['json_ok']:
old_car_json = car['json'] old_car_json = car['json']
try: try:
@ -382,16 +392,16 @@ class Client:
self.log.debug(f"Unknown car: car_id={car_id}") self.log.debug(f"Unknown car: car_id={car_id}")
case "r": # Reset car case "r": # Reset car
self.log.debug("Trying to reset car") self.log.debug("Trying to reset car")
cid, car_id = self._get_cid_vid(data) cid, car_id = self._get_cid_vid(dta)
if car_id != -1 and cid == self.cid: if car_id != -1 and cid == self.cid:
# TODO: Call event onCarReset # TODO: Call event onCarReset
await self._send(data, to_all=True, to_self=False) await self._send(dta, to_all=True, to_self=False)
self.log.debug(f"Car reset: car_id={car_id}") self.log.debug(f"Car reset: car_id={car_id}")
case "t": case "t":
self.log.debug(f"Received 'Ot' packet: {data}") self.log.debug(f"Received 'Ot' packet: {dta}")
await self._send(data, to_all=True, to_self=False) await self._send(dta, to_all=True, to_self=False)
case "m": case "m":
await self._send(data, to_all=True, to_self=True) await self._send(dta, to_all=True, to_self=True)
async def _handle_codes(self, data): async def _handle_codes(self, data):
if not data: if not data:
@ -495,10 +505,11 @@ class Client:
for i, car in enumerate(self.cars): for i, car in enumerate(self.cars):
if not car: if not car:
continue continue
await self._send(f"Od:{self.cid}-{i}") self.log.debug(f"Removing car: car_id={i}")
await self._send(f"Od:{self.cid}-{i}", to_all=True, to_self=False)
if self.ready: if self.ready:
await self._send(f"J{self.nick} disconnected!", to_all=True) # I'm disconnected. await self._send(f"J{self.nick} disconnected!", to_all=True, to_self=False) # I'm disconnected.
self.log.debug(f"Removing client {self.nick}:{self.cid}") self.log.debug(f"Removing client")
# TODO: i18n # TODO: i18n
self.log.info("Disconnected") self.log.info("Disconnected")
self.__Core.clients[self.cid] = None self.__Core.clients[self.cid] = None