add Stackable Callbacks to dbBindCallback (#25)

* fix addon config cfgPatches
* add Multiple callback support to dbBindCallback
* add Call dbBindCallback callback directly when result is already ready

Author: jokoho48

.gitmodules

@@ -4,12 +4,15 @@
 [submodule "mariadb-connector-c"]
 	path = mariadb-connector-c
 	url = https://github.com/dedmen/mariadb-connector-c.git
+    branch = intercept_3_2
 [submodule "mariadbpp"]
 	path = mariadbpp
 	url = https://github.com/dedmen/mariadbpp
+    branch = intercept
 [submodule "wolfssl"]
 	path = wolfssl
 	url = https://github.com/wolfSSL/wolfssl
 [submodule "yaml-cpp"]
 	path = yaml-cpp
 	url = https://github.com/dedmen/yaml-cpp.git
+    branch = intercept

CMakeLists.txt

@@ -30,15 +30,6 @@ else()
 endif()
 
 
-#yaml resets c++17 so I just move it above ours so we don't have to re-set
-SET(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Don't want" FORCE)
-SET(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "Don't want" FORCE)
-SET(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Don't want" FORCE)
-SET(YAML_CPP_INSTALL OFF CACHE BOOL "Don't want" FORCE)
-SET(MSVC_SHARED_RT OFF CACHE BOOL "want static" FORCE)
-
-add_subdirectory(yaml-cpp)
-
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -69,13 +60,20 @@ else()
 	set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/OPT:REF /DEBUG:FULL") 
 endif()
 
+SET(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Don't want" FORCE)
+SET(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "Don't want" FORCE)
+SET(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Don't want" FORCE)
+SET(YAML_CPP_INSTALL OFF CACHE BOOL "Don't want" FORCE)
+SET(MSVC_SHARED_RT OFF CACHE BOOL "want static" FORCE)
+
+add_subdirectory(yaml-cpp)
 
 add_subdirectory(mariadb-connector-c)
 
 CONFIGURE_FILE("${CMAKE_CURRENT_BINARY_DIR}/mariadb-connector-c/include/mariadb_version.h"
                "${PROJECT_SOURCE_DIR}/mariadb-connector-c/include/mariadb_version.h")
-
-
+set(MariaDBClient_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/mariadb-connector-c/include")
+set(MariaDBClient_LIBRARY "${PROJECT_SOURCE_DIR}/mariadb-connector-c/libmariadb")
 
 add_subdirectory(mariadbpp)
 

addons/main/config.cpp

@@ -1,16 +1,16 @@
 class CfgPatches {
-	class intercept_template_plugin { //Change this
-		name = "Intercept Template Plugin"; //Change this
+	class intercept_database {
+		name = "Intercept Database";
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 1.82;
 		requiredAddons[] = {"intercept_core"};
-		author = "Dedmen"; //Change this
-		authors[] = {"Dedmen"}; //Change this
-		url = "https://github.com/intercept/intercept-plugin-template"; //Change this
-		version = "1.0";
-		versionStr = "1.0";
-		versionAr[] = {1,0};
+		author = "Dedmen";
+		authors[] = {"Dedmen"};
+		url = "https://github.com/intercept/intercept-database";
+		version = "1.5";
+		versionStr = "1.5";
+		versionAr[] = {1,5};
 	};
 };
 class Intercept {

intercept

@@ -28,9 +28,6 @@ void Logger::logThread(intercept::types::r_string message) {
 }
 
 void Logger::pushTimestamp(std::ostream& str) const {
-      std::time_t t = std::time(0);   // get time now
-    std::tm* now = std::localtime(&t);
-
     auto currentTime = std::chrono::system_clock::now();
     auto millisSinceEpoch = std::chrono::duration_cast<std::chrono::milliseconds>(currentTime.time_since_epoch()).count();
     auto timeT = std::chrono::system_clock::to_time_t(currentTime);

mariadb-connector-c

@@ -58,12 +58,13 @@ void intercept::on_frame() {
     for (auto& it : Threading::get().completedAsyncTasks) {
         __itt_task_begin(domainMain, __itt_null, __itt_null, main_on_frame_callback);
 
-        if (!it->data->callback.is_nil() && it->data->res) {
+        if (!it->data->callbacks.is_empty() && it->data->res) {
             logMessageWithTime("task callback");
             auto gd_res = new GameDataDBResult();
             gd_res->res = it->data->res;
-
-            sqf::call(it->data->callback, { gd_res, it->data->callbackArgs });
+            for (auto& [code, arg] : it->data->callbacks)
+                sqf::call(code, { gd_res, arg });
+            it->data->callbacks.clear();
         }
         __itt_counter_dec(counter);
         __itt_task_end(domainMain);

mariadbpp

@@ -304,14 +304,21 @@ game_value Result::cmd_toParsedArray(game_state& state, game_value_parameter rig
 game_value Result::cmd_bindCallback(game_state&, game_value_parameter left, game_value_parameter right) {
     auto& res = left.get_as<GameDataDBAsyncResult>();
 
-    res->data->callback = right[0];
-    res->data->callbackArgs = right[1]; //#TODO call directly if result is ready
+    if (res->data->res) {
+        auto gd_res = new GameDataDBResult();
+        gd_res->res = res->data->res;
+        sqf::call(right[0], { gd_res, right[1] });
+        return {};
+    }
+    res->data->callbacks.push_back({ right[0], right[1] });
     return {};
 }
 
 game_value Result::cmd_waitForResult(game_state&, game_value_parameter right) {
     auto& res = right.get_as<GameDataDBAsyncResult>();
 
+    //#TODO suspend in scheduled
+
     res->data->fut.wait();
 
     std::unique_lock l(Threading::get().asyncWorkMutex);
@@ -329,7 +336,12 @@ game_value Result::cmd_waitForResult(game_state&, game_value_parameter right) {
 
     auto gd_res = new GameDataDBResult();
     gd_res->res = res->data->res;
-    sqf::call(res->data->callback, { gd_res, res->data->callbackArgs });
+    if (!res->data->callbacks.is_empty()) {
+        for (auto& [code, arg] : res->data->callbacks) 
+            sqf::call(code, { gd_res, arg });
+        res->data->callbacks.clear();
+    }
+    
     return gd_res;
 }
 

src/logger.cpp

@@ -114,8 +114,7 @@ class GameDataDBAsyncResult : public game_data {
         std::future<bool> fut;
         mariadb::result_set_ref res;
         r_string statementName; //Is null if this was not a statement from config
-        game_value callback;
-        game_value callbackArgs;
+        auto_array<std::pair<game_value, game_value>> callbacks;
     };
     std::shared_ptr<dataT> data;
 };