Beta!!!

README.md

@@ -1,7 +1,7 @@
 # KuiToi-Server
 
 ## About
-**_[Status: Alpha]_** \
+**_[Status: Beta]_** \
 BeamingDrive Multiplayer (BeamMP) server compatible with BeamMP clients.
 
 ## TODOs
@@ -11,21 +11,21 @@ BeamingDrive Multiplayer (BeamMP) server compatible with BeamMP clients.
     - [x] Private access (Without key, Direct connect)
     - [x] Public access  (With key, listing in Launcher)
     - [X] Player authentication
-  - [ ] TCP Server part:
+  - [x] TCP Server part:
     - [x] Handle code
     - [x] Understanding BeamMP header
     - [x] Upload mods
     - [x] Connecting to the world
     - [x] Chat
     - [x] Players online counter
-    - [ ] Packets handled (One or more)
-    - [ ] Car synchronizations:
+    - [x] Packets handled (Recursive finding second packet)
+    - [x] Car synchronizations:
       - [x] State packets
       - [x] Spawn cars
+      - [x] Delete cars
       - [x] Edit cars
-      - [ ] Delete cars
-      - [ ] Reset cars
-    - [ ] "ABG:" (compressed data)
+      - [x] Reset cars
+    - [x] "ABG:" (compressed data)
       - [x] Decompress data
       - [ ] Compress data
   - [ ] UDP Server part:

src/core/Client.py

@@ -1,7 +1,7 @@
 # Developed by KuiToi Dev
 # File core.tcp_server.py
 # Written by: SantaSpeen
-# Core version: 0.2.3
+# Core version: 0.3.0
 # Licence: FPA
 # (c) kuitoi.su 2023
 import asyncio
@@ -17,9 +17,11 @@ class Client:
     def __init__(self, reader, writer, core):
         self.__reader = reader
         self.__writer = writer
-        self._down_rw = (None, None)
         self.__Core = core
         self.__alive = True
+        self.__packets_queue = []
+        self.__tasks = []
+        self._down_rw = (None, None)
         self._loop = asyncio.get_event_loop()
         self._log = utils.get_logger("client(None:0)")
         self._addr = writer.get_extra_info("sockname")
@@ -128,16 +130,37 @@ class Client:
             writer.write(header + data)
             await writer.drain()
         except ConnectionError:
-            self.log.debug('tcp_send: Disconnected')
+            self.log.debug('_send: Disconnected')
             self.__alive = False
+            await self._remove_me()
 
-    async def _recv(self):
+    async def __handle_packet(self, data, int_header):
+        self.log.debug(f"int_header: {int_header}; data: {data};")
+        if len(data) != int_header:
+            self.log.debug(f"WARN Expected to read {int_header} bytes, instead got {len(data)}")
+
+            recv2 = data[int_header:]
+            header2 = recv2[:4]
+            data2 = recv2[4:]
+            int_header2 = int.from_bytes(header2, byteorder='little', signed=True)
+            t = asyncio.create_task(self.__handle_packet(data2, int_header2))
+            self.__tasks.append(t)
+            data = data[:4 + int_header]
+
+        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)}")
+
+        self.__packets_queue.append(data)
+        self.log.debug(f"Packets in queue: {len(self.__packets_queue)}")
+
+    async def _recv(self, one=False):
+        while self.__alive:
             try:
                 header = await self.__reader.read(4)
 
-            int_header = 0
-            for i in range(len(header)):
-                int_header += header[i]
+                int_header = int.from_bytes(header, byteorder='little', signed=True)
 
                 if int_header <= 0:
                     await asyncio.sleep(0.1)
@@ -145,29 +168,27 @@ class Client:
                     if self.__alive:
                         self.log.debug(f"Header: {header}")
                         await self.kick("Invalid packet - header negative")
-                return b""
+                    self.__packets_queue.append(None)
+                    continue
 
                 if int_header > 100 * MB:
                     await self.kick("Header size limit exceeded")
                     self.log.warning(f"Client {self.nick}:{self.cid} sent header of >100MB - "
                                      f"assuming malicious intent and disconnecting the client.")
-                return b""
+                    self.__packets_queue.append(None)
+                    continue
 
                 data = await self.__reader.read(100 * MB)
-            self.log.debug(f"header: `{header}`; int_header: `{int_header}`; data: `{data}`;")
-
-            if len(data) != int_header:
-                self.log.debug(f"WARN Expected to read {int_header} bytes, instead got {len(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)}")
-                return data
+                if one:
+                    self.log.debug(f"int_header: `{int_header}`; data: `{data}`;")
                     return data
