Change to luajit

Decreases the likelyhood of lua stack corruption.

---

By creating this pull request, I understand that code that is AI
generated or otherwise automatically generated may be rejected without
further discussion.
I declare that I fully understand all code I pushed into this PR, and
wrote all this code myself and own the rights to this code.

.github/workflows/linux.yml

@@ -19,8 +19,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: debian
-            version: 11
           - distro: debian
             version: 12
           - distro: ubuntu
@@ -48,6 +46,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
+          fetch-depth: 0
 
       - name: Git config safe directory
         shell: bash
@@ -90,8 +89,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: debian
-            version: 11
           - distro: debian
             version: 12
           - distro: ubuntu
@@ -119,6 +116,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
+          fetch-depth: 0
 
       - name: Git config safe directory
         shell: bash

.github/workflows/release.yml

@@ -38,8 +38,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: debian
-            version: 11
           - distro: debian
             version: 12
           - distro: ubuntu
@@ -67,6 +65,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
+          fetch-depth: 0
 
       - name: Git config safe directory
         shell: bash
@@ -109,8 +108,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: debian
-            version: 11
           - distro: debian
             version: 12
           - distro: ubuntu
@@ -141,6 +138,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
+          fetch-depth: 0
 
       - name: Git config safe directory
         shell: bash
@@ -194,6 +192,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
+          fetch-depth: 0
 
       - name: Create Build Environment
         shell: bash

.github/workflows/windows.yml

@@ -26,6 +26,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
+          fetch-depth: 0
 
       - name: Setup vcpkg
         uses: lukka/run-vcpkg@v11

CMakeLists.txt

@@ -80,14 +80,15 @@ set(PRJ_SOURCES
     src/ChronoWrapper.cpp
 )
 
-find_package(Lua REQUIRED)
+# fix for sol2
+find_path(LUAJIT_INCLUDE_DIR lua.hpp PATH_SUFFIXES luajit)
 
 # set the source file containing main()
 set(PRJ_MAIN src/main.cpp)
 # set the source file containing the test's main
 set(PRJ_TEST_MAIN test/test_main.cpp)
 # set include paths not part of libraries
-set(PRJ_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
+set(PRJ_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})
 # set compile features (e.g. standard version)
 set(PRJ_COMPILE_FEATURES cxx_std_20)
 # set #defines (test enable/disable not included here)
@@ -105,9 +106,11 @@ set(PRJ_LIBRARIES
     libzip::zip
     OpenSSL::SSL OpenSSL::Crypto
     CURL::libcurl
-    ${LUA_LIBRARIES}
+    lua51
 )
 
