Added check for Stateview, added socket cancel to finish all connect, send and receive operations immediately

.github/workflows/linux.yml

@@ -84,7 +84,7 @@ jobs:
         run: ./bin/BeamMP-Server-tests
 
   arm64-matrix:
-    runs-on: ubuntu-22.04-arm
+    runs-on: [Linux, ARM64]
     env:
       VCPKG_DEFAULT_TRIPLET: "arm64-linux"
     strategy:

.github/workflows/release.yml

@@ -104,7 +104,7 @@ jobs:
           asset_content_type: application/x-elf
 
   arm64-matrix:
-    runs-on: ubuntu-22.04-arm
+    runs-on: [Linux, ARM64]
     needs: create-release
     strategy:
       matrix:

include/Common.h

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

src/Client.cpp

@@ -84,6 +84,7 @@ void TClient::Disconnect(std::string_view Reason) {
         if (ec) {
             beammp_debugf("Failed to shutdown client socket: {}", ec.message());
         }
+        mSocket.cancel();
         mSocket.close(ec);
         if (ec) {
             beammp_debugf("Failed to close client socket: {}", ec.message());

src/TLuaEngine.cpp

@@ -43,6 +43,8 @@ static sol::protected_function AddTraceback(sol::state_view StateView, sol::prot
 static std::optional<sol::function> GetLuaHandler(sol::state_view StateView, const std::string Handler, const std::string EventName);
 
 static std::optional<sol::function> GetLuaHandler(sol::state_view StateView, const std::string Handler, const std::string EventName) {
+    if (!StateView)
+        return std::nullopt;
     auto Res = StateView.safe_script("return " + Handler, sol::script_pass_on_error);
     if (!Res.valid()) {
         beammp_errorf("invalid handler for event \"{}\". handler: \"{}\"", EventName, Handler);
@@ -80,11 +82,10 @@ TEST_CASE("TLuaEngine ctor & dtor") {
 
 void TLuaEngine::operator()() {
     RegisterThread("LuaEngine");
+    Application::SetSubsystemStatus("LuaEngine", Application::Status::Good);
     // lua engine main thread
     beammp_infof("Lua v{}.{}.{}", LUA_VERSION_MAJOR, LUA_VERSION_MINOR, LUA_VERSION_RELEASE);
     CollectAndInitPlugins();
-
-    Application::SetSubsystemStatus("LuaEngine", Application::Status::Good);
     // now call all onInit's
     auto Futures = TriggerEvent("onInit", "");
     WaitForAll(Futures, std::chrono::seconds(5));

src/TNetwork.cpp

@@ -307,11 +307,6 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
     Client->SetIdentifier("ip", ip);
     beammp_tracef("This thread is ip {} ({})", ip, RawConnection.SockAddr.address().to_v6().is_v4_mapped() ? "IPv4 mapped IPv6" : "IPv6");
 
-    if (Application::GetSubsystemStatuses().at("Main") == Application::Status::Starting) {
-        ClientKick(*Client, "The server is still starting, please try joining again later.");
-        return nullptr;
-    }
-
     beammp_info("Identifying new ClientConnection...");
 
     auto Data = TCPRcv(*Client);

src/main.cpp

@@ -182,6 +182,10 @@ int BeamMPServerMain(MainArguments Arguments) {
 
     TServer Server(Arguments.List);
 
+    auto LuaEngine = std::make_shared<TLuaEngine>();
+    LuaEngine->SetServer(&Server);
+    Application::Console().InitializeLuaConsole(*LuaEngine);
+
     RegisterThread("Main");
 
     beammp_trace("Running in debug mode on a debug build");
@@ -190,16 +194,13 @@ int BeamMPServerMain(MainArguments Arguments) {
     TPPSMonitor PPSMonitor(Server);
     THeartbeatThread Heartbeat(ResourceManager, Server);
     TNetwork Network(Server, PPSMonitor, ResourceManager);
-
-    auto LuaEngine = std::make_shared<TLuaEngine>();
-    LuaEngine->SetServer(&Server);
-    Application::Console().InitializeLuaConsole(*LuaEngine);
     LuaEngine->SetNetwork(&Network);
     PPSMonitor.SetNetwork(Network);
     Application::CheckForUpdates();
 
     TPluginMonitor PluginMonitor(fs::path(Application::Settings.getAsString(Settings::Key::General_ResourceFolder)) / "Server", LuaEngine);
 
+    Application::SetSubsystemStatus("Main", Application::Status::Good);
     RegisterThread("Main(Waiting)");
 
     std::set<std::string> IgnoreSubsystems {
@@ -214,10 +215,6 @@ int BeamMPServerMain(MainArguments Arguments) {
             std::string SystemsBadList {};
             auto Statuses = Application::GetSubsystemStatuses();
             for (const auto& NameStatusPair : Statuses) {
-                if (NameStatusPair.first == "Main") {
-                    continue;
-                }
-
                 if (IgnoreSubsystems.count(NameStatusPair.first) > 0) {
                     continue; // ignore
                 }
@@ -231,8 +228,6 @@ int BeamMPServerMain(MainArguments Arguments) {
             // remove ", "
             SystemsBadList = SystemsBadList.substr(0, SystemsBadList.size() - 2);
             if (FullyStarted) {
-                Application::SetSubsystemStatus("Main", Application::Status::Good);
-
                 if (!WithErrors) {
                     beammp_info("ALL SYSTEMS STARTED SUCCESSFULLY, EVERYTHING IS OKAY");
                 } else {