6 files changed, 58 insertions, 16 deletions
diff --git a/src/common/Utilities/AsyncCallbackProcessor.h b/src/common/Utilities/AsyncCallbackProcessor.h
index 8a0b123b1b7..5a45ab254a2 100644
--- a/src/common/Utilities/AsyncCallbackProcessor.h
+++ b/src/common/Utilities/AsyncCallbackProcessor.h
@@ -15,16 +15,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef AsyncCallbackProcessor_h__
-#define AsyncCallbackProcessor_h__
+#ifndef TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_H
+#define TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_H
 
-#include <algorithm>
+#include "AsyncCallbackProcessorFwd.h"
 #include <vector>
 
-//template <class T>
-//concept AsyncCallback = requires(T t) { { t.InvokeIfReady() } -> std::convertible_to<bool> };
-
-template<typename T> // requires AsyncCallback<T>
+template<AsyncCallback T>
 class AsyncCallbackProcessor
 {
 public:
@@ -33,8 +30,7 @@ public:
 
     T& AddCallback(T&& query)
     {
-        _callbacks.emplace_back(std::move(query));
-        return _callbacks.back();
+        return _callbacks.emplace_back(std::move(query));
     }
 
     void ProcessReadyCallbacks()
@@ -44,14 +40,24 @@ public:
 
         std::vector<T> updateCallbacks{ std::move(_callbacks) };
 
-        updateCallbacks.erase(std::remove_if(updateCallbacks.begin(), updateCallbacks.end(), [](T& callback)
+        std::erase_if(updateCallbacks, [](T& callback)
         {
-            return callback.InvokeIfReady();
-        }), updateCallbacks.end());
+            return InvokeAsyncCallbackIfReady(callback);
+        });
 
         _callbacks.insert(_callbacks.end(), std::make_move_iterator(updateCallbacks.begin()), std::make_move_iterator(updateCallbacks.end()));
     }
 
+    bool Empty() const
+    {
+        return _callbacks.empty();
+    }
+
+    void CancelAll()
+    {
+        _callbacks.clear();
+    }
+
 private:
     AsyncCallbackProcessor(AsyncCallbackProcessor const&) = delete;
     AsyncCallbackProcessor& operator=(AsyncCallbackProcessor const&) = delete;
@@ -59,4 +65,4 @@ private:
     std::vector<T> _callbacks;
 };
 
-#endif // AsyncCallbackProcessor_h__
+#endif // TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_H
diff --git a/src/common/Utilities/AsyncCallbackProcessorFwd.h b/src/common/Utilities/AsyncCallbackProcessorFwd.h
new file mode 100644
index 00000000000..8eb8b700210
--- /dev/null
+++ b/src/common/Utilities/AsyncCallbackProcessorFwd.h
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_FWD_H
+#define TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_FWD_H
+
+#include <concepts>
+
+template <typename T>
+concept AsyncCallback = requires(T& t) { { InvokeAsyncCallbackIfReady(t) } -> std::convertible_to<bool>; };
+
+template<AsyncCallback T>
+class AsyncCallbackProcessor;
+
+#endif // TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_FWD_H
diff --git a/src/server/database/Database/DatabaseEnvFwd.h b/src/server/database/Database/DatabaseEnvFwd.h
index 18c4216a193..1e36ee0e861 100644
--- a/src/server/database/Database/DatabaseEnvFwd.h
+++ b/src/server/database/Database/DatabaseEnvFwd.h
@@ -18,6 +18,7 @@
 #ifndef DatabaseEnvFwd_h__
 #define DatabaseEnvFwd_h__
 
+#include "AsyncCallbackProcessorFwd.h"
 #include <memory>
 
 struct QueryResultFieldMetadata;
@@ -45,9 +46,7 @@ class PreparedResultSet;
 using PreparedQueryResult = std::shared_ptr<PreparedResultSet>;
 
 class QueryCallback;
-
-template<typename T>
-class AsyncCallbackProcessor;
+bool InvokeAsyncCallbackIfReady(QueryCallback& callback);
 
 using QueryCallbackProcessor = AsyncCallbackProcessor<QueryCallback>;
 
@@ -57,6 +56,7 @@ template<typename T>
 class Transaction;
 
 class TransactionCallback;
+bool InvokeAsyncCallbackIfReady(TransactionCallback& callback);
 
 template<typename T>
 using SQLTransaction = std::shared_ptr<Transaction<T>>;
@@ -77,6 +77,7 @@ using LoginDatabaseQueryHolder = SQLQueryHolder<LoginDatabaseConnection>;
 using WorldDatabaseQueryHolder = SQLQueryHolder<WorldDatabaseConnection>;
 
 class SQLQueryHolderCallback;
+bool InvokeAsyncCallbackIfReady(SQLQueryHolderCallback& callback);
 
 // mysql
 struct MySQLHandle;
diff --git a/src/server/database/Database/QueryCallback.h b/src/server/database/Database/QueryCallback.h
index 72b4ca1202a..efb76d75219 100644
--- a/src/server/database/Database/QueryCallback.h
+++ b/src/server/database/Database/QueryCallback.h
@@ -57,4 +57,6 @@ private:
     std::queue<QueryCallbackData, std::list<QueryCallbackData>> _callbacks;
 };
 
+inline bool InvokeAsyncCallbackIfReady(QueryCallback& callback) { return callback.InvokeIfReady(); }
+
 #endif // _QUERY_CALLBACK_H
diff --git a/src/server/database/Database/QueryHolder.h b/src/server/database/Database/QueryHolder.h
index a0a0b2b2d0f..e274a7b1165 100644
--- a/src/server/database/Database/QueryHolder.h
+++ b/src/server/database/Database/QueryHolder.h
@@ -79,4 +79,6 @@ public:
     std::function<void(SQLQueryHolderBase const&)> m_callback;
 };
 
+inline bool InvokeAsyncCallbackIfReady(SQLQueryHolderCallback& callback) { return callback.InvokeIfReady(); }
+
 #endif
diff --git a/src/server/database/Database/Transaction.h b/src/server/database/Database/Transaction.h
index 9c4284b49c8..da7fafb5a1a 100644
--- a/src/server/database/Database/Transaction.h
+++ b/src/server/database/Database/Transaction.h
@@ -122,4 +122,6 @@ public:
     std::function<void(bool)> m_callback;
 };
 
+inline bool InvokeAsyncCallbackIfReady(TransactionCallback& callback) { return callback.InvokeIfReady(); }
+
 #endif