0.4.4 -> 0.4.5

.gitignore

@@ -140,3 +140,6 @@ dmypy.json
 logs/
 *.yml
 *.toml
+
+/win-ver_info.txt
+/output/

docs/cn/multilanguage/readme.md

@@ -1,3 +1,3 @@
 # MultiLanguage - i18n支持
 
-在 [example.json](./example.json) 中是 [src/modules/i18n/files/ru.json](../../../src/modules/i18n/files/ru.json) 的副本。如果你想将其翻译成以前未翻译过的语言，或者更新现有的翻译，我将很高兴接受你的拉取请求。
+在 [example.json](./example.json) 中是 [src/modules/i18n/files/ru.json](../../../src/translates/ru.json) 的副本。如果你想将其翻译成以前未翻译过的语言，或者更新现有的翻译，我将很高兴接受你的拉取请求。

docs/en/multilanguage/readme.md

@@ -1,4 +1,4 @@
 # MultiLanguage - i18n Support
 
-In [example.json](./example.json) you will find a copy of [src/modules/i18n/files/ru.json](../../../src/modules/i18n/files/ru.json).\
+In [example.json](./example.json) you will find a copy of [src/modules/i18n/files/ru.json](../../../src/translates/ru.json).\
 If you want to translate to a language that has not been translated before or update an existing translation, I would be happy to receive your pull requests.

docs/ru/multilanguage/readme.md

@@ -1,4 +1,4 @@
 # MultiLanguage - Поддержка i18n
 
-В [example.json](./example.json) это копия [src/modules/i18n/files/ru.json](../../../src/modules/i18n/files/ru.json)\
+В [example.json](./example.json) это копия [src/modules/i18n/files/ru.json](../../../src/translates/ru.json)\
 Если есть желание перевести на не переведённый ранее язык, или обновить уже существующий перевод буду рад вашим пул реквестам.

src/core/Client.py

@@ -1,7 +1,7 @@
 # Developed by KuiToi Dev
 # File core.tcp_server.py
 # Written by: SantaSpeen
-# Core version: 0.4.3
+# Core version: 0.4.5
 # Licence: FPA
 # (c) kuitoi.su 2023
 import asyncio
@@ -325,7 +325,7 @@ class Client:
                     self._split_load(half_size, size, True, file, speed)
                 ]
                 sl0, sl1 = await asyncio.gather(*uploads)
-                tr = time.monotonic() - t
+                tr = (time.monotonic() - t) or 0.0001
                 if self.__Core.lock_upload:
                     self.__Core.lock_upload = False
                 msg = i18n.client_mod_sent.format(round(size / MB, 3), math.ceil(size / tr / MB), int(tr))
@@ -515,6 +515,12 @@ class Client:
         else:
             self.log.debug(f"Invalid car: car_id={car_id}")
 
+    async def reset_car(self, car_id, x, y, z, rot=None):
+        # TODO: reset_car
+        self.log.debug(f"Resetting car from plugin")
+        if rot is None:
+            rot = {"y": 0, "w": 0, "x": 0, "z": 0}
+
     async def _reset_car(self, raw_data):
         cid, car_id = self._get_cid_vid(raw_data)
         if car_id != -1 and cid == self.cid and self._cars[car_id]:

src/core/Client.pyi

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

src/core/__init__.py

@@ -1,8 +1,8 @@
 # Developed by KuiToi Dev
 # File core.__init__.py
 # Written by: SantaSpeen
-# Version 1.4
-# Core version: 0.4.3
+# Version 1.5
+# Core version: 0.4.5
 # 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.4.3'
-__build__ = 2125  # Я это считаю лог файлами
+__version__ = '0.4.5'
+__build__ = 2300  # Я это считаю лог файлами
 __author__ = 'SantaSpeen'
 __author_email__ = 'admin@kuitoi.su'
 __license__ = "FPA"