+                else:
+                    t = asyncio.create_task(self.__handle_packet(data, int_header))
+                    self.__tasks.append(t)
+
             except ConnectionError:
                 self.__alive = False
-            return b""
+                self.__packets_queue.append(None)
 
     async def _split_load(self, start, end, d_sock, filename):
         # TODO: Speed  limiter
@@ -191,8 +212,7 @@ class Client:
 
     async def _sync_resources(self):
         while self.__alive:
-            data = await self._recv()
-            self.log.debug(f"data: {data!r}")
+            data = await self._recv(True)
             if data.startswith(b"f"):
                 file = data[1:].decode("utf-8")
                 # TODO: i18n
@@ -249,17 +269,17 @@ class Client:
                 else:
                     await self._send(bytes(mod_list, "utf-8"))
             elif data == b"Done":
-                await self._send(b"M/levels/" + bytes(config.Game['map'], 'utf-8') + b"/info.json")
                 for c in range(config.Game['max_cars']):
                     self._cars.append(None)
+                await self._send(b"M/levels/" + bytes(config.Game['map'], 'utf-8') + b"/info.json")
                 break
         return
 
     def _get_cid_vid(self, data: str):
-        s = data[data.find(":", 1)+1:]
+        s = data[:data.find(":", 1)]
         id_sep = s.find('-')
         if id_sep == -1:
-            self.log.debug(f"Invalid packet: Could not parse pid/vid from packet, as there is no '-' separator: '{s}'")
+            self.log.debug(f"Invalid packet: Could not parse pid/vid from packet, as there is no '-' separator: '{data}'")
             return -1, -1
         cid = s[:id_sep]
         vid = s[id_sep + 1:]
@@ -272,7 +292,7 @@ class Client:
                 self.log.debug(f"Invalid packet: Could not parse cid/vid from packet, as one or both are not valid "
                                f"numbers: '{s}'")
                 return -1, -1
-        self.log.debug(f"Invalid packet: Could not parse pid/vid from packet: '{s}'")
+        self.log.debug(f"Invalid packet: Could not parse pid/vid from packet: '{data}'")
         return -1, -1
 
     async def _handle_vehicle_codes(self, data):
@@ -289,19 +309,19 @@ class Client:
                         if c is None:
                             break
                         car_id += 1
-                    self.log.debug(f"Created a car with ID {car_id}")
+                    self.log.debug(f"Created a car: car_id={car_id}")
                     car_data = data[2:]
                     car_json = {}
                     try:
-                        car_json = json.loads(data[5:])
+                        car_json = json.loads(data[data.find("{"):])
                     except Exception as e:
                         self.log.debug(f"Invalid car_json: Error: {e}; Data: {car_data}")
-                    # TODO: Call event onCarSpawn
-                    allow_spawn = True
+                    allow = True
                     over_spawn = False
+                    # TODO: Call event onCarSpawn
                     pkt = f"Os:{self.roles}:{self.nick}:{self.cid}-{car_id}:{car_data}"
                     unicycle = car_json.get("jbm") == "unicycle"
-                    if (allow_spawn and (config.Game['max_cars'] > car_id or unicycle)) or over_spawn:
+                    if (allow and (config.Game['max_cars'] > car_id or unicycle)) or over_spawn:
                         self.log.debug(f"Car spawn accepted.")
                         self._cars[car_id] = {
                             "packet": pkt,
@@ -310,7 +330,7 @@ class Client:
                             "unicycle": unicycle,
                             "over_spawn": over_spawn or unicycle
                         }
-                        await self._send(pkt, to_all=True)
+                        await self._send(pkt, to_all=True, to_self=True)
                     else:
                         await self._send(pkt)
                         des = f"Od:{self.cid}-{car_id}"
@@ -322,27 +342,52 @@ class Client:
                     # TODO: Call event onCarDelete
                     await self._send(data, to_all=True, to_self=True)
                     try:
+                        car = self.cars[car_id]
+                        if car['unicycle']:
+                            self._cars.pop(car_id)
+                        else:
                             self._cars[car_id] = None
                         await self._send(f"Od:{self.cid}-{car_id}")
-                        self.log.debug(f"Deleted car with car_id: {car_id}")
+                        self.log.debug(f"Deleted car: car_id={car_id}")
                     except IndexError:
                         self.log.debug(f"Unknown car: car_id={car_id}")
             case "c":  # Edit car
                 self.log.debug("Trying to edit car")
