mirror of
https://github.com/kuitoi/kuitoi-Server.git
synced 2026-06-22 08:31:28 +00:00
Compare commits
4 Commits
0.4.5-beta
...
f145048cc1
| Author | SHA1 | Date | |
|---|---|---|---|
| f145048cc1 | |||
| 68bf7d0d00 | |||
| e9815cdfcf | |||
| acb2b45626 |
@@ -25,7 +25,8 @@ class Config:
|
||||
"access_token": secrets.token_hex(16)}
|
||||
|
||||
def __repr__(self):
|
||||
return "%s(Auth=%r, Game=%r, Server=%r)" % (self.__class__.__name__, self.Auth, self.Game, self.Server)
|
||||
return f"{self.__class__.__name__}(Auth={self.Auth!r}, Game={self.Game!r}, Server={self.Server!r}, " \
|
||||
f"RCON={self.RCON!r}, Options={self.Options!r}, WebAPI={self.WebAPI!r})"
|
||||
|
||||
|
||||
class ConfigProvider:
|
||||
|
||||
@@ -15,7 +15,10 @@ from prompt_toolkit import PromptSession, print_formatted_text, HTML
|
||||
from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
|
||||
from prompt_toolkit.completion import NestedCompleter
|
||||
from prompt_toolkit.history import FileHistory
|
||||
from prompt_toolkit.output.win32 import NoConsoleScreenBufferError
|
||||
try:
|
||||
from prompt_toolkit.output.win32 import NoConsoleScreenBufferError
|
||||
except AssertionError:
|
||||
class NoConsoleScreenBufferError(Exception): ...
|
||||
from prompt_toolkit.patch_stdout import patch_stdout
|
||||
|
||||
from core import get_logger
|
||||
|
||||
@@ -141,7 +141,7 @@ class EventsSystem:
|
||||
return funcs_data
|
||||
|
||||
def call_lua_event(self, event_name, *args):
|
||||
self.log.debug(f"Calling lua event: '{event_name}'")
|
||||
self.log.debug(f"Calling lua event: '{event_name} ({args})'")
|
||||
funcs_data = []
|
||||
if event_name in self.__lua_events.keys():
|
||||
for data in self.__lua_events[event_name]:
|
||||
|
||||
@@ -110,7 +110,7 @@ class MP:
|
||||
|
||||
def TriggerLocalEvent(self, event_name, *args):
|
||||
self.log.debug("request TriggerLocalEvent()")
|
||||
self.log.debug(f"Calling local lua event: '{event_name}'")
|
||||
self.log.debug(f"Calling local lua event: '{event_name} ({args})'")
|
||||
funcs_data = []
|
||||
if event_name in self._local_events.keys():
|
||||
for func_name in self._local_events[event_name]:
|
||||
@@ -157,7 +157,7 @@ class MP:
|
||||
to_all = False
|
||||
if player_id < 0:
|
||||
to_all = True
|
||||
client = client[0]
|
||||
client = client[0] if len(client) > 0 else None
|
||||
if client and event_name and data:
|
||||
t = self.loop.create_task(client.send_event(event_name, data, to_all=to_all))
|
||||
self.tasks.append(t)
|
||||
@@ -168,7 +168,7 @@ class MP:
|
||||
return False, "Can't found event_name or data"
|
||||
|
||||
def TriggerClientEventJson(self, player_id, event_name, data):
|
||||
self.log.debug("request TriggerClientEventJson()")
|
||||
self.log.debug(f"request TriggerClientEventJson({player_id, event_name, data})")
|
||||
data = self._lua.globals().Util.JsonEncode(data)
|
||||
self.TriggerClientEvent(player_id, event_name, data)
|
||||
|
||||
@@ -232,7 +232,7 @@ class MP:
|
||||
|
||||
def GetPlayers(self):
|
||||
self.log.debug("request GetPlayers()")
|
||||
clients = ev.call_event("_get_players", cid=-1)
|
||||
clients = ev.call_event("_get_player", cid=-1)[0]
|
||||
return self._lua.table_from(clients)
|
||||
|
||||
def IsPlayerGuest(self, player_id) -> bool:
|
||||
@@ -312,12 +312,18 @@ class Util:
|
||||
return {k: v for k, v in new_dict.items() if v is not None}
|
||||
|
||||
def JsonEncode(self, table):
|
||||
data = {}
|
||||
try:
|
||||
self.log.debug("requesting JsonEncode()")
|
||||
if all(isinstance(k, int) for k in table.keys()):
|
||||
data = self._recursive_list_encode(table)
|
||||
else:
|
||||
data = self._recursive_dict_encode(table)
|
||||
return json.dumps(data)
|
||||
except Exception as e:
|
||||
self.log.exception(e)
|
||||
data = json.dumps(data)
|
||||
self.log.debug(f"Encoded: {data}")
|
||||
return data
|
||||
|
||||
def JsonDecode(self, string):
|
||||
self.log.debug("requesting JsonDecode()")
|
||||
|
||||
Reference in New Issue
Block a user