@@ -30,7 +30,7 @@ from modules import ConfigProvider, EventsSystem
 from modules import Console
 from modules import MultiLanguage
 
-args = parser.parse_args()
+args, _ = parser.parse_known_args()
 if args.version:
     print(f"{__title__}:\n\tVersion: {__version__}\n\tBuild: {__build__}")
     exit(0)

src/core/core.py

@@ -1,7 +1,7 @@
 # Developed by KuiToi Dev
 # File core.core.py
 # Written by: SantaSpeen
-# Version: 0.4.3
+# Version: 0.4.5
 # 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
-# Core version: 0.4.3
+# Core version: 0.4.5
 # 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.4.3
+# Core version: 0.4.5
 # Licence: FPA
 # (c) kuitoi.su 2023
 import asyncio

src/core/tcp_server.pyi

@@ -1,7 +1,7 @@
 # Developed by KuiToi Dev
 # File core.tcp_server.pyi
 # Written by: SantaSpeen
-# Core version: 0.4.3
+# Core version: 0.4.5
 # 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.4.3
+# Core version: 0.4.5
 # 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.4.3
+# Core version: 0.4.5
 # 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.4.3
+# Core version: 0.4.5
 # Licence: FPA
 # (c) kuitoi.su 2023
 import datetime

src/modules/EventsSystem/events_system.py

@@ -73,6 +73,11 @@ class EventsSystem:
         self.log.debug("used builtins_hook")
         builtins.ev = self
 
+    def is_event(self, event_name):
+        return (event_name in self.__async_events.keys() or
+                event_name in self.__events.keys() or
+                event_name in self.__lua_events.keys())
+
     def register_event(self, event_name, event_func, async_event=False, lua=None):
         self.log.debug(f"register_event(event_name='{event_name}', event_func='{event_func}', "
                        f"async_event={async_event}, lua_event={lua}):")
@@ -112,7 +117,7 @@ class EventsSystem:
                 except Exception as e:
                     self.log.error(i18n.events_calling_error.format(event_name, func.__name__))
                     self.log.exception(e)
-        else:
+        elif not self.is_event(event_name):
             self.log.warning(i18n.events_not_found.format(event_name, "kt.call_event()"))
 
         return funcs_data
@@ -130,7 +135,7 @@ class EventsSystem:
                 except Exception as e:
                     self.log.error(i18n.events_calling_error.format(event_name, func.__name__))
                     self.log.exception(e)
-        else:
+        elif not self.is_event(event_name):
             self.log.warning(i18n.events_not_found.format(event_name, "kt.call_async_event()"))
 
         return funcs_data
@@ -151,7 +156,7 @@ class EventsSystem:
                     funcs_data.append(fd)
                 except Exception as e:
                     self.log.error(i18n.events_lua_calling_error.format(f"{e}", event_name, func_name, f"{args}"))
-        else:
+        elif not self.is_event(event_name):
             self.log.warning(i18n.events_not_found.format(event_name, "ev.call_lua_event(), MP.Trigger<>Event()"))
 
         return funcs_data

src/modules/i18n/i18n.py

@@ -8,6 +8,7 @@
 # (c) kuitoi.su 2023
 import builtins
 import json
+import os
 from json import JSONDecodeError
 
 from core.utils import get_logger
@@ -25,135 +26,110 @@ class i18n:
 
 class MultiLanguage:
 
-    def __init__(self, language: str = None, files_dir="modules/i18n/files/", encoding=None):
+    def __init__(self, language: str = None, files_dir="translates/", encoding=None):
         if encoding is None:
             encoding = config.enc
         if language is None:
             language = "en"