-                # TODO: edit car
+                allow = True
+                # TODO: Call event onCarEdited
                 cid, car_id = self._get_cid_vid(data)
                 if car_id != -1 and cid == self.cid:
+                    try:
                         car = self.cars[car_id]
                         if car['unicycle']:
-                        pass
+                            self._cars.pop(car_id)
+                            await self._send(f"Od:{self.cid}-{car_id}", to_all=True, to_self=True)
+                        elif allow:
+                            await self._send(data, to_all=True, to_self=False)
+                            if car['json_ok']:
+                                old_car_json = car['json']
+                                try:
+                                    new_car_json = json.loads(data[data.find("{"):])
+                                    old_car_json.update(new_car_json)
+                                    car['json'] = new_car_json
+                                    self.log.debug(f"Updated car: car_id={car_id}")
+                                except Exception as e:
+                                    self.log.debug(f"Invalid new_car_json: Error: {e}; Data: {data}")
+
+                    except IndexError:
+                        self.log.debug(f"Unknown car: car_id={car_id}")
             case "r":  # Reset car
                 self.log.debug("Trying to reset car")
-                # TODO: reset car
                 cid, car_id = self._get_cid_vid(data)
                 if car_id != -1 and cid == self.cid:
-                    pass
-            case "t" | "m":
-                pass
+                    # TODO: Call event onCarReset
+                    await self._send(data, to_all=True, to_self=False)
+                    self.log.debug(f"Car reset: car_id={car_id}")
+            case "t":
+                self.log.debug(f"Received 'Ot' packet: {data}")
+                await self._send(data, to_all=True, to_self=False)
+            case "m":
+                await self._send(data, to_all=True, to_self=True)
 
     async def _handle_codes(self, data):
         if not data:
@@ -352,8 +397,10 @@ class Client:
         # Codes: V W X Y
         if 89 >= data[0] >= 86:
             await self._send(data, to_all=True, to_self=False)
-
+        try:
             data = data.decode()
+        except UnicodeDecodeError:
+            self.log.debug(f"UnicodeDecodeError: {data}")
 
         code = data[0]
         match code:
@@ -370,6 +417,8 @@ class Client:
                     if not client:
                         continue
                     for car in client.cars:
+                        if not car:
+                            continue
                         await self._send(car['packet'])
 
             case "C":  # Chat handler
@@ -420,9 +469,19 @@ class Client:
     async def _looper(self):
         await self._send(f"P{self.cid}")  # Send clientID
         await self._sync_resources()
+        tasks = self.__tasks
+        recv = asyncio.create_task(self._recv())
+        tasks.append(recv)
         while self.__alive:
-            data = await self._recv()
-            self._loop.create_task(self._handle_codes(data))
+            if len(self.__packets_queue) > 0:
+                for index, packet in enumerate(self.__packets_queue):
+                    self.log.debug(f"Packet: {packet}")
+                    del self.__packets_queue[index]
+                    task = self._loop.create_task(self._handle_codes(packet))
+                    tasks.append(task)
+            else:
+                await asyncio.sleep(0.1)
+        await asyncio.gather(*tasks)
 
     async def _remove_me(self):
         await asyncio.sleep(0.3)

src/core/Client.pyi

@@ -1,7 +1,7 @@
 # Developed by KuiToi Dev
 # File core.tcp_server.py
 # Written by: SantaSpeen
-# Core version: 0.2.3
+# Core version: 0.3.0
 # Licence: FPA
 # (c) kuitoi.su 2023
 import asyncio
@@ -15,8 +15,10 @@ from core import Core, utils
 class Client:
 
     def __init__(self, reader: StreamReader, writer: StreamWriter, core: Core) -> "Client":
+        self.__tasks = []
         self.__reader = reader
         self.__writer = writer
+        self.__packets_queue = []
         self._down_rw: Tuple[StreamReader, StreamWriter] | Tuple[None, None] = (None, None)
         self._log = utils.get_logger("client(id: )")
         self._addr = writer.get_extra_info("sockname")
@@ -50,7 +52,8 @@ class Client:
     async def kick(self, reason: str) -> None: ...
     async def _send(self, data: bytes | str, to_all: bool = False, to_self: bool = True, to_udp: bool = False, writer: StreamWriter = None) -> None: ...
     async def _sync_resources(self) -> None: ...
