Fix various memory leaks with RAII

include/Lua/LuaSystem.hpp

@@ -3,66 +3,76 @@
 ///
 
 #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;
 
-struct LuaArg{
+struct LuaArg {
     std::vector<std::any> args;
-    void PushArgs(lua_State *State){
-       for(std::any arg : args){
-            if(!arg.has_value())return;
+    void PushArgs(lua_State* State) {
+        for (std::any arg : args) {
+            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));
+            if (Type.find("bool") != std::string::npos) {
+                lua_pushboolean(State, std::any_cast<bool>(arg));
             }
-            if(Type.find("basic_string") != std::string::npos || Type.find("char") != std::string::npos){
-                lua_pushstring(State,std::any_cast<std::string>(arg).c_str());
+            if (Type.find("basic_string") != std::string::npos || Type.find("char") != std::string::npos) {
+                lua_pushstring(State, std::any_cast<std::string>(arg).c_str());
             }
-            if(Type.find("int") != std::string::npos){
-                lua_pushinteger(State,std::any_cast<int>(arg));
+            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));
             }
-       }
+        }
     }
 };
 
 class Lua {
 private:
-    std::set<std::pair<std::string,std::string>> RegisteredEvents;
-    lua_State *luaState = luaL_newstate();
-    fs::file_time_type LastWrote;
-    std::string PluginName;
-    std::string FileName;
+    std::set<std::pair<std::string, std::string>> _RegisteredEvents;
+    lua_State* luaState { nullptr };
+    fs::file_time_type _LastWrote;
+    std::string _PluginName;
+    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);
-    void UnRegisterEvent(const std::string&Event);
+    void RegisterEvent(const std::string& Event, const std::string& FunctionName);
+    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);
-    void SetPluginName(const std::string&Name);
+    bool IsRegistered(const std::string& Event);
+    void SetPluginName(const std::string& Name);
     void Execute(const std::string& Command);
-    void SetFileName(const std::string&Name);
+    void SetFileName(const std::string& Name);
     fs::file_time_type GetLastWrite();
-    std::string GetPluginName();
-    std::string GetFileName();
-    bool StopThread = false;
-    bool Console = false;
+    std::string GetPluginName() const;
+    std::string GetFileName() const;
     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;
+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<std::unique_ptr<Lua>> PluginEngine;

src/Console.cpp

@@ -130,9 +130,7 @@ void SetupConsole() {
 }
 void ConsoleInit() {
     SetupConsole();
-    LuaConsole = new Lua();
-    LuaConsole->Console = true;
-    LuaConsole->Init();
+    LuaConsole = new Lua(true);
     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,75 +13,73 @@
 #include <sys/stat.h>
 #endif // __linux
 
-std::set<Lua*> PluginEngine;
-bool NewFile(const std::string&Path){
-    for(Lua*Script : PluginEngine){
-        if(Path == Script->GetFileName())return false;
+std::set<std::unique_ptr<Lua>> PluginEngine;
+bool NewFile(const std::string& Path) {
+    for (auto& Script : PluginEngine) {
+        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);
-    for (const auto &entry : fs::directory_iterator(Path)){
+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);
+    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();
-                PluginEngine.insert(Script);
-                Script->SetFileName(entry.path().string());
-                Script->SetPluginName(Name);
-                Script->SetLastWrite(fs::last_write_time(Script->GetFileName()));
-                Script->Init();
-                if(HotSwap)info(Sec("[HOTSWAP] Added : ") +
-                Script->GetFileName().substr(Script->GetFileName().find('\\')));
+            if (!HotSwap || NewFile(entry.path().string())) {
+                auto FileName = entry.path().string();
+                std::unique_ptr<Lua> ScriptToInsert(new Lua(Name, FileName, fs::last_write_time(FileName)));
+                auto& Script = *ScriptToInsert;
+                PluginEngine.insert(std::move(ScriptToInsert));
+                if (HotSwap)
+                    info(Sec("[HOTSWAP] Added : ") + Script.GetFileName().substr(Script.GetFileName().find('\\')));
             }
         }
     }
 }
-void FolderList(const std::string& Path,bool HotSwap){
-    for (const auto &entry : fs::directory_iterator(Path)) {
+void FolderList(const std::string& Path, bool HotSwap) {
+    for (const auto& entry : fs::directory_iterator(Path)) {
         auto pos = entry.path().filename().string().find('.');
         if (pos == std::string::npos) {
-            RegisterFiles(entry.path().string(),HotSwap);
+            RegisterFiles(entry.path().string(), HotSwap);
         }
     }
 }
-[[noreturn]]void HotSwaps(const std::string& path){
+[[noreturn]] void HotSwaps(const std::string& path) {
     DebugPrintTID();
-    while(true){
-        for(Lua*Script : PluginEngine){
-            struct stat Info{};
-            if(stat(Script->GetFileName().c_str(), &Info) != 0){
-                Script->StopThread = true;
+    while (true) {
+        for (auto& Script : PluginEngine) {
+            struct stat Info {};
+            if (stat(Script->GetFileName().c_str(), &Info) != 0) {
+                Script->SetStopThread(true);
                 PluginEngine.erase(Script);
-                info(Sec("[HOTSWAP] Removed : ")+
-                Script->GetFileName().substr(Script->GetFileName().find('\\')));
+                info(Sec("[HOTSWAP] Removed : ") + Script->GetFileName().substr(Script->GetFileName().find('\\')));
                 break;
             }
-            if(Script->GetLastWrite() != fs::last_write_time(Script->GetFileName())){
-                Script->StopThread = true;
-                info(Sec("[HOTSWAP] Updated : ")+
-                     Script->GetFileName().substr(Script->GetFileName().find('\\')));
+            if (Script->GetLastWrite() != fs::last_write_time(Script->GetFileName())) {
+                Script->SetStopThread(true);
+                info(Sec("[HOTSWAP] Updated : ") + Script->GetFileName().substr(Script->GetFileName().find('\\')));
                 Script->SetLastWrite(fs::last_write_time(Script->GetFileName()));
                 Script->Reload();
             }
         }
-        FolderList(path,true);
+        FolderList(path, true);
         std::this_thread::sleep_for(std::chrono::seconds(2));
     }
 }
 
-void InitLua(){
-    if(!fs::exists(Resource)){
+void InitLua() {
+    if (!fs::exists(Resource)) {
         fs::create_directory(Resource);
     }
     std::string Path = Resource + Sec("/Server");
-    if(!fs::exists(Path)){
+    if (!fs::exists(Path)) {
         fs::create_directory(Path);
     }
-    FolderList(Path,false);
-    std::thread t1(HotSwaps,Path);
+    FolderList(Path, false);
+    std::thread t1(HotSwaps, Path);
     t1.detach();
     info(Sec("Lua system online"));
 }