+link_directories(${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib)
+
 # add dependency find_package calls and similar here
 find_package(fmt CONFIG REQUIRED)
 find_package(OpenSSL REQUIRED)
@@ -148,7 +151,8 @@ if(UNIX)
 endif(UNIX)
 
 if (WIN32)
-    add_compile_options("-D_WIN32_WINNT=0x0601")
+    add_compile_definitions(_WIN32_WINNT=0x0A00)
+
     add_compile_options("/bigobj")
 endif(WIN32)
 

include/TLuaEngine.h

@@ -192,9 +192,7 @@ public:
         for (const auto& Event : mLuaEvents.at(EventName)) {
             for (const auto& Function : Event.second) {
                 if (Event.first != IgnoreId) {
-                    auto Result = EnqueueFunctionCall(Event.first, Function, Arguments, EventName);
+                    Results.push_back(EnqueueFunctionCall(Event.first, Function, Arguments, EventName));
-                    Results.push_back(Result);
-                    AddResultToCheck(Result);
                 }
             }
         }

src/TConsole.cpp

@@ -160,7 +160,7 @@ void TConsole::ChangeToRegularConsole() {
 }
 
 bool TConsole::EnsureArgsCount(const std::vector<std::string>& args, size_t n) {
-    if (n == 0 && args.size() != 0) {
+    if (n == 0 && !args.empty()) {
         Application::Console().WriteRaw("This command expects no arguments.");
         return false;
     } else if (args.size() != n) {
@@ -198,7 +198,7 @@ void TConsole::Command_Lua(const std::string&, const std::vector<std::string>& a
         } else {
             Application::Console().WriteRaw("Lua state '" + NewStateId + "' is not a known state. Didn't switch to Lua.");
         }
-    } else if (args.size() == 0) {
+    } else if (args.empty()) {
         ChangeToLuaConsole(mDefaultStateId);
     }
 }
@@ -260,8 +260,7 @@ void TConsole::Command_Version(const std::string& cmd, const std::vector<std::st
 
     Application::Console().WriteRaw("Platform: " + platform);
     Application::Console().WriteRaw("Server:   v" + Application::ServerVersionString());
-    std::string lua_version = fmt::format("Lua:      v{}.{}.{}", LUA_VERSION_MAJOR, LUA_VERSION_MINOR, LUA_VERSION_RELEASE);
+    Application::Console().WriteRaw(LUA_RELEASE);
-    Application::Console().WriteRaw(lua_version);
     std::string openssl_version = fmt::format("OpenSSL:  v{}.{}.{}", OPENSSL_VERSION_MAJOR, OPENSSL_VERSION_MINOR, OPENSSL_VERSION_PATCH);
     Application::Console().WriteRaw(openssl_version);
 }
@@ -423,7 +422,7 @@ void TConsole::Command_Settings(const std::string&, const std::vector<std::strin
         settings set <category> <setting> <value>   sets specified setting to value
         )";
 
-    if (args.size() == 0) {
+    if (args.empty()) {
         beammp_errorf("No arguments specified for command 'settings'!");
         Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
         return;
@@ -705,7 +704,7 @@ void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {
             }
         }
     }
-    if (NonNilFutures.size() == 0) {
+    if (NonNilFutures.empty()) {
         if (!IgnoreNotACommand) {
             Application::Console().WriteRaw("Error: Unknown command: '" + cmd + "'. Type 'help' to see a list of valid commands.");
         }

src/TLuaEngine.cpp

@@ -30,16 +30,12 @@
 #include <condition_variable>
 #include <fmt/core.h>
 #include <nlohmann/json.hpp>
-#include <optional>
 #include <random>
-#include <sol/stack_core.hpp>
 #include <thread>
 #include <tuple>
 
 TLuaEngine* LuaAPI::MP::Engine;
 
-static sol::protected_function AddTraceback(sol::state_view StateView, sol::protected_function RawFn);
-
 TLuaEngine::TLuaEngine()
     : mResourceServerPath(fs::path(Application::Settings.getAsString(Settings::Key::General_ResourceFolder)) / "Server") {
     Application::SetSubsystemStatus("LuaEngine", Application::Status::Starting);
@@ -69,7 +65,7 @@ TEST_CASE("TLuaEngine ctor & dtor") {
 void TLuaEngine::operator()() {
     RegisterThread("LuaEngine");
     // lua engine main thread
-    beammp_infof("Lua v{}.{}.{}", LUA_VERSION_MAJOR, LUA_VERSION_MINOR, LUA_VERSION_RELEASE);
+    beammp_infof(LUA_RELEASE);
     CollectAndInitPlugins();
 
     Application::SetSubsystemStatus("LuaEngine", Application::Status::Good);
@@ -131,7 +127,7 @@ void TLuaEngine::operator()() {
                 }
             }
         }
-        if (mLuaStates.size() == 0) {
+        if (mLuaStates.empty()) {
             beammp_trace("No Lua states, event loop running extremely sparsely");
             Application::SleepSafeSeconds(10);
         } else {
@@ -496,7 +492,6 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
     sol::variadic_results LocalArgs = JsonStringToArray(Str);
     for (const auto& Handler : MyHandlers) {
         auto Fn = mStateView[Handler];
-        Fn = AddTraceback(mStateView, Fn);
         if (Fn.valid()) {
             auto LuaResult = Fn(LocalArgs);
             auto Result = std::make_shared<TLuaResult>();
@@ -505,9 +500,7 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
                 Result->Result = LuaResult;
             } else {
                 Result->Error = true;
-                sol::error Err = LuaResult;
+                Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
-                Result->ErrorMessage = Err.what();
-                beammp_errorf("An error occured while executing local event handler \"{}\" for event \"{}\": {}", Handler, EventName, Result->ErrorMessage);
             }
             Result->MarkAsReady();
             Return.push_back(Result);
@@ -1089,21 +1082,6 @@ void TLuaEngine::StateThreadData::RegisterEvent(const std::string& EventName, co
     mEngine->RegisterEvent(EventName, mStateId, FunctionName);
 }
 
-static sol::protected_function AddTraceback(sol::state_view StateView, sol::protected_function RawFn) {
-    StateView["INTERNAL_ERROR_HANDLER"] = [](lua_State *L) {
-        auto Error = sol::stack::get<std::optional<std::string>>(L);
-        std::string ErrorString = "<Unknown error>";
-        if (Error.has_value()) {
-            ErrorString = Error.value();
-        }
-        auto DebugTracebackFn = sol::state_view(L).globals().get<sol::table>("debug").get<sol::protected_function>("traceback");
-        // 2 = start collecting the trace one above the current function (1=current function)
-        std::string Traceback = DebugTracebackFn(ErrorString, 2);
-        return sol::stack::push(L, Traceback);
-    };
-    return sol::protected_function(RawFn, StateView["INTERNAL_ERROR_HANDLER"]);
-}
-
 void TLuaEngine::StateThreadData::operator()() {
     RegisterThread("Lua:" + mStateId);
     while (!Application::IsShuttingDown()) {
@@ -1168,8 +1146,8 @@ void TLuaEngine::StateThreadData::operator()() {
                 // TODO: Use TheQueuedFunction.EventName for errors, warnings, etc
                 Result->StateId = mStateId;
                 sol::state_view StateView(mState);
-                auto RawFn = StateView[FnName];
+                auto Fn = StateView[FnName];
-                if (RawFn.valid() && RawFn.get_type() == sol::type::function) {
+                if (Fn.valid() && Fn.get_type() == sol::type::function) {
                     std::vector<sol::object> LuaArgs;
                     for (const auto& Arg : Args) {
                         if (Arg.valueless_by_exception()) {
@@ -1204,7 +1182,6 @@ void TLuaEngine::StateThreadData::operator()() {
                             break;
                         }
                     }
-                    auto Fn = AddTraceback(StateView, RawFn);
                     auto Res = Fn(sol::as_args(LuaArgs));
                     if (Res.valid()) {
                         Result->Error = false;

src/TNetwork.cpp

@@ -243,10 +243,11 @@ void TNetwork::TCPServerMain() {
             ip::tcp::socket ClientSocket = Acceptor.accept(ClientEp, ec);
             if (ec) {
                 beammp_errorf("Failed to accept() new client: {}", ec.message());
+                continue;
             }
             TConnection Conn { std::move(ClientSocket), ClientEp };
             std::thread ID(&TNetwork::Identify, this, std::move(Conn));
-            ID.detach(); // TODO: Add to a queue and attempt to join periodically
+            ID.detach();
         } catch (const std::exception& e) {
             beammp_errorf("Exception in accept routine: {}", e.what());
         }

src/TServer.cpp

@@ -198,7 +198,8 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
         int PID = -1;
         int VID = -1;
 
-        auto MaybePidVid = GetPidVid(StringPacket.substr(3).substr(0, StringPacket.substr(3).find(':', 1)));
+        auto pidVidPart = StringPacket.substr(3);
+        auto MaybePidVid = GetPidVid(pidVidPart.substr(0, pidVidPart.find(':')));
         if (MaybePidVid) {
             std::tie(PID, VID) = MaybePidVid.value();
         }
@@ -256,6 +257,10 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
             beammp_debugf("Empty chat message received from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
             return;
         }
+        if (Message.size() > 500) {
+           beammp_debugf("Chat message too long from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
+           return;
+        }
         auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", LockedClient->GetID(), LockedClient->GetName(), Message);
         TLuaEngine::WaitForAll(Futures);
         LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), PacketAsString.substr(PacketAsString.find(':', 3) + 1));
@@ -289,7 +294,8 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
         int PID = -1;
         int VID = -1;
 
-        auto MaybePidVid = GetPidVid(StringPacket.substr(3).substr(0, StringPacket.substr(3).find(':', 1)));
+        auto pidVidPart = StringPacket.substr(3);
+        auto MaybePidVid = GetPidVid(pidVidPart.substr(0, pidVidPart.find(':')));
         if (MaybePidVid) {
             std::tie(PID, VID) = MaybePidVid.value();
         }

vcpkg.json

@@ -14,6 +14,14 @@
     "openssl",
     "rapidjson",
     "sol2",
-    "curl"
+    "curl",
-  ]
+    "luajit"
+  ],
+  "overrides": [
+    {
+      "name": "sol2",
+      "version": "3.3.1"
+    }
+  ],
+  "builtin-baseline": "5bf0c55239da398b8c6f450818c9e28d36bf9966"
 }