From b3dffe74ec844b5ae82df09504acb86f66ff5e32 Mon Sep 17 00:00:00 2001
From: SantaSpeen <SantaSpeen@gmail.com>
Date: Fri, 21 Jul 2023 22:51:22 +0300
Subject: [PATCH] Lau plugins now run in thread; Remove unused event; Add event
 from to Lua;

---
 src/core/core.py                                |  5 +++--
 src/modules/PluginsLoader/lua_plugins_loader.py | 15 ++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/core/core.py b/src/core/core.py
index 43fe13a..d66d36d 100644
--- a/src/core/core.py
+++ b/src/core/core.py
@@ -267,7 +267,7 @@ class Core:
             t = asyncio.wait(tasks, return_when=asyncio.FIRST_EXCEPTION)
 
             await ev.call_async_event("_plugins_start")
-            await ev.call_async_event("_lua_plugins_start")
+            # await ev.call_async_event("_lua_plugins_start")
 
             self.run = True
             self.log.info(i18n.start)
@@ -289,10 +289,11 @@ class Core:
         asyncio.run(self.main())
 
     async def stop(self):
+        ev.call_lua_event("onShutdown")
         ev.call_event("onServerStopped")
         await ev.call_async_event("onServerStopped")
         await ev.call_async_event("_plugins_unload")
-        await ev.call_async_event("_lua_plugins_unload")
+        ev.call_event("_lua_plugins_unload")
         self.run = False
         self.log.info(i18n.stop)
         if config.WebAPI["enabled"]:
diff --git a/src/modules/PluginsLoader/lua_plugins_loader.py b/src/modules/PluginsLoader/lua_plugins_loader.py
index ad5141f..e9ad8fb 100644
--- a/src/modules/PluginsLoader/lua_plugins_loader.py
+++ b/src/modules/PluginsLoader/lua_plugins_loader.py
@@ -4,8 +4,8 @@ import os
 import platform
 import random
 import shutil
+from threading import Thread
 
-import lupa
 from lupa.lua53 import LuaRuntime
 
 from core import get_logger
@@ -510,12 +510,11 @@ class LuaPluginsLoader:
         self.log = get_logger("LuaPluginsLoader")
         self.loaded_str = "Lua plugins: "
         ev.register_event("_lua_plugins_get", lambda x: self.lua_plugins)
-        ev.register_event("_lua_plugins_start", self.start)
         ev.register_event("_lua_plugins_unload", self.unload)
         console.add_command("lua_plugins", lambda x: self.loaded_str[:-2])
         console.add_command("lua_pl", lambda x: self.loaded_str[:-2])
 
-    async def load(self):
+    def load(self):
         self.log.debug("Loading Lua plugins...")
         py_folders = ev.call_event("_plugins_get")[0]
         for obj in os.listdir(self.plugins_dir):
@@ -544,16 +543,14 @@ class LuaPluginsLoader:
             with open(os.path.join(path, "main.lua"), 'r', encoding=config.enc) as f:
                 code += f.read()
             try:
-                lua.execute(code)
+                th = Thread(target=lua.execute, args=(code,), name=f"lua_plugin_{obj}-Thread")
+                th.start()
                 self.loaded_str += f"{obj}:ok, "
-                self.lua_plugins.update({obj: {"mp": mp, "lua": lua}})
+                self.lua_plugins.update({obj: {"mp": mp, "lua": lua, "thread": th}})
             except Exception as e:
                 self.log.error(f"Cannot load lua plugin from `{obj}/main.lua`")
                 self.log.exception(e)
                 self.loaded_str += f"{obj}:no, "
 
-    async def start(self, _):
-        ...
-
-    async def unload(self, _):
+    def unload(self, _):
         ...