README.md

@@ -21,17 +21,16 @@ BeamingDrive Multiplayer (BeamMP) server compatible with BeamMP clients.
     - [x] Packets handled (Recursive finding second packet)
     - [x] Car synchronizations:
       - [x] State packets
-        - [ ] Debug (gear?)
       - [x] Spawn cars
       - [x] Delete cars
       - [x] Edit cars
       - [x] Reset cars
     - [x] "ABG:" (compressed data)
       - [x] Decompress data
-      - [x] Compress data
+      - [ ] Compress data
   - [ ] UDP Server part:
-    - [x] Ping
+    - [ ] Players synchronizations _(Code: Zp)_
-    - [ ] Position synchronizations _(Code: Zp)_
+    - [ ] Ping _(Code: p)_
 - [x] Additional:
   - [ ] KuiToi System
     - [ ] Servers counter
@@ -52,7 +51,6 @@ BeamingDrive Multiplayer (BeamMP) server compatible with BeamMP clients.
     - [x] Async support
   - [x] Plugins support
     - [ ] KuiToi class
-    - [ ] Client class
     - [x] Load Python plugins
     - [x] Async support
     - [ ] Load Lua plugins (Original BeamMP compatibility)
@@ -60,7 +58,7 @@ BeamingDrive Multiplayer (BeamMP) server compatible with BeamMP clients.
     - [x] Core
     - [x] Console
     - [x] WebAPI
-  - [ ] HTTP API Server (fastapi)
+  - [x] HTTP API Server (fastapi)
     - [x] Stop and Start with core
     - [x] Configure FastAPI logger
     - [ ] Sync with event system

src/core/Client.py

@@ -21,10 +21,9 @@ class Client:
         self.__alive = True
         self.__packets_queue = []
         self.__tasks = []
-        self._down_sock = (None, None)
+        self._down_rw = (None, None)
-        self._udp_sock = (None, None)
         self._loop = asyncio.get_event_loop()
-        self._log = utils.get_logger("player(None:0)")
+        self._log = utils.get_logger("client(None:0)")
         self._addr = writer.get_extra_info("sockname")
         self._cid = -1
         self._key = None
@@ -113,6 +112,10 @@ class Client:
                     continue
                 if not to_udp or code in ['V', 'W', 'Y', 'E']:
                     if code in ['O', 'T'] or len(data) > 1000:
+                        if len(data) > 400:
+                            # TODO: Compress data
+                            await client._send(data)
+                        else:
                             await client._send(data)
                     else:
                         await client._send(data)
@@ -121,9 +124,6 @@ class Client:
                     self.log.debug(f"UDP Part not ready: {code}")
             return
 
-        if len(data) > 400:
-            data = b"ABG:" + zlib.compress(data, level=zlib.Z_BEST_COMPRESSION)
-
         header = len(data).to_bytes(4, "little", signed=True)
         self.log.debug(f'len: {len(data)}; send: {header + data!r}')
         try:
@@ -177,10 +177,9 @@ class Client:
 
                 if int_header > 100 * MB:
                     await self.kick("Header size limit exceeded")
-                    self.log.warning("Client sent header of >100MB - "
+                    self.log.warning(f"Client {self.nick}:{self.cid} sent header of >100MB - "
-                                     "assuming malicious intent and disconnecting the client.")
+                                     f"assuming malicious intent and disconnecting the client.")
                     self.__packets_queue.append(None)
-                    self.log.debug(f"Last recv: {await self.__reader.read(100 * MB)}")
                     continue
 
                 data = await self.__reader.read(int_header)
@@ -207,7 +206,7 @@ class Client:
     async def _split_load(self, start, end, d_sock, filename):
         # TODO: Speed  limiter
         real_size = end - start
-        writer = self._down_sock[1] if d_sock else self.__writer
+        writer = self._down_rw[1] if d_sock else self.__writer
         who = 'dwn' if d_sock else 'srv'
         if config.Server["debug"]:
             self.log.debug(f"[{who}] Real size: {real_size / MB}mb; {real_size == end}, {real_size * 2 == end}")