-    async def _recv(self) -> bytes: ...
+    async def __handle_packet(self, data, int_header): ...
+    async def _recv(self, one=False) -> bytes | None: ...
     async def _split_load(self, start: int, end: int, d_sock: bool, filename: str) -> None: ...
     async def _get_cid_vid(self, s: str) -> Tuple[int, int]: ...
     async def _handle_vehicle_codes(self, data) -> None: ...

src/core/__init__.py

@@ -2,7 +2,7 @@
 # File core.__init__.py
 # Written by: SantaSpeen
 # Version 1.3
-# Core version: 0.2.3
+# Core version: 0.3.0
 # Licence: FPA
 # (c) kuitoi.su 2023
 # Special thanks to: AI Sage(https://poe.com/Sage), AI falcon-40b-v7(https://OpenBuddy.ai)
@@ -10,8 +10,8 @@
 __title__ = 'KuiToi-Server'
 __description__ = 'BeamingDrive Multiplayer server compatible with BeamMP clients.'
 __url__ = 'https://github.com/kuitoi/kuitoi-Server'
-__version__ = '0.2.3'
-__build__ = 1208  # Я это считаю лог файлами
+__version__ = '0.3.0'
+__build__ = 1257  # Я это считаю лог файлами
 __author__ = 'SantaSpeen'
 __author_email__ = 'admin@kuitoi.su'
 __license__ = "FPA"

src/core/core.py

@@ -1,7 +1,7 @@
 # Developed by KuiToi Dev
 # File core.core.py
 # Written by: SantaSpeen
-# Version: 0.2.3
+# Version: 0.3.0
 # Licence: FPA
 # (c) kuitoi.su 2023
 import asyncio

src/core/core.pyi

@@ -1,7 +1,7 @@
 # Developed by KuiToi Dev
 # File core.core.pyi
 # Written by: SantaSpeen
-# Version 0.2.3
+# Version 0.3.0
 # Licence: FPA
 # (c) kuitoi.su 2023
 import asyncio

src/core/tcp_server.py

@@ -1,7 +1,7 @@
 # Developed by KuiToi Dev
 # File core.tcp_server.py
 # Written by: SantaSpeen
-# Core version: 0.2.3
+# Core version: 0.3.0
 # Licence: FPA
 # (c) kuitoi.su 2023
 import asyncio
@@ -25,7 +25,7 @@ class TCPServer:
         client = self.Core.create_client(reader, writer)
         # TODO: i18n
         self.log.info(f"Identifying new ClientConnection...")
-        data = await client._recv()
+        data = await client._recv(True)
         self.log.debug(f"Version: {data}")
         if data.decode("utf-8") != f"VC{self.Core.client_major_version}":
             # TODO: i18n
@@ -34,7 +34,7 @@ class TCPServer:
         else:
             await client._send(b"S")  # Accepted client version
 
-        data = await client._recv()
+        data = await client._recv(True)
         self.log.debug(f"Key: {data}")
         if len(data) > 50:
             # TODO: i18n
@@ -133,7 +133,7 @@ class TCPServer:
                 break
             except Exception as e:
                 # TODO: i18n
-                self.log.error("Error while connecting..")
+                self.log.error("Error while handling connection...")
                 self.log.exception(e)
                 traceback.print_exc()
                 break

src/core/tcp_server.pyi

@@ -1,7 +1,7 @@
 # Developed by KuiToi Dev
 # File core.tcp_server.pyi
 # Written by: SantaSpeen
-# Core version: 0.2.3
+# Core version: 0.3.0
 # Licence: FPA
 # (c) kuitoi.su 2023
 import asyncio

src/core/udp_server.py

@@ -1,7 +1,7 @@
 # Developed by KuiToi Dev
 # File core.udp_server.py
 # Written by: SantaSpeen
-# Core version: 0.2.3
+# Core version: 0.3.0
 # Licence: FPA
 # (c) kuitoi.su 2023
 import asyncio

src/core/udp_server.pyi

@@ -1,7 +1,7 @@
 # Developed by KuiToi Dev
 # File core.udp_server.py
 # Written by: SantaSpeen
-# Core version: 0.2.3
+# Core version: 0.3.0
 # Licence: FPA
 # (c) kuitoi.su 2023
 import asyncio

src/core/utils.py

@@ -2,7 +2,7 @@
 # File core.utils.py
 # Written by: SantaSpeen
 # Version 1.1
-# Core version: 0.2.3
+# Core version: 0.3.0
 # Licence: FPA
 # (c) kuitoi.su 2023
 import datetime