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

Refactor Client ID

Browse Source
This commit is contained in:
Maxim Khomutov 2023-07-13 02:33:45 +03:00
parent 85c379bd9e
commit 19c121f208
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/core/core.py
View File

@ -147,8 +147,9 @@ class Core:
self.loop = asyncio.get_event_loop() self.loop = asyncio.get_event_loop()
self.run = False self.run = False
self.direct = False self.direct = False
self.clients = {} self.clients = []
self.clients_counter = 0 self.clients_by_id = {}
self.clients_by_nick = {}
self.mods_dir = "./mods" self.mods_dir = "./mods"
self.mods_list = [0, ] self.mods_list = [0, ]
self.server_ip = config.Server["server_ip"] self.server_ip = config.Server["server_ip"]
@ -162,31 +163,40 @@ class Core:
self.client_major_version = "2.0" self.client_major_version = "2.0"
self.BeamMP_version = "3.2.0" self.BeamMP_version = "3.2.0"
def get_client(self, sock=None, cid=None): def get_client(self, sock=None, cid=None, nick=None):
if cid: if cid:
return self.clients.get(cid) return self.clients_by_id.get(cid)
if nick:
return self.clients_by_nick.get(nick)
if sock: if sock:
return self.clients.get(sock.getsockname()) return self.clients_by_nick.get(sock.getsockname())
def insert_client(self, client): def insert_client(self, client):
self.log.debug(f"Inserting client: {client.cid}") self.log.debug(f"Inserting client: {client.cid}")
self.clients.update({client.cid: client, client.nick: client}) self.clients_by_nick.update({client.nick: client})
self.clients_by_id.update({client.cid: client})
self.clients[client.cid] = client
def create_client(self, *args, **kwargs): def create_client(self, *args, **kwargs):
client = Client(*args, **kwargs) client = Client(*args, **kwargs)
self.clients_counter += 1 cid = 1
client.id = self.clients_counter for client in self.clients:
if client.cid == cid:
cid += 1
else:
break
client.cid = cid
client._update_logger() client._update_logger()
self.log.debug(f"Create client: {client.cid}; clients_counter: {self.clients_counter}") self.log.debug(f"Create client; client.cid: {client.cid};")
return client return client
async def check_alive(self): async def check_alive(self):
await asyncio.sleep(5) await asyncio.sleep(5)
self.log.debug(f"Checking if clients is alive") self.log.debug(f"Checking if clients is alive")
for cl in self.clients.values(): for client in self.clients:
d = await cl.is_disconnected() d = client.is_disconnected()
if d: if d:
self.log.debug(f"Client ID: {cl.id} died...") self.log.debug(f"Client ID: {client.cid} died...")
@staticmethod @staticmethod
def start_web(): def start_web():

6
src/core/core.pyi
View File

@ -7,7 +7,7 @@
import asyncio import asyncio
from asyncio import StreamWriter, StreamReader from asyncio import StreamWriter, StreamReader
from threading import Thread from threading import Thread
from typing import Callable from typing import Callable, List, Dict, Tuple
from core import utils from core import utils
from .tcp_server import TCPServer from .tcp_server import TCPServer
@ -44,7 +44,9 @@ class Core:
self.loop = asyncio.get_event_loop() self.loop = asyncio.get_event_loop()
self.run = False self.run = False
self.direct = False self.direct = False
self.clients = dict() self.clients: List[Client]= []
self.clients_by_id: Dict[{int: Client}]= {}
self.clients_by_nick: Dict[{str: Client}] = {}
self.clients_counter: int = 0 self.clients_counter: int = 0
self.mods_dir: str = "mods" self.mods_dir: str = "mods"
self.mods_list: list = [] self.mods_list: list = []