Fix various memory leaks with RAII

include/Lua/LuaSystem.hpp

@@ -3,14 +3,15 @@
 ///
 
 #pragma once
+#include "lua.hpp"
+#include <any>
 #include <filesystem>
 #include <iostream>
-#include "lua.hpp"
-#include <vector>
-#include <thread>
 #include <mutex>
+#include <memory>
 #include <set>
-#include <any>
+#include <thread>
+#include <vector>
 
 namespace fs = std::filesystem;
 
@@ -18,7 +19,8 @@ struct LuaArg{
     std::vector<std::any> args;
     void PushArgs(lua_State* State) {
         for (std::any arg : args) {
-            if(!arg.has_value())return;
+            if (!arg.has_value())
+                return;
             std::string Type = arg.type().name();
             if (Type.find("bool") != std::string::npos) {
                 lua_pushboolean(State, std::any_cast<bool>(arg));
@@ -29,7 +31,8 @@ struct LuaArg{
             if (Type.find("int") != std::string::npos) {
                 lua_pushinteger(State, std::any_cast<int>(arg));
             }
-            if(Type.find("float") != std::string::npos){ lua_pushnumber(State,std::any_cast<float>(arg));
+            if (Type.find("float") != std::string::npos) {
+                lua_pushnumber(State, std::any_cast<float>(arg));
             }
         }
     }
@@ -37,15 +40,19 @@ struct LuaArg{
 
 class Lua {
 private:
-    std::set<std::pair<std::string,std::string>> RegisteredEvents;
+    std::set<std::pair<std::string, std::string>> _RegisteredEvents;
-    lua_State *luaState = luaL_newstate();
+    lua_State* luaState { nullptr };
-    fs::file_time_type LastWrote;
+    fs::file_time_type _LastWrote;
-    std::string PluginName;
+    std::string _PluginName;
-    std::string FileName;
+    std::string _FileName;
+    bool _StopThread = false;
+    bool _Console = false;
+    // this is called by the ctor to ensure RAII
+    void Init();
 
 public:
     void RegisterEvent(const std::string& Event, const std::string& FunctionName);
-    std::string GetRegistered(const std::string&Event);
+    std::string GetRegistered(const std::string& Event) const;
     void UnRegisterEvent(const std::string& Event);
     void SetLastWrite(fs::file_time_type time);
     bool IsRegistered(const std::string& Event);
@@ -53,16 +60,19 @@ public:
     void Execute(const std::string& Command);
     void SetFileName(const std::string& Name);
     fs::file_time_type GetLastWrite();
-    std::string GetPluginName();
+    std::string GetPluginName() const;
-    std::string GetFileName();
+    std::string GetFileName() const;
-    bool StopThread = false;
-    bool Console = false;
     lua_State* GetState();
+    const lua_State* GetState() const;
     char* GetOrigin();
     std::mutex Lock;
     void Reload();
-    void Init();
+    Lua(const std::string& PluginName, const std::string& FileName, fs::file_time_type LastWrote, bool Console = false);
+    Lua(bool Console = false);
+    ~Lua();
+    void SetStopThread(bool StopThread) { _StopThread = StopThread; }
+    bool GetStopThread() const { return _StopThread; }
 };
 int CallFunction(Lua* lua, const std::string& FuncName, LuaArg* args);
 int TriggerLuaEvent(const std::string& Event, bool local, Lua* Caller, LuaArg* arg, bool Wait);
-extern std::set<Lua*> PluginEngine;
+extern std::set<std::unique_ptr<Lua>> PluginEngine;

src/Console.cpp

@@ -130,9 +130,7 @@ void SetupConsole() {
 }
 void ConsoleInit() {
     SetupConsole();
-    LuaConsole = new Lua();
+    LuaConsole = new Lua(true);
-    LuaConsole->Console = true;
-    LuaConsole->Init();
     printf("> ");
     std::thread In(ReadCin);
     In.detach();

src/Lua/LuaMain.cpp

@@ -2,10 +2,10 @@
 /// Created by Anonymous275 on 5/20/2020
 ///
 
+#include "Logger.h"
 #include "Lua/LuaSystem.hpp"
 #include "Security/Enc.h"
 #include "Settings.h"
-#include "Logger.h"
 #include <thread>
 
 #ifdef __linux
@@ -13,28 +13,28 @@
 #include <sys/stat.h>
 #endif // __linux
 
-std::set<Lua*> PluginEngine;
+std::set<std::unique_ptr<Lua>> PluginEngine;
 bool NewFile(const std::string& Path) {
-    for(Lua*Script : PluginEngine){
+    for (auto& Script : PluginEngine) {
-        if(Path == Script->GetFileName())return false;
+        if (Path == Script->GetFileName())
+            return false;
     }
     return true;
 }
 void RegisterFiles(const std::string& Path, bool HotSwap) {
     std::string Name = Path.substr(Path.find_last_of('\\') + 1);
-    if(!HotSwap)info(Sec("Loading plugin : ") + Name);
+    if (!HotSwap)
+        info(Sec("Loading plugin : ") + Name);
     for (const auto& entry : fs::directory_iterator(Path)) {
         auto pos = entry.path().string().find(Sec(".lua"));
         if (pos != std::string::npos && entry.path().string().length() - pos == 4) {
             if (!HotSwap || NewFile(entry.path().string())) {
-                Lua *Script = new Lua();
+                auto FileName = entry.path().string();
-                PluginEngine.insert(Script);
+                std::unique_ptr<Lua> ScriptToInsert(new Lua(Name, FileName, fs::last_write_time(FileName)));
-                Script->SetFileName(entry.path().string());
+                auto& Script = *ScriptToInsert;
-                Script->SetPluginName(Name);
+                PluginEngine.insert(std::move(ScriptToInsert));
-                Script->SetLastWrite(fs::last_write_time(Script->GetFileName()));
+                if (HotSwap)
-                Script->Init();
+                    info(Sec("[HOTSWAP] Added : ") + Script.GetFileName().substr(Script.GetFileName().find('\\')));
-                if(HotSwap)info(Sec("[HOTSWAP] Added : ") +
-                Script->GetFileName().substr(Script->GetFileName().find('\\')));
             }
         }
     }
@@ -50,19 +50,17 @@ void FolderList(const std::string& Path,bool HotSwap){
 [[noreturn]] void HotSwaps(const std::string& path) {
     DebugPrintTID();
     while (true) {
-        for(Lua*Script : PluginEngine){
+        for (auto& Script : PluginEngine) {
             struct stat Info {};
             if (stat(Script->GetFileName().c_str(), &Info) != 0) {
-                Script->StopThread = true;
+                Script->SetStopThread(true);
                 PluginEngine.erase(Script);
-                info(Sec("[HOTSWAP] Removed : ")+
+                info(Sec("[HOTSWAP] Removed : ") + Script->GetFileName().substr(Script->GetFileName().find('\\')));
-                Script->GetFileName().substr(Script->GetFileName().find('\\')));
                 break;
             }
             if (Script->GetLastWrite() != fs::last_write_time(Script->GetFileName())) {
-                Script->StopThread = true;
+                Script->SetStopThread(true);
-                info(Sec("[HOTSWAP] Updated : ")+
+                info(Sec("[HOTSWAP] Updated : ") + Script->GetFileName().substr(Script->GetFileName().find('\\')));
-                     Script->GetFileName().substr(Script->GetFileName().find('\\')));
                 Script->SetLastWrite(fs::last_write_time(Script->GetFileName()));
                 Script->Reload();
             }

src/Lua/LuaSystem.cpp

@@ -3,18 +3,19 @@
 ///
 
 #include "Lua/LuaSystem.hpp"
-#include "Security/Enc.h"
 #include "Client.hpp"
-#include "Settings.h"
-#include "Network.h"
 #include "Logger.h"
+#include "Network.h"
+#include "Security/Enc.h"
+#include "Settings.h"
 #include "UnixCompat.h"
-#include <iostream>
 #include <future>
+#include <iostream>
 #include <utility>
 
 LuaArg* CreateArg(lua_State* L, int T, int S) {
-    if(S > T)return nullptr;
+    if (S > T)
+        return nullptr;
     auto* temp = new LuaArg;
     for (int C = S; C <= T; C++) {
         if (lua_isstring(L, C)) {
@@ -32,17 +33,23 @@ LuaArg* CreateArg(lua_State *L,int T,int S){
 void ClearStack(lua_State* L) {
     lua_settop(L, 0);
 }
-Lua* GetScript(lua_State *L){
+std::optional<std::reference_wrapper<Lua>> GetScript(lua_State* L) {
-    for(Lua*Script : PluginEngine){
+    for (auto& Script : PluginEngine) {
-        if (Script->GetState() == L)return Script;
+        if (Script->GetState() == L)
+            return *Script;
     }
-    return nullptr;
+    return std::nullopt;
 }
 void SendError(lua_State* L, const std::string& msg) {
-    Lua* S = GetScript(L);
+    Assert(L);
+    auto MaybeS = GetScript(L);
     std::string a;
-    if(S == nullptr)a = Sec("Console");
+    if (!MaybeS.has_value()) {
-    else a = S->GetFileName().substr(S->GetFileName().find('\\'));
+        a = Sec("_Console");
+    } else {
+        Lua& S = MaybeS.value();
+        a = S.GetFileName().substr(S.GetFileName().find('\\'));
+    }
     warn(a + Sec(" | Incorrect Call of ") + msg);
 }
 int Trigger(Lua* lua, const std::string& R, LuaArg* arg) {
@@ -52,30 +59,35 @@ int Trigger(Lua*lua,const std::string& R, LuaArg*arg){
     std::thread t(std::move(task));
     t.detach();
     auto status = f1.wait_for(std::chrono::seconds(5));
-    if(status != std::future_status::timeout)return f1.get();
+    if (status != std::future_status::timeout)
+        return f1.get();
     SendError(lua->GetState(), R + " took too long to respond");
     return 0;
 }
 int FutureWait(Lua* lua, const std::string& R, LuaArg* arg, bool Wait) {
+    Assert(lua);
     std::packaged_task<int()> task([lua, R, arg] { return Trigger(lua, R, arg); });
     std::future<int> f1 = task.get_future();
     std::thread t(std::move(task));
     t.detach();
     int T = 0;
-    if(Wait)T = 6;
+    if (Wait)
+        T = 6;
     auto status = f1.wait_for(std::chrono::seconds(T));
-    if(status != std::future_status::timeout)return f1.get();
+    if (status != std::future_status::timeout)
+        return f1.get();
     return 0;
 }
 int TriggerLuaEvent(const std::string& Event, bool local, Lua* Caller, LuaArg* arg, bool Wait) {
     int R = 0;
-    for(Lua*Script : PluginEngine){
+    for (auto& Script : PluginEngine) {
         if (Script->IsRegistered(Event)) {
             if (local) {
                 if (Script->GetPluginName() == Caller->GetPluginName()) {
-                    R += FutureWait(Script,Script->GetRegistered(Event),arg,Wait);
+                    R += FutureWait(Script.get(), Script->GetRegistered(Event), arg, Wait);
                 }
-            }else R += FutureWait(Script,Script->GetRegistered(Event), arg,Wait);
+            } else
+                R += FutureWait(Script.get(), Script->GetRegistered(Event), arg, Wait);
         }
     }
     return R;
@@ -83,7 +95,7 @@ int TriggerLuaEvent(const std::string& Event,bool local,Lua*Caller,LuaArg* arg,b
 bool ConsoleCheck(lua_State* L, int r) {
     if (r != LUA_OK) {
         std::string msg = lua_tostring(L, -1);
-        warn(Sec("Console | ") + msg);
+        warn(Sec("_Console | ") + msg);
         return false;
     }
     return true;
@@ -91,29 +103,40 @@ bool ConsoleCheck(lua_State *L, int r){
 bool CheckLua(lua_State* L, int r) {
     if (r != LUA_OK) {
         std::string msg = lua_tostring(L, -1);
-        Lua * S = GetScript(L);
+        auto MaybeS = GetScript(L);
-        std::string a = S->GetFileName().substr(S->GetFileName().find('\\'));
+        if (MaybeS.has_value()) {
+            Lua& S = MaybeS.value();
+            std::string a = S.GetFileName().substr(S.GetFileName().find('\\'));
             warn(a + " | " + msg);
             return false;
         }
+        // What the fuck, what do we do?!
+        AssertNotReachable();
+    }
     return true;
 }
 
 int lua_RegisterEvent(lua_State* L) {
     int Args = lua_gettop(L);
-    Lua* Script = GetScript(L);
+    auto MaybeScript = GetScript(L);
+    Assert(MaybeScript.has_value());
+    Lua& Script = MaybeScript.value();
     if (Args == 2 && lua_isstring(L, 1) && lua_isstring(L, 2)) {
-        Script->RegisterEvent(lua_tostring(L,1),lua_tostring(L,2));
+        Script.RegisterEvent(lua_tostring(L, 1), lua_tostring(L, 2));
-    }else SendError(L,Sec("RegisterEvent invalid argument count expected 2 got ") + std::to_string(Args));
+    } else
+        SendError(L, Sec("RegisterEvent invalid argument count expected 2 got ") + std::to_string(Args));
     return 0;
 }
 int lua_TriggerEventL(lua_State* L) {
     int Args = lua_gettop(L);
-    Lua* Script = GetScript(L);
+    auto MaybeScript = GetScript(L);
+    Assert(MaybeScript.has_value());
+    Lua& Script = MaybeScript.value();
     if (Args > 0) {
         if (lua_isstring(L, 1)) {
-            TriggerLuaEvent(lua_tostring(L, 1), true, Script, CreateArg(L,Args,2),false);
+            TriggerLuaEvent(lua_tostring(L, 1), true, &Script, CreateArg(L, Args, 2), false);
-        }else SendError(L,Sec("TriggerLocalEvent wrong argument [1] need string"));
+        } else
+            SendError(L, Sec("TriggerLocalEvent wrong argument [1] need string"));
     } else {
         SendError(L, Sec("TriggerLocalEvent not enough arguments expected 1 got 0"));
     }
@@ -122,12 +145,16 @@ int lua_TriggerEventL(lua_State *L){
 
 int lua_TriggerEventG(lua_State* L) {
     int Args = lua_gettop(L);
-    Lua* Script = GetScript(L);
+    auto MaybeScript = GetScript(L);
+    Assert(MaybeScript.has_value());
+    Lua& Script = MaybeScript.value();
     if (Args > 0) {
         if (lua_isstring(L, 1)) {
-            TriggerLuaEvent(lua_tostring(L, 1), false, Script, CreateArg(L,Args,2),false);
+            TriggerLuaEvent(lua_tostring(L, 1), false, &Script, CreateArg(L, Args, 2), false);
-        }else SendError(L,Sec("TriggerGlobalEvent wrong argument [1] need string"));
+        } else
-    }else SendError(L,Sec("TriggerGlobalEvent not enough arguments"));
+            SendError(L, Sec("TriggerGlobalEvent wrong argument [1] need string"));
+    } else
+        SendError(L, Sec("TriggerGlobalEvent not enough arguments"));
     return 0;
 }
 
@@ -147,7 +174,8 @@ void SafeExecution(Lua* lua,const std::string& FuncName){
         __try {
             int R = lua_pcall(luaState, 0, 0, 0);
             CheckLua(luaState, R);
-        }__except(Handle(GetExceptionInformation(),Origin)){}
+        } __except (Handle(GetExceptionInformation(), Origin)) {
+        }
 #else // unix
         int R = lua_pcall(luaState, 0, 0, 0);
         CheckLua(luaState, R);
@@ -163,15 +191,18 @@ void ExecuteAsync(Lua* lua,const std::string& FuncName){
 }
 void CallAsync(Lua* lua, const std::string& Func, int U) {
     DebugPrintTID();
-    lua->StopThread = false;
+    lua->SetStopThread(false);
     int D = 1000 / U;
-    while(!lua->StopThread){
+    while (!lua->GetStopThread()) {
         ExecuteAsync(lua, Func);
         std::this_thread::sleep_for(std::chrono::milliseconds(D));
     }
 }
 int lua_StopThread(lua_State* L) {
-    GetScript(L)->StopThread = true;
+    auto MaybeScript = GetScript(L);
+    Assert(MaybeScript.has_value());
+    // ugly, but whatever, this is safe as fuck
+    MaybeScript.value().get().SetStopThread(true);
     return 0;
 }
 int lua_CreateThread(lua_State* L) {
@@ -182,12 +213,19 @@ int lua_CreateThread(lua_State *L){
             if (lua_isinteger(L, 2) || lua_isnumber(L, 2)) {
                 int U = int(lua_tointeger(L, 2));
                 if (U > 0 && U < 501) {
-                    std::thread t1(CallAsync,GetScript(L),STR,U);
+                    auto MaybeScript = GetScript(L);
+                    Assert(MaybeScript.has_value());
+                    Lua& Script = MaybeScript.value();
+                    std::thread t1(CallAsync, &Script, STR, U);
                     t1.detach();
-                }else SendError(L,Sec("CreateThread wrong argument [2] number must be between 1 and 500"));
+                } else
-            }else SendError(L,Sec("CreateThread wrong argument [2] need number"));
+                    SendError(L, Sec("CreateThread wrong argument [2] number must be between 1 and 500"));
-        }else SendError(L,Sec("CreateThread wrong argument [1] need string"));
+            } else
-    }else SendError(L,Sec("CreateThread not enough arguments"));
+                SendError(L, Sec("CreateThread wrong argument [2] need number"));
+        } else
+            SendError(L, Sec("CreateThread wrong argument [1] need string"));
+    } else
+        SendError(L, Sec("CreateThread not enough arguments"));
     return 0;
 }
 int lua_Sleep(lua_State* L) {
@@ -202,7 +240,8 @@ int lua_Sleep(lua_State *L){
 }
 Client* GetClient(int ID) {
     for (Client* c : CI->Clients) {
-        if(c != nullptr && c->GetID() == ID)return c;
+        if (c != nullptr && c->GetID() == ID)
+            return c;
     }
     return nullptr;
 }
@@ -210,8 +249,10 @@ int lua_isConnected(lua_State *L){
     if (lua_isnumber(L, 1)) {
         int ID = int(lua_tonumber(L, 1));
         Client* c = GetClient(ID);
-        if(c != nullptr)lua_pushboolean(L, c->isConnected);
+        if (c != nullptr)
-        else return 0;
+            lua_pushboolean(L, c->isConnected);
+        else
+            return 0;
     } else {
         SendError(L, Sec("isConnected not enough arguments"));
         return 0;
@@ -222,8 +263,10 @@ int lua_GetPlayerName(lua_State *L){
     if (lua_isnumber(L, 1)) {
         int ID = int(lua_tonumber(L, 1));
         Client* c = GetClient(ID);
-        if(c != nullptr)lua_pushstring(L, c->GetName().c_str());
+        if (c != nullptr)
-        else return 0;
+            lua_pushstring(L, c->GetName().c_str());
+        else
+            return 0;
     } else {
         SendError(L, Sec("GetPlayerName not enough arguments"));
         return 0;
@@ -238,8 +281,10 @@ int lua_GetDID(lua_State *L){
     if (lua_isnumber(L, 1)) {
         int ID = int(lua_tonumber(L, 1));
         Client* c = GetClient(ID);
-        if(c != nullptr)lua_pushstring(L, c->GetDID().c_str());
+        if (c != nullptr)
-        else return 0;
+            lua_pushstring(L, c->GetDID().c_str());
+        else
+            return 0;
     } else {
         SendError(L, Sec("GetDID not enough arguments"));
         return 0;
@@ -250,13 +295,15 @@ int lua_GetAllPlayers(lua_State *L){
     lua_newtable(L);
     int i = 1;
     for (Client* c : CI->Clients) {
-        if(c == nullptr)continue;
+        if (c == nullptr)
+            continue;
         lua_pushinteger(L, c->GetID());
         lua_pushstring(L, c->GetName().c_str());
         lua_settable(L, -3);
         i++;
     }
-    if(CI->Clients.empty())return 0;
+    if (CI->Clients.empty())
+        return 0;
     return 1;
 }
 int lua_GetCars(lua_State* L) {
@@ -273,8 +320,10 @@ int lua_GetCars(lua_State *L){
                     i++;
                 }
             }
-            if(c->GetAllCars().empty())return 0;
+            if (c->GetAllCars().empty())
-        }else return 0;
+                return 0;
+        } else
+            return 0;
     } else {
         SendError(L, Sec("GetPlayerVehicles not enough arguments"));
         return 0;
@@ -286,8 +335,10 @@ int lua_dropPlayer(lua_State *L){
     if (lua_isnumber(L, 1)) {
         int ID = int(lua_tonumber(L, 1));
         Client* c = GetClient(ID);
-        if(c == nullptr)return 0;
+        if (c == nullptr)
-        if(c->GetRole() == Sec("MDEV"))return 0;
+            return 0;
+        if (c->GetRole() == Sec("MDEV"))
+            return 0;
         std::string Reason;
         if (Args > 1 && lua_isstring(L, 2)) {
             Reason = std::string(Sec(" Reason : ")) + lua_tostring(L, 2);
@@ -296,7 +347,8 @@ int lua_dropPlayer(lua_State *L){
         c->SetStatus(-2);
         closesocket(c->GetTCPSock());
 
-    }else SendError(L,Sec("DropPlayer not enough arguments"));
+    } else
+        SendError(L, Sec("DropPlayer not enough arguments"));
     return 0;
 }
 int lua_sendChat(lua_State* L) {
@@ -309,13 +361,17 @@ int lua_sendChat(lua_State *L){
             } else {
                 Client* c = GetClient(ID);
                 if (c != nullptr) {
-                    if(!c->isSynced)return 0;
+                    if (!c->isSynced)
+                        return 0;
                     std::string Packet = "C:Server: " + std::string(lua_tostring(L, 2));
                     Respond(c, Packet, true);
-                }else SendError(L,Sec("SendChatMessage invalid argument [1] invalid ID"));
+                } else
+                    SendError(L, Sec("SendChatMessage invalid argument [1] invalid ID"));
             }
-        }else SendError(L,Sec("SendChatMessage invalid argument [2] expected string"));
+        } else
-    }else SendError(L,Sec("SendChatMessage invalid argument [1] expected number"));
+            SendError(L, Sec("SendChatMessage invalid argument [2] expected string"));
+    } else
+        SendError(L, Sec("SendChatMessage invalid argument [1] expected number"));
     return 0;
 }
 int lua_RemoveVehicle(lua_State* L) {
@@ -332,13 +388,15 @@ int lua_RemoveVehicle(lua_State *L){
             SendError(L, Sec("RemoveVehicle invalid Player ID"));
             return 0;
         }
-        if(c->GetRole() == "MDEV")return 0;
+        if (c->GetRole() == "MDEV")
+            return 0;
         if (!c->GetCarData(VID).empty()) {
             std::string Destroy = "Od:" + std::to_string(PID) + "-" + std::to_string(VID);
             SendToAll(nullptr, Destroy, true, true);
             c->DeleteCar(VID);
         }
-    }else SendError(L,Sec("RemoveVehicle invalid argument expected number"));
+    } else
+        SendError(L, Sec("RemoveVehicle invalid argument expected number"));
     return 0;
 }
 int lua_HWID(lua_State* L) {
@@ -365,7 +423,8 @@ int lua_RemoteEvent(lua_State *L){
     }
     int ID = int(lua_tointeger(L, 1));
     std::string Packet = "E:" + std::string(lua_tostring(L, 2)) + ":" + std::string(lua_tostring(L, 3));
-    if(ID == -1)SendToAll(nullptr,Packet,true,true);
+    if (ID == -1)
+        SendToAll(nullptr, Packet, true, true);
     else {
         Client* c = GetClient(ID);
         if (c == nullptr) {
@@ -389,60 +448,63 @@ int lua_Set(lua_State *L){
         SendError(L, Sec("set invalid argument [1] expected number"));
         return 0;
     }
-    Lua* Src = GetScript(L);
+    auto MaybeSrc = GetScript(L);
     std::string Name;
-    if(Src == nullptr)Name = Sec("Console");
+    if (!MaybeSrc.has_value()) {
-    else Name = Src->GetPluginName();
+        Name = Sec("_Console");
+    } else {
+        Name = MaybeSrc.value().get().GetPluginName();
+    }
     int C = int(lua_tointeger(L, 1));
     switch (C) {
     case 0: //debug
         if (lua_isboolean(L, 2)) {
             Debug = lua_toboolean(L, 2);
             info(Name + Sec(" | Debug -> ") + (Debug ? "true" : "false"));
-            }
+        } else
-            else SendError(L,Sec("set invalid argument [2] expected boolean for ID : 0"));
+            SendError(L, Sec("set invalid argument [2] expected boolean for ID : 0"));
         break;
     case 1: //private
         if (lua_isboolean(L, 2)) {
             Private = lua_toboolean(L, 2);
             info(Name + Sec(" | Private -> ") + (Private ? "true" : "false"));
-            }
+        } else
-            else SendError(L,Sec("set invalid argument [2] expected boolean for ID : 1"));
+            SendError(L, Sec("set invalid argument [2] expected boolean for ID : 1"));
         break;
     case 2: //max cars
         if (lua_isnumber(L, 2)) {
             MaxCars = int(lua_tointeger(L, 2));
             info(Name + Sec(" | MaxCars -> ") + std::to_string(MaxCars));
-            }
+        } else
-            else SendError(L,Sec("set invalid argument [2] expected number for ID : 2"));
+            SendError(L, Sec("set invalid argument [2] expected number for ID : 2"));
         break;
     case 3: //max players
         if (lua_isnumber(L, 2)) {
             MaxPlayers = int(lua_tointeger(L, 2));
             info(Name + Sec(" | MaxPlayers -> ") + std::to_string(MaxPlayers));
-            }
+        } else
-            else SendError(L,Sec("set invalid argument [2] expected number for ID : 3"));
+            SendError(L, Sec("set invalid argument [2] expected number for ID : 3"));
         break;
     case 4: //Map
         if (lua_isstring(L, 2)) {
             MapName = lua_tostring(L, 2);
             info(Name + Sec(" | MapName -> ") + MapName);
-            }
+        } else
-            else SendError(L,Sec("set invalid argument [2] expected string for ID : 4"));
+            SendError(L, Sec("set invalid argument [2] expected string for ID : 4"));
         break;
     case 5: //Name
         if (lua_isstring(L, 2)) {
             ServerName = lua_tostring(L, 2);
             info(Name + Sec(" | ServerName -> ") + ServerName);
-            }
+        } else
-            else SendError(L,Sec("set invalid argument [2] expected string for ID : 5"));
+            SendError(L, Sec("set invalid argument [2] expected string for ID : 5"));
         break;
     case 6: //Desc
         if (lua_isstring(L, 2)) {
             ServerDesc = lua_tostring(L, 2);
             info(Name + Sec(" | ServerDesc -> ") + ServerDesc);
-            }
+        } else
-            else SendError(L,Sec("set invalid argument [2] expected string for ID : 6"));
+            SendError(L, Sec("set invalid argument [2] expected string for ID : 6"));
         break;
     default:
         warn(Sec("Invalid config ID : ") + std::to_string(C));
@@ -461,37 +523,33 @@ extern "C" {
 }
 }
 
-void Lua::Init(){
+Lua::Lua(const std::string& PluginName, const std::string& FileName, fs::file_time_type LastWrote, bool Console)
-    luaL_openlibs(luaState);
+    : luaState(luaL_newstate()) {
-    lua_register(luaState,"TriggerGlobalEvent",lua_TriggerEventG);
+    Assert(luaState);
-    lua_register(luaState,"TriggerLocalEvent",lua_TriggerEventL);
+    if (!PluginName.empty()) {
-    lua_register(luaState,"TriggerClientEvent",lua_RemoteEvent);
+        SetPluginName(PluginName);
-    lua_register(luaState,"GetPlayerCount",lua_GetPlayerCount);
-    lua_register(luaState,"isPlayerConnected",lua_isConnected);
-    lua_register(luaState,"RegisterEvent",lua_RegisterEvent);
-    lua_register(luaState,"GetPlayerName",lua_GetPlayerName);
-    lua_register(luaState,"RemoveVehicle",lua_RemoveVehicle);
-    lua_register(luaState,"GetPlayerDiscordID",lua_GetDID);
-    lua_register(luaState,"GetPlayerVehicles",lua_GetCars);
-    lua_register(luaState,"CreateThread",lua_CreateThread);
-    lua_register(luaState,"SendChatMessage",lua_sendChat);
-    lua_register(luaState,"GetPlayers",lua_GetAllPlayers);
-    lua_register(luaState,"StopThread",lua_StopThread);
-    lua_register(luaState,"DropPlayer",lua_dropPlayer);
-    lua_register(luaState,"GetPlayerHWID",lua_HWID);
-    lua_register(luaState,"exit",lua_ServerExit);
-    lua_register(luaState,"Sleep",lua_Sleep);
-    lua_register(luaState,"print",lua_Print);
-    lua_register(luaState,"Set",lua_Set);
-    if(!Console)Reload();
     }
+    if (!FileName.empty()) {
+        SetFileName(FileName);
+    }
+    SetLastWrite(LastWrote);
+    _Console = Console;
+    Init();
+}
+
+Lua::Lua(bool Console)
+    : luaState(luaL_newstate()) {
+    _Console = Console;
+    Init();
+}
+
 void Lua::Execute(const std::string& Command) {
     if (ConsoleCheck(luaState, luaL_dostring(luaState, Command.c_str()))) {
         lua_settop(luaState, 0);
     }
 }
 void Lua::Reload() {
-    if(CheckLua(luaState,luaL_dofile(luaState,FileName.c_str()))){
+    if (CheckLua(luaState, luaL_dofile(luaState, _FileName.c_str()))) {
         CallFunction(this, Sec("onInit"), nullptr);
     }
 }
@@ -502,6 +560,7 @@ char* Lua::GetOrigin(){
     memcpy(Data, T.c_str(), T.size());
     return Data;
 }
+
 int CallFunction(Lua* lua, const std::string& FuncName, LuaArg* Arg) {
     lua_State* luaState = lua->GetState();
     lua_getglobal(luaState, FuncName.c_str());
@@ -525,7 +584,8 @@ int CallFunction(Lua*lua,const std::string& FuncName,LuaArg* Arg){
                 }
             }
 #ifdef WIN32
-        }__except(Handle(GetExceptionInformation(),Origin)){}
+        } __except (Handle(GetExceptionInformation(), Origin)) {
+        }
 #endif // WIN32
         delete[] Origin;
     }
@@ -533,46 +593,84 @@ int CallFunction(Lua*lua,const std::string& FuncName,LuaArg* Arg){
     return 0;
 }
 void Lua::SetPluginName(const std::string& Name) {
-    PluginName = Name;
+    _PluginName = Name;
 }
 void Lua::SetFileName(const std::string& Name) {
-    FileName = Name;
+    _FileName = Name;
 }
+void Lua::Init() {
+    Assert(luaState);
+    luaL_openlibs(luaState);
+    lua_register(luaState, "TriggerGlobalEvent", lua_TriggerEventG);
+    lua_register(luaState, "TriggerLocalEvent", lua_TriggerEventL);
+    lua_register(luaState, "TriggerClientEvent", lua_RemoteEvent);
+    lua_register(luaState, "GetPlayerCount", lua_GetPlayerCount);
+    lua_register(luaState, "isPlayerConnected", lua_isConnected);
+    lua_register(luaState, "RegisterEvent", lua_RegisterEvent);
+    lua_register(luaState, "GetPlayerName", lua_GetPlayerName);
+    lua_register(luaState, "RemoveVehicle", lua_RemoveVehicle);
+    lua_register(luaState, "GetPlayerDiscordID", lua_GetDID);
+    lua_register(luaState, "GetPlayerVehicles", lua_GetCars);
+    lua_register(luaState, "CreateThread", lua_CreateThread);
+    lua_register(luaState, "SendChatMessage", lua_sendChat);
+    lua_register(luaState, "GetPlayers", lua_GetAllPlayers);
+    lua_register(luaState, "StopThread", lua_StopThread);
+    lua_register(luaState, "DropPlayer", lua_dropPlayer);
+    lua_register(luaState, "GetPlayerHWID", lua_HWID);
+    lua_register(luaState, "exit", lua_ServerExit);
+    lua_register(luaState, "Sleep", lua_Sleep);
+    lua_register(luaState, "print", lua_Print);
+    lua_register(luaState, "Set", lua_Set);
+    if (!_Console)
+        Reload();
+}
+
 void Lua::RegisterEvent(const std::string& Event, const std::string& FunctionName) {
-    RegisteredEvents.insert(std::make_pair(Event,FunctionName));
+    _RegisteredEvents.insert(std::make_pair(Event, FunctionName));
 }
 void Lua::UnRegisterEvent(const std::string& Event) {
-    for(const std::pair<std::string,std::string>& a : RegisteredEvents){
+    for (const std::pair<std::string, std::string>& a : _RegisteredEvents) {
         if (a.first == Event) {
-            RegisteredEvents.erase(a);
+            _RegisteredEvents.erase(a);
             break;
         }
     }
 }
 bool Lua::IsRegistered(const std::string& Event) {
-    for(const std::pair<std::string,std::string>& a : RegisteredEvents){
+    for (const std::pair<std::string, std::string>& a : _RegisteredEvents) {
-        if(a.first == Event)return true;
+        if (a.first == Event)
+            return true;
     }
     return false;
 }
-std::string Lua::GetRegistered(const std::string&Event){
+std::string Lua::GetRegistered(const std::string& Event) const {
-    for(const std::pair<std::string,std::string>& a : RegisteredEvents){
+    for (const std::pair<std::string, std::string>& a : _RegisteredEvents) {
-        if(a.first == Event)return a.second;
+        if (a.first == Event)
+            return a.second;
     }
     return "";
 }
-std::string Lua::GetFileName(){
+std::string Lua::GetFileName() const {
-    return FileName;
+    return _FileName;
 }
-std::string Lua::GetPluginName(){
+std::string Lua::GetPluginName() const {
-    return PluginName;
+    return _PluginName;
 }
 lua_State* Lua::GetState() {
     return luaState;
 }
+
+const lua_State* Lua::GetState() const {
+    return luaState;
+}
+
 void Lua::SetLastWrite(fs::file_time_type time) {
-   LastWrote = time;
+    _LastWrote = time;
 }
 fs::file_time_type Lua::GetLastWrite() {
-    return LastWrote;
+    return _LastWrote;
+}
+
+Lua::~Lua() {
+    lua_close(luaState);
 }