-        self.__data = {}
+        self.__data = {
+            "hello": "Hello from KuiToi-Server!",
+            "config_path": "Use {} to configure.",
+            "init_ok": "Initialization completed.",
+            "start": "Server started!",
+            "stop": "Server stopped!",
+            "auth_need_key": "BeamMP key is required to run!",
+            "auth_empty_key": "BeamMP key is empty!",
+            "auth_cannot_open_browser": "Failed to open browser: {}",
+            "auth_use_link": "Use this link: {}",
+            "GUI_yes": "Yes",
+            "GUI_no": "No",
+            "GUI_ok": "OK",
+            "GUI_cancel": "Cancel",
+            "GUI_need_key_message": "BeamMP key is required to run!\nDo you want to open the link in your browser to get the key?",
+            "GUI_enter_key_message": "Please enter the key:",
+            "GUI_cannot_open_browser": "Failed to open browser.\nUse this link: {}",
+            "web_start": "WebAPI started on {} (CTRL+C to stop)",
+            "core_bind_failed": "Failed to bind port. Error: {}",
+            "core_direct_mode": "Server started in direct connection mode.",
+            "core_auth_server_error": "Received invalid response from BeamMP authentication server.",
+            "core_auth_server_refused": "The BeamMP authentication server refused your key. Reason: {}",
+            "core_auth_server_refused_no_reason": "The BeamMP authentication server did not provide a reason.",
+            "core_auth_server_refused_direct_node": "The server is still running, but in direct connection mode.",
+            "core_auth_server_no_response": "Failed to authenticate the server.",
+            "core_mods_loaded": "Loaded {} mods. {}Mb",
+            "core_identifying_connection": "Processing new connection...",
+            "core_player_kick_outdated": "Incorrect version of BeamMP.",
+            "core_player_kick_bad_key": "Invalid key passed!",
+            "core_player_kick_invalid_key": "Invalid key! Please restart your game.",
+            "core_player_kick_auth_server_fail": "BeamMP authentication server failed! Please try to connect again in 5 minutes.",
+            "core_player_kick_stale": "Stale client. (Replaced by new connection)",
+            "core_player_kick_no_allowed_default_reason": "You are not welcome on this server. Access denied.",
+            "core_player_kick_server_full": "Server is full.",
+            "core_player_set_id": "Player set ID {}",
+            "core_identifying_okay": "Successful login.",
+            "game_welcome_message": "Welcome {}!",
+            "client_mod_request": "Requested mod: {}",
+            "client_mod_sent": "Mod sent: Size: {}mb, Speed: {}Mb/s ({}sec)",
+            "client_mod_sent_limit": " (limit {}Mb/s)",
+            "client_mod_sent_error": "Error sending mod: {}",
+            "client_sync_time": "Sync time {}sec.",
+            "client_kicked": "Kicked for reason: \"{}\"",
+            "client_event_invalid_data": "Invalid data returned from event: {}",
+            "client_player_disconnected": "Left the server. Playtime: {} min",
+            "events_not_callable": "Unable to add event \"{}\". Use \"{}\" instead. Skipping...",
+            "events_not_found": "Event \"{}\" is not registered. Maybe {}? Skipping...",
+            "events_calling_error": "Error calling \"{}\" in function \"{}\".",
+            "events_lua_function_not_found": "Unable to call {}lua event - \"{}\" not found.",
+            "events_lua_local": "local ",
+            "events_lua_calling_error": "Error: \"{}\" - calling lua event \"{}\", function: \"{}\", arguments: {}",
+            "plugins_not_found_load": "Function \"def load():\" not found.",
+            "plugins_not_found_start": "Function \"def start():\" not found.",
+            "plugins_not_found_unload": "Function \"def unload():\" not found.",
+            "plugins_kt_invalid": "\"kt\" variable does not belong to the KuiToi class.",
+            "plugins_invalid": "Plugin \"{}\" cannot be run in KuiToi.",
+            "plugins_error_loading": "An error occurred while loading the plugin {}: {}",
+            "plugins_lua_enabled": "You have enabled Lua plugin support.",
+            "plugins_lua_nuances_warning": "There are some nuances when working with Kuiti. If you have a suggestion for their solution, and it is related to KuiToi, please contact the developer.",
+            "plugins_lua_legacy_config_create_warning": "Some BeamMP plugins require a properly configured ServerConfig.toml file to function.",
+            "plugins_lua_legacy_config_create": "Creating it.",
+            "plugins_lua_unload": "Stopping Lua plugin: {}",
+            "man_message_man": "man - Shows the help page for COMMAND.\nUsage: man COMMAND",
+            "help_message_man": "Shows the help page for COMMAND.",
+            "man_for": "Help page for",
+            "man_message_not_found": "man: Help page not found.",
+            "man_command_not_found": "man: Command \"{}\" not found!",
+            "man_message_help": "help - Shows the names and brief descriptions of commands.\nUsage: help [--raw]\nThe `help` command displays a list of all available commands, with a brief description for each command.",
+            "help_message_help": "Shows the names and brief descriptions of commands",
+            "help_command": "Command",
+            "help_message": "Text",
+            "help_message_not_found": "No text found",
+            "man_message_stop": "stop - Stops the server.\nUsage: stop",
+            "help_message_stop": "Stops the server.",
+            "man_message_exit": "exit - Stops the server.\nUsage: exit",
+            "help_message_exit": "Stops the server."
+        }
+        self.__en_data = self.__data.copy()
         self.__i18n = None
         self.__encoding = encoding
         self.language = language
