Revert "Lua version change to 5.3.5 (#458)"

This reverts commit 9fa9974159, reversing
changes made to 6ec4106ec7.

.github/workflows/linux.yml

@@ -3,11 +3,11 @@ name: Linux
 on:
   push:
     branches:
-      - "develop"
+      - 'develop'
-      - "minor"
+      - 'minor'
   pull_request:
 
-env:
+env: 
   VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
   VCPKG_FORCE_SYSTEM_BINARIES: 1
   CMAKE_BUILD_TYPE: "Release"
@@ -21,8 +21,6 @@ jobs:
         include:
           - distro: debian
             version: 12
-          - distro: debian
-            version: 13
           - distro: ubuntu
             version: 22.04
           - distro: ubuntu
@@ -32,7 +30,7 @@ jobs:
     steps:
       - name: get-cmake
         uses: lukka/get-cmake@v3.28.1
-
+            
       - name: Export GitHub Actions cache environment variables
         uses: actions/github-script@v6
         with:
@@ -47,7 +45,7 @@ jobs:
 
       - uses: actions/checkout@v2
         with:
-          submodules: "recursive"
+          submodules: 'recursive'
           fetch-depth: 0
 
       - name: Git config safe directory
@@ -93,8 +91,6 @@ jobs:
         include:
           - distro: debian
             version: 12
-          - distro: debian
-            version: 13
           - distro: ubuntu
             version: 22.04
           - distro: ubuntu
@@ -104,7 +100,7 @@ jobs:
     steps:
       - name: get-cmake
         uses: lukka/get-cmake@v3.28.1
-
+            
       - name: Export GitHub Actions cache environment variables
         uses: actions/github-script@v6
         with:
@@ -119,7 +115,7 @@ jobs:
 
       - uses: actions/checkout@v2
         with:
-          submodules: "recursive"
+          submodules: 'recursive'
           fetch-depth: 0
 
       - name: Git config safe directory
@@ -155,3 +151,4 @@ jobs:
 
       - name: Test
         run: ./bin/BeamMP-Server-tests
+

.github/workflows/release.yml

@@ -3,7 +3,7 @@ on:
   push:
     # Sequence of patterns matched against refs/tags
     tags:
-      - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
+    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 
 env:
   VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
@@ -14,8 +14,8 @@ jobs:
   create-release:
     runs-on: ubuntu-latest
     name: Create Release
-    outputs:
+    outputs: 
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
+      upload_url: ${{ steps.create_release.outputs.upload_url }} 
     steps:
       - name: Create Release
         id: create_release
@@ -40,8 +40,6 @@ jobs:
         include:
           - distro: debian
             version: 12
-          - distro: debian
-            version: 13
           - distro: ubuntu
             version: 22.04
           - distro: ubuntu
@@ -51,7 +49,7 @@ jobs:
     steps:
       - name: get-cmake
         uses: lukka/get-cmake@v3.28.1
-
+            
       - name: Export GitHub Actions cache environment variables
         uses: actions/github-script@v6
         with:
@@ -66,7 +64,7 @@ jobs:
 
       - uses: actions/checkout@v2
         with:
-          submodules: "recursive"
+          submodules: 'recursive'
           fetch-depth: 0
 
       - name: Git config safe directory
@@ -83,7 +81,7 @@ jobs:
         run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
 
       - name: Upload Release Asset
-        id: upload-release-asset
+        id: upload-release-asset 
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -112,8 +110,6 @@ jobs:
         include:
           - distro: debian
             version: 12
-          - distro: debian
-            version: 13
           - distro: ubuntu
             version: 22.04
           - distro: ubuntu
@@ -126,7 +122,7 @@ jobs:
     steps:
       - name: get-cmake
         uses: lukka/get-cmake@v3.28.1
-
+            
       - name: Export GitHub Actions cache environment variables
         uses: actions/github-script@v6
         with:
@@ -141,7 +137,7 @@ jobs:
 
       - uses: actions/checkout@v2
         with:
-          submodules: "recursive"
+          submodules: 'recursive'
           fetch-depth: 0
 
       - name: Git config safe directory
@@ -158,7 +154,7 @@ jobs:
         run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
 
       - name: Upload Release Asset
-        id: upload-release-asset
+        id: upload-release-asset 
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -195,7 +191,7 @@ jobs:
 
       - uses: actions/checkout@v2
         with:
-          submodules: "recursive"
+          submodules: 'recursive'
           fetch-depth: 0
 
       - name: Create Build Environment
@@ -207,7 +203,7 @@ jobs:
         run: bash ./scripts/windows/2-build.sh
 
       - name: Upload Release Asset