@@ -246,7 +245,7 @@ class Client:
                     return
                 await self._send(b"AG")
                 t = 0
-                while not self._down_sock[0]:
+                while not self._down_rw[0]:
                     await asyncio.sleep(0.1)
                     t += 1
                     if t > 50:
@@ -452,7 +451,12 @@ class Client:
                         message = ev_data["message"]
                         to_all = ev_data.get("to_all")
                         if to_all is None:
+                            if need_send:
+                                need_send = False
                             to_all = True
+                        if to_all:
+                            if need_send:
+                                need_send = False
                         to_self = ev_data.get("to_self")
                         if to_self is None:
                             to_self = True
@@ -461,7 +465,6 @@ class Client:
                         if to_client:
                             writer = to_client._writer
                         await self._send(f"C:{message}", to_all=to_all, to_self=to_self, writer=writer)
-                        need_send = False
                     except KeyError | AttributeError:
                         self.log.error(f"Returns invalid data: {ev_data}")
                 if need_send:
@@ -520,7 +523,7 @@ class Client:
         except Exception as e:
             self.log.debug(f"Error while closing writer: {e}")
         try:
-            _, down_w = self._down_sock
+            _, down_w = self._down_rw
             if down_w and not down_w.is_closing():
                 down_w.close()
         except Exception as e:

src/core/Client.pyi

@@ -5,7 +5,7 @@
 # Licence: FPA
 # (c) kuitoi.su 2023
 import asyncio
-from asyncio import StreamReader, StreamWriter, DatagramTransport
+from asyncio import StreamReader, StreamWriter
 from logging import Logger
 from typing import Tuple, List, Dict
 
@@ -19,8 +19,7 @@ class Client:
         self.__reader = reader
         self.__writer = writer
         self.__packets_queue = []
-        self._udp_sock: Tuple[DatagramTransport, tuple] | Tuple[None, None] = (None, None)
+        self._down_rw: Tuple[StreamReader, StreamWriter] | Tuple[None, None] = (None, None)
-        self._down_sock: Tuple[StreamReader, StreamWriter] | Tuple[None, None] = (None, None)
         self._log = utils.get_logger("client(id: )")
         self._addr = writer.get_extra_info("sockname")
         self._loop = asyncio.get_event_loop()

src/core/core.py

@@ -95,7 +95,6 @@ class Core:
 
     async def check_alive(self):
         maxp = config.Game['players']
-        try:
         while self.run:
             await asyncio.sleep(1)
             ca = f"Ss{len(self.clients_by_id)}/{maxp}:{self.get_clients_list()}"
@@ -106,9 +105,6 @@ class Core:
                     client.is_disconnected()
                     continue
                 await client._send(bytes(ca, "utf-8"))
-        except Exception as e:
-            self.log.error("Error in check_alive.")
-            self.log.exception(e)
 
     @staticmethod
     def start_web():
@@ -145,7 +141,7 @@ class Core:
         modstotal = len(self.mods_list) - 1
         while self.run:
             try:
-                data = {"uuid": config.Auth["key"], "players": len(self.clients_by_id), "maxplayers": config.Game["players"],
+                data = {"uuid": config.Auth["key"], "players": len(self.clients), "maxplayers": config.Game["players"],
                         "port": config.Server["server_port"], "map": f"/levels/{config.Game['map']}/info.json",
                         "private": config.Auth['private'], "version": self.BeamMP_version,
                         "clientversion": self.client_major_version,
@@ -192,12 +188,13 @@ class Core:
                             self.direct = True
                 else:
                     self.direct = True
+                    if test:
+                        self.log.error("Cannot auth...")
+                    if not config.Auth['private']:
+                        raise KeyboardInterrupt
                     if test:
                         # TODO: i18n
-                        self.log.error("Cannot authenticate server.")
                         self.log.info(f"Server still runnig, but only in Direct connect mode.")
-                    # if not config.Auth['private']:
-                    #     raise KeyboardInterrupt
 
                 if test:
                     return ok
@@ -254,7 +251,7 @@ class Core:
                 self.clients.append(None)
             tasks = []
             # self.udp.start,
-            f_tasks = [self.tcp.start, self.udp._start, console.start, self.stop_me, self.heartbeat, self.check_alive]
+            f_tasks = [self.tcp.start, console.start, self.stop_me, self.heartbeat, self.check_alive]
             for task in f_tasks:
                 tasks.append(asyncio.create_task(task()))
             t = asyncio.wait(tasks, return_when=asyncio.FIRST_EXCEPTION)
@@ -274,7 +271,7 @@ class Core:
         finally:
             self.run = False
             self.tcp.stop()
-            self.udp._stop()
+            # self.udp.stop()
             await self.stop()
 
     def start(self):

src/core/tcp_server.py

@@ -89,7 +89,7 @@ class TCPServer:
             cid = (await reader.read(1))[0]
             client = self.Core.get_client(cid=cid)
             if client:
-                client._down_sock = (reader, writer)
+                client._down_rw = (reader, writer)
                 self.log.debug(f"Client: {client.nick}:{cid} - HandleDownload!")
             else:
                 writer.close()

src/core/udp_server.py

@@ -26,55 +26,30 @@ class UDPServer(asyncio.DatagramTransport):
         self.transport = transport
 
     def datagram_received(self, data, addr):
-        cid = data[0] - 1
+        message = data.decode()
-        code = data[2:3].decode()
+        print('Received %r from %s' % (message, addr))
+        print('Send %r to %s' % (message, addr))
+        self.transport.sendto(data, addr)
 
-        client = self.Core.get_client(cid=cid)
+    async def start(self):
-        if client and client._udp_sock != (self.transport, addr):
-            client._udp_sock = (self.transport, addr)
-            self.log.debug(f"Set UDP Sock for CID: {cid}")
-        else:
-            self.log.debug(f"Client not found.")
-
-        match code:
-            case "p":
-                self.log.debug(f"[{cid}] Send ping")
-                # TODO: Call event onSentPing
-                self.transport.sendto(b"p", addr)  # Send ping
-            case "Z":
-                # TODO: Positions synchronization
-                # TODO: Call event onChangePosition
-                pass
-            case _:
-                self.log.debug(f"[{cid}] Unknown code: {code}")
-
-    def connection_lost(self, exc):
-        if exc is not None and exc != KeyboardInterrupt:
-            self.log.debug(f'Connection raised: {exc}')
-        self.log.debug(f'Disconnected.')
-        self.transport.close()
-
-    async def _start(self):
         self.log.debug("Starting UDP server.")
         self.run = True
         try:
             self.transport, _ = await self.loop.create_datagram_endpoint(
-                lambda: UDPServer(self.Core),
+                lambda: self,
-                local_addr=(self.host, self.port)
+                local_addr=(self.host, self.port),
+                reuse_port=True
             )
-            self.log.debug(f"UDP server started on {self.transport.get_extra_info('sockname')}")
-            return
         except OSError as e:
-            self.run = False
-            self.Core.run = False
             self.log.error("Cannot bind port or other error")
-            self.log.exception(e)
+            raise e
-        except Exception as e:
+        except BaseException as e:
+            self.log.error(f"Error: {e}")
+            raise e
+        finally:
             self.run = False
             self.Core.run = False
-            self.log.error(f"Error: {e}")
-            self.log.exception(e)
 
-    def _stop(self):
+    def stop(self):
         self.log.debug("Stopping UDP server")
         self.transport.close()

src/core/udp_server.pyi

@@ -5,24 +5,22 @@
 # Licence: FPA
 # (c) kuitoi.su 2023
 import asyncio
-from asyncio import DatagramTransport
 from typing import Tuple
 
 from core import utils
-from core.core import Core
 
 
-class UDPServer(asyncio.DatagramTransport):
+class UDPServer:
 
-    def __init__(self, core: Core, host=None, port=None):
+    def __init__(self, core, host=None, port=None):
         self.log = utils.get_logger("UDPServer")
         self.loop = asyncio.get_event_loop()
         self.Core = core
         self.host = host
         self.port = port
         self.run = False
-        self.transport: DatagramTransport = None
+        self.transport = None
-    def connection_made(self, transport: DatagramTransport): ...
+    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: ...