+        if not os.path.exists(files_dir):
+            os.makedirs(files_dir)
+        if not os.path.exists(files_dir + "en.json"):
+            with open(files_dir + "en.json", "w") as f:
+                f.write(json.dumps(self.__en_data, indent=2))
         self.files_dir = files_dir
         self.log = get_logger("i18n")
+        self.fi = False
         self.set_language(language)
 
-    def set_language(self, language):
-        if language is None:
-            language = "en"
-        self.log.debug(f"set_language({language})")
-        self.language = language
-        if language != "en":
-            self.open_file()
+    def set_language(self, language="en"):
+        if self.language == language and self.fi:
+            return
         else:
-            # noinspection PyDictDuplicateKeys
-            self.__data = {
-                "": "Basic phases",
-                "hello": "Hello from KuiToi-Server!",
-                "config_path": "Use {} to configure.",
-                "init_ok": "Initialization completed.",
-                "start": "Server started!",
-                "stop": "Server stopped!",
-
-                "": "Server auth",
-                "auth_need_key": "BeamMP key is required to run!",
-                "auth_empty_key": "BeamMP key is empty!",
-                "auth_cannot_open_browser": "Failed to open browser: {}",
-                "auth_use_link": "Use this link: {}",
-
-                "": "GUI phases",
-                "GUI_yes": "Yes",
-                "GUI_no": "No",
-                "GUI_ok": "OK",
-                "GUI_cancel": "Cancel",
-                "GUI_need_key_message": "BeamMP key is required to run!\nDo you want to open the link in your browser to get the key?",
-                "GUI_enter_key_message": "Please enter the key:",
-                "GUI_cannot_open_browser": "Failed to open browser.\nUse this link: {}",
-
-                "": "Web phases",
-                "web_start": "WebAPI started on {} (CTRL+C to stop)",
-
-                "": "Core phrases",
-                "core_bind_failed": "Failed to bind port. Error: {}",
-                "core_direct_mode": "Server started in direct connection mode.",
-                "core_auth_server_error": "Received invalid response from BeamMP authentication server.",
-                "core_auth_server_refused": "The BeamMP authentication server refused your key. Reason: {}",
-                "core_auth_server_refused_no_reason": "The BeamMP authentication server did not provide a reason.",
-                "core_auth_server_refused_direct_node": "The server is still running, but in direct connection mode.",
-                "core_auth_server_no_response": "Failed to authenticate the server.",
-                "core_mods_loaded": "Loaded {} mods. {}Mb",
-                "core_identifying_connection": "Processing new connection...",
-                "core_player_kick_outdated": "Incorrect version of BeamMP.",
-                "core_player_kick_bad_key": "Invalid key passed!",
-                "core_player_kick_invalid_key": "Invalid key! Please restart your game.",
-                "core_player_kick_auth_server_fail": "BeamMP authentication server failed! Please try to connect again in 5 minutes.",
-                "core_player_kick_stale": "Stale client. (Replaced by new connection)",
-                "core_player_kick_no_allowed_default_reason": "You are not welcome on this server. Access denied.",
-                "core_player_kick_server_full": "Server is full.",
-                "core_player_set_id": "Player set ID {}",
-                "core_identifying_okay": "Successful login.",
-
-                "": "In-game phrases",
-                "game_welcome_message": "Welcome {}!",
-
-                "": "Client class phrases",
-                "client_mod_request": "Requested mod: {}",
-                "client_mod_sent": "Mod sent: Size: {}mb, Speed: {}Mb/s ({}sec)",
-                "client_mod_sent_limit": " (limit {}Mb/s)",
-                "client_mod_sent_error": "Error sending mod: {}",
-                "client_sync_time": "Sync time {}sec.",
-                "client_kicked": "Kicked for reason: \"{}\"",
-                "client_event_invalid_data": "Invalid data returned from event: {}",
-                "client_player_disconnected": "Left the server. Playtime: {} min",
-
-                "": "Events system",
-
-                "events_not_callable": "Unable to add event \"{}\". Use \"{}\" instead. Skipping...",
-                "events_not_found": "Event \"{}\" is not registered. Maybe {}? Skipping...",
-                "events_calling_error": "Error calling \"{}\" in function \"{}\".",
-                "events_lua_function_not_found": "Unable to call {}lua event - \"{}\" not found.",
-                "events_lua_local": "local ",
-                "events_lua_calling_error": "Error: \"{}\" - calling lua event \"{}\", function: \"{}\", arguments: {}",
-
-                "": "Plugins loader",
-
-                "plugins_not_found_load": "Function \"def load():\" not found.",
-                "plugins_not_found_start": "Function \"def start():\" not found.",
-                "plugins_not_found_unload": "Function \"def unload():\" not found.",
-                "plugins_kt_invalid": "\"kt\" variable does not belong to the KuiToi class.",
-                "plugins_invalid": "Plugin \"{}\" cannot be run in KuiToi.",
-                "plugins_error_loading": "An error occurred while loading the plugin {}: {}",
-
-                "": "Lua plugins loader",
-
-                "plugins_lua_enabled": "You have enabled Lua plugin support.",
-                "plugins_lua_nuances_warning": "There are some nuances when working with Kuiti. If you have a suggestion for their solution, and it is related to KuiToi, please contact the developer.",
-                "plugins_lua_legacy_config_create_warning": "Some BeamMP plugins require a properly configured ServerConfig.toml file to function.",
-                "plugins_lua_legacy_config_create": "Creating it.",
-                "plugins_lua_unload": "Stopping Lua plugin: {}",
-
-                "": "Command: man",
-                "man_message_man": "man - Shows the help page for COMMAND.\nUsage: man COMMAND",
-                "help_message_man": "Shows the help page for COMMAND.",
-                "man_for": "Help page for",
-                "man_message_not_found": "man: Help page not found.",
-                "man_command_not_found": "man: Command \"{}\" not found!",
-
-                "": "Command: help",
-                "man_message_help": "help - Shows the names and brief descriptions of commands.\nUsage: help [--raw]\nThe `help` command displays a list of all available commands, with a brief description for each command.",
-                "help_message_help": "Shows the names and brief descriptions of commands",
-                "help_command": "Command",
-                "help_message": "Text",
-                "help_message_not_found": "No text found",
-
-                "": "Command: stop",
-                "man_message_stop": "stop - Stops the server.\nUsage: stop",
-                "help_message_stop": "Stops the server.",
-
-                "": "Command: exit",
-                "man_message_exit": "exit - Stops the server.\nUsage: exit",
-                "help_message_exit": "Stops the server."
-            }
+            self.fi = True
+            self.log.debug(f"set_language({language})")
+            self.language = language
+            self.open_file()
         self.__i18n = i18n(self.__data)
 
     def open_file(self):