-        id: upload-release-asset
+        id: upload-release-asset 
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

include/Common.h

@@ -129,7 +129,7 @@ private:
     static inline std::mutex mShutdownHandlersMutex {};
     static inline std::deque<TShutdownHandler> mShutdownHandlers {};
 
-    static inline Version mVersion { 3, 9, 1 };
+    static inline Version mVersion { 3, 9, 0 };
 };
 
 void SplitString(std::string const& str, const char delim, std::vector<std::string>& out);

scripts/debian-11/2-configure.sh

@@ -4,4 +4,4 @@ set -ex
 
 ./vcpkg/bootstrap-vcpkg.sh
 
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON

scripts/debian-12/2-configure.sh

@@ -4,4 +4,4 @@ set -ex
 
 ./vcpkg/bootstrap-vcpkg.sh
 
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON

scripts/debian-13/1-install-deps.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build

scripts/debian-13/1.5-git-safe.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-git config --global --add safe.directory $(pwd)
-git config --global --add safe.directory $(pwd)/vcpkg
-git config --global --add safe.directory $(pwd)/deps/commandline

scripts/debian-13/2-configure.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-./vcpkg/bootstrap-vcpkg.sh
-
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON

scripts/debian-13/3-build-tests.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests

scripts/debian-13/3-build.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server
-
-objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
-objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
-
-strip -s bin/BeamMP-Server

scripts/debian-13/4-install-runtime-deps.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 curl
-

scripts/ubuntu-22.04/2-configure.sh

@@ -4,4 +4,4 @@ set -ex
 
 ./vcpkg/bootstrap-vcpkg.sh
 
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON

scripts/ubuntu-24.04/2-configure.sh

@@ -4,4 +4,4 @@ set -ex
 
 ./vcpkg/bootstrap-vcpkg.sh
 
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON

src/TNetwork.cpp

@@ -670,13 +670,7 @@ void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
             Client->Disconnect("TCPRcv failed");
             break;
         }
-        try {
+        mServer.GlobalParser(c, std::move(res), mPPSMonitor, *this, false);
-            mServer.GlobalParser(c, std::move(res), mPPSMonitor, *this, false);
-        } catch (const std::exception& e) {
-            beammp_warnf("Failed to receive/parse packet via TCP from client {}: {}", Client->GetID(), e.what());
-            Client->Disconnect("Failed to parse packet");
-            break;
-        }
     }
 
     if (QueueSync.joinable())

src/TServer.cpp

@@ -28,7 +28,6 @@
 #include <any>
 #include <optional>
 #include <sstream>
-#include <utility>
 
 #include <nlohmann/json.hpp>
 
@@ -54,6 +53,7 @@ static std::optional<std::pair<int, int>> GetPidVid(const std::string& str) {
     }
     return std::nullopt;
 }
+
 TEST_CASE("GetPidVid") {
     SUBCASE("Valid singledigit") {
         const auto MaybePidVid = GetPidVid("0-1");
@@ -120,6 +120,7 @@ TEST_CASE("GetPidVid") {
         CHECK(!MaybePidVid);
     }
 }
+
 TServer::TServer(const std::vector<std::string_view>& Arguments) {
     beammp_info("BeamMP Server v" + Application::ServerVersionString());
     Application::SetSubsystemStatus("Server", Application::Status::Starting);
@@ -471,13 +472,7 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
         }
 
         if (PID != -1 && VID != -1 && PID == c.GetID()) {
-            auto BracketPos = Data.find('{');
+            Data = Data.substr(Data.find('{'));
-            if (BracketPos == std::string::npos) {
-                beammp_debugf("Invalid 'Or' packet body from client {}", c.GetID());
-                return;
-            }
-
-            Data = Data.substr(BracketPos);
             LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleReset", "", c.GetID(), VID, Data));
             Network.SendToAll(&c, StringToVector(Packet), false, true);
         }
@@ -506,14 +501,7 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
         }
 
         if (PID != -1 && VID != -1 && PID == c.GetID()) {
-            auto BracketPos = Data.find('[');
+            Data = Data.substr(Data.find('['));
-            if (BracketPos == std::string::npos) {
-                beammp_debugf("Invalid 'Op' packet body from client {}", c.GetID());
-                return;
-            }
-
-            Data = Data.substr(BracketPos);
-
             LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehiclePaintChanged", "", c.GetID(), VID, Data));
             Network.SendToAll(&c, StringToVector(Packet), false, true);
 

vcpkg.json

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