@@ -165,9 +141,9 @@ class MultiLanguage:
             return
         except JSONDecodeError:
             self.log.error(
-                f"Localisation \"{self.language}.json\" have JsonDecodeError. Using default localisation: en.")
+                f"Localisation \"{file}\" have JsonDecodeError. Using default localisation: en.")
         except FileNotFoundError:
-            self.log.warning(f"Localisation \"{self.language}.json\" not found; Using default localisation: en.")
+            self.log.warning(f"Localisation \"{file}\" not found; Using default localisation: en.")
         self.set_language("en")
 
     def builtins_hook(self) -> None:

win-metadata.yml

@@ -0,0 +1,19 @@
+# pip install pyinstaller-versionfile
+# create-version-file win-metadata.yml --outfile win-ver_info.txt
+Version: 0.4.5
+CompanyName: KuiToi
+FileDescription: KuiToi Server
+InternalName: KuiToi Server
+LegalCopyright: © Maxim Khomutov
+OriginalFilename: KuiToi-Server.exe
+ProductName: KuiToi Server
+Translation:
+  # ru-RU
+  - langID: 1049
+    charsetID: 1251
+  # en-US
+  - langID: 1033
+    charsetID: 1251
+  # zh-CN
+  - langID: 2052
+    charsetID: 950

win-pyinstaller.json

@@ -0,0 +1,85 @@
+{
+ "version": "auto-py-to-exe-configuration_v1",
+ "pyinstallerOptions": [
+  {
+   "optionDest": "noconfirm",
+   "value": true
+  },
+  {
+   "optionDest": "filenames",
+   "value": "C:/Users/Santa/PycharmProjects/kuitoi-Server/src/main.py"
+  },
+  {
+   "optionDest": "onefile",
+   "value": true
+  },
+  {
+   "optionDest": "console",
+   "value": true
+  },
+  {
+   "optionDest": "icon_file",
+   "value": "C:/Users/Santa/PycharmProjects/kuitoi-Server/win-logo.ico"
+  },
+  {
+   "optionDest": "name",
+   "value": "KuiToi-Server"
+  },
+  {
+   "optionDest": "ascii",
+   "value": true
+  },
+  {
+   "optionDest": "clean_build",
+   "value": false
+  },
+  {
+   "optionDest": "strip",
+   "value": false
+  },
+  {
+   "optionDest": "noupx",
+   "value": false
+  },
+  {
+   "optionDest": "disable_windowed_traceback",
+   "value": false
+  },
+  {
+   "optionDest": "version_file",
+   "value": "C:/Users/Santa/PycharmProjects/kuitoi-Server/win-ver_info.txt"
+  },
+  {
+   "optionDest": "embed_manifest",
+   "value": true
+  },
+  {
+   "optionDest": "uac_admin",
+   "value": false
+  },
+  {
+   "optionDest": "uac_uiaccess",
+   "value": false
+  },
+  {
+   "optionDest": "win_private_assemblies",
+   "value": false
+  },
+  {
+   "optionDest": "win_no_prefer_redirects",
+   "value": false
+  },
+  {
+   "optionDest": "bootloader_ignore_signals",
+   "value": false
+  },
+  {
+   "optionDest": "argv_emulation",
+   "value": false
+  }
+ ],
+ "nonPyinstallerOptions": {
+  "increaseRecursionLimit": true,
+  "manualArguments": ""
+ }
+}