Add a basic ID pool.

Very primitive mechanism but better than nothing.

CMakeLists.txt

@@ -3,7 +3,7 @@ project(SqMod)
 
 # This plug-in only works on 64-bit
 if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-    message(FATAL_ERROR "SqMod does not support 32-but platforms anymore.")
+    message(FATAL_ERROR "SqMod does not support 32-bit platforms anymore.")
 endif()
 
 # Tell CMake where to find our scripts
@@ -12,15 +12,13 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/vendor/POCO/cmake)
 
 # Several plugin options
 option(ENABLE_API21 "Build for 2.1 API." OFF)
-option(ENABLE_DISCORD "Enable built-in Discord support" OFF)
-option(ENABLE_DISCORD_VOICE "Enable voice support in Discord library" OFF)
 option(ENABLE_OFFICIAL "Enable compatibility with official legacy plug-in" ON)
 # As a fall-back for certain situations (mainly some docker ubuntu containers)
 option(ENABLE_BUILTIN_MYSQL_C "Enable built-in MySQL connector library" OFF)
 #option(FORCE_32BIT_BIN "Create a 32-bit executable binary if the compiler defaults to 64-bit." OFF)
 # This option should only be available in certain conditions
 if(WIN32 AND MINGW)
-    option(COPY_DEPENDENCIES "Copy deppendent DLLs into the deps folder." OFF)
+    option(COPY_DEPENDENCIES "Copy dependent DLLs into the deps folder." OFF)
 endif()
 
 # C++14 is mandatory

module/Base/AABB.cpp

@@ -4,6 +4,7 @@
 #include "Base/DynArg.hpp"
 #include "Core/Buffer.hpp"
 #include "Core/Utility.hpp"
+#include "Library/JSON.hpp"
 
 // ------------------------------------------------------------------------------------------------
 namespace SqMod {
@@ -300,6 +301,21 @@ String AABB::ToString() const
     return fmt::format("{},{},{},{},{},{}", min.x, min.y, min.z, max.x, max.y, max.z);
 }
 
+// ------------------------------------------------------------------------------------------------
+void AABB::ToJSON(CtxJSON & ctx) const
+{
+    if (ctx.mObjectOverArray)
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "{{min:{{x:{},y:{},z:{}}},max:{{x:{},y:{},z:{}}},",
+            min.x, min.y, min.z, max.x, max.y, max.z);
+    }
+    else
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "{{min:[{},{},{}],max:[{},{},{}]}},",
+            min.x, min.y, min.z, max.x, max.y, max.z);
+    }
+}
+
 // ------------------------------------------------------------------------------------------------
 void AABB::SetStr(SQChar delim, StackStrF & values)
 {
@@ -793,6 +809,7 @@ void Register_AABB(HSQUIRRELVM vm)
         .SquirrelFunc(_SC("cmp"), &SqDynArgFwd< SqDynArgCmpFn< AABB >, SQFloat, SQInteger, bool, std::nullptr_t, AABB >)
         .SquirrelFunc(_SC("_typename"), &Typename::Fn)
         .Func(_SC("_tostring"), &AABB::ToString)
+        .Func(_SC("_tojson"), &AABB::ToJSON)
         // Meta-methods
         .SquirrelFunc(_SC("_add"), &SqDynArgFwd< SqDynArgAddFn< AABB >, SQFloat, SQInteger, bool, std::nullptr_t, AABB >)
         .SquirrelFunc(_SC("_sub"), &SqDynArgFwd< SqDynArgSubFn< AABB >, SQFloat, SQInteger, bool, std::nullptr_t, AABB >)

module/Base/AABB.hpp

@@ -304,6 +304,11 @@ struct AABB
     */
     SQMOD_NODISCARD String ToString() const;
 
+    /* --------------------------------------------------------------------------------------------
+     * Used by the script engine to convert an instance of this type to a JSON string.
+    */
+    void ToJSON(CtxJSON & ctx) const;
+
     /* --------------------------------------------------------------------------------------------
      * Set the values extracted from the specified string using the specified delimiter.
     */

module/Base/Circle.cpp

@@ -3,6 +3,7 @@
 #include "Base/DynArg.hpp"
 #include "Core/Buffer.hpp"
 #include "Core/Utility.hpp"
+#include "Library/JSON.hpp"
 #include "Library/Numeric/Random.hpp"
 
 // ------------------------------------------------------------------------------------------------
@@ -360,6 +361,19 @@ String Circle::ToString() const
     return fmt::format("{},{},{}", pos.x, pos.y, rad);
 }
 
+// ------------------------------------------------------------------------------------------------
+void Circle::ToJSON(CtxJSON & ctx) const
+{
+    if (ctx.mObjectOverArray)
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "{{x:{},y:{},r:{}}},", pos.x, pos.y, rad);
+    }
+    else
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "[{},{},{}],", pos.x, pos.y, rad);
+    }
+}
+
 // ------------------------------------------------------------------------------------------------
 void Circle::SetRadius(Value nr)
 {
@@ -552,6 +566,7 @@ void Register_Circle(HSQUIRRELVM vm)
         .SquirrelFunc(_SC("cmp"), &SqDynArgFwd< SqDynArgCmpFn< Circle >, SQFloat, SQInteger, bool, std::nullptr_t, Circle >)
         .SquirrelFunc(_SC("_typename"), &Typename::Fn)
         .Func(_SC("_tostring"), &Circle::ToString)
+        .Func(_SC("_toJSON"), &Circle::ToJSON)
         // Meta-methods
         .SquirrelFunc(_SC("_add"), &SqDynArgFwd< SqDynArgAddFn< Circle >, SQFloat, SQInteger, bool, std::nullptr_t, Circle >)
         .SquirrelFunc(_SC("_sub"), &SqDynArgFwd< SqDynArgSubFn< Circle >, SQFloat, SQInteger, bool, std::nullptr_t, Circle >)

module/Base/Circle.hpp

@@ -341,6 +341,11 @@ struct Circle
     */
     SQMOD_NODISCARD String ToString() const;
 
+    /* --------------------------------------------------------------------------------------------
+     * Used by the script engine to convert an instance of this type to a JSON string.
+    */
+    void ToJSON(CtxJSON & ctx) const;
+
     /* --------------------------------------------------------------------------------------------
      * Set the specified radius.
     */

module/Base/Color3.cpp

@@ -4,6 +4,7 @@
 #include "Base/DynArg.hpp"
 #include "Core/Buffer.hpp"
 #include "Core/Utility.hpp"
+#include "Library/JSON.hpp"
 #include "Library/Numeric/Random.hpp"
 
 // ------------------------------------------------------------------------------------------------
@@ -481,6 +482,19 @@ String Color3::ToString() const
     return fmt::format("{},{},{}", r, g, b);
 }
 
+// ------------------------------------------------------------------------------------------------
+void Color3::ToJSON(CtxJSON & ctx) const
+{
+    if (ctx.mObjectOverArray)
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "{{r:{},g:{},b:{}}},", r, g, b);
+    }
+    else
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "[{},{},{}],", r, g, b);
+    }
+}
+
 // ------------------------------------------------------------------------------------------------
 void Color3::SetScalar(Value ns)
 {
@@ -741,6 +755,7 @@ void Register_Color3(HSQUIRRELVM vm)
         .SquirrelFunc(_SC("cmp"), &SqDynArgFwd< SqDynArgCmpFn< Color3 >, SQFloat, SQInteger, bool, std::nullptr_t, Color3 >)
         .SquirrelFunc(_SC("_typename"), &Typename::Fn)
         .Func(_SC("_tostring"), &Color3::ToString)
+        .Func(_SC("_tojson"), &Color3::ToJSON)
         // Meta-methods
         .SquirrelFunc(_SC("_add"), &SqDynArgFwd< SqDynArgAddFn< Color3 >, SQFloat, SQInteger, bool, std::nullptr_t, Color3 >)
         .SquirrelFunc(_SC("_sub"), &SqDynArgFwd< SqDynArgSubFn< Color3 >, SQFloat, SQInteger, bool, std::nullptr_t, Color3 >)

module/Base/Color3.hpp

@@ -405,6 +405,11 @@ struct Color3
     */
     SQMOD_NODISCARD String ToString() const;
 
+    /* --------------------------------------------------------------------------------------------
+     * Used by the script engine to convert an instance of this type to a JSON string.
+    */
+    void ToJSON(CtxJSON & ctx) const;
+
     /* --------------------------------------------------------------------------------------------
      * Set all components to the specified scalar value.
     */

module/Base/Color4.cpp

@@ -4,6 +4,7 @@
 #include "Base/DynArg.hpp"
 #include "Core/Buffer.hpp"
 #include "Core/Utility.hpp"
+#include "Library/JSON.hpp"
 #include "Library/Numeric/Random.hpp"
 
 // ------------------------------------------------------------------------------------------------
@@ -506,6 +507,19 @@ String Color4::ToString() const
     return fmt::format("{},{},{},{}", r, g, b, a);
 }
 
+// ------------------------------------------------------------------------------------------------
+void Color4::ToJSON(CtxJSON & ctx) const
+{
+    if (ctx.mObjectOverArray)
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "{{r:{},g:{},b:{},a:{}}},", r, g, b, a);
+    }
+    else
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "[{},{},{},{}],", r, g, b, a);
+    }
+}
+
 // ------------------------------------------------------------------------------------------------
 void Color4::SetScalar(Value ns)
 {
@@ -781,6 +795,7 @@ void Register_Color4(HSQUIRRELVM vm)
         .SquirrelFunc(_SC("cmp"), &SqDynArgFwd< SqDynArgCmpFn< Color4 >, SQFloat, SQInteger, bool, std::nullptr_t, Color4 >)
         .SquirrelFunc(_SC("_typename"), &Typename::Fn)
         .Func(_SC("_tostring"), &Color4::ToString)
+        .Func(_SC("_tojson"), &Color4::ToJSON)
         // Meta-methods
         .SquirrelFunc(_SC("_add"), &SqDynArgFwd< SqDynArgAddFn< Color4 >, SQFloat, SQInteger, bool, std::nullptr_t, Color4 >)
         .SquirrelFunc(_SC("_sub"), &SqDynArgFwd< SqDynArgSubFn< Color4 >, SQFloat, SQInteger, bool, std::nullptr_t, Color4 >)

module/Base/Color4.hpp

@@ -405,6 +405,11 @@ struct Color4
     */
     SQMOD_NODISCARD String ToString() const;
 
+    /* --------------------------------------------------------------------------------------------
+     * Used by the script engine to convert an instance of this type to a JSON string.
+    */
+    void ToJSON(CtxJSON & ctx) const;
+
     /* --------------------------------------------------------------------------------------------
      * Set all components to the specified scalar value.
     */

module/Base/Quaternion.cpp

@@ -5,6 +5,7 @@
 #include "Base/DynArg.hpp"
 #include "Core/Buffer.hpp"
 #include "Core/Utility.hpp"
+#include "Library/JSON.hpp"
 #include "Library/Numeric/Random.hpp"
 
 // ------------------------------------------------------------------------------------------------
@@ -349,6 +350,19 @@ String Quaternion::ToString() const
     return fmt::format("{},{},{},{}", x, y, z, w);
 }
 
+// ------------------------------------------------------------------------------------------------
+void Quaternion::ToJSON(CtxJSON & ctx) const
+{
+    if (ctx.mObjectOverArray)
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "{{x:{},y:{},z:{},w:{}}},", x, y, z, w);
+    }
+    else
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "[{},{},{},{}],", x, y, z, w);
+    }
+}
+
 // ------------------------------------------------------------------------------------------------
 void Quaternion::SetScalar(Value ns)
 {
@@ -775,6 +789,7 @@ void Register_Quaternion(HSQUIRRELVM vm)
         .SquirrelFunc(_SC("cmp"), &SqDynArgFwd< SqDynArgCmpFn< Quaternion >, SQFloat, SQInteger, bool, std::nullptr_t, Quaternion >)
         .SquirrelFunc(_SC("_typename"), &Typename::Fn)
         .Func(_SC("_tostring"), &Quaternion::ToString)
+        .Func(_SC("_tojson"), &Quaternion::ToJSON)
         // Meta-methods
         .SquirrelFunc(_SC("_add"), &SqDynArgFwd< SqDynArgAddFn< Quaternion >, SQFloat, SQInteger, bool, std::nullptr_t, Quaternion >)
         .SquirrelFunc(_SC("_sub"), &SqDynArgFwd< SqDynArgSubFn< Quaternion >, SQFloat, SQInteger, bool, std::nullptr_t, Quaternion >)

module/Base/Quaternion.hpp

@@ -296,6 +296,11 @@ struct Quaternion
     */
     SQMOD_NODISCARD String ToString() const;
 
+    /* --------------------------------------------------------------------------------------------
+     * Used by the script engine to convert an instance of this type to a JSON string.
+    */
+    void ToJSON(CtxJSON & ctx) const;
+
     /* --------------------------------------------------------------------------------------------
      * Set all components to the specified scalar value.
     */

module/Base/Shared.hpp

@@ -6,6 +6,9 @@
 // ------------------------------------------------------------------------------------------------
 namespace SqMod {
 
+// ------------------------------------------------------------------------------------------------
+struct CtxJSON;
+
 /* ------------------------------------------------------------------------------------------------
  * Helper constants used by the bas types.
 */

module/Base/Sphere.cpp

@@ -3,6 +3,7 @@
 #include "Base/DynArg.hpp"
 #include "Core/Buffer.hpp"
 #include "Core/Utility.hpp"
+#include "Library/JSON.hpp"
 #include "Library/Numeric/Random.hpp"
 
 // ------------------------------------------------------------------------------------------------
@@ -360,6 +361,19 @@ String Sphere::ToString() const
     return fmt::format("{},{},{},{}", pos.x, pos.y, pos.z, rad);
 }
 
+// ------------------------------------------------------------------------------------------------
+void Sphere::ToJSON(CtxJSON & ctx) const
+{
+    if (ctx.mObjectOverArray)
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "{{x:{},y:{},z:{},r:{}}},", pos.x, pos.y, pos.z, rad);
+    }
+    else
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "[{},{},{},{}],", pos.x, pos.y, pos.z, rad);
+    }
+}
+
 // ------------------------------------------------------------------------------------------------
 void Sphere::SetRadius(Value nr)
 {
@@ -527,6 +541,7 @@ void Register_Sphere(HSQUIRRELVM vm)
         .SquirrelFunc(_SC("cmp"), &SqDynArgFwd< SqDynArgCmpFn< Sphere >, SQFloat, SQInteger, bool, std::nullptr_t, Sphere >)
         .SquirrelFunc(_SC("_typename"), &Typename::Fn)
         .Func(_SC("_tostring"), &Sphere::ToString)
+        .Func(_SC("_tojson"), &Sphere::ToJSON)
         // Meta-methods
         .SquirrelFunc(_SC("_add"), &SqDynArgFwd< SqDynArgAddFn< Sphere >, SQFloat, SQInteger, bool, std::nullptr_t, Sphere >)
         .SquirrelFunc(_SC("_sub"), &SqDynArgFwd< SqDynArgSubFn< Sphere >, SQFloat, SQInteger, bool, std::nullptr_t, Sphere >)

module/Base/Sphere.hpp

@@ -341,6 +341,11 @@ struct Sphere
     */
     SQMOD_NODISCARD String ToString() const;
 
+    /* --------------------------------------------------------------------------------------------
+     * Used by the script engine to convert an instance of this type to a JSON string.
+    */
+    void ToJSON(CtxJSON & ctx) const;
+
     /* --------------------------------------------------------------------------------------------
      * Set the specified radius.
     */

module/Base/Vector2.cpp

@@ -4,6 +4,7 @@
 #include "Base/DynArg.hpp"
 #include "Core/Buffer.hpp"
 #include "Core/Utility.hpp"
+#include "Library/JSON.hpp"
 #include "Library/Numeric/Random.hpp"
 
 // ------------------------------------------------------------------------------------------------
@@ -295,6 +296,19 @@ String Vector2::ToString() const
     return fmt::format("{},{}", x, y);
 }
 
+// ------------------------------------------------------------------------------------------------
+void Vector2::ToJSON(CtxJSON & ctx) const
+{
+    if (ctx.mObjectOverArray)
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "{{x:{},y:{}}},", x, y);
+    }
+    else
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "[{},{}],", x, y);
+    }
+}
+
 // ------------------------------------------------------------------------------------------------
 void Vector2::SetScalar(Value ns)
 {
@@ -428,6 +442,7 @@ void Register_Vector2(HSQUIRRELVM vm)
         .SquirrelFunc(_SC("cmp"), &SqDynArgFwd< SqDynArgCmpFn< Vector2 >, SQFloat, SQInteger, bool, std::nullptr_t, Vector2 >)
         .SquirrelFunc(_SC("_typename"), &Typename::Fn)
         .Func(_SC("_tostring"), &Vector2::ToString)
+        .Func(_SC("_tojson"), &Vector2::ToJSON)
         // Meta-methods
         .SquirrelFunc(_SC("_add"), &SqDynArgFwd< SqDynArgAddFn< Vector2 >, SQFloat, SQInteger, bool, std::nullptr_t, Vector2 >)
         .SquirrelFunc(_SC("_sub"), &SqDynArgFwd< SqDynArgSubFn< Vector2 >, SQFloat, SQInteger, bool, std::nullptr_t, Vector2 >)

module/Base/Vector2.hpp

@@ -285,6 +285,11 @@ struct Vector2
     */
     SQMOD_NODISCARD String ToString() const;
 
+    /* --------------------------------------------------------------------------------------------
+     * Used by the script engine to convert an instance of this type to a JSON string.
+    */
+    void ToJSON(CtxJSON & ctx) const;
+
     /* --------------------------------------------------------------------------------------------
      * Set all components to the specified scalar value.
     */

module/Base/Vector2i.cpp

@@ -4,6 +4,7 @@
 #include "Base/DynArg.hpp"
 #include "Core/Buffer.hpp"
 #include "Core/Utility.hpp"
+#include "Library/JSON.hpp"
 #include "Library/Numeric/Random.hpp"
 
 // ------------------------------------------------------------------------------------------------
@@ -441,6 +442,19 @@ String Vector2i::ToString() const
     return fmt::format("{},{}", x, y);
 }
 
+// ------------------------------------------------------------------------------------------------
+void Vector2i::ToJSON(CtxJSON & ctx) const
+{
+    if (ctx.mObjectOverArray)
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "{{x:{},y:{}}},", x, y);
+    }
+    else
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "[{},{}],", x, y);
+    }
+}
+
 // ------------------------------------------------------------------------------------------------
 void Vector2i::SetScalar(Value ns)
 {
@@ -574,6 +588,7 @@ void Register_Vector2i(HSQUIRRELVM vm)
         .SquirrelFunc(_SC("cmp"), &SqDynArgFwd< SqDynArgCmpFn< Vector2i >, SQFloat, SQInteger, bool, std::nullptr_t, Vector2i >)
         .SquirrelFunc(_SC("_typename"), &Typename::Fn)
         .Func(_SC("_tostring"), &Vector2i::ToString)
+        .Func(_SC("_tojson"), &Vector2i::ToJSON)
         // Meta-methods
         .SquirrelFunc(_SC("_add"), &SqDynArgFwd< SqDynArgAddFn< Vector2i >, SQFloat, SQInteger, bool, std::nullptr_t, Vector2i >)
         .SquirrelFunc(_SC("_sub"), &SqDynArgFwd< SqDynArgSubFn< Vector2i >, SQFloat, SQInteger, bool, std::nullptr_t, Vector2i >)

module/Base/Vector2i.hpp

@@ -390,6 +390,11 @@ struct Vector2i
     */
     SQMOD_NODISCARD String ToString() const;
 
+    /* --------------------------------------------------------------------------------------------
+     * Used by the script engine to convert an instance of this type to a JSON string.
+    */
+    void ToJSON(CtxJSON & ctx) const;
+
     /* --------------------------------------------------------------------------------------------
      * Set all components to the specified scalar value.
     */

module/Base/Vector3.cpp

@@ -5,6 +5,7 @@
 #include "Base/DynArg.hpp"
 #include "Core/Buffer.hpp"
 #include "Core/Utility.hpp"
+#include "Library/JSON.hpp"
 #include "Library/Numeric/Random.hpp"
 
 // ------------------------------------------------------------------------------------------------
@@ -331,6 +332,19 @@ String Vector3::ToString() const
     return fmt::format("{},{},{}", x, y, z);
 }
 
+// ------------------------------------------------------------------------------------------------
+void Vector3::ToJSON(CtxJSON & ctx) const
+{
+    if (ctx.mObjectOverArray)
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "{{x:{},y:{},z:{}}},", x, y, z);
+    }
+    else
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "[{},{},{}],", x, y, z);
+    }
+}
+
 // ------------------------------------------------------------------------------------------------
 void Vector3::SetScalar(Value ns)
 {
@@ -696,6 +710,7 @@ void Register_Vector3(HSQUIRRELVM vm)
         .SquirrelFunc(_SC("cmp"), &SqDynArgFwd< SqDynArgCmpFn< Vector3 >, SQFloat, SQInteger, bool, std::nullptr_t, Vector3 >)
         .SquirrelFunc(_SC("_typename"), &Typename::Fn)
         .Func(_SC("_tostring"), &Vector3::ToString)
+        .Func(_SC("_tojson"), &Vector3::ToJSON)
         // Meta-methods
         .SquirrelFunc(_SC("_add"), &SqDynArgFwd< SqDynArgAddFn< Vector3 >, SQFloat, SQInteger, bool, std::nullptr_t, Vector3 >)
         .SquirrelFunc(_SC("_sub"), &SqDynArgFwd< SqDynArgSubFn< Vector3 >, SQFloat, SQInteger, bool, std::nullptr_t, Vector3 >)

module/Base/Vector3.hpp

@@ -297,6 +297,11 @@ struct Vector3
     */
     SQMOD_NODISCARD String ToString() const;
 
+    /* --------------------------------------------------------------------------------------------
+     * Used by the script engine to convert an instance of this type to a JSON string.
+    */
+    void ToJSON(CtxJSON & ctx) const;
+
     /* --------------------------------------------------------------------------------------------
      * Set all components to the specified scalar value.
     */

module/Base/Vector4.cpp

@@ -5,6 +5,7 @@
 #include "Base/DynArg.hpp"
 #include "Core/Buffer.hpp"
 #include "Core/Utility.hpp"
+#include "Library/JSON.hpp"
 #include "Library/Numeric/Random.hpp"
 
 // ------------------------------------------------------------------------------------------------
@@ -344,6 +345,19 @@ String Vector4::ToString() const
     return fmt::format("{},{},{},{}", x, y, z, w);
 }
 
+// ------------------------------------------------------------------------------------------------
+void Vector4::ToJSON(CtxJSON & ctx) const
+{
+    if (ctx.mObjectOverArray)
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "{{x:{},y:{},z:{},w:{}}},", x, y, z, w);
+    }
+    else
+    {
+        fmt::format_to(std::back_inserter(ctx.mOutput), "[{},{},{},{}],", x, y, z, w);
+    }
+}
+
 // ------------------------------------------------------------------------------------------------
 void Vector4::SetScalar(Value ns)
 {
@@ -526,6 +540,7 @@ void Register_Vector4(HSQUIRRELVM vm)
         .SquirrelFunc(_SC("cmp"), &SqDynArgFwd< SqDynArgCmpFn< Vector4 >, SQFloat, SQInteger, bool, std::nullptr_t, Vector4 >)
         .SquirrelFunc(_SC("_typename"), &Typename::Fn)
         .Func(_SC("_tostring"), &Vector4::ToString)
+        .Func(_SC("_tojson"), &Vector4::ToJSON)
         // Meta-methods
         .SquirrelFunc(_SC("_add"), &SqDynArgFwd< SqDynArgAddFn< Vector4 >, SQFloat, SQInteger, bool, std::nullptr_t, Vector4 >)
         .SquirrelFunc(_SC("_sub"), &SqDynArgFwd< SqDynArgSubFn< Vector4 >, SQFloat, SQInteger, bool, std::nullptr_t, Vector4 >)

module/Base/Vector4.hpp

@@ -295,6 +295,11 @@ struct Vector4
     */
     SQMOD_NODISCARD String ToString() const;
 
+    /* --------------------------------------------------------------------------------------------
+     * Used by the script engine to convert an instance of this type to a JSON string.
+    */
+    void ToJSON(CtxJSON & ctx) const;
+
     /* --------------------------------------------------------------------------------------------
      * Set all components to the specified scalar value.
     */

module/CMakeLists.txt

@@ -1,5 +1,7 @@
 # Create the Squirrel module
 add_library(SqModule MODULE SqBase.hpp Main.cpp
+    # SDK
+    SDK/sqmod.h
     # VCMP
     VCMP/vcmp.h
     VCMP/vcmp20.h
@@ -80,6 +82,7 @@ add_library(SqModule MODULE SqBase.hpp Main.cpp
     Library/Numeric.cpp Library/Numeric.hpp
     Library/Numeric/Math.cpp Library/Numeric/Math.hpp
     Library/Numeric/Random.cpp Library/Numeric/Random.hpp
+    Library/RegEx.cpp Library/RegEx.hpp
     Library/String.cpp Library/String.hpp
     Library/System.cpp Library/System.hpp
     Library/System/Dir.cpp Library/System/Dir.hpp
@@ -106,7 +109,6 @@ add_library(SqModule MODULE SqBase.hpp Main.cpp
     PocoLib/Crypto.cpp PocoLib/Crypto.hpp
     PocoLib/Data.cpp PocoLib/Data.hpp
     PocoLib/Net.cpp PocoLib/Net.hpp
-    PocoLib/RegEx.cpp PocoLib/RegEx.hpp
     PocoLib/Register.cpp PocoLib/Register.hpp
     PocoLib/Time.cpp PocoLib/Time.hpp
     PocoLib/Util.cpp PocoLib/Util.hpp
@@ -114,6 +116,7 @@ add_library(SqModule MODULE SqBase.hpp Main.cpp
     Core.cpp Core.hpp
     Logger.cpp Logger.hpp
     Register.cpp
+    Exports.cpp
 )
 # Various definitions required by the plug-in
 target_compile_definitions(SqModule PRIVATE SCRAT_USE_EXCEPTIONS=1)
@@ -132,28 +135,7 @@ if(WIN32 OR MINGW)
     target_link_libraries(SqModule wsock32 ws2_32 shlwapi)
 endif()
 # Link to base libraries
-target_link_libraries(SqModule Squirrel fmt::fmt SimpleINI TinyDir xxHash ConcurrentQueue SAJSON CPR UTF8Lib PUGIXML CivetWeb maxminddb libzmq-static)
-# Enable built-in Discord support
-if(ENABLE_DISCORD)
-    target_link_libraries(SqModule DPP)
-    target_compile_definitions(SqModule PRIVATE VCMP_ENABLE_DISCORD=1)
-    target_sources(SqModule PRIVATE
-        Library/DPP.cpp Library/DPP.hpp
-        Library/DPP/Channel.cpp Library/DPP/Channel.hpp
-        Library/DPP/Client.cpp Library/DPP/Client.hpp
-        Library/DPP/Cluster.cpp Library/DPP/Cluster.hpp
-        Library/DPP/Command.cpp Library/DPP/Command.hpp
-        Library/DPP/Constants.cpp Library/DPP/Constants.hpp
-        Library/DPP/Events.cpp Library/DPP/Events.hpp
-        Library/DPP/Guild.cpp Library/DPP/Guild.hpp
-        Library/DPP/Integration.cpp Library/DPP/Integration.hpp
-        Library/DPP/Message.cpp Library/DPP/Message.hpp
-        Library/DPP/Other.cpp Library/DPP/Other.hpp
-        Library/DPP/Role.cpp Library/DPP/Role.hpp
-        Library/DPP/User.cpp Library/DPP/User.hpp
-        Library/DPP/Utilities.cpp Library/DPP/Utilities.hpp
-    )
-endif()
+target_link_libraries(SqModule RPMalloc Squirrel fmt::fmt SimpleINI TinyDir xxHash ConcurrentQueue SAJSON CPR UTF8Lib PUGIXML CivetWeb maxminddb libzmq-static)
 # Link to POCO libraries
 target_link_libraries(SqModule Poco::Foundation Poco::Crypto Poco::Data Poco::Net)
 # Does POCO have SQLite support?
@@ -222,8 +204,18 @@ else(WIN32)
 endif(WIN32)
 # Include current directory in the search path
 target_include_directories(SqModule PRIVATE ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(SqModule PRIVATE ${CMAKE_CURRENT_LIST_DIR}/SDK)
 target_include_directories(SqModule PRIVATE ${CMAKE_CURRENT_LIST_DIR}/VCMP)
 target_include_directories(SqModule PRIVATE ${CMAKE_CURRENT_LIST_DIR}/Sqrat)
+# Include PCRE directory in the header search path
+if (POCO_UNBUNDLED)
+    find_package(PCRE REQUIRED)
+    target_link_libraries(SqModule PRIVATE Pcre::Pcre)
+else()
+    # Get the foundation source folder path
+    get_target_property(POCO_FOUNDATION_SOURCE_DIR Foundation SOURCE_DIR)
+    target_include_directories(SqModule PRIVATE "${POCO_FOUNDATION_SOURCE_DIR}/src")
+endif()
 # Copy module into the plug-ins folder
 add_custom_command(TARGET SqModule POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:SqModule> "${PROJECT_SOURCE_DIR}/bin/plugins")
 # Copy several dependent DLLs on windows to make distribution easier (used mainly by people that distribute builds)
@@ -234,12 +226,12 @@ if(WIN32 AND MINGW AND COPY_DEPENDENCIES)
     endif()
     # Make sure the deps folder exists
     file(MAKE_DIRECTORY "${PROJECT_SOURCE_DIR}/bin/deps")
-    # Copy dependencies into the plug-ins folder (only so it can be distributed with the DLL)
+    # Copy dependencies into the deps folder (only so it can be distributed with the DLL)
     file(COPY "${MINGW_BIN_PATH}/zlib1.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
     file(COPY "${MINGW_BIN_PATH}/libpq.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
     file(COPY "${MINGW_BIN_PATH}/libzstd.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
     file(COPY "${MINGW_BIN_PATH}/libpsl-5.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
-    file(COPY "${MINGW_BIN_PATH}/libffi-7.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
+    file(COPY "${MINGW_BIN_PATH}/libffi-8.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
     file(COPY "${MINGW_BIN_PATH}/libcurl-4.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
     file(COPY "${MINGW_BIN_PATH}/libssh2-1.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
     file(COPY "${MINGW_BIN_PATH}/libidn2-0.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
@@ -257,17 +249,17 @@ if(WIN32 AND MINGW AND COPY_DEPENDENCIES)
     file(COPY "${MINGW_BIN_PATH}/libp11-kit-0.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
     file(COPY "${MINGW_BIN_PATH}/libbrotlidec.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
     file(COPY "${MINGW_BIN_PATH}/libbrotlicommon.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
-    file(COPY "${MINGW_BIN_PATH}/libunistring-2.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
+    file(COPY "${MINGW_BIN_PATH}/libunistring-5.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
     file(COPY "${MINGW_BIN_PATH}/libnghttp2-14.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
     file(COPY "${MINGW_BIN_PATH}/libwinpthread-1.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
     file(COPY "${MINGW_BIN_PATH}/libstdc++-6.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
     if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT FORCE_32BIT_BIN)
         file(COPY "${MINGW_BIN_PATH}/libgcc_s_seh-1.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
-        file(COPY "${MINGW_BIN_PATH}/libssl-1_1-x64.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
-        file(COPY "${MINGW_BIN_PATH}/libcrypto-1_1-x64.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
+        file(COPY "${MINGW_BIN_PATH}/libssl-3-x64.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
+        file(COPY "${MINGW_BIN_PATH}/libcrypto-3-x64.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
     else()
-        file(COPY "${MINGW_BIN_PATH}/libssl-1_1.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
-        file(COPY "${MINGW_BIN_PATH}/libcrypto-1_1.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
+        file(COPY "${MINGW_BIN_PATH}/libssl-3.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
+        file(COPY "${MINGW_BIN_PATH}/libcrypto-3.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")
     endif()
     if(POCO_UNBUNDLED)
         file(COPY "${MINGW_BIN_PATH}/libexpat-1.dll" DESTINATION "${PROJECT_SOURCE_DIR}/bin/deps")

module/Core.cpp

@@ -49,9 +49,6 @@ extern void TerminateRoutines();
 extern void TerminateCommands();
 extern void TerminateSignals();
 extern void TerminateNet();
-#ifdef VCMP_ENABLE_DISCORD
-    extern void TerminateDPP();
-#endif
 extern void TerminatePocoNet();
 extern void TerminatePocoData();
 
@@ -164,6 +161,7 @@ Core::Core() noexcept
     , m_Scripts()
     , m_PendingScripts()
     , m_Options()
+    , m_ExtCommands{nullptr, nullptr, nullptr, nullptr}
     , m_Blips()
     , m_Checkpoints()
     , m_KeyBinds()
@@ -444,9 +442,9 @@ bool Core::Execute()
     m_LockPostLoadSignal = false;
     m_LockUnloadSignal = false;
 
-    //cLogDbg(m_Verbosity >= 1, "Signaling outside plug-ins to register their API");
+    cLogDbg(m_Verbosity >= 1, "Signaling outside plug-ins that the API is being registered");
     // Tell modules to do their monkey business
-    //_Func->SendPluginCommand(0xDEADBABE, "");
+    _Func->SendPluginCommand(SQMOD_LOAD_CMD, SQMOD_HOST_NAME);
 
     // Load pending scripts while we're in the bounds of the allowed recursiveness
     for (unsigned levels = 0; !m_PendingScripts.empty() && (levels < 8); ++levels)
@@ -514,9 +512,9 @@ void Core::Terminate(bool shutdown)
         // Clear the callbacks
         ResetSignalPair(mOnUnload);
 
-        //cLogDbg(m_Verbosity >= 1, "Signaling outside plug-ins to release their resources");
+        cLogDbg(m_Verbosity >= 1, "Signaling outside plug-ins to release their resources");
         // Tell modules to do their monkey business
-        //_Func->SendPluginCommand(0xDEADC0DE, "");
+        _Func->SendPluginCommand(SQMOD_TERMINATE_CMD, SQMOD_HOST_NAME);
     }
 
     cLogDbg(m_Verbosity >= 1, "Clearing the entity containers");
@@ -552,11 +550,6 @@ void Core::Terminate(bool shutdown)
     // Release announcers
     AnnounceTerminate();
     cLogDbg(m_Verbosity >= 1, "Announcer terminated");
-    // Release DPP
-#ifdef VCMP_ENABLE_DISCORD
-    TerminateDPP();
-    cLogDbg(m_Verbosity >= 1, "Discord terminated");
-#endif
     // Release network
     TerminateNet();
     cLogDbg(m_Verbosity >= 1, "Network terminated");
@@ -604,9 +597,9 @@ void Core::Terminate(bool shutdown)
         HSQUIRRELVM sq_vm = m_VM;
         m_VM = nullptr;
 
-        //cLogDbg(m_Verbosity >= 1, "Signaling outside plug-ins the virtual machine is closing");
+        cLogDbg(m_Verbosity >= 1, "Signaling outside plug-ins the virtual machine is closing");
         // Tell modules to do their monkey business
-        //_Func->SendPluginCommand(0xBAAAAAAD, "");
+        _Func->SendPluginCommand(SQMOD_CLOSING_CMD, SQMOD_HOST_NAME);
         // Release any callbacks from the logger
         Logger::Get().Release();
         cLogDbg(m_Verbosity >= 2, "Closing Virtual Machine");
@@ -637,9 +630,9 @@ void Core::Terminate(bool shutdown)
         // Destroy the VM context, if any
         delete ctx;
 
-        //cLogDbg(m_Verbosity >= 1, "Signaling outside plug-ins to release the virtual machine");
+        cLogDbg(m_Verbosity >= 1, "Signaling outside plug-ins the virtual machine was closed");
         // Tell modules to do their monkey business
-        //_Func->SendPluginCommand(0xDEADBEAF, "");
+        _Func->SendPluginCommand(SQMOD_RELEASED_CMD, SQMOD_HOST_NAME);
     }
 
     OutputMessage("Squirrel plug-in was successfully terminated");
@@ -912,6 +905,81 @@ String Core::FetchCodeLine(const SQChar * src, SQInteger line, bool trim)
     return script->FetchLine(line, trim);
 }
 
+// ------------------------------------------------------------------------------------------------
+int32_t Core::RegisterExtCommand(ExtPluginCommand_t fn)
+{
+    ExtPluginCommand_t * slot = nullptr;
+    // Find a free slot or matching function pointer in the pool
+    for (size_t i = 0; i < m_ExtCommands.max_size(); ++i)
+    {
+        // Is this slot available and are we still looking for a slot?
+        if (m_ExtCommands[i] == nullptr && slot == nullptr)
+        {
+            slot = &m_ExtCommands[i]; // Found a slot
+        }
+        // We keep looking for duplicates even if we found the slot
+        else if (m_ExtCommands[i] == fn)
+        {
+            return 0; // Already registered
+        }
+    }
+    // Do we have a free slot?
+    if (slot != nullptr)
+    {
+        *slot = fn; // Use this slot
+        return 1; // Successfully registered
+    }
+    // No space in the pool
+    return -1;
+}
+
+// ------------------------------------------------------------------------------------------------
+int32_t Core::UnregisterExtCommand(ExtPluginCommand_t fn)
+{
+    // Find the matching function pointer
+    for (size_t i = 0; i < m_ExtCommands.max_size(); ++i)
+    {
+        // Is this the same pointer?
+        if (m_ExtCommands[i] != nullptr && m_ExtCommands[i] == fn)
+        {
+            // Forget about it
+            m_ExtCommands[i] = nullptr;
+            return 1; // Successfully unregistered
+        }
+    }
+    // No space
+    return -1;
+}
+
+// ------------------------------------------------------------------------------------------------
+int32_t Core::SendExtCommand(int32_t target, int32_t req, int32_t tag, const uint8_t * data, size_t size)
+{
+    int32_t count = 0;
+    // Send the command to all registered function pointers
+    for (size_t i = 0; i < m_ExtCommands.max_size(); ++i)
+    {
+        if (m_ExtCommands[i] != nullptr)
+        {
+            const int32_t r = m_ExtCommands[i](target, req, tag, data, size);
+            // Command processed
+            ++count;
+            // Command failed?
+            if (r < 0)
+            {
+                LogErr("External command failed (%i): target(%i), req(%i), tag(%i), data(%p), size (%zu)",
+                        r, target, req, tag, data, size);
+            }
+            // Command consumed?
+            else if (r > 0)
+            {
+                break; // This function pointer requested exclusive access over this command
+            }
+        }
+    }
+    // Return how many function pointers received this command
+    return count;
+}
+
 // ------------------------------------------------------------------------------------------------
 bool Core::DoScripts(Scripts::iterator itr, Scripts::iterator end)
 {
@@ -2379,6 +2447,8 @@ void Core::InitEvents()
     InitSignalPair(mOnServerOption, m_Events, "ServerOption");
     InitSignalPair(mOnScriptReload, m_Events, "ScriptReload");
     InitSignalPair(mOnScriptLoaded, m_Events, "ScriptLoaded");
+    InitSignalPair(mOnExtCommandReply, m_Events, "ExtCommandReply");
+    InitSignalPair(mOnExtCommandEvent, m_Events, "ExtCommandEvent");
 }
 // ------------------------------------------------------------------------------------------------
 void Core::DropEvents()
@@ -2524,6 +2594,8 @@ void Core::DropEvents()
     ResetSignalPair(mOnServerOption);
     ResetSignalPair(mOnScriptReload);
     ResetSignalPair(mOnScriptLoaded);
+    ResetSignalPair(mOnExtCommandReply);
+    ResetSignalPair(mOnExtCommandEvent);
     m_Events.Release();
 }
 
@@ -2869,6 +2941,31 @@ static LightObj & SqGetClientDataBuffer()
     return Core::Get().GetClientDataBuffer();
 }
 
+// ------------------------------------------------------------------------------------------------
+static SQInteger SqSendExtCommand(int32_t target, int32_t req, int32_t tag, SqBuffer & buffer)
+{
+    // Default to an empty/null buffer
+    const uint8_t * data = nullptr;
+    size_t size = 0;
+    // Does the buffer actually point to anything?
+    if (buffer.GetRef())
+    {
+        data = buffer.GetRef()->Begin< uint8_t >();
+        size = buffer.GetRef()->PositionAs< size_t >();
+    }
+    // Forward the request
+    return Core::Get().SendExtCommand(target, req, tag, data, size);
+}
+
+// ------------------------------------------------------------------------------------------------
+static SQInteger SqSendExtCommandStr(int32_t target, int32_t req, int32_t tag, StackStrF & str)
+{
+    // Forward the request
+    return Core::Get().SendExtCommand(target, req, tag,
+                                        reinterpret_cast< const uint8_t * >(str.mPtr),
+                                        str.mLen <= 0 ? 0 : static_cast< size_t >(str.mLen));
+}
+
 // ================================================================================================
 void Register_Core(HSQUIRRELVM vm)
 {
@@ -2918,6 +3015,8 @@ void Register_Core(HSQUIRRELVM vm)
         .Func(_SC("DestroyPickup"), &SqDelPickup)
         .Func(_SC("DestroyVehicle"), &SqDelVehicle)
         .Func(_SC("ClientDataBuffer"), &SqGetClientDataBuffer)
+        .Func(_SC("SendExtCommand"), &SqSendExtCommand)
+        .FmtFunc(_SC("SendExtCommandStr"), &SqSendExtCommandStr)
         .Func(_SC("OnPreLoad"), &SqGetPreLoadEvent)
         .Func(_SC("OnPostLoad"), &SqGetPostLoadEvent)
         .Func(_SC("OnUnload"), &SqGetUnloadEvent)

module/Core.hpp

@@ -9,6 +9,9 @@
 // ------------------------------------------------------------------------------------------------
 #include <unordered_map>
 
+// ------------------------------------------------------------------------------------------------
+#include "SDK/sqmod.h"
+
 // ------------------------------------------------------------------------------------------------
 namespace SqMod {
 
@@ -56,6 +59,8 @@ public:
     typedef std::vector< ScriptSrc >                Scripts; // List of loaded scripts.
     // --------------------------------------------------------------------------------------------
     typedef std::unordered_map< String, String >    Options; // List of custom options.
+    // --------------------------------------------------------------------------------------------
+    typedef std::array< ExtPluginCommand_t, 4 > ExtCommands; // 4 external command parsers should be enough.
 
 private:
 
@@ -68,6 +73,7 @@ private:
     Scripts                         m_Scripts; // Loaded scripts objects.
     Scripts                         m_PendingScripts; // Pending scripts objects.
     Options                         m_Options; // Custom configuration options.
+    ExtCommands                     m_ExtCommands; // External command parsers pointers.
 
     // --------------------------------------------------------------------------------------------
     Blips                           m_Blips; // Blips pool.
@@ -399,6 +405,23 @@ public:
     */
     SQMOD_NODISCARD String FetchCodeLine(const SQChar * src, SQInteger line, bool trim = true);
 
+    /* --------------------------------------------------------------------------------------------
+     * Register a pointer to a function used to processes commands from script.
+     * Returns -1 it failed (no free slot), 0 if it was already registered and 1 if it succeeded.
+    */
+    int32_t RegisterExtCommand(ExtPluginCommand_t fn);
+
+    /* --------------------------------------------------------------------------------------------
+     * Remove a pointer to a function used to processes commands from script.
+     * Returns -1 it failed (no free slot) and 1 if it succeeded.
+    */
+    int32_t UnregisterExtCommand(ExtPluginCommand_t fn);
+
+    /* --------------------------------------------------------------------------------------------
+     * Send a command to all functions currently registered to receive them.
+    */
+    int32_t SendExtCommand(int32_t target, int32_t req, int32_t tag, const uint8_t * data, size_t size);
+
 protected:
 
     /* --------------------------------------------------------------------------------------------
@@ -710,6 +733,16 @@ public:
     */
     void EmitClientScriptData(int32_t player_id, const uint8_t * data, size_t size);
 
+    /* --------------------------------------------------------------------------------------------
+     * Send a response to the script that may have resulted from a previous command.
+    */
+    void EmitExtCommandReply(int32_t sender, int32_t tag, const uint8_t * data, size_t size);
+
+    /* --------------------------------------------------------------------------------------------
+     * Forward an event to the script from an external plug-in.
+    */
+    void EmitExtCommandEvent(int32_t sender, int32_t tag, const uint8_t * data, size_t size);
+
 public:
 
     /* --------------------------------------------------------------------------------------------
@@ -864,6 +897,8 @@ public:
     SignalPair  mOnServerOption{};
     SignalPair  mOnScriptReload{};
     SignalPair  mOnScriptLoaded{};
+    SignalPair  mOnExtCommandReply{};
+    SignalPair  mOnExtCommandEvent{};
 };
 
 /* ------------------------------------------------------------------------------------------------
@@ -993,28 +1028,93 @@ template < class F > inline void ForeachActivePickup(F f) { ForeachActiveEntity(
 template < class F > inline void ForeachActivePlayer(F f) { ForeachActiveEntity(Core::Get().GetPlayers(), std::forward< F >(f)); }
 template < class F > inline void ForeachActiveVehicle(F f) { ForeachActiveEntity(Core::Get().GetVehicles(), std::forward< F >(f)); }
 
+/* ------------------------------------------------------------------------------------------------
+ * Process the identifier of each player slot.
+*/
+template < class F > inline void ForeachPlayerSlot(F f) {
+    for (int32_t i = 0, n = static_cast< int32_t >(_Func->GetMaxPlayers()); i < n; ++i) {
+        f(i);
+    }
+}
+/* ------------------------------------------------------------------------------------------------
+ * Process the identifier of each player slot and count processed players.
+*/
+template < class F > SQMOD_NODISCARD inline int32_t ForeachPlayerSlotCount(F f) {
+    int32_t c = 0;
+    for (int32_t i = 0, n = static_cast< int32_t >(_Func->GetMaxPlayers()); i < n; ++i) {
+        if (f(i)) ++c;
+    }
+    return c;
+}
+/* ------------------------------------------------------------------------------------------------
+ * Process the identifier of each player slot until a certain criteria is met.
+*/
+template < class F > SQMOD_NODISCARD inline int32_t ForeachPlayerSlotUntil(F f) {
+    for (int32_t i = 0, n = static_cast< int32_t >(_Func->GetMaxPlayers()); i < n; ++i) {
+        if (f(i)) return i;
+    }
+    return -1;
+}
+
 /* ------------------------------------------------------------------------------------------------
  * Process the identifier of each connected player.
 */
 template < class F > inline void ForeachConnectedPlayer(F f) {
-    for (int32_t i = 0, n = _Func->GetMaxPlayers(); i < n; ++i) f(i);
+    for (int32_t i = 0, n = static_cast< int32_t >(_Func->GetMaxPlayers()); i < n; ++i) {
+        if (_Func->IsPlayerConnected(i) != 0) f(i);
+    }
 }
 /* ------------------------------------------------------------------------------------------------
  * Process the identifier of each connected player and count processed players.
 */
 template < class F > SQMOD_NODISCARD inline int32_t ForeachConnectedPlayerCount(F f) {
     int32_t c = 0;
-    for (int32_t i = 0, n = _Func->GetMaxPlayers(); i < n; ++i)
-        if (f(i)) ++c;
+    for (int32_t i = 0, n = static_cast< int32_t >(_Func->GetMaxPlayers()); i < n; ++i) {
+        if (_Func->IsPlayerConnected(i) != 0 && f(i)) ++c;
+    }
     return c;
 }
 /* ------------------------------------------------------------------------------------------------
  * Process the identifier of each connected player until a certain criteria is met.
 */
 template < class F > SQMOD_NODISCARD inline int32_t ForeachConnectedPlayerUntil(F f) {
-    for (int32_t i = 0, n = _Func->GetMaxPlayers(); i < n; ++i)
-        if (f(i)) return i;
+    for (int32_t i = 0, n = static_cast< int32_t >(_Func->GetMaxPlayers()); i < n; ++i) {
+        if (_Func->IsPlayerConnected(i) != 0 && f(i)) return i;
+    }
     return -1;
 }
 
+/* ------------------------------------------------------------------------------------------------
+ * Used to select entity instances based on type.
+*/
+template < class > struct EntityInstSelect;
+// Specialization for blips.
+template < > struct EntityInstSelect< CBlip > {
+    static BlipInst & Get(int32_t id) { return Core::Get().GetBlip(id); }
+};
+// Specialization for checkpoints.
+template < > struct EntityInstSelect< CCheckpoint > {
+    static CheckpointInst & Get(int32_t id) { return Core::Get().GetCheckpoint(id); }
+};
+// Specialization for keybinds.
+template < > struct EntityInstSelect< CKeyBind > {
+    static KeyBindInst & Get(int32_t id) { return Core::Get().GetKeyBind(id); }
+};
+// Specialization for objects.
+template < > struct EntityInstSelect< CObject > {
+    static ObjectInst & Get(int32_t id) { return Core::Get().GetObj(id); }
+};
+// Specialization for pickups.
+template < > struct EntityInstSelect< CPickup > {
+    static PickupInst & Get(int32_t id) { return Core::Get().GetPickup(id); }
+};
+// Specialization for players.
+template < > struct EntityInstSelect< CPlayer > {
+    static PlayerInst & Get(int32_t id) { return Core::Get().GetPlayer(id); }
+};
+// Specialization for vehicles.
+template < > struct EntityInstSelect< CVehicle > {
+    static VehicleInst & Get(int32_t id) { return Core::Get().GetVehicle(id); }
+};
+
 } // Namespace:: SqMod

module/Core/Areas.cpp

@@ -161,7 +161,7 @@ bool Area::IsInside(float x, float y) const
 
 // ------------------------------------------------------------------------------------------------
 AreaManager::AreaManager(size_t sz) noexcept
-    : m_Queue(), m_ProcList(), m_Grid{}
+    : m_Queue(), m_ProcList(), m_Grid{}, m_Cells{}
 {
     // Negative half grid size (left)
     int l = (-GRIDH * CELLD);
@@ -171,21 +171,30 @@ AreaManager::AreaManager(size_t sz) noexcept
     int r = (l + CELLD);
     // Positive half grid size (top)
     int t = abs(l);
+    // Row/Column of the grid
+    int row = 0, col = 0;
     // Initialize the grid cells
     for (auto & a : m_Grid)
     {
+        // Reset the column
+        col = 0;
+        // Process row
         for (auto & c : a)
         {
+            auto & cx = m_Cells[row][col];
             // Grab a reference to the cell
             // Configure the range of the cell
-            c.mL = static_cast< float >(l);
-            c.mB = static_cast< float >(b);
-            c.mR = static_cast< float >(r);
-            c.mT = static_cast< float >(t);
+            c.mL = cx.mL = static_cast< float >(l);
+            c.mB = cx.mB = static_cast< float >(b);
+            c.mR = cx.mR = static_cast< float >(r);
+            c.mT = cx.mT = static_cast< float >(t);
             // Reserve area memory if requested
             c.mAreas.reserve(sz);
             // Reset the locks on this area
             c.mLocks = 0;
+            // Set the row and column
+            c.mRow = row;
+            c.mCol = col++;
             // Advance the left side
             l = r;
             // Advance the right side
@@ -203,6 +212,8 @@ AreaManager::AreaManager(size_t sz) noexcept
                 t -= CELLD;
             }
         }
+        // Advance row
+        ++row;
     }
     // Reserve some space in the queue
     m_Queue.reserve(128);
@@ -340,6 +351,21 @@ void AreaManager::RemoveArea(Area & a)
 // ------------------------------------------------------------------------------------------------
 Vector2i AreaManager::LocateCell(float x, float y)
 {
+    for (int r = 0; r < GRIDN; ++r)
+    {
+        for (int c = 0; c < GRIDN; ++c)
+        {
+            auto & bb = m_Cells[r][c];
+            // Check whether point is inside cell
+            if (bb.mL <= x && bb.mR >= x && bb.mB <= y && bb.mT >= y)
+            {
+                return {r, c}; // Is inside
+            }
+        }
+    }
+    // Point is out of bounds
+    return {NOCELL, NOCELL};
+/*
     // Transform the world coordinates into a cell coordinates
     // and cast to integral after rounding the value
     int xc = static_cast< int >(std::round(x / CELLD));
@@ -364,6 +390,7 @@ Vector2i AreaManager::LocateCell(float x, float y)
     }
     // Return the identified cell row and column
     return {GRIDH+xc, GRIDH-yc};
+*/
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -469,6 +496,7 @@ void Register_Areas(HSQUIRRELVM vm)
         .Func(_SC("TestEx"), &Area::TestEx)
         .Func(_SC("Manage"), &Area::Manage)
         .Func(_SC("Unmanage"), &Area::Unmanage)
+        .CbFunc(_SC("EachCell"), &Area::EachCell)
         // Static Functions
         .StaticFunc(_SC("GlobalTest"), &Areas_TestPoint)
         .StaticFunc(_SC("GlobalTestEx"), &Areas_TestPointEx)

module/Core/Areas.hpp

@@ -29,15 +29,25 @@ struct AreaCell
     Areas   mAreas; // Areas that intersect with the cell.
     // --------------------------------------------------------------------------------------------
     int     mLocks; // The amount of locks on the cell.
+    int     mRow; // Row location in the grid.
+    int     mCol; // Column location in the grid.
 
     /* --------------------------------------------------------------------------------------------
      * Default constructor.
     */
     AreaCell()
-        : mL(0), mB(0), mR(0), mT(0), mAreas(0), mLocks(0)
+        : mL(0), mB(0), mR(0), mT(0), mAreas(0), mLocks(0), mRow(0), mCol(0)
     {
         //...
     }
+
+    /* --------------------------------------------------------------------------------------------
+     * Show information (mainly for debug purposes).
+    */
+    String Dump()
+    {
+        return fmt::format("({} : {} | {} : {}) {} : {}", mL, mB, mR, mT, mRow, mCol);
+    }
 };
 
 /* ------------------------------------------------------------------------------------------------
@@ -454,6 +464,17 @@ struct Area
     */
     bool Unmanage();
 
+    /* --------------------------------------------------------------------------------------------
+     * Iterate all managed cells through a functor.
+    */
+    void EachCell(Function & fn) const
+    {
+        for (const auto & e : mCells)
+        {
+            fn.Execute(static_cast< SQInteger >(e->mRow), static_cast< SQInteger >(e->mCol));
+        }
+    }
+
 protected:
 
     /* --------------------------------------------------------------------------------------------
@@ -610,7 +631,10 @@ private:
     ProcList    m_ProcList; // Actions ready to be completed.
     // --------------------------------------------------------------------------------------------
     AreaCell    m_Grid[GRIDN][GRIDN]; // A grid of area lists.
-
+    // --------------------------------------------------------------------------------------------
+    struct {
+        float   mL, mB, mR, mT;
+    } m_Cells[GRIDN][GRIDN];
 public:
 
     /* --------------------------------------------------------------------------------------------
@@ -664,7 +688,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Clear all cell lists and release any script references.
     */
-    static Vector2i LocateCell(float x, float y);
+    Vector2i LocateCell(float x, float y);
 
     /* --------------------------------------------------------------------------------------------
      * Test a point to see whether it intersects with any areas
@@ -679,7 +703,7 @@ public:
             return; // Not our problem
         }
         // Retrieve a reference to the identified cell
-        AreaCell & c = m_Grid[cc.y][cc.x];
+        AreaCell & c = m_Grid[cc.x][cc.y];
         // Is this cell empty?
         if (c.mAreas.empty())
         {

module/Core/Buffer.hpp

@@ -285,13 +285,13 @@ public:
         // Make sure that the buffer can host at least one element of this type
         if (m_Cap < sizeof(T))
         {
-            ThrowMemExcept(fmt::runtime("Buffer capacity of (%u) is unable to host an element of size (%u)"),
+            ThrowMemExcept(fmt::runtime("Buffer capacity of ({}) is unable to host an element of size ({})"),
                             m_Cap, sizeof(T));
         }
         // Make sure that the specified element is withing buffer range
         else if (n > (m_Cap - sizeof(T)))
         {
-            ThrowMemExcept(fmt::runtime("Element of size (%d) at index (%u) is out of buffer capacity (%u)"),
+            ThrowMemExcept(fmt::runtime("Element of size ({}) at index ({}) is out of buffer capacity ({})"),
                             sizeof(T), n, m_Cap);
         }
         // Return the requested element
@@ -306,13 +306,13 @@ public:
         // Make sure that the buffer can host at least one element of this type
         if (m_Cap < sizeof(T))
         {
-            ThrowMemExcept(fmt::runtime("Buffer capacity of (%u) is unable to host an element of size (%u)"),
+            ThrowMemExcept(fmt::runtime("Buffer capacity of ({}) is unable to host an element of size ({})"),
                             m_Cap, sizeof(T));
         }
         // Make sure that the specified element is withing buffer range
         else if (n > (m_Cap - sizeof(T)))
         {
-            ThrowMemExcept(fmt::runtime("Element of size (%d) at index (%u) is out of buffer capacity (%u)"),
+            ThrowMemExcept(fmt::runtime("Element of size ({}) at index ({}) is out of buffer capacity ({})"),
                             sizeof(T), n, m_Cap);
         }
         // Return the requested element
@@ -359,7 +359,7 @@ public:
         // Make sure that the buffer can host at least one element of this type
         if (m_Cap < sizeof(T))
         {
-            ThrowMemExcept(fmt::runtime("Buffer capacity of (%u) is unable to host an element of size (%u)"),
+            ThrowMemExcept(fmt::runtime("Buffer capacity of ({}) is unable to host an element of size ({})"),
                             m_Cap, sizeof(T));
         }
         // Return the requested element
@@ -374,7 +374,7 @@ public:
         // Make sure that the buffer can host at least one element of this type
         if (m_Cap < sizeof(T))
         {
-            ThrowMemExcept(fmt::runtime("Buffer capacity of (%u) is unable to host an element of size (%u)"),
+            ThrowMemExcept(fmt::runtime("Buffer capacity of ({}) is unable to host an element of size ({})"),
                             m_Cap, sizeof(T));
         }
         // Return the requested element
@@ -389,7 +389,7 @@ public:
         // Make sure that the buffer can host at least two elements of this type
         if (m_Cap < (sizeof(T) * 2))
         {
-            ThrowMemExcept(fmt::runtime("Buffer capacity of (%u) is unable to host two elements of size (%u)"),
+            ThrowMemExcept(fmt::runtime("Buffer capacity of ({}) is unable to host two elements of size ({})"),
                             m_Cap, sizeof(T));
         }
         // Return the requested element
@@ -404,7 +404,7 @@ public:
         // Make sure that the buffer can host at least two elements of this type
         if (m_Cap < (sizeof(T) * 2))
         {
-            ThrowMemExcept(fmt::runtime("Buffer capacity of (%u) is unable to host two elements of size (%u)"),
+            ThrowMemExcept(fmt::runtime("Buffer capacity of ({}) is unable to host two elements of size ({})"),
                             m_Cap, sizeof(T));
         }
         // Return the requested element
@@ -419,7 +419,7 @@ public:
         // Make sure that the buffer can host at least one element of this type
         if (m_Cap < sizeof(T))
         {
-            ThrowMemExcept(fmt::runtime("Buffer capacity of (%u) is unable to host an element of size (%u)"),
+            ThrowMemExcept(fmt::runtime("Buffer capacity of ({}) is unable to host an element of size ({})"),
                             m_Cap, sizeof(T));
         }
         // Return the requested element
@@ -434,7 +434,7 @@ public:
         // Make sure that the buffer can host at least one element of this type
         if (m_Cap < sizeof(T))
         {
-            ThrowMemExcept(fmt::runtime("Buffer capacity of (%u) is unable to host an element of size (%u)"),
+            ThrowMemExcept(fmt::runtime("Buffer capacity of ({}) is unable to host an element of size ({})"),
                             m_Cap, sizeof(T));
         }
         // Return the requested element
@@ -449,7 +449,7 @@ public:
         // Make sure that the buffer can host at least two elements of this type
         if (m_Cap < (sizeof(T) * 2))
         {
-            ThrowMemExcept(fmt::runtime("Buffer capacity of (%u) is unable to host two elements of size (%u)"),
+            ThrowMemExcept(fmt::runtime("Buffer capacity of ({}) is unable to host two elements of size ({})"),
                             m_Cap, sizeof(T));
         }
         // Return the requested element
@@ -464,7 +464,7 @@ public:
         // Make sure that the buffer can host at least two elements of this type
         if (m_Cap < (sizeof(T) * 2))
         {
-            ThrowMemExcept(fmt::runtime("Buffer capacity of (%u) is unable to host two elements of size (%u)"),
+            ThrowMemExcept(fmt::runtime("Buffer capacity of ({}) is unable to host two elements of size ({})"),
                             m_Cap, sizeof(T));
         }
         // Return the requested element
@@ -540,7 +540,7 @@ public:
         // Make sure that at least one element of this type exists after the cursor
         if ((m_Cur + sizeof(T)) > m_Cap)
         {
-            ThrowMemExcept(fmt::runtime("Element of size (%u) starting at (%u) exceeds buffer capacity (%u)"),
+            ThrowMemExcept(fmt::runtime("Element of size ({}) starting at ({}) exceeds buffer capacity ({})"),
                             sizeof(T), m_Cur, m_Cap);
         }
         // Return the requested element
@@ -555,7 +555,7 @@ public:
         // Make sure that at least one element of this type exists after the cursor
         if ((m_Cur + sizeof(T)) > m_Cap)
         {
-            ThrowMemExcept(fmt::runtime("Element of size (%u) starting at (%u) exceeds buffer capacity (%u)"),
+            ThrowMemExcept(fmt::runtime("Element of size ({}) starting at ({}) exceeds buffer capacity ({})"),
                             sizeof(T), m_Cur, m_Cap);
         }
         // Return the requested element
@@ -570,7 +570,7 @@ public:
         // The cursor must have at least one element of this type behind
         if (m_Cur < sizeof(T))
         {
-            ThrowMemExcept(fmt::runtime("Cannot read an element of size (%u) before the cursor at (%u)"),
+            ThrowMemExcept(fmt::runtime("Cannot read an element of size ({}) before the cursor at ({})"),
                             sizeof(T), m_Cur);
         }
         // Return the requested element
@@ -585,7 +585,7 @@ public:
         // The cursor must have at least one element of this type behind
         if (m_Cur < sizeof(T))
         {
-            ThrowMemExcept(fmt::runtime("Cannot read an element of size (%u) before the cursor at (%u)"),
+            ThrowMemExcept(fmt::runtime("Cannot read an element of size ({}) before the cursor at ({})"),
                             sizeof(T), m_Cur);
         }
         // Return the requested element
@@ -600,13 +600,13 @@ public:
         // Make sure that the buffer can host at least one element of this type
         if (m_Cap < sizeof(T))
         {
-            ThrowMemExcept(fmt::runtime("Buffer capacity of (%u) is unable to host an element of size (%u)"),
+            ThrowMemExcept(fmt::runtime("Buffer capacity of ({}) is unable to host an element of size ({})"),
                             m_Cap, sizeof(T));
         }
         // There must be buffer left for at least two elements of this type after the cursor
         else if ((m_Cur + (sizeof(T) * 2)) > m_Cap)
         {
-            ThrowMemExcept(fmt::runtime("Element of size (%u) starting at (%u) exceeds buffer capacity (%u)"),
+            ThrowMemExcept(fmt::runtime("Element of size ({}) starting at ({}) exceeds buffer capacity ({})"),
                             sizeof(T), m_Cur + sizeof(T), m_Cap);
         }
         // Return the requested element
@@ -621,13 +621,13 @@ public:
         // Make sure that the buffer can host at least one element of this type
         if (m_Cap < sizeof(T))
         {
-            ThrowMemExcept(fmt::runtime("Buffer capacity of (%u) is unable to host an element of size (%u)"),
+            ThrowMemExcept(fmt::runtime("Buffer capacity of ({}) is unable to host an element of size ({})"),
                             m_Cap, sizeof(T));
         }
         // There must be buffer left for at least two elements of this type after the cursor
         else if ((m_Cur + (sizeof(T) * 2)) > m_Cap)
         {
-            ThrowMemExcept(fmt::runtime("Element of size (%u) starting at (%u) exceeds buffer capacity (%u)"),
+            ThrowMemExcept(fmt::runtime("Element of size ({}) starting at ({}) exceeds buffer capacity ({})"),
                             sizeof(T), m_Cur + sizeof(T), m_Cap);
         }
         // Return the requested element
@@ -708,7 +708,7 @@ public:
         // See if the requested capacity doesn't exceed the limit
         if (n > Max< T >())
         {
-            ThrowMemExcept(fmt::runtime("Requested buffer of (%u) elements exceeds the (%u) limit"), n, Max< T >());
+            ThrowMemExcept(fmt::runtime("Requested buffer of ({}) elements exceeds the ({}) limit"), n, Max< T >());
         }
         // Is there an existing buffer?
         else if (n && !m_Cap)

module/Core/Common.cpp

@@ -248,6 +248,14 @@ String SqTypeName(HSQUIRRELVM vm, SQInteger idx)
     return String(val.mPtr, static_cast< size_t >(val.mLen));
 }
 
+// ------------------------------------------------------------------------------------------------
+String SqTypeName(HSQUIRRELVM vm, LightObj & obj)
+{
+    const StackGuard sg(vm);
+    sq_pushobject(vm, obj);
+    return SqTypeName(vm, -1);
+}
+
 // ------------------------------------------------------------------------------------------------
 LightObj BufferToStrObj(const Buffer & b)
 {

module/Core/Common.hpp

@@ -40,6 +40,7 @@
 #include <sqratTable.h>
 #include <sqratUtil.h>
 #include <fmt/core.h>
+#include <rpmalloc.h>
 
 // ------------------------------------------------------------------------------------------------
 namespace SqMod {
@@ -173,7 +174,7 @@ void OutputError(const char * msg, ...);
 /* ------------------------------------------------------------------------------------------------
  * Generate a formatted string and throw it as a Sqrat exception.
 */
-template < class... Args > void SqThrowF(Args &&... args)
+template < class... Args > inline void SqThrowF(Args &&... args)
 {
     throw Sqrat::Exception(fmt::format(std::forward< Args >(args)...));
 }
@@ -181,7 +182,7 @@ template < class... Args > void SqThrowF(Args &&... args)
 /* ------------------------------------------------------------------------------------------------
  * Generate a formatted string and throw it as a squirrel exception.
 */
-template < class... Args > SQRESULT SqThrowErrorF(HSQUIRRELVM vm, Args &&... args)
+template < class... Args > inline SQRESULT SqThrowErrorF(HSQUIRRELVM vm, Args &&... args)
 {
     String msg;
     try
@@ -241,6 +242,11 @@ SQMOD_NODISCARD const SQChar * SqTypeName(SQObjectType type);
 */
 SQMOD_NODISCARD String SqTypeName(HSQUIRRELVM vm, SQInteger idx);
 
+/* ------------------------------------------------------------------------------------------------
+ * Retrieve the string representation of a certain type from a script object.
+*/
+SQMOD_NODISCARD String SqTypeName(HSQUIRRELVM vm, LightObj & obj);
+
 /* ------------------------------------------------------------------------------------------------
  * Create a script string instance from a buffer.
 */
@@ -266,4 +272,93 @@ SQMOD_NODISCARD SQFloat PopStackFloat(HSQUIRRELVM vm, SQInteger idx);
 */
 SQMOD_NODISCARD bool SToB(const SQChar * str);
 
+/* ------------------------------------------------------------------------------------------------
+ * RAII allocator initializer.
+*/
+struct RPMallocInit
+{
+    /* --------------------------------------------------------------------------------------------
+     * Default constructor.
+    */
+    RPMallocInit()
+    {
+        if (rpmalloc_initialize() != 0)
+        {
+             OutputError("Failed to initialize memory allocator");
+        }
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy constructor (disabled).
+    */
+    RPMallocInit(const RPMallocInit &) = delete;
+
+    /* --------------------------------------------------------------------------------------------
+     * Move constructor (disabled).
+    */
+    RPMallocInit(RPMallocInit &&) noexcept = delete;
+
+    /* --------------------------------------------------------------------------------------------
+     * Destructor.
+    */
+    ~RPMallocInit()
+    {
+        if (rpmalloc_is_thread_initialized()) rpmalloc_finalize();
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy assignment operator (disabled).
+    */
+    RPMallocInit & operator = (const RPMallocInit &) = delete;
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy assignment operator (disabled).
+    */
+    RPMallocInit & operator = (RPMallocInit &&) noexcept = delete;
+
+};
+
+/* ------------------------------------------------------------------------------------------------
+ * RAII allocator thread initializer.
+*/
+struct RPMallocThreadInit
+{
+    /* --------------------------------------------------------------------------------------------
+     * Default constructor.
+    */
+    RPMallocThreadInit()
+    {
+        rpmalloc_thread_initialize();
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy constructor (disabled).
+    */
+    RPMallocThreadInit(const RPMallocThreadInit &) = delete;
+
+    /* --------------------------------------------------------------------------------------------
+     * Move constructor (disabled).
+    */
+    RPMallocThreadInit(RPMallocThreadInit &&) noexcept = delete;
+
+    /* --------------------------------------------------------------------------------------------
+     * Destructor.
+    */
+    ~RPMallocThreadInit()
+    {
+        if (rpmalloc_is_thread_initialized()) rpmalloc_thread_finalize(1);
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy assignment operator (disabled).
+    */
+    RPMallocThreadInit & operator = (const RPMallocThreadInit &) = delete;
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy assignment operator (disabled).
+    */
+    RPMallocThreadInit & operator = (RPMallocThreadInit &&) noexcept = delete;
+
+};
+
 } // Namespace:: SqMod

module/Core/Events.inc

@@ -347,7 +347,7 @@ void Core::EmitIncomingConnection(char * player_name, size_t name_buffer_size, c
         // Release any stored buffer information
         m_IncomingNameBuffer = nullptr;
         m_IncomingNameCapacity = 0;
-        // We catched the exception so we can release the assigned buffer
+        // We caught the exception so we can release the assigned buffer
         throw; // re-throw it
     }
     // Release any stored buffer information
@@ -392,7 +392,8 @@ void Core::EmitPlayerRequestSpawn(int32_t player_id)
 #ifdef VCMP_ENABLE_OFFICIAL
     if (IsOfficial())
     {
-        ExecuteLegacyEvent(m_VM, _SC("onPlayerRequestSpawn"), _player.mLgObj);
+        LightObj r = EvaluateLegacyEvent(m_VM, _SC("onPlayerRequestSpawn"), _player.mLgObj);
+        SetState(r.IsNull() ? 1 : r.Cast< int32_t >());
     }
 #endif
 }
@@ -2245,6 +2246,44 @@ void Core::EmitClientScriptData(int32_t player_id, const uint8_t * data, size_t
     m_ClientData.Release();
 }
 
+// ------------------------------------------------------------------------------------------------
+void Core::EmitExtCommandReply(int32_t sender, int32_t tag, const uint8_t * data, size_t size)
+{
+    SQMOD_CO_EV_TRACEBACK("[TRACE<] Core::ExtCommandReply(%i, %i, %p, %zu)", sender, tag, data, size)
+    // Don't even bother if there's no one listening
+    if (!(mOnExtCommandReply.first->IsEmpty()))
+    {
+        // Allocate a buffer with the received size
+        Buffer b(static_cast< Buffer::SzType >(size));
+        // Replicate the data to the allocated buffer
+        b.Write(0, reinterpret_cast< Buffer::ConstPtr >(data), static_cast< Buffer::SzType >(size));
+        // Prepare an object for the obtained buffer
+        LightObj obj(SqTypeIdentity< SqBuffer >{}, m_VM, std::move(b));
+        // Forward the event call
+        (*mOnExtCommandReply.first)(sender, tag, obj, size);
+    }
+    SQMOD_CO_EV_TRACEBACK("[TRACE>] Core::ExtCommandReply")
+}
+
+// ------------------------------------------------------------------------------------------------
+void Core::EmitExtCommandEvent(int32_t sender, int32_t tag, const uint8_t * data, size_t size)
+{
+    SQMOD_CO_EV_TRACEBACK("[TRACE<] Core::ExtCommandEvent(%i, %i, %p, %zu)", sender, tag, data, size)
+    // Don't even bother if there's no one listening
+    if (!(mOnExtCommandEvent.first->IsEmpty()))
+    {
+        // Allocate a buffer with the received size
+        Buffer b(static_cast< Buffer::SzType >(size));
+        // Replicate the data to the allocated buffer
+        b.Write(0, reinterpret_cast< Buffer::ConstPtr >(data), static_cast< Buffer::SzType >(size));
+        // Prepare an object for the obtained buffer
+        LightObj obj(SqTypeIdentity< SqBuffer >{}, m_VM, std::move(b));
+        // Forward the event call
+        (*mOnExtCommandEvent.first)(sender, tag, obj, size);
+    }
+    SQMOD_CO_EV_TRACEBACK("[TRACE>] Core::ExtCommandEvent")
+}
+
 #undef NULL_SQOBJ_ // don't need this anymore
 
 } // Namespace:: SqMod

module/Core/Routine.cpp

@@ -549,6 +549,8 @@ void Register_Routine(HSQUIRRELVM vm)
         .Prop(_SC("Inactive"), &Routine::GetInactive)
         .Prop(_SC("Persistent"), &Routine::GetPersistent, &Routine::SetPersistent)
         .Prop(_SC("Yields"), &Routine::GetYields, &Routine::SetYields)
+        .Prop(_SC("Elapsed"), &Routine::GetElapsed)
+        .Prop(_SC("Remaining"), &Routine::GetRemaining)
         .Prop(_SC("Terminated"), &Routine::GetTerminated)
         .Prop(_SC("Arguments"), &Routine::GetArguments)
         // Member Methods

module/Core/Routine.hpp

@@ -408,7 +408,6 @@ public:
         }
         // Unable to find such routine
         STHROWF("Unable to fetch a routine with tag ({}). No such routine", tag.mPtr);
-        SQ_UNREACHABLE
         // Should not reach this point but if it did, we have to return something
 #ifdef __clang__
     #pragma clang diagnostic push
@@ -418,6 +417,7 @@ public:
 #ifdef __clang__
     #pragma clang diagnostic pop
 #endif
+        SQ_UNREACHABLE
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -804,6 +804,32 @@ public:
         return (m_Slot == SQMOD_MAX_ROUTINES);
     }
 
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve the time elapsed since the routine was created or invoked.
+    */
+    SQMOD_NODISCARD SQInteger GetElapsed() const
+    {
+        if (m_Slot >= SQMOD_MAX_ROUTINES)
+        {
+            STHROWF("This instance does not reference a valid routine");
+        }
+        // We know it's valid so let's return it
+        return s_Instances[m_Slot].mInterval - s_Intervals[m_Slot];
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve the time remaining until the routine is invoked.
+    */
+    SQMOD_NODISCARD SQInteger GetRemaining() const
+    {
+        if (m_Slot >= SQMOD_MAX_ROUTINES)
+        {
+            STHROWF("This instance does not reference a valid routine");
+        }
+        // We know it's valid so let's return it
+        return s_Intervals[m_Slot];
+    }
+
     /* --------------------------------------------------------------------------------------------
      * Retrieve the number of arguments to be forwarded.
     */

module/Core/Signal.cpp

@@ -1723,6 +1723,7 @@ void Register_Signal(HSQUIRRELVM vm)
         .SquirrelFunc(_SC("Eliminate"), &Signal::SqEliminate)
         .SquirrelFunc(_SC("EliminateThis"), &Signal::SqEliminateThis)
         .SquirrelFunc(_SC("EliminateFunc"), &Signal::SqEliminateFunc)
+        .SquirrelFunc(_SC("Broadcast"), &Signal::SqEmit)
         .SquirrelFunc(_SC("Emit"), &Signal::SqEmit)
         .SquirrelFunc(_SC("Query"), &Signal::SqQuery)
         .SquirrelFunc(_SC("Consume"), &Signal::SqConsume)

module/Core/Tasks.cpp

@@ -328,17 +328,40 @@ SQInteger Tasks::Find(int32_t id, int32_t type, SQInteger & pos, HSQUIRRELVM vm)
 {
     // Grab the top of the stack
     const SQInteger top = sq_gettop(vm);
-    // Was there a callback specified?
+    // Was there a callback or tag specified?
     if (top <= 1)
     {
-        return sq_throwerror(vm, "Missing task callback");
+        return sq_throwerror(vm, "Missing task callback or tag");
     }
-
     SQRESULT res = SQ_OK;
-    // Grab the hash of the callback object
-    const SQHash chash = sq_gethash(vm, 2);
+    // Fetch the task identifier type
+    const SQObjectType ot = sq_gettype(vm, 2);
+    // Are we looking for a task with a specific tag?
+    if (ot == OT_STRING)
+    {
+        // Attempt to retrieve the value from the stack as a string
+        StackStrF tag(vm, 2);
+        // Have we failed to retrieve the string?
+        if (SQ_FAILED(tag.Proc(true)))
+        {
+            return tag.mRes; // Propagate the error!
+        }
+        // Attempt to find the requested task
+        for (const auto & t : s_Tasks)
+        {
+            if (t.mEntity == id && t.mType == type && t.mTag.compare(0, String::npos, tag.mPtr) == 0)
+            {
+                pos = static_cast< SQInteger >(&t - s_Tasks); // Store the index of this element
+            }
+        }
+    }
+    // Validate the callback type
+    else if (ot != OT_CLOSURE && ot != OT_NATIVECLOSURE)
+    {
+        return sq_throwerror(vm, "Invalid callback type");
+    }
     // Should we include the iterations in the criteria?
-    if (top > 3)
+    else if (top > 3)
     {
         SQInteger intrv = 0;
         // Grab the interval from the stack
@@ -348,6 +371,8 @@ SQInteger Tasks::Find(int32_t id, int32_t type, SQInteger & pos, HSQUIRRELVM vm)
         {
             return res; // Propagate the error
         }
+        // Grab the hash of the callback object
+        const SQHash chash = sq_gethash(vm, 2);
         // Attempt to find the requested task
         for (const auto & t : s_Tasks)
         {
@@ -375,6 +400,8 @@ SQInteger Tasks::Find(int32_t id, int32_t type, SQInteger & pos, HSQUIRRELVM vm)
         {
             return res; // Propagate the error
         }
+        // Grab the hash of the callback object
+        const SQHash chash = sq_gethash(vm, 2);
         // Cast iterations to the right type
         const Iterator itr = ConvTo< Iterator >::From(sqitr);
         // Attempt to find the requested task
@@ -388,6 +415,8 @@ SQInteger Tasks::Find(int32_t id, int32_t type, SQInteger & pos, HSQUIRRELVM vm)
     }
     else
     {
+        // Grab the hash of the callback object
+        const SQHash chash = sq_gethash(vm, 2);
         // Attempt to find the requested task
         for (const auto & t : s_Tasks)
         {
@@ -416,7 +445,7 @@ SQInteger Tasks::Remove(int32_t id, int32_t type, HSQUIRRELVM vm)
     // Did we find anything?
     else if (pos < 0)
     {
-        return sq_throwerror(vm, "Unable to locate such task");
+        sq_pushbool(vm, SQFalse); // Unable to locate such task
     }
     else
     {
@@ -424,9 +453,11 @@ SQInteger Tasks::Remove(int32_t id, int32_t type, HSQUIRRELVM vm)
         s_Tasks[pos].Terminate();
         // Reset the timer
         s_Intervals[pos] = 0;
+        // A task was successfully removed
+        sq_pushbool(vm, SQTrue);
     }
-    // Specify that we don't return anything
-    return 0;
+    // Specify that we return a value
+    return 1;
 }
 
 // ------------------------------------------------------------------------------------------------

module/Core/Tasks.hpp

@@ -37,9 +37,9 @@ private:
         LightObj    mData; // A reference to the arbitrary data associated with this instance.
         Iterator    mIterations; // Number of iterations before self destruct.
         Interval    mInterval; // Interval between task invocations.
-        int16_t       mEntity; // The identifier of the entity to which is belongs.
-        uint8_t       mType; // The type of the entity to which is belongs.
-        uint8_t       mArgc; // The number of arguments that the task must forward.
+        int16_t     mEntity; // The identifier of the entity to which is belongs.
+        uint8_t     mType; // The type of the entity to which is belongs.
+        uint8_t     mArgc; // The number of arguments that the task must forward.
         Argument    mArgv[8]; // The arguments that the task must forward.
 
         /* ----------------------------------------------------------------------------------------

module/Core/ThreadPool.cpp

@@ -103,7 +103,7 @@ void ThreadPool::Terminate(bool SQ_UNUSED_ARG(shutdown))
         // Is the item valid?
         if (item)
         {
-            item->OnCompleted(); // Allow the item to finish itself
+            [[maybe_unused]] auto _ = item->OnCompleted(true); // Allow the item to finish itself
         }
         // Item processed
         item.reset();
@@ -125,7 +125,15 @@ void ThreadPool::Process()
             // Is the item valid?
             if (item)
             {
-                item->OnCompleted(); // Allow the item to finish itself
+                try {
+                    // Allow the item to finish itself
+                    if (item->OnCompleted(false))
+                    {
+                        Enqueue(std::move(item)); // Queue again
+                    }
+                } catch (const std::exception & e) {
+                    LogErr("Exception occured in %s completion stage [%s] for [%s]", item->TypeName(), e.what(), item->IdentifiableInfo());
+                }
             }
         }
     }
@@ -138,6 +146,8 @@ void ThreadPool::WorkerProc()
     bool retry = false;
     // Pointer to the dequeued item
     Item item;
+    // Initialize third-party allocator for this thread
+    auto rpmallocinit = std::make_unique< RPMallocThreadInit >();
     // Constantly process items from the queue
     while (true)
     {
@@ -147,7 +157,11 @@ void ThreadPool::WorkerProc()
             // Is there an item that requested to try again?
             if (item)
             {
-                item->OnAborted(true); // NOLINT(bugprone-use-after-move) There's an `if` condition above idiot!
+                try {
+                    item->OnAborted(true); // NOLINT(bugprone-use-after-move) There's an `if` condition above idiot!
+                } catch (const std::exception & e) {
+                    LogErr("Exception occured in %s cancelation stage [%s] for [%s]", item->TypeName(), e.what(), item->IdentifiableInfo());
+                }
             }
             // Exit the loop
             break;
@@ -173,15 +187,30 @@ void ThreadPool::WorkerProc()
             // Is there an item to be processed?
             if (item)
             {
-                item->OnAborted(false); // It should mark itself as aborted somehow!
+                try {
+                    item->OnAborted(false); // It should mark itself as aborted somehow!
+                } catch (const std::exception & e) {
+                    LogErr("Exception occured in %s forced cancelation stage [%s] for [%s]", item->TypeName(), e.what(), item->IdentifiableInfo());
+                }
             }
             // Exit the loop
             break;
         }
+        bool r;
+        // Attempt preparation
+        try {
+            r = item->OnPrepare();
+        } catch (const std::exception & e) {
+            LogErr("Exception occured in %s preparation stage [%s] for [%s]", item->TypeName(), e.what(), item->IdentifiableInfo());
+        }
         // Perform the task
-        if (item->OnPrepare())
+        if (r)
         {
-            retry = item->OnProcess();
+            try {
+                retry = item->OnProcess();
+            } catch (const std::exception & e) {
+                LogErr("Exception occured in %s processing stage [%s] for [%s]", item->TypeName(), e.what(), item->IdentifiableInfo());
+            }
         }
         // The task was performed
         if (!retry)

module/Core/ThreadPool.hpp

@@ -55,6 +55,16 @@ struct ThreadPoolItem
     */
     ThreadPoolItem & operator = (ThreadPoolItem && o) = delete;
 
+    /* --------------------------------------------------------------------------------------------
+     * Provide a name to what type of task this is. Mainly for debugging purposes.
+    */
+    SQMOD_NODISCARD virtual const char * TypeName() noexcept { return "worker item"; }
+
+    /* --------------------------------------------------------------------------------------------
+     * Provide unique information that may help identify the task. Mainly for debugging purposes.
+    */
+    SQMOD_NODISCARD virtual const char * IdentifiableInfo() noexcept { return ""; }
+
     /* --------------------------------------------------------------------------------------------
      * Invoked in worker thread by the thread pool after obtaining the task from the queue.
      * Must return true to indicate that the task can be performed. False indicates failure.
@@ -69,8 +79,10 @@ struct ThreadPoolItem
 
     /* --------------------------------------------------------------------------------------------
      * Invoked in main thread by the thread pool after the task was completed.
+     * If it returns true then it will be put back into the queue to be processed again.
+     * If the boolean parameter is true then the thread-pool is in the process of shutting down.
     */
-    virtual void OnCompleted() { }
+    SQMOD_NODISCARD virtual bool OnCompleted(bool SQ_UNUSED_ARG(stop)) { return false; }
 
     /* --------------------------------------------------------------------------------------------
      * Called in worker by the thread pool to let the task know that it will be aborted.
@@ -98,13 +110,13 @@ private:
      * Destructor.
     */
     ~ThreadPool();
-
+public:
+    // --------------------------------------------------------------------------------------------
+    using Item = std::unique_ptr< ThreadPoolItem >; // Owning pointer of an item.
 private:
 
     // --------------------------------------------------------------------------------------------
     using Pool = std::vector< std::thread >; // Worker container.
-    using Item = std::unique_ptr< ThreadPoolItem >; // Owning pointer of an item.
-    // --------------------------------------------------------------------------------------------
     using Finished = moodycamel::ConcurrentQueue< Item >; // Finished items.
 
     // --------------------------------------------------------------------------------------------
@@ -171,9 +183,25 @@ public:
     void Process();
 
     /* --------------------------------------------------------------------------------------------
-     * Queue an item to be processed.
+     * Queue an item to be processed. Will take ownership of the given pointer!
     */
     void Enqueue(ThreadPoolItem * item)
+    {
+        Enqueue(Item{item});
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Queue an item to be processed. Will take ownership of the given pointer!
+    */
+    template < class T > void CastEnqueue(std::unique_ptr< T > && item)
+    {
+        Enqueue(Item{std::forward< std::unique_ptr< T > >(item)});
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Queue an item to be processed. Will take ownership of the given pointer!
+    */
+    void Enqueue(Item && item)
     {
         // Only queue valid items
         if (!item || !m_Running) return;
@@ -183,7 +211,7 @@ public:
             // Acquire a lock on the mutex
             std::unique_lock< std::mutex > lock(m_Mutex);
             // Push the item in the queue
-            m_Queue.push(Item(item));
+            m_Queue.push(std::forward< Item >(item));
             // Release the mutex before notifying
             lock.unlock();
             // Notify one thread that there's work
@@ -191,16 +219,32 @@ public:
         }
         else
         {
+            bool r;
+            // Attempt preparation
+            try {
+                r = item->OnPrepare();
+            } catch (const std::exception & e) {
+                LogErr("Exception occured in %s preparation stage [%s] for [%s]", item->TypeName(), e.what(), item->IdentifiableInfo());
+            }
             // Perform the task in-place
-            if (item->OnPrepare())
+            if (r)
             {
-                if (item->OnProcess())
+                try {
+                    r = item->OnProcess();
+                } catch (const std::exception & e) {
+                    LogErr("Exception occured in %s processing stage [%s] for [%s]", item->TypeName(), e.what(), item->IdentifiableInfo());
+                }
+                if (r)
                 {
-                    item->OnAborted(true); // Not accepted in single thread
+                    try {
+                        item->OnAborted(true); // Not accepted in single thread
+                    } catch (const std::exception & e) {
+                        LogErr("Exception occured in %s cancelation stage [%s] for [%s]", item->TypeName(), e.what(), item->IdentifiableInfo());
+                    }
                 }
             }
-            // Item was finished in main thread
-            item->OnCompleted();
+            // Task is completed in processing stage
+            m_Finished.enqueue(std::forward< Item >(item));
         }
     }
 
@@ -211,7 +255,6 @@ public:
     {
         return m_Threads.size();
     }
-
 };
 
 } // Namespace:: SqMod

module/Core/VecMap.hpp

@@ -251,6 +251,20 @@ template < class Key, class T, class Pred = std::equal_to< Key > > struct VecMap
         return m_Storage.back().second;
     }
 
+    /* --------------------------------------------------------------------------------------------
+     * Retrieves a reference to the front of the container.
+     * Available for internal use only.
+    */
+    reference front() { return m_Storage.front(); }
+    const_reference front() const { return m_Storage.front(); }
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieves a reference to the back of the container.
+     * Available for internal use only.
+    */
+    reference back() { return m_Storage.back(); }
+    const_reference back() const { return m_Storage.back(); }
+
 private:
 
     /* --------------------------------------------------------------------------------------------

module/Entity/Checkpoint.cpp

@@ -468,6 +468,16 @@ void CCheckpoint::SetColorA(int32_t a) const
     // Perform the requested operation
     _Func->SetCheckPointColour(m_ID, r, g, b, a);
 }
+#ifdef VCMP_ENABLE_OFFICIAL
+// ------------------------------------------------------------------------------------------------
+LightObj & CCheckpoint::GetLegacyObject() const
+{
+    // Validate the managed identifier
+    Validate();
+    // Return the requested information
+    return Core::Get().GetCheckpoint(m_ID).mLgObj;
+}
+#endif
 
 // ------------------------------------------------------------------------------------------------
 static LightObj & Checkpoint_CreateEx1a(int32_t world, bool sphere, float x, float y, float z,
@@ -517,6 +527,9 @@ void Register_CCheckpoint(HSQUIRRELVM vm)
         .Prop(_SC("Tag"), &CCheckpoint::GetTag, &CCheckpoint::SetTag)
         .Prop(_SC("Data"), &CCheckpoint::GetData, &CCheckpoint::SetData)
         .Prop(_SC("Active"), &CCheckpoint::IsActive)
+#ifdef VCMP_ENABLE_OFFICIAL
+        .Prop(_SC("Legacy"), &CCheckpoint::GetLegacyObject)
+#endif
         // Core Methods
         .FmtFunc(_SC("SetTag"), &CCheckpoint::ApplyTag)
         .Func(_SC("CustomEvent"), &CCheckpoint::CustomEvent)

module/Entity/Checkpoint.hpp

@@ -320,6 +320,12 @@ public:
      * Modify the alpha transparency of the managed checkpoint entity.
     */
     void SetColorA(int32_t a) const;
+#ifdef VCMP_ENABLE_OFFICIAL
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve legacy object instance for this entity.
+    */
+    LightObj & GetLegacyObject() const;
+#endif
 };
 
 } // Namespace:: SqMod

module/Entity/Object.cpp

@@ -833,6 +833,16 @@ void CObject::RotateByEulerZ(float z) const
     // Perform the requested operation
     _Func->RotateObjectByEuler(m_ID, 0.0f, 0.0f, z, mRotateByEulerDuration);
 }
+#ifdef VCMP_ENABLE_OFFICIAL
+// ------------------------------------------------------------------------------------------------
+LightObj & CObject::GetLegacyObject() const
+{
+    // Validate the managed identifier
+    Validate();
+    // Return the requested information
+    return Core::Get().GetObj(m_ID).mLgObj;
+}
+#endif
 
 // ------------------------------------------------------------------------------------------------
 static LightObj & Object_CreateEx1a(int32_t model, int32_t world, float x, float y, float z,
@@ -883,6 +893,9 @@ void Register_CObject(HSQUIRRELVM vm)
         .Prop(_SC("Tag"), &CObject::GetTag, &CObject::SetTag)
         .Prop(_SC("Data"), &CObject::GetData, &CObject::SetData)
         .Prop(_SC("Active"), &CObject::IsActive)
+#ifdef VCMP_ENABLE_OFFICIAL
+        .Prop(_SC("Legacy"), &CObject::GetLegacyObject)
+#endif
         // Core Methods
         .FmtFunc(_SC("SetTag"), &CObject::ApplyTag)
         .Func(_SC("CustomEvent"), &CObject::CustomEvent)

module/Entity/Object.hpp

@@ -499,6 +499,12 @@ public:
      * Modify the rotation on the z axis of the managed object entity.
     */
     void RotateByEulerZ(float z) const;
+#ifdef VCMP_ENABLE_OFFICIAL
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve legacy object instance for this entity.
+    */
+    LightObj & GetLegacyObject() const;
+#endif
 };
 
 } // Namespace:: SqMod

module/Entity/Pickup.cpp

@@ -449,6 +449,16 @@ void CPickup::SetPositionZ(float z) const
     // Perform the requested operation
     _Func->SetPickupPosition(m_ID, z, y, z);
 }
+#ifdef VCMP_ENABLE_OFFICIAL
+// ------------------------------------------------------------------------------------------------
+LightObj & CPickup::GetLegacyObject() const
+{
+    // Validate the managed identifier
+    Validate();
+    // Return the requested information
+    return Core::Get().GetPickup(m_ID).mLgObj;
+}
+#endif
 
 // ------------------------------------------------------------------------------------------------
 static LightObj & Pickup_CreateEx1a(int32_t model, int32_t world, int32_t quantity,
@@ -496,6 +506,9 @@ void Register_CPickup(HSQUIRRELVM vm)
         .Prop(_SC("Tag"), &CPickup::GetTag, &CPickup::SetTag)
         .Prop(_SC("Data"), &CPickup::GetData, &CPickup::SetData)
         .Prop(_SC("Active"), &CPickup::IsActive)
+#ifdef VCMP_ENABLE_OFFICIAL
+        .Prop(_SC("Legacy"), &CPickup::GetLegacyObject)
+#endif
         // Core Methods
         .FmtFunc(_SC("SetTag"), &CPickup::ApplyTag)
         .Func(_SC("CustomEvent"), &CPickup::CustomEvent)

module/Entity/Pickup.hpp

@@ -298,6 +298,12 @@ public:
      * Modify the position on the z axis of the managed pickup entity.
     */
     void SetPositionZ(float z) const;
+#ifdef VCMP_ENABLE_OFFICIAL
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve legacy object instance for this entity.
+    */
+    LightObj & GetLegacyObject() const;
+#endif
 };
 
 } // Namespace:: SqMod

module/Entity/Player.cpp

@@ -2593,7 +2593,16 @@ SQInteger CPlayer::AnnounceEx(HSQUIRRELVM vm)
     // This function does not return a value
     return 0;
 }
-
+#ifdef VCMP_ENABLE_OFFICIAL
+// ------------------------------------------------------------------------------------------------
+LightObj & CPlayer::GetLegacyObject() const
+{
+    // Validate the managed identifier
+    Validate();
+    // Return the requested information
+    return Core::Get().GetPlayer(m_ID).mLgObj;
+}
+#endif
 // ------------------------------------------------------------------------------------------------
 SQInteger Player_FindAuto(HSQUIRRELVM vm)
 {
@@ -2793,6 +2802,9 @@ void Register_CPlayer(HSQUIRRELVM vm)
         .Prop(_SC("Tag"), &CPlayer::GetTag, &CPlayer::SetTag)
         .Prop(_SC("Data"), &CPlayer::GetData, &CPlayer::SetData)
         .Prop(_SC("Active"), &CPlayer::IsActive)
+#ifdef VCMP_ENABLE_OFFICIAL
+        .Prop(_SC("Legacy"), &CPlayer::GetLegacyObject)
+#endif
         // Core Methods
         .FmtFunc(_SC("SetTag"), &CPlayer::ApplyTag)
         .Func(_SC("CustomEvent"), &CPlayer::CustomEvent)

module/Entity/Player.hpp

@@ -1101,6 +1101,12 @@ public:
      * Send a formatted announcement message to the managed player entity.
     */
     static SQInteger AnnounceEx(HSQUIRRELVM vm);
+#ifdef VCMP_ENABLE_OFFICIAL
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve legacy object instance for this entity.
+    */
+    LightObj & GetLegacyObject() const;
+#endif
 };
 
 } // Namespace:: SqMod

module/Entity/Vehicle.cpp

@@ -2015,6 +2015,16 @@ void CVehicle::SetRelativeTurnSpeedZ(float z) const
     // Perform the requested operation
     _Func->SetVehicleTurnSpeed(m_ID, z, y, z, static_cast< uint8_t >(false), static_cast< uint8_t >(true));
 }
+#ifdef VCMP_ENABLE_OFFICIAL
+// ------------------------------------------------------------------------------------------------
+LightObj & CVehicle::GetLegacyObject() const
+{
+    // Validate the managed identifier
+    Validate();
+    // Return the requested information
+    return Core::Get().GetVehicle(m_ID).mLgObj;
+}
+#endif
 
 // ------------------------------------------------------------------------------------------------
 static LightObj & Vehicle_CreateEx1a(int32_t model, int32_t world, float x, float y, float z, float angle,
@@ -2061,6 +2071,9 @@ void Register_CVehicle(HSQUIRRELVM vm)
         .Prop(_SC("ID"), &CVehicle::GetID)
         .Prop(_SC("Tag"), &CVehicle::GetTag, &CVehicle::SetTag)
         .Prop(_SC("Data"), &CVehicle::GetData, &CVehicle::SetData)
+#ifdef VCMP_ENABLE_OFFICIAL
+        .Prop(_SC("Legacy"), &CVehicle::GetLegacyObject)
+#endif
         .Prop(_SC("Active"), &CVehicle::IsActive)
         // Core Methods
         .FmtFunc(_SC("SetTag"), &CVehicle::ApplyTag)

module/Entity/Vehicle.hpp

@@ -942,6 +942,12 @@ public:
      * Modify the relative turn velocity on the z axis of the managed vehicle entity.
     */
     void SetRelativeTurnSpeedZ(float z) const;
+#ifdef VCMP_ENABLE_OFFICIAL
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve legacy object instance for this entity.
+    */
+    LightObj & GetLegacyObject() const;
+#endif
 };
 
 } // Namespace:: SqMod

module/Exports.cpp

@@ -0,0 +1,73 @@
+// ------------------------------------------------------------------------------------------------
+#include "Core.hpp"
+
+// ------------------------------------------------------------------------------------------------
+#include <cstring>
+
+// ------------------------------------------------------------------------------------------------
+#include <sqmod.h>
+
+// ------------------------------------------------------------------------------------------------
+namespace SqMod {
+
+// ------------------------------------------------------------------------------------------------
+static int32_t RegisterCommandFn(ExtPluginCommand_t fn)
+{
+    return Core::Get().RegisterExtCommand(fn);
+}
+
+// ------------------------------------------------------------------------------------------------
+static int32_t UnregisterCommandFn(ExtPluginCommand_t fn)
+{
+    return Core::Get().UnregisterExtCommand(fn);
+}
+
+// ------------------------------------------------------------------------------------------------
+static int32_t SendCommandFn(int32_t target, int32_t req, int32_t tag, const uint8_t * data, size_t size)
+{
+    return Core::Get().SendExtCommand(target, req, tag, data, size);
+}
+
+// ------------------------------------------------------------------------------------------------
+static int32_t SendCommandReplyFn(int32_t sender, int32_t tag, const uint8_t * data, size_t size)
+{
+    // Mark the initialization as successful by default
+    const CoreState cs(SQMOD_SUCCESS);
+    // Forward the call to the script callbacks
+    Core::Get().EmitExtCommandReply(sender, tag, data, size);
+    // Return the last known plug-in state
+    return Core::Get().GetState();
+}
+
+// ------------------------------------------------------------------------------------------------
+static int32_t SendCommandEventFn(int32_t sender, int32_t tag, const uint8_t * data, size_t size)
+{
+    // Mark the initialization as successful by default
+    const CoreState cs(SQMOD_SUCCESS);
+    // Forward the call to the script callbacks
+    Core::Get().EmitExtCommandEvent(sender, tag, data, size);
+    // Return the last known plug-in state
+    return Core::Get().GetState();
+}
+
+// ------------------------------------------------------------------------------------------------
+static const SQ_MOD_EXPORTS g_SqModExports{
+    sizeof(SQ_MOD_EXPORTS),
+    &RegisterCommandFn,
+    &UnregisterCommandFn,
+    &SendCommandFn,
+    &SendCommandReplyFn,
+    &SendCommandEventFn
+};
+
+// The server needs a pointer to a pointer, and a persistent one
+static const SQ_MOD_EXPORTS * g_SqModExportsPtr = &g_SqModExports;
+
+// ------------------------------------------------------------------------------------------------
+void InitExports()
+{
+    // Tell the server about the pointer to the exports structure
+    _Func->ExportFunctions(_Info->pluginId, reinterpret_cast< const void ** >(&g_SqModExportsPtr), sizeof(HSQ_MOD_EXPORTS));
+}
+
+} // Namespace:: SqMod

module/Library/CURL.cpp

@@ -47,9 +47,11 @@ struct CpBaseAction : public ThreadPoolItem
     ~CpBaseAction() override = default;
 
     /* --------------------------------------------------------------------------------------------
-     * Task completed callback.
+     * Invoked in main thread by the thread pool after the task was completed.
+     * If it returns true then it will be put back into the queue to be processed again.
+     * If the boolean parameter is trye then the thread-pool is in the process of shutting down.
     */
-    void OnCompleted() override
+    SQMOD_NODISCARD bool OnCompleted(bool SQ_UNUSED_ARG(stop)) override
     {
         // Is there a callback?
         if (!mCallback.IsNull())
@@ -58,6 +60,8 @@ struct CpBaseAction : public ThreadPoolItem
         }
         // Unlock the session
         mInstance->mPending = nullptr;
+        // Don't re-queue
+        return false;
     }
 
     /* --------------------------------------------------------------------------------------------

module/Library/DPP.cpp

@@ -1,72 +0,0 @@
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP.hpp"
-#include "Library/DPP/Cluster.hpp"
-
-// ------------------------------------------------------------------------------------------------
-#include <sqratConst.h>
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-// ------------------------------------------------------------------------------------------------
-void TerminateDPP()
-{
-    // Go over all clusters and try to terminate them
-    for (DpCluster * inst = DpCluster::sHead; inst && inst->mNext != DpCluster::sHead; inst = inst->mNext)
-    {
-        inst->Terminate(); // Terminate() the cluster
-    }
-}
-
-// ------------------------------------------------------------------------------------------------
-void ProcessDPP()
-{
-    // Go over all clusters and allow them to process data
-    for (DpCluster * inst = DpCluster::sHead; inst && inst->mNext != DpCluster::sHead; inst = inst->mNext)
-    {
-        inst->Process();
-    }
-}
-
-// ------------------------------------------------------------------------------------------------
-extern void Register_DPP_Channel(HSQUIRRELVM vm, Table & ns);
-extern void Register_DPP_Client(HSQUIRRELVM vm, Table & ns);
-extern void Register_DPP_Cluster(HSQUIRRELVM vm, Table & ns);
-extern void Register_DPP_Command(HSQUIRRELVM vm, Table & ns);
-extern void Register_DPP_Constants(HSQUIRRELVM vm, Table & ns);
-extern void Register_DPP_Events(HSQUIRRELVM vm, Table & ns);
-extern void Register_DPP_Guild(HSQUIRRELVM vm, Table & ns);
-extern void Register_DPP_Integration(HSQUIRRELVM vm, Table & ns);
-extern void Register_DPP_Message(HSQUIRRELVM vm, Table & ns);
-extern void Register_DPP_Other(HSQUIRRELVM vm, Table & ns);
-extern void Register_DPP_Role(HSQUIRRELVM vm, Table & ns);
-extern void Register_DPP_User(HSQUIRRELVM vm, Table & ns);
-
-// ================================================================================================
-void Register_DPP(HSQUIRRELVM vm)
-{
-    Table ns(vm);
-    // --------------------------------------------------------------------------------------------
-    Register_DPP_Constants(vm, ns);
-    Register_DPP_Client(vm, ns);
-    Register_DPP_Integration(vm, ns);
-    Register_DPP_Command(vm, ns);
-    Register_DPP_Message(vm, ns);
-    Register_DPP_Channel(vm, ns);
-    Register_DPP_Other(vm, ns);
-    Register_DPP_Role(vm, ns);
-    Register_DPP_User(vm, ns);
-    Register_DPP_Guild(vm, ns);
-    {
-        Table ens(vm);
-        Register_DPP_Events(vm, ens);
-        ns.Bind(_SC("Events"), ens);
-    }
-    Register_DPP_Cluster(vm, ns);
-    // --------------------------------------------------------------------------------------------
-    ns.Func(_SC("HasVoice"), dpp::utility::has_voice);
-    // --------------------------------------------------------------------------------------------
-    RootTable(vm).Bind(_SC("SqDiscord"), ns);
-}
-
-} // Namespace:: SqMod

module/Library/DPP.hpp

@@ -1,12 +0,0 @@
-#pragma once
-
-// ------------------------------------------------------------------------------------------------
-#include "Core/Utility.hpp"
-
-// ------------------------------------------------------------------------------------------------
-
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-} // Namespace:: SqMod

module/Library/DPP/Channel.cpp

@@ -1,16 +0,0 @@
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP/Channel.hpp"
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-// ------------------------------------------------------------------------------------------------
-
-
-// ------------------------------------------------------------------------------------------------
-void Register_DPP_Channel(HSQUIRRELVM vm, Table & ns)
-{
-
-}
-
-} // Namespace:: SqMod

module/Library/DPP/Channel.hpp

@@ -1,19 +0,0 @@
-#pragma once
-
-// ------------------------------------------------------------------------------------------------
-#include "Core/Utility.hpp"
-
-// ------------------------------------------------------------------------------------------------
-#include <chrono>
-
-// ------------------------------------------------------------------------------------------------
-#include <dpp/dpp.h>
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-/* ------------------------------------------------------------------------------------------------
- * 
-*/
-
-} // Namespace:: SqMod

module/Library/DPP/Client.cpp

@@ -1,16 +0,0 @@
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP/Client.hpp"
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-// ------------------------------------------------------------------------------------------------
-
-
-// ------------------------------------------------------------------------------------------------
-void Register_DPP_Client(HSQUIRRELVM vm, Table & ns)
-{
-
-}
-
-} // Namespace:: SqMod

module/Library/DPP/Client.hpp

@@ -1,19 +0,0 @@
-#pragma once
-
-// ------------------------------------------------------------------------------------------------
-#include "Core/Utility.hpp"
-
-// ------------------------------------------------------------------------------------------------
-#include <chrono>
-
-// ------------------------------------------------------------------------------------------------
-#include <dpp/dpp.h>
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-/* ------------------------------------------------------------------------------------------------
- * 
-*/
-
-} // Namespace:: SqMod

module/Library/DPP/Cluster.cpp

@@ -1,757 +0,0 @@
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP/Cluster.hpp"
-#include "Library/DPP/Events.hpp"
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-// ------------------------------------------------------------------------------------------------
-SQMOD_DECL_TYPENAME(SqDppCluster, _SC("SqDppCluster"))
-
-// ------------------------------------------------------------------------------------------------
-void Register_DPP_Cluster(HSQUIRRELVM vm, Table & ns)
-{
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("Cluster"),
-        Class< DpCluster, NoCopy< DpCluster > >(vm, SqDppCluster::Str)
-        // Constructors
-        .Ctor< StackStrF & >()
-        .Ctor< StackStrF &, SQInteger >()
-        .Ctor< StackStrF &, SQInteger, SQInteger >()
-        .Ctor< StackStrF &, SQInteger, SQInteger, SQInteger >()
-        .Ctor< StackStrF &, SQInteger, SQInteger, SQInteger, SQInteger >()
-        .Ctor< StackStrF &, SQInteger, SQInteger, SQInteger, SQInteger, bool >()
-        .Ctor< StackStrF &, SQInteger, SQInteger, SQInteger, SQInteger, bool, const DpCachePolicy & >()
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppCluster::Fn)
-        // Member Properties
-        .Prop(_SC("On"), &DpCluster::GetEvents)
-        .Prop(_SC("UpTime"), &DpCluster::UpTime)
-        // Member Methods
-        .Func(_SC("Start"), &DpCluster::Start)
-        .Func(_SC("Log"), &DpCluster::Log)
-        .Func(_SC("GetDmChannel"), &DpCluster::GetDmChannel)
-        .Func(_SC("SetDmChannel"), &DpCluster::SetDmChannel)
-        .Func(_SC("SetPresence"), &DpCluster::SetPresence)
-        .Func(_SC("EnableEvent"), &DpCluster::EnableEvent)
-        .Func(_SC("DisableEvent"), &DpCluster::DisableEvent)
-    );
-}
-
-// ------------------------------------------------------------------------------------------------
-SQMOD_NODISCARD LightObj EventToScriptObject(uint8_t type, uintptr_t data);
-void EventInvokeCleanup(uint8_t type, uintptr_t data);
-
-// ------------------------------------------------------------------------------------------------
-void DpCluster::Process(bool force)
-{
-    // Is there a valid connection?
-    if (!mC && !force)
-    {
-        return; // No point in going forward
-    }
-    DpInternalEvent event;
-    // Retrieve each event individually and process it
-    for (size_t count = mQueue.size_approx(), n = 0; n <= count; ++n)
-    {
-        // Try to get an event from the queue
-        if (mQueue.try_dequeue(event))
-        {
-            // Fetch the type of event
-            const auto type = event.GetType();
-            // Fetch the event itself
-            const auto data = event.GetData();
-            // Is this a valid event and is anyone listening to it?
-            if (event.mData == 0 || mEvents[type].first == nullptr || mEvents[type].first->IsEmpty())
-            {
-                continue; // Move on
-            }
-            // Transform the event instance into a script object
-            LightObj obj = EventToScriptObject(type, data);
-            // Allow the script to take ownership of the event instance now
-            event.Reset();
-            // Forward the call to the associated signal
-            (*mEvents[type].first)(obj);
-            // Allow the event instance to clean itself
-            EventInvokeCleanup(type, data);
-        }
-    }
-}
-
-/* ================================================================================================
- * Event handlers.
-*/
-void DpCluster::OnVoiceStateUpdate(const dpp::voice_state_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::VoiceStateUpdate, new DpVoiceStateUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnLog(const dpp::log_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::Log, new DpLogEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildJoinRequestDelete(const dpp::guild_join_request_delete_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildJoinRequestDelete, new DpGuildJoinRequestDeleteEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnInteractionCreate(const dpp::interaction_create_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::InteractionCreate, new DpInteractionCreateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnButtonClick(const dpp::button_click_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::ButtonClick, new DpButtonClickEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnSelectClick(const dpp::select_click_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::SelectClick, new DpSelectClickEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildDelete(const dpp::guild_delete_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildDelete, new DpGuildDeleteEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnChannelDelete(const dpp::channel_delete_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::ChannelDelete, new DpChannelDeleteEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnChannelUpdate(const dpp::channel_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::ChannelUpdate, new DpChannelUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnReady(const dpp::ready_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::Ready, new DpReadyEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnMessageDelete(const dpp::message_delete_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::MessageDelete, new DpMessageDeleteEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnApplicationCommandDelete(const dpp::application_command_delete_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::ApplicationCommandDelete, new DpApplicationCommandDeleteEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildMemberRemove(const dpp::guild_member_remove_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildMemberRemove, new DpGuildMemberRemoveEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnApplicationCommandCreate(const dpp::application_command_create_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::ApplicationCommandCreate, new DpApplicationCommandCreateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnResumed(const dpp::resumed_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::Resumed, new DpResumedEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildRoleCreate(const dpp::guild_role_create_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildRoleCreate, new DpGuildRoleCreateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnTypingStart(const dpp::typing_start_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::TypingStart, new DpTypingStartEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnMessageReactionAdd(const dpp::message_reaction_add_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::MessageReactionAdd, new DpMessageReactionAddEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildMembersChunk(const dpp::guild_members_chunk_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildMembersChunk, new DpGuildMembersChunkEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnMessageReactionRemove(const dpp::message_reaction_remove_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::MessageReactionRemove, new DpMessageReactionRemoveEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildCreate(const dpp::guild_create_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildCreate, new DpGuildCreateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnChannelCreate(const dpp::channel_create_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::ChannelCreate, new DpChannelCreateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnMessageReactionRemoveEmoji(const dpp::message_reaction_remove_emoji_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::MessageReactionRemoveEmoji, new DpMessageReactionRemoveEmojiEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnMessageDeleteBulk(const dpp::message_delete_bulk_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::MessageDeleteBulk, new DpMessageDeleteBulkEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildRoleUpdate(const dpp::guild_role_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildRoleUpdate, new DpGuildRoleUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildRoleDelete(const dpp::guild_role_delete_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildRoleDelete, new DpGuildRoleDeleteEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnChannelPinsUpdate(const dpp::channel_pins_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::ChannelPinsUpdate, new DpChannelPinsUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnMessageReactionRemoveAll(const dpp::message_reaction_remove_all_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::MessageReactionRemoveAll, new DpMessageReactionRemoveAllEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnVoiceServerUpdate(const dpp::voice_server_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::VoiceServerUpdate, new DpVoiceServerUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildEmojisUpdate(const dpp::guild_emojis_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildEmojisUpdate, new DpGuildEmojisUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildStickersUpdate(const dpp::guild_stickers_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildStickersUpdate, new DpGuildStickersUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnPresenceUpdate(const dpp::presence_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::PresenceUpdate, new DpPresenceUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnWebhooksUpdate(const dpp::webhooks_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::WebhooksUpdate, new DpWebhooksUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildMemberAdd(const dpp::guild_member_add_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildMemberAdd, new DpGuildMemberAddEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnInviteDelete(const dpp::invite_delete_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::InviteDelete, new DpInviteDeleteEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildUpdate(const dpp::guild_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildUpdate, new DpGuildUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildIntegrationsUpdate(const dpp::guild_integrations_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildIntegrationsUpdate, new DpGuildIntegrationsUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildMemberUpdate(const dpp::guild_member_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildMemberUpdate, new DpGuildMemberUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnApplicationCommandUpdate(const dpp::application_command_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::ApplicationCommandUpdate, new DpApplicationCommandUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnInviteCreate(const dpp::invite_create_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::InviteCreate, new DpInviteCreateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnMessageUpdate(const dpp::message_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::MessageUpdate, new DpMessageUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnUserUpdate(const dpp::user_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::UserUpdate, new DpUserUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnMessageCreate(const dpp::message_create_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::MessageCreate, new DpMessageCreateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildBanAdd(const dpp::guild_ban_add_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildBanAdd, new DpGuildBanAddEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnGuildBanRemove(const dpp::guild_ban_remove_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::GuildBanRemove, new DpGuildBanRemoveEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnIntegrationCreate(const dpp::integration_create_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::IntegrationCreate, new DpIntegrationCreateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnIntegrationUpdate(const dpp::integration_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::IntegrationUpdate, new DpIntegrationUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnIntegrationDelete(const dpp::integration_delete_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::IntegrationDelete, new DpIntegrationDeleteEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnThreadCreate(const dpp::thread_create_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::ThreadCreate, new DpThreadCreateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnThreadUpdate(const dpp::thread_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::ThreadUpdate, new DpThreadUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnThreadDelete(const dpp::thread_delete_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::ThreadDelete, new DpThreadDeleteEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnThreadListSync(const dpp::thread_list_sync_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::ThreadListSync, new DpThreadListSyncEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnThreadMemberUpdate(const dpp::thread_member_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::ThreadMemberUpdate, new DpThreadMemberUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnThreadMembersUpdate(const dpp::thread_members_update_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::ThreadMembersUpdate, new DpThreadMembersUpdateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnVoiceBufferSend(const dpp::voice_buffer_send_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::VoiceBufferSend, new DpVoiceBufferSendEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnVoiceUserTalking(const dpp::voice_user_talking_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::VoiceUserTalking, new DpVoiceUserTalkingEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnVoiceReady(const dpp::voice_ready_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::VoiceReady, new DpVoiceReadyEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnVoiceReceive(const dpp::voice_receive_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::VoiceReceive, new DpVoiceReceiveEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnVoiceTrackMarker(const dpp::voice_track_marker_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::VoiceTrackMarker, new DpVoiceTrackMarkerEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnStageInstanceCreate(const dpp::stage_instance_create_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::StageInstanceCreate, new DpStageInstanceCreateEvent(ev)));
-}
-// ------------------------------------------------------------------------------------------------
-void DpCluster::OnStageInstanceDelete(const dpp::stage_instance_delete_t & ev)
-{
-    mQueue.enqueue(DpInternalEvent(DpEventID::StageInstanceDelete, new DpStageInstanceDeleteEvent(ev)));
-}
-
-// ------------------------------------------------------------------------------------------------
-DpCluster & DpCluster::EnableEvent(SQInteger id)
-{
-    switch (id)
-    {
-        case DpEventID::VoiceStateUpdate:           mC->on_voice_state_update([this](auto && e) { OnVoiceStateUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::Log:                        mC->on_log([this](auto && e) { OnLog(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildJoinRequestDelete:     mC->on_guild_join_request_delete([this](auto && e) { OnGuildJoinRequestDelete(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::InteractionCreate:          mC->on_interaction_create([this](auto && e) { OnInteractionCreate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::ButtonClick:                mC->on_button_click([this](auto && e) { OnButtonClick(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::SelectClick:                mC->on_select_click([this](auto && e) { OnSelectClick(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildDelete:                mC->on_guild_delete([this](auto && e) { OnGuildDelete(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::ChannelDelete:              mC->on_channel_delete([this](auto && e) { OnChannelDelete(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::ChannelUpdate:              mC->on_channel_update([this](auto && e) { OnChannelUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::Ready:                      mC->on_ready([this](auto && e) { OnReady(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::MessageDelete:              mC->on_message_delete([this](auto && e) { OnMessageDelete(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::ApplicationCommandDelete:   mC->on_application_command_delete([this](auto && e) { OnApplicationCommandDelete(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildMemberRemove:          mC->on_guild_member_remove([this](auto && e) { OnGuildMemberRemove(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::ApplicationCommandCreate:   mC->on_application_command_create([this](auto && e) { OnApplicationCommandCreate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::Resumed:                    mC->on_resumed([this](auto && e) { OnResumed(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildRoleCreate:            mC->on_guild_role_create([this](auto && e) { OnGuildRoleCreate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::TypingStart:                mC->on_typing_start([this](auto && e) { OnTypingStart(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::MessageReactionAdd:         mC->on_message_reaction_add([this](auto && e) { OnMessageReactionAdd(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildMembersChunk:          mC->on_guild_members_chunk([this](auto && e) { OnGuildMembersChunk(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::MessageReactionRemove:      mC->on_message_reaction_remove([this](auto && e) { OnMessageReactionRemove(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildCreate:                mC->on_guild_create([this](auto && e) { OnGuildCreate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::ChannelCreate:              mC->on_channel_create([this](auto && e) { OnChannelCreate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::MessageReactionRemoveEmoji: mC->on_message_reaction_remove_emoji([this](auto && e) { OnMessageReactionRemoveEmoji(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::MessageDeleteBulk:          mC->on_message_delete_bulk([this](auto && e) { OnMessageDeleteBulk(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildRoleUpdate:            mC->on_guild_role_update([this](auto && e) { OnGuildRoleUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildRoleDelete:            mC->on_guild_role_delete([this](auto && e) { OnGuildRoleDelete(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::ChannelPinsUpdate:          mC->on_channel_pins_update([this](auto && e) { OnChannelPinsUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::MessageReactionRemoveAll:   mC->on_message_reaction_remove_all([this](auto && e) { OnMessageReactionRemoveAll(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::VoiceServerUpdate:          mC->on_voice_server_update([this](auto && e) { OnVoiceServerUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildEmojisUpdate:          mC->on_guild_emojis_update([this](auto && e) { OnGuildEmojisUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildStickersUpdate:        mC->on_guild_stickers_update([this](auto && e) { OnGuildStickersUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::PresenceUpdate:             mC->on_presence_update([this](auto && e) { OnPresenceUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::WebhooksUpdate:             mC->on_webhooks_update([this](auto && e) { OnWebhooksUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildMemberAdd:             mC->on_guild_member_add([this](auto && e) { OnGuildMemberAdd(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::InviteDelete:               mC->on_invite_delete([this](auto && e) { OnInviteDelete(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildUpdate:                mC->on_guild_update([this](auto && e) { OnGuildUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildIntegrationsUpdate:    mC->on_guild_integrations_update([this](auto && e) { OnGuildIntegrationsUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildMemberUpdate:          mC->on_guild_member_update([this](auto && e) { OnGuildMemberUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::ApplicationCommandUpdate:   mC->on_application_command_update([this](auto && e) { OnApplicationCommandUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::InviteCreate:               mC->on_invite_create([this](auto && e) { OnInviteCreate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::MessageUpdate:              mC->on_message_update([this](auto && e) { OnMessageUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::UserUpdate:                 mC->on_user_update([this](auto && e) { OnUserUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::MessageCreate:              mC->on_message_create([this](auto && e) { OnMessageCreate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildBanAdd:                mC->on_guild_ban_add([this](auto && e) { OnGuildBanAdd(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::GuildBanRemove:             mC->on_guild_ban_remove([this](auto && e) { OnGuildBanRemove(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::IntegrationCreate:          mC->on_integration_create([this](auto && e) { OnIntegrationCreate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::IntegrationUpdate:          mC->on_integration_update([this](auto && e) { OnIntegrationUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::IntegrationDelete:          mC->on_integration_delete([this](auto && e) { OnIntegrationDelete(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::ThreadCreate:               mC->on_thread_create([this](auto && e) { OnThreadCreate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::ThreadUpdate:               mC->on_thread_update([this](auto && e) { OnThreadUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::ThreadDelete:               mC->on_thread_delete([this](auto && e) { OnThreadDelete(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::ThreadListSync:             mC->on_thread_list_sync([this](auto && e) { OnThreadListSync(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::ThreadMemberUpdate:         mC->on_thread_member_update([this](auto && e) { OnThreadMemberUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::ThreadMembersUpdate:        mC->on_thread_members_update([this](auto && e) { OnThreadMembersUpdate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::VoiceBufferSend:            mC->on_voice_buffer_send([this](auto && e) { OnVoiceBufferSend(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::VoiceUserTalking:           mC->on_voice_user_talking([this](auto && e) { OnVoiceUserTalking(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::VoiceReady:                 mC->on_voice_ready([this](auto && e) { OnVoiceReady(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::VoiceReceive:               mC->on_voice_receive([this](auto && e) { OnVoiceReceive(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::VoiceTrackMarker:           mC->on_voice_track_marker([this](auto && e) { OnVoiceTrackMarker(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::StageInstanceCreate:        mC->on_stage_instance_create([this](auto && e) { OnStageInstanceCreate(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::StageInstanceDelete:        mC->on_stage_instance_delete([this](auto && e) { OnStageInstanceDelete(std::forward< decltype(e) >(e)); }); break;
-        case DpEventID::Max: // Fall through
-        default: STHROWF("Invalid discord event identifier {}", id);
-    }
-    // Allow chaining
-    return *this;
-}
-
-// ------------------------------------------------------------------------------------------------
-DpCluster & DpCluster::DisableEvent(SQInteger id)
-{
-    switch (id)
-    {
-        case DpEventID::VoiceStateUpdate:           mC->on_voice_state_update(std::function<void(const dpp::voice_state_update_t&)>{}); break;
-        case DpEventID::Log:                        mC->on_log(std::function<void(const dpp::log_t&)>{}); break;
-        case DpEventID::GuildJoinRequestDelete:     mC->on_guild_join_request_delete(std::function<void(const dpp::guild_join_request_delete_t&)>{}); break;
-        case DpEventID::InteractionCreate:          mC->on_interaction_create(std::function<void(const dpp::interaction_create_t&)>{}); break;
-        case DpEventID::ButtonClick:                mC->on_button_click(std::function<void(const dpp::button_click_t&)>{}); break;
-        case DpEventID::SelectClick:                mC->on_select_click(std::function<void(const dpp::select_click_t&)>{}); break;
-        case DpEventID::GuildDelete:                mC->on_guild_delete(std::function<void(const dpp::guild_delete_t&)>{}); break;
-        case DpEventID::ChannelDelete:              mC->on_channel_delete(std::function<void(const dpp::channel_delete_t&)>{}); break;
-        case DpEventID::ChannelUpdate:              mC->on_channel_update(std::function<void(const dpp::channel_update_t&)>{}); break;
-        case DpEventID::Ready:                      mC->on_ready(std::function<void(const dpp::ready_t&)>{}); break;
-        case DpEventID::MessageDelete:              mC->on_message_delete(std::function<void(const dpp::message_delete_t&)>{}); break;
-        case DpEventID::ApplicationCommandDelete:   mC->on_application_command_delete(std::function<void(const dpp::application_command_delete_t&)>{}); break;
-        case DpEventID::GuildMemberRemove:          mC->on_guild_member_remove(std::function<void(const dpp::guild_member_remove_t&)>{}); break;
-        case DpEventID::ApplicationCommandCreate:   mC->on_application_command_create(std::function<void(const dpp::application_command_create_t&)>{}); break;
-        case DpEventID::Resumed:                    mC->on_resumed(std::function<void(const dpp::resumed_t&)>{}); break;
-        case DpEventID::GuildRoleCreate:            mC->on_guild_role_create(std::function<void(const dpp::guild_role_create_t&)>{}); break;
-        case DpEventID::TypingStart:                mC->on_typing_start(std::function<void(const dpp::typing_start_t&)>{}); break;
-        case DpEventID::MessageReactionAdd:         mC->on_message_reaction_add(std::function<void(const dpp::message_reaction_add_t&)>{}); break;
-        case DpEventID::GuildMembersChunk:          mC->on_guild_members_chunk(std::function<void(const dpp::guild_members_chunk_t&)>{}); break;
-        case DpEventID::MessageReactionRemove:      mC->on_message_reaction_remove(std::function<void(const dpp::message_reaction_remove_t&)>{}); break;
-        case DpEventID::GuildCreate:                mC->on_guild_create(std::function<void(const dpp::guild_create_t&)>{}); break;
-        case DpEventID::ChannelCreate:              mC->on_channel_create(std::function<void(const dpp::channel_create_t&)>{}); break;
-        case DpEventID::MessageReactionRemoveEmoji: mC->on_message_reaction_remove_emoji(std::function<void(const dpp::message_reaction_remove_emoji_t&)>{}); break;
-        case DpEventID::MessageDeleteBulk:          mC->on_message_delete_bulk(std::function<void(const dpp::message_delete_bulk_t&)>{}); break;
-        case DpEventID::GuildRoleUpdate:            mC->on_guild_role_update(std::function<void(const dpp::guild_role_update_t&)>{}); break;
-        case DpEventID::GuildRoleDelete:            mC->on_guild_role_delete(std::function<void(const dpp::guild_role_delete_t&)>{}); break;
-        case DpEventID::ChannelPinsUpdate:          mC->on_channel_pins_update(std::function<void(const dpp::channel_pins_update_t&)>{}); break;
-        case DpEventID::MessageReactionRemoveAll:   mC->on_message_reaction_remove_all(std::function<void(const dpp::message_reaction_remove_all_t&)>{}); break;
-        case DpEventID::VoiceServerUpdate:          mC->on_voice_server_update(std::function<void(const dpp::voice_server_update_t&)>{}); break;
-        case DpEventID::GuildEmojisUpdate:          mC->on_guild_emojis_update(std::function<void(const dpp::guild_emojis_update_t&)>{}); break;
-        case DpEventID::GuildStickersUpdate:        mC->on_guild_stickers_update(std::function<void(const dpp::guild_stickers_update_t&)>{}); break;
-        case DpEventID::PresenceUpdate:             mC->on_presence_update(std::function<void(const dpp::presence_update_t&)>{}); break;
-        case DpEventID::WebhooksUpdate:             mC->on_webhooks_update(std::function<void(const dpp::webhooks_update_t&)>{}); break;
-        case DpEventID::GuildMemberAdd:             mC->on_guild_member_add(std::function<void(const dpp::guild_member_add_t&)>{}); break;
-        case DpEventID::InviteDelete:               mC->on_invite_delete(std::function<void(const dpp::invite_delete_t&)>{}); break;
-        case DpEventID::GuildUpdate:                mC->on_guild_update(std::function<void(const dpp::guild_update_t&)>{}); break;
-        case DpEventID::GuildIntegrationsUpdate:    mC->on_guild_integrations_update(std::function<void(const dpp::guild_integrations_update_t&)>{}); break;
-        case DpEventID::GuildMemberUpdate:          mC->on_guild_member_update(std::function<void(const dpp::guild_member_update_t&)>{}); break;
-        case DpEventID::ApplicationCommandUpdate:   mC->on_application_command_update(std::function<void(const dpp::application_command_update_t&)>{}); break;
-        case DpEventID::InviteCreate:               mC->on_invite_create(std::function<void(const dpp::invite_create_t&)>{}); break;
-        case DpEventID::MessageUpdate:              mC->on_message_update(std::function<void(const dpp::message_update_t&)>{}); break;
-        case DpEventID::UserUpdate:                 mC->on_user_update(std::function<void(const dpp::user_update_t&)>{}); break;
-        case DpEventID::MessageCreate:              mC->on_message_create(std::function<void(const dpp::message_create_t&)>{}); break;
-        case DpEventID::GuildBanAdd:                mC->on_guild_ban_add(std::function<void(const dpp::guild_ban_add_t&)>{}); break;
-        case DpEventID::GuildBanRemove:             mC->on_guild_ban_remove(std::function<void(const dpp::guild_ban_remove_t&)>{}); break;
-        case DpEventID::IntegrationCreate:          mC->on_integration_create(std::function<void(const dpp::integration_create_t&)>{}); break;
-        case DpEventID::IntegrationUpdate:          mC->on_integration_update(std::function<void(const dpp::integration_update_t&)>{}); break;
-        case DpEventID::IntegrationDelete:          mC->on_integration_delete(std::function<void(const dpp::integration_delete_t&)>{}); break;
-        case DpEventID::ThreadCreate:               mC->on_thread_create(std::function<void(const dpp::thread_create_t&)>{}); break;
-        case DpEventID::ThreadUpdate:               mC->on_thread_update(std::function<void(const dpp::thread_update_t&)>{}); break;
-        case DpEventID::ThreadDelete:               mC->on_thread_delete(std::function<void(const dpp::thread_delete_t&)>{}); break;
-        case DpEventID::ThreadListSync:             mC->on_thread_list_sync(std::function<void(const dpp::thread_list_sync_t&)>{}); break;
-        case DpEventID::ThreadMemberUpdate:         mC->on_thread_member_update(std::function<void(const dpp::thread_member_update_t&)>{}); break;
-        case DpEventID::ThreadMembersUpdate:        mC->on_thread_members_update(std::function<void(const dpp::thread_members_update_t&)>{}); break;
-        case DpEventID::VoiceBufferSend:            mC->on_voice_buffer_send(std::function<void(const dpp::voice_buffer_send_t&)>{}); break;
-        case DpEventID::VoiceUserTalking:           mC->on_voice_user_talking(std::function<void(const dpp::voice_user_talking_t&)>{}); break;
-        case DpEventID::VoiceReady:                 mC->on_voice_ready(std::function<void(const dpp::voice_ready_t&)>{}); break;
-        case DpEventID::VoiceReceive:               mC->on_voice_receive(std::function<void(const dpp::voice_receive_t&)>{}); break;
-        case DpEventID::VoiceTrackMarker:           mC->on_voice_track_marker(std::function<void(const dpp::voice_track_marker_t&)>{}); break;
-        case DpEventID::StageInstanceCreate:        mC->on_stage_instance_create(std::function<void(const dpp::stage_instance_create_t&)>{}); break;
-        case DpEventID::StageInstanceDelete:        mC->on_stage_instance_delete(std::function<void(const dpp::stage_instance_delete_t&)>{}); break;
-        case DpEventID::Max: // Fall through
-        default: STHROWF("Invalid discord event identifier {}", id);
-    }
-    // Allow chaining
-    return *this;
-}
-
-// ------------------------------------------------------------------------------------------------
-void DpInternalEvent::Release()
-{
-    // Make sure we actually manage something
-    if (mData == 0) return;
-    // Fetch the type of data
-    const auto type = GetType();
-    // Fetch the data itself
-    const auto data = GetData();
-    // Identify data type
-    switch (type)
-    {
-        case DpEventID::VoiceStateUpdate:           delete reinterpret_cast< DpVoiceStateUpdateEvent * >(data); break;
-        case DpEventID::Log:                        delete reinterpret_cast< DpLogEvent * >(data); break;
-        case DpEventID::GuildJoinRequestDelete:     delete reinterpret_cast< DpGuildJoinRequestDeleteEvent * >(data); break;
-        case DpEventID::InteractionCreate:          delete reinterpret_cast< DpInteractionCreateEvent * >(data); break;
-        case DpEventID::ButtonClick:                delete reinterpret_cast< DpButtonClickEvent * >(data); break;
-        case DpEventID::SelectClick:                delete reinterpret_cast< DpSelectClickEvent * >(data); break;
-        case DpEventID::GuildDelete:                delete reinterpret_cast< DpGuildDeleteEvent * >(data); break;
-        case DpEventID::ChannelDelete:              delete reinterpret_cast< DpChannelDeleteEvent * >(data); break;
-        case DpEventID::ChannelUpdate:              delete reinterpret_cast< DpChannelUpdateEvent * >(data); break;
-        case DpEventID::Ready:                      delete reinterpret_cast< DpReadyEvent * >(data); break;
-        case DpEventID::MessageDelete:              delete reinterpret_cast< DpMessageDeleteEvent * >(data); break;
-        case DpEventID::ApplicationCommandDelete:   delete reinterpret_cast< DpApplicationCommandDeleteEvent * >(data); break;
-        case DpEventID::GuildMemberRemove:          delete reinterpret_cast< DpGuildMemberRemoveEvent * >(data); break;
-        case DpEventID::ApplicationCommandCreate:   delete reinterpret_cast< DpApplicationCommandCreateEvent * >(data); break;
-        case DpEventID::Resumed:                    delete reinterpret_cast< DpResumedEvent * >(data); break;
-        case DpEventID::GuildRoleCreate:            delete reinterpret_cast< DpGuildRoleCreateEvent * >(data); break;
-        case DpEventID::TypingStart:                delete reinterpret_cast< DpTypingStartEvent * >(data); break;
-        case DpEventID::MessageReactionAdd:         delete reinterpret_cast< DpMessageReactionAddEvent * >(data); break;
-        case DpEventID::GuildMembersChunk:          delete reinterpret_cast< DpGuildMembersChunkEvent * >(data); break;
-        case DpEventID::MessageReactionRemove:      delete reinterpret_cast< DpMessageReactionRemoveEvent * >(data); break;
-        case DpEventID::GuildCreate:                delete reinterpret_cast< DpGuildCreateEvent * >(data); break;
-        case DpEventID::ChannelCreate:              delete reinterpret_cast< DpChannelCreateEvent * >(data); break;
-        case DpEventID::MessageReactionRemoveEmoji: delete reinterpret_cast< DpMessageReactionRemoveEmojiEvent * >(data); break;
-        case DpEventID::MessageDeleteBulk:          delete reinterpret_cast< DpMessageDeleteBulkEvent * >(data); break;
-        case DpEventID::GuildRoleUpdate:            delete reinterpret_cast< DpGuildRoleUpdateEvent * >(data); break;
-        case DpEventID::GuildRoleDelete:            delete reinterpret_cast< DpGuildRoleDeleteEvent * >(data); break;
-        case DpEventID::ChannelPinsUpdate:          delete reinterpret_cast< DpChannelPinsUpdateEvent * >(data); break;
-        case DpEventID::MessageReactionRemoveAll:   delete reinterpret_cast< DpMessageReactionRemoveAllEvent * >(data); break;
-        case DpEventID::VoiceServerUpdate:          delete reinterpret_cast< DpVoiceServerUpdateEvent * >(data); break;
-        case DpEventID::GuildEmojisUpdate:          delete reinterpret_cast< DpGuildEmojisUpdateEvent * >(data); break;
-        case DpEventID::GuildStickersUpdate:        delete reinterpret_cast< DpGuildStickersUpdateEvent * >(data); break;
-        case DpEventID::PresenceUpdate:             delete reinterpret_cast< DpPresenceUpdateEvent * >(data); break;
-        case DpEventID::WebhooksUpdate:             delete reinterpret_cast< DpWebhooksUpdateEvent * >(data); break;
-        case DpEventID::GuildMemberAdd:             delete reinterpret_cast< DpGuildMemberAddEvent * >(data); break;
-        case DpEventID::InviteDelete:               delete reinterpret_cast< DpInviteDeleteEvent * >(data); break;
-        case DpEventID::GuildUpdate:                delete reinterpret_cast< DpGuildUpdateEvent * >(data); break;
-        case DpEventID::GuildIntegrationsUpdate:    delete reinterpret_cast< DpGuildIntegrationsUpdateEvent * >(data); break;
-        case DpEventID::GuildMemberUpdate:          delete reinterpret_cast< DpGuildMemberUpdateEvent * >(data); break;
-        case DpEventID::ApplicationCommandUpdate:   delete reinterpret_cast< DpApplicationCommandUpdateEvent * >(data); break;
-        case DpEventID::InviteCreate:               delete reinterpret_cast< DpInviteCreateEvent * >(data); break;
-        case DpEventID::MessageUpdate:              delete reinterpret_cast< DpMessageUpdateEvent * >(data); break;
-        case DpEventID::UserUpdate:                 delete reinterpret_cast< DpUserUpdateEvent * >(data); break;
-        case DpEventID::MessageCreate:              delete reinterpret_cast< DpMessageCreateEvent * >(data); break;
-        case DpEventID::GuildBanAdd:                delete reinterpret_cast< DpGuildBanAddEvent * >(data); break;
-        case DpEventID::GuildBanRemove:             delete reinterpret_cast< DpGuildBanRemoveEvent * >(data); break;
-        case DpEventID::IntegrationCreate:          delete reinterpret_cast< DpIntegrationCreateEvent * >(data); break;
-        case DpEventID::IntegrationUpdate:          delete reinterpret_cast< DpIntegrationUpdateEvent * >(data); break;
-        case DpEventID::IntegrationDelete:          delete reinterpret_cast< DpIntegrationDeleteEvent * >(data); break;
-        case DpEventID::ThreadCreate:               delete reinterpret_cast< DpThreadCreateEvent * >(data); break;
-        case DpEventID::ThreadUpdate:               delete reinterpret_cast< DpThreadUpdateEvent * >(data); break;
-        case DpEventID::ThreadDelete:               delete reinterpret_cast< DpThreadDeleteEvent * >(data); break;
-        case DpEventID::ThreadListSync:             delete reinterpret_cast< DpThreadListSyncEvent * >(data); break;
-        case DpEventID::ThreadMemberUpdate:         delete reinterpret_cast< DpThreadMemberUpdateEvent * >(data); break;
-        case DpEventID::ThreadMembersUpdate:        delete reinterpret_cast< DpThreadMembersUpdateEvent * >(data); break;
-        case DpEventID::VoiceBufferSend:            delete reinterpret_cast< DpVoiceBufferSendEvent * >(data); break;
-        case DpEventID::VoiceUserTalking:           delete reinterpret_cast< DpVoiceUserTalkingEvent * >(data); break;
-        case DpEventID::VoiceReady:                 delete reinterpret_cast< DpVoiceReadyEvent * >(data); break;
-        case DpEventID::VoiceReceive:               delete reinterpret_cast< DpVoiceReceiveEvent * >(data); break;
-        case DpEventID::VoiceTrackMarker:           delete reinterpret_cast< DpVoiceTrackMarkerEvent * >(data); break;
-        case DpEventID::StageInstanceCreate:        delete reinterpret_cast< DpStageInstanceCreateEvent * >(data); break;
-        case DpEventID::StageInstanceDelete:        delete reinterpret_cast< DpStageInstanceDeleteEvent * >(data); break;
-        case DpEventID::Max: // Fall through
-        default: LogFtl("Unrecognized discord event instance type"); assert(0); break;
-    }
-    // Forget about it
-    Reset();
-}
-
-// ------------------------------------------------------------------------------------------------
-SQMOD_NODISCARD LightObj EventToScriptObject(uint8_t type, uintptr_t data)
-{
-    switch (type)
-    {
-        case DpEventID::VoiceStateUpdate:           return LightObj(reinterpret_cast< DpVoiceStateUpdateEvent * >(data));
-        case DpEventID::Log:                        return LightObj(reinterpret_cast< DpLogEvent * >(data));
-        case DpEventID::GuildJoinRequestDelete:     return LightObj(reinterpret_cast< DpGuildJoinRequestDeleteEvent * >(data));
-        case DpEventID::InteractionCreate:          return LightObj(reinterpret_cast< DpInteractionCreateEvent * >(data));
-        case DpEventID::ButtonClick:                return LightObj(reinterpret_cast< DpButtonClickEvent * >(data));
-        case DpEventID::SelectClick:                return LightObj(reinterpret_cast< DpSelectClickEvent * >(data));
-        case DpEventID::GuildDelete:                return LightObj(reinterpret_cast< DpGuildDeleteEvent * >(data));
-        case DpEventID::ChannelDelete:              return LightObj(reinterpret_cast< DpChannelDeleteEvent * >(data));
-        case DpEventID::ChannelUpdate:              return LightObj(reinterpret_cast< DpChannelUpdateEvent * >(data));
-        case DpEventID::Ready:                      return LightObj(reinterpret_cast< DpReadyEvent * >(data));
-        case DpEventID::MessageDelete:              return LightObj(reinterpret_cast< DpMessageDeleteEvent * >(data));
-        case DpEventID::ApplicationCommandDelete:   return LightObj(reinterpret_cast< DpApplicationCommandDeleteEvent * >(data));
-        case DpEventID::GuildMemberRemove:          return LightObj(reinterpret_cast< DpGuildMemberRemoveEvent * >(data));
-        case DpEventID::ApplicationCommandCreate:   return LightObj(reinterpret_cast< DpApplicationCommandCreateEvent * >(data));
-        case DpEventID::Resumed:                    return LightObj(reinterpret_cast< DpResumedEvent * >(data));
-        case DpEventID::GuildRoleCreate:            return LightObj(reinterpret_cast< DpGuildRoleCreateEvent * >(data));
-        case DpEventID::TypingStart:                return LightObj(reinterpret_cast< DpTypingStartEvent * >(data));
-        case DpEventID::MessageReactionAdd:         return LightObj(reinterpret_cast< DpMessageReactionAddEvent * >(data));
-        case DpEventID::GuildMembersChunk:          return LightObj(reinterpret_cast< DpGuildMembersChunkEvent * >(data));
-        case DpEventID::MessageReactionRemove:      return LightObj(reinterpret_cast< DpMessageReactionRemoveEvent * >(data));
-        case DpEventID::GuildCreate:                return LightObj(reinterpret_cast< DpGuildCreateEvent * >(data));
-        case DpEventID::ChannelCreate:              return LightObj(reinterpret_cast< DpChannelCreateEvent * >(data));
-        case DpEventID::MessageReactionRemoveEmoji: return LightObj(reinterpret_cast< DpMessageReactionRemoveEmojiEvent * >(data));
-        case DpEventID::MessageDeleteBulk:          return LightObj(reinterpret_cast< DpMessageDeleteBulkEvent * >(data));
-        case DpEventID::GuildRoleUpdate:            return LightObj(reinterpret_cast< DpGuildRoleUpdateEvent * >(data));
-        case DpEventID::GuildRoleDelete:            return LightObj(reinterpret_cast< DpGuildRoleDeleteEvent * >(data));
-        case DpEventID::ChannelPinsUpdate:          return LightObj(reinterpret_cast< DpChannelPinsUpdateEvent * >(data));
-        case DpEventID::MessageReactionRemoveAll:   return LightObj(reinterpret_cast< DpMessageReactionRemoveAllEvent * >(data));
-        case DpEventID::VoiceServerUpdate:          return LightObj(reinterpret_cast< DpVoiceServerUpdateEvent * >(data));
-        case DpEventID::GuildEmojisUpdate:          return LightObj(reinterpret_cast< DpGuildEmojisUpdateEvent * >(data));
-        case DpEventID::GuildStickersUpdate:        return LightObj(reinterpret_cast< DpGuildStickersUpdateEvent * >(data));
-        case DpEventID::PresenceUpdate:             return LightObj(reinterpret_cast< DpPresenceUpdateEvent * >(data));
-        case DpEventID::WebhooksUpdate:             return LightObj(reinterpret_cast< DpWebhooksUpdateEvent * >(data));
-        case DpEventID::GuildMemberAdd:             return LightObj(reinterpret_cast< DpGuildMemberAddEvent * >(data));
-        case DpEventID::InviteDelete:               return LightObj(reinterpret_cast< DpInviteDeleteEvent * >(data));
-        case DpEventID::GuildUpdate:                return LightObj(reinterpret_cast< DpGuildUpdateEvent * >(data));
-        case DpEventID::GuildIntegrationsUpdate:    return LightObj(reinterpret_cast< DpGuildIntegrationsUpdateEvent * >(data));
-        case DpEventID::GuildMemberUpdate:          return LightObj(reinterpret_cast< DpGuildMemberUpdateEvent * >(data));
-        case DpEventID::ApplicationCommandUpdate:   return LightObj(reinterpret_cast< DpApplicationCommandUpdateEvent * >(data));
-        case DpEventID::InviteCreate:               return LightObj(reinterpret_cast< DpInviteCreateEvent * >(data));
-        case DpEventID::MessageUpdate:              return LightObj(reinterpret_cast< DpMessageUpdateEvent * >(data));
-        case DpEventID::UserUpdate:                 return LightObj(reinterpret_cast< DpUserUpdateEvent * >(data));
-        case DpEventID::MessageCreate:              return LightObj(reinterpret_cast< DpMessageCreateEvent * >(data));
-        case DpEventID::GuildBanAdd:                return LightObj(reinterpret_cast< DpGuildBanAddEvent * >(data));
-        case DpEventID::GuildBanRemove:             return LightObj(reinterpret_cast< DpGuildBanRemoveEvent * >(data));
-        case DpEventID::IntegrationCreate:          return LightObj(reinterpret_cast< DpIntegrationCreateEvent * >(data));
-        case DpEventID::IntegrationUpdate:          return LightObj(reinterpret_cast< DpIntegrationUpdateEvent * >(data));
-        case DpEventID::IntegrationDelete:          return LightObj(reinterpret_cast< DpIntegrationDeleteEvent * >(data));
-        case DpEventID::ThreadCreate:               return LightObj(reinterpret_cast< DpThreadCreateEvent * >(data));
-        case DpEventID::ThreadUpdate:               return LightObj(reinterpret_cast< DpThreadUpdateEvent * >(data));
-        case DpEventID::ThreadDelete:               return LightObj(reinterpret_cast< DpThreadDeleteEvent * >(data));
-        case DpEventID::ThreadListSync:             return LightObj(reinterpret_cast< DpThreadListSyncEvent * >(data));
-        case DpEventID::ThreadMemberUpdate:         return LightObj(reinterpret_cast< DpThreadMemberUpdateEvent * >(data));
-        case DpEventID::ThreadMembersUpdate:        return LightObj(reinterpret_cast< DpThreadMembersUpdateEvent * >(data));
-        case DpEventID::VoiceBufferSend:            return LightObj(reinterpret_cast< DpVoiceBufferSendEvent * >(data));
-        case DpEventID::VoiceUserTalking:           return LightObj(reinterpret_cast< DpVoiceUserTalkingEvent * >(data));
-        case DpEventID::VoiceReady:                 return LightObj(reinterpret_cast< DpVoiceReadyEvent * >(data));
-        case DpEventID::VoiceReceive:               return LightObj(reinterpret_cast< DpVoiceReceiveEvent * >(data));
-        case DpEventID::VoiceTrackMarker:           return LightObj(reinterpret_cast< DpVoiceTrackMarkerEvent * >(data));
-        case DpEventID::StageInstanceCreate:        return LightObj(reinterpret_cast< DpStageInstanceCreateEvent * >(data));
-        case DpEventID::StageInstanceDelete:        return LightObj(reinterpret_cast< DpStageInstanceDeleteEvent * >(data));
-        case DpEventID::Max: // Fall through
-        default: assert(0); return LightObj{};
-    }
-}
-
-// ------------------------------------------------------------------------------------------------
-void EventInvokeCleanup(uint8_t type, uintptr_t data)
-{
-    switch (type)
-    {
-        case DpEventID::VoiceStateUpdate:           reinterpret_cast< DpVoiceStateUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::Log:                        reinterpret_cast< DpLogEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildJoinRequestDelete:     reinterpret_cast< DpGuildJoinRequestDeleteEvent * >(data)->Cleanup(); break;
-        case DpEventID::InteractionCreate:          reinterpret_cast< DpInteractionCreateEvent * >(data)->Cleanup(); break;
-        case DpEventID::ButtonClick:                reinterpret_cast< DpButtonClickEvent * >(data)->Cleanup(); break;
-        case DpEventID::SelectClick:                reinterpret_cast< DpSelectClickEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildDelete:                reinterpret_cast< DpGuildDeleteEvent * >(data)->Cleanup(); break;
-        case DpEventID::ChannelDelete:              reinterpret_cast< DpChannelDeleteEvent * >(data)->Cleanup(); break;
-        case DpEventID::ChannelUpdate:              reinterpret_cast< DpChannelUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::Ready:                      reinterpret_cast< DpReadyEvent * >(data)->Cleanup(); break;
-        case DpEventID::MessageDelete:              reinterpret_cast< DpMessageDeleteEvent * >(data)->Cleanup(); break;
-        case DpEventID::ApplicationCommandDelete:   reinterpret_cast< DpApplicationCommandDeleteEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildMemberRemove:          reinterpret_cast< DpGuildMemberRemoveEvent * >(data)->Cleanup(); break;
-        case DpEventID::ApplicationCommandCreate:   reinterpret_cast< DpApplicationCommandCreateEvent * >(data)->Cleanup(); break;
-        case DpEventID::Resumed:                    reinterpret_cast< DpResumedEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildRoleCreate:            reinterpret_cast< DpGuildRoleCreateEvent * >(data)->Cleanup(); break;
-        case DpEventID::TypingStart:                reinterpret_cast< DpTypingStartEvent * >(data)->Cleanup(); break;
-        case DpEventID::MessageReactionAdd:         reinterpret_cast< DpMessageReactionAddEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildMembersChunk:          reinterpret_cast< DpGuildMembersChunkEvent * >(data)->Cleanup(); break;
-        case DpEventID::MessageReactionRemove:      reinterpret_cast< DpMessageReactionRemoveEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildCreate:                reinterpret_cast< DpGuildCreateEvent * >(data)->Cleanup(); break;
-        case DpEventID::ChannelCreate:              reinterpret_cast< DpChannelCreateEvent * >(data)->Cleanup(); break;
-        case DpEventID::MessageReactionRemoveEmoji: reinterpret_cast< DpMessageReactionRemoveEmojiEvent * >(data)->Cleanup(); break;
-        case DpEventID::MessageDeleteBulk:          reinterpret_cast< DpMessageDeleteBulkEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildRoleUpdate:            reinterpret_cast< DpGuildRoleUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildRoleDelete:            reinterpret_cast< DpGuildRoleDeleteEvent * >(data)->Cleanup(); break;
-        case DpEventID::ChannelPinsUpdate:          reinterpret_cast< DpChannelPinsUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::MessageReactionRemoveAll:   reinterpret_cast< DpMessageReactionRemoveAllEvent * >(data)->Cleanup(); break;
-        case DpEventID::VoiceServerUpdate:          reinterpret_cast< DpVoiceServerUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildEmojisUpdate:          reinterpret_cast< DpGuildEmojisUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildStickersUpdate:        reinterpret_cast< DpGuildStickersUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::PresenceUpdate:             reinterpret_cast< DpPresenceUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::WebhooksUpdate:             reinterpret_cast< DpWebhooksUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildMemberAdd:             reinterpret_cast< DpGuildMemberAddEvent * >(data)->Cleanup(); break;
-        case DpEventID::InviteDelete:               reinterpret_cast< DpInviteDeleteEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildUpdate:                reinterpret_cast< DpGuildUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildIntegrationsUpdate:    reinterpret_cast< DpGuildIntegrationsUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildMemberUpdate:          reinterpret_cast< DpGuildMemberUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::ApplicationCommandUpdate:   reinterpret_cast< DpApplicationCommandUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::InviteCreate:               reinterpret_cast< DpInviteCreateEvent * >(data)->Cleanup(); break;
-        case DpEventID::MessageUpdate:              reinterpret_cast< DpMessageUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::UserUpdate:                 reinterpret_cast< DpUserUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::MessageCreate:              reinterpret_cast< DpMessageCreateEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildBanAdd:                reinterpret_cast< DpGuildBanAddEvent * >(data)->Cleanup(); break;
-        case DpEventID::GuildBanRemove:             reinterpret_cast< DpGuildBanRemoveEvent * >(data)->Cleanup(); break;
-        case DpEventID::IntegrationCreate:          reinterpret_cast< DpIntegrationCreateEvent * >(data)->Cleanup(); break;
-        case DpEventID::IntegrationUpdate:          reinterpret_cast< DpIntegrationUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::IntegrationDelete:          reinterpret_cast< DpIntegrationDeleteEvent * >(data)->Cleanup(); break;
-        case DpEventID::ThreadCreate:               reinterpret_cast< DpThreadCreateEvent * >(data)->Cleanup(); break;
-        case DpEventID::ThreadUpdate:               reinterpret_cast< DpThreadUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::ThreadDelete:               reinterpret_cast< DpThreadDeleteEvent * >(data)->Cleanup(); break;
-        case DpEventID::ThreadListSync:             reinterpret_cast< DpThreadListSyncEvent * >(data)->Cleanup(); break;
-        case DpEventID::ThreadMemberUpdate:         reinterpret_cast< DpThreadMemberUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::ThreadMembersUpdate:        reinterpret_cast< DpThreadMembersUpdateEvent * >(data)->Cleanup(); break;
-        case DpEventID::VoiceBufferSend:            reinterpret_cast< DpVoiceBufferSendEvent * >(data)->Cleanup(); break;
-        case DpEventID::VoiceUserTalking:           reinterpret_cast< DpVoiceUserTalkingEvent * >(data)->Cleanup(); break;
-        case DpEventID::VoiceReady:                 reinterpret_cast< DpVoiceReadyEvent * >(data)->Cleanup(); break;
-        case DpEventID::VoiceReceive:               reinterpret_cast< DpVoiceReceiveEvent * >(data)->Cleanup(); break;
-        case DpEventID::VoiceTrackMarker:           reinterpret_cast< DpVoiceTrackMarkerEvent * >(data)->Cleanup(); break;
-        case DpEventID::StageInstanceCreate:        reinterpret_cast< DpStageInstanceCreateEvent * >(data)->Cleanup(); break;
-        case DpEventID::StageInstanceDelete:        reinterpret_cast< DpStageInstanceDeleteEvent * >(data)->Cleanup(); break;
-        case DpEventID::Max: // Fall through
-        default: assert(0); return;
-    }
-}
-
-} // Namespace:: SqMod

module/Library/DPP/Cluster.hpp

@@ -1,431 +0,0 @@
-#pragma once
-
-// ------------------------------------------------------------------------------------------------
-#include "Core/Utility.hpp"
-#include "Core/Signal.hpp"
-
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP/Other.hpp"
-#include "Library/DPP/Constants.hpp"
-
-// ------------------------------------------------------------------------------------------------
-#include <chrono>
-#include <memory>
-#include <functional>
-
-// ------------------------------------------------------------------------------------------------
-#include <concurrentqueue.h>
-#include <dpp/dpp.h>
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-/* ------------------------------------------------------------------------------------------------
- * Internal event proxy.
-*/
-struct DpInternalEvent
-{
-    /* --------------------------------------------------------------------------------------------
-     * Event data.
-    */
-    uint64_t mData{0llu};
-
-    /* --------------------------------------------------------------------------------------------
-     * Default constructor.
-    */
-    DpInternalEvent() noexcept = default;
-
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    DpInternalEvent(uint64_t type, void * data) noexcept
-        : mData((type << 56u) | reinterpret_cast< uint64_t >(data))
-    {
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor (disabled).
-    */
-    DpInternalEvent(const DpInternalEvent & o) = delete;
-
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    DpInternalEvent(DpInternalEvent && o) noexcept
-        : mData(o.mData)
-    {
-        o.mData = 0llu; // Take ownership
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Destructor.
-    */
-    ~DpInternalEvent()
-    {
-        Release();
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Copy assignment operator (disabled).
-    */
-    DpInternalEvent & operator = (const DpInternalEvent & o) = delete;
-
-    /* --------------------------------------------------------------------------------------------
-     * Move assignment operator.
-    */
-    DpInternalEvent & operator = (DpInternalEvent && o) noexcept
-    {
-        if (mData != o.mData)
-        {
-            // Release current information
-            Release();
-            // Replicate members
-            mData = o.mData;
-            // Take ownership
-            o.mData = 0llu;
-        }
-        return *this;
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Forget about the managed event data.
-    */
-    void Reset() noexcept
-    {
-        mData = 0llu;
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the event type.
-    */
-    SQMOD_NODISCARD uint8_t GetType() const noexcept
-    {
-        return static_cast< uint8_t >((mData >> 56u) & 0xFFllu);
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the event data.
-    */
-    SQMOD_NODISCARD uintptr_t GetData() const noexcept
-    {
-        return static_cast< uintptr_t >((~(0xFFllu << 56u)) & mData);
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Release associated event data, if any.
-    */
-    void Release();
-};
-
-/* ------------------------------------------------------------------------------------------------
- * The cluster class represents a group of shards and a command queue for sending and receiving
- * commands from discord via HTTP.
-*/
-struct DpCluster : public SqChainedInstances< DpCluster >
-{
-    /* --------------------------------------------------------------------------------------------
-     * Queue of events generated from other threads.
-    */
-    using EventQueue = moodycamel::ConcurrentQueue< DpInternalEvent >;
-
-    /* --------------------------------------------------------------------------------------------
-     * Managed cluster instance.
-    */
-    std::unique_ptr< dpp::cluster > mC{nullptr};
-
-    /* --------------------------------------------------------------------------------------------
-     * Event queue.
-    */
-    EventQueue mQueue{4096};
-
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    explicit DpCluster(StackStrF & token)
-        : mC(std::make_unique< dpp::cluster >(token.ToStr()))
-        , mQueue(4096)
-    {
-        Initialize();
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    DpCluster(StackStrF & token, SQInteger intents)
-        : mC(std::make_unique< dpp::cluster >(token.ToStr(), static_cast< uint32_t >(intents)))
-        , mQueue(4096)
-    {
-        Initialize();
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    DpCluster(StackStrF & token, SQInteger intents, SQInteger shards)
-        : mC(std::make_unique< dpp::cluster >(token.ToStr(), static_cast< uint32_t >(intents), static_cast< uint32_t >(shards)))
-        , mQueue(4096)
-    {
-        Initialize();
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    DpCluster(StackStrF & token, SQInteger intents, SQInteger shards, SQInteger cluster_id)
-        : mC(std::make_unique< dpp::cluster >(token.ToStr(), static_cast< uint32_t >(intents), static_cast< uint32_t >(shards), static_cast< uint32_t >(cluster_id)))
-        , mQueue(4096)
-    {
-        Initialize();
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    DpCluster(StackStrF & token, SQInteger intents, SQInteger shards, SQInteger cluster_id, SQInteger max_clusters)
-        : mC(std::make_unique< dpp::cluster >(token.ToStr(), static_cast< uint32_t >(intents), static_cast< uint32_t >(shards), static_cast< uint32_t >(cluster_id), static_cast< uint32_t >(max_clusters)))
-        , mQueue(4096)
-    {
-        Initialize();
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    DpCluster(StackStrF & token, SQInteger intents, SQInteger shards, SQInteger cluster_id, SQInteger max_clusters, bool compressed)
-        : mC(std::make_unique< dpp::cluster >(token.ToStr(), static_cast< uint32_t >(intents), static_cast< uint32_t >(shards), static_cast< uint32_t >(cluster_id), static_cast< uint32_t >(max_clusters), compressed))
-        , mQueue(4096)
-    {
-        Initialize();
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    DpCluster(StackStrF & token, SQInteger intents, SQInteger shards, SQInteger cluster_id, SQInteger max_clusters, bool compressed, const DpCachePolicy & cp)
-        : mC(std::make_unique< dpp::cluster >(token.ToStr(), static_cast< uint32_t >(intents), static_cast< uint32_t >(shards), static_cast< uint32_t >(cluster_id), static_cast< uint32_t >(max_clusters), compressed, cp.ToNative()))
-        , mQueue(4096)
-    {
-        Initialize();
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Destructor.
-    */
-    ~DpCluster()
-    {
-        DropEvents();
-        // Forget about this instance
-        UnchainInstance();
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Start the cluster, connecting all its shards. Returns once all shards are connected.
-    */
-    DpCluster & Start()
-    {
-        LogInf("Before start...");
-        mC->start(true);
-        LogInf("After start...");
-        return *this;
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Log a message to whatever log the user is using.
-    */
-    DpCluster & Log(SQInteger severity, StackStrF & message)
-    {
-        mC->log(static_cast< dpp::loglevel >(severity), message.ToStr());
-        return *this;
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Get the dm channel for a user id.
-    */
-    SQMOD_NODISCARD dpp::snowflake GetDmChannel(dpp::snowflake user_id) const
-    {
-        return mC->get_dm_channel(static_cast< dpp::snowflake >(user_id));
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Set the dm channel id for a user id.
-    */
-    DpCluster & SetDmChannel(dpp::snowflake user_id, dpp::snowflake channel_id)
-    {
-        mC->set_dm_channel(user_id, channel_id);
-        return *this;
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Returns the uptime of the cluster.
-    */
-    SQMOD_NODISCARD dpp::utility::uptime UpTime() const
-    {
-        return mC->uptime();
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Returns the uptime of the cluster.
-    */
-    DpCluster & SetPresence(const DpPresence & p)
-    {
-        mC->set_presence(p.Valid());
-        return *this;
-    }
-
-    // --------------------------------------------------------------------------------------------
-    LightObj mSqEvents{}; // Table containing the emitted cluster events.
-
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the events table of this cluster.
-    */
-    SQMOD_NODISCARD LightObj & GetEvents()
-    {
-        return mSqEvents;
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Cluster signals.
-    */
-    std::array< SignalPair, static_cast< size_t >(DpEventID::Max) > mEvents{};
-
-    /* --------------------------------------------------------------------------------------------
-     * Process the cluster.
-    */
-    void Process(bool force = false);
-
-    /* --------------------------------------------------------------------------------------------
-     * Terminate the cluster.
-    */
-    void Terminate()
-    {
-        // Delete the cluster instance
-        mC.reset();
-        // Release associated script objects
-        mSqEvents.Release();
-        // Release event signal objects
-        DropEvents();
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Enable a certain event for the cluster.
-    */
-    DpCluster & EnableEvent(SQInteger id);
-
-    /* --------------------------------------------------------------------------------------------
-     * Disable a certain event for the cluster.
-    */
-    DpCluster & DisableEvent(SQInteger id);
-
-private:
-
-    /* --------------------------------------------------------------------------------------------
-     * Initialize the cluster.
-    */
-    void Initialize()
-    {
-        InitEvents();
-        // Remember this instance
-        ChainInstance();
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Signal initialization.
-    */
-    void InitEvents()
-    {
-        // Ignore the call if already initialized
-        if (!mSqEvents.IsNull())
-        {
-            return;
-        }
-        // Create a new table on the stack
-        sq_newtableex(SqVM(), 64);
-        // Grab the table object from the stack
-        mSqEvents = LightObj(-1, SqVM());
-        // Pop the table object from the stack
-        sq_pop(SqVM(), 1);
-        // Proceed to initializing the events
-        for (size_t i = 0; i < mEvents.size(); ++i)
-        {
-            InitSignalPair(mEvents[i], mSqEvents, DpEventID::NAME[i]);
-        }
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Signal termination.
-    */
-    void DropEvents()
-    {
-        for (auto & e : mEvents)
-        {
-            ResetSignalPair(e);
-        }
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Event handlers.
-    */
-    void OnVoiceStateUpdate(const dpp::voice_state_update_t & ev);
-    void OnLog(const dpp::log_t & ev);
-    void OnGuildJoinRequestDelete(const dpp::guild_join_request_delete_t & ev);
-    void OnInteractionCreate(const dpp::interaction_create_t & ev);
-    void OnButtonClick(const dpp::button_click_t & ev);
-    void OnSelectClick(const dpp::select_click_t & ev);
-    void OnGuildDelete(const dpp::guild_delete_t & ev);
-    void OnChannelDelete(const dpp::channel_delete_t & ev);
-    void OnChannelUpdate(const dpp::channel_update_t & ev);
-    void OnReady(const dpp::ready_t & ev);
-    void OnMessageDelete(const dpp::message_delete_t & ev);
-    void OnApplicationCommandDelete(const dpp::application_command_delete_t & ev);
-    void OnGuildMemberRemove(const dpp::guild_member_remove_t & ev);
-    void OnApplicationCommandCreate(const dpp::application_command_create_t & ev);
-    void OnResumed(const dpp::resumed_t & ev);
-    void OnGuildRoleCreate(const dpp::guild_role_create_t & ev);
-    void OnTypingStart(const dpp::typing_start_t & ev);
-    void OnMessageReactionAdd(const dpp::message_reaction_add_t & ev);
-    void OnGuildMembersChunk(const dpp::guild_members_chunk_t & ev);
-    void OnMessageReactionRemove(const dpp::message_reaction_remove_t & ev);
-    void OnGuildCreate(const dpp::guild_create_t & ev);
-    void OnChannelCreate(const dpp::channel_create_t & ev);
-    void OnMessageReactionRemoveEmoji(const dpp::message_reaction_remove_emoji_t & ev);
-    void OnMessageDeleteBulk(const dpp::message_delete_bulk_t & ev);
-    void OnGuildRoleUpdate(const dpp::guild_role_update_t & ev);
-    void OnGuildRoleDelete(const dpp::guild_role_delete_t & ev);
-    void OnChannelPinsUpdate(const dpp::channel_pins_update_t & ev);
-    void OnMessageReactionRemoveAll(const dpp::message_reaction_remove_all_t & ev);
-    void OnVoiceServerUpdate(const dpp::voice_server_update_t & ev);
-    void OnGuildEmojisUpdate(const dpp::guild_emojis_update_t & ev);
-    void OnGuildStickersUpdate(const dpp::guild_stickers_update_t & ev);
-    void OnPresenceUpdate(const dpp::presence_update_t & ev);
-    void OnWebhooksUpdate(const dpp::webhooks_update_t & ev);
-    void OnGuildMemberAdd(const dpp::guild_member_add_t & ev);
-    void OnInviteDelete(const dpp::invite_delete_t & ev);
-    void OnGuildUpdate(const dpp::guild_update_t & ev);
-    void OnGuildIntegrationsUpdate(const dpp::guild_integrations_update_t & ev);
-    void OnGuildMemberUpdate(const dpp::guild_member_update_t & ev);
-    void OnApplicationCommandUpdate(const dpp::application_command_update_t & ev);
-    void OnInviteCreate(const dpp::invite_create_t & ev);
-    void OnMessageUpdate(const dpp::message_update_t & ev);
-    void OnUserUpdate(const dpp::user_update_t & ev);
-    void OnMessageCreate(const dpp::message_create_t & ev);
-    void OnGuildBanAdd(const dpp::guild_ban_add_t & ev);
-    void OnGuildBanRemove(const dpp::guild_ban_remove_t & ev);
-    void OnIntegrationCreate(const dpp::integration_create_t & ev);
-    void OnIntegrationUpdate(const dpp::integration_update_t & ev);
-    void OnIntegrationDelete(const dpp::integration_delete_t & ev);
-    void OnThreadCreate(const dpp::thread_create_t & ev);
-    void OnThreadUpdate(const dpp::thread_update_t & ev);
-    void OnThreadDelete(const dpp::thread_delete_t & ev);
-    void OnThreadListSync(const dpp::thread_list_sync_t & ev);
-    void OnThreadMemberUpdate(const dpp::thread_member_update_t & ev);
-    void OnThreadMembersUpdate(const dpp::thread_members_update_t & ev);
-    void OnVoiceBufferSend(const dpp::voice_buffer_send_t & ev);
-    void OnVoiceUserTalking(const dpp::voice_user_talking_t & ev);
-    void OnVoiceReady(const dpp::voice_ready_t & ev);
-    void OnVoiceReceive(const dpp::voice_receive_t & ev);
-    void OnVoiceTrackMarker(const dpp::voice_track_marker_t & ev);
-    void OnStageInstanceCreate(const dpp::stage_instance_create_t & ev);
-    void OnStageInstanceDelete(const dpp::stage_instance_delete_t & ev);
-};
-
-} // Namespace:: SqMod

module/Library/DPP/Command.cpp

@@ -1,16 +0,0 @@
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP/Command.hpp"
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-// ------------------------------------------------------------------------------------------------
-
-
-// ------------------------------------------------------------------------------------------------
-void Register_DPP_Command(HSQUIRRELVM vm, Table & ns)
-{
-
-}
-
-} // Namespace:: SqMod

module/Library/DPP/Command.hpp

@@ -1,19 +0,0 @@
-#pragma once
-
-// ------------------------------------------------------------------------------------------------
-#include "Core/Utility.hpp"
-
-// ------------------------------------------------------------------------------------------------
-#include <chrono>
-
-// ------------------------------------------------------------------------------------------------
-#include <dpp/dpp.h>
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-/* ------------------------------------------------------------------------------------------------
- * 
-*/
-
-} // Namespace:: SqMod

module/Library/DPP/Constants.cpp

@@ -1,427 +0,0 @@
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP/Constants.hpp"
-
-// ------------------------------------------------------------------------------------------------
-#include <sqratConst.h>
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-// ------------------------------------------------------------------------------------------------
-const std::array< const char *, static_cast< size_t >(DpEventID::Max) > DpEventID::NAME{
-    "VoiceStateUpdate",
-    "Log",
-    "GuildJoinRequestDelete",
-    "InteractionCreate",
-    "ButtonClick",
-    "SelectClick",
-    "GuildDelete",
-    "ChannelDelete",
-    "ChannelUpdate",
-    "Ready",
-    "MessageDelete",
-    "ApplicationCommandDelete",
-    "GuildMemberRemove",
-    "ApplicationCommandCreate",
-    "Resumed",
-    "GuildRoleCreate",
-    "TypingStart",
-    "MessageReactionAdd",
-    "GuildMembersChunk",
-    "MessageReactionRemove",
-    "GuildCreate",
-    "ChannelCreate",
-    "MessageReactionRemoveEmoji",
-    "MessageDeleteBulk",
-    "GuildRoleUpdate",
-    "GuildRoleDelete",
-    "ChannelPinsUpdate",
-    "MessageReactionRemoveAll",
-    "VoiceServerUpdate",
-    "GuildEmojisUpdate",
-    "GuildStickersUpdate",
-    "PresenceUpdate",
-    "WebhooksUpdate",
-    "GuildMemberAdd",
-    "InviteDelete",
-    "GuildUpdate",
-    "GuildIntegrationsUpdate",
-    "GuildMemberUpdate",
-    "ApplicationCommandUpdate",
-    "InviteCreate",
-    "MessageUpdate",
-    "UserUpdate",
-    "MessageCreate",
-    "GuildBanAdd",
-    "GuildBanRemove",
-    "IntegrationCreate",
-    "IntegrationUpdate",
-    "IntegrationDelete",
-    "ThreadCreate",
-    "ThreadUpdate",
-    "ThreadDelete",
-    "ThreadListSync",
-    "ThreadMemberUpdate",
-    "ThreadMembersUpdate",
-    "VoiceBufferSend",
-    "VoiceUserTalking",
-    "VoiceReady",
-    "VoiceReceive",
-    "VoiceTrackMarker",
-    "StageInstanceCreate",
-    "StageInstanceDelete"
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpLogLevelEnum[] = {
-    {_SC("Trace"),      static_cast< SQInteger >(dpp::ll_trace)},
-    {_SC("Debug"),      static_cast< SQInteger >(dpp::ll_debug)},
-    {_SC("Info"),       static_cast< SQInteger >(dpp::ll_info)},
-    {_SC("Warning"),    static_cast< SQInteger >(dpp::ll_warning)},
-    {_SC("Error"),      static_cast< SQInteger >(dpp::ll_error)},
-    {_SC("Critical"),   static_cast< SQInteger >(dpp::ll_critical)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpImageTypeEnum[] = {
-    {_SC("PNG"),    static_cast< SQInteger >(dpp::i_png)},
-    {_SC("JPG"),    static_cast< SQInteger >(dpp::i_jpg)},
-    {_SC("GIF"),    static_cast< SQInteger >(dpp::i_gif)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpCachePolicyEnum[] = {
-    {_SC("Aggressive"),   static_cast< SQInteger >(dpp::cp_aggressive)},
-    {_SC("Lazy"),         static_cast< SQInteger >(dpp::cp_lazy)},
-    {_SC("None"),         static_cast< SQInteger >(dpp::cp_none)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpClusterIntentsEnum[] = {
-    {_SC("Guilds"),                   static_cast< SQInteger >(dpp::i_guilds)},
-    {_SC("GuildMembers"),             static_cast< SQInteger >(dpp::i_guild_members)},
-    {_SC("GuildBans"),                static_cast< SQInteger >(dpp::i_guild_bans)},
-    {_SC("GuildEmojis"),              static_cast< SQInteger >(dpp::i_guild_emojis)},
-    {_SC("GuildIntegrations"),        static_cast< SQInteger >(dpp::i_guild_integrations)},
-    {_SC("GuildWebhooks"),            static_cast< SQInteger >(dpp::i_guild_webhooks)},
-    {_SC("GuildInvites"),             static_cast< SQInteger >(dpp::i_guild_invites)},
-    {_SC("GuildVoiceStates"),         static_cast< SQInteger >(dpp::i_guild_voice_states)},
-    {_SC("GuildPresences"),           static_cast< SQInteger >(dpp::i_guild_presences)},
-    {_SC("GuildMessages"),            static_cast< SQInteger >(dpp::i_guild_messages)},
-    {_SC("GuildMessageReactions"),    static_cast< SQInteger >(dpp::i_guild_message_reactions)},
-    {_SC("GuildMessageTyping"),       static_cast< SQInteger >(dpp::i_guild_message_typing)},
-    {_SC("DirectMessages"),           static_cast< SQInteger >(dpp::i_direct_messages)},
-    {_SC("DirectMessageReactions"),   static_cast< SQInteger >(dpp::i_direct_message_reactions)},
-    {_SC("DirectMessageTyping"),      static_cast< SQInteger >(dpp::i_direct_message_typing)},
-    {_SC("Default"),                  static_cast< SQInteger >(dpp::i_default_intents)},
-    {_SC("Privileged"),               static_cast< SQInteger >(dpp::i_privileged_intents)},
-    {_SC("All"),                      static_cast< SQInteger >(dpp::i_all_intents)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpPresenceFlagsEnum[] = {
-    {_SC("DesktopOnline"),  static_cast< SQInteger >(dpp::p_desktop_online)},
-    {_SC("DesktopDND"),     static_cast< SQInteger >(dpp::p_desktop_dnd)},
-    {_SC("DesktopIdle"),    static_cast< SQInteger >(dpp::p_desktop_idle)},
-    {_SC("WebWnline"),      static_cast< SQInteger >(dpp::p_web_online)},
-    {_SC("WebDND"),         static_cast< SQInteger >(dpp::p_web_dnd)},
-    {_SC("WebIdle"),        static_cast< SQInteger >(dpp::p_web_idle)},
-    {_SC("MobileOnline"),   static_cast< SQInteger >(dpp::p_mobile_online)},
-    {_SC("MobileDND"),      static_cast< SQInteger >(dpp::p_mobile_dnd)},
-    {_SC("MobileIdle"),     static_cast< SQInteger >(dpp::p_mobile_idle)},
-    {_SC("StatusOnline"),   static_cast< SQInteger >(dpp::p_status_online)},
-    {_SC("StatusDND"),      static_cast< SQInteger >(dpp::p_status_dnd)},
-    {_SC("StatusIdle"),     static_cast< SQInteger >(dpp::p_status_idle)},
-    // Helper bit-shift flags
-    {_SC("BitShiftDesktop"),    static_cast< SQInteger >(PF_SHIFT_DESKTOP)},
-    {_SC("BitShiftWeb"),        static_cast< SQInteger >(PF_SHIFT_WEB)},
-    {_SC("BitShiftMobile"),     static_cast< SQInteger >(PF_SHIFT_MOBILE)},
-    {_SC("BitShiftMain"),       static_cast< SQInteger >(PF_SHIFT_MAIN)},
-    {_SC("BitStatusMask"),      static_cast< SQInteger >(PF_STATUS_MASK)},
-    {_SC("BitClearDesktop"),    static_cast< SQInteger >(PF_CLEAR_DESKTOP)},
-    {_SC("BitClearWeb"),        static_cast< SQInteger >(PF_CLEAR_WEB)},
-    {_SC("BitClearMobile"),     static_cast< SQInteger >(PF_CLEAR_MOBILE)},
-    {_SC("BitClearStatus"),     static_cast< SQInteger >(PF_CLEAR_STATUS)},
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpPresenceStatusEnum[] = {
-    {_SC("Offline"),    static_cast< SQInteger >(dpp::ps_offline)},
-    {_SC("Online"),     static_cast< SQInteger >(dpp::ps_online)},
-    {_SC("DND"),        static_cast< SQInteger >(dpp::ps_dnd)},
-    {_SC("Idle"),       static_cast< SQInteger >(dpp::ps_idle)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpDesktopStatusBitsEnum[] = {
-    {_SC("ShiftDesktop"),   static_cast< SQInteger >(PF_SHIFT_DESKTOP)},
-    {_SC("ShiftWeb"),       static_cast< SQInteger >(PF_SHIFT_WEB)},
-    {_SC("ShiftMobile"),    static_cast< SQInteger >(PF_SHIFT_MOBILE)},
-    {_SC("ShiftMain"),      static_cast< SQInteger >(PF_SHIFT_MAIN)},
-    {_SC("StatusMask"),     static_cast< SQInteger >(PF_STATUS_MASK)},
-    {_SC("ClearDesktop"),   static_cast< SQInteger >(PF_CLEAR_DESKTOP)},
-    {_SC("ClearWeb"),       static_cast< SQInteger >(PF_CLEAR_WEB)},
-    {_SC("ClearMobile"),    static_cast< SQInteger >(PF_CLEAR_MOBILE)},
-    {_SC("ClearStatus"),    static_cast< SQInteger >(PF_CLEAR_STATUS)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpActivityTypeEnum[] = {
-    {_SC("Game"),       static_cast< SQInteger >(dpp::at_game)},
-    {_SC("Streaming"),  static_cast< SQInteger >(dpp::at_streaming)},
-    {_SC("Listening"),  static_cast< SQInteger >(dpp::at_listening)},
-    {_SC("Custom"),     static_cast< SQInteger >(dpp::at_custom)},
-    {_SC("Competing"),  static_cast< SQInteger >(dpp::at_competing)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpActivityFlagsEnum[] = {
-    {_SC("Instance"),       static_cast< SQInteger >(dpp::af_instance)},
-    {_SC("Join"),           static_cast< SQInteger >(dpp::af_join)},
-    {_SC("Spectate"),       static_cast< SQInteger >(dpp::af_spectate)},
-    {_SC("JoinRequest"),    static_cast< SQInteger >(dpp::af_join_request)},
-    {_SC("Sync"),           static_cast< SQInteger >(dpp::af_sync)},
-    {_SC("Play"),           static_cast< SQInteger >(dpp::af_play)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpVoiceStateFlagsEnum[] = {
-    {_SC("Deaf"),       static_cast< SQInteger >(dpp::vs_deaf)},
-    {_SC("Mute"),       static_cast< SQInteger >(dpp::vs_mute)},
-    {_SC("SelfMute"),   static_cast< SQInteger >(dpp::vs_self_mute)},
-    {_SC("SelfDeaf"),   static_cast< SQInteger >(dpp::vs_self_deaf)},
-    {_SC("SelfStream"), static_cast< SQInteger >(dpp::vs_self_stream)},
-    {_SC("SelfVideo"),  static_cast< SQInteger >(dpp::vs_self_video)},
-    {_SC("Suppress"),   static_cast< SQInteger >(dpp::vs_suppress)},
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpRoleFlagsEnum[] = {
-    {_SC("Hoist"),              static_cast< SQInteger >(dpp::r_hoist)},
-    {_SC("Managed"),            static_cast< SQInteger >(dpp::r_managed)},
-    {_SC("Mentionable"),        static_cast< SQInteger >(dpp::r_mentionable)},
-    {_SC("PremiumSubscriber"),  static_cast< SQInteger >(dpp::r_premium_subscriber)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpRolePermissionsEnum[] = {
-    {_SC("CreateInstantInvite"),  static_cast< SQInteger >(dpp::p_create_instant_invite)},
-    {_SC("KickMembers"),           static_cast< SQInteger >(dpp::p_kick_members)},
-    {_SC("BanMembers"),            static_cast< SQInteger >(dpp::p_ban_members)},
-    {_SC("Administrator"),          static_cast< SQInteger >(dpp::p_administrator)},
-    {_SC("ManageChannels"),        static_cast< SQInteger >(dpp::p_manage_channels)},
-    {_SC("ManageGuild"),           static_cast< SQInteger >(dpp::p_manage_guild)},
-    {_SC("AddReactions"),          static_cast< SQInteger >(dpp::p_add_reactions)},
-    {_SC("ViewAuditLog"),         static_cast< SQInteger >(dpp::p_view_audit_log)},
-    {_SC("PrioritySpeaker"),       static_cast< SQInteger >(dpp::p_priority_speaker)},
-    {_SC("Stream"),                 static_cast< SQInteger >(dpp::p_stream)},
-    {_SC("ViewChannel"),           static_cast< SQInteger >(dpp::p_view_channel)},
-    {_SC("SendMessages"),          static_cast< SQInteger >(dpp::p_send_messages)},
-    {_SC("SendTtsMessages"),      static_cast< SQInteger >(dpp::p_send_tts_messages)},
-    {_SC("ManageMessages"),        static_cast< SQInteger >(dpp::p_manage_messages)},
-    {_SC("EmbedLinks"),            static_cast< SQInteger >(dpp::p_embed_links)},
-    {_SC("AttachFiles"),           static_cast< SQInteger >(dpp::p_attach_files)},
-    {_SC("ReadMessageHistory"),   static_cast< SQInteger >(dpp::p_read_message_history)},
-    {_SC("MentionEveryone"),       static_cast< SQInteger >(dpp::p_mention_everyone)},
-    {_SC("UseExternalEmojis"),    static_cast< SQInteger >(dpp::p_use_external_emojis)},
-    {_SC("ViewGuildInsights"),    static_cast< SQInteger >(dpp::p_view_guild_insights)},
-    {_SC("Connect"),                static_cast< SQInteger >(dpp::p_connect)},
-    {_SC("Speak"),                  static_cast< SQInteger >(dpp::p_speak)},
-    {_SC("MuteMembers"),           static_cast< SQInteger >(dpp::p_mute_members)},
-    {_SC("DeafenMembers"),         static_cast< SQInteger >(dpp::p_deafen_members)},
-    {_SC("MoveMembers"),           static_cast< SQInteger >(dpp::p_move_members)},
-    {_SC("UseVAD"),                static_cast< SQInteger >(dpp::p_use_vad)},
-    {_SC("ChangeNickname"),        static_cast< SQInteger >(dpp::p_change_nickname)},
-    {_SC("ManageNicknames"),       static_cast< SQInteger >(dpp::p_manage_nicknames)},
-    {_SC("ManageRoles"),           static_cast< SQInteger >(dpp::p_manage_roles)},
-    {_SC("ManageWebHooks"),        static_cast< SQInteger >(dpp::p_manage_webhooks)},
-    {_SC("ManageEmojis"),          static_cast< SQInteger >(dpp::p_manage_emojis)},
-    {_SC("UseSlashCommands"),     static_cast< SQInteger >(dpp::p_use_slash_commands)},
-    {_SC("RequestToSpeak"),       static_cast< SQInteger >(dpp::p_request_to_speak)},
-    {_SC("ManageThreads"),         static_cast< SQInteger >(dpp::p_manage_threads)},
-    {_SC("UsePublicThreads"),     static_cast< SQInteger >(dpp::p_use_public_threads)},
-    {_SC("UsePrivateThreads"),    static_cast< SQInteger >(dpp::p_use_private_threads)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpUserFlagsEnum[] = {
-    {_SC("Bot"),                static_cast< SQInteger >(dpp::u_bot)},
-    {_SC("System"),             static_cast< SQInteger >(dpp::u_system)},
-    {_SC("MfaEnabled"),         static_cast< SQInteger >(dpp::u_mfa_enabled)},
-    {_SC("Verified"),           static_cast< SQInteger >(dpp::u_verified)},
-    {_SC("NitroFull"),          static_cast< SQInteger >(dpp::u_nitro_full)},
-    {_SC("NitroClassic"),       static_cast< SQInteger >(dpp::u_nitro_classic)},
-    {_SC("DiscordEmployee"),    static_cast< SQInteger >(dpp::u_discord_employee)},
-    {_SC("PartneredOwner"),     static_cast< SQInteger >(dpp::u_partnered_owner)},
-    {_SC("HypesquadEvents"),    static_cast< SQInteger >(dpp::u_hypesquad_events)},
-    {_SC("Bughunter1"),         static_cast< SQInteger >(dpp::u_bughunter_1)},
-    {_SC("HouseBravery"),       static_cast< SQInteger >(dpp::u_house_bravery)},
-    {_SC("HouseBrilliance"),    static_cast< SQInteger >(dpp::u_house_brilliance)},
-    {_SC("HouseBalanace"),      static_cast< SQInteger >(dpp::u_house_balanace)},
-    {_SC("EarlySupporter"),     static_cast< SQInteger >(dpp::u_early_supporter)},
-    {_SC("TeamUser"),           static_cast< SQInteger >(dpp::u_team_user)},
-    {_SC("Bughunter2"),         static_cast< SQInteger >(dpp::u_bughunter_2)},
-    {_SC("VerifiedBot"),        static_cast< SQInteger >(dpp::u_verified_bot)},
-    {_SC("VerifiedBotDev"),     static_cast< SQInteger >(dpp::u_verified_bot_dev)},
-    {_SC("AnimatedIcon"),       static_cast< SQInteger >(dpp::u_animated_icon)},
-    {_SC("CertifiedModerator"), static_cast< SQInteger >(dpp::u_certified_moderator)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpRegionEnum[] = {
-    {_SC("Brazil"),         static_cast< SQInteger >(dpp::r_brazil)},
-    {_SC("CentralEurope"),  static_cast< SQInteger >(dpp::r_central_europe)},
-    {_SC("HongKong"),       static_cast< SQInteger >(dpp::r_hong_kong)},
-    {_SC("India"),          static_cast< SQInteger >(dpp::r_india)},
-    {_SC("Japan"),          static_cast< SQInteger >(dpp::r_japan)},
-    {_SC("Russia"),         static_cast< SQInteger >(dpp::r_russia)},
-    {_SC("Singapore"),      static_cast< SQInteger >(dpp::r_singapore)},
-    {_SC("SouthAfrica"),    static_cast< SQInteger >(dpp::r_south_africa)},
-    {_SC("Sydney"),         static_cast< SQInteger >(dpp::r_sydney)},
-    {_SC("UsCentral"),      static_cast< SQInteger >(dpp::r_us_central)},
-    {_SC("UsEast"),         static_cast< SQInteger >(dpp::r_us_east)},
-    {_SC("UsSouth"),        static_cast< SQInteger >(dpp::r_us_south)},
-    {_SC("UsWest"),         static_cast< SQInteger >(dpp::r_us_west)},
-    {_SC("WesternEurope"),  static_cast< SQInteger >(dpp::r_western_europe)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpGuildFlagsEnum[] = {
-    {_SC("Large"),                  static_cast< SQInteger >(dpp::g_large)},
-    {_SC("Unavailable"),            static_cast< SQInteger >(dpp::g_unavailable)},
-    {_SC("WidgetEnabled"),          static_cast< SQInteger >(dpp::g_widget_enabled)},
-    {_SC("InviteSplash"),           static_cast< SQInteger >(dpp::g_invite_splash)},
-    {_SC("VipRegions"),             static_cast< SQInteger >(dpp::g_vip_regions)},
-    {_SC("VanityURL"),              static_cast< SQInteger >(dpp::g_vanity_url)},
-    {_SC("Verified"),               static_cast< SQInteger >(dpp::g_verified)},
-    {_SC("Partnered"),              static_cast< SQInteger >(dpp::g_partnered)},
-    {_SC("Community"),              static_cast< SQInteger >(dpp::g_community)},
-    {_SC("Commerce"),               static_cast< SQInteger >(dpp::g_commerce)},
-    {_SC("News"),                   static_cast< SQInteger >(dpp::g_news)},
-    {_SC("Discoverable"),           static_cast< SQInteger >(dpp::g_discoverable)},
-    {_SC("Featureable"),            static_cast< SQInteger >(dpp::g_featureable)},
-    {_SC("AnimatedIcon"),           static_cast< SQInteger >(dpp::g_animated_icon)},
-    {_SC("Banner"),                 static_cast< SQInteger >(dpp::g_banner)},
-    {_SC("WelcomeScreenEnabled"),   static_cast< SQInteger >(dpp::g_welcome_screen_enabled)},
-    {_SC("MemberVerificationGate"), static_cast< SQInteger >(dpp::g_member_verification_gate)},
-    {_SC("PreviewEnabled"),         static_cast< SQInteger >(dpp::g_preview_enabled)},
-    {_SC("NoJoinNotifications"),    static_cast< SQInteger >(dpp::g_no_join_notifications)},
-    {_SC("NoBoostNotifications"),   static_cast< SQInteger >(dpp::g_no_boost_notifications)},
-    {_SC("HasAnimatedIcon"),        static_cast< SQInteger >(dpp::g_has_animated_icon)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpGuildMemberFlagsEnum[] = {
-    {_SC("Deaf"),       static_cast< SQInteger >(dpp::gm_deaf)},
-    {_SC("Mute"),       static_cast< SQInteger >(dpp::gm_mute)},
-    {_SC("Pending"),    static_cast< SQInteger >(dpp::gm_pending)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpComponentTypeEnum[] = {
-    {_SC("ActionRow"),      static_cast< SQInteger >(dpp::cot_action_row)},
-    {_SC("Button"),         static_cast< SQInteger >(dpp::cot_button)},
-    {_SC("SelectMenu"),     static_cast< SQInteger >(dpp::cot_selectmenu)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpComponentStyleEnum[] = {
-    {_SC("Primary"),        static_cast< SQInteger >(dpp::cos_primary)},
-    {_SC("Secondary"),      static_cast< SQInteger >(dpp::cos_secondary)},
-    {_SC("Success"),        static_cast< SQInteger >(dpp::cos_success)},
-    {_SC("Danger"),         static_cast< SQInteger >(dpp::cos_danger)},
-    {_SC("Link"),           static_cast< SQInteger >(dpp::cos_link)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpStickerTypeEnum[] = {
-    {_SC("Standard"),      static_cast< SQInteger >(dpp::st_standard)},
-    {_SC("Guild"),         static_cast< SQInteger >(dpp::st_guild)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpStickerFormatEnum[] = {
-    {_SC("PNG"),        static_cast< SQInteger >(dpp::sf_png)},
-    {_SC("APNG"),       static_cast< SQInteger >(dpp::sf_apng)},
-    {_SC("Lottie"),     static_cast< SQInteger >(dpp::sf_lottie)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpMessageFlagsEnum[] = {
-    {_SC("Crossposted"),            static_cast< SQInteger >(dpp::m_crossposted)},
-    {_SC("IsCrosspost"),            static_cast< SQInteger >(dpp::m_is_crosspost)},
-    {_SC("SuppressEmbeds"),         static_cast< SQInteger >(dpp::m_suppress_embeds)},
-    {_SC("SourceMessageDeleted"),   static_cast< SQInteger >(dpp::m_source_message_deleted)},
-    {_SC("Urgent"),                 static_cast< SQInteger >(dpp::m_urgent)},
-    {_SC("Ephemeral"),              static_cast< SQInteger >(dpp::m_ephemeral)},
-    {_SC("Loading"),                static_cast< SQInteger >(dpp::m_loading)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElement g_DpMessageTypeEnum[] = {
-    {_SC("Default"),                                    static_cast< SQInteger >(dpp::mt_default)},
-    {_SC("RecipientAdd"),                               static_cast< SQInteger >(dpp::mt_recipient_add)},
-    {_SC("RecipientRemove"),                            static_cast< SQInteger >(dpp::mt_recipient_remove)},
-    {_SC("Call"),                                       static_cast< SQInteger >(dpp::mt_call)},
-    {_SC("ChannelNameChange"),                          static_cast< SQInteger >(dpp::mt_channel_name_change)},
-    {_SC("ChannelIconChange"),                          static_cast< SQInteger >(dpp::mt_channel_icon_change)},
-    {_SC("ChannelPinnedMessage"),                       static_cast< SQInteger >(dpp::mt_channel_pinned_message)},
-    {_SC("GuildMemberJoin"),                            static_cast< SQInteger >(dpp::mt_guild_member_join)},
-    {_SC("UserPremiumGuildSubscription"),               static_cast< SQInteger >(dpp::mt_user_premium_guild_subscription)},
-    {_SC("UserPremiumGuildSubscriptionTier1"),          static_cast< SQInteger >(dpp::mt_user_premium_guild_subscription_tier_1)},
-    {_SC("UserPremiumGuildSubscriptionTier2"),          static_cast< SQInteger >(dpp::mt_user_premium_guild_subscription_tier_2)},
-    {_SC("UserPremiumGuildSubscriptionTier3"),          static_cast< SQInteger >(dpp::mt_user_premium_guild_subscription_tier_3)},
-    {_SC("ChannelFollowAdd"),                           static_cast< SQInteger >(dpp::mt_channel_follow_add)},
-    {_SC("GuildDiscoveryDisqualified"),                 static_cast< SQInteger >(dpp::mt_guild_discovery_disqualified)},
-    {_SC("GuildDiscoveryRequalified"),                  static_cast< SQInteger >(dpp::mt_guild_discovery_requalified)},
-    {_SC("GuildDiscoveryGracePeriodInitialWarning"),    static_cast< SQInteger >(dpp::mt_guild_discovery_grace_period_initial_warning)},
-    {_SC("GuildDiscoveryGracePeriodFinalWarning"),      static_cast< SQInteger >(dpp::mt_guild_discovery_grace_period_final_warning)},
-    {_SC("ThreadCreated"),                              static_cast< SQInteger >(dpp::mt_thread_created)},
-    {_SC("Reply"),                                      static_cast< SQInteger >(dpp::mt_reply)},
-    {_SC("ApplicationCommand"),                         static_cast< SQInteger >(dpp::mt_application_command)},
-    {_SC("ThreadStarterMessage"),                       static_cast< SQInteger >(dpp::mt_thread_starter_message)},
-    {_SC("GuildInviteReminder"),                        static_cast< SQInteger >(dpp::mt_guild_invite_reminder)}
-};
-
-// ------------------------------------------------------------------------------------------------
-static const EnumElements g_EnumList[] = {
-    {_SC("SqDiscordLogLevel"),              g_DpLogLevelEnum},
-    {_SC("SqDiscordImageType"),             g_DpImageTypeEnum},
-    {_SC("SqDiscordCachePolicy"),           g_DpCachePolicyEnum},
-    {_SC("SqDiscordClusterIntents"),        g_DpClusterIntentsEnum},
-    {_SC("SqDiscordPresenceFlags"),         g_DpPresenceFlagsEnum},
-    {_SC("SqDiscordPresenceStatus"),        g_DpPresenceStatusEnum},
-    {_SC("SqDiscordDesktopStatusBits"),     g_DpDesktopStatusBitsEnum},
-    {_SC("SqDiscordActivityType"),          g_DpActivityTypeEnum},
-    {_SC("SqDiscordActivityFlags"),         g_DpActivityFlagsEnum},
-    {_SC("SqDiscordVoiceStateFlags"),       g_DpVoiceStateFlagsEnum},
-    {_SC("SqDiscordRoleFlags"),             g_DpRoleFlagsEnum},
-    {_SC("SqDiscordRolePermissions"),       g_DpRolePermissionsEnum},
-    {_SC("SqDiscordUserFlags"),             g_DpUserFlagsEnum},
-    {_SC("SqDiscordRegion"),                g_DpRegionEnum},
-    {_SC("SqDiscordGuildFlags"),            g_DpGuildFlagsEnum},
-    {_SC("SqDiscordGuildMemberFlags"),      g_DpGuildMemberFlagsEnum},
-    {_SC("SqDiscordComponentType"),         g_DpComponentTypeEnum},
-    {_SC("SqDiscordComponentStyle"),        g_DpComponentStyleEnum},
-    {_SC("SqDiscordStickerType"),           g_DpStickerTypeEnum},
-    {_SC("SqDiscordStickerFormat"),         g_DpStickerFormatEnum},
-    {_SC("SqDiscordMessageFlags"),          g_DpMessageFlagsEnum},
-    {_SC("SqDiscordMessageType"),           g_DpMessageTypeEnum}
-};
-
-// ------------------------------------------------------------------------------------------------
-void Register_DPP_Constants(HSQUIRRELVM vm, Table & ns)
-{
-    RegisterEnumerations(vm, g_EnumList);
-    // --------------------------------------------------------------------------------------------
-    Enumeration e(vm);
-    // Bind all events using their associated name
-    for (SQInteger i = 0; i < static_cast< SQInteger >(DpEventID::Max); ++i)
-    {
-        e.Const(DpEventID::NAME[i], i);
-    }
-    // Expose the constants
-    ConstTable(vm).Enum(_SC("SqDiscordEvent"), e);
-}
-
-} // Namespace:: SqMod

module/Library/DPP/Constants.hpp

@@ -1,91 +0,0 @@
-#pragma once
-
-// ------------------------------------------------------------------------------------------------
-#include "Core/Utility.hpp"
-
-// ------------------------------------------------------------------------------------------------
-#include <dpp/dpp.h>
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-/* ------------------------------------------------------------------------------------------------
- * Unique ID for each event.
-*/
-struct DpEventID
-{
-    /* --------------------------------------------------------------------------------------------
-     * ID enumeration.
-    */
-    enum Type
-    {
-        VoiceStateUpdate=0,
-        Log,
-        GuildJoinRequestDelete,
-        InteractionCreate,
-        ButtonClick,
-        SelectClick,
-        GuildDelete,
-        ChannelDelete,
-        ChannelUpdate,
-        Ready,
-        MessageDelete,
-        ApplicationCommandDelete,
-        GuildMemberRemove,
-        ApplicationCommandCreate,
-        Resumed,
-        GuildRoleCreate,
-        TypingStart,
-        MessageReactionAdd,
-        GuildMembersChunk,
-        MessageReactionRemove,
-        GuildCreate,
-        ChannelCreate,
-        MessageReactionRemoveEmoji,
-        MessageDeleteBulk,
-        GuildRoleUpdate,
-        GuildRoleDelete,
-        ChannelPinsUpdate,
-        MessageReactionRemoveAll,
-        VoiceServerUpdate,
-        GuildEmojisUpdate,
-        GuildStickersUpdate,
-        PresenceUpdate,
-        WebhooksUpdate,
-        GuildMemberAdd,
-        InviteDelete,
-        GuildUpdate,
-        GuildIntegrationsUpdate,
-        GuildMemberUpdate,
-        ApplicationCommandUpdate,
-        InviteCreate,
-        MessageUpdate,
-        UserUpdate,
-        MessageCreate,
-        GuildBanAdd,
-        GuildBanRemove,
-        IntegrationCreate,
-        IntegrationUpdate,
-        IntegrationDelete,
-        ThreadCreate,
-        ThreadUpdate,
-        ThreadDelete,
-        ThreadListSync,
-        ThreadMemberUpdate,
-        ThreadMembersUpdate,
-        VoiceBufferSend,
-        VoiceUserTalking,
-        VoiceReady,
-        VoiceReceive,
-        VoiceTrackMarker,
-        StageInstanceCreate,
-        StageInstanceDelete,
-        Max
-    };
-    /* --------------------------------------------------------------------------------------------
-     * String identification for each event ID.
-    */
-    static const std::array< const char *, static_cast< size_t >(Max) > NAME;
-};
-
-} // Namespace:: SqMod

module/Library/DPP/Events.cpp

@@ -1,630 +0,0 @@
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP/Events.hpp"
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-// ------------------------------------------------------------------------------------------------
-SQMOD_DECL_TYPENAME(SqDppVoiceStateUpdateEvent, _SC("SqDppVoiceStateUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppLogEvent, _SC("SqDppLogEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildJoinRequestDeleteEvent, _SC("SqDppGuildJoinRequestDeleteEvent"))
-SQMOD_DECL_TYPENAME(SqDppInteractionCreateEvent, _SC("SqDppInteractionCreateEvent"))
-SQMOD_DECL_TYPENAME(SqDppButtonClickEvent, _SC("SqDppButtonClickEvent"))
-SQMOD_DECL_TYPENAME(SqDppSelectClickEvent, _SC("SqDppSelectClickEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildDeleteEvent, _SC("SqDppGuildDeleteEvent"))
-SQMOD_DECL_TYPENAME(SqDppChannelDeleteEvent, _SC("SqDppChannelDeleteEvent"))
-SQMOD_DECL_TYPENAME(SqDppChannelUpdateEvent, _SC("SqDppChannelUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppReadyEvent, _SC("SqDppReadyEvent"))
-SQMOD_DECL_TYPENAME(SqDppMessageDeleteEvent, _SC("SqDppMessageDeleteEvent"))
-SQMOD_DECL_TYPENAME(SqDppApplicationCommandDeleteEvent, _SC("SqDppApplicationCommandDeleteEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildMemberRemoveEvent, _SC("SqDppGuildMemberRemoveEvent"))
-SQMOD_DECL_TYPENAME(SqDppApplicationCommandCreateEvent, _SC("SqDppApplicationCommandCreateEvent"))
-SQMOD_DECL_TYPENAME(SqDppResumedEvent, _SC("SqDppResumedEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildRoleCreateEvent, _SC("SqDppGuildRoleCreateEvent"))
-SQMOD_DECL_TYPENAME(SqDppTypingStartEvent, _SC("SqDppTypingStartEvent"))
-SQMOD_DECL_TYPENAME(SqDppMessageReactionAddEvent, _SC("SqDppMessageReactionAddEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildMembersChunkEvent, _SC("SqDppGuildMembersChunkEvent"))
-SQMOD_DECL_TYPENAME(SqDppMessageReactionRemoveEvent, _SC("SqDppMessageReactionRemoveEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildCreateEvent, _SC("SqDppGuildCreateEvent"))
-SQMOD_DECL_TYPENAME(SqDppChannelCreateEvent, _SC("SqDppChannelCreateEvent"))
-SQMOD_DECL_TYPENAME(SqDppMessageReactionRemoveEmojiEvent, _SC("SqDppMessageReactionRemoveEmojiEvent"))
-SQMOD_DECL_TYPENAME(SqDppMessageDeleteBulkEvent, _SC("SqDppMessageDeleteBulkEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildRoleUpdateEvent, _SC("SqDppGuildRoleUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildRoleDeleteEvent, _SC("SqDppGuildRoleDeleteEvent"))
-SQMOD_DECL_TYPENAME(SqDppChannelPinsUpdateEvent, _SC("SqDppChannelPinsUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppMessageReactionRemoveAllEvent, _SC("SqDppMessageReactionRemoveAllEvent"))
-SQMOD_DECL_TYPENAME(SqDppVoiceServerUpdateEvent, _SC("SqDppVoiceServerUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildEmojisUpdateEvent, _SC("SqDppGuildEmojisUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildStickersUpdateEvent, _SC("SqDppGuildStickersUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppPresenceUpdateEvent, _SC("SqDppPresenceUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppWebhooksUpdateEvent, _SC("SqDppWebhooksUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildMemberAddEvent, _SC("SqDppGuildMemberAddEvent"))
-SQMOD_DECL_TYPENAME(SqDppInviteDeleteEvent, _SC("SqDppInviteDeleteEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildUpdateEvent, _SC("SqDppGuildUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildIntegrationsUpdateEvent, _SC("SqDppGuildIntegrationsUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildMemberUpdateEvent, _SC("SqDppGuildMemberUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppApplicationCommandUpdateEvent, _SC("SqDppApplicationCommandUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppInviteCreateEvent, _SC("SqDppInviteCreateEvent"))
-SQMOD_DECL_TYPENAME(SqDppMessageUpdateEvent, _SC("SqDppMessageUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppUserUpdateEvent, _SC("SqDppUserUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppMessageCreateEvent, _SC("SqDppMessageCreateEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildBanAddEvent, _SC("SqDppGuildBanAddEvent"))
-SQMOD_DECL_TYPENAME(SqDppGuildBanRemoveEvent, _SC("SqDppGuildBanRemoveEvent"))
-SQMOD_DECL_TYPENAME(SqDppIntegrationCreateEvent, _SC("SqDppIntegrationCreateEvent"))
-SQMOD_DECL_TYPENAME(SqDppIntegrationUpdateEvent, _SC("SqDppIntegrationUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppIntegrationDeleteEvent, _SC("SqDppIntegrationDeleteEvent"))
-SQMOD_DECL_TYPENAME(SqDppThreadCreateEvent, _SC("SqDppThreadCreateEvent"))
-SQMOD_DECL_TYPENAME(SqDppThreadUpdateEvent, _SC("SqDppThreadUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppThreadDeleteEvent, _SC("SqDppThreadDeleteEvent"))
-SQMOD_DECL_TYPENAME(SqDppThreadListSyncEvent, _SC("SqDppThreadListSyncEvent"))
-SQMOD_DECL_TYPENAME(SqDppThreadMemberUpdateEvent, _SC("SqDppThreadMemberUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppThreadMembersUpdateEvent, _SC("SqDppThreadMembersUpdateEvent"))
-SQMOD_DECL_TYPENAME(SqDppVoiceBufferSendEvent, _SC("SqDppVoiceBufferSendEvent"))
-SQMOD_DECL_TYPENAME(SqDppVoiceUserTalkingEvent, _SC("SqDppVoiceUserTalkingEvent"))
-SQMOD_DECL_TYPENAME(SqDppVoiceReadyEvent, _SC("SqDppVoiceReadyEvent"))
-SQMOD_DECL_TYPENAME(SqDppVoiceReceiveEvent, _SC("SqDppVoiceReceiveEvent"))
-SQMOD_DECL_TYPENAME(SqDppVoiceTrackMarkerEvent, _SC("SqDppVoiceTrackMarkerEvent"))
-SQMOD_DECL_TYPENAME(SqDppStageInstanceCreateEvent, _SC("SqDppStageInstanceCreateEvent"))
-SQMOD_DECL_TYPENAME(SqDppStageInstanceDeleteEvent, _SC("SqDppStageInstanceDeleteEvent"))
-
-// ------------------------------------------------------------------------------------------------
-void Register_DPP_Events(HSQUIRRELVM vm, Table & ns)
-{
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("VoiceStateUpdate"),
-        Class< DpVoiceStateUpdateEvent, NoConstructor< DpVoiceStateUpdateEvent > >(vm, SqDppVoiceStateUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppVoiceStateUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpVoiceStateUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("State"), &DpVoiceStateUpdateEvent::GetState)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("Log"),
-        Class< DpLogEvent, NoConstructor< DpLogEvent > >(vm, SqDppLogEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppLogEvent::Fn)
-        .Func(_SC("_tostring"), &DpLogEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpLogEvent::GetRawEvent)
-        .Prop(_SC("Severity"), &DpLogEvent::GetSeverity)
-        .Prop(_SC("Message"), &DpLogEvent::GetMessage)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildJoinRequestDelete"),
-        Class< DpGuildJoinRequestDeleteEvent, NoConstructor< DpGuildJoinRequestDeleteEvent > >(vm, SqDppGuildJoinRequestDeleteEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildJoinRequestDeleteEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildJoinRequestDeleteEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildJoinRequestDeleteEvent::GetRawEvent)
-        .Prop(_SC("GuildID"), &DpGuildJoinRequestDeleteEvent::GetGuildID)
-        .Prop(_SC("UserID"), &DpGuildJoinRequestDeleteEvent::GetUserID)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("InteractionCreate"),
-        Class< DpInteractionCreateEvent, NoConstructor< DpInteractionCreateEvent > >(vm, SqDppInteractionCreateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppInteractionCreateEvent::Fn)
-        .Func(_SC("_tostring"), &DpInteractionCreateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpInteractionCreateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("ButtonClick"),
-        Class< DpButtonClickEvent, NoConstructor< DpButtonClickEvent > >(vm, SqDppButtonClickEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppButtonClickEvent::Fn)
-        .Func(_SC("_tostring"), &DpButtonClickEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpButtonClickEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("SelectClick"),
-        Class< DpSelectClickEvent, NoConstructor< DpSelectClickEvent > >(vm, SqDppSelectClickEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppSelectClickEvent::Fn)
-        .Func(_SC("_tostring"), &DpSelectClickEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpSelectClickEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildDelete"),
-        Class< DpGuildDeleteEvent, NoConstructor< DpGuildDeleteEvent > >(vm, SqDppGuildDeleteEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildDeleteEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildDeleteEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildDeleteEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("ChannelDelete"),
-        Class< DpChannelDeleteEvent, NoConstructor< DpChannelDeleteEvent > >(vm, SqDppChannelDeleteEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppChannelDeleteEvent::Fn)
-        .Func(_SC("_tostring"), &DpChannelDeleteEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpChannelDeleteEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("ChannelUpdate"),
-        Class< DpChannelUpdateEvent, NoConstructor< DpChannelUpdateEvent > >(vm, SqDppChannelUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppChannelUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpChannelUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpChannelUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("Ready"),
-        Class< DpReadyEvent, NoConstructor< DpReadyEvent > >(vm, SqDppReadyEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppReadyEvent::Fn)
-        .Func(_SC("_tostring"), &DpReadyEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpReadyEvent::GetRawEvent)
-        .Prop(_SC("SessionID"), &DpReadyEvent::GetSessionID)
-        .Prop(_SC("ShardID"), &DpReadyEvent::GetShardID)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("MessageDelete"),
-        Class< DpMessageDeleteEvent, NoConstructor< DpMessageDeleteEvent > >(vm, SqDppMessageDeleteEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppMessageDeleteEvent::Fn)
-        .Func(_SC("_tostring"), &DpMessageDeleteEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpMessageDeleteEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("ApplicationCommandDelete"),
-        Class< DpApplicationCommandDeleteEvent, NoConstructor< DpApplicationCommandDeleteEvent > >(vm, SqDppApplicationCommandDeleteEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppApplicationCommandDeleteEvent::Fn)
-        .Func(_SC("_tostring"), &DpApplicationCommandDeleteEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpApplicationCommandDeleteEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildMemberRemove"),
-        Class< DpGuildMemberRemoveEvent, NoConstructor< DpGuildMemberRemoveEvent > >(vm, SqDppGuildMemberRemoveEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildMemberRemoveEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildMemberRemoveEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildMemberRemoveEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("ApplicationCommandCreate"),
-        Class< DpApplicationCommandCreateEvent, NoConstructor< DpApplicationCommandCreateEvent > >(vm, SqDppApplicationCommandCreateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppApplicationCommandCreateEvent::Fn)
-        .Func(_SC("_tostring"), &DpApplicationCommandCreateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpApplicationCommandCreateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("Resumed"),
-        Class< DpResumedEvent, NoConstructor< DpResumedEvent > >(vm, SqDppResumedEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppResumedEvent::Fn)
-        .Func(_SC("_tostring"), &DpResumedEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpResumedEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildRoleCreate"),
-        Class< DpGuildRoleCreateEvent, NoConstructor< DpGuildRoleCreateEvent > >(vm, SqDppGuildRoleCreateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildRoleCreateEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildRoleCreateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildRoleCreateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("TypingStart"),
-        Class< DpTypingStartEvent, NoConstructor< DpTypingStartEvent > >(vm, SqDppTypingStartEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppTypingStartEvent::Fn)
-        .Func(_SC("_tostring"), &DpTypingStartEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpTypingStartEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("MessageReactionAdd"),
-        Class< DpMessageReactionAddEvent, NoConstructor< DpMessageReactionAddEvent > >(vm, SqDppMessageReactionAddEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppMessageReactionAddEvent::Fn)
-        .Func(_SC("_tostring"), &DpMessageReactionAddEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpMessageReactionAddEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildMembersChunk"),
-        Class< DpGuildMembersChunkEvent, NoConstructor< DpGuildMembersChunkEvent > >(vm, SqDppGuildMembersChunkEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildMembersChunkEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildMembersChunkEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildMembersChunkEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("MessageReactionRemove"),
-        Class< DpMessageReactionRemoveEvent, NoConstructor< DpMessageReactionRemoveEvent > >(vm, SqDppMessageReactionRemoveEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppMessageReactionRemoveEvent::Fn)
-        .Func(_SC("_tostring"), &DpMessageReactionRemoveEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpMessageReactionRemoveEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildCreate"),
-        Class< DpGuildCreateEvent, NoConstructor< DpGuildCreateEvent > >(vm, SqDppGuildCreateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildCreateEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildCreateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildCreateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("ChannelCreate"),
-        Class< DpChannelCreateEvent, NoConstructor< DpChannelCreateEvent > >(vm, SqDppChannelCreateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppChannelCreateEvent::Fn)
-        .Func(_SC("_tostring"), &DpChannelCreateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpChannelCreateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("MessageReactionRemoveEmoji"),
-        Class< DpMessageReactionRemoveEmojiEvent, NoConstructor< DpMessageReactionRemoveEmojiEvent > >(vm, SqDppMessageReactionRemoveEmojiEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppMessageReactionRemoveEmojiEvent::Fn)
-        .Func(_SC("_tostring"), &DpMessageReactionRemoveEmojiEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpMessageReactionRemoveEmojiEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("MessageDeleteBulk"),
-        Class< DpMessageDeleteBulkEvent, NoConstructor< DpMessageDeleteBulkEvent > >(vm, SqDppMessageDeleteBulkEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppMessageDeleteBulkEvent::Fn)
-        .Func(_SC("_tostring"), &DpMessageDeleteBulkEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpMessageDeleteBulkEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildRoleUpdate"),
-        Class< DpGuildRoleUpdateEvent, NoConstructor< DpGuildRoleUpdateEvent > >(vm, SqDppGuildRoleUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildRoleUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildRoleUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildRoleUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildRoleDelete"),
-        Class< DpGuildRoleDeleteEvent, NoConstructor< DpGuildRoleDeleteEvent > >(vm, SqDppGuildRoleDeleteEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildRoleDeleteEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildRoleDeleteEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildRoleDeleteEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("ChannelPinsUpdate"),
-        Class< DpChannelPinsUpdateEvent, NoConstructor< DpChannelPinsUpdateEvent > >(vm, SqDppChannelPinsUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppChannelPinsUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpChannelPinsUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpChannelPinsUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("MessageReactionRemoveAll"),
-        Class< DpMessageReactionRemoveAllEvent, NoConstructor< DpMessageReactionRemoveAllEvent > >(vm, SqDppMessageReactionRemoveAllEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppMessageReactionRemoveAllEvent::Fn)
-        .Func(_SC("_tostring"), &DpMessageReactionRemoveAllEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpMessageReactionRemoveAllEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("VoiceServerUpdate"),
-        Class< DpVoiceServerUpdateEvent, NoConstructor< DpVoiceServerUpdateEvent > >(vm, SqDppVoiceServerUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppVoiceServerUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpVoiceServerUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpVoiceServerUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildEmojisUpdate"),
-        Class< DpGuildEmojisUpdateEvent, NoConstructor< DpGuildEmojisUpdateEvent > >(vm, SqDppGuildEmojisUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildEmojisUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildEmojisUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildEmojisUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildStickersUpdate"),
-        Class< DpGuildStickersUpdateEvent, NoConstructor< DpGuildStickersUpdateEvent > >(vm, SqDppGuildStickersUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildStickersUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildStickersUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildStickersUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("PresenceUpdate"),
-        Class< DpPresenceUpdateEvent, NoConstructor< DpPresenceUpdateEvent > >(vm, SqDppPresenceUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppPresenceUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpPresenceUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpPresenceUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("WebhooksUpdate"),
-        Class< DpWebhooksUpdateEvent, NoConstructor< DpWebhooksUpdateEvent > >(vm, SqDppWebhooksUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppWebhooksUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpWebhooksUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpWebhooksUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildMemberAdd"),
-        Class< DpGuildMemberAddEvent, NoConstructor< DpGuildMemberAddEvent > >(vm, SqDppGuildMemberAddEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildMemberAddEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildMemberAddEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildMemberAddEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("InviteDelete"),
-        Class< DpInviteDeleteEvent, NoConstructor< DpInviteDeleteEvent > >(vm, SqDppInviteDeleteEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppInviteDeleteEvent::Fn)
-        .Func(_SC("_tostring"), &DpInviteDeleteEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpInviteDeleteEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildUpdate"),
-        Class< DpGuildUpdateEvent, NoConstructor< DpGuildUpdateEvent > >(vm, SqDppGuildUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildIntegrationsUpdate"),
-        Class< DpGuildIntegrationsUpdateEvent, NoConstructor< DpGuildIntegrationsUpdateEvent > >(vm, SqDppGuildIntegrationsUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildIntegrationsUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildIntegrationsUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildIntegrationsUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildMemberUpdate"),
-        Class< DpGuildMemberUpdateEvent, NoConstructor< DpGuildMemberUpdateEvent > >(vm, SqDppGuildMemberUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildMemberUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildMemberUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildMemberUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("ApplicationCommandUpdate"),
-        Class< DpApplicationCommandUpdateEvent, NoConstructor< DpApplicationCommandUpdateEvent > >(vm, SqDppApplicationCommandUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppApplicationCommandUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpApplicationCommandUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpApplicationCommandUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("InviteCreate"),
-        Class< DpInviteCreateEvent, NoConstructor< DpInviteCreateEvent > >(vm, SqDppInviteCreateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppInviteCreateEvent::Fn)
-        .Func(_SC("_tostring"), &DpInviteCreateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpInviteCreateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("MessageUpdate"),
-        Class< DpMessageUpdateEvent, NoConstructor< DpMessageUpdateEvent > >(vm, SqDppMessageUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppMessageUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpMessageUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpMessageUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("UserUpdate"),
-        Class< DpUserUpdateEvent, NoConstructor< DpUserUpdateEvent > >(vm, SqDppUserUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppUserUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpUserUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpUserUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("MessageCreate"),
-        Class< DpMessageCreateEvent, NoConstructor< DpMessageCreateEvent > >(vm, SqDppMessageCreateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppMessageCreateEvent::Fn)
-        .Func(_SC("_tostring"), &DpMessageCreateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpMessageCreateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildBanAdd"),
-        Class< DpGuildBanAddEvent, NoConstructor< DpGuildBanAddEvent > >(vm, SqDppGuildBanAddEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildBanAddEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildBanAddEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildBanAddEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("GuildBanRemove"),
-        Class< DpGuildBanRemoveEvent, NoConstructor< DpGuildBanRemoveEvent > >(vm, SqDppGuildBanRemoveEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildBanRemoveEvent::Fn)
-        .Func(_SC("_tostring"), &DpGuildBanRemoveEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpGuildBanRemoveEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("IntegrationCreate"),
-        Class< DpIntegrationCreateEvent, NoConstructor< DpIntegrationCreateEvent > >(vm, SqDppIntegrationCreateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppIntegrationCreateEvent::Fn)
-        .Func(_SC("_tostring"), &DpIntegrationCreateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpIntegrationCreateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("IntegrationUpdate"),
-        Class< DpIntegrationUpdateEvent, NoConstructor< DpIntegrationUpdateEvent > >(vm, SqDppIntegrationUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppIntegrationUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpIntegrationUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpIntegrationUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("IntegrationDelete"),
-        Class< DpIntegrationDeleteEvent, NoConstructor< DpIntegrationDeleteEvent > >(vm, SqDppIntegrationDeleteEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppIntegrationDeleteEvent::Fn)
-        .Func(_SC("_tostring"), &DpIntegrationDeleteEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpIntegrationDeleteEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("ThreadCreate"),
-        Class< DpThreadCreateEvent, NoConstructor< DpThreadCreateEvent > >(vm, SqDppThreadCreateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppThreadCreateEvent::Fn)
-        .Func(_SC("_tostring"), &DpThreadCreateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpThreadCreateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("ThreadUpdate"),
-        Class< DpThreadUpdateEvent, NoConstructor< DpThreadUpdateEvent > >(vm, SqDppThreadUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppThreadUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpThreadUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpThreadUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("ThreadDelete"),
-        Class< DpThreadDeleteEvent, NoConstructor< DpThreadDeleteEvent > >(vm, SqDppThreadDeleteEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppThreadDeleteEvent::Fn)
-        .Func(_SC("_tostring"), &DpThreadDeleteEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpThreadDeleteEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("ThreadListSync"),
-        Class< DpThreadListSyncEvent, NoConstructor< DpThreadListSyncEvent > >(vm, SqDppThreadListSyncEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppThreadListSyncEvent::Fn)
-        .Func(_SC("_tostring"), &DpThreadListSyncEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpThreadListSyncEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("ThreadMemberUpdate"),
-        Class< DpThreadMemberUpdateEvent, NoConstructor< DpThreadMemberUpdateEvent > >(vm, SqDppThreadMemberUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppThreadMemberUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpThreadMemberUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpThreadMemberUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("ThreadMembersUpdate"),
-        Class< DpThreadMembersUpdateEvent, NoConstructor< DpThreadMembersUpdateEvent > >(vm, SqDppThreadMembersUpdateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppThreadMembersUpdateEvent::Fn)
-        .Func(_SC("_tostring"), &DpThreadMembersUpdateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpThreadMembersUpdateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("VoiceBufferSend"),
-        Class< DpVoiceBufferSendEvent, NoConstructor< DpVoiceBufferSendEvent > >(vm, SqDppVoiceBufferSendEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppVoiceBufferSendEvent::Fn)
-        .Func(_SC("_tostring"), &DpVoiceBufferSendEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpVoiceBufferSendEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("VoiceUserTalking"),
-        Class< DpVoiceUserTalkingEvent, NoConstructor< DpVoiceUserTalkingEvent > >(vm, SqDppVoiceUserTalkingEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppVoiceUserTalkingEvent::Fn)
-        .Func(_SC("_tostring"), &DpVoiceUserTalkingEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpVoiceUserTalkingEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("VoiceReady"),
-        Class< DpVoiceReadyEvent, NoConstructor< DpVoiceReadyEvent > >(vm, SqDppVoiceReadyEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppVoiceReadyEvent::Fn)
-        .Func(_SC("_tostring"), &DpVoiceReadyEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpVoiceReadyEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("VoiceReceive"),
-        Class< DpVoiceReceiveEvent, NoConstructor< DpVoiceReceiveEvent > >(vm, SqDppVoiceReceiveEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppVoiceReceiveEvent::Fn)
-        .Func(_SC("_tostring"), &DpVoiceReceiveEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpVoiceReceiveEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("VoiceTrackMarker"),
-        Class< DpVoiceTrackMarkerEvent, NoConstructor< DpVoiceTrackMarkerEvent > >(vm, SqDppVoiceTrackMarkerEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppVoiceTrackMarkerEvent::Fn)
-        .Func(_SC("_tostring"), &DpVoiceTrackMarkerEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpVoiceTrackMarkerEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("StageInstanceCreate"),
-        Class< DpStageInstanceCreateEvent, NoConstructor< DpStageInstanceCreateEvent > >(vm, SqDppStageInstanceCreateEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppStageInstanceCreateEvent::Fn)
-        .Func(_SC("_tostring"), &DpStageInstanceCreateEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpStageInstanceCreateEvent::GetRawEvent)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("StageInstanceDelete"),
-        Class< DpStageInstanceDeleteEvent, NoConstructor< DpStageInstanceDeleteEvent > >(vm, SqDppStageInstanceDeleteEvent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppStageInstanceDeleteEvent::Fn)
-        .Func(_SC("_tostring"), &DpStageInstanceDeleteEvent::GetRawEvent)
-        // Member Properties
-        .Prop(_SC("RawEvent"), &DpStageInstanceDeleteEvent::GetRawEvent)
-    );
-}
-
-} // Namespace:: SqMod

module/Library/DPP/Guild.cpp

@@ -1,146 +0,0 @@
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP/Guild.hpp"
-#include "Library/DPP/Other.hpp"
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-// ------------------------------------------------------------------------------------------------
-SQMOD_DECL_TYPENAME(SqDppGuildMember, _SC("SqDppGuildMember"))
-SQMOD_DECL_TYPENAME(SqDppGuild, _SC("SqDppGuild"))
-
-// ------------------------------------------------------------------------------------------------
-Table DpGuild::GetMembers() const
-{
-    Table t(SqVM(), static_cast< SQInteger >(Valid().members.size()));
-    // Attempt to convert the [members] associative container into a script table
-    const auto r = t.InsertFromMapWith(mPtr->members, [](HSQUIRRELVM vm, auto id, auto & m) -> SQRESULT {
-        // The [id] is a dpp::snowflake which is basically a uint64_t so let's leave that as is
-        sq_pushinteger(vm, static_cast< SQInteger >(id));
-        // Wrap the dpp::guild_member type into a DpGuildMember instance
-        ClassType< DpGuildMember >::PushInstance(vm, new DpGuildMember(m));
-        // The elements are now on the stack and can be inserted in the table
-        return SQ_OK;
-    });
-    // Did anything fail?
-    if (SQ_FAILED(r))
-    {
-        STHROWF("Unable to convert [members] container");
-    }
-    // Return the resulted table
-    return t;
-}
-
-// ------------------------------------------------------------------------------------------------
-Table DpGuild::GetVoiceMembers() const
-{
-    Table t(SqVM(), static_cast< SQInteger >(Valid().voice_members.size()));
-    // Attempt to convert the [voice_members] associative container into a script table
-    const auto r = t.InsertFromMapWith(mPtr->voice_members, [](HSQUIRRELVM vm, auto id, auto & m) -> SQRESULT {
-        // The [id] is a dpp::snowflake which is basically a uint64_t so let's leave that as is
-        sq_pushinteger(vm, static_cast< SQInteger >(id));
-        // Wrap the dpp::guild_member type into a DpGuildMember instance
-        ClassType< DpVoiceState >::PushInstance(vm, new DpVoiceState(m));
-        // The elements are now on the stack and can be inserted in the table
-        return SQ_OK;
-    });
-    // Did anything fail?
-    if (SQ_FAILED(r))
-    {
-        STHROWF("Unable to convert [voice_members] container");
-    }
-    // Return the resulted table
-    return t;
-}
-
-// ------------------------------------------------------------------------------------------------
-void Register_DPP_Guild(HSQUIRRELVM vm, Table & ns)
-{
-    ns.Bind(_SC("GuildMember"),
-        Class< DpGuildMember, NoConstructor< DpGuildMember > >(vm, SqDppGuildMember::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuildMember::Fn)
-        .Func(_SC("_tojson"), &DpGuildMember::BuildJSON)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpGuildMember::IsValid)
-        .Prop(_SC("JSON"), &DpGuildMember::BuildJSON)
-        .Prop(_SC("Nickname"), &DpGuildMember::GetNickname)
-        .Prop(_SC("GuildID"), &DpGuildMember::GetGuildID)
-        .Prop(_SC("UserID"), &DpGuildMember::GetUserID)
-        .Prop(_SC("JoinedAt"), &DpGuildMember::GetJoinedAt)
-        .Prop(_SC("PremiumSince"), &DpGuildMember::GetPremiumSince)
-        .Prop(_SC("Flags"), &DpGuildMember::GetFlags)
-        .Prop(_SC("IsDeaf"), &DpGuildMember::IsDeaf)
-        .Prop(_SC("IsMuted"), &DpGuildMember::IsMuted)
-        .Prop(_SC("IsPending"), &DpGuildMember::IsPending)
-        // Member Methods
-        .Func(_SC("GetRoles"), &DpGuildMember::GetRoles)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("Guild"),
-        Class< DpGuild, NoConstructor< DpGuild > >(vm, SqDppGuild::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppGuild::Fn)
-        .Func(_SC("_tojson"), &DpGuild::BuildJSON)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpGuild::IsValid)
-        .Prop(_SC("JSON"), &DpGuild::BuildJSON)
-        .Prop(_SC("ShardID"), &DpGuild::GetShardID)
-        .Prop(_SC("Flags"), &DpGuild::GetFlags)
-        .Prop(_SC("Name"), &DpGuild::GetName)
-        .Prop(_SC("Description"), &DpGuild::GetDescription)
-        .Prop(_SC("VanityUrlCode"), &DpGuild::GetVanityUrlCode)
-        .Prop(_SC("Icon"), &DpGuild::GetIcon)
-        .Prop(_SC("Splash"), &DpGuild::GetSplash)
-        .Prop(_SC("DiscoverySplash"), &DpGuild::GetDiscoverySplash)
-        .Prop(_SC("OwnerID"), &DpGuild::GetOwnerID)
-        .Prop(_SC("VoiceRegion"), &DpGuild::GetVoiceRegion)
-        .Prop(_SC("AfkChannelID"), &DpGuild::GetAfkChannelID)
-        .Prop(_SC("AfkTimeout"), &DpGuild::GetAfkTimeout)
-        .Prop(_SC("WidgetChannelID"), &DpGuild::GetWidgetChannelID)
-        .Prop(_SC("VerificationLevel"), &DpGuild::GetVerificationLevel)
-        .Prop(_SC("DefaultMessageNotifications"), &DpGuild::GetDefaultMessageNotifications)
-        .Prop(_SC("ExplicitContentFilter"), &DpGuild::GetExplicitContentFilter)
-        .Prop(_SC("MfaLevel"), &DpGuild::GetMfaLevel)
-        .Prop(_SC("ApplicationID"), &DpGuild::GetApplicationID)
-        .Prop(_SC("SystemChannelID"), &DpGuild::GetSystemChannelID)
-        .Prop(_SC("RulesChannelID"), &DpGuild::GetRulesChannelID)
-        .Prop(_SC("MemberCount"), &DpGuild::GetMemberCount)
-        .Prop(_SC("Banner"), &DpGuild::GetBanner)
-        .Prop(_SC("PremiumTier"), &DpGuild::GetPremiumTier)
-        .Prop(_SC("PremiumSubscriptionCount"), &DpGuild::GetPremiumSubscriptionCount)
-        .Prop(_SC("PublicUpdatesChannelID"), &DpGuild::GetPublicUpdatesChannelID)
-        .Prop(_SC("MaxVideoChannelUsers"), &DpGuild::GetMaxVideoChannelUsers)
-        .Prop(_SC("IsLarge"), &DpGuild::IsLarge)
-        .Prop(_SC("IsUnavailable"), &DpGuild::IsUnavailable)
-        .Prop(_SC("WidgetEnabled"), &DpGuild::WidgetEnabled)
-        .Prop(_SC("HasInviteSplash"), &DpGuild::HasInviteSplash)
-        .Prop(_SC("HasVipRegions"), &DpGuild::HasVipRegions)
-        .Prop(_SC("HasVanityURL"), &DpGuild::HasVanityURL)
-        .Prop(_SC("IsVerified"), &DpGuild::IsVerified)
-        .Prop(_SC("IsPartnered"), &DpGuild::IsPartnered)
-        .Prop(_SC("IsCommunity"), &DpGuild::IsCommunity)
-        .Prop(_SC("HasCommerce"), &DpGuild::HasCommerce)
-        .Prop(_SC("HasNews"), &DpGuild::HasNews)
-        .Prop(_SC("IsDiscoverable"), &DpGuild::IsDiscoverable)
-        .Prop(_SC("IsFeatureable"), &DpGuild::IsFeatureable)
-        .Prop(_SC("HasAnimatedIcon"), &DpGuild::HasAnimatedIcon)
-        .Prop(_SC("BasBanner"), &DpGuild::BasBanner)
-        .Prop(_SC("WelcomeScreenEnabled"), &DpGuild::WelcomeScreenEnabled)
-        .Prop(_SC("HasMemberVerificationGate"), &DpGuild::HasMemberVerificationGate)
-        .Prop(_SC("IsPreviewEnabled"), &DpGuild::IsPreviewEnabled)
-        .Prop(_SC("HasAnimatedIconHash"), &DpGuild::HasAnimatedIconHash)
-        // Member Methods
-        .Func(_SC("BuildJSON"), &DpGuild::BuildJSON_)
-        .Func(_SC("GetRoles"), &DpGuild::GetRoles)
-        .Func(_SC("GetChannels"), &DpGuild::GetChannels)
-        .Func(_SC("GetThreads"), &DpGuild::GetThreads)
-        .Func(_SC("GetMembers"), &DpGuild::GetMembers)
-        .Func(_SC("GetVoiceMembers"), &DpGuild::GetVoiceMembers)
-        .Func(_SC("GetEmojis"), &DpGuild::GetEmojis)
-        .Func(_SC("RehashMembers"), &DpGuild::RehashMembers)
-        .Func(_SC("ConnectMemberVoice"), &DpGuild::ConnectMemberVoice)
-    );
-}
-
-} // Namespace:: SqMod

module/Library/DPP/Guild.hpp

@@ -1,478 +0,0 @@
-#pragma once
-
-// ------------------------------------------------------------------------------------------------
-#include "Core/Utility.hpp"
-
-// ------------------------------------------------------------------------------------------------
-#include <chrono>
-
-// ------------------------------------------------------------------------------------------------
-#include <dpp/dpp.h>
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-/* ------------------------------------------------------------------------------------------------
- * Represents a guild on Discord (AKA a server).
-*/
-struct DpGuildMember
-{
-    using Ptr = std::unique_ptr< dpp::guild_member >;
-    /* --------------------------------------------------------------------------------------------
-     * Referenced guild member instance.
-    */
-    Ptr mPtr{nullptr};
-    /* --------------------------------------------------------------------------------------------
-     * Whether the referenced pointer is owned.
-    */
-    bool mOwned{false};
-    /* --------------------------------------------------------------------------------------------
-     * Default constructor.
-    */
-    DpGuildMember() noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    explicit DpGuildMember(Ptr::pointer ptr, bool owned = false) noexcept
-        : mPtr(ptr), mOwned(owned)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor.
-    */
-    explicit DpGuildMember(const Ptr::element_type & o) noexcept
-        : DpGuildMember(new Ptr::element_type(o), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    explicit DpGuildMember(Ptr::element_type && o) noexcept
-        : DpGuildMember(new Ptr::element_type(std::forward< Ptr::element_type >(o)), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor (disabled).
-    */
-    DpGuildMember(const DpGuildMember & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    DpGuildMember(DpGuildMember && o) noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Destructor.
-    */
-    ~DpGuildMember() noexcept { Cleanup(); }
-    /* --------------------------------------------------------------------------------------------
-     * Copy assignment operator (disabled).
-    */
-    DpGuildMember & operator = (const DpGuildMember & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move assignment operator.
-    */
-    DpGuildMember & operator = (DpGuildMember && o) noexcept
-    {
-        if (this != &o) {
-            // Do we own this to try delete it?
-            Cleanup();
-            // Transfer members values
-            mPtr = std::move(o.mPtr);
-            mOwned = o.mOwned;
-        }
-        return *this;
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Release any referenced resources and default to an empty/invalid state.
-    */
-    void Cleanup()
-    {
-        // Do we own this to try delete it?
-        if (!mOwned && mPtr) {
-            // Not our job, simply forget about it
-            [[maybe_unused]] auto p = mPtr.release();
-        } else mPtr.reset(); // We own this so delete the instance
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle.
-    */
-    void Validate() const { if (!mPtr) STHROWF("Invalid discord voice state handle"); }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle and retrieve a const reference to it.
-    */
-    SQMOD_NODISCARD Ptr::element_type & Valid() const { Validate(); return *mPtr; }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether a valid instance is managed.
-    */
-    SQMOD_NODISCARD bool IsValid() const { return static_cast< bool >(mPtr); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the gickname, or empty string if they don't have a nickname on this guild.
-    */
-    SQMOD_NODISCARD const std::string & GetNickname() const { return Valid().nickname; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the guild id.
-    */
-    SQMOD_NODISCARD dpp::snowflake GetGuildID() const { return Valid().guild_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the user id.
-    */
-    SQMOD_NODISCARD dpp::snowflake GetUserID() const { return Valid().user_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the list of roles this user has on this guild.
-    */
-    SQMOD_NODISCARD Array GetRoles() const
-    {
-        return Array(SqVM()).Reserve(static_cast< SQInteger >(Valid().roles.size()))
-                            .AppendFromVector(Valid().roles);
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the date and time since the user joined the guild.
-    */
-    SQMOD_NODISCARD SQInteger GetJoinedAt() const
-    {
-        return std::chrono::time_point_cast< std::chrono::seconds >(
-                std::chrono::system_clock::from_time_t(Valid().joined_at)
-            ).time_since_epoch().count();
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the date and time since the user has boosted the guild guild.
-    */
-    SQMOD_NODISCARD SQInteger GetPremiumSince() const
-    {
-        return std::chrono::time_point_cast< std::chrono::seconds >(
-                std::chrono::system_clock::from_time_t(Valid().premium_since)
-            ).time_since_epoch().count();
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the set of flags built from the bitmask defined by dpp::guild_member_flags.
-    */
-    SQMOD_NODISCARD SQInteger GetFlags() const { return static_cast< SQInteger >(Valid().flags); }
-    /* --------------------------------------------------------------------------------------------
-     * Build JSON string for the member object.
-    */
-    SQMOD_NODISCARD std::string BuildJSON() const { return Valid().build_json(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user is deafened.
-    */
-    SQMOD_NODISCARD bool IsDeaf() const { return Valid().is_deaf(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user is muted.
-    */
-    SQMOD_NODISCARD bool IsMuted() const { return Valid().is_muted(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user is pending verification by membership screening.
-    */
-    SQMOD_NODISCARD bool IsPending() const { return Valid().is_pending(); }
-};
-
-/* ------------------------------------------------------------------------------------------------
- * Represents a guild on Discord (AKA a server)
-*/
-struct DpGuild
-{
-    using Ptr = std::unique_ptr< dpp::guild >;
-    /* --------------------------------------------------------------------------------------------
-     * Referenced guild instance.
-    */
-    Ptr mPtr{nullptr};
-    /* --------------------------------------------------------------------------------------------
-     * Whether the referenced pointer is owned.
-    */
-    bool mOwned{false};
-    /* --------------------------------------------------------------------------------------------
-     * Default constructor.
-    */
-    DpGuild() noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    explicit DpGuild(Ptr::pointer ptr, bool owned = false) noexcept
-        : mPtr(ptr), mOwned(owned)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor.
-    */
-    explicit DpGuild(const Ptr::element_type & o) noexcept
-        : DpGuild(new Ptr::element_type(o), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    explicit DpGuild(Ptr::element_type && o) noexcept
-        : DpGuild(new Ptr::element_type(std::forward< Ptr::element_type >(o)), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor (disabled).
-    */
-    DpGuild(const DpGuild & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    DpGuild(DpGuild && o) noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Destructor.
-    */
-    ~DpGuild() noexcept { Cleanup(); }
-    /* --------------------------------------------------------------------------------------------
-     * Copy assignment operator (disabled).
-    */
-    DpGuild & operator = (const DpGuild & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move assignment operator.
-    */
-    DpGuild & operator = (DpGuild && o) noexcept
-    {
-        if (this != &o) {
-            // Do we own this to try delete it?
-            Cleanup();
-            // Transfer members values
-            mPtr = std::move(o.mPtr);
-            mOwned = o.mOwned;
-        }
-        return *this;
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Release any referenced resources and default to an empty/invalid state.
-    */
-    void Cleanup()
-    {
-        // Do we own this to try delete it?
-        if (!mOwned && mPtr) {
-            // Not our job, simply forget about it
-            [[maybe_unused]] auto p = mPtr.release();
-        } else mPtr.reset(); // We own this so delete the instance
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle.
-    */
-    void Validate() const { if (!mPtr) STHROWF("Invalid discord guild handle"); }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle and retrieve a const reference to it.
-    */
-    SQMOD_NODISCARD Ptr::element_type & Valid() const { Validate(); return *mPtr; }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether a valid instance is managed.
-    */
-    SQMOD_NODISCARD bool IsValid() const { return static_cast< bool >(mPtr); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the shard ID of the guild.
-    */
-    SQMOD_NODISCARD SQInteger GetShardID() const { return static_cast< SQInteger >(Valid().shard_id); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the flags bitmask as defined by values within dpp::guild_flags.
-    */
-    SQMOD_NODISCARD SQInteger GetFlags() const { return static_cast< SQInteger >(Valid().flags); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the guild name.
-    */
-    SQMOD_NODISCARD const std::string & GetName() const { return Valid().name; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the server description for communities.
-    */
-    SQMOD_NODISCARD const std::string & GetDescription() const { return Valid().description; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the vanity url code for verified or partnered servers and boost level 3.
-    */
-    SQMOD_NODISCARD const std::string & GetVanityUrlCode() const { return Valid().vanity_url_code; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the guild icon hash.
-    */
-    SQMOD_NODISCARD const dpp::utility::iconhash & GetIcon() const { return Valid().icon; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the guild splash hash.
-    */
-    SQMOD_NODISCARD const dpp::utility::iconhash & GetSplash() const { return Valid().splash; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the guild discovery splash hash.
-    */
-    SQMOD_NODISCARD const dpp::utility::iconhash & GetDiscoverySplash() const { return Valid().discovery_splash; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the snowflake id of guild owner.
-    */
-    SQMOD_NODISCARD dpp::snowflake GetOwnerID() const { return Valid().owner_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the guild voice region.
-    */
-    SQMOD_NODISCARD SQInteger GetVoiceRegion() const { return static_cast< SQInteger >(Valid().voice_region); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the snowflake ID of AFK voice channel or 0.
-    */
-    SQMOD_NODISCARD dpp::snowflake GetAfkChannelID() const { return Valid().afk_channel_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the voice AFK timeout before moving users to AFK channel.
-    */
-    SQMOD_NODISCARD SQInteger GetAfkTimeout() const { return static_cast< SQInteger >(Valid().afk_timeout); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the snowflake ID of widget channel, or 0.
-    */
-    SQMOD_NODISCARD dpp::snowflake GetWidgetChannelID() const { return Valid().widget_channel_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the verification level of server.
-    */
-    SQMOD_NODISCARD SQInteger GetVerificationLevel() const { return static_cast< SQInteger >(Valid().verification_level); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the setting for how notifications are to be delivered to users.
-    */
-    SQMOD_NODISCARD SQInteger GetDefaultMessageNotifications() const { return static_cast< SQInteger >(Valid().default_message_notifications); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether or not explicit content filtering is enable and what setting it is.
-    */
-    SQMOD_NODISCARD SQInteger GetExplicitContentFilter() const { return static_cast< SQInteger >(Valid().explicit_content_filter); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether multi factor authentication is required for moderators or not.
-    */
-    SQMOD_NODISCARD SQInteger GetMfaLevel() const { return static_cast< SQInteger >(Valid().mfa_level); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the ID of creating application, if any, or 0.
-    */
-    SQMOD_NODISCARD dpp::snowflake GetApplicationID() const { return Valid().application_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the ID of system channel where discord update messages are sent.
-    */
-    SQMOD_NODISCARD dpp::snowflake GetSystemChannelID() const { return Valid().system_channel_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the ID of rules channel for communities.
-    */
-    SQMOD_NODISCARD dpp::snowflake GetRulesChannelID() const { return Valid().rules_channel_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the approximate member count. May be sent as zero.
-    */
-    SQMOD_NODISCARD SQInteger GetMemberCount() const { return static_cast< SQInteger >(Valid().member_count); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the server banner hash.
-    */
-    SQMOD_NODISCARD const dpp::utility::iconhash & GetBanner() const { return Valid().banner; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the boost level.
-    */
-    SQMOD_NODISCARD SQInteger GetPremiumTier() const { return static_cast< SQInteger >(Valid().premium_tier); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the number of boosters.
-    */
-    SQMOD_NODISCARD SQInteger GetPremiumSubscriptionCount() const { return static_cast< SQInteger >(Valid().premium_subscription_count); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve public updates channel ID or 0.
-    */
-    SQMOD_NODISCARD dpp::snowflake GetPublicUpdatesChannelID() const { return Valid().public_updates_channel_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the maximum users in a video channel, or 0.
-    */
-    SQMOD_NODISCARD SQInteger GetMaxVideoChannelUsers() const { return static_cast< SQInteger >(Valid().max_video_channel_users); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve a roles defined on this server.
-    */
-    SQMOD_NODISCARD Array GetRoles() const { return Array(SqVM()).Reserve(static_cast< SQInteger >(Valid().roles.size())).AppendFromVector(Valid().roles); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve a list of channels on this server.
-    */
-    SQMOD_NODISCARD Array GetChannels() const { return Array(SqVM()).Reserve(static_cast< SQInteger >(Valid().channels.size())).AppendFromVector(Valid().channels); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve a list of threads on this server.
-    */
-    SQMOD_NODISCARD Array GetThreads() const { return Array(SqVM()).Reserve(static_cast< SQInteger >(Valid().threads.size())).AppendFromVector(Valid().threads); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve a list of guild members. Note that when you first receive the guild create event,
-     * this may be empty or near empty. This depends upon your dpp::intents and the size of your bot.
-     * It will be filled by guild member chunk requests.
-    */
-    SQMOD_NODISCARD Table GetMembers() const;
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve a list of members in voice channels in the guild.
-    */
-    SQMOD_NODISCARD Table GetVoiceMembers() const;
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve a list of emojis.
-    */
-    SQMOD_NODISCARD Array GetEmojis() const { return Array(SqVM()).Reserve(static_cast< SQInteger >(Valid().emojis.size())).AppendFromVector(Valid().emojis); }
-    /* --------------------------------------------------------------------------------------------
-     * Build a JSON string from this object.
-    */
-    SQMOD_NODISCARD std::string BuildJSON() const { return Valid().build_json(); }
-    /* --------------------------------------------------------------------------------------------
-     * Build a JSON string from this object. If [with_id] is True then ID is to be included in the JSON.
-    */
-    SQMOD_NODISCARD std::string BuildJSON_(bool with_id) const { return Valid().build_json(with_id); }
-    /* --------------------------------------------------------------------------------------------
-     * Rehash members map.
-    */
-    SQMOD_NODISCARD DpGuild & RehashMembers() { Valid().rehash_members(); return *this; }
-    /* --------------------------------------------------------------------------------------------
-     * Connect to a voice channel another guild member is in.
-     * Returns true if the user specified is in a voice channel, false if they aren't.
-    */
-    SQMOD_NODISCARD bool ConnectMemberVoice(SQInteger user_id) const { return Valid().connect_member_voice(user_id); }
-    /* --------------------------------------------------------------------------------------------
-     * Is a large server (>250 users).
-    */
-    SQMOD_NODISCARD bool IsLarge() const { return Valid().is_large(); }
-    /* --------------------------------------------------------------------------------------------
-     * Is unavailable due to outage (most other fields will be blank or outdated).
-    */
-    SQMOD_NODISCARD bool IsUnavailable() const { return Valid().is_unavailable(); }
-    /* --------------------------------------------------------------------------------------------
-     * Widget is enabled for this server.
-    */
-    SQMOD_NODISCARD bool WidgetEnabled() const { return Valid().widget_enabled(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild has an invite splash.
-    */
-    SQMOD_NODISCARD bool HasInviteSplash() const { return Valid().has_invite_splash(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild has VIP regions.
-    */
-    SQMOD_NODISCARD bool HasVipRegions() const { return Valid().has_vip_regions(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild can have a vanity URL.
-    */
-    SQMOD_NODISCARD bool HasVanityURL() const { return Valid().has_vanity_url(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild is a verified server.
-    */
-    SQMOD_NODISCARD bool IsVerified() const { return Valid().is_verified(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild is a discord partner server.
-    */
-    SQMOD_NODISCARD bool IsPartnered() const { return Valid().is_partnered(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild has enabled community.
-    */
-    SQMOD_NODISCARD bool IsCommunity() const { return Valid().is_community(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild has enabled commerce channels.
-    */
-    SQMOD_NODISCARD bool HasCommerce() const { return Valid().has_commerce(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild has news channel.
-    */
-    SQMOD_NODISCARD bool HasNews() const { return Valid().has_news(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild is discoverable.
-    */
-    SQMOD_NODISCARD bool IsDiscoverable() const { return Valid().is_discoverable(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild is featureable.
-    */
-    SQMOD_NODISCARD bool IsFeatureable() const { return Valid().is_featureable(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild is allowed an animated icon.
-    */
-    SQMOD_NODISCARD bool HasAnimatedIcon() const { return Valid().has_animated_icon(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild has a banner image.
-    */
-    SQMOD_NODISCARD bool BasBanner() const { return Valid().has_banner(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild has enabled welcome screen.
-    */
-    SQMOD_NODISCARD bool WelcomeScreenEnabled() const { return Valid().is_welcome_screen_enabled(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild has enabled membership screening.
-    */
-    SQMOD_NODISCARD bool HasMemberVerificationGate() const { return Valid().has_member_verification_gate(); }
-    /* --------------------------------------------------------------------------------------------
-     * Guild has preview enabled.
-    */
-    SQMOD_NODISCARD bool IsPreviewEnabled() const { return Valid().is_preview_enabled(); }
-    /* --------------------------------------------------------------------------------------------
-     * Server icon is actually an animated gif.
-    */
-    SQMOD_NODISCARD bool HasAnimatedIconHash() const { return Valid().has_animated_icon_hash(); }
-};
-
-} // Namespace:: SqMod

module/Library/DPP/Integration.cpp

@@ -1,16 +0,0 @@
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP/Integration.hpp"
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-// ------------------------------------------------------------------------------------------------
-
-
-// ------------------------------------------------------------------------------------------------
-void Register_DPP_Integration(HSQUIRRELVM vm, Table & ns)
-{
-
-}
-
-} // Namespace:: SqMod

module/Library/DPP/Integration.hpp

@@ -1,19 +0,0 @@
-#pragma once
-
-// ------------------------------------------------------------------------------------------------
-#include "Core/Utility.hpp"
-
-// ------------------------------------------------------------------------------------------------
-#include <chrono>
-
-// ------------------------------------------------------------------------------------------------
-#include <dpp/dpp.h>
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-/* ------------------------------------------------------------------------------------------------
- * 
-*/
-
-} // Namespace:: SqMod

module/Library/DPP/Message.cpp

@@ -1,242 +0,0 @@
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP/Message.hpp"
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-// ------------------------------------------------------------------------------------------------
-SQMOD_DECL_TYPENAME(SqDppSelectOption, _SC("SqDppSelectOption"))
-SQMOD_DECL_TYPENAME(SqDppSelectOptions, _SC("SqDppSelectOptions"))
-SQMOD_DECL_TYPENAME(SqDppComponent, _SC("SqDppComponent"))
-SQMOD_DECL_TYPENAME(SqDppComponents, _SC("SqDppComponents"))
-SQMOD_DECL_TYPENAME(SqDppEmbedFooter, _SC("SqDppEmbedFooter"))
-SQMOD_DECL_TYPENAME(SqDppEmbedImage, _SC("SqDppEmbedImage"))
-SQMOD_DECL_TYPENAME(SqDppEmbedProvider, _SC("SqDppEmbedProvider"))
-SQMOD_DECL_TYPENAME(SqDppEmbedAuthor, _SC("SqDppEmbedAuthor"))
-SQMOD_DECL_TYPENAME(SqDppEmbedField, _SC("SqDppEmbedField"))
-SQMOD_DECL_TYPENAME(SqDppEmbed, _SC("SqDppEmbed"))
-SQMOD_DECL_TYPENAME(SqDppReaction, _SC("SqDppReaction"))
-SQMOD_DECL_TYPENAME(SqDppAttachment, _SC("SqDppAttachment"))
-SQMOD_DECL_TYPENAME(SqDppSticker, _SC("SqDppSticker"))
-SQMOD_DECL_TYPENAME(SqDppStickerPack, _SC("SqDppStickerPack"))
-SQMOD_DECL_TYPENAME(SqDppMessage, _SC("SqDppMessage"))
-
-// ------------------------------------------------------------------------------------------------
-void Register_DPP_Message(HSQUIRRELVM vm, Table & ns)
-{
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("SelectOption"),
-        Class< DpSelectOption, NoCopy< DpSelectOption > >(vm, SqDppSelectOption::Str)
-        .Ctor()
-        .Ctor< StackStrF &, StackStrF &, StackStrF & >()
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppSelectOption::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpSelectOption::IsValid)
-        .Prop(_SC("Label"), &DpSelectOption::GetLabel, &DpSelectOption::SetLabel)
-        .Prop(_SC("Value"), &DpSelectOption::GetValue, &DpSelectOption::SetValue)
-        .Prop(_SC("Description"), &DpSelectOption::GetDescription, &DpSelectOption::SetDescription)
-        .Prop(_SC("IsDefault"), &DpSelectOption::IsDefault, &DpSelectOption::SetDefault)
-        .Prop(_SC("IsAnimated"), &DpSelectOption::IsAnimated, &DpSelectOption::SetAnimated)
-        .Prop(_SC("EmojiName"), &DpSelectOption::GetEmojiName, &DpSelectOption::SetEmojiName)
-        .Prop(_SC("EmojiID"), &DpSelectOption::GetEmojiID, &DpSelectOption::SetEmojiID)
-        // Member Methods
-        .FmtFunc(_SC("SetLabel"), &DpSelectOption::ApplyLabel)
-        .FmtFunc(_SC("SetValue"), &DpSelectOption::ApplyValue)
-        .FmtFunc(_SC("SetDescription"), &DpSelectOption::ApplyDescription)
-        .FmtFunc(_SC("SetEmoji"), &DpSelectOption::SetEmoji)
-        .FmtFunc(_SC("SetDefault"), &DpSelectOption::SetDefault)
-        .FmtFunc(_SC("SetAnimated"), &DpSelectOption::SetAnimated)
-        .FmtFunc(_SC("SetEmojiName"), &DpSelectOption::ApplyEmojiName)
-    );
-    // --------------------------------------------------------------------------------------------
-    Register_DPP_VectorProxy< dpp::select_option, DpSelectOption, SqDppSelectOptions >(vm, ns, _SC("SelectOptions"));
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("Component"),
-        Class< DpComponent, NoConstructor< DpComponent > >(vm, SqDppComponent::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppComponent::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpComponent::IsValid)
-        .Prop(_SC("JSON"), &DpComponent::BuildJSON)
-        .Prop(_SC("Type"), &DpComponent::GetType, &DpComponent::SetType)
-        .Prop(_SC("Label"), &DpComponent::GetLabel, &DpComponent::SetLabel)
-        .Prop(_SC("Style"), &DpComponent::GetStyle, &DpComponent::SetStyle)
-        .Prop(_SC("CustomID"), &DpComponent::GetCustomID, &DpComponent::SetCustomID)
-        .Prop(_SC("URL"), &DpComponent::GetURL, &DpComponent::SetURL)
-        .Prop(_SC("Placeholder"), &DpComponent::GetPlaceholder, &DpComponent::SetPlaceholder)
-        .Prop(_SC("MinValues"), &DpComponent::GetMinValues, &DpComponent::SetMinValues)
-        .Prop(_SC("MaxValues"), &DpComponent::GetMaxValues, &DpComponent::SetMaxValues)
-        .Prop(_SC("Disabled"), &DpComponent::IsDisabled, &DpComponent::SetDisabled)
-        .Prop(_SC("IsAnimated"), &DpComponent::IsAnimated, &DpComponent::SetAnimated)
-        .Prop(_SC("EmojiName"), &DpComponent::GetEmojiName, &DpComponent::SetEmojiName)
-        .Prop(_SC("EmojiID"), &DpComponent::GetEmojiID, &DpComponent::SetEmojiID)
-        // Member Methods
-        .FmtFunc(_SC("SetLabel"), &DpComponent::ApplyLabel)
-        .FmtFunc(_SC("SetCustomID"), &DpComponent::ApplyCustomID)
-        .FmtFunc(_SC("SetURL"), &DpComponent::ApplyURL)
-        .FmtFunc(_SC("SetPlaceholder"), &DpComponent::ApplyPlaceholder)
-        .FmtFunc(_SC("SetDisabled"), &DpComponent::SetDisabled)
-        .FmtFunc(_SC("SetAnimated"), &DpComponent::SetAnimated)
-        .FmtFunc(_SC("SetEmojiName"), &DpComponent::ApplyEmojiName)
-        .FmtFunc(_SC("GetComponents"), &DpComponent::GetComponents)
-        .FmtFunc(_SC("GetOptions"), &DpComponent::GetOptions)
-        .FmtFunc(_SC("AddComponent"), &DpComponent::AddComponent)
-        .FmtFunc(_SC("AddOption"), &DpComponent::AddSelectOption)
-    );
-    // --------------------------------------------------------------------------------------------
-    Register_DPP_VectorProxy< dpp::component, DpComponent, SqDppComponent >(vm, ns, _SC("Components"));
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("EmbedFooter"),
-        Class< DpEmbedFooter, NoConstructor< DpEmbedFooter > >(vm, SqDppEmbedFooter::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppEmbedFooter::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpEmbedFooter::IsValid)
-        .Prop(_SC("Text"), &DpEmbedFooter::GetText, &DpEmbedFooter::SetText)
-        .Prop(_SC("Icon"), &DpEmbedFooter::GetIconURL, &DpEmbedFooter::SetIconURL)
-        .Prop(_SC("Proxy"), &DpEmbedFooter::GetProxyURL, &DpEmbedFooter::SetProxyURL)
-        // Member Methods
-        .FmtFunc(_SC("SetText"), &DpEmbedFooter::ApplyText)
-        .FmtFunc(_SC("SetIcon"), &DpEmbedFooter::ApplyIconURL)
-        .FmtFunc(_SC("SetProxy"), &DpEmbedFooter::ApplyProxyURL)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("EmbedImage"),
-        Class< DpEmbedImage, NoConstructor< DpEmbedImage > >(vm, SqDppEmbedImage::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppEmbedImage::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpEmbedImage::IsValid)
-        .Prop(_SC("URL"), &DpEmbedImage::GetURL, &DpEmbedImage::SetURL)
-        .Prop(_SC("Proxy"), &DpEmbedImage::GetProxyURL, &DpEmbedImage::SetProxyURL)
-        .Prop(_SC("Height"), &DpEmbedImage::GetHeight, &DpEmbedImage::SetHeight)
-        .Prop(_SC("Width"), &DpEmbedImage::GetWidth, &DpEmbedImage::SetWidth)
-        // Member Methods
-        .FmtFunc(_SC("SetURL"), &DpEmbedImage::ApplyURL)
-        .FmtFunc(_SC("SetProxy"), &DpEmbedImage::ApplyProxyURL)
-        .FmtFunc(_SC("SetHeight"), &DpEmbedImage::ApplyHeight)
-        .FmtFunc(_SC("SetWidth"), &DpEmbedImage::ApplyWidth)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("EmbedProvider"),
-        Class< DpEmbedProvider, NoConstructor< DpEmbedProvider > >(vm, SqDppEmbedProvider::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppEmbedProvider::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpEmbedProvider::IsValid)
-        .Prop(_SC("Name"), &DpEmbedProvider::GetName, &DpEmbedProvider::SetName)
-        .Prop(_SC("URL"), &DpEmbedProvider::GetURL, &DpEmbedProvider::SetURL)
-        // Member Methods
-        .FmtFunc(_SC("SetName"), &DpEmbedProvider::ApplyName)
-        .FmtFunc(_SC("SetURL"), &DpEmbedProvider::ApplyURL)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("EmbedAuthor"),
-        Class< DpEmbedAuthor, NoConstructor< DpEmbedAuthor > >(vm, SqDppEmbedAuthor::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppEmbedAuthor::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpEmbedAuthor::IsValid)
-        .Prop(_SC("Name"), &DpEmbedAuthor::GetName, &DpEmbedAuthor::SetName)
-        .Prop(_SC("URL"), &DpEmbedAuthor::GetURL, &DpEmbedAuthor::SetURL)
-        .Prop(_SC("Icon"), &DpEmbedAuthor::GetIconURL, &DpEmbedAuthor::SetIconURL)
-        .Prop(_SC("ProxyIcon"), &DpEmbedAuthor::GetProxyIconURL, &DpEmbedAuthor::SetProxyIconURL)
-        // Member Methods
-        .FmtFunc(_SC("SetName"), &DpEmbedAuthor::ApplyName)
-        .FmtFunc(_SC("SetURL"), &DpEmbedAuthor::ApplyURL)
-        .FmtFunc(_SC("SetIcon"), &DpEmbedAuthor::ApplyIconURL)
-        .FmtFunc(_SC("SetProxyIcon"), &DpEmbedAuthor::ApplyProxyIconURL)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("EmbedField"),
-        Class< DpEmbedField, NoConstructor< DpEmbedField > >(vm, SqDppEmbedField::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppEmbedField::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpEmbedField::IsValid)
-        .Prop(_SC("Name"), &DpEmbedField::GetName, &DpEmbedField::SetName)
-        .Prop(_SC("Value"), &DpEmbedField::GetValue, &DpEmbedField::SetValue)
-        .Prop(_SC("Inline"), &DpEmbedField::IsInline, &DpEmbedField::SetInline)
-        // Member Methods
-        .FmtFunc(_SC("SetName"), &DpEmbedField::ApplyName)
-        .FmtFunc(_SC("SetValue"), &DpEmbedField::ApplyValue)
-        .FmtFunc(_SC("SetInline"), &DpEmbedField::SetInline)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("Embed"),
-        Class< DpEmbed, NoConstructor< DpEmbed > >(vm, SqDppEmbed::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppEmbed::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpEmbed::IsValid)
-        .Prop(_SC("Title"), &DpEmbed::GetTitle, &DpEmbed::SetTitle)
-        .Prop(_SC("Type"), &DpEmbed::GetType, &DpEmbed::SetType)
-        .Prop(_SC("Description"), &DpEmbed::GetDescription, &DpEmbed::SetDescription)
-        .Prop(_SC("URL"), &DpEmbed::GetURL, &DpEmbed::SetURL)
-        .Prop(_SC("TimeStamp"), &DpEmbed::GetTimeStamp, &DpEmbed::SetTimeStamp)
-        .Prop(_SC("Color"), &DpEmbed::GetColor, &DpEmbed::SetColor)
-        .Prop(_SC("Footer"), &DpEmbed::GetFooter, &DpEmbed::SetFooter)
-        .Prop(_SC("Image"), &DpEmbed::GetImage, &DpEmbed::SetImage)
-        .Prop(_SC("Thumbnail"), &DpEmbed::GetThumbnail, &DpEmbed::SetThumbnail)
-        .Prop(_SC("Video"), &DpEmbed::GetVideo, &DpEmbed::SetVideo)
-        .Prop(_SC("Provider"), &DpEmbed::GetProvider, &DpEmbed::SetProvider)
-        .Prop(_SC("Author"), &DpEmbed::GetAuthor, &DpEmbed::SetAuthor)
-        .Prop(_SC("Fields"), &DpEmbed::GetFields)
-        // Member Methods
-        .FmtFunc(_SC("SetTitle"), &DpEmbed::ApplyTitle)
-        .FmtFunc(_SC("SetType"), &DpEmbed::ApplyType)
-        .FmtFunc(_SC("SetDescription"), &DpEmbed::ApplyDescription)
-        .FmtFunc(_SC("SetURL"), &DpEmbed::ApplyURL)
-        .FmtFunc(_SC("SetTimeStamp"), &DpEmbed::ApplyTimeStamp)
-        .FmtFunc(_SC("SetFooter"), &DpEmbed::ApplyFooter)
-        .FmtFunc(_SC("SetImage"), &DpEmbed::ApplyImage)
-        .FmtFunc(_SC("SetThumbnail"), &DpEmbed::ApplyThumbnail)
-        .FmtFunc(_SC("SetVideo"), &DpEmbed::ApplyVideo)
-        .FmtFunc(_SC("SetProvider"), &DpEmbed::ApplyProvider)
-        .FmtFunc(_SC("SetAuthor"), &DpEmbed::ApplyAuthor)
-        .FmtFunc(_SC("AddField"), &DpEmbed::AddField)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("Reaction"),
-        Class< DpReaction, NoConstructor< DpReaction > >(vm, SqDppReaction::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppReaction::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpReaction::IsValid)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("Attachment"),
-        Class< DpAttachment, NoConstructor< DpAttachment > >(vm, SqDppAttachment::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppAttachment::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpAttachment::IsValid)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("Sticker"),
-        Class< DpSticker, NoConstructor< DpSticker > >(vm, SqDppSticker::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppSticker::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpSticker::IsValid)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("StickerPack"),
-        Class< DpStickerPack, NoConstructor< DpStickerPack > >(vm, SqDppStickerPack::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppStickerPack::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpStickerPack::IsValid)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("Message"),
-        Class< DpMessage, NoConstructor< DpMessage > >(vm, SqDppMessage::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppMessage::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpMessage::IsValid)
-    );
-}
-
-} // Namespace:: SqMod

module/Library/DPP/Other.cpp

@@ -1,141 +0,0 @@
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP/Other.hpp"
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-// ------------------------------------------------------------------------------------------------
-SQMOD_DECL_TYPENAME(SqDppCachePolicy, _SC("SqDppCachePolicy"))
-SQMOD_DECL_TYPENAME(SqDppIconHash, _SC("SqDppIconHash"))
-SQMOD_DECL_TYPENAME(SqDppUptime, _SC("SqDppUptime"))
-SQMOD_DECL_TYPENAME(SqDppActivity, _SC("SqDppActivity"))
-SQMOD_DECL_TYPENAME(SqDppPresence, _SC("SqDppPresence"))
-SQMOD_DECL_TYPENAME(SqDppVoiceState, _SC("SqDppVoiceState"))
-
-// ------------------------------------------------------------------------------------------------
-void Register_DPP_Other(HSQUIRRELVM vm, Table & ns)
-{
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("Uptime"),
-        Class< dpp::utility::uptime >(vm, SqDppUptime::Str)
-        // Constructors
-        .Ctor()
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppUptime::Fn)
-        .Func(_SC("_tostring"), &dpp::utility::uptime::to_string)
-        // Member Variables
-        .Var(_SC("Days"), &dpp::utility::uptime::days)
-        .Var(_SC("Hours"), &dpp::utility::uptime::hours)
-        .Var(_SC("Minutes"), &dpp::utility::uptime::mins)
-        .Var(_SC("Seconds"), &dpp::utility::uptime::secs)
-        // Member Methods
-        .Func(_SC("ToSeconds"), &dpp::utility::uptime::to_secs)
-        .Func(_SC("ToMilliseconds"), &dpp::utility::uptime::to_msecs)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("IconHash"),
-        Class< dpp::utility::iconhash >(vm, SqDppIconHash::Str)
-        // Constructors
-        .Ctor()
-        .Ctor< const std::string & >()
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppIconHash::Fn)
-        .Func(_SC("_tostring"), &dpp::utility::iconhash::to_string)
-        // Member Variables
-        .Var(_SC("High"), &dpp::utility::iconhash::first)
-        .Var(_SC("Low"), &dpp::utility::iconhash::second)
-        // Member Methods
-        .Func(_SC("Set"), &dpp::utility::iconhash::set)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("CachePolicy"),
-        Class< DpCachePolicy >(vm, SqDppCachePolicy::Str)
-        // Constructors
-        .Ctor()
-        .Ctor< SQInteger >()
-        .Ctor< SQInteger, SQInteger >()
-        .Ctor< SQInteger, SQInteger, SQInteger >()
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppCachePolicy::Fn)
-        // Member Variables
-        .Var(_SC("UserPolicy"), &DpCachePolicy::mUserPolicy)
-        .Var(_SC("EmojiPolicy"), &DpCachePolicy::mEmojiPolicy)
-        .Var(_SC("RolePolicy"), &DpCachePolicy::mRolePolicy)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("Activity"),
-        Class< DpActivity, NoCopy< DpActivity > >(vm, SqDppActivity::Str)
-        // Constructors
-        .Ctor()
-        .Ctor< SQInteger, StackStrF &, StackStrF &, StackStrF & >()
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppActivity::Fn)
-        // Member Properties
-        .Prop(_SC("Name"), &DpActivity::GetName, &DpActivity::SetName)
-        .Prop(_SC("State"), &DpActivity::GetState, &DpActivity::SetState)
-        .Prop(_SC("URL"), &DpActivity::GetURL, &DpActivity::SetURL)
-        .Prop(_SC("Type"), &DpActivity::GetType, &DpActivity::SetType)
-        .Prop(_SC("CreatedAt"), &DpActivity::GetCreatedAt, &DpActivity::SetCreatedAt)
-        .Prop(_SC("Start"), &DpActivity::GetStart, &DpActivity::SetStart)
-        .Prop(_SC("End"), &DpActivity::GetEnd, &DpActivity::SetEnd)
-        // Member Methods
-        .Func(_SC("SetName"), &DpActivity::ApplyName)
-        .Func(_SC("SetState"), &DpActivity::ApplyState)
-        .Func(_SC("SetURL"), &DpActivity::ApplyURL)
-        .Func(_SC("SetType"), &DpActivity::ApplyType)
-        .Func(_SC("SetCreatedAt"), &DpActivity::ApplyCreatedAt)
-        .Func(_SC("SetStart"), &DpActivity::ApplyStart)
-        .Func(_SC("SetEnd"), &DpActivity::ApplyEnd)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("Presence"),
-        Class< DpPresence, NoCopy< DpPresence > >(vm, SqDppPresence::Str)
-        // Constructors
-        .Ctor()
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppPresence::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpPresence::IsValid)
-        .Prop(_SC("UserID"), &DpPresence::GetUserID, &DpPresence::SetUserID)
-        .Prop(_SC("GuildID"), &DpPresence::GetGuildID, &DpPresence::SetGuildID)
-        .Prop(_SC("Flags"), &DpPresence::GetFlags, &DpPresence::SetFlags)
-        .Prop(_SC("ActivityCount"), &DpPresence::ActivityCount)
-        .Prop(_SC("DesktopStatus"), &DpPresence::GetDesktopStatus)
-        .Prop(_SC("WebStatus"), &DpPresence::GetWebStatus)
-        .Prop(_SC("MobileStatus"), &DpPresence::GetMobileStatus)
-        .Prop(_SC("Status"), &DpPresence::GetStatus)
-        // Member Methods
-        .Func(_SC("SetUserID"), &DpPresence::ApplyUserID)
-        .Func(_SC("SetGuildID"), &DpPresence::ApplyGuildID)
-        .Func(_SC("SetFlags"), &DpPresence::ApplyFlags)
-        .Func(_SC("AddActivity"), &DpPresence::AddActivity)
-        .Func(_SC("EachActivity"), &DpPresence::EachActivity)
-        .Func(_SC("ClearActivities"), &DpPresence::ClearActivities)
-        .Func(_SC("FilterActivities"), &DpPresence::FilterActivities)
-        .Func(_SC("BuildJSON"), &DpPresence::BuildJSON)
-    );
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(_SC("VoiceState"),
-        Class< DpVoiceState, NoConstructor< DpVoiceState > >(vm, SqDppVoiceState::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppVoiceState::Fn)
-        .Func(_SC("_tojson"), &DpVoiceState::BuildJSON)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpVoiceState::IsValid)
-        .Prop(_SC("JSON"), &DpVoiceState::BuildJSON)
-        .Prop(_SC("GuildID"), &DpVoiceState::GetGuildID)
-        .Prop(_SC("ChannelID"), &DpVoiceState::GetChannelID)
-        .Prop(_SC("UserID"), &DpVoiceState::GetUserID)
-        .Prop(_SC("SessionID"), &DpVoiceState::GetSessionID)
-        .Prop(_SC("Flags"), &DpVoiceState::GetFlags, &DpVoiceState::SetFlags)
-        .Prop(_SC("IsDeaf"), &DpVoiceState::IsDeaf)
-        .Prop(_SC("IsMute"), &DpVoiceState::IsMute)
-        .Prop(_SC("IsSelfMute"), &DpVoiceState::IsSelfMute)
-        .Prop(_SC("IsSelfDeaf"), &DpVoiceState::IsSelfDeaf)
-        .Prop(_SC("SelfStream"), &DpVoiceState::SelfStream)
-        .Prop(_SC("SelfVideo"), &DpVoiceState::SelfVideo)
-        .Prop(_SC("IsSuppressed"), &DpVoiceState::IsSuppressed)
-    );
-}
-
-} // Namespace:: SqMod

module/Library/DPP/Other.hpp

@@ -1,607 +0,0 @@
-#pragma once
-
-// ------------------------------------------------------------------------------------------------
-#include "Core/Utility.hpp"
-
-// ------------------------------------------------------------------------------------------------
-#include <chrono>
-
-// ------------------------------------------------------------------------------------------------
-#include <dpp/dpp.h>
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-/* ------------------------------------------------------------------------------------------------
- * Represents the caching policy of the cluster.
-*/
-struct DpCachePolicy
-{
-    SQInteger mUserPolicy{dpp::cp_aggressive};
-    SQInteger mEmojiPolicy{dpp::cp_aggressive};
-    SQInteger mRolePolicy{dpp::cp_aggressive};
-    /* --------------------------------------------------------------------------------------------
-     * Default constructor.
-    */
-    DpCachePolicy() noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    explicit DpCachePolicy(SQInteger user) noexcept
-        : mUserPolicy(user), mEmojiPolicy(dpp::cp_aggressive), mRolePolicy(dpp::cp_aggressive)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    DpCachePolicy(SQInteger user, SQInteger emoji) noexcept
-        : mUserPolicy(user), mEmojiPolicy(emoji), mRolePolicy(dpp::cp_aggressive)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    DpCachePolicy(SQInteger user, SQInteger emoji, SQInteger role) noexcept
-        : mUserPolicy(user), mEmojiPolicy(emoji), mRolePolicy(role)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor.
-    */
-    DpCachePolicy(const DpCachePolicy &) noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Convert to native cache policy type.
-    */
-    SQMOD_NODISCARD dpp::cache_policy_t ToNative() const noexcept
-    {
-        return dpp::cache_policy_t{
-            static_cast< dpp::cache_policy_setting_t >(mUserPolicy),
-            static_cast< dpp::cache_policy_setting_t >(mEmojiPolicy),
-            static_cast< dpp::cache_policy_setting_t >(mRolePolicy)
-        };
-    }
-};
-
-/* ------------------------------------------------------------------------------------------------
- * An activity is a representation of what a user is doing. It might be a game, or a website, or a movie. Whatever.
-*/
-struct DpActivity
-{
-    using Ptr = std::unique_ptr< dpp::activity >;
-    /* --------------------------------------------------------------------------------------------
-     * Referenced activity instance.
-    */
-    Ptr mPtr{nullptr};
-    /* --------------------------------------------------------------------------------------------
-     * Whether the referenced pointer is owned.
-    */
-    bool mOwned{false};
-    /* --------------------------------------------------------------------------------------------
-     * Default constructor.
-    */
-    DpActivity() noexcept
-        : DpActivity(new Ptr::element_type(), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    explicit DpActivity(Ptr::pointer ptr, bool owned = false) noexcept
-        : mPtr(ptr), mOwned(owned)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor.
-    */
-    explicit DpActivity(const Ptr::element_type & o) noexcept
-        : DpActivity(new Ptr::element_type(o), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    explicit DpActivity(Ptr::element_type && o) noexcept
-        : DpActivity(new Ptr::element_type(std::forward< Ptr::element_type >(o)), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    DpActivity(SQInteger type, StackStrF & name, StackStrF & state, StackStrF & url)
-        : DpActivity(new Ptr::element_type(static_cast< dpp::activity_type >(type), name.ToStr(), state.ToStr(), url.ToStr()), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor (disabled).
-    */
-    DpActivity(const DpActivity & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    DpActivity(DpActivity && o) noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Destructor.
-    */
-    ~DpActivity() noexcept { Cleanup(); }
-    /* --------------------------------------------------------------------------------------------
-     * Copy assignment operator (disabled).
-    */
-    DpActivity & operator = (const DpActivity & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move assignment operator.
-    */
-    DpActivity & operator = (DpActivity && o) noexcept
-    {
-        if (this != &o) {
-            Cleanup();
-            // Transfer members values
-            mPtr = std::move(o.mPtr);
-            mOwned = o.mOwned;
-        }
-        return *this;
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Release any referenced resources and default to an empty/invalid state.
-    */
-    void Cleanup()
-    {
-        // Do we own this to try delete it?
-        if (!mOwned && mPtr) {
-            // Not our job, simply forget about it
-            [[maybe_unused]] auto p = mPtr.release();
-        } else mPtr.reset(); // We own this so delete the instance
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle.
-    */
-    void Validate() const { if (!mPtr) STHROWF("Invalid discord activity handle"); }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle and retrieve a const reference to it.
-    */
-    SQMOD_NODISCARD Ptr::element_type & Valid() const { Validate(); return *mPtr; }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether a valid instance is managed.
-    */
-    SQMOD_NODISCARD bool IsValid() const { return static_cast< bool >(mPtr); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the name of the activity.
-    */
-    SQMOD_NODISCARD const std::string & GetName() const { return Valid().name; }
-    /* --------------------------------------------------------------------------------------------
-     * Modify the name of the activity.
-    */
-    void SetName(StackStrF & name) const { Valid().name = name.ToStr(); }
-    /* --------------------------------------------------------------------------------------------
-     * Modify the name of the activity.
-    */
-    DpActivity & ApplyName(StackStrF & name) { SetName(name); return *this; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the state of the activity.
-    */
-    SQMOD_NODISCARD const std::string & GetState() const { return Valid().state; }
-    /* --------------------------------------------------------------------------------------------
-     * Modify the state of the activity.
-    */
-    void SetState(StackStrF & state) const { Valid().state = state.ToStr(); }
-    /* --------------------------------------------------------------------------------------------
-     * Modify the state of the activity.
-    */
-    DpActivity & ApplyState(StackStrF & state) { SetState(state); return *this; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the url of the activity.
-    */
-    SQMOD_NODISCARD const std::string & GetURL() const { return Valid().url; }
-    /* --------------------------------------------------------------------------------------------
-     * Modify the url of the activity.
-    */
-    void SetURL(StackStrF & url) const { Valid().url = url.ToStr(); }
-    /* --------------------------------------------------------------------------------------------
-     * Modify the url of the activity.
-    */
-    DpActivity & ApplyURL(StackStrF & url) { SetURL(url); return *this; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the type of the activity.
-    */
-    SQMOD_NODISCARD SQInteger GetType() const { return static_cast< SQInteger >(Valid().type); }
-    /* --------------------------------------------------------------------------------------------
-     * Modify the type of the activity.
-    */
-    void SetType(SQInteger s) const { Valid().type = static_cast< dpp::activity_type >(s); }
-    /* --------------------------------------------------------------------------------------------
-     * Modify the type of the activity.
-    */
-    DpActivity & ApplyType(SQInteger s) { SetType(s); return *this; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve when the activity was created.
-    */
-    SQMOD_NODISCARD SQInteger GetCreatedAt() const
-    {
-        return static_cast< SQInteger >(std::chrono::duration_cast< std::chrono::seconds >(std::chrono::system_clock::from_time_t(Valid().created_at).time_since_epoch()).count());
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Modify when the activity was created.
-    */
-    void SetCreatedAt(SQInteger s) const
-    {
-        Valid().created_at = std::chrono::system_clock::to_time_t(std::chrono::time_point< std::chrono::system_clock >{std::chrono::seconds{s}});
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Modify when the activity was created.
-    */
-    DpActivity & ApplyCreatedAt(SQInteger s) { SetCreatedAt(s); return *this; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve when the activity was started.
-    */
-    SQMOD_NODISCARD SQInteger GetStart() const
-    {
-        return static_cast< SQInteger >(std::chrono::duration_cast< std::chrono::seconds >(std::chrono::system_clock::from_time_t(Valid().start).time_since_epoch()).count());
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Modify when the activity was started.
-    */
-    void SetStart(SQInteger s) const
-    {
-        Valid().start = std::chrono::system_clock::to_time_t(std::chrono::time_point< std::chrono::system_clock >{std::chrono::seconds{s}});
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Modify when the activity was started.
-    */
-    DpActivity & ApplyStart(SQInteger s) { SetStart(s); return *this; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve when the activity was stopped.
-    */
-    SQMOD_NODISCARD SQInteger GetEnd() const
-    {
-        return static_cast< SQInteger >(std::chrono::duration_cast< std::chrono::seconds >(std::chrono::system_clock::from_time_t(Valid().end).time_since_epoch()).count());
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Modify when the activity was stopped.
-    */
-    void SetEnd(SQInteger s) const
-    {
-        Valid().end = std::chrono::system_clock::to_time_t(std::chrono::time_point< std::chrono::system_clock >{std::chrono::seconds{s}});
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Modify when the activity was stopped.
-    */
-    DpActivity & ApplyEnd(SQInteger s) { SetEnd(s); return *this; }
-};
-
-/* ------------------------------------------------------------------------------------------------
- * Represents user presence, e.g. what game they are playing and if they are online.
-*/
-struct DpPresence
-{
-    using Ptr = std::unique_ptr< dpp::presence >;
-    /* --------------------------------------------------------------------------------------------
-     * Referenced presence instance.
-    */
-    Ptr mPtr{nullptr};
-    /* --------------------------------------------------------------------------------------------
-     * Whether the referenced pointer is owned.
-    */
-    bool mOwned{false};
-    /* --------------------------------------------------------------------------------------------
-     * Default constructor.
-    */
-    DpPresence() noexcept
-        : DpPresence(new Ptr::element_type(), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    explicit DpPresence(Ptr::pointer ptr, bool owned = false) noexcept
-        : mPtr(ptr), mOwned(owned)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor.
-    */
-    explicit DpPresence(const Ptr::element_type & o) noexcept
-        : DpPresence(new Ptr::element_type(o), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    explicit DpPresence(Ptr::element_type && o) noexcept
-        : DpPresence(new Ptr::element_type(std::forward< Ptr::element_type >(o)), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor (disabled).
-    */
-    DpPresence(const DpPresence & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    DpPresence(DpPresence && o) noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Destructor.
-    */
-    ~DpPresence() noexcept { Cleanup(); }
-    /* --------------------------------------------------------------------------------------------
-     * Copy assignment operator (disabled).
-    */
-    DpPresence & operator = (const DpPresence & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move assignment operator.
-    */
-    DpPresence & operator = (DpPresence && o) noexcept
-    {
-        if (this != &o) {
-            Cleanup();
-            // Transfer members values
-            mPtr = std::move(o.mPtr);
-            mOwned = o.mOwned;
-        }
-        return *this;
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Release any referenced resources and default to an empty/invalid state.
-    */
-    void Cleanup()
-    {
-        // Do we own this to try delete it?
-        if (!mOwned && mPtr) {
-            // Not our job, simply forget about it
-            [[maybe_unused]] auto p = mPtr.release();
-        } else mPtr.reset(); // We own this so delete the instance
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle.
-    */
-    void Validate() const { if (!mPtr) STHROWF("Invalid discord presence handle"); }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle and retrieve a const reference to it.
-    */
-    SQMOD_NODISCARD Ptr::element_type & Valid() const { Validate(); return *mPtr; }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether a valid instance is managed.
-    */
-    SQMOD_NODISCARD bool IsValid() const { return static_cast< bool >(mPtr); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the user that the presence applies to.
-    */
-    SQMOD_NODISCARD dpp::snowflake GetUserID() const { return Valid().user_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Modify the user that the presence applies to.
-    */
-    void SetUserID(dpp::snowflake id) const { Valid().user_id = id; }
-    /* --------------------------------------------------------------------------------------------
-     * Modify the user that the presence applies to.
-    */
-    DpPresence & ApplyUserID(dpp::snowflake id) { SetUserID(id); return *this; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the guild that the presence applies to.
-    */
-    SQMOD_NODISCARD dpp::snowflake GetGuildID() const { return Valid().guild_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Modify the guild that the presence applies to.
-    */
-    void SetGuildID(dpp::snowflake id) const { Valid().guild_id = id; }
-    /* --------------------------------------------------------------------------------------------
-     * Modify the guild that the presence applies to.
-    */
-    DpPresence & ApplyGuildID(dpp::snowflake id) { SetGuildID(id); return *this; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the presence bit-mask.
-    */
-    SQMOD_NODISCARD SQInteger GetFlags() const { return static_cast< SQInteger >(Valid().flags); }
-    /* --------------------------------------------------------------------------------------------
-     * Modify the presence bit-mask.
-    */
-    void SetFlags(SQInteger f) const { Valid().flags = static_cast< uint8_t >(f); }
-    /* --------------------------------------------------------------------------------------------
-     * Modify the presence bit-mask.
-    */
-    DpPresence & ApplyFlags(SQInteger f) { SetFlags(f); return *this; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the number of activities.
-    */
-    SQMOD_NODISCARD SQInteger ActivityCount() const { return static_cast< SQInteger >(Valid().activities.size()); }
-    /* --------------------------------------------------------------------------------------------
-     * Add a new activity.
-    */
-    DpPresence & AddActivity(const DpActivity & a) { Valid().activities.push_back(a.Valid()); return *this; }
-    /* --------------------------------------------------------------------------------------------
-     * Iterate all activities.
-    */
-    DpPresence & EachActivity(Function & fn)
-    {
-        for (const auto & a : Valid().activities)
-        {
-            fn.Execute(a);
-        }
-        return *this;
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the number of activities.
-    */
-    DpPresence & ClearActivities(const DpActivity & a) { Valid().activities.clear(); return *this; }
-    /* --------------------------------------------------------------------------------------------
-     * Filter activities.
-    */
-    DpPresence & FilterActivities(Function & fn)
-    {
-        std::vector< dpp::activity > list;
-        // Reserve memory in advance
-        list.reserve(Valid().activities.size());
-        // Process each activity individually
-        for (const auto & a : Valid().activities)
-        {
-            auto ret = fn.Eval(a);
-            // (null || true) == keep & false == skip
-            if (!ret.IsNull() || !ret.template Cast< bool >())
-            {
-                list.push_back(a); // Keep this activity
-            }
-        }
-        // Use filtered activities
-        Valid().activities.swap(list);
-        // Allow chaining
-        return *this;
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Build JSON string from this object.
-    */
-    SQMOD_NODISCARD std::string BuildJSON() const { return Valid().build_json(); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the users status on desktop.
-    */
-    SQMOD_NODISCARD SQInteger GetDesktopStatus() const { return static_cast< SQInteger >(Valid().desktop_status()); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the user's status on web.
-    */
-    SQMOD_NODISCARD SQInteger GetWebStatus() const { return static_cast< SQInteger >(Valid().web_status()); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the user's status on mobile.
-    */
-    SQMOD_NODISCARD SQInteger GetMobileStatus() const { return static_cast< SQInteger >(Valid().mobile_status()); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the user's status as shown to other users.
-    */
-    SQMOD_NODISCARD SQInteger GetStatus() const { return static_cast< SQInteger >(Valid().status()); }
-};
-
-/* ------------------------------------------------------------------------------------------------
- * Represents the voice state of a user on a guild.
- * These are stored in the DpGuild object, and accessible there, or via DpChannel::GetVoiceMembers.
-*/
-struct DpVoiceState
-{
-    using Ptr = std::unique_ptr< dpp::voicestate >;
-    /* --------------------------------------------------------------------------------------------
-     * Referenced voice state instance.
-    */
-    Ptr mPtr{nullptr};
-    /* --------------------------------------------------------------------------------------------
-     * Whether the referenced pointer is owned.
-    */
-    bool mOwned{false};
-    /* --------------------------------------------------------------------------------------------
-     * Default constructor.
-    */
-    DpVoiceState() noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    explicit DpVoiceState(Ptr::pointer ptr, bool owned = false) noexcept
-        : mPtr(ptr), mOwned(owned)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    explicit DpVoiceState(const Ptr::element_type & o) noexcept
-        : DpVoiceState(new Ptr::element_type(o), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    explicit DpVoiceState(Ptr::element_type && o) noexcept
-        : DpVoiceState(new Ptr::element_type(std::forward< Ptr::element_type >(o)), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor (disabled).
-    */
-    DpVoiceState(const DpVoiceState & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    DpVoiceState(DpVoiceState && o) noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Destructor.
-    */
-    ~DpVoiceState() noexcept { Cleanup(); }
-    /* --------------------------------------------------------------------------------------------
-     * Copy assignment operator (disabled).
-    */
-    DpVoiceState & operator = (const DpVoiceState & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move assignment operator.
-    */
-    DpVoiceState & operator = (DpVoiceState && o) noexcept
-    {
-        if (this != &o) {
-            Cleanup();
-            // Transfer members values
-            mPtr = std::move(o.mPtr);
-            mOwned = o.mOwned;
-        }
-        return *this;
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Release any referenced resources and default to an empty/invalid state.
-    */
-    void Cleanup()
-    {
-        // Do we own this to try delete it?
-        if (!mOwned && mPtr) {
-            // Not our job, simply forget about it
-            [[maybe_unused]] auto p = mPtr.release();
-        } else mPtr.reset(); // We own this so delete the instance
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle.
-    */
-    void Validate() const { if (!mPtr) STHROWF("Invalid discord voice state handle"); }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle and retrieve a const reference to it.
-    */
-    SQMOD_NODISCARD Ptr::element_type & Valid() const { Validate(); return *mPtr; }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether a valid instance is managed.
-    */
-    SQMOD_NODISCARD bool IsValid() const { return static_cast< bool >(mPtr); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the guild id this voice state is for (optional).
-    */
-    SQMOD_NODISCARD dpp::snowflake GetGuildID() const { return Valid().guild_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the guild id this voice state is for (optional).
-    */
-    SQMOD_NODISCARD dpp::snowflake GetChannelID() const { return Valid().channel_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the guild id this voice state is for (optional).
-    */
-    SQMOD_NODISCARD dpp::snowflake GetUserID() const { return Valid().user_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the guild id this voice state is for (optional).
-    */
-    SQMOD_NODISCARD const std::string & GetSessionID() const { return Valid().session_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the guild id this voice state is for (optional).
-    */
-    SQMOD_NODISCARD SQInteger GetFlags() const { return Valid().flags; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the guild id this voice state is for (optional).
-    */
-    void SetFlags(SQInteger flags) const { Valid().flags = flags; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the guild id this voice state is for (optional).
-    */
-    SQMOD_NODISCARD std::string BuildJSON() const { return Valid().build_json(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check if user is deafened.
-    */
-    SQMOD_NODISCARD bool IsDeaf() const { return Valid().is_deaf(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check if user is muted.
-    */
-    SQMOD_NODISCARD bool IsMute() const { return Valid().is_mute(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check if user muted themselves.
-    */
-    SQMOD_NODISCARD bool IsSelfMute() const { return Valid().is_self_mute(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check if user deafened themselves.
-    */
-    SQMOD_NODISCARD bool IsSelfDeaf() const { return Valid().is_self_deaf(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check if user is streamig.
-    */
-    SQMOD_NODISCARD bool SelfStream() const { return Valid().self_stream(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check if user is in video.
-    */
-    SQMOD_NODISCARD bool SelfVideo() const { return Valid().self_video(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check if user is surpressed.
-    */
-    SQMOD_NODISCARD bool IsSuppressed() const { return Valid().is_suppressed(); }
-};
-
-/* ------------------------------------------------------------------------------------------------
- * 
-*/
-
-} // Namespace:: SqMod

module/Library/DPP/Role.cpp

@@ -1,74 +0,0 @@
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP/Role.hpp"
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-// ------------------------------------------------------------------------------------------------
-SQMOD_DECL_TYPENAME(SqDppRole, _SC("SqDppRole"))
-
-// ------------------------------------------------------------------------------------------------
-void Register_DPP_Role(HSQUIRRELVM vm, Table & ns)
-{
-    ns.Bind(_SC("Role"),
-        Class< DpRole, NoConstructor< DpRole > >(vm, SqDppRole::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppRole::Fn)
-        .Func(_SC("_tojson"), &DpRole::BuildJSON)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpRole::IsValid)
-        .Prop(_SC("JSON"), &DpRole::BuildJSON)
-        .Prop(_SC("Name"), &DpRole::GetName)
-        .Prop(_SC("GuildID"), &DpRole::GetGuildID)
-        .Prop(_SC("Color"), &DpRole::GetColour)
-        .Prop(_SC("Colour"), &DpRole::GetColour)
-        .Prop(_SC("Position"), &DpRole::GetPosition)
-        .Prop(_SC("Permissions"), &DpRole::GetPermissions)
-        .Prop(_SC("Flags"), &DpRole::GetFlags)
-        .Prop(_SC("IntegrationID"), &DpRole::GetIntegrationID)
-        .Prop(_SC("BotID"), &DpRole::GetBotID)
-        .Prop(_SC("IsHoisted"), &DpRole::IsHoisted)
-        .Prop(_SC("IsMentionable"), &DpRole::IsMentionable)
-        .Prop(_SC("IsManaged"), &DpRole::IsManaged)
-        .Prop(_SC("CanCreateInstantInvite"), &DpRole::CanCreateInstantInvite)
-        .Prop(_SC("CanKickMembers"), &DpRole::CanKickMembers)
-        .Prop(_SC("CanBanMembers"), &DpRole::CanBanMembers)
-        .Prop(_SC("IsAdministrator"), &DpRole::IsAdministrator)
-        .Prop(_SC("CanManageChannels"), &DpRole::CanManageChannels)
-        .Prop(_SC("CanManageGuild"), &DpRole::CanManageGuild)
-        .Prop(_SC("CanAddReactions"), &DpRole::CanAddReactions)
-        .Prop(_SC("CanViewAuditLog"), &DpRole::CanViewAuditLog)
-        .Prop(_SC("IsPrioritySpeaker"), &DpRole::IsPrioritySpeaker)
-        .Prop(_SC("CanStream"), &DpRole::CanStream)
-        .Prop(_SC("CanViewChannel"), &DpRole::CanViewChannel)
-        .Prop(_SC("CanSendMessages"), &DpRole::CanSendMessages)
-        .Prop(_SC("CanSendTtsMessages"), &DpRole::CanSendTtsMessages)
-        .Prop(_SC("CanManageMessages"), &DpRole::CanManageMessages)
-        .Prop(_SC("CanEmbedLinks"), &DpRole::CanEmbedLinks)
-        .Prop(_SC("CanAttachFiles"), &DpRole::CanAttachFiles)
-        .Prop(_SC("CanReadMessageHistory"), &DpRole::CanReadMessageHistory)
-        .Prop(_SC("CanMentionEveryone"), &DpRole::CanMentionEveryone)
-        .Prop(_SC("CanUseExternalEmojis"), &DpRole::CanUseExternalEmojis)
-        .Prop(_SC("CanViewGuildInsights"), &DpRole::CanViewGuildInsights)
-        .Prop(_SC("CanConnect"), &DpRole::CanConnect)
-        .Prop(_SC("CanSpeak"), &DpRole::CanSpeak)
-        .Prop(_SC("CanMuteMembers"), &DpRole::CanMuteMembers)
-        .Prop(_SC("CanDeafenMembers"), &DpRole::CanDeafenMembers)
-        .Prop(_SC("CanMoveMembers"), &DpRole::CanMoveMembers)
-        .Prop(_SC("CanUseVAT"), &DpRole::CanUseVAT)
-        .Prop(_SC("CanChangeNickname"), &DpRole::CanChangeNickname)
-        .Prop(_SC("CanManageNicknames"), &DpRole::CanManageNicknames)
-        .Prop(_SC("CanManageRoles"), &DpRole::CanManageRoles)
-        .Prop(_SC("CanManageWebhooks"), &DpRole::CanManageWebhooks)
-        .Prop(_SC("CanManageEmojis"), &DpRole::CanManageEmojis)
-        .Prop(_SC("CanUseSlashCommands"), &DpRole::CanUseSlashCommands)
-        .Prop(_SC("HasRequestToSpeak"), &DpRole::HasRequestToSpeak)
-        .Prop(_SC("CanManageThreads"), &DpRole::CanManageThreads)
-        .Prop(_SC("HasUsePublicThreads"), &DpRole::HasUsePublicThreads)
-        .Prop(_SC("HasUsePrivateThreads"), &DpRole::HasUsePrivateThreads)
-        // Member Methods
-        .Func(_SC("BuildJSON"), &DpRole::BuildJSON_)
-    );
-}
-
-} // Namespace:: SqMod

module/Library/DPP/Role.hpp

@@ -1,301 +0,0 @@
-#pragma once
-
-// ------------------------------------------------------------------------------------------------
-#include "Core/Utility.hpp"
-
-// ------------------------------------------------------------------------------------------------
-#include <chrono>
-
-// ------------------------------------------------------------------------------------------------
-#include <dpp/dpp.h>
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-/* ------------------------------------------------------------------------------------------------
- * Represents a role within a DpGuild.
-*/
-struct DpRole
-{
-    using Ptr = std::unique_ptr< dpp::role >;
-    /* --------------------------------------------------------------------------------------------
-     * Referenced role instance.
-    */
-    Ptr mPtr{nullptr};
-    /* --------------------------------------------------------------------------------------------
-     * Whether the referenced pointer is owned.
-    */
-    bool mOwned{false};
-    /* --------------------------------------------------------------------------------------------
-     * Default constructor.
-    */
-    DpRole() noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    explicit DpRole(Ptr::pointer ptr, bool owned = false) noexcept
-        : mPtr(ptr), mOwned(owned)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    explicit DpRole(const Ptr::element_type & o) noexcept
-        : DpRole(new Ptr::element_type(o), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    explicit DpRole(Ptr::element_type && o) noexcept
-        : DpRole(new Ptr::element_type(std::forward< Ptr::element_type >(o)), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor (disabled).
-    */
-    DpRole(const DpRole & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    DpRole(DpRole && o) noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Destructor.
-    */
-    ~DpRole() noexcept { Cleanup(); }
-    /* --------------------------------------------------------------------------------------------
-     * Copy assignment operator (disabled).
-    */
-    DpRole & operator = (const DpRole & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move assignment operator.
-    */
-    DpRole & operator = (DpRole && o) noexcept
-    {
-        if (this != &o) {
-            Cleanup();
-            // Transfer members values
-            mPtr = std::move(o.mPtr);
-            mOwned = o.mOwned;
-        }
-        return *this;
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Release any referenced resources and default to an empty/invalid state.
-    */
-    void Cleanup()
-    {
-        // Do we own this to try delete it?
-        if (!mOwned && mPtr) {
-            // Not our job, simply forget about it
-            [[maybe_unused]] auto p = mPtr.release();
-        } else mPtr.reset(); // We own this so delete the instance
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle.
-    */
-    void Validate() const { if (!mPtr) STHROWF("Invalid discord role handle"); }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle and retrieve a const reference to it.
-    */
-    SQMOD_NODISCARD Ptr::element_type & Valid() const { Validate(); return *mPtr; }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether a valid instance is managed.
-    */
-    SQMOD_NODISCARD bool IsValid() const { return static_cast< bool >(mPtr); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve role name.
-    */
-    SQMOD_NODISCARD const std::string & GetName() const { return Valid().name; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the role guild id.
-    */
-    SQMOD_NODISCARD dpp::snowflake GetGuildID() const { return Valid().guild_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the role colour.
-    */
-    SQMOD_NODISCARD SQInteger GetColour() const { return static_cast< SQInteger >(Valid().colour); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the role position.
-    */
-    SQMOD_NODISCARD SQInteger GetPosition() const { return static_cast< SQInteger >(Valid().position); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the role permissions bitmask values from SqDiscordRolePermissions.
-    */
-    SQMOD_NODISCARD SQInteger GetPermissions() const { return static_cast< SQInteger >(Valid().permissions); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the role flags from SqDiscordRoleFlags.
-    */
-    SQMOD_NODISCARD SQInteger GetFlags() const { return static_cast< SQInteger >(Valid().flags); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the role integration id if any (e.g. role is a bot's role created when it was invited).
-    */
-    SQMOD_NODISCARD dpp::snowflake GetIntegrationID() const { return Valid().integration_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the role bot id if any (e.g. role is a bot's role created when it was invited).
-    */
-    SQMOD_NODISCARD dpp::snowflake GetBotID() const { return Valid().bot_id; }
-    /* --------------------------------------------------------------------------------------------
-     * Build a JSON string from this object.
-    */
-    SQMOD_NODISCARD std::string BuildJSON() const { return Valid().build_json(); }
-    /* --------------------------------------------------------------------------------------------
-     * Build a JSON string from this object. If [with_id] is True then ID is to be included in the JSON.
-    */
-    SQMOD_NODISCARD std::string BuildJSON_(bool with_id) const { return Valid().build_json(with_id); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role is hoisted.
-    */
-    SQMOD_NODISCARD bool IsHoisted() const { return Valid().is_hoisted(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role is mentionable.
-    */
-    SQMOD_NODISCARD bool IsMentionable() const { return Valid().is_mentionable(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role is managed (belongs to a bot or application).
-    */
-    SQMOD_NODISCARD bool IsManaged() const { return Valid().is_managed(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has create instant invite permission.
-    */
-    SQMOD_NODISCARD bool CanCreateInstantInvite() const { return Valid().has_create_instant_invite(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the kick members permission.
-    */
-    SQMOD_NODISCARD bool CanKickMembers() const { return Valid().has_kick_members(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the ban members permission.
-    */
-    SQMOD_NODISCARD bool CanBanMembers() const { return Valid().has_ban_members(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the administrator permission.
-    */
-    SQMOD_NODISCARD bool IsAdministrator() const { return Valid().has_administrator(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the manage channels permission.
-    */
-    SQMOD_NODISCARD bool CanManageChannels() const { return Valid().has_manage_channels(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the manage guild permission.
-    */
-    SQMOD_NODISCARD bool CanManageGuild() const { return Valid().has_manage_guild(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the add reactions permission.
-    */
-    SQMOD_NODISCARD bool CanAddReactions() const { return Valid().has_add_reactions(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the view audit log permission.
-    */
-    SQMOD_NODISCARD bool CanViewAuditLog() const { return Valid().has_view_audit_log(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the priority speaker permission.
-    */
-    SQMOD_NODISCARD bool IsPrioritySpeaker() const { return Valid().has_priority_speaker(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the stream permission.
-    */
-    SQMOD_NODISCARD bool CanStream() const { return Valid().has_stream(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the view channel permission.
-    */
-    SQMOD_NODISCARD bool CanViewChannel() const { return Valid().has_view_channel(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the send messages permission.
-    */
-    SQMOD_NODISCARD bool CanSendMessages() const { return Valid().has_send_messages(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the send TTS messages permission.
-    */
-    SQMOD_NODISCARD bool CanSendTtsMessages() const { return Valid().has_send_tts_messages(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the manage messages permission.
-    */
-    SQMOD_NODISCARD bool CanManageMessages() const { return Valid().has_manage_messages(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the embed links permission.
-    */
-    SQMOD_NODISCARD bool CanEmbedLinks() const { return Valid().has_embed_links(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the attach files permission.
-    */
-    SQMOD_NODISCARD bool CanAttachFiles() const { return Valid().has_attach_files(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the read message history permission.
-    */
-    SQMOD_NODISCARD bool CanReadMessageHistory() const { return Valid().has_read_message_history(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the mention \@everyone and \@here permission.
-    */
-    SQMOD_NODISCARD bool CanMentionEveryone() const { return Valid().has_mention_everyone(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the use external emojis permission.
-    */
-    SQMOD_NODISCARD bool CanUseExternalEmojis() const { return Valid().has_use_external_emojis(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the view guild insights permission.
-    */
-    SQMOD_NODISCARD bool CanViewGuildInsights() const { return Valid().has_view_guild_insights(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the connect voice permission.
-    */
-    SQMOD_NODISCARD bool CanConnect() const { return Valid().has_connect(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the speak permission.
-    */
-    SQMOD_NODISCARD bool CanSpeak() const { return Valid().has_speak(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the mute members permission.
-    */
-    SQMOD_NODISCARD bool CanMuteMembers() const { return Valid().has_mute_members(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the deafen members permission.
-    */
-    SQMOD_NODISCARD bool CanDeafenMembers() const { return Valid().has_deafen_members(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the move members permission.
-    */
-    SQMOD_NODISCARD bool CanMoveMembers() const { return Valid().has_move_members(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has use voice activity detection permission.
-    */
-    SQMOD_NODISCARD bool CanUseVAT() const { return Valid().has_use_vad(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the change nickname permission.
-    */
-    SQMOD_NODISCARD bool CanChangeNickname() const { return Valid().has_change_nickname(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the manage nicknames permission.
-    */
-    SQMOD_NODISCARD bool CanManageNicknames() const { return Valid().has_manage_nicknames(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the manage roles permission.
-    */
-    SQMOD_NODISCARD bool CanManageRoles() const { return Valid().has_manage_roles(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the manage webhooks permission.
-    */
-    SQMOD_NODISCARD bool CanManageWebhooks() const { return Valid().has_manage_webhooks(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the manage emojis permission.
-    */
-    SQMOD_NODISCARD bool CanManageEmojis() const { return Valid().has_manage_emojis(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the use slash commands permission.
-    */
-    SQMOD_NODISCARD bool CanUseSlashCommands() const { return Valid().has_use_slash_commands(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the request to speak permission.
-    */
-    SQMOD_NODISCARD bool HasRequestToSpeak() const { return Valid().has_request_to_speak(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the manage threads permission.
-    */
-    SQMOD_NODISCARD bool CanManageThreads() const { return Valid().has_manage_threads(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the use public threads permission.
-    */
-    SQMOD_NODISCARD bool HasUsePublicThreads() const { return Valid().has_use_public_threads(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the role has the use private threads permission.
-    */
-    SQMOD_NODISCARD bool HasUsePrivateThreads() const { return Valid().has_use_private_threads(); }
-};
-
-} // Namespace:: SqMod

module/Library/DPP/User.cpp

@@ -1,48 +0,0 @@
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP/User.hpp"
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-// ------------------------------------------------------------------------------------------------
-SQMOD_DECL_TYPENAME(SqDppUser, _SC("SqDppUser"))
-
-// ------------------------------------------------------------------------------------------------
-void Register_DPP_User(HSQUIRRELVM vm, Table & ns)
-{
-    ns.Bind(_SC("User"),
-        Class< DpUser, NoConstructor< DpUser > >(vm, SqDppUser::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &SqDppUser::Fn)
-        // Member Properties
-        .Prop(_SC("Valid"), &DpUser::IsValid)
-        .Prop(_SC("Username"), &DpUser::GetUsername)
-        .Prop(_SC("Discriminator"), &DpUser::GetDiscriminator)
-        .Prop(_SC("Avatar"), &DpUser::GetAvatar)
-        .Prop(_SC("Flags"), &DpUser::GetFlags)
-        .Prop(_SC("RefCount"), &DpUser::GetRefCount)
-        .Prop(_SC("AvatarURL"), &DpUser::GetAvatarURL)
-        .Prop(_SC("IsBot"), &DpUser::IsBot)
-        .Prop(_SC("IsSystem"), &DpUser::IsSystem)
-        .Prop(_SC("IsMfaEnabled"), &DpUser::IsMfaEnabled)
-        .Prop(_SC("IsVerified"), &DpUser::IsVerified)
-        .Prop(_SC("HasNitroFull"), &DpUser::HasNitroFull)
-        .Prop(_SC("HasNitroClassic"), &DpUser::HasNitroClassic)
-        .Prop(_SC("IsDiscordEmployee"), &DpUser::IsDiscordEmployee)
-        .Prop(_SC("IsPartneredOwner"), &DpUser::IsPartneredOwner)
-        .Prop(_SC("HasHypesquadEvents"), &DpUser::HasHypesquadEvents)
-        .Prop(_SC("IsBughunter1"), &DpUser::IsBughunter1)
-        .Prop(_SC("IsHouseBravery"), &DpUser::IsHouseBravery)
-        .Prop(_SC("IsHouseBrilliance"), &DpUser::IsHouseBrilliance)
-        .Prop(_SC("IsHouseBalanace"), &DpUser::IsHouseBalanace)
-        .Prop(_SC("IsEarlySupporter"), &DpUser::IsEarlySupporter)
-        .Prop(_SC("IsTeamUser"), &DpUser::IsTeamUser)
-        .Prop(_SC("IsBughunter2"), &DpUser::IsBughunter2)
-        .Prop(_SC("IsVerifiedBot"), &DpUser::IsVerifiedBot)
-        .Prop(_SC("IsVerifiedBotDev"), &DpUser::IsVerifiedBotDev)
-        .Prop(_SC("IsCertifiedDoderator"), &DpUser::IsCertifiedDoderator)
-        .Prop(_SC("HasAnimatedIcon"), &DpUser::HasAnimatedIcon)
-    );
-}
-
-} // Namespace:: SqMod

module/Library/DPP/User.hpp

@@ -1,206 +0,0 @@
-#pragma once
-
-// ------------------------------------------------------------------------------------------------
-#include "Core/Utility.hpp"
-
-// ------------------------------------------------------------------------------------------------
-#include <dpp/dpp.h>
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-/* ------------------------------------------------------------------------------------------------
- * Represents a user on discord. May or may not be a member of a DpGuild.
-*/
-struct DpUser
-{
-    using Ptr = std::unique_ptr< dpp::user >;
-    /* --------------------------------------------------------------------------------------------
-     * Referenced user instance.
-    */
-    Ptr mPtr{nullptr};
-    /* --------------------------------------------------------------------------------------------
-     * Whether the referenced pointer is owned.
-    */
-    bool mOwned{false};
-    /* --------------------------------------------------------------------------------------------
-     * Default constructor.
-    */
-    DpUser() noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    explicit DpUser(Ptr::pointer ptr, bool owned = false) noexcept
-        : mPtr(ptr), mOwned(owned)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor.
-    */
-    explicit DpUser(const Ptr::element_type & o) noexcept
-        : DpUser(new Ptr::element_type(o), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    explicit DpUser(Ptr::element_type && o) noexcept
-        : DpUser(new Ptr::element_type(std::forward< Ptr::element_type >(o)), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor (disabled).
-    */
-    DpUser(const DpUser & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    DpUser(DpUser && o) noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Destructor.
-    */
-    ~DpUser() noexcept { Cleanup(); }
-    /* --------------------------------------------------------------------------------------------
-     * Copy assignment operator (disabled).
-    */
-    DpUser & operator = (const DpUser & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move assignment operator.
-    */
-    DpUser & operator = (DpUser && o) noexcept
-    {
-        if (this != &o) {
-            Cleanup();
-            // Transfer members values
-            mPtr = std::move(o.mPtr);
-            mOwned = o.mOwned;
-        }
-        return *this;
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Release any referenced resources and default to an empty/invalid state.
-    */
-    void Cleanup()
-    {
-        // Do we own this to try delete it?
-        if (!mOwned && mPtr) {
-            // Not our job, simply forget about it
-            [[maybe_unused]] auto p = mPtr.release();
-        } else mPtr.reset(); // We own this so delete the instance
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle.
-    */
-    void Validate() const { if (!mPtr) STHROWF("Invalid discord user handle"); }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle and retrieve a const reference to it.
-    */
-    SQMOD_NODISCARD Ptr::element_type & Valid() const { Validate(); return *mPtr; }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether a valid instance is managed.
-    */
-    SQMOD_NODISCARD bool IsValid() const { return static_cast< bool >(mPtr); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve user discord username.
-    */
-    SQMOD_NODISCARD const std::string & GetUsername() const { return Valid().username; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve user discriminator (aka tag), 4 digits usually displayed with leading zeroes.
-    */
-    SQMOD_NODISCARD SQInteger GetDiscriminator() const { return static_cast< SQInteger >(Valid().discriminator); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve user avatar hash.
-    */
-    SQMOD_NODISCARD const dpp::utility::iconhash & GetAvatar() const { return Valid().avatar; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve user flags built from a bitmask of values in dpp::user_flags.
-    */
-    SQMOD_NODISCARD SQInteger GetFlags() const { return static_cast< SQInteger >(Valid().flags); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve user feference count of how many guilds this user is in.
-    */
-    SQMOD_NODISCARD SQInteger GetRefCount() const { return static_cast< SQInteger >(Valid().refcount); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the avatar url of the user object.
-    */
-    SQMOD_NODISCARD std::string GetAvatarURL() const { return Valid().get_avatar_url(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user is a bot.
-    */
-    SQMOD_NODISCARD bool IsBot() const { return Valid().is_bot(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user is a system user (Clyde).
-    */
-    SQMOD_NODISCARD bool IsSystem() const { return Valid().is_system(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user has multi-factor authentication enabled.
-    */
-    SQMOD_NODISCARD bool IsMfaEnabled() const { return Valid().is_mfa_enabled(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user has verified account.
-    */
-    SQMOD_NODISCARD bool IsVerified() const { return Valid().is_verified(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user has full nitro.
-    */
-    SQMOD_NODISCARD bool HasNitroFull() const { return Valid().has_nitro_full(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user has nitro classic.
-    */
-    SQMOD_NODISCARD bool HasNitroClassic() const { return Valid().has_nitro_classic(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user is a discord employee.
-    */
-    SQMOD_NODISCARD bool IsDiscordEmployee() const { return Valid().is_discord_employee(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user owns a partnered server.
-    */
-    SQMOD_NODISCARD bool IsPartneredOwner() const { return Valid().is_partnered_owner(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user has hype-squad events.
-    */
-    SQMOD_NODISCARD bool HasHypesquadEvents() const { return Valid().has_hypesquad_events(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user has the bug-hunter level 1 badge.
-    */
-    SQMOD_NODISCARD bool IsBughunter1() const { return Valid().is_bughunter_1(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user is in house bravery.
-    */
-    SQMOD_NODISCARD bool IsHouseBravery() const { return Valid().is_house_bravery(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user is in house brilliance.
-    */
-    SQMOD_NODISCARD bool IsHouseBrilliance() const { return Valid().is_house_brilliance(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user is in house balance.
-    */
-    SQMOD_NODISCARD bool IsHouseBalanace() const { return Valid().is_house_balanace(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user is an early supporter.
-    */
-    SQMOD_NODISCARD bool IsEarlySupporter() const { return Valid().is_early_supporter(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user is a team user.
-    */
-    SQMOD_NODISCARD bool IsTeamUser() const { return Valid().is_team_user(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user has the bug-hunter level 2 badge.
-    */
-    SQMOD_NODISCARD bool IsBughunter2() const { return Valid().is_bughunter_2(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user has the verified bot badge.
-    */
-    SQMOD_NODISCARD bool IsVerifiedBot() const { return Valid().is_verified_bot(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user is an early verified bot developer.
-    */
-    SQMOD_NODISCARD bool IsVerifiedBotDev() const { return Valid().is_verified_bot_dev(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user is a certified moderator.
-    */
-    SQMOD_NODISCARD bool IsCertifiedDoderator() const { return Valid().is_certified_moderator(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether the user has an animated icon.
-    */
-    SQMOD_NODISCARD bool HasAnimatedIcon() const { return Valid().has_animated_icon(); }
-};
-
-} // Namespace:: SqMod

module/Library/DPP/Utilities.cpp

@@ -1,12 +0,0 @@
-// ------------------------------------------------------------------------------------------------
-#include "Library/DPP/Utilities.hpp"
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-// ------------------------------------------------------------------------------------------------
-
-// ------------------------------------------------------------------------------------------------
-
-
-} // Namespace:: SqMod

module/Library/DPP/Utilities.hpp

@@ -1,429 +0,0 @@
-#pragma once
-
-// ------------------------------------------------------------------------------------------------
-#include "Core/Utility.hpp"
-
-// ------------------------------------------------------------------------------------------------
-#include <dpp/dpp.h>
-
-// ------------------------------------------------------------------------------------------------
-#include <memory>
-
-// ------------------------------------------------------------------------------------------------
-namespace SqMod {
-
-/* ------------------------------------------------------------------------------------------------
- * Wrapper around a std::vector of DPP values.
-*/
-template < class T, class W > struct DpVectorProxy
-{
-    using Ptr = std::unique_ptr< std::vector< T > >;
-    using Vec = std::vector< std::pair< LightObj, W * > >;
-    /* --------------------------------------------------------------------------------------------
-     * Referenced vector instance.
-    */
-    Ptr mPtr{nullptr};
-    /* --------------------------------------------------------------------------------------------
-     * Cached script objects vector.
-    */
-    Vec mVec{};
-    /* --------------------------------------------------------------------------------------------
-     * Whether the referenced pointer is owned.
-    */
-    bool mOwned{false};
-    /* --------------------------------------------------------------------------------------------
-     * Default constructor.
-    */
-    DpVectorProxy() noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    explicit DpVectorProxy(typename Ptr::pointer ptr, bool owned = false)
-        : mPtr(ptr), mVec(), mOwned(owned)
-    { if (mPtr) mVec.resize(mPtr->size()); }
-    /* --------------------------------------------------------------------------------------------
-     * Explicit constructor.
-    */
-    explicit DpVectorProxy(const typename Ptr::element_type & o) noexcept
-        : DpVectorProxy(new typename Ptr::element_type(o), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    explicit DpVectorProxy(typename Ptr::element_type && o) noexcept
-        : DpVectorProxy(new typename Ptr::element_type(std::forward< Ptr::element_type >(o)), true)
-    { }
-    /* --------------------------------------------------------------------------------------------
-     * Copy constructor (disabled).
-    */
-    DpVectorProxy(const DpVectorProxy & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move constructor.
-    */
-    DpVectorProxy(DpVectorProxy && o) noexcept = default;
-    /* --------------------------------------------------------------------------------------------
-     * Destructor.
-    */
-    ~DpVectorProxy() noexcept { Cleanup(); }
-    /* --------------------------------------------------------------------------------------------
-     * Copy assignment operator (disabled).
-    */
-    DpVectorProxy & operator = (const DpVectorProxy & o) = delete;
-    /* --------------------------------------------------------------------------------------------
-     * Move assignment operator.
-    */
-    DpVectorProxy & operator = (DpVectorProxy && o) noexcept
-    {
-        if (this != &o) {
-            Cleanup();
-            // Transfer members values
-            mPtr = std::move(o.mPtr);
-            mVec = std::move(o.mVec);
-            mOwned = o.mOwned;
-        }
-        return *this;
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Release any referenced resources and default to an empty/invalid state.
-    */
-    void Cleanup()
-    {
-        // Invalidate cached instances
-        ClearCache();
-        // Do we own this to try delete it?
-        if (!mOwned && mPtr) {
-            // Not our job, simply forget about it
-            [[maybe_unused]] auto p = mPtr.release();
-        } else mPtr.reset(); // We own this so delete the instance
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle.
-    */
-    void Validate() const { if (!mPtr) STHROWF("Invalid discord vector handle"); }
-    /* --------------------------------------------------------------------------------------------
-     * Validate the managed handle and retrieve a const reference to it.
-    */
-    SQMOD_NODISCARD typename Ptr::element_type & Valid() const { Validate(); return *mPtr; }
-    /* --------------------------------------------------------------------------------------------
-     * Check whether a valid instance is managed.
-    */
-    SQMOD_NODISCARD bool IsValid() const { return static_cast< bool >(mPtr); }
-    /* --------------------------------------------------------------------------------------------
-     * Make sure an index is within range and return the container. Container must exist.
-    */
-    void ValidIdx_(SQInteger i)
-    {
-        if (static_cast< size_t >(i) >= Valid().size())
-        {
-            STHROWF("Invalid vector container index({})", i);
-        }
-    }
-    typename Ptr::element_type & ValidIdx(SQInteger i) { ValidIdx_(i); return *mPtr; }
-    /* --------------------------------------------------------------------------------------------
-     * Make sure an index is within range and return the container. Container must exist.
-    */
-    void ValidIdx_(SQInteger i) const
-    {
-        if (static_cast< size_t >(i) >= Valid().size())
-        {
-            STHROWF("Invalid vector container index({})", i);
-        }
-    }
-    const typename Ptr::element_type & ValidIdx(SQInteger i) const { ValidIdx_(i); return *mPtr; }
-    /* --------------------------------------------------------------------------------------------
-     * Make sure a container instance is referenced and is populated, then return it.
-    */
-    void ValidPop_()
-    {
-        if (Valid().empty())
-        {
-            STHROWF("Vector container is empty");
-        }
-    }
-    typename Ptr::element_type & ValidPop() { ValidPop_(); return *mPtr; }
-    /* --------------------------------------------------------------------------------------------
-     * Make sure a container instance is referenced and is populated, then return it.
-    */
-    void ValidPop_() const
-    {
-        if (Valid().empty())
-        {
-            STHROWF("Vector container is empty");
-        }
-    }
-    const typename Ptr::element_type & ValidPop() const { ValidPop_(); return *mPtr; }
-    /* --------------------------------------------------------------------------------------------
-     * Check if a container instance is referenced.
-    */
-    SQMOD_NODISCARD bool IsNull() const { return !mPtr; }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve a value from the container.
-    */
-    SQMOD_NODISCARD LightObj & Get_(SQInteger i)
-    {
-        // Is the element cached?
-        if (mVec[static_cast< size_t >(i)].first.IsNull())
-        {
-            mVec[static_cast< size_t >(i)] = Obj(&mPtr->at(static_cast< size_t >(i)));
-        }
-        // Return the object from the cache
-        return mVec[static_cast< size_t >(i)].first;
-    }
-    SQMOD_NODISCARD LightObj & Get(SQInteger i)
-    {
-        // Was the referenced vector modified?
-        if (mVec.size() < Valid().size())
-        {
-            // Synchronize the size
-            mVec.resize(mPtr->size());
-            // Synchronize the cache
-            CacheSync();
-        }
-        // Validate index
-        ValidIdx_(i);
-        // Perform the request
-        return Get_(i);
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Modify a value from the container.
-    */
-    void Set(SQInteger i, const W & v) { ValidIdx(i)[static_cast< size_t >(i)] = v.Valid(); }
-    /* --------------------------------------------------------------------------------------------
-     * Check if the container has no elements.
-    */
-    SQMOD_NODISCARD bool Empty() const { return Valid().empty(); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the number of elements in the container.
-    */
-    SQMOD_NODISCARD SQInteger Size() const { return static_cast< SQInteger >(Valid().size()); }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve the number of elements that the container has currently allocated space for.
-    */
-    SQMOD_NODISCARD SQInteger Capacity() const { return static_cast< SQInteger >(Valid().capacity()); }
-    /* --------------------------------------------------------------------------------------------
-     * Synchronize cache container instances.
-    */
-    void CacheSync()
-    {
-        // Invalidate cached instances, if any
-        for (size_t i = 0; i < mVec.size(); ++i)
-        {
-            // Is this element cached?
-            if (mVec[i].second != nullptr)
-            {
-                // Discard previous instance, if any
-                [[maybe_unused]] auto _ = mVec[i].second->mPtr.release();
-                // Sync to new instance
-                mVec[i].second->mPtr.reset(&mPtr->at(i));
-            }
-        }
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Increase the capacity of the container to a value that's greater or equal to the one specified.
-    */
-    DpVectorProxy & Reserve(SQInteger n)
-    {
-        Valid().reserve(ClampL< SQInteger, size_t >(n));
-        mVec.reserve(mPtr->size());
-        CacheSync();
-        return *this;
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Request the removal of unused capacity.
-    */
-    void Compact() { Valid().shrink_to_fit(); CacheSync(); mVec.shrink_to_fit(); }
-    /* --------------------------------------------------------------------------------------------
-     * Erase all elements from the cache container.
-    */
-    void ClearCache()
-    {
-        // Invalidate cached instances, if any
-        for (auto & e : mVec)
-        {
-            // Is this element cached?
-            if (e.second != nullptr)
-            {
-                // Invalidate the instance
-                e.second->Cleanup();
-                // Forget about it
-                e.second = nullptr;
-                // Release script object
-                e.first.Release();
-            }
-        }
-        // Clear the cache vector
-        mVec.clear();
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Erase all elements from the container.
-    */
-    void Clear() { Validate(); ClearCache(); mPtr->clear(); }
-    /* --------------------------------------------------------------------------------------------
-     * Push a value at the back of the container.
-    */
-    void Push(const W & v)
-    {
-        Valid().push_back(v.Valid());
-        mVec.emplace_back();
-        CacheSync();
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Extends the Container by appending all the items in the given container.
-    */
-    void Extend(DpVectorProxy & v)
-    {
-        Valid().insert(Valid().end(), v.Valid().begin(), v.Valid().end());
-        mVec.resize(mPtr->size());
-        CacheSync();
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Pop the last element in the container.
-    */
-    void Pop()
-    {
-        Validate();
-        // Is this element cached?
-        if (mVec.back().second != nullptr)
-        {
-            // Invalidate the instance
-            mVec.back().second->Cleanup();
-            mVec.back().first.Release();
-        }
-        // Safe to remove
-        mPtr->pop_back();
-        mVec.pop_back();
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Erase the element at a certain position.
-    */
-    void EraseAt(SQInteger i)
-    {
-        ValidIdx_(i);
-        // Is this element cached?
-        if (mVec[static_cast< size_t >(i)].second != nullptr)
-        {
-            // Invalidate the instance
-            mVec[static_cast< size_t >(i)].second->Cleanup();
-            mVec[static_cast< size_t >(i)].first.Release();
-        }
-        // Safe to remove
-        mPtr->erase(mPtr->begin() + static_cast< size_t >(i));
-        mVec.erase(mVec.begin() + static_cast< size_t >(i));
-        // Synchronize cache
-        CacheSync();
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Iterate all values through a functor.
-    */
-    void Each(Function & fn)
-    {
-        Validate();
-        // Iterate referenced vector elements
-        for (size_t i = 0; i < mVec.size(); ++i)
-        {
-            fn.Execute(Get(static_cast< SQInteger >(i)));
-        }
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Iterate values in range through a functor.
-    */
-    void EachRange(SQInteger p, SQInteger n, Function & fn)
-    {
-        ValidIdx_(p);
-        ValidIdx_(p + n);
-        // Iterate specified range
-        for (n += p; p < n; ++p)
-        {
-            fn.Execute(Get(static_cast< SQInteger >(p)));
-        }
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Iterate all values through a functor until stopped (i.e false is returned).
-    */
-    void While(Function & fn)
-    {
-        Validate();
-        // Iterate referenced vector elements
-        for (size_t i = 0; i < mVec.size(); ++i)
-        {
-            auto ret = fn.Eval(Get(static_cast< SQInteger >(i)));
-            // (null || true) == continue & false == break
-            if (!ret.IsNull() || !ret.template Cast< bool >())
-            {
-                break;
-            }
-        }
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Iterate values in range through a functor until stopped (i.e false is returned).
-    */
-    void WhileRange(SQInteger p, SQInteger n, Function & fn)
-    {
-        ValidIdx_(p);
-        ValidIdx_(p + n);
-        // Iterate specified range
-        for (n += p; p < n; ++p)
-        {
-            auto ret = fn.Eval(Get(static_cast< SQInteger >(p)));
-            // (null || true) == continue & false == break
-            if (!ret.IsNull() || !ret.template Cast< bool >())
-            {
-                break;
-            }
-        }
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve a wrapped instance as a script object.
-    */
-    SQMOD_NODISCARD static std::pair< LightObj, W * > Obj(T * ptr, bool owned = false)
-    {
-        // Create the wrapper instance for given pointer
-        auto wp = std::make_unique< W >(ptr, false);
-        // Create script object for wrapper instance
-        std::pair< LightObj, W * > p{LightObj{wp.get()}, wp.get()};
-        // Release ownership of the wrapper instance
-        [[maybe_unused]] auto _ = wp.release();
-        // Return the script object and wrapper instance
-        return p;
-    }
-    /* --------------------------------------------------------------------------------------------
-     * Retrieve a wrapped instance as a script object.
-    */
-    SQMOD_NODISCARD static std::pair< LightObj, W * > Obj(const T * ptr, bool owned = false)
-    {
-        return Obj(const_cast< T * >(ptr), owned);
-    }
-};
-
-template < class T, class W, class U > inline void Register_DPP_VectorProxy(HSQUIRRELVM vm, Table & ns, const SQChar * name)
-{
-    using Container = DpVectorProxy< T, W >;
-    // --------------------------------------------------------------------------------------------
-    ns.Bind(name,
-        Class< Container, NoConstructor< Container > >(vm, U::Str)
-        // Meta-methods
-        .SquirrelFunc(_SC("_typename"), &U::Fn)
-        // Properties
-        .Prop(_SC("Null"), &Container::IsNull)
-        .Prop(_SC("Empty"), &Container::Empty)
-        .Prop(_SC("Size"), &Container::Size)
-        .Prop(_SC("Capacity"), &Container::Capacity, &Container::Reserve)
-        // Member Methods
-        .Func(_SC("Get"), &Container::Get)
-        .Func(_SC("Set"), &Container::Set)
-        .Func(_SC("Reserve"), &Container::Reserve)
-        .Func(_SC("Compact"), &Container::Compact)
-        .Func(_SC("Clear"), &Container::Clear)
-        .Func(_SC("Push"), &Container::Push)
-        .Func(_SC("Append"), &Container::Push)
-        .Func(_SC("Extend"), &Container::Extend)
-        .Func(_SC("Pop"), &Container::Pop)
-        .Func(_SC("EraseAt"), &Container::EraseAt)
-        .Func(_SC("Each"), &Container::Each)
-        .Func(_SC("EachRange"), &Container::EachRange)
-        .Func(_SC("While"), &Container::While)
-        .Func(_SC("WhileRange"), &Container::WhileRange)
-    );
-}
-
-} // Namespace:: SqMod

module/Library/IO/Buffer.cpp

@@ -11,6 +11,13 @@
 
 // ------------------------------------------------------------------------------------------------
 #include <Poco/Checksum.h>
+#include <Poco/Base32Encoder.h>
+#include <Poco/Base32Decoder.h>
+#include <Poco/Base64Encoder.h>
+#include <Poco/Base64Decoder.h>
+
+// ------------------------------------------------------------------------------------------------
+#include <sstream>
 
 // ------------------------------------------------------------------------------------------------
 namespace SqMod {
@@ -30,7 +37,7 @@ SQInteger SqBuffer::WriteRawString(StackStrF & val) const
     }
     // Calculate the string length
     Buffer::SzType length = ConvTo< Buffer::SzType >::From(val.mLen);
-    // Write the the string contents
+    // Write the string contents
     m_Buffer->AppendS(val.mPtr, length);
     // Return the length of the written string
     return val.mLen;
@@ -224,7 +231,7 @@ AABB SqBuffer::ReadAABB() const
     // Advance the buffer cursor
     m_Buffer->Advance< AABB >(1);
     // Return the requested information
-    return AABB(value);
+    return {value};
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -237,7 +244,7 @@ Circle SqBuffer::ReadCircle() const
     // Advance the buffer cursor
     m_Buffer->Advance< Circle >(1);
     // Return the requested information
-    return Circle(value);
+    return {value};
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -250,7 +257,7 @@ Color3 SqBuffer::ReadColor3() const
     // Advance the buffer cursor
     m_Buffer->Advance< Color3 >(1);
     // Return the requested information
-    return Color3(value);
+    return {value};
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -263,7 +270,7 @@ Color4 SqBuffer::ReadColor4() const
     // Advance the buffer cursor
     m_Buffer->Advance< Color4 >(1);
     // Return the requested information
-    return Color4(value);
+    return {value};
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -276,7 +283,7 @@ Quaternion SqBuffer::ReadQuaternion() const
     // Advance the buffer cursor
     m_Buffer->Advance< Quaternion >(1);
     // Return the requested information
-    return Quaternion(value);
+    return {value};
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -289,7 +296,7 @@ Sphere SqBuffer::ReadSphere() const
     // Advance the buffer cursor
     m_Buffer->Advance< Sphere >(1);
     // Return the requested information
-    return Sphere(value);
+    return {value};
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -302,7 +309,7 @@ Vector2 SqBuffer::ReadVector2() const
     // Advance the buffer cursor
     m_Buffer->Advance< Vector2 >(1);
     // Return the requested information
-    return Vector2(value);
+    return {value};
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -315,7 +322,7 @@ Vector2i SqBuffer::ReadVector2i() const
     // Advance the buffer cursor
     m_Buffer->Advance< Vector2i >(1);
     // Return the requested information
-    return Vector2i(value);
+    return {value};
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -328,7 +335,7 @@ Vector3 SqBuffer::ReadVector3() const
     // Advance the buffer cursor
     m_Buffer->Advance< Vector3 >(1);
     // Return the requested information
-    return Vector3(value);
+    return {value};
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -341,7 +348,34 @@ Vector4 SqBuffer::ReadVector4() const
     // Advance the buffer cursor
     m_Buffer->Advance< Vector4 >(1);
     // Return the requested information
-    return Vector4(value);
+    return {value};
+}
+
+// ------------------------------------------------------------------------------------------------
+extern SQInteger SqFromNativeJSON(HSQUIRRELVM vm, const char * data, size_t size);
+
+// ------------------------------------------------------------------------------------------------
+SQInteger SqBuffer::GetJSON(HSQUIRRELVM vm) const
+{
+    // Remember the current stack size
+    const SQInteger top = sq_gettop(vm);
+    // Was the JSON string size specified?
+    if (top < 2)
+    {
+        return sq_throwerror(vm, _SC("Please specify the size of the JSON string to parse"));
+    }
+    // Do we even point to a valid buffer?
+    if (!m_Buffer)
+    {
+        return sq_throwerror(vm, _SC("Invalid memory buffer reference"));
+    }
+    // Validate the buffer itself
+    else if (!(*m_Buffer))
+    {
+        return sq_throwerror(vm, _SC("Invalid memory buffer"));
+    }
+    // Attempt to create the JSON object and push it on the stack
+    return SqFromNativeJSON(vm, &m_Buffer->Cursor< char >(), static_cast< size_t >(Var< SQInteger >{vm, 2}.value));
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -352,7 +386,7 @@ SQInteger SqBuffer::GetCRC32(SQInteger n) const
     // Create the checksum computer
     Poco::Checksum c(Poco::Checksum::TYPE_CRC32);
     // Give it the data to process
-    c.update(&m_Buffer->Cursor< char >(), n >= 0 ? static_cast< uint32_t >(n) : m_Buffer->Remaining());
+    c.update(&m_Buffer->Cursor< char >(), ClampRemaining(n));
     // return the result
     return static_cast< SQInteger >(c.checksum());
 }
@@ -365,12 +399,46 @@ SQInteger SqBuffer::GetADLER32(SQInteger n) const
     // Create the checksum computer
     Poco::Checksum c(Poco::Checksum::TYPE_ADLER32);
     // Give it the data to process
-    c.update(&m_Buffer->Cursor< char >(), n >= 0 ? static_cast< uint32_t >(n) : m_Buffer->Remaining());
+    c.update(&m_Buffer->Cursor< char >(), ClampRemaining(n));
     // return the result
     return static_cast< SQInteger >(c.checksum());
 
 }
 
+// ------------------------------------------------------------------------------------------------
+LightObj SqBuffer::GetBase32(SQInteger n) const
+{
+    // Validate the managed buffer reference
+    ValidateDeeper();
+    // Create a string receiver
+    std::ostringstream out;
+    // Create the encoder
+    Poco::Base32Encoder enc(out);
+    // Encode the string
+    enc.write(&m_Buffer->Cursor< char >(), ClampRemaining(n));
+    // Close the encoder
+    enc.close();
+    // Return the resulted string
+    return LightObj{out.str()};
+}
+
+// ------------------------------------------------------------------------------------------------
+LightObj SqBuffer::GetBase64(SQInteger n) const
+{
+    // Validate the managed buffer reference
+    ValidateDeeper();
+    // Create a string receiver
+    std::ostringstream out;
+    // Create the encoder
+    Poco::Base64Encoder enc(out);
+    // Encode the string
+    enc.write(&m_Buffer->Cursor< char >(), ClampRemaining(n));
+    // Close the encoder
+    enc.close();
+    // Return the resulted string
+    return LightObj{out.str()};
+}
+
 // ================================================================================================
 void Register_Buffer(HSQUIRRELVM vm)
 {
@@ -457,6 +525,9 @@ void Register_Buffer(HSQUIRRELVM vm)
         .Func(_SC("ReadVector4"), &SqBuffer::ReadVector4)
         .Func(_SC("CRC32"), &SqBuffer::GetCRC32)
         .Func(_SC("ADLER32"), &SqBuffer::GetADLER32)
+        .Func(_SC("Base32"), &SqBuffer::GetBase32)
+        .Func(_SC("Base64"), &SqBuffer::GetBase64)
+        .SquirrelMethod< SqBuffer, &SqBuffer::GetJSON >(_SC("GetJSON"))
     );
 }
 

module/Library/IO/Buffer.hpp

@@ -193,6 +193,24 @@ public:
         return *m_Buffer;
     }
 
+    /* --------------------------------------------------------------------------------------------
+     * Limit the specified amount at to the range of the cursor and the end of the buffer.
+    */
+    SQMOD_NODISCARD SzType ClampRemaining(SQInteger n) const
+    {
+        // Do we even specify a buffer amount?
+        if (n >= 0)
+        {
+            // Is it within the range we currently have left?
+            if (static_cast< SzType >(n) <= m_Buffer->Remaining())
+            {
+                return static_cast< SzType >(n);
+            }
+        }
+        // Fall back to the actual remaining data
+        return m_Buffer->Remaining();
+    }
+
     /* --------------------------------------------------------------------------------------------
      * Retrieve a certain element type at the specified position.
     */
@@ -276,33 +294,41 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Reposition the edit cursor to the specified number of elements ahead.
     */
-    void Advance(SQInteger n) const
+    SqBuffer & Advance(SQInteger n)
     {
         Valid().Advance(ConvTo< SzType >::From(n));
+        // Allow chaining
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
      * Reposition the edit cursor to the specified number of elements behind.
     */
-    void Retreat(SQInteger n) const
+    SqBuffer & Retreat(SQInteger n)
     {
         Valid().Retreat(ConvTo< SzType >::From(n));
+        // Allow chaining
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
      * Reposition the edit cursor to a fixed position within the buffer.
     */
-    void Move(SQInteger n) const
+    SqBuffer & Move(SQInteger n)
     {
         Valid().Move(ConvTo< SzType >::From(n));
+        // Allow chaining
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
      * Append a value to the current cursor location and advance the cursor.
     */
-    void Push(SQInteger v) const
+    SqBuffer & Push(SQInteger v)
     {
         Valid().Push(ConvTo< Value >::From(v));
+        // Allow chaining
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -396,15 +422,17 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Grow the size of the internal buffer by the specified amount of bytes.
     */
-    void Grow(SQInteger n) const
+    SqBuffer & Grow(SQInteger n)
     {
-        return Valid().Grow(ConvTo< SzType >::From(n) * sizeof(Value));
+        Valid().Grow(ConvTo< SzType >::From(n) * sizeof(Value));
+        // Allow chaining
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
      * Makes sure there is enough capacity to hold the specified element count.
     */
-    void Adjust(SQInteger n)
+    SqBuffer & Adjust(SQInteger n)
     {
         // Validate the managed buffer reference
         Validate();
@@ -420,6 +448,8 @@ public:
         {
             STHROWF("{}", e.what()); // Re-package
         }
+        // Allow chaining
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -752,6 +782,12 @@ public:
     */
     SQMOD_NODISCARD Vector4 ReadVector4() const;
 
+    /* --------------------------------------------------------------------------------------------
+     * Transform a portion of the data in the buffer to a JSON object.
+     * This has the benefit that a temporary string doesn't have to be created.
+    */
+    SQMOD_NODISCARD SQInteger GetJSON(HSQUIRRELVM vm) const;
+
     /* --------------------------------------------------------------------------------------------
      * Compute the CRC-32 checksums on the data in the buffer.
     */
@@ -761,6 +797,16 @@ public:
      * Compute the Adler-32 checksums on the data in the buffer.
     */
     SQMOD_NODISCARD SQInteger GetADLER32(SQInteger n) const;
+
+    /* --------------------------------------------------------------------------------------------
+     * Encode the specified range of data as base32 and return it.
+    */
+    SQMOD_NODISCARD LightObj GetBase32(SQInteger n) const;
+
+    /* --------------------------------------------------------------------------------------------
+     * Encode the specified range of data as base64 and return it.
+    */
+    SQMOD_NODISCARD LightObj GetBase64(SQInteger n) const;
 };
 
 } // Namespace:: SqMod

module/Library/IO/INI.cpp

@@ -381,7 +381,7 @@ void Register_INI(HSQUIRRELVM vm)
         .Func(_SC("Check"), &IniResult::Check)
     );
 
-    inins.Bind(_SC("IniEntries"),
+    inins.Bind(_SC("Entries"),
         Class< IniEntries >(vm, EntriesTypename::Str)
         // Constructors
         .Ctor()
@@ -409,7 +409,7 @@ void Register_INI(HSQUIRRELVM vm)
         .Func(_SC("SortByLoadOrder"), &IniEntries::SortByLoadOrder)
     );
 
-    inins.Bind(_SC("IniDocument"),
+    inins.Bind(_SC("Document"),
         Class< IniDocument, NoCopy< IniDocument > >(vm, DocumentTypename::Str)
         // Constructors
         .Ctor()
@@ -464,7 +464,7 @@ void Register_INI(HSQUIRRELVM vm)
         .Overload< bool (IniDocument::*)(const SQChar *, const SQChar *, const SQChar *, bool) >(_SC("DeleteValue"), &IniDocument::DeleteValue)
     );
 
-    RootTable(vm).Bind(_SC("SqIni"), inins);
+    RootTable(vm).Bind(_SC("SqINI"), inins);
 
     ConstTable(vm).Enum(_SC("SqIniError"), Enumeration(vm)
         .Const(_SC("Ok"),                       int32_t(SI_OK))

module/Library/JSON.cpp

@@ -2,6 +2,7 @@
 #include "Library/JSON.hpp"
 
 // ------------------------------------------------------------------------------------------------
+#include <sajson.h>
 #include <sqratConst.h>
 
 // ------------------------------------------------------------------------------------------------
@@ -11,13 +12,10 @@
 namespace SqMod {
 
 // ------------------------------------------------------------------------------------------------
-static SQInteger SqToJSON(HSQUIRRELVM vm) noexcept
-{
-    return sq_throwerror(vm, _SC("Not implemented yet!"));
-}
+SQMOD_DECL_TYPENAME(SqCtxJSON, _SC("SqCtxJSON"))
 
 // ------------------------------------------------------------------------------------------------
-static SQInteger SqFromJson_Push(HSQUIRRELVM vm, const sajson::value & node) noexcept
+static SQInteger SqFromJson_Push(HSQUIRRELVM vm, const sajson::value & node) noexcept // NOLINT(misc-no-recursion)
 {
     // Operation result
     SQInteger r = SQ_OK;
@@ -151,11 +149,616 @@ static SQInteger SqFromJSON(HSQUIRRELVM vm) noexcept
     return SQ_SUCCEEDED(r) ? 1 : r;
 }
 
+// ------------------------------------------------------------------------------------------------
+SQInteger SqFromNativeJSON(HSQUIRRELVM vm, const char * data, size_t size)
+{
+    // Attempt to parse the specified JSON string
+    const sajson::document & document = sajson::parse(sajson::dynamic_allocation(), sajson::string(data, size));
+    // See if there was an error
+    if (!document.is_valid())
+    {
+        return sq_throwerror(vm, document.get_error_message_as_cstring());
+    }
+    // Process the nodes that were parsed from the string
+    SQInteger r = SqFromJson_Push(vm, document.get_root());
+    // We either have a value to return or we propagate some error
+    return SQ_SUCCEEDED(r) ? 1 : r;
+}
+
+// ------------------------------------------------------------------------------------------------
+CtxJSON & CtxJSON::OpenArray()
+{
+    // Add the array-begin character
+    mOutput.push_back('[');
+    // Go forward one level
+    Advance();
+    // Allow chaining
+    return *this;
+}
+
+// ------------------------------------------------------------------------------------------------
+CtxJSON & CtxJSON::CloseArray()
+{
+    // If the last character is a comma then replace it
+    if (mOutput.back() == ',')
+    {
+        mOutput.back() = ']';
+    }
+    // Append the array-end character
+    else
+    {
+        mOutput.push_back(']');
+    }
+    // Move the comma after the closing character
+    mOutput.push_back(',');
+    // Go back one level
+    Retreat();
+    // Allow chaining
+    return *this;
+}
+
+// ------------------------------------------------------------------------------------------------
+CtxJSON & CtxJSON::ReopenArray()
+{
+    // If the last character is a comma then remove it
+    if (mOutput.back() == ',')
+    {
+        mOutput.pop_back();
+    }
+    // If the last character is the array-end character then replace it with a comma
+    if (mOutput.back() == ']')
+    {
+        mOutput.back() = ',';
+    }
+    // Allow chaining
+    return *this;
+}
+
+// ------------------------------------------------------------------------------------------------
+CtxJSON & CtxJSON::OpenObject()
+{
+    // Add the object-begin character
+    mOutput.push_back('{');
+    // Go forward one level
+    Advance();
+    // Allow chaining
+    return *this;
+}
+
+// ------------------------------------------------------------------------------------------------
+CtxJSON & CtxJSON::CloseObject()
+{
+    // If the last character is a comma then replace it
+    if (mOutput.back() == ',')
+    {
+        mOutput.back() = '}';
+    }
+    // Append the object-end character
+    else
+    {
+        mOutput.push_back('}');
+    }
+    // Move the comma after the closing character
+    mOutput.push_back(',');
+    // Go back one level
+    Retreat();
+    // Allow chaining
+    return *this;
+}
+
+// ------------------------------------------------------------------------------------------------
+CtxJSON & CtxJSON::ReopenObject()
+{
+    // If the last character is a comma then remove it
+    if (mOutput.back() == ',')
+    {
+        mOutput.pop_back();
+    }
+    // If the last character is the object-end character then replace it with a comma
+    if (mOutput.back() == '}')
+    {
+        mOutput.back() = ',';
+    }
+    // Allow chaining
+    return *this;
+}
+
+// ------------------------------------------------------------------------------------------------
+CtxJSON & CtxJSON::MakeKey()
+{
+    // If the last character is a comma then replace it
+    if (mOutput.back() == ',')
+    {
+        mOutput.back() = ':';
+    }
+    // Append the array-end character
+    else
+    {
+        mOutput.push_back(':');
+    }
+    // Allow the hook to react
+    if (mKeyHook)
+    {
+        mKeyHook(*this);
+    }
+    // Allow chaining
+    return *this;
+}
+
+// ------------------------------------------------------------------------------------------------
+bool CtxJSON::CheckWeakRefWrap(HSQUIRRELVM vm, SQInteger idx) noexcept
+{
+    SQRESULT r = sq_getweakrefval(vm, idx);
+    // Whether the type doesn't have to be wrapped
+    bool w = true;
+    // Attempt to grab the value pointed by the weak reference
+    if (SQ_SUCCEEDED(r))
+    {
+        // Attempt to serialize the actual value
+        w = sq_gettype(vm, -1) != OT_TABLE && sq_gettype(vm, -1) != OT_ARRAY && sq_gettype(vm, -1) == OT_INSTANCE;
+        // Pop the referenced value
+        sq_poptop(vm);
+    }
+    // Wrap the value by default
+    return w;
+}
+
+// ------------------------------------------------------------------------------------------------
+SQRESULT CtxJSON::SerializeParams(HSQUIRRELVM vm)
+{
+    bool wrap_everything_in_array = false;
+    // Clear the output buffer if necessary
+    mOutput.clear();
+    mDepth = 0;
+    // Fetch the number of objects on the stack
+    const auto top = sq_gettop(vm);
+    // If there's more than one argument then they all get wrapped inside an array
+    // If there is one argument and is not an array, table or instance then do the same
+    if (top > 2 || (sq_gettype(vm, 2) != OT_TABLE &&
+                    sq_gettype(vm, 2) != OT_ARRAY &&
+                    sq_gettype(vm, 2) != OT_INSTANCE &&
+                    CheckWeakRefWrap(vm, 2)))
+    {
+        wrap_everything_in_array = true;
+        // Open an array
+        OpenArray();
+    }
+    // Serialize every specified argument
+    for (SQInteger i = 2; i <= top; ++i)
+    {
+        if (SQRESULT r = SerializeAt(vm, i); SQ_FAILED(r))
+        {
+            return r; // Propagate the error
+        }
+    }
+    // Was everything wrapped inside an array?
+    if (wrap_everything_in_array)
+    {
+        CloseArray();
+    }
+    // Remove trailing separator, if any
+    if (mOutput.back() == ',')
+    {
+        mOutput.pop_back();
+    }
+    // Push the output string on the stack
+    sq_pushstring(vm, mOutput.c_str(), static_cast< SQInteger >(mOutput.size()));
+    // Specify that we have a value on the stack
+    return 1;
+}
+
+// ------------------------------------------------------------------------------------------------
+SQRESULT CtxJSON::SerializeAt(HSQUIRRELVM vm, SQInteger idx) // NOLINT(misc-no-recursion)
+{
+    // Identify object type
+    switch (sq_gettype(vm, idx))
+    {
+        case OT_NULL: {
+            PushNull();
+        } break;
+        case OT_INTEGER: {
+            SQInteger v;
+            // Attempt to retrieve the value from the stack
+            if (SQRESULT r = sq_getinteger(vm, idx, &v); SQ_FAILED(r))
+            {
+                return r; // Propagate the error
+            }
+            // Write the value in the output
+            PushInteger(v);
+        } break;
+        case OT_FLOAT: {
+            SQFloat v;
+            // Attempt to retrieve the value from the stack
+            if (SQRESULT r = sq_getfloat(vm, idx, &v); SQ_FAILED(r))
+            {
+                return r; // Propagate the error
+            }
+            // Write the value in the output
+        #ifdef SQUSEDOUBLE
+            PushDouble(v);
+        #else
+            PushFloat(v);
+        #endif
+        } break;
+        case OT_BOOL: {
+            SQBool v;
+            // Attempt to retrieve the value from the stack
+            if (SQRESULT r = sq_getbool(vm, idx, &v); SQ_FAILED(r))
+            {
+                return r; // Propagate the error
+            }
+            // Write the value in the output
+            PushBool(v != SQFalse);
+        } break;
+        case OT_STRING: {
+            const SQChar * v = nullptr;
+            SQInteger n = 0;
+            // Attempt to retrieve and convert the string
+            if (SQRESULT r = sq_getstringandsize(vm, idx, &v, &n); SQ_FAILED(r))
+            {
+                return r; // Propagate the error
+            }
+            // Write the value in the output
+            PushString(v, static_cast< size_t >(n));
+        } break;
+        case OT_TABLE: {
+            if (SQRESULT r = SerializeTable(vm, idx); SQ_FAILED(r))
+            {
+                return r; // Propagate the error
+            }
+        } break;
+        case OT_ARRAY: {
+            if (SQRESULT r = SerializeArray(vm, idx); SQ_FAILED(r))
+            {
+                return r; // Propagate the error
+            }
+        } break;
+        case OT_INSTANCE: {
+            if (SQRESULT r = SerializeInstance(vm, idx); SQ_FAILED(r))
+            {
+                return r; // Propagate the error
+            }
+        } break;
+        case OT_WEAKREF: {
+            if (SQRESULT r = SerializeWeakRef(vm, idx); SQ_FAILED(r))
+            {
+                return r; // Propagate the error
+            }
+        } break;
+        case OT_USERDATA:
+        case OT_CLOSURE:
+        case OT_NATIVECLOSURE:
+        case OT_GENERATOR:
+        case OT_USERPOINTER:
+        case OT_THREAD:
+        case OT_FUNCPROTO:
+        case OT_CLASS:
+        case OT_OUTER:
+            return sq_throwerrorf(vm, _SC("Type (%s) is not serializable"), SqTypeName(sq_gettype(vm, 2)));
+    }
+    // Serialization was successful
+    return SQ_OK;
+}
+
+// ------------------------------------------------------------------------------------------------
+SQRESULT CtxJSON::SerializeArray(HSQUIRRELVM vm, SQInteger idx) // NOLINT(misc-no-recursion)
+{
+    // Begin array scope
+    OpenArray();
+    // Push null to initiate iteration
+    sq_pushnull(vm);
+    // So we can use absolute stack indexes to avoid errors
+    const auto top = sq_gettop(vm);
+    // Start iterating the array at the specified position in the stack
+    for(SQRESULT r = SQ_OK; SQ_SUCCEEDED(sq_next(vm, idx));)
+    {
+        // Attempt serialization of the currently iterated value
+        r = SerializeAt(vm, top + 2);
+        // Check for failures
+        if (SQ_FAILED(r))
+        {
+            // Pop the null iterator, key and value from the stack
+            sq_pop(vm, 3);
+            // Propagate the error
+            return r;
+        }
+        // Pop the key and value from the stack (i.e. cleanup after `sq_next`)
+        sq_pop(vm, 2);
+    }
+    // Pop the null iterator
+    sq_poptop(vm);
+    // Close array scope
+    CloseArray();
+    // Serialization was successful
+    return SQ_OK;
+}
+
+// ------------------------------------------------------------------------------------------------
+SQRESULT CtxJSON::SerializeTable(HSQUIRRELVM vm, SQInteger idx) // NOLINT(misc-no-recursion)
+{
+    // Begin object scope
+    OpenObject();
+    // Push null to initiate iteration
+    sq_pushnull(vm);
+    // So we can use absolute stack indexes to avoid errors
+    const auto top = sq_gettop(vm);
+    // Start iterating the object at the specified position in the stack
+    for(SQRESULT r = SQ_OK; SQ_SUCCEEDED(sq_next(vm, idx));)
+    {
+        if (sq_gettype(vm, -2) == OT_STRING)
+        {
+            // Attempt serialization of the currently iterated element key
+            r = SerializeAt(vm, top + 1);
+            // Can we proceed with the value?
+            if (SQ_SUCCEEDED(r))
+            {
+                // Mark the value above as the key of this element and
+                // attempt serialization of the currently iterated element value
+                r = MakeKey().SerializeAt(vm, top + 2);
+            }
+        }
+        else
+        {
+            r = sq_throwerror(vm, _SC("Only string values are accepted as object keys"));
+        }
+        // Check for failures
+        if (SQ_FAILED(r))
+        {
+            // Pop the null iterator, key and value from the stack
+            sq_pop(vm, 3);
+            // Propagate the error
+            return r;
+        }
+        // Pop the key and value from the stack (i.e. cleanup after `sq_next`)
+        sq_pop(vm, 2);
+    }
+    // Pop the null iterator
+    sq_poptop(vm);
+    // Close object scope
+    CloseObject();
+    // Serialization was successful
+    return SQ_OK;
+}
+
+// ------------------------------------------------------------------------------------------------
+SQRESULT CtxJSON::SerializeInstance(HSQUIRRELVM vm, SQInteger idx)
+{
+    sq_pushstring(vm, mMetaMethod.c_str(), static_cast< SQInteger >(mMetaMethod.size()));
+    // Attempt to retrieve the meta-method from the instance
+    if(SQRESULT r = sq_get(vm, idx); SQ_FAILED(r))
+    {
+        return r; // Propagate the error
+    }
+    // Make sure this is actually a closure/function that we can invoke
+    else if (const auto t = sq_gettype(vm, -1); t != OT_CLOSURE && t != OT_NATIVECLOSURE)
+    {
+        // Remove whatever is on the stack
+        sq_poptop(vm);
+        // Abort the operation as we can't do anything about it
+        return sq_throwerrorf(vm, _SC("`_tojson` meta-method is not a closure for type (%s)"), SqTypeName(vm, idx).c_str());
+    }
+    // Push the instance itself the stack (the environment)
+    sq_push(vm, idx);
+    // Push this instance on the stack (the json context)
+    ClassType< CtxJSON >::PushInstance(vm, this);
+    // Invoke the function to perform the conversion in this context
+    SQRESULT r = sq_call(vm, 2, SQFalse, SQFalse);
+    // Remove the closure from the stack
+    sq_poptop(vm);
+    // Propagate the result, whatever that is
+    return r;
+}
+
+// ------------------------------------------------------------------------------------------------
+SQRESULT CtxJSON::SerializeWeakRef(HSQUIRRELVM vm, SQInteger idx) // NOLINT(misc-no-recursion)
+{
+    SQRESULT r = sq_getweakrefval(vm, idx);
+    // Attempt to grab the value pointed by the weak reference
+    if (SQ_SUCCEEDED(r))
+    {
+        // Attempt to serialize the actual value
+        r = SerializeAt(vm, sq_gettop(vm));
+        // Pop the referenced value
+        sq_poptop(vm);
+    }
+    // Propagate the error, if any
+    return r;
+}
+
+// ------------------------------------------------------------------------------------------------
+SQRESULT CtxJSON::PushValues(HSQUIRRELVM vm)
+{
+    // Fetch the number of objects on the stack
+    const auto top = sq_gettop(vm);
+    // Do we have a value?
+    if (top < 2)
+    {
+        return sq_throwerror(vm, _SC("Must specify at least one value to be pushed"));
+    }
+    // Serialize every specified argument
+    for (SQInteger i = 2; i <= top; ++i)
+    {
+        if (SQRESULT r = SerializeAt(vm, i); SQ_FAILED(r))
+        {
+            return r; // Propagate the error
+        }
+    }
+    // Allow chaining
+    sq_push(vm, 1);
+    // Specify that a value was returned
+    return 1;
+}
+
+// ------------------------------------------------------------------------------------------------
+SQRESULT CtxJSON::PushElement(HSQUIRRELVM vm)
+{
+    // Fetch the number of objects on the stack
+    const auto top = sq_gettop(vm);
+    // Do we have a value?
+    if (top < 3)
+    {
+        return sq_throwerrorf(vm, _SC("Not enough parameters. Received %lld but %lld needed"), top-1, 2);
+    }
+    else if (sq_gettype(vm, 2) != OT_STRING)
+    {
+        return sq_throwerrorf(vm, _SC("Element key must be a string"));
+    }
+    // Attempt serialization of the currently iterated element key
+    if (SQRESULT r = SerializeAt(vm, 2); SQ_SUCCEEDED(r))
+    {
+        // Mark the value above as the key of this element and
+        // attempt serialization of the currently iterated element value
+        r = MakeKey().SerializeAt(vm, 3);
+        // Check for failures
+        if (SQ_FAILED(r))
+        {
+            return r; // Propagate the error
+        }
+    }
+    // Allow chaining
+    sq_push(vm, 1);
+    // Specify that a value was returned
+    return 1;
+}
+
+// ------------------------------------------------------------------------------------------------
+CtxJSON & CtxJSON::PushKey(StackStrF & key)
+{
+    // Validate the string value
+    if (key.mLen >= 0 && SQ_SUCCEEDED(key.mRes))
+    {
+        PushString(key.mPtr, static_cast< size_t >(key.mLen));
+        MakeKey();
+    }
+    else
+    {
+        STHROWF("Invalid object key");
+    }
+    // Allow chaining
+    return *this;
+}
+
+// ------------------------------------------------------------------------------------------------
+void CtxJSON::PushNull()
+{
+    mOutput.append("null,");
+}
+
+// ------------------------------------------------------------------------------------------------
+void CtxJSON::PushInteger(SQInteger value)
+{
+    fmt::format_int f(value);
+    // Append the formatted integer to the buffer
+    mOutput.append(f.data(), f.size());
+    mOutput.push_back(',');
+}
+
+// ------------------------------------------------------------------------------------------------
+void CtxJSON::PushFloat(float value)
+{
+    fmt::format_to(std::back_inserter(mOutput), "{},", value);
+}
+
+// ------------------------------------------------------------------------------------------------
+void CtxJSON::PushDouble(double value)
+{
+    fmt::format_to(std::back_inserter(mOutput), "{},", value);
+}
+
+// ------------------------------------------------------------------------------------------------
+void CtxJSON::PushBool(bool value)
+{
+    if (value)
+    {
+        mOutput.append("true,", 5);
+    }
+    else
+    {
+        mOutput.append("false,", 6);
+    }
+}
+
+// ------------------------------------------------------------------------------------------------
+void CtxJSON::PushString(const SQChar * str)
+{
+    mOutput.push_back('"');
+    mOutput.append(str);
+    mOutput.push_back('"');
+    mOutput.push_back(',');
+    // Allow the hook to know
+    mString.assign(str);
+}
+
+// ------------------------------------------------------------------------------------------------
+void CtxJSON::PushString(const SQChar * str, size_t length)
+{
+    mOutput.push_back('"');
+    mOutput.append(str, length);
+    mOutput.push_back('"');
+    mOutput.push_back(',');
+    // Allow the hook to know
+    mString.assign(str, length);
+}
+
+// ------------------------------------------------------------------------------------------------
+static SQInteger SqToJSON(HSQUIRRELVM vm) noexcept
+{
+    // Make sure the instance is cleaned up even in the case of exceptions
+    DeleteGuard< CtxJSON > sq_dg(new CtxJSON());
+    // Remember the instance, so we don't have to cast the script object back
+    auto ctx = sq_dg.Get();
+    // Turn it into a script object because it may be passed as a parameter to `_tojson` meta-methods
+    LightObj obj(sq_dg, vm);
+    // Proceed with the serialization
+    return ctx->SerializeParams(vm);
+}
+
+// ------------------------------------------------------------------------------------------------
+static SQInteger SqToCompactJSON(HSQUIRRELVM vm) noexcept
+{
+    // Make sure the instance is cleaned up even in the case of exceptions
+    DeleteGuard< CtxJSON > sq_dg(new CtxJSON(false));
+    // Remember the instance, so we don't have to cast the script object back
+    auto ctx = sq_dg.Get();
+    // Turn it into a script object because it may be passed as a parameter to `_tojson` meta-methods
+    LightObj obj(sq_dg, vm);
+    // Proceed with the serialization
+    return ctx->SerializeParams(vm);
+}
+
 // ================================================================================================
 void Register_JSON(HSQUIRRELVM vm)
 {
     RootTable(vm).SquirrelFunc(_SC("SqToJSON"), SqToJSON);
+    RootTable(vm).SquirrelFunc(_SC("SqToCompactJSON"), SqToCompactJSON);
     RootTable(vm).SquirrelFunc(_SC("SqFromJSON"), SqFromJSON);
+    // --------------------------------------------------------------------------------------------
+    RootTable(vm).Bind(_SC("SqCtxJSON"),
+        Class< CtxJSON, NoCopy< CtxJSON > >(vm, SqCtxJSON::Str)
+        // Constructors
+        .Ctor()
+        .Ctor< bool >()
+        .Ctor< bool, StackStrF & >()
+        // Meta-methods
+        .SquirrelFunc(_SC("_typename"), &SqCtxJSON::Fn)
+        // Properties
+        .Prop(_SC("Output"), &CtxJSON::GetOutput)
+        .Prop(_SC("Depth"), &CtxJSON::GetDepth)
+        .Prop(_SC("OOA"), &CtxJSON::GetObjectOverArray, &CtxJSON::SetObjectOverArray)
+        .Prop(_SC("ObjectOverArray"), &CtxJSON::GetObjectOverArray, &CtxJSON::SetObjectOverArray)
+        // Member Methods
+        .SquirrelMethod< CtxJSON, &CtxJSON::SerializeParams >(_SC("Serialize"))
+        .SquirrelMethod< CtxJSON, &CtxJSON::PushValues >(_SC("PushValues"))
+        .SquirrelMethod< CtxJSON, &CtxJSON::PushElement >(_SC("PushElement"))
+        .Func(_SC("OpenArray"), &CtxJSON::OpenArray)
+        .Func(_SC("CloseArray"), &CtxJSON::CloseArray)
+        .Func(_SC("OpenObject"), &CtxJSON::OpenObject)
+        .Func(_SC("CloseObject"), &CtxJSON::CloseObject)
+        .Func(_SC("MakeKey"), &CtxJSON::MakeKey)
+        .FmtFunc(_SC("PushKey"), &CtxJSON::PushKey)
+        .Func(_SC("SetOOA"), &CtxJSON::SetObjectOverArray)
+        .Func(_SC("SetObjectOverArray"), &CtxJSON::SetObjectOverArray)
+    );
 }
 
 } // Namespace:: SqMod

module/Library/JSON.hpp

@@ -5,12 +5,281 @@
 #include "Library/IO/Buffer.hpp"
 
 // ------------------------------------------------------------------------------------------------
-#include <sajson.h>
+#include <functional>
+
+// ------------------------------------------------------------------------------------------------
+#include <fmt/args.h>
+#include <fmt/format.h>
+#include <fmt/xchar.h>
 
 // ------------------------------------------------------------------------------------------------
 namespace SqMod {
 
-// ------------------------------------------------------------------------------------------------
+/* ------------------------------------------------------------------------------------------------
+ * JSON serializer. The generated JSON output is always minified for efficiency reasons.
+*/
+struct CtxJSON
+{
+    /* --------------------------------------------------------------------------------------------
+     * Output string.
+    */
+    String mOutput{};
 
+    /* --------------------------------------------------------------------------------------------
+     * Prefer a table with named members even when a simple array would do the job.
+     * Take a Vector3 for example. Compact array [x, y, z] or named object {x: #.#, y: #.#, z: #.#}
+    */
+    bool mObjectOverArray{true};
+
+    /* --------------------------------------------------------------------------------------------
+     * How nested are we currently.
+    */
+    uint32_t mDepth{0};
+
+    /* --------------------------------------------------------------------------------------------
+     * The meta-method name to use on objects.
+    */
+    String mMetaMethod{"_tojson"};
+
+    /* --------------------------------------------------------------------------------------------
+     * Last pushed string value. Can be used to heck for key name in the hook.
+    */
+    String mString{};
+
+    /* --------------------------------------------------------------------------------------------
+     * Internal utility used to monitor the existence of certain keys to allow overloading.
+    */
+    std::function< void(CtxJSON&) > mKeyHook{};
+
+    /* --------------------------------------------------------------------------------------------
+     * Default constructor.
+    */
+    CtxJSON() = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Explicit constructor.
+    */
+    explicit CtxJSON(bool ooa)
+        : CtxJSON()
+    {
+        mObjectOverArray = ooa;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Explicit constructor.
+    */
+    CtxJSON(bool ooa, StackStrF & mmname)
+        : CtxJSON()
+    {
+        mObjectOverArray = ooa;
+        // Allow custom metamethod names
+        mMetaMethod.assign(mmname.mPtr, static_cast< size_t >(mmname.mLen));
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Internal constructor.
+    */
+    explicit CtxJSON(std::function< void(CtxJSON&) > && kh)
+        : CtxJSON()
+    {
+        mKeyHook = std::move(kh);
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy constructor.
+    */
+    CtxJSON(const CtxJSON &) = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Move constructor.
+    */
+    CtxJSON(CtxJSON &&) noexcept = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Destructor.
+    */
+    ~CtxJSON() = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy assignment operator.
+    */
+    CtxJSON & operator = (const CtxJSON &) = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Move assignment operator.
+    */
+    CtxJSON & operator = (CtxJSON &&) noexcept = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve the current depth.
+    */
+    SQMOD_NODISCARD const String & GetOutput() const noexcept
+    {
+        return mOutput;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve the current depth.
+    */
+    SQMOD_NODISCARD SQInteger GetDepth() const noexcept
+    {
+        return mDepth;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve whether objects are preferred over arrays.
+    */
+    SQMOD_NODISCARD bool GetObjectOverArray() const noexcept
+    {
+        return mObjectOverArray;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve whether objects are preferred over arrays.
+    */
+    CtxJSON & SetObjectOverArray(bool toggle) noexcept
+    {
+        mObjectOverArray = toggle;
+        // Allow chaining
+        return *this;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Increase indentation by one level.
+    */
+    void Advance() noexcept
+    {
+        ++mDepth;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Decrease indentation by one level.
+    */
+    void Retreat() noexcept
+    {
+        assert(mDepth > 0);
+        if (mDepth) --mDepth;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Begin writing an array.
+    */
+    CtxJSON & OpenArray();
+
+    /* --------------------------------------------------------------------------------------------
+     * Stop writing an array.
+    */
+    CtxJSON & CloseArray();
+
+    /* --------------------------------------------------------------------------------------------
+     * Resume writing an array.
+    */
+    CtxJSON & ReopenArray();
+
+    /* --------------------------------------------------------------------------------------------
+     * Begin writing an object.
+    */
+    CtxJSON & OpenObject();
+
+    /* --------------------------------------------------------------------------------------------
+     * Stop writing an object.
+    */
+    CtxJSON & CloseObject();
+
+    /* --------------------------------------------------------------------------------------------
+     * Resume writing an object.
+    */
+    CtxJSON & ReopenObject();
+
+    /* --------------------------------------------------------------------------------------------
+     * Begin writing a key value.
+    */
+    CtxJSON & MakeKey();
+
+    /* --------------------------------------------------------------------------------------------
+     * Check whether the specified weak-ref points to a type of value that must be wrapped.
+    */
+    SQMOD_NODISCARD static bool CheckWeakRefWrap(HSQUIRRELVM vm, SQInteger idx) noexcept;
+
+    /* --------------------------------------------------------------------------------------------
+     * Serialize given arguments.
+    */
+    SQRESULT SerializeParams(HSQUIRRELVM vm);
+
+    /* --------------------------------------------------------------------------------------------
+     * Serialize the value a specific position in the stack.
+    */
+    SQRESULT SerializeAt(HSQUIRRELVM vm, SQInteger idx);
+
+    /* --------------------------------------------------------------------------------------------
+     * Serialize the array a specific position in the stack. Stack index must be absolute!
+    */
+    SQRESULT SerializeArray(HSQUIRRELVM vm, SQInteger idx);
+
+    /* --------------------------------------------------------------------------------------------
+     * Serialize the table a specific position in the stack. Stack index must be absolute!
+    */
+    SQRESULT SerializeTable(HSQUIRRELVM vm, SQInteger idx);
+
+    /* --------------------------------------------------------------------------------------------
+     * Serialize the instance a specific position in the stack. Stack index must be absolute!
+    */
+    SQRESULT SerializeInstance(HSQUIRRELVM vm, SQInteger idx);
+
+    /* --------------------------------------------------------------------------------------------
+     * Serialize the weak-ref a specific position in the stack. Stack index must be absolute!
+    */
+    SQRESULT SerializeWeakRef(HSQUIRRELVM vm, SQInteger idx);
+
+    /* --------------------------------------------------------------------------------------------
+     * Serialize a value to the current container. It assumes an array or object is currently open.
+    */
+    SQRESULT PushValues(HSQUIRRELVM vm);
+
+    /* --------------------------------------------------------------------------------------------
+     * Serialize a key/value pair to the current object. It assumes an object is currently open.
+    */
+    SQRESULT PushElement(HSQUIRRELVM vm);
+
+    /* --------------------------------------------------------------------------------------------
+     * Push a key in the output. It assumes an object was open and previous element closed properly.
+    */
+    CtxJSON & PushKey(StackStrF & key);
+
+    /* --------------------------------------------------------------------------------------------
+     * Write a null value to the output.
+    */
+    void PushNull();
+
+    /* --------------------------------------------------------------------------------------------
+     * Write an integer value to the output.
+    */
+    void PushInteger(SQInteger value);
+
+    /* --------------------------------------------------------------------------------------------
+     * Write a single precision floating point value to the output.
+    */
+    void PushFloat(float value);
+
+    /* --------------------------------------------------------------------------------------------
+     * Write a double precision floating point value to the output.
+    */
+    void PushDouble(double value);
+
+    /* --------------------------------------------------------------------------------------------
+     * Write a boolean value to the output.
+    */
+    void PushBool(bool value);
+
+    /* --------------------------------------------------------------------------------------------
+     * Write a string value to the output.
+    */
+    void PushString(const SQChar * str);
+
+    /* --------------------------------------------------------------------------------------------
+     * Write a string value to the output.
+    */
+    void PushString(const SQChar * str, size_t length);
+};
 
 } // Namespace:: SqMod

module/Library/Net.cpp

@@ -22,6 +22,8 @@ void InitializeNet()
 #endif
 #ifndef NO_SSL
     f |= MG_FEATURES_SSL;
+#else
+    OutputMessage("Network compiled without SSL support.");
 #endif
 #ifndef NO_CGI
     f |= MG_FEATURES_CGI;
@@ -89,6 +91,9 @@ WebSocketClient & WebSocketClient::Connect()
     {
         STHROWF("Connection failed: {}", err_buf);
     }
+    // Reset memebrs
+    mClosing.store(false);
+    mClosed.store(false);
     // Allow chaining
     return *this;
 }
@@ -113,6 +118,9 @@ WebSocketClient & WebSocketClient::ConnectExt()
     {
         STHROWF("Connection failed: {}", err_buf);
     }
+    // Reset memebrs
+    mClosing.store(false);
+    mClosed.store(false);
     // Allow chaining
     return *this;
 }
@@ -129,6 +137,11 @@ int WebSocketClient::DataHandler(int flags, char * data, size_t data_len) noexce
     {
         LogFtl("Failed to queue web-socket data");
     }
+    // Should we auto-close the connection
+    if (((flags & 0xF) == MG_WEBSOCKET_OPCODE_CONNECTION_CLOSE) && mAutoClose.load() == true)
+    {
+        return 0;
+    }
     // Return 1 to keep the connection open
     return 1;
 }
@@ -167,6 +180,7 @@ void Register_Net(HSQUIRRELVM vm)
         .Prop(_SC("OnClose"), &WebSocketClient::GetOnClose, &WebSocketClient::SetOnClose)
         .Prop(_SC("Valid"), &WebSocketClient::IsValid)
         .Prop(_SC("Closing"), &WebSocketClient::IsClosing)
+        .Prop(_SC("AutoClose"), &WebSocketClient::GetAutoClose, &WebSocketClient::SetAutoClose)
         // Member Methods
         .FmtFunc(_SC("SetTag"), &WebSocketClient::ApplyTag)
         .FmtFunc(_SC("SetData"), &WebSocketClient::ApplyData)

module/Library/Net.hpp

@@ -154,6 +154,18 @@ struct WebSocketClient : public SqChainedInstances< WebSocketClient >
     */
     std::atomic< bool > mClosing{false};
 
+    /* --------------------------------------------------------------------------------------------
+     * Whether the closing callback was inoked (avoid recursive calls).
+    */
+    std::atomic< bool > mClosed{false};
+
+    /* --------------------------------------------------------------------------------------------
+     * Whether to not keep the connection open after receiving the close event.
+     * Internally this event is ignored but if set to true the connection is immediatelly closed
+     * in the internal event handler, before the event may reach the script callback.
+    */
+    std::atomic< bool > mAutoClose{false};
+
     /* --------------------------------------------------------------------------------------------
      * Server host to connect to, i.e. "echo.websocket.org" or "192.168.1.1" or "localhost".
     */
@@ -179,7 +191,8 @@ struct WebSocketClient : public SqChainedInstances< WebSocketClient >
     */
     WebSocketClient()
         : Base(), mHandle(nullptr), mQueue(1024), mOnData(), mOnClose(), mTag(), mData()
-        , mPort(0), mSecure(false), mClosing(false), mHost(), mPath(), mOrigin(), mExtensions()
+        , mPort(0), mSecure(false), mClosing(false), mClosed(false), mAutoClose(false)
+        , mHost(), mPath(), mOrigin(), mExtensions()
     {
         ChainInstance(); // Remember this instance
     }
@@ -189,7 +202,7 @@ struct WebSocketClient : public SqChainedInstances< WebSocketClient >
     */
     WebSocketClient(StackStrF & host, uint16_t port, StackStrF & path)
         : Base(), mHandle(nullptr), mQueue(1024), mOnData(), mOnClose(), mTag(), mData()
-        , mPort(port), mSecure(false), mClosing(false)
+        , mPort(port), mSecure(false), mClosing(false), mClosed(false), mAutoClose(false)
         , mHost(host.mPtr, host.GetSize())
         , mPath(path.mPtr, path.GetSize())
         , mOrigin(), mExtensions()
@@ -202,7 +215,7 @@ struct WebSocketClient : public SqChainedInstances< WebSocketClient >
     */
     WebSocketClient(StackStrF & host, uint16_t port, StackStrF & path, bool secure)
         : Base(), mHandle(nullptr), mQueue(1024), mOnData(), mOnClose(), mTag(), mData()
-        , mPort(port), mSecure(secure), mClosing(false)
+        , mPort(port), mSecure(secure), mClosing(false), mClosed(false), mAutoClose(false)
         , mHost(host.mPtr, host.GetSize())
         , mPath(path.mPtr, path.GetSize())
         , mOrigin(), mExtensions()
@@ -215,7 +228,7 @@ struct WebSocketClient : public SqChainedInstances< WebSocketClient >
     */
     WebSocketClient(StackStrF & host, uint16_t port, StackStrF & path, bool secure, StackStrF & origin)
         : Base(), mHandle(nullptr), mQueue(1024), mOnData(), mOnClose(), mTag(), mData()
-        , mPort(port), mSecure(secure), mClosing(false)
+        , mPort(port), mSecure(secure), mClosing(false), mClosed(false), mAutoClose(false)
         , mHost(host.mPtr, host.GetSize())
         , mPath(path.mPtr, path.GetSize())
         , mOrigin(origin.mPtr, origin.GetSize())
@@ -229,7 +242,7 @@ struct WebSocketClient : public SqChainedInstances< WebSocketClient >
     */
     WebSocketClient(StackStrF & host, uint16_t port, StackStrF & path, bool secure, StackStrF & origin, StackStrF & ext)
         : Base(), mHandle(nullptr), mQueue(1024), mOnData(), mOnClose(), mTag(), mData()
-        , mPort(port), mSecure(secure), mClosing(false)
+        , mPort(port), mSecure(secure), mClosing(false), mClosed(false), mAutoClose(false)
         , mHost(host.mPtr, host.GetSize())
         , mPath(path.mPtr, path.GetSize())
         , mOrigin(origin.mPtr, origin.GetSize())
@@ -289,6 +302,22 @@ struct WebSocketClient : public SqChainedInstances< WebSocketClient >
         return mClosing.load();
     }
 
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve whether auto-closing is enabled or not.
+    */
+    SQMOD_NODISCARD bool GetAutoClose() const
+    {
+        return mAutoClose.load();
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Modify whether auto-closing is enabled or not.
+    */
+    void SetAutoClose(bool toggle)
+    {
+        mAutoClose.store(toggle);
+    }
+
     /* --------------------------------------------------------------------------------------------
      * Retrieve the associated user tag.
     */
@@ -648,7 +677,7 @@ struct WebSocketClient : public SqChainedInstances< WebSocketClient >
     /* --------------------------------------------------------------------------------------------
      * Sends the contents of the given buffer through the socket as a single frame.
     */
-    SQMOD_NODISCARD SQInteger SendOpCode(SqBuffer & buf, SQInteger opcode)
+    SQMOD_NODISCARD SQInteger SendOpCode(SQInteger opcode)
     {
         return mg_websocket_client_write(Valid(), static_cast< int >(opcode), nullptr, 0);
     }
@@ -706,9 +735,12 @@ struct WebSocketClient : public SqChainedInstances< WebSocketClient >
             }
         }
         // Is the server closing the connection?
-        if (closing && !mOnClose.IsNull())
+        if (closing && !mClosed.load() && !mOnClose.IsNull())
         {
-            mOnClose.Execute(); // Let the user know
+            // Let the user know
+            mOnClose.Execute();
+            // Prevent calling this callback again
+            mClosed.store(true);
         }
     }
 
@@ -756,5 +788,4 @@ protected:
     }
 };
 
-
 } // Namespace:: SqMod

module/Library/RegEx.cpp

@@ -0,0 +1,191 @@
+// ------------------------------------------------------------------------------------------------
+#include "Library/RegEx.hpp"
+
+// ------------------------------------------------------------------------------------------------
+#include <sqratConst.h>
+
+// ------------------------------------------------------------------------------------------------
+namespace SqMod {
+
+// ------------------------------------------------------------------------------------------------
+SQMOD_DECL_TYPENAME(SqRxMatchTypename, _SC("SqRxMatch"))
+SQMOD_DECL_TYPENAME(SqRxMatchesTypename, _SC("SqRxMatches"))
+SQMOD_DECL_TYPENAME(SqRxInstanceTypename, _SC("SqRxInstance"))
+
+// ------------------------------------------------------------------------------------------------
+bool RxInstance::STUDY = true;
+int RxInstance::OPTIONS = 0;
+int RxInstance::STUDY_OPTIONS = 0;
+
+// ================================================================================================
+void Register_RegEx(HSQUIRRELVM vm)
+{
+    RootTable(vm).Bind(SqRxMatchTypename::Str,
+       Class< RxMatch >(vm, SqRxMatchTypename::Str)
+       // Constructors
+       .Ctor()
+       .Ctor< SQInteger >()
+       .Ctor< SQInteger, SQInteger >()
+       // Meta-methods
+       .SquirrelFunc(_SC("_typename"), &SqRxMatchTypename::Fn)
+       // Properties
+       .Prop(_SC("Offset"), &RxMatch::GetOffset, &RxMatch::SetOffset)
+       .Prop(_SC("Length"), &RxMatch::GetLength, &RxMatch::SetLength)
+       .Prop(_SC("End"), &RxMatch::GetEnd)
+       // Member Methods
+       .Func(_SC("SubStr"), &RxMatch::SubStr)
+    );
+    RootTable(vm).Bind(SqRxMatchesTypename::Str,
+       Class< RxMatches >(vm, SqRxMatchesTypename::Str)
+       // Constructors
+       .Ctor()
+       // Meta-methods
+       .SquirrelFunc(_SC("_typename"), &SqRxMatchesTypename::Fn)
+       // Properties
+       .Prop(_SC("Front"), &RxMatches::Front)
+       .Prop(_SC("Back"), &RxMatches::Back)
+       .Prop(_SC("Empty"), &RxMatches::Empty)
+       .Prop(_SC("Size"), &RxMatches::Size)
+       .Prop(_SC("Capacity"), &RxMatches::Capacity, &RxMatches::Reserve)
+       // Member Methods
+       .Func(_SC("Get"), &RxMatches::Get)
+       .Func(_SC("Reserve"), &RxMatches::Reserve)
+       .Func(_SC("Compact"), &RxMatches::Compact)
+       .Func(_SC("Clear"), &RxMatches::Clear)
+       .Func(_SC("Pop"), &RxMatches::Pop)
+       .Func(_SC("EraseAt"), &RxMatches::EraseAt)
+       .Func(_SC("EraseFrom"), &RxMatches::EraseFrom)
+       .Func(_SC("Each"), &RxMatches::Each)
+       .Func(_SC("EachRange"), &RxMatches::EachRange)
+       .Func(_SC("While"), &RxMatches::While)
+       .Func(_SC("WhileRange"), &RxMatches::WhileRange)
+       .Func(_SC("SubStr"), &RxMatches::SubStr)
+    );
+    RootTable(vm).Bind(_SC("SqRx"),
+        Class< RxInstance, NoCopy< RxInstance > >(vm, SqRxInstanceTypename::Str)
+        // Constructors
+        .Ctor()
+        .Ctor< StackStrF & >()
+        .Ctor< int, StackStrF & >()
+        .Ctor< int, bool, StackStrF & >()
+        // Meta-methods
+        .SquirrelFunc(_SC("_typename"), &SqRxInstanceTypename::Fn)
+        //.Func(_SC("_tostring"), &CPlayer::ToString)
+        // Static Values
+        .SetStaticValue(_SC("STUDY"), RxInstance::STUDY)
+        .SetStaticValue(_SC("OPTIONS"), RxInstance::OPTIONS)
+        .SetStaticValue(_SC("STUDY_OPTIONS"), RxInstance::STUDY_OPTIONS)
+        // Properties
+        .Prop(_SC("Valid"), &RxInstance::IsValid)
+        .Prop(_SC("Studied"), &RxInstance::IsStudied)
+        // Member Methods
+        .FmtFunc(_SC("CompileF"), &RxInstance::Compile1)
+        .FmtFunc(_SC("CompileExF"), &RxInstance::Compile2)
+        .FmtFunc(_SC("TryCompileF"), &RxInstance::TryCompile1)
+        .FmtFunc(_SC("TryCompileExF"), &RxInstance::TryCompile2)
+        .FmtFunc(_SC("MatchFirst"), &RxInstance::MatchFirst)
+        .FmtFunc(_SC("MatchFirstEx"), &RxInstance::MatchFirst_)
+        .FmtFunc(_SC("MatchFirstFrom"), &RxInstance::MatchFirstFrom)
+        .FmtFunc(_SC("MatchFirstFromEx"), &RxInstance::MatchFirstFrom_)
+        .FmtFunc(_SC("Match"), &RxInstance::Match)
+        .FmtFunc(_SC("MatchEx"), &RxInstance::Match_)
+        .FmtFunc(_SC("MatchFrom"), &RxInstance::MatchFrom)
+        .FmtFunc(_SC("MatchFromEx"), &RxInstance::MatchFrom_)
+        .FmtFunc(_SC("Matches"), &RxInstance::Matches)
+        .FmtFunc(_SC("MatchesEx"), &RxInstance::Matches_)
+        .FmtFunc(_SC("MatchesEx2"), &RxInstance::MatchesEx)
+        // Member Overloads
+        .Overload(_SC("Compile"), &RxInstance::Compile1)
+        .Overload(_SC("Compile"), &RxInstance::Compile2)
+        .Overload(_SC("TryCompile"), &RxInstance::TryCompile1)
+        .Overload(_SC("TryCompile"), &RxInstance::TryCompile2)
+        .Overload(_SC("Study"), &RxInstance::Study0)
+        .Overload(_SC("Study"), &RxInstance::Study1)
+    );
+    // --------------------------------------------------------------------------------------------
+    ConstTable(vm).Enum(_SC("SqRxOption"), Enumeration(vm)
+        .Const(_SC("Caseless"),         static_cast< SQInteger >(PCRE_CASELESS))
+        .Const(_SC("Multiline"),        static_cast< SQInteger >(PCRE_MULTILINE))
+        .Const(_SC("Dotall"),           static_cast< SQInteger >(PCRE_DOTALL))
+        .Const(_SC("Extended"),         static_cast< SQInteger >(PCRE_EXTENDED))
+        .Const(_SC("Anchored"),         static_cast< SQInteger >(PCRE_ANCHORED))
+        .Const(_SC("DollarEndOnly"),    static_cast< SQInteger >(PCRE_DOLLAR_ENDONLY))
+        .Const(_SC("Extra"),            static_cast< SQInteger >(PCRE_EXTRA))
+        .Const(_SC("NotBOL"),           static_cast< SQInteger >(PCRE_NOTBOL))
+        .Const(_SC("NotEOL"),           static_cast< SQInteger >(PCRE_NOTEOL))
+        .Const(_SC("UnGreedy"),         static_cast< SQInteger >(PCRE_UNGREEDY))
+        .Const(_SC("NotEmpty"),         static_cast< SQInteger >(PCRE_NOTEMPTY))
+        .Const(_SC("UTF8"),             static_cast< SQInteger >(PCRE_UTF8))
+        .Const(_SC("UTF16"),            static_cast< SQInteger >(PCRE_UTF16))
+        .Const(_SC("UTF32"),            static_cast< SQInteger >(PCRE_UTF32))
+        .Const(_SC("NoAutoCapture"),    static_cast< SQInteger >(PCRE_NO_AUTO_CAPTURE))
+        .Const(_SC("NoUTF8Check"),      static_cast< SQInteger >(PCRE_NO_UTF8_CHECK))
+        .Const(_SC("NoUTF16Check"),     static_cast< SQInteger >(PCRE_NO_UTF16_CHECK))
+        .Const(_SC("NoUTF32Check"),     static_cast< SQInteger >(PCRE_NO_UTF32_CHECK))
+        .Const(_SC("AutoCallout"),      static_cast< SQInteger >(PCRE_AUTO_CALLOUT))
+        .Const(_SC("PartialSoft"),      static_cast< SQInteger >(PCRE_PARTIAL_SOFT))
+        .Const(_SC("Partial"),          static_cast< SQInteger >(PCRE_PARTIAL))
+        .Const(_SC("NeverUTF"),         static_cast< SQInteger >(PCRE_NEVER_UTF))
+        .Const(_SC("DfaShortest"),      static_cast< SQInteger >(PCRE_DFA_SHORTEST))
+        .Const(_SC("NoAutoPossess"),    static_cast< SQInteger >(PCRE_NO_AUTO_POSSESS))
+        .Const(_SC("DfaRestart"),       static_cast< SQInteger >(PCRE_DFA_RESTART))
+        .Const(_SC("FirstLine"),        static_cast< SQInteger >(PCRE_FIRSTLINE))
+        .Const(_SC("DupNames"),         static_cast< SQInteger >(PCRE_DUPNAMES))
+        .Const(_SC("NewLineCR"),        static_cast< SQInteger >(PCRE_NEWLINE_CR))
+        .Const(_SC("NewLineLF"),        static_cast< SQInteger >(PCRE_NEWLINE_LF))
+        .Const(_SC("NewLineCRLF"),      static_cast< SQInteger >(PCRE_NEWLINE_CRLF))
+        .Const(_SC("NewLineAny"),       static_cast< SQInteger >(PCRE_NEWLINE_ANY))
+        .Const(_SC("NewLineAnyCRLF"),   static_cast< SQInteger >(PCRE_NEWLINE_ANYCRLF))
+        .Const(_SC("BsrAnyCRLF"),       static_cast< SQInteger >(PCRE_BSR_ANYCRLF))
+        .Const(_SC("BsrUnicode"),       static_cast< SQInteger >(PCRE_BSR_UNICODE))
+        .Const(_SC("JavaScriptCompat"), static_cast< SQInteger >(PCRE_JAVASCRIPT_COMPAT))
+        .Const(_SC("NoStartOptimize"),  static_cast< SQInteger >(PCRE_NO_START_OPTIMIZE))
+        .Const(_SC("NoStartOptimise"),  static_cast< SQInteger >(PCRE_NO_START_OPTIMISE))
+        .Const(_SC("PartialHard"),      static_cast< SQInteger >(PCRE_PARTIAL_HARD))
+        .Const(_SC("NotEmptyAtStart"),  static_cast< SQInteger >(PCRE_NOTEMPTY_ATSTART))
+        .Const(_SC("UCP"),              static_cast< SQInteger >(PCRE_UCP))
+    );
+    // --------------------------------------------------------------------------------------------
+    ConstTable(vm).Enum(_SC("SqRxError"), Enumeration(vm)
+        .Const(_SC("NoMatch"),       	static_cast< SQInteger >(PCRE_ERROR_NOMATCH))
+        .Const(_SC("Null"),       		static_cast< SQInteger >(PCRE_ERROR_NULL))
+        .Const(_SC("BadOption"),     	static_cast< SQInteger >(PCRE_ERROR_BADOPTION))
+        .Const(_SC("BadMagic"),      	static_cast< SQInteger >(PCRE_ERROR_BADMAGIC))
+        .Const(_SC("UnknownOpCode"), 	static_cast< SQInteger >(PCRE_ERROR_UNKNOWN_OPCODE))
+        .Const(_SC("UnknownNode"),   	static_cast< SQInteger >(PCRE_ERROR_UNKNOWN_NODE))
+        .Const(_SC("NoMemory"),      	static_cast< SQInteger >(PCRE_ERROR_NOMEMORY))
+        .Const(_SC("NoSubstring"),   	static_cast< SQInteger >(PCRE_ERROR_NOSUBSTRING))
+        .Const(_SC("MatchLimit"),    	static_cast< SQInteger >(PCRE_ERROR_MATCHLIMIT))
+        .Const(_SC("Callout"),       	static_cast< SQInteger >(PCRE_ERROR_CALLOUT))
+        .Const(_SC("BadUTF8"),       	static_cast< SQInteger >(PCRE_ERROR_BADUTF8))
+        .Const(_SC("BadUTF16"),      	static_cast< SQInteger >(PCRE_ERROR_BADUTF16))
+        .Const(_SC("BadUTF32"),      	static_cast< SQInteger >(PCRE_ERROR_BADUTF32))
+        .Const(_SC("BadUTF8Offset"), 	static_cast< SQInteger >(PCRE_ERROR_BADUTF8_OFFSET))
+        .Const(_SC("BadUTF16Offset"),	static_cast< SQInteger >(PCRE_ERROR_BADUTF16_OFFSET))
+        .Const(_SC("Partial"),       	static_cast< SQInteger >(PCRE_ERROR_PARTIAL))
+        .Const(_SC("BadPartial"),    	static_cast< SQInteger >(PCRE_ERROR_BADPARTIAL))
+        .Const(_SC("Internal"),      	static_cast< SQInteger >(PCRE_ERROR_INTERNAL))
+        .Const(_SC("BadCount"),      	static_cast< SQInteger >(PCRE_ERROR_BADCOUNT))
+        .Const(_SC("DfaUitem"),      	static_cast< SQInteger >(PCRE_ERROR_DFA_UITEM))
+        .Const(_SC("DfaUcond"),      	static_cast< SQInteger >(PCRE_ERROR_DFA_UCOND))
+        .Const(_SC("DfaUmLimit"),    	static_cast< SQInteger >(PCRE_ERROR_DFA_UMLIMIT))
+        .Const(_SC("DfaWsSize"),     	static_cast< SQInteger >(PCRE_ERROR_DFA_WSSIZE))
+        .Const(_SC("DfaRecurse"),    	static_cast< SQInteger >(PCRE_ERROR_DFA_RECURSE))
+        .Const(_SC("RecursionLimit"),	static_cast< SQInteger >(PCRE_ERROR_RECURSIONLIMIT))
+        .Const(_SC("NullWsLimit"),   	static_cast< SQInteger >(PCRE_ERROR_NULLWSLIMIT))
+        .Const(_SC("BadNewLine"),    	static_cast< SQInteger >(PCRE_ERROR_BADNEWLINE))
+        .Const(_SC("BadOffset"),     	static_cast< SQInteger >(PCRE_ERROR_BADOFFSET))
+        .Const(_SC("ShortUTF8"),     	static_cast< SQInteger >(PCRE_ERROR_SHORTUTF8))
+        .Const(_SC("ShortUTF16"),    	static_cast< SQInteger >(PCRE_ERROR_SHORTUTF16))
+        .Const(_SC("RecurseLoop"),   	static_cast< SQInteger >(PCRE_ERROR_RECURSELOOP))
+        .Const(_SC("JitStackLimit"), 	static_cast< SQInteger >(PCRE_ERROR_JIT_STACKLIMIT))
+        .Const(_SC("BadMode"),       	static_cast< SQInteger >(PCRE_ERROR_BADMODE))
+        .Const(_SC("BadEndianness"), 	static_cast< SQInteger >(PCRE_ERROR_BADENDIANNESS))
+        .Const(_SC("DfaBadRestart"), 	static_cast< SQInteger >(PCRE_ERROR_DFA_BADRESTART))
+        .Const(_SC("JitBadOption"),  	static_cast< SQInteger >(PCRE_ERROR_JIT_BADOPTION))
+        .Const(_SC("BadLength"),     	static_cast< SQInteger >(PCRE_ERROR_BADLENGTH))
+        .Const(_SC("Unset"),       		static_cast< SQInteger >(PCRE_ERROR_UNSET))
+    );
+}
+
+} // Namespace:: SqMod

module/Library/RegEx.hpp

@@ -0,0 +1,885 @@
+#pragma once
+
+// ------------------------------------------------------------------------------------------------
+#include "Core/Utility.hpp"
+
+// ------------------------------------------------------------------------------------------------
+#ifdef POCO_UNBUNDLED
+	#include <pcre.h>
+#else
+	#include "pcre_config.h"
+	#include "pcre.h"
+#endif
+
+// ------------------------------------------------------------------------------------------------
+#include <utility>
+
+// ------------------------------------------------------------------------------------------------
+namespace SqMod {
+
+/* ------------------------------------------------------------------------------------------------
+ * 
+*/
+struct RxMatch
+{
+    /* --------------------------------------------------------------------------------------------
+     * 
+    */
+	SQInteger mOffset{0};
+
+    /* --------------------------------------------------------------------------------------------
+     * 
+    */
+	SQInteger mLength{0};
+    /* --------------------------------------------------------------------------------------------
+     * Default constructor.
+    */
+    RxMatch() noexcept = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Offset constructor.
+    */
+    explicit RxMatch(SQInteger offset) noexcept
+        : mOffset{offset}
+    {
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Explicit constructor.
+    */
+    RxMatch(SQInteger offset, SQInteger length) noexcept
+        : mOffset{offset}, mLength{length}
+    {
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy constructor.
+    */
+    RxMatch(const RxMatch & o) = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Move constructor.
+    */
+    RxMatch(RxMatch && o) noexcept = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy assignment operator.
+    */
+    RxMatch & operator = (const RxMatch & o) = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Move assignment operator.
+    */
+    RxMatch & operator = (RxMatch && o) noexcept = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve offset.
+    */
+    SQMOD_NODISCARD SQInteger GetOffset() const noexcept
+    {
+        return mOffset;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Modify offset.
+    */
+    void SetOffset(SQInteger value) noexcept
+    {
+        mOffset = value;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve length.
+    */
+    SQMOD_NODISCARD SQInteger GetLength() const noexcept
+    {
+        return mLength;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Modify length.
+    */
+    void SetLength(SQInteger value) noexcept
+    {
+        mLength = value;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve match end.
+    */
+    SQMOD_NODISCARD SQInteger GetEnd() const noexcept
+    {
+        return mOffset + mLength;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Extract a sub-string.
+    */
+    [[nodiscard]] LightObj SubStr(StackStrF & str) const
+    {
+        if ((mOffset + mLength) > str.mLen)
+        {
+            STHROWF("Rx: Match is outside the range of the specified string.");
+        }
+        // Return the sub-string
+        return LightObj{str.mPtr + mOffset, mLength};
+    }
+};
+
+/* ------------------------------------------------------------------------------------------------
+ * 
+*/
+struct RxMatches
+{
+    using List = std::vector< RxMatch >;
+
+    /* --------------------------------------------------------------------------------------------
+     * Internal RegularExpression instance.
+    */
+    List mList;
+
+    /* --------------------------------------------------------------------------------------------
+     * Default constructor.
+    */
+    RxMatches() = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy list constructor.
+    */
+    explicit RxMatches(const List & l) // NOLINT(modernize-pass-by-value)
+            : mList{l}
+    {
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Move list constructor.
+    */
+    explicit RxMatches(List && m) noexcept
+            : mList{std::move(m)}
+    {
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy constructor.
+    */
+    RxMatches(const RxMatches & o) = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Move constructor.
+    */
+    RxMatches(RxMatches && o) noexcept = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy assignment operator.
+    */
+    RxMatches & operator = (const RxMatches & o) = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Move assignment operator.
+    */
+    RxMatches & operator = (RxMatches && o) noexcept = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Make sure an index is within range and return the container. Container must exist.
+    */
+    List & ValidIdx(SQInteger i)
+    {
+        if (static_cast< size_t >(i) >= mList.size())
+        {
+            STHROWF("Invalid Regular Expression match list index({})", i);
+        }
+        return mList;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Make sure an index is within range and return the container. Container must exist.
+    */
+    SQMOD_NODISCARD const List & ValidIdx(SQInteger i) const
+    {
+        if (static_cast< size_t >(i) >= mList.size())
+        {
+            STHROWF("Invalid Regular Expression match list index({})", i);
+        }
+        return mList;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Make sure a container instance is populated, then return it.
+    */
+    SQMOD_NODISCARD List & ValidPop()
+    {
+        if (mList.empty())
+        {
+            STHROWF("Regular Expression match list container is empty");
+        }
+        return mList;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve a value from the container.
+    */
+    SQMOD_NODISCARD List::reference Get(SQInteger i)
+    {
+        return ValidIdx(i).at(ClampL< SQInteger, size_t >(i));
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve the first element in the container.
+    */
+    SQMOD_NODISCARD List::reference Front()
+    {
+        return ValidPop().front();
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve the last element in the container.
+    */
+    SQMOD_NODISCARD List::reference Back()
+    {
+        return mList.back();
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Check if the container has no elements.
+    */
+    SQMOD_NODISCARD bool Empty() const
+    {
+        return mList.empty();
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve the number of elements in the container.
+    */
+    SQMOD_NODISCARD SQInteger Size() const
+    {
+        return static_cast< SQInteger >(mList.size());
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve the number of elements that the container has currently allocated space for.
+    */
+    SQMOD_NODISCARD SQInteger Capacity() const
+    {
+        return static_cast< SQInteger >(mList.capacity());
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Increase the capacity of the container to a value that's greater or equal to the one specified.
+    */
+    RxMatches & Reserve(SQInteger n)
+    {
+        mList.reserve(ClampL< SQInteger, size_t >(n));
+        return *this;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Request the removal of unused capacity.
+    */
+    void Compact()
+    {
+        mList.shrink_to_fit();
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Erase all elements from the container.
+    */
+    void Clear()
+    {
+        mList.clear();
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Pop the last element in the container.
+    */
+    void Pop()
+    {
+        ValidPop().pop_back();
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Erase the element at a certain position.
+    */
+    void EraseAt(SQInteger i)
+    {
+        mList.erase(ValidIdx(i).begin() + static_cast< size_t >(i)); // NOLINT(cppcoreguidelines-narrowing-conversions)
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Erase a certain amount of elements starting from a specific position.
+    */
+    void EraseFrom(SQInteger i, SQInteger n)
+    {
+        mList.erase(ValidIdx(i).begin() + static_cast< size_t >(i), // NOLINT(cppcoreguidelines-narrowing-conversions)
+                     ValidIdx(i + n).begin() + static_cast< size_t >(i + n)); // NOLINT(cppcoreguidelines-narrowing-conversions)
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Iterate all values through a functor.
+    */
+    void Each(Function & fn) const
+    {
+        for (const auto & e : mList)
+        {
+            fn.Execute(static_cast< SQInteger >(e.mOffset), static_cast< SQInteger >(e.mLength));
+        }
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Iterate values in range through a functor.
+    */
+    void EachRange(SQInteger p, SQInteger n, Function & fn) const
+    {
+        std::for_each(ValidIdx(p).begin() + static_cast< size_t >(p), // NOLINT(cppcoreguidelines-narrowing-conversions)
+                      ValidIdx(p + n).begin() + static_cast< size_t >(p + n), // NOLINT(cppcoreguidelines-narrowing-conversions)
+                      [&](List::const_reference & e) {
+                          fn.Execute(static_cast< SQInteger >(e.mOffset), static_cast< SQInteger >(e.mLength));
+                      });
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Iterate all values through a functor until stopped (i.e. false is returned).
+    */
+    void While(Function & fn) const
+    {
+        for (const auto & e : mList)
+        {
+            auto ret = fn.Eval(static_cast< SQInteger >(e.mOffset), static_cast< SQInteger >(e.mLength));
+            // (null || true) == continue & false == break
+            if (!ret.IsNull() || !ret.template Cast< bool >())
+            {
+                break;
+            }
+        }
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Iterate values in range through a functor until stopped (i.e. false is returned).
+    */
+    void WhileRange(SQInteger p, SQInteger n, Function & fn) const
+    {
+        auto itr = ValidIdx(p).begin() + static_cast< size_t >(p); // NOLINT(cppcoreguidelines-narrowing-conversions)
+        auto end = ValidIdx(p + n).begin() + static_cast< size_t >(p + n); // NOLINT(cppcoreguidelines-narrowing-conversions)
+        for (; itr != end; ++itr)
+        {
+            auto ret = fn.Eval(static_cast< SQInteger >(itr->mOffset), static_cast< SQInteger >(itr->mLength));
+            // (null || true) == continue & false == break
+            if (!ret.IsNull() || !ret.template Cast< bool >())
+            {
+                break;
+            }
+        }
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Extract a sub-string.
+    */
+    [[nodiscard]] LightObj SubStr(SQInteger i, StackStrF & str) const
+    {
+        const RxMatch & m = ValidIdx(i)[i];
+        // Check if match is within range
+        if ((m.mOffset + m.mLength) > str.mLen)
+        {
+            STHROWF("Rx: Match is outside the range of the specified string.");
+        }
+        // Return the sub-string
+        return LightObj{str.mPtr + m.mOffset, m.mLength};
+    }
+};
+
+/* ------------------------------------------------------------------------------------------------
+ * 
+*/
+struct RxInstance
+{
+    /* --------------------------------------------------------------------------------------------
+     * Whether to analyze and optimize the pattern by default for evey new instance (true).
+    */
+    static bool STUDY;
+
+    /* --------------------------------------------------------------------------------------------
+     * Default options for every new instance (0).
+    */
+    static int OPTIONS;
+
+    /* --------------------------------------------------------------------------------------------
+     * Default study options for every new instance (0).
+    */
+    static int STUDY_OPTIONS;
+
+    /* --------------------------------------------------------------------------------------------
+     * Default offset vector size (must be multiple of 3).
+    */
+    static constexpr int OVEC_SIZE = 63;
+
+    /* --------------------------------------------------------------------------------------------
+     * Internal vector type used for offsets buffer.
+    */
+    using OVEC_t = std::vector< int >;
+
+    /* --------------------------------------------------------------------------------------------
+     * Internal RegularExpression instance.
+    */
+	pcre * 			mPCRE{nullptr};
+
+    /* --------------------------------------------------------------------------------------------
+     * Internal RegularExpression instance.
+    */
+	pcre_extra * 	mExtra{nullptr};
+
+    /* --------------------------------------------------------------------------------------------
+     * Internal buffer used for offsets.
+    */
+    OVEC_t          mOVEC{};
+
+    /* --------------------------------------------------------------------------------------------
+     * Default constructor.
+    */
+    RxInstance() noexcept = default;
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy constructor (disabled).
+    */
+    RxInstance(const RxInstance &) = delete;
+
+    /* --------------------------------------------------------------------------------------------
+     * Move constructor.
+    */
+    RxInstance(RxInstance && o) noexcept
+        : mPCRE(o.mPCRE), mExtra(o.mExtra), mOVEC(std::move(o.mOVEC)) // Replicate it
+    {
+        o.mPCRE = nullptr; // Take ownership
+        o.mExtra = nullptr; // Take ownership
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Basic constructor.
+    */
+    explicit RxInstance(StackStrF & pattern)
+        : RxInstance(OPTIONS, STUDY, pattern)
+    {
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Basic constructor. With specific options.
+    */
+    explicit RxInstance(int options, StackStrF & pattern)
+        : RxInstance(options, STUDY, pattern)
+    {
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Basic constructor. With specific options.
+    */
+    explicit RxInstance(int options, bool study, StackStrF & pattern)
+        : mPCRE(Compile_(pattern.mPtr, options)), mExtra(nullptr)
+    {
+        if (study)
+        {
+            Study0();
+        }
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Internal constructor.
+    */
+    RxInstance(const char * pattern, int options, bool study)
+        : mPCRE(Compile_(pattern, options)), mExtra(nullptr)
+    {
+        if (study)
+        {
+            Study0();
+        }
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Destructor.
+    */
+	~RxInstance()
+	{
+        Destroy();
+	}
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy assignment operator (disabled).
+    */
+    RxInstance & operator = (const RxInstance &) = delete;
+
+    /* --------------------------------------------------------------------------------------------
+     * Move assignment operator.
+    */
+    RxInstance & operator = (RxInstance && o) noexcept
+    {
+        // Prevent self assignment
+        if (this != &o)
+        {
+            // Release current instance, if any
+            Destroy();
+            // Replicate it
+            mPCRE = o.mPCRE;
+            mExtra = o.mExtra;
+            mOVEC = std::move(o.mOVEC);
+            // Take ownership
+            o.mPCRE = nullptr;
+            o.mExtra = nullptr;
+        }
+        return *this;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Estimate the size necessary for the offsets vector buffer.
+    */
+    void EstimateOVEC(bool force = false)
+    {
+        if (mOVEC.empty() || force)
+        {
+            int size = 0;
+            // Attempt to estimate the size of the offsets vector buffer
+            const int r = pcre_fullinfo(ValidPCRE(), mExtra, PCRE_INFO_CAPTURECOUNT, &size);
+            // Check for errors
+            if (r != 0)
+            {
+                STHROWF("Rx: Offsets vector buffer estimation failed ({})", r);
+            }
+            // Attempt to scale the vector (must be multiple of 3)
+            mOVEC.resize((size + 1) * 3);
+        }
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Return a valid `pcre` instance pointer or throw an exception.
+    */
+    SQMOD_NODISCARD pcre * ValidPCRE() const
+    {
+        // Do we manage a valid instance?
+        if (mPCRE == nullptr)
+        {
+            STHROWF("Uninitialized Regular Expression instance.");
+        }
+        // Return it
+        return mPCRE;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Return a valid `pcre_extra` instance pointer or throw an exception.
+    */
+    SQMOD_NODISCARD pcre_extra * ValidExtra() const
+    {
+        // Do we manage a valid instance?
+        if (mExtra == nullptr)
+        {
+            STHROWF("Regular Expression was not studied and optimized.");
+        }
+        // Return it
+        return mExtra;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Compile the specified pattern.
+    */
+    SQMOD_NODISCARD static pcre * Compile_(const char * pattern, int options = OPTIONS)
+    {
+        const char * error_msg = nullptr;
+        int error_code, error_offset = 0;
+        // Attempt to compile the specified pattern
+        pcre * ptr = pcre_compile2(pattern, options, &error_code, &error_msg, &error_offset, nullptr);
+        // Did the compilation failed?
+        if (ptr == nullptr)
+        {
+            STHROWF("Rx: {s} (code {}) (at offset {})", error_msg, error_code, error_offset);
+        }
+        // Return the `pcre` instance
+        return ptr;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Attempt to compile the specified pattern. Error information is returned instead of thrown.
+    */
+    SQMOD_NODISCARD static std::pair< pcre *, Table > TryCompile_(const char * pattern, int options = OPTIONS)
+    {
+        const char * error_msg = nullptr;
+        int error_code, error_offset = 0;
+        // Attempt to compile the specified pattern
+        pcre * ptr = pcre_compile2(pattern, options, &error_code, &error_msg, &error_offset, nullptr);
+        // Did the compilation failed?
+        if (ptr == nullptr)
+        {
+            Table t;
+            t.SetValue("message", error_msg);
+            t.SetValue("code", error_code);
+            t.SetValue("offset", error_offset);
+            // Return the table with error information
+            return std::make_pair(ptr, std::move(t));
+        }
+        // Return the `pcre` instance with no error information
+        return std::make_pair(ptr, Table{});
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Compile the specified pattern.
+    */
+    RxInstance & Compile1(StackStrF & pattern)
+    {
+        return Compile2(OPTIONS, pattern);
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Compile the specified pattern. With specific options.
+    */
+    RxInstance & Compile2(int options, StackStrF & pattern)
+    {
+        // Release current instance, if any
+        Destroy();
+        // Attempt to compile
+        mPCRE = Compile_(pattern.mPtr, options);
+        // Allocate offsets vector buffer
+        EstimateOVEC();
+        // Allow chaining
+        return *this;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Compile the specified pattern.
+    */
+    Table TryCompile1(StackStrF & pattern)
+    {
+        return TryCompile2(OPTIONS, pattern);
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Compile the specified pattern. With specific options.
+    */
+    Table TryCompile2(int options, StackStrF & pattern)
+    {
+        // Release current instance, if any
+        Destroy();
+        // Attempt to compile
+        auto p = TryCompile_(pattern.mPtr, options);
+        // Were there any compilation errors?
+        if (p.first != nullptr)
+        {
+            mPCRE = p.first;
+        }
+        // Return compilation info
+        return p.second;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Analyze the managed pattern and optimized it.
+    */
+    RxInstance & Study0()
+    {
+        return Study1(STUDY_OPTIONS);
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Analyze the managed pattern and optimized it. With specific options.
+    */
+    RxInstance & Study1(int options)
+    {
+        if (mExtra != nullptr)
+        {
+            STHROWF("Regular Expression was already analyzed and optimized");
+        }
+        const char * error = nullptr;
+        // Study and optimize the expression
+        mExtra = pcre_study(ValidPCRE(), options, &error);
+        // If there was an error studying the expression then throw it
+        if (mExtra == nullptr && error != nullptr)
+        {
+            STHROWF("Rx: {s}", error);
+        }
+        // Allow chaining
+        return *this;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Release managed resources and revert to uninitialized instance.
+    */
+    SQMOD_NODISCARD bool IsValid() const
+    {
+        return (mPCRE != nullptr);
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Release managed resources and revert to uninitialized instance.
+    */
+    SQMOD_NODISCARD bool IsStudied() const
+    {
+        return (mExtra != nullptr);
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Release managed resources and revert to uninitialized instance.
+    */
+    void Destroy()
+    {
+        // Do we manage any instance?
+        if (mPCRE != nullptr)
+        {
+            pcre_free(mPCRE);
+            mPCRE = nullptr;
+        }
+        // Is the expression optimized?
+        if (mExtra != nullptr)
+        {
+            pcre_free(mExtra);
+            mExtra = nullptr;
+        }
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Matches the given subject string against the pattern.
+     * Returns the position of the first captured sub-string in m.
+     * If no part of the subject matches the pattern, m.mOffset is -1 and m.mLength is 0.
+     * Returns the number of matches. Throws a exception in case of an error.
+    */
+    SQMOD_NODISCARD int MatchFirstFrom(SQInteger o, RxMatch & m, StackStrF & s)
+    {
+        return MatchFirstFrom_(OPTIONS, o, m, s);
+    }
+    SQMOD_NODISCARD int MatchFirstFrom_(int f, SQInteger o, RxMatch & m, StackStrF & s)
+    {
+        if (o > s.mLen)
+        {
+            STHROWF("Rx: Offset is out of range");
+        }
+        EstimateOVEC();
+        // Attempt to execute the expression on the specified subject
+        const int rc = pcre_exec(ValidPCRE(), mExtra, s.mPtr, static_cast< int >(s.mLen), static_cast< int >(o), f & 0xFFFF, mOVEC.data(), static_cast< int >(mOVEC.size()));
+        // Was there a match?
+        if (rc == PCRE_ERROR_NOMATCH)
+        {
+            m.mOffset = -1;
+            m.mLength = 0;
+            // No match found
+            return 0;
+        }
+        // Bad options/flags?
+        else if (rc == PCRE_ERROR_BADOPTION)
+        {
+            STHROWF("Rx: Bad option");
+        }
+        // Overflow?
+        else if (rc == 0)
+        {
+            STHROWF("Rx: too many captured sub-strings");
+        }
+        // Some other error?
+        else if (rc < 0)
+        {
+            STHROWF("Rx: error {}", rc);
+        }
+        // Store match
+        m.mOffset = mOVEC[0];
+        m.mLength = mOVEC[1] - mOVEC[0];
+        // Yield result back to script
+        return rc;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Matches the given subject string against the pattern.
+     * Returns the position of the first captured sub-string in m.
+     * If no part of the subject matches the pattern, m.mOffset is -1 and m.mLength is 0.
+     * Returns the number of matches. Throws a exception in case of an error.
+    */
+    SQMOD_NODISCARD int MatchFirst(RxMatch & m, StackStrF & s)
+    {
+        return MatchFirstFrom_(OPTIONS, 0, m, s);
+    }
+    SQMOD_NODISCARD int MatchFirst_(int f, RxMatch & m, StackStrF & s)
+    {
+        return MatchFirstFrom_(f, 0, m, s);
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Matches the given subject string against the pattern.
+     * The first entry in m contains the position of the captured sub-string.
+     * The following entries identify matching sub-patterns. See the PCRE documentation for a more detailed explanation.
+     * If no part of the subject matches the pattern, m is empty.
+     * Returns the number of matches. Throws an exception in case of an error.
+    */
+    SQMOD_NODISCARD int MatchFrom(SQInteger o, RxMatches & m, StackStrF & s)
+    {
+        return MatchFrom_(OPTIONS, o, m, s);
+    }
+    SQMOD_NODISCARD int MatchFrom_(int f, SQInteger o, RxMatches & m, StackStrF & s)
+    {
+        if (o > s.mLen)
+        {
+            STHROWF("Rx: Offset is out of range");
+        }
+        EstimateOVEC();
+        // Clear previous matches, if any
+        m.mList.clear();
+        // Attempt to execute the expression on the specified subject
+        const int rc = pcre_exec(ValidPCRE(), mExtra, s.mPtr, static_cast< int >(s.mLen), static_cast< int >(o), f & 0xFFFF, mOVEC.data(), static_cast< int >(mOVEC.size()));
+        // Was there a match?
+        if (rc == PCRE_ERROR_NOMATCH)
+        {
+            return 0; // No match found
+        }
+        // Bad options/flags?
+        else if (rc == PCRE_ERROR_BADOPTION)
+        {
+            STHROWF("Rx: Bad option");
+        }
+        // Overflow?
+        else if (rc == 0)
+        {
+            STHROWF("Rx: too many captured sub-strings");
+        }
+        // Some other error?
+        else if (rc < 0)
+        {
+            STHROWF("Rx: error {}", rc);
+        }
+        // Reserve space in advance
+        m.mList.reserve(static_cast< size_t >(rc));
+        // Transfer matches to match-list
+        for (int i = 0; i < rc; ++i)
+        {
+            m.mList.emplace_back(mOVEC[i*2], mOVEC[i*2+1] - mOVEC[i*2]);
+        }
+        // Yield result back to script
+        return rc;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Matches the given subject string against the pattern.
+     * The first entry in m contains the position of the captured sub-string.
+     * The following entries identify matching sub-patterns. See the PCRE documentation for a more detailed explanation.
+     * If no part of the subject matches the pattern, m is empty.
+     * Returns the number of matches. Throws an exception in case of an error.
+    */
+    SQMOD_NODISCARD int Match(RxMatches & m, StackStrF & s)
+    {
+        return MatchFrom_(OPTIONS, 0, m, s);
+    }
+    SQMOD_NODISCARD int Match_(int f, RxMatches & m, StackStrF & s)
+    {
+        return MatchFrom_(f, 0, m, s);
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Returns true if and only if the subject matches the regular expression.
+     * Internally, this method sets the RE_ANCHORED and RE_NOTEMPTY options for matching,
+     * which means that the empty string will never match and the pattern is treated as if it starts with a ^.
+    */
+    SQMOD_NODISCARD bool Matches(StackStrF & s)
+    {
+        return Matches_(PCRE_ANCHORED | PCRE_NOTEMPTY, s);
+    }
+    SQMOD_NODISCARD bool Matches_(SQInteger o, StackStrF & s)
+    {
+        return MatchesEx(PCRE_ANCHORED | PCRE_NOTEMPTY, 0, s);
+    }
+    SQMOD_NODISCARD bool MatchesEx(int f, SQInteger o, StackStrF & s)
+    {
+        RxMatch m;
+        const int rc = MatchFirstFrom_(f, o, m, s);
+        return (rc > 0) && (m.mOffset == o) && (m.mLength == (s.mLen - o));
+    }
+};
+
+
+} // Namespace:: SqMod

module/Library/SQLite.cpp

@@ -362,6 +362,15 @@ static const EnumElement g_MainEnum[] = {
     {_SC("WARNING_AUTOINDEX"),                    SQLITE_WARNING_AUTOINDEX}
 };
 
+// ------------------------------------------------------------------------------------------------
+LightObj GetSQLiteFromSession(Poco::Data::SessionImpl * session)
+{
+    // Create a reference counted connection handle instance
+    SQLiteConnRef ref(new SQLiteConnHnd(session));
+    // Transform it into a connection instance and yield it as a script object
+    return LightObj(SqTypeIdentity< SQLiteConnection >{}, SqVM(), ref);
+}
+
 // ------------------------------------------------------------------------------------------------
 static inline bool IsDigitsOnly(const SQChar * str)
 {
@@ -374,13 +383,13 @@ static inline bool IsDigitsOnly(const SQChar * str)
 }
 
 // ------------------------------------------------------------------------------------------------
-Object GetConnectionObj(const ConnRef & conn)
+Object GetConnectionObj(const SQLiteConnRef & conn)
 {
     return Object(new SQLiteConnection(conn));
 }
 
 // ------------------------------------------------------------------------------------------------
-Object GetStatementObj(const StmtRef & stmt)
+Object GetStatementObj(const SQLiteStmtRef & stmt)
 {
     return Object(new SQLiteStatement(stmt));
 }
@@ -602,6 +611,7 @@ SQLiteConnHnd::SQLiteConnHnd()
     , mFlags(0)
     , mName()
     , mVFS()
+    , mSession()
     , mMemory(false)
     , mTrace(false)
     , mProfile(false)
@@ -609,6 +619,24 @@ SQLiteConnHnd::SQLiteConnHnd()
     /* ... */
 }
 
+// ------------------------------------------------------------------------------------------------
+SQLiteConnHnd::SQLiteConnHnd(Poco::Data::SessionImpl * session)
+    : SQLiteConnHnd()
+{
+    mSession.assign(session, true);
+    // Retrieve the internal handle property
+    mPtr = Poco::AnyCast< sqlite3 * >(mSession->getProperty("handle"));
+}
+
+// ------------------------------------------------------------------------------------------------
+SQLiteConnHnd::SQLiteConnHnd(Poco::AutoPtr< Poco::Data::SessionImpl > && session)
+    : SQLiteConnHnd()
+{
+    mSession = std::move(session);
+    // Retrieve the internal handle property
+    mPtr = Poco::AnyCast< sqlite3 * >(mSession->getProperty("handle"));
+}
+
 // ------------------------------------------------------------------------------------------------
 SQLiteConnHnd::~SQLiteConnHnd()
 {
@@ -619,10 +647,17 @@ SQLiteConnHnd::~SQLiteConnHnd()
         Flush(static_cast<uint32_t>(mQueue.size()), NullObject(), NullFunction());
         // NOTE: Should we call sqlite3_interrupt(...) before closing?
         // Attempt to close the database
-        if ((sqlite3_close(mPtr)) != SQLITE_OK)
+        // If this connection is a pooled session then let it clean itself up
+        if (mSession.isNull() && (sqlite3_close(mPtr)) != SQLITE_OK)
         {
             LogErr("Unable to close SQLite connection [%s]", sqlite3_errmsg(mPtr));
         }
+        else
+        {
+            mSession.reset();
+        }
+        // Prevent further use of this connection
+        mPtr = nullptr;
     }
 }
 
@@ -630,7 +665,7 @@ SQLiteConnHnd::~SQLiteConnHnd()
 void SQLiteConnHnd::Create(const SQChar * name, int32_t flags, const SQChar * vfs)
 {
     // Make sure a previous connection doesn't exist
-    if (mPtr)
+    if (Access())
     {
         STHROWF("Unable to connect to database. Database already connected");
     }
@@ -663,7 +698,7 @@ void SQLiteConnHnd::Create(const SQChar * name, int32_t flags, const SQChar * vf
 int32_t SQLiteConnHnd::Flush(uint32_t num, Object & env, Function & func)
 {
     // Do we even have a valid connection?
-    if (!mPtr)
+    if (!Access())
     {
         return -1; // No connection!
     }
@@ -751,10 +786,10 @@ int32_t SQLiteConnHnd::Flush(uint32_t num, Object & env, Function & func)
 }
 
 // ------------------------------------------------------------------------------------------------
-SQLiteStmtHnd::SQLiteStmtHnd(ConnRef conn)
+SQLiteStmtHnd::SQLiteStmtHnd(SQLiteConnRef conn)
     : mPtr(nullptr)
     , mStatus(SQLITE_OK)
-    , mConn(std::move(conn))
+    , mConnection(std::move(conn))
     , mQuery()
     , mColumns(0)
     , mParameters(0)
@@ -774,7 +809,7 @@ SQLiteStmtHnd::~SQLiteStmtHnd()
         // Attempt to finalize the statement
         if ((sqlite3_finalize(mPtr)) != SQLITE_OK)
         {
-            LogErr("Unable to finalize SQLite statement [%s]", mConn->ErrMsg());
+            LogErr("Unable to finalize SQLite statement [%s]", mConnection->ErrMsg());
         }
     }
 }
@@ -783,12 +818,12 @@ SQLiteStmtHnd::~SQLiteStmtHnd()
 void SQLiteStmtHnd::Create(const SQChar * query, SQInteger length)
 {
     // Make sure a previous statement doesn't exist
-    if (mPtr)
+    if (Access())
     {
         STHROWF("Unable to prepare statement. Statement already prepared");
     }
     // Is the specified database connection is valid?
-    else if (!mConn)
+    else if (!mConnection)
     {
         STHROWF("Unable to prepare statement. Invalid connection handle");
     }
@@ -800,7 +835,7 @@ void SQLiteStmtHnd::Create(const SQChar * query, SQInteger length)
     // Save the query string
     mQuery.assign(query, static_cast< size_t >(length));
     // Attempt to prepare a statement with the specified query string
-    if ((mStatus = sqlite3_prepare_v2(mConn->mPtr, mQuery.c_str(), ConvTo< int32_t >::From(mQuery.size()),
+    if ((mStatus = sqlite3_prepare_v2(mConnection->mPtr, mQuery.c_str(), ConvTo< int32_t >::From(mQuery.size()),
                                             &mPtr, nullptr)) != SQLITE_OK)
     {
         // Clear the query string since it failed
@@ -808,7 +843,7 @@ void SQLiteStmtHnd::Create(const SQChar * query, SQInteger length)
         // Explicitly make sure the handle is null
         mPtr = nullptr;
         // Now it's safe to throw the error
-        STHROWF("Unable to prepare statement [{}]", mConn->ErrMsg());
+        STHROWF("Unable to prepare statement [{}]", mConnection->ErrMsg());
     }
     else
     {
@@ -823,7 +858,7 @@ void SQLiteStmtHnd::Create(const SQChar * query, SQInteger length)
 int32_t SQLiteStmtHnd::GetColumnIndex(const SQChar * name, SQInteger length)
 {
     // Validate the handle
-    if (!mPtr)
+    if (!Access())
     {
         STHROWF("Invalid SQLite statement");
     }
@@ -861,25 +896,25 @@ int32_t SQLiteStmtHnd::GetColumnIndex(const SQChar * name, SQInteger length)
 // ------------------------------------------------------------------------------------------------
 const char * SQLiteStmtHnd::ErrStr() const
 {
-    return mConn ? sqlite3_errstr(sqlite3_errcode(mConn->mPtr)) : _SC("");
+    return mConnection ? sqlite3_errstr(sqlite3_errcode(mConnection->Access())) : _SC("");
 }
 
 // ------------------------------------------------------------------------------------------------
 const char * SQLiteStmtHnd::ErrMsg() const
 {
-    return mConn ? sqlite3_errmsg(mConn->mPtr) : _SC("");
+    return mConnection ? sqlite3_errmsg(mConnection->Access()) : _SC("");
 }
 
 // ------------------------------------------------------------------------------------------------
 int32_t SQLiteStmtHnd::ErrNo() const
 {
-    return mConn ? sqlite3_errcode(mConn->mPtr) : SQLITE_NOMEM;
+    return mConnection ? sqlite3_errcode(mConnection->Access()) : SQLITE_NOMEM;
 }
 
 // ------------------------------------------------------------------------------------------------
 int32_t SQLiteStmtHnd::ExErrNo() const
 {
-    return mConn ? sqlite3_extended_errcode(mConn->mPtr) : SQLITE_NOMEM;
+    return mConnection ? sqlite3_extended_errcode(mConnection->Access()) : SQLITE_NOMEM;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -921,7 +956,7 @@ void SQLiteConnection::ValidateCreated(const char * file, int32_t line) const
     {
         SqThrowF(SQMOD_RTFMT("Invalid SQLite connection reference =>[{}:{}]"), file, line);
     }
-    else if (m_Handle->mPtr == nullptr)
+    else if (m_Handle->Access() == nullptr)
     {
         SqThrowF(SQMOD_RTFMT("Invalid SQLite connection =>[{}:{}]"), file, line);
     }
@@ -933,7 +968,7 @@ void SQLiteConnection::ValidateCreated() const
     {
         SqThrowF(fmt::runtime("Invalid SQLite connection reference"));
     }
-    else if (m_Handle->mPtr == nullptr)
+    else if (m_Handle->Access() == nullptr)
     {
         SqThrowF(fmt::runtime("Invalid SQLite connection"));
     }
@@ -942,13 +977,13 @@ void SQLiteConnection::ValidateCreated() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-const ConnRef & SQLiteConnection::GetValid(const char * file, int32_t line) const
+const SQLiteConnRef & SQLiteConnection::GetValid(const char * file, int32_t line) const
 {
     Validate(file, line);
     return m_Handle;
 }
 #else
-const ConnRef & SQLiteConnection::GetValid() const
+const SQLiteConnRef & SQLiteConnection::GetValid() const
 {
     Validate();
     return m_Handle;
@@ -957,13 +992,13 @@ const ConnRef & SQLiteConnection::GetValid() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-const ConnRef & SQLiteConnection::GetCreated(const char * file, int32_t line) const
+const SQLiteConnRef & SQLiteConnection::GetCreated(const char * file, int32_t line) const
 {
     ValidateCreated(file, line);
     return m_Handle;
 }
 #else
-const ConnRef & SQLiteConnection::GetCreated() const
+const SQLiteConnRef & SQLiteConnection::GetCreated() const
 {
     ValidateCreated();
     return m_Handle;
@@ -976,7 +1011,7 @@ void SQLiteConnection::Open(StackStrF & name)
     // Should we create a connection handle?
     if (!m_Handle)
     {
-        m_Handle = ConnRef(new SQLiteConnHnd());
+        m_Handle = SQLiteConnRef(new SQLiteConnHnd());
     }
     // Make sure another database isn't opened
     if (SQMOD_GET_VALID(*this)->mPtr != nullptr)
@@ -996,7 +1031,7 @@ void SQLiteConnection::Open(StackStrF & name, int32_t flags)
     // Should we create a connection handle?
     if (!m_Handle)
     {
-        m_Handle = ConnRef(new SQLiteConnHnd());
+        m_Handle = SQLiteConnRef(new SQLiteConnHnd());
     }
     // Make sure another database isn't opened
     if (SQMOD_GET_VALID(*this)->mPtr != nullptr)
@@ -1013,7 +1048,7 @@ void SQLiteConnection::Open(StackStrF & name, int32_t flags, StackStrF & vfs)
     // Should we create a connection handle?
     if (!m_Handle)
     {
-        m_Handle = ConnRef(new SQLiteConnHnd());
+        m_Handle = SQLiteConnRef(new SQLiteConnHnd());
     }
     // Make sure another database isn't opened
     if (SQMOD_GET_VALID(*this)->mPtr != nullptr)
@@ -1029,14 +1064,14 @@ int32_t SQLiteConnection::Exec(StackStrF & str)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to execute the specified query
-    m_Handle->mStatus = sqlite3_exec(m_Handle->mPtr, str.mPtr, nullptr, nullptr, nullptr);
+    m_Handle->mStatus = sqlite3_exec(m_Handle->Access(), str.mPtr, nullptr, nullptr, nullptr);
     // Validate the execution result
     if (m_Handle->mStatus != SQLITE_OK)
     {
         STHROWF("Unable to execute query [{}]", m_Handle->ErrMsg());
     }
     // Return rows affected by this query
-    return sqlite3_changes(m_Handle->mPtr);
+    return sqlite3_changes(m_Handle->Access());
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -1109,12 +1144,12 @@ void SQLiteConnection::SetTracing(bool SQ_UNUSED_ARG(toggle)) // NOLINT(readabil
     // Do we have to disable it?
     else if (m_Handle->mTrace)
     {
-        sqlite3_trace(m_Handle->mPtr, nullptr, nullptr);
+        sqlite3_trace(m_Handle->Access(), nullptr, nullptr);
     }
     // Go ahead and enable tracing
     else
     {
-        sqlite3_trace(m_Handle->mPtr, &SQLiteConnection::TraceOutput, nullptr);
+        sqlite3_trace(m_Handle->Access(), &SQLiteConnection::TraceOutput, nullptr);
     }
 #endif
 }
@@ -1133,12 +1168,12 @@ void SQLiteConnection::SetProfiling(bool SQ_UNUSED_ARG(toggle)) // NOLINT(readab
     // Do we have to disable it?
     else if (m_Handle->mProfile)
     {
-        sqlite3_profile(m_Handle->mPtr, nullptr, nullptr);
+        sqlite3_profile(m_Handle->Access(), nullptr, nullptr);
     }
     // Go ahead and enable profiling
     else
     {
-        sqlite3_profile(m_Handle->mPtr, &SQLiteConnection::ProfileOutput, nullptr);
+        sqlite3_profile(m_Handle->Access(), &SQLiteConnection::ProfileOutput, nullptr);
     }
 #endif
 }
@@ -1148,7 +1183,7 @@ void SQLiteConnection::SetBusyTimeout(int32_t millis)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Apply the requested timeout
-    if ((m_Handle->mStatus = sqlite3_busy_timeout(m_Handle->mPtr, millis)) != SQLITE_OK)
+    if ((m_Handle->mStatus = sqlite3_busy_timeout(m_Handle->Access(), millis)) != SQLITE_OK)
     {
         STHROWF("Unable to set busy timeout [{}]", m_Handle->ErrMsg());
     }
@@ -1269,7 +1304,7 @@ void SQLiteParameter::ValidateCreated(const char * file, int32_t line) const
     {
         SqThrowF(SQMOD_RTFMT("Invalid SQLite statement reference =>[{}:{}]"), file, line);
     }
-    else if (m_Handle->mPtr == nullptr)
+    else if (m_Handle->Access() == nullptr)
     {
         SqThrowF(SQMOD_RTFMT("Invalid SQLite statement =>[{}:{}]"), file, line);
     }
@@ -1286,7 +1321,7 @@ void SQLiteParameter::ValidateCreated() const
     {
         SqThrowF(fmt::runtime("Invalid SQLite statement reference"));
     }
-    else if (m_Handle->mPtr == nullptr)
+    else if (m_Handle->Access() == nullptr)
     {
         SqThrowF(fmt::runtime("Invalid SQLite statement"));
     }
@@ -1295,13 +1330,13 @@ void SQLiteParameter::ValidateCreated() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-const StmtRef & SQLiteParameter::GetValid(const char * file, int32_t line) const
+const SQLiteStmtRef & SQLiteParameter::GetValid(const char * file, int32_t line) const
 {
     Validate(file, line);
     return m_Handle;
 }
 #else
-const StmtRef & SQLiteParameter::GetValid() const
+const SQLiteStmtRef & SQLiteParameter::GetValid() const
 {
     Validate();
     return m_Handle;
@@ -1310,13 +1345,13 @@ const StmtRef & SQLiteParameter::GetValid() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-const StmtRef & SQLiteParameter::GetCreated(const char * file, int32_t line) const
+const SQLiteStmtRef & SQLiteParameter::GetCreated(const char * file, int32_t line) const
 {
     ValidateCreated(file, line);
     return m_Handle;
 }
 #else
-const StmtRef & SQLiteParameter::GetCreated() const
+const SQLiteStmtRef & SQLiteParameter::GetCreated() const
 {
     ValidateCreated();
     return m_Handle;
@@ -1377,7 +1412,7 @@ void SQLiteParameter::SetIndex(const Object & param)
                 STHROWF("Cannot use an empty parameter name");
             }
             // Attempt to find a parameter with the specified name
-            idx = sqlite3_bind_parameter_index(SQMOD_GET_CREATED(*this)->mPtr, val.mPtr);
+            idx = sqlite3_bind_parameter_index(SQMOD_GET_CREATED(*this)->Access(), val.mPtr);
         } break;
         // Is this an integer value? (or at least can be easily converted to one)
         case OT_INTEGER:
@@ -1409,7 +1444,7 @@ void SQLiteParameter::SetIndex(const Object & param)
             // Attempt to find a parameter with the specified name
             else
             {
-                idx = sqlite3_bind_parameter_index(SQMOD_GET_CREATED(*this)->mPtr, val.mPtr);
+                idx = sqlite3_bind_parameter_index(SQMOD_GET_CREATED(*this)->Access(), val.mPtr);
             }
         } break;
         // We don't recognize this kind of value!
@@ -1432,7 +1467,7 @@ Object SQLiteParameter::GetStatement() const
 // ------------------------------------------------------------------------------------------------
 Object SQLiteParameter::GetConnection() const
 {
-    return GetConnectionObj(SQMOD_GET_VALID(*this)->mConn);
+    return GetConnectionObj(SQMOD_GET_VALID(*this)->mConnection);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -1477,7 +1512,7 @@ void SQLiteParameter::SetBool(bool value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_int(m_Handle->mPtr, m_Index, value);
+    m_Handle->mStatus = sqlite3_bind_int(m_Handle->Access(), m_Index, value);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1490,7 +1525,7 @@ void SQLiteParameter::SetChar(SQInteger value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_int(m_Handle->mPtr, m_Index, ConvTo< SQChar >::From(value));
+    m_Handle->mStatus = sqlite3_bind_int(m_Handle->Access(), m_Index, ConvTo< SQChar >::From(value));
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1503,7 +1538,7 @@ void SQLiteParameter::SetInteger(SQInteger value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_integer(m_Handle->mPtr, m_Index, value);
+    m_Handle->mStatus = sqlite3_bind_integer(m_Handle->Access(), m_Index, value);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1516,7 +1551,7 @@ void SQLiteParameter::SetInt8(SQInteger value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_int(m_Handle->mPtr, m_Index, ConvTo< int8_t >::From(value));
+    m_Handle->mStatus = sqlite3_bind_int(m_Handle->Access(), m_Index, ConvTo< int8_t >::From(value));
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1529,7 +1564,7 @@ void SQLiteParameter::SetUint8(SQInteger value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_int(m_Handle->mPtr, m_Index, ConvTo< uint8_t >::From(value));
+    m_Handle->mStatus = sqlite3_bind_int(m_Handle->Access(), m_Index, ConvTo< uint8_t >::From(value));
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1542,7 +1577,7 @@ void SQLiteParameter::SetInt16(SQInteger value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_int(m_Handle->mPtr, m_Index, ConvTo< int16_t >::From(value));
+    m_Handle->mStatus = sqlite3_bind_int(m_Handle->Access(), m_Index, ConvTo< int16_t >::From(value));
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1555,7 +1590,7 @@ void SQLiteParameter::SetUint16(SQInteger value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_int(m_Handle->mPtr, m_Index, ConvTo< uint16_t >::From(value));
+    m_Handle->mStatus = sqlite3_bind_int(m_Handle->Access(), m_Index, ConvTo< uint16_t >::From(value));
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1568,7 +1603,7 @@ void SQLiteParameter::SetInt32(SQInteger value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_int(m_Handle->mPtr, m_Index, ConvTo< int32_t >::From(value));
+    m_Handle->mStatus = sqlite3_bind_int(m_Handle->Access(), m_Index, ConvTo< int32_t >::From(value));
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1581,7 +1616,7 @@ void SQLiteParameter::SetUint32(SQInteger value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_int(m_Handle->mPtr, m_Index, static_cast< int32_t >(ConvTo< uint32_t >::From(value)));
+    m_Handle->mStatus = sqlite3_bind_int(m_Handle->Access(), m_Index, static_cast< int32_t >(ConvTo< uint32_t >::From(value)));
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1594,7 +1629,7 @@ void SQLiteParameter::SetInt64(SQInteger value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_int64(m_Handle->mPtr, m_Index, value);
+    m_Handle->mStatus = sqlite3_bind_int64(m_Handle->Access(), m_Index, value);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1607,7 +1642,7 @@ void SQLiteParameter::SetUint64(SQInteger value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_int64(m_Handle->mPtr, m_Index, value);
+    m_Handle->mStatus = sqlite3_bind_int64(m_Handle->Access(), m_Index, value);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1620,7 +1655,7 @@ void SQLiteParameter::SetFloat(SQFloat value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_double(m_Handle->mPtr, m_Index, value);
+    m_Handle->mStatus = sqlite3_bind_double(m_Handle->Access(), m_Index, value);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1633,7 +1668,7 @@ void SQLiteParameter::SetFloat32(SQFloat value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_double(m_Handle->mPtr, m_Index, ConvTo< float >::From(value));
+    m_Handle->mStatus = sqlite3_bind_double(m_Handle->Access(), m_Index, ConvTo< float >::From(value));
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1646,7 +1681,7 @@ void SQLiteParameter::SetFloat64(SQFloat value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_double(m_Handle->mPtr, m_Index, value);
+    m_Handle->mStatus = sqlite3_bind_double(m_Handle->Access(), m_Index, value);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1659,7 +1694,7 @@ void SQLiteParameter::SetString(StackStrF & value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_text(m_Handle->mPtr, m_Index, value.mPtr, static_cast<int>(value.mLen), SQLITE_TRANSIENT);
+    m_Handle->mStatus = sqlite3_bind_text(m_Handle->Access(), m_Index, value.mPtr, static_cast<int>(value.mLen), SQLITE_TRANSIENT);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1672,7 +1707,7 @@ void SQLiteParameter::SetStringRaw(const SQChar * value, SQInteger length)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_text(m_Handle->mPtr, m_Index, value, static_cast<int>(length), SQLITE_TRANSIENT);
+    m_Handle->mStatus = sqlite3_bind_text(m_Handle->Access(), m_Index, value, static_cast<int>(length), SQLITE_TRANSIENT);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1685,7 +1720,7 @@ void SQLiteParameter::SetZeroBlob(SQInteger size)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_zeroblob(m_Handle->mPtr, m_Index, ConvTo< int32_t >::From(size));
+    m_Handle->mStatus = sqlite3_bind_zeroblob(m_Handle->Access(), m_Index, ConvTo< int32_t >::From(size));
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1717,7 +1752,7 @@ void SQLiteParameter::SetBlob(const Object & value)
         len = sqstd_getblobsize(vm, -1);
     }
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_blob(m_Handle->mPtr, m_Index, ptr, static_cast<int>(len), SQLITE_TRANSIENT);
+    m_Handle->mStatus = sqlite3_bind_blob(m_Handle->Access(), m_Index, ptr, static_cast<int>(len), SQLITE_TRANSIENT);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1731,9 +1766,9 @@ void SQLiteParameter::SetData(const SqBuffer & value)
     Buffer & buff = *value.GetRef();
     // Attempt to bind the specified value
 #ifdef _SQ64
-    m_Handle->mStatus = sqlite3_bind_blob64(m_Handle->mPtr, m_Index, buff.Data(), buff.Position(), SQLITE_TRANSIENT);
+    m_Handle->mStatus = sqlite3_bind_blob64(m_Handle->Access(), m_Index, buff.Data(), buff.Position(), SQLITE_TRANSIENT);
 #else
-    m_Handle->mStatus = sqlite3_bind_blob(m_Handle->mPtr, m_Index, buff.Data(), buff.Position(), SQLITE_TRANSIENT);
+    m_Handle->mStatus = sqlite3_bind_blob(m_Handle->Access(), m_Index, buff.Data(), buff.Position(), SQLITE_TRANSIENT);
 #endif
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
@@ -1762,9 +1797,9 @@ void SQLiteParameter::SetDataEx(const SqBuffer & value, SQInteger offset, SQInte
     }
     // Attempt to bind the specified value
 #ifdef _SQ64
-    m_Handle->mStatus = sqlite3_bind_blob64(m_Handle->mPtr, m_Index, (buff.Data() + offset), static_cast< sqlite3_uint64 >(offset + length), SQLITE_TRANSIENT);
+    m_Handle->mStatus = sqlite3_bind_blob64(m_Handle->Access(), m_Index, (buff.Data() + offset), static_cast< sqlite3_uint64 >(offset + length), SQLITE_TRANSIENT);
 #else
-    m_Handle->mStatus = sqlite3_bind_blob(m_Handle->mPtr, m_Index, (buff.Data() + offset), static_cast< int >(offset + length), SQLITE_TRANSIENT);
+    m_Handle->mStatus = sqlite3_bind_blob(m_Handle->Access(), m_Index, (buff.Data() + offset), static_cast< int >(offset + length), SQLITE_TRANSIENT);
 #endif
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
@@ -1780,7 +1815,7 @@ void SQLiteParameter::SetDate(const Date & value)
     // Attempt to generate the specified date string
     auto str = fmt::format("{} 00:00:00", value.ToString());
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_text(m_Handle->mPtr, m_Index, str.data(), static_cast< int >(str.size()), SQLITE_TRANSIENT);
+    m_Handle->mStatus = sqlite3_bind_text(m_Handle->Access(), m_Index, str.data(), static_cast< int >(str.size()), SQLITE_TRANSIENT);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1803,7 +1838,7 @@ void SQLiteParameter::SetDateEx(SQInteger year, SQInteger month, SQInteger day)
     // Attempt to generate the specified date string
     auto str = fmt::format("{}-{}-{} 00:00:00", y, m, d);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_text(m_Handle->mPtr, m_Index, str.data(), static_cast< int >(str.size()), SQLITE_TRANSIENT);
+    m_Handle->mStatus = sqlite3_bind_text(m_Handle->Access(), m_Index, str.data(), static_cast< int >(str.size()), SQLITE_TRANSIENT);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1816,7 +1851,7 @@ void SQLiteParameter::SetTime(const Time & value)
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_int(m_Handle->mPtr, m_Index, static_cast<int>(value.GetTimestamp().GetSecondsI()));
+    m_Handle->mStatus = sqlite3_bind_int(m_Handle->Access(), m_Index, static_cast<int>(value.GetTimestamp().GetSecondsI()));
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1848,7 +1883,7 @@ void SQLiteParameter::SetTimeEx(SQInteger hour, SQInteger minute, SQInteger seco
         STHROWF("Second value is out of range: {} >= 60", s);
     }
     // Calculate the number of seconds in the specified time and bind the resulted value
-    m_Handle->mStatus = sqlite3_bind_int(m_Handle->mPtr, m_Index, (h * (60 * 60)) + (m * 60) + s);
+    m_Handle->mStatus = sqlite3_bind_int(m_Handle->Access(), m_Index, (h * (60 * 60)) + (m * 60) + s);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1896,7 +1931,7 @@ void SQLiteParameter::SetDatetimeEx(SQInteger year, SQInteger month, SQInteger d
     // Attempt to generate the specified date string
     auto str = fmt::format(_SC("{:04}-{:02}-{:02} {:02}:{:02}:{:02}"), y, mo, d, h, mi, s);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_text(m_Handle->mPtr, m_Index, str.data(), static_cast< int >(str.size()), SQLITE_TRANSIENT);
+    m_Handle->mStatus = sqlite3_bind_text(m_Handle->Access(), m_Index, str.data(), static_cast< int >(str.size()), SQLITE_TRANSIENT);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1909,7 +1944,7 @@ void SQLiteParameter::SetNow()
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_int(m_Handle->mPtr, m_Index,
+    m_Handle->mStatus = sqlite3_bind_int(m_Handle->Access(), m_Index,
                                             static_cast< int32_t >(std::time(nullptr)));
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
@@ -1923,7 +1958,7 @@ void SQLiteParameter::SetNull()
 {
     SQMOD_VALIDATE_CREATED(*this);
     // Attempt to bind the specified value
-    m_Handle->mStatus = sqlite3_bind_null(m_Handle->mPtr, m_Index);
+    m_Handle->mStatus = sqlite3_bind_null(m_Handle->Access(), m_Index);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -1975,7 +2010,7 @@ void SQLiteColumn::ValidateCreated(const char * file, int32_t line) const
     {
         SqThrowF(SQMOD_RTFMT("Invalid SQLite statement reference =>[{}:{}]"), file, line);
     }
-    else if (m_Handle->mPtr == nullptr)
+    else if (m_Handle->Access() == nullptr)
     {
         SqThrowF(SQMOD_RTFMT("Invalid SQLite statement =>[{}:{}]"), file, line);
     }
@@ -1992,7 +2027,7 @@ void SQLiteColumn::ValidateCreated() const
     {
         SqThrowF(fmt::runtime("Invalid SQLite statement reference"));
     }
-    else if (m_Handle->mPtr == nullptr)
+    else if (m_Handle->Access() == nullptr)
     {
         SqThrowF(fmt::runtime("Invalid SQLite statement"));
     }
@@ -2001,13 +2036,13 @@ void SQLiteColumn::ValidateCreated() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-const StmtRef & SQLiteColumn::GetValid(const char * file, int32_t line) const
+const SQLiteStmtRef & SQLiteColumn::GetValid(const char * file, int32_t line) const
 {
     Validate(file, line);
     return m_Handle;
 }
 #else
-const StmtRef & SQLiteColumn::GetValid() const
+const SQLiteStmtRef & SQLiteColumn::GetValid() const
 {
     Validate();
     return m_Handle;
@@ -2016,13 +2051,13 @@ const StmtRef & SQLiteColumn::GetValid() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-const StmtRef & SQLiteColumn::GetCreated(const char * file, int32_t line) const
+const SQLiteStmtRef & SQLiteColumn::GetCreated(const char * file, int32_t line) const
 {
     ValidateCreated(file, line);
     return m_Handle;
 }
 #else
-const StmtRef & SQLiteColumn::GetCreated() const
+const SQLiteStmtRef & SQLiteColumn::GetCreated() const
 {
     ValidateCreated();
     return m_Handle;
@@ -2161,7 +2196,7 @@ Object SQLiteColumn::GetStatement() const
 // ------------------------------------------------------------------------------------------------
 Object SQLiteColumn::GetConnection() const
 {
-    return GetConnectionObj(SQMOD_GET_VALID(*this)->mConn);
+    return GetConnectionObj(SQMOD_GET_VALID(*this)->mConnection);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -2207,7 +2242,7 @@ Object SQLiteColumn::GetValue() const
     // Obtain the initial stack size
     const StackGuard sg;
     // Identify which type of value must be pushed on the stack
-    switch (sqlite3_column_type(m_Handle->mPtr, m_Index))
+    switch (sqlite3_column_type(m_Handle->Access(), m_Index))
     {
         // Is this a null value?
         case SQLITE_NULL:
@@ -2217,28 +2252,28 @@ Object SQLiteColumn::GetValue() const
         // Is this an integer?
         case SQLITE_INTEGER:
         {
-            sq_pushinteger(SqVM(), sqlite3_column_integer(m_Handle->mPtr, m_Index));
+            sq_pushinteger(SqVM(), sqlite3_column_integer(m_Handle->Access(), m_Index));
         } break;
         // Is this a floating point?
         case SQLITE_FLOAT:
         {
             sq_pushfloat(SqVM(),
-                            ConvTo< SQFloat >::From(sqlite3_column_double(m_Handle->mPtr, m_Index)));
+                            ConvTo< SQFloat >::From(sqlite3_column_double(m_Handle->Access(), m_Index)));
         } break;
         // Is this a string?
         case SQLITE_TEXT:
         {
             sq_pushstring(SqVM(),
-                            reinterpret_cast< const SQChar * >(sqlite3_column_text(m_Handle->mPtr, m_Index)),
-                            sqlite3_column_bytes(m_Handle->mPtr, m_Index));
+                            reinterpret_cast< const SQChar * >(sqlite3_column_text(m_Handle->Access(), m_Index)),
+                            sqlite3_column_bytes(m_Handle->Access(), m_Index));
         } break;
         // Is this raw data?
         case SQLITE_BLOB:
         {
             // Retrieve the size of the blob that must be allocated
-            const int32_t size = sqlite3_column_bytes(m_Handle->mPtr, m_Index);
+            const int32_t size = sqlite3_column_bytes(m_Handle->Access(), m_Index);
             // Retrieve the the actual blob data that must be returned
-            auto data = reinterpret_cast< const char * >(sqlite3_column_blob(m_Handle->mPtr, m_Index));
+            auto data = reinterpret_cast< const char * >(sqlite3_column_blob(m_Handle->Access(), m_Index));
             // Attempt to create a buffer with the blob data on the stack
             Var< const SqBuffer & >::push(SqVM(), SqBuffer(data, size, 0));
         } break;
@@ -2256,7 +2291,7 @@ Object SQLiteColumn::GetNumber() const
     // Obtain the initial stack size
     const StackGuard sg;
     // Identify which type of value must be pushed on the stack
-    switch (sqlite3_column_type(m_Handle->mPtr, m_Index))
+    switch (sqlite3_column_type(m_Handle->Access(), m_Index))
     {
         // Is this a null value?
         case SQLITE_NULL:
@@ -2266,18 +2301,18 @@ Object SQLiteColumn::GetNumber() const
         // Is this an integer?
         case SQLITE_INTEGER:
         {
-            sq_pushinteger(SqVM(), sqlite3_column_integer(m_Handle->mPtr, m_Index));
+            sq_pushinteger(SqVM(), sqlite3_column_integer(m_Handle->Access(), m_Index));
         } break;
         // Is this a floating point?
         case SQLITE_FLOAT:
         {
             sq_pushfloat(SqVM(),
-                            ConvTo< SQFloat >::From(sqlite3_column_double(m_Handle->mPtr, m_Index)));
+                            ConvTo< SQFloat >::From(sqlite3_column_double(m_Handle->Access(), m_Index)));
         } break;
         // Is this a string?
         case SQLITE_TEXT:
         {
-            auto str = reinterpret_cast< const SQChar * >(sqlite3_column_text(m_Handle->mPtr, m_Index));
+            auto str = reinterpret_cast< const SQChar * >(sqlite3_column_text(m_Handle->Access(), m_Index));
             // Is there even a string to parse?
             if (!str || *str == '\0')
             {
@@ -2308,7 +2343,7 @@ SQInteger SQLiteColumn::GetInteger() const
 {
     SQMOD_VALIDATE_ROW(*this);
     // Return the requested information
-    return sqlite3_column_integer(m_Handle->mPtr, m_Index);
+    return sqlite3_column_integer(m_Handle->Access(), m_Index);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -2316,7 +2351,7 @@ SQFloat SQLiteColumn::GetFloat() const
 {
     SQMOD_VALIDATE_ROW(*this);
     // Return the requested information
-    return ConvTo< SQFloat >::From(sqlite3_column_double(m_Handle->mPtr, m_Index));
+    return ConvTo< SQFloat >::From(sqlite3_column_double(m_Handle->Access(), m_Index));
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -2324,7 +2359,7 @@ SQInteger SQLiteColumn::GetLong() const
 {
     SQMOD_VALIDATE_ROW(*this);
     // Return the requested information
-    return sqlite3_column_int64(m_Handle->mPtr, m_Index);
+    return sqlite3_column_int64(m_Handle->Access(), m_Index);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -2334,8 +2369,8 @@ Object SQLiteColumn::GetString() const
     // Obtain the initial stack size
     const StackGuard sg;
     // Push the column text on the stack
-    sq_pushstring(SqVM(), reinterpret_cast< const SQChar * >(sqlite3_column_text(m_Handle->mPtr, m_Index)),
-                            sqlite3_column_bytes(m_Handle->mPtr, m_Index));
+    sq_pushstring(SqVM(), reinterpret_cast< const SQChar * >(sqlite3_column_text(m_Handle->Access(), m_Index)),
+                            sqlite3_column_bytes(m_Handle->Access(), m_Index));
     // Get the object from the stack and return it
     return Var< Object >(SqVM(), -1).value;
 }
@@ -2345,7 +2380,7 @@ bool SQLiteColumn::GetBoolean() const
 {
     SQMOD_VALIDATE_ROW(*this);
     // Return the requested information
-    return sqlite3_column_int(m_Handle->mPtr, m_Index) > 0;
+    return sqlite3_column_int(m_Handle->Access(), m_Index) > 0;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -2353,7 +2388,7 @@ SQChar SQLiteColumn::GetChar() const
 {
     SQMOD_VALIDATE_ROW(*this);
     // Return the requested information
-    return (SQChar)sqlite3_column_int(m_Handle->mPtr, m_Index);
+    return (SQChar)sqlite3_column_int(m_Handle->Access(), m_Index);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -2363,9 +2398,9 @@ Object SQLiteColumn::GetBuffer() const
     // Remember the current stack size
     const StackGuard sg;
     // Retrieve the size of the blob that must be allocated
-    const int32_t size = sqlite3_column_bytes(m_Handle->mPtr, m_Index);
+    const int32_t size = sqlite3_column_bytes(m_Handle->Access(), m_Index);
     // Retrieve the the actual blob data that must be returned
-    auto data = reinterpret_cast< const char * >(sqlite3_column_blob(m_Handle->mPtr, m_Index));
+    auto data = reinterpret_cast< const char * >(sqlite3_column_blob(m_Handle->Access(), m_Index));
     // Attempt to create a buffer with the blob data on the stack
     Var< const SqBuffer & >::push(SqVM(), SqBuffer(data, size, 0));
     // Get the object from the stack and return it
@@ -2379,11 +2414,11 @@ Object SQLiteColumn::GetBlob() const
     // Obtain the initial stack size
     const StackGuard sg;
     // Obtain the size of the data
-    const int32_t sz = sqlite3_column_bytes(m_Handle->mPtr, m_Index);
+    const int32_t sz = sqlite3_column_bytes(m_Handle->Access(), m_Index);
     // Allocate a blob of the same size
     SQUserPointer p = sqstd_createblob(SqVM(), sz);
     // Obtain a pointer to the data
-    const void * b = sqlite3_column_blob(m_Handle->mPtr, m_Index);
+    const void * b = sqlite3_column_blob(m_Handle->Access(), m_Index);
     // Could the memory blob be allocated?
     if (!p)
     {
@@ -2433,7 +2468,7 @@ void SQLiteStatement::ValidateCreated(const char * file, int32_t line) const
     {
         SqThrowF(SQMOD_RTFMT("Invalid SQLite statement reference =>[{}:{}]"), file, line);
     }
-    else if (m_Handle->mPtr == nullptr)
+    else if (m_Handle->Access() == nullptr)
     {
         SqThrowF(SQMOD_RTFMT("Invalid SQLite statement =>[{}:{}]"), file, line);
     }
@@ -2445,7 +2480,7 @@ void SQLiteStatement::ValidateCreated() const
     {
         SqThrowF(fmt::runtime("Invalid SQLite statement reference"));
     }
-    else if (m_Handle->mPtr == nullptr)
+    else if (m_Handle->Access() == nullptr)
     {
         SqThrowF(fmt::runtime("Invalid SQLite statement"));
     }
@@ -2454,13 +2489,13 @@ void SQLiteStatement::ValidateCreated() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-const StmtRef & SQLiteStatement::GetValid(const char * file, int32_t line) const
+const SQLiteStmtRef & SQLiteStatement::GetValid(const char * file, int32_t line) const
 {
     Validate(file, line);
     return m_Handle;
 }
 #else
-const StmtRef & SQLiteStatement::GetValid() const
+const SQLiteStmtRef & SQLiteStatement::GetValid() const
 {
     Validate();
     return m_Handle;
@@ -2469,13 +2504,13 @@ const StmtRef & SQLiteStatement::GetValid() const
 
 // ------------------------------------------------------------------------------------------------
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-const StmtRef & SQLiteStatement::GetCreated(const char * file, int32_t line) const
+const SQLiteStmtRef & SQLiteStatement::GetCreated(const char * file, int32_t line) const
 {
     ValidateCreated(file, line);
     return m_Handle;
 }
 #else
-const StmtRef & SQLiteStatement::GetCreated() const
+const SQLiteStmtRef & SQLiteStatement::GetCreated() const
 {
     ValidateCreated();
     return m_Handle;
@@ -2561,7 +2596,7 @@ SQLiteStatement::SQLiteStatement(const SQLiteConnection & connection, StackStrF
 // ------------------------------------------------------------------------------------------------
 Object SQLiteStatement::GetConnection() const
 {
-    return Object(new SQLiteConnection(SQMOD_GET_VALID(*this)->mConn));
+    return Object(new SQLiteConnection(SQMOD_GET_VALID(*this)->mConnection));
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -2572,7 +2607,7 @@ SQLiteStatement & SQLiteStatement::Reset()
     m_Handle->mGood = false;
     m_Handle->mDone = false;
     // Attempt to reset the statement to it's initial state
-    m_Handle->mStatus = sqlite3_reset(m_Handle->mPtr);
+    m_Handle->mStatus = sqlite3_reset(m_Handle->Access());
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -2590,7 +2625,7 @@ SQLiteStatement & SQLiteStatement::Clear()
     m_Handle->mGood = false;
     m_Handle->mDone = false;
     // Attempt to clear the statement
-    m_Handle->mStatus = sqlite3_clear_bindings(m_Handle->mPtr);
+    m_Handle->mStatus = sqlite3_clear_bindings(m_Handle->Access());
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -2610,7 +2645,7 @@ int32_t SQLiteStatement::Exec()
         STHROWF("Executed without resetting first");
     }
     // Attempt to step the statement
-    m_Handle->mStatus = sqlite3_step(m_Handle->mPtr);
+    m_Handle->mStatus = sqlite3_step(m_Handle->Access());
     // Have we finished stepping?
     if (m_Handle->mStatus == SQLITE_DONE)
     {
@@ -2618,7 +2653,7 @@ int32_t SQLiteStatement::Exec()
         m_Handle->mGood = false;
         m_Handle->mDone = true;
         // Return the changes made by this statement
-        return sqlite3_changes(m_Handle->mConn->mPtr);
+        return sqlite3_changes(m_Handle->mConnection->mPtr);
     }
     // Specify that we don't have any row and we haven't finished stepping
     m_Handle->mGood = false;
@@ -2651,7 +2686,7 @@ bool SQLiteStatement::Step()
         STHROWF("Stepped without resetting first");
     }
     // Attempt to step the statement
-    m_Handle->mStatus = sqlite3_step(m_Handle->mPtr);
+    m_Handle->mStatus = sqlite3_step(m_Handle->Access());
     // Do we have a row available?
     if (m_Handle->mStatus == SQLITE_ROW)
     {
@@ -2801,7 +2836,7 @@ Table SQLiteStatement::GetTable(int32_t min, int32_t max) const
     while (min <= max)
     {
         // Attempt to obtain the column name
-        const SQChar * name = sqlite3_column_name(m_Handle->mPtr, min);
+        const SQChar * name = sqlite3_column_name(m_Handle->Access(), min);
         // Validate the obtained name
         if (!name)
         {
@@ -2824,7 +2859,7 @@ SQLiteTransaction::SQLiteTransaction(const SQLiteConnection & db)
 }
 
 // ------------------------------------------------------------------------------------------------
-SQLiteTransaction::SQLiteTransaction(ConnRef  db)
+SQLiteTransaction::SQLiteTransaction(SQLiteConnRef  db)
     : m_Handle(std::move(db)), m_Committed(false)
 {
     // Was the specified database connection valid?
@@ -2833,7 +2868,7 @@ SQLiteTransaction::SQLiteTransaction(ConnRef  db)
         STHROWF("Invalid connection handle");
     }
     // Attempt to begin transaction
-    m_Handle->mStatus = sqlite3_exec(m_Handle->mPtr, "BEGIN", nullptr, nullptr, nullptr);
+    m_Handle->mStatus = sqlite3_exec(m_Handle->Access(), "BEGIN", nullptr, nullptr, nullptr);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -2850,7 +2885,7 @@ SQLiteTransaction::~SQLiteTransaction()
         return; // We're done here!
     }
     // Attempt to roll back changes because this failed to commit
-    m_Handle->mStatus = sqlite3_exec(m_Handle->mPtr, "ROLLBACK", nullptr, nullptr, nullptr);
+    m_Handle->mStatus = sqlite3_exec(m_Handle->Access(), "ROLLBACK", nullptr, nullptr, nullptr);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {
@@ -2873,7 +2908,7 @@ bool SQLiteTransaction::Commit()
         STHROWF("Transaction was already committed");
     }
     // Attempt to commit the change during this transaction
-    m_Handle->mStatus = sqlite3_exec(m_Handle->mPtr, "COMMIT", nullptr, nullptr, nullptr);
+    m_Handle->mStatus = sqlite3_exec(m_Handle->Access(), "COMMIT", nullptr, nullptr, nullptr);
     // Validate the result
     if (m_Handle->mStatus != SQLITE_OK)
     {

module/Library/SQLite.hpp

@@ -2,6 +2,7 @@
 
 // ------------------------------------------------------------------------------------------------
 #include "Core/Utility.hpp"
+#include "Core/ThreadPool.hpp"
 
 // ------------------------------------------------------------------------------------------------
 #include "Library/IO/Buffer.hpp"
@@ -10,6 +11,10 @@
 #include "Library/Chrono/Time.hpp"
 #include "Library/Chrono/Timestamp.hpp"
 
+// ------------------------------------------------------------------------------------------------
+#include "Poco/AutoPtr.h"
+#include "Poco/Data/SessionImpl.h"
+
 // ------------------------------------------------------------------------------------------------
 #include <utility>
 #include <vector>
@@ -78,18 +83,18 @@ struct SQLiteStmtHnd;
 /* ------------------------------------------------------------------------------------------------
  * Common typedefs.
 */
-typedef SharedPtr< SQLiteConnHnd > ConnRef;
-typedef SharedPtr< SQLiteStmtHnd > StmtRef;
+typedef SharedPtr< SQLiteConnHnd > SQLiteConnRef;
+typedef SharedPtr< SQLiteStmtHnd > SQLiteStmtRef;
 
 /* ------------------------------------------------------------------------------------------------
  * Obtain a script object from a connection handle. (meant to avoid having to include the header)
 */
-Object GetConnectionObj(const ConnRef & conn);
+Object GetConnectionObj(const SQLiteConnRef & conn);
 
 /* ------------------------------------------------------------------------------------------------
  * Obtain a script object from a statement handle. (meant to avoid having to include the header)
 */
-Object GetStatementObj(const StmtRef & stmt);
+Object GetStatementObj(const SQLiteStmtRef & stmt);
 
 /* ------------------------------------------------------------------------------------------------
  * Tests if a certain query string is empty.
@@ -178,6 +183,9 @@ public:
     String      mName; // The specified name to be used as the database file.
     String      mVFS; // The specified virtual file system.
 
+    // --------------------------------------------------------------------------------------------
+    Poco::AutoPtr< Poco::Data::SessionImpl > mSession; // POCO session when this connection comes from a pool.
+
     // --------------------------------------------------------------------------------------------
     bool        mMemory; // Whether the database exists in memory and not disk.
     bool        mTrace; // Whether tracing was activated on the database.
@@ -188,6 +196,16 @@ public:
     */
     SQLiteConnHnd();
 
+    /* --------------------------------------------------------------------------------------------
+     * Explicit constructor.
+    */
+    explicit SQLiteConnHnd(Poco::Data::SessionImpl * session);
+
+    /* --------------------------------------------------------------------------------------------
+     * Explicit constructor.
+    */
+    explicit SQLiteConnHnd(Poco::AutoPtr< Poco::Data::SessionImpl > && session);
+
     /* --------------------------------------------------------------------------------------------
      * Copy constructor. (disabled)
     */
@@ -254,6 +272,20 @@ public:
     {
         return sqlite3_extended_errcode(mPtr);
     }
+
+    /* --------------------------------------------------------------------------------------------
+     * Access the connection pointer.
+    */
+    SQMOD_NODISCARD Pointer Access() const
+    {
+        if (!mSession.isNull()) {
+            // Only reason this is necessary is to dirty the connection handle access time-stamp
+            // So it won't be closed/collected when it comes from a connection/session-pool
+            [[maybe_unused]] auto _ = mSession->isConnected();
+        }
+        // We yield access to the pointer anyway
+        return mPtr;
+    }
 };
 
 /* ------------------------------------------------------------------------------------------------
@@ -286,7 +318,7 @@ public:
     int32_t     mStatus; // The last status code of this connection handle.
 
     // --------------------------------------------------------------------------------------------
-    ConnRef     mConn; // The handle to the associated database connection.
+    SQLiteConnRef   mConnection; // The handle to the associated database connection.
 
     // --------------------------------------------------------------------------------------------
     String      mQuery; // The query string used to create this statement.
@@ -303,7 +335,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Default constructor.
     */
-    explicit SQLiteStmtHnd(ConnRef conn);
+    explicit SQLiteStmtHnd(SQLiteConnRef conn);
 
     /* --------------------------------------------------------------------------------------------
      * Copy constructor. (disabled)
@@ -375,6 +407,20 @@ public:
      * Return the extended numeric result code for the most recent failed API call (if any).
     */
     SQMOD_NODISCARD int32_t ExErrNo() const;
+
+    /* --------------------------------------------------------------------------------------------
+     * Access the statement pointer.
+    */
+    SQMOD_NODISCARD Pointer Access() const
+    {
+        if (bool(mConnection) && !(mConnection->mSession.isNull())) {
+            // Only reason this is necessary is to dirty the connection handle access time-stamp
+            // So it won't be closed/collected when it comes from a connection/session-pool
+            [[maybe_unused]] auto _ = mConnection->mSession->isConnected();
+        }
+        // We yield access to the pointer anyway
+        return mPtr;
+    }
 };
 
 /* ------------------------------------------------------------------------------------------------
@@ -385,7 +431,7 @@ class SQLiteConnection
 private:
 
     // --------------------------------------------------------------------------------------------
-    ConnRef m_Handle; // Reference to the managed connection.
+    SQLiteConnRef m_Handle; // Reference to the managed connection.
 
 protected:
 
@@ -421,18 +467,18 @@ protected:
      * Validate the managed connection handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD const ConnRef & GetValid(const char * file, int32_t line) const;
+    SQMOD_NODISCARD const SQLiteConnRef & GetValid(const char * file, int32_t line) const;
 #else
-    SQMOD_NODISCARD const ConnRef & GetValid() const;
+    SQMOD_NODISCARD const SQLiteConnRef & GetValid() const;
 #endif // _DEBUG
 
     /* --------------------------------------------------------------------------------------------
      * Validate the managed connection handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD const ConnRef & GetCreated(const char * file, int32_t line) const;
+    SQMOD_NODISCARD const SQLiteConnRef & GetCreated(const char * file, int32_t line) const;
 #else
-    SQMOD_NODISCARD const ConnRef & GetCreated() const;
+    SQMOD_NODISCARD const SQLiteConnRef & GetCreated() const;
 #endif // _DEBUG
 
 public:
@@ -479,7 +525,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Direct handle constructor.
     */
-    explicit SQLiteConnection(ConnRef c)
+    explicit SQLiteConnection(SQLiteConnRef c)
         : m_Handle(std::move(c))
     {
         /* ... */
@@ -526,7 +572,7 @@ public:
     */
     operator sqlite3 * () //NOLINT (intentionally implicit)
     {
-        return m_Handle ? m_Handle->mPtr : nullptr;
+        return m_Handle ? m_Handle->Access() : nullptr;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -534,7 +580,7 @@ public:
     */
     operator sqlite3 * () const //NOLINT (intentionally implicit)
     {
-        return m_Handle ? m_Handle->mPtr : nullptr;
+        return m_Handle ? m_Handle->Access() : nullptr;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -548,7 +594,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Retrieve the associated connection handle.
     */
-    SQMOD_NODISCARD const ConnRef & GetHandle() const
+    SQMOD_NODISCARD const SQLiteConnRef & GetHandle() const
     {
         return m_Handle;
     }
@@ -566,7 +612,7 @@ public:
     */
     SQMOD_NODISCARD bool IsConnected() const
     {
-        return m_Handle && (m_Handle->mPtr != nullptr);
+        return m_Handle && (m_Handle->Access() != nullptr);
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -679,6 +725,16 @@ public:
     */
     Object Query(StackStrF & str) const;
 
+    /* --------------------------------------------------------------------------------------------
+     * Attempt to execute the specified query asynchronously.
+    */
+    LightObj AsyncExec(StackStrF & str);
+
+    /* --------------------------------------------------------------------------------------------
+     * Attempt to create a statement from the specified query asynchronously.
+    */
+    LightObj AsyncQuery(StackStrF & str) const;
+
     /* --------------------------------------------------------------------------------------------
      * See if the database connection was opened in read-only mode.
     */
@@ -857,8 +913,8 @@ class SQLiteParameter
 private:
 
     // --------------------------------------------------------------------------------------------
-    int32_t     m_Index{0}; // The index of the managed parameter.
-    StmtRef     m_Handle{}; // Reference to the managed statement.
+    int32_t         m_Index{0}; // The index of the managed parameter.
+    SQLiteStmtRef   m_Handle{}; // Reference to the managed statement.
 
 protected:
 
@@ -884,18 +940,18 @@ protected:
      * Validate the managed statement handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD const StmtRef & GetValid(const char * file, int32_t line) const;
+    SQMOD_NODISCARD const SQLiteStmtRef & GetValid(const char * file, int32_t line) const;
 #else
-    SQMOD_NODISCARD const StmtRef & GetValid() const;
+    SQMOD_NODISCARD const SQLiteStmtRef & GetValid() const;
 #endif // _DEBUG
 
     /* --------------------------------------------------------------------------------------------
      * Validate the managed statement handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD const StmtRef & GetCreated(const char * file, int32_t line) const;
+    SQMOD_NODISCARD const SQLiteStmtRef & GetCreated(const char * file, int32_t line) const;
 #else
-    SQMOD_NODISCARD const StmtRef & GetCreated() const;
+    SQMOD_NODISCARD const SQLiteStmtRef & GetCreated() const;
 #endif // _DEBUG
 
     /* --------------------------------------------------------------------------------------------
@@ -943,7 +999,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * No parameter constructor.
     */
-    explicit SQLiteParameter(StmtRef stmt)
+    explicit SQLiteParameter(SQLiteStmtRef stmt)
         : m_Index(0), m_Handle(std::move(stmt))
     {
         /* ... */
@@ -952,7 +1008,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Index constructor.
     */
-    SQLiteParameter(StmtRef stmt, int32_t idx)
+    SQLiteParameter(SQLiteStmtRef stmt, int32_t idx)
         : m_Index(idx), m_Handle(std::move(stmt))
     {
         SQMOD_VALIDATE_PARAM(*this, m_Index);
@@ -961,7 +1017,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Name constructor.
     */
-    SQLiteParameter(const StmtRef & stmt, const SQChar * name)
+    SQLiteParameter(const SQLiteStmtRef & stmt, const SQChar * name)
         : m_Index(stmt ? sqlite3_bind_parameter_index(stmt->mPtr, name) : 0), m_Handle(stmt)
     {
         SQMOD_VALIDATE_PARAM(*this, m_Index);
@@ -970,7 +1026,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Dynamic constructor.
     */
-    SQLiteParameter(StmtRef stmt, const Object & param)
+    SQLiteParameter(SQLiteStmtRef stmt, const Object & param)
         : m_Index(0), m_Handle(std::move(stmt))
     {
         if (!m_Handle)
@@ -1033,7 +1089,7 @@ public:
         // Can we attempt to return the parameter name?
         if (m_Handle && m_Index)
         {
-            const SQChar * val = sqlite3_bind_parameter_name(m_Handle->mPtr, m_Index);
+            const SQChar * val = sqlite3_bind_parameter_name(m_Handle->Access(), m_Index);
             // Return the value if valid
             return val ? val : String{};
         }
@@ -1252,7 +1308,7 @@ private:
 
     // --------------------------------------------------------------------------------------------
     int32_t     m_Index{-1}; // The index of the managed column.
-    StmtRef     m_Handle{}; // The statement where the column exist.
+    SQLiteStmtRef     m_Handle{}; // The statement where the column exist.
 
 protected:
 
@@ -1278,18 +1334,18 @@ protected:
      * Validate the managed statement handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD const StmtRef & GetValid(const char * file, int32_t line) const;
+    SQMOD_NODISCARD const SQLiteStmtRef & GetValid(const char * file, int32_t line) const;
 #else
-    SQMOD_NODISCARD const StmtRef & GetValid() const;
+    SQMOD_NODISCARD const SQLiteStmtRef & GetValid() const;
 #endif // _DEBUG
 
     /* --------------------------------------------------------------------------------------------
      * Validate the managed statement handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD const StmtRef & GetCreated(const char * file, int32_t line) const;
+    SQMOD_NODISCARD const SQLiteStmtRef & GetCreated(const char * file, int32_t line) const;
 #else
-    SQMOD_NODISCARD const StmtRef & GetCreated() const;
+    SQMOD_NODISCARD const SQLiteStmtRef & GetCreated() const;
 #endif // _DEBUG
 
     /* --------------------------------------------------------------------------------------------
@@ -1346,7 +1402,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * No column constructor.
     */
-    explicit SQLiteColumn(StmtRef stmt)
+    explicit SQLiteColumn(SQLiteStmtRef stmt)
         : m_Index(-1), m_Handle(std::move(stmt))
     {
         /* ... */
@@ -1355,7 +1411,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Index constructor.
     */
-    SQLiteColumn(StmtRef stmt, int32_t idx)
+    SQLiteColumn(SQLiteStmtRef stmt, int32_t idx)
         : m_Index(idx), m_Handle(std::move(stmt))
     {
         SQMOD_VALIDATE_COLUMN(*this, m_Index);
@@ -1364,7 +1420,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Name constructor.
     */
-    SQLiteColumn(const StmtRef & stmt, const SQChar * name)
+    SQLiteColumn(const SQLiteStmtRef & stmt, const SQChar * name)
         : m_Index(stmt ? stmt->GetColumnIndex(name) : -1), m_Handle(stmt)
     {
         SQMOD_VALIDATE_COLUMN(*this, m_Index);
@@ -1373,7 +1429,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Dynamic constructor.
     */
-    SQLiteColumn(StmtRef stmt, const Object & column)
+    SQLiteColumn(SQLiteStmtRef stmt, const Object & column)
         : m_Index(-1), m_Handle(std::move(stmt))
     {
         if (!m_Handle)
@@ -1436,7 +1492,7 @@ public:
         // Can we attempt to return the parameter name?
         if (m_Handle && m_Index)
         {
-            const SQChar * val = sqlite3_column_name(m_Handle->mPtr, m_Index);
+            const SQChar * val = sqlite3_column_name(m_Handle->Access(), m_Index);
             // Return the value if valid
             return val ? val : String{};
         }
@@ -1573,7 +1629,7 @@ class SQLiteStatement
 private:
 
     // --------------------------------------------------------------------------------------------
-    StmtRef m_Handle; // Reference to the managed statement.
+    SQLiteStmtRef m_Handle; // Reference to the managed statement.
 
 protected:
 
@@ -1599,18 +1655,18 @@ protected:
      * Validate the managed statement handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD const StmtRef & GetValid(const char * file, int32_t line) const;
+    SQMOD_NODISCARD const SQLiteStmtRef & GetValid(const char * file, int32_t line) const;
 #else
-    SQMOD_NODISCARD const StmtRef & GetValid() const;
+    SQMOD_NODISCARD const SQLiteStmtRef & GetValid() const;
 #endif // _DEBUG
 
     /* --------------------------------------------------------------------------------------------
      * Validate the managed statement handle and throw an error if invalid.
     */
 #if defined(_DEBUG) || defined(SQMOD_EXCEPTLOC)
-    SQMOD_NODISCARD const StmtRef & GetCreated(const char * file, int32_t line) const;
+    SQMOD_NODISCARD const SQLiteStmtRef & GetCreated(const char * file, int32_t line) const;
 #else
-    SQMOD_NODISCARD const StmtRef & GetCreated() const;
+    SQMOD_NODISCARD const SQLiteStmtRef & GetCreated() const;
 #endif // _DEBUG
 
     /* --------------------------------------------------------------------------------------------
@@ -1654,12 +1710,21 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Construct a statement under the specified connection using the specified string.
     */
-    SQLiteStatement(const ConnRef & connection, StackStrF & query)
+    SQLiteStatement(const SQLiteConnRef & connection, StackStrF & query)
         : m_Handle(new SQLiteStmtHnd(connection))
     {
         SQMOD_GET_VALID(*this)->Create(query.mPtr, query.mLen);
     }
 
+    /* --------------------------------------------------------------------------------------------
+     * Construct a statement under the specified connection using the specified string.
+    */
+    SQLiteStatement(const SQLiteConnRef & connection, const SQChar * query, SQInteger length)
+        : m_Handle(new SQLiteStmtHnd(connection))
+    {
+        SQMOD_GET_VALID(*this)->Create(query, length);
+    }
+
     /* --------------------------------------------------------------------------------------------
      * Construct a statement under the specified connection using the specified string.
     */
@@ -1668,7 +1733,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Direct handle constructor.
     */
-    explicit SQLiteStatement(StmtRef  s)
+    explicit SQLiteStatement(SQLiteStmtRef s)
         : m_Handle(std::move(s))
     {
         /* ... */
@@ -1715,7 +1780,7 @@ public:
     */
     operator sqlite3_stmt * () // NOLINT(google-explicit-constructor,hicpp-explicit-conversions)
     {
-        return m_Handle ? m_Handle->mPtr : nullptr;
+        return m_Handle ? m_Handle->Access() : nullptr;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1723,7 +1788,7 @@ public:
     */
     operator sqlite3_stmt * () const // NOLINT(google-explicit-constructor,hicpp-explicit-conversions)
     {
-        return m_Handle ? m_Handle->mPtr : nullptr;
+        return m_Handle ? m_Handle->Access() : nullptr;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1737,7 +1802,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Retrieve the associated statement handle.
     */
-    SQMOD_NODISCARD const StmtRef & GetHandle() const
+    SQMOD_NODISCARD const SQLiteStmtRef & GetHandle() const
     {
         return m_Handle;
     }
@@ -1755,7 +1820,7 @@ public:
     */
     SQMOD_NODISCARD bool IsPrepared() const
     {
-        return m_Handle && (m_Handle->mPtr != nullptr);
+        return m_Handle && (m_Handle->Access() != nullptr);
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -2436,7 +2501,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Construct using the direct connection handle.
     */
-    explicit SQLiteTransaction(ConnRef db);
+    explicit SQLiteTransaction(SQLiteConnRef db);
 
     /* --------------------------------------------------------------------------------------------
      * Copy constructor. (disabled)
@@ -2495,7 +2560,7 @@ public:
 private:
 
     // --------------------------------------------------------------------------------------------
-    ConnRef     m_Handle{}; // The database connection handle where the transaction began.
+    SQLiteConnRef     m_Handle{}; // The database connection handle where the transaction began.
     bool        m_Committed{false}; // Whether changes were successfully committed to the database.
 };
 

module/Library/System/Dir.hpp

@@ -594,7 +594,7 @@ public:
 #if defined(UNICODE) || defined(_UNICODE)
         return String(mHandle->extension, mHandle->extension + std::wcslen(mHandle->extension));
 #else
-        return String(mHandle->name);
+        return String(mHandle->extension);
 #endif
     }
 };

module/Library/Utils.cpp

@@ -8,6 +8,9 @@
 // ------------------------------------------------------------------------------------------------
 namespace SqMod {
 
+// ------------------------------------------------------------------------------------------------
+SQMOD_DECL_TYPENAME(SqIdPoolTypename, _SC("SqIdPool"))
+
 /* ------------------------------------------------------------------------------------------------
  * Probably not the best implementation but should cover all sorts of weird cases.
 */
@@ -83,15 +86,18 @@ static SQInteger SqExtractIPv4(HSQUIRRELVM vm)
 }
 
 // ------------------------------------------------------------------------------------------------
+extern void Register_IdPool(HSQUIRRELVM vm, Table & ns);
 extern void Register_Vector(HSQUIRRELVM vm, Table & ns);
 extern void Register_Native_String(HSQUIRRELVM vm, Table & ns);
 extern void Register_ServerAnnouncer(HSQUIRRELVM vm, Table & ns);
 
+
 // ================================================================================================
 void Register_Utils(HSQUIRRELVM vm)
 {
     Table ns(vm);
 
+    Register_IdPool(vm, ns);
     Register_Vector(vm, ns);
     Register_Native_String(vm, ns);
     Register_ServerAnnouncer(vm, ns);
@@ -101,4 +107,35 @@ void Register_Utils(HSQUIRRELVM vm)
     RootTable(vm).Bind(_SC("SqUtils"), ns);
 }
 
+// ------------------------------------------------------------------------------------------------
+void Register_IdPool(HSQUIRRELVM vm, Table & ns)
+{
+ // --------------------------------------------------------------------------------------------
+    ns.Bind(_SC("IdPool"),
+        Class< SqIdPool, NoCopy< SqIdPool > >(vm, SqIdPoolTypename::Str)
+        // Constructors
+        .Ctor()
+        .template Ctor< SqIdPool::Type >()
+        .template Ctor< SqIdPool::Type, SqIdPool::Type >()
+        // Meta-methods
+        .SquirrelFunc(_SC("_typename"), &SqIdPoolTypename::Fn)
+        // Member Variables
+        .ConstVar(_SC("Next"), &SqIdPool::mNext)
+        .ConstVar(_SC("Step"), &SqIdPool::mStep)
+        .ConstVar(_SC("Start"), &SqIdPool::mStart)
+        // Properties
+        .Prop(_SC("FreeCount"), &SqIdPool::FreeCount)
+        .Prop(_SC("UsedCount"), &SqIdPool::UsedCount)
+        // Member Methods
+        .Func(_SC("Reset"), &SqIdPool::Reset)
+        .Func(_SC("Acquire"), &SqIdPool::Acquire)
+        .Func(_SC("Release"), &SqIdPool::Release)
+        .Func(_SC("Using"), &SqIdPool::Using)
+        .Func(_SC("EachUsed"), &SqIdPool::EachUsed)
+        .Func(_SC("WhileUsed"), &SqIdPool::WhileUsed)
+        .Func(_SC("EachFree"), &SqIdPool::EachFree)
+        .Func(_SC("WhileFree"), &SqIdPool::WhileFree)
+    );
+}
+
 } // Namespace:: SqMod

module/Library/Utils.hpp

@@ -6,4 +6,187 @@
 // ------------------------------------------------------------------------------------------------
 namespace SqMod {
 
+/* ------------------------------------------------------------------------------------------------
+ * Helper utility used to provide reusable unique IDs of signed integer type.
+ * It is not thread-safe since the script runs in single-threaded mode.
+*/
+struct SqIdPool
+{
+    using Type = SQInteger; // Type that is used to represent an ID.
+    using Pool = std::vector< Type >; // Container for both used and unused IDs.
+
+    // --------------------------------------------------------------------------------------------
+    // Pool of available IDs.
+    Pool mPool{};
+    // Pool of currently used IDs.
+    Pool mUsed{};
+    // The ID that will be generated next time the pool is empty.
+    Type mNext{0};
+    // How much to increment with each ID.
+    Type mStep{1};
+    // Where to start generating IDs.
+    Type mStart{0};
+
+    /* --------------------------------------------------------------------------------------------
+     * Base constructors.
+    */
+    SqIdPool() noexcept = default;
+    SqIdPool(Type start) noexcept
+        : SqIdPool(start, 1)
+    {
+    }
+    SqIdPool(Type start, Type step) noexcept
+        : mPool(), mUsed(), mNext(start), mStep(step), mStart(start)
+    {
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy/Move constructors (disabled).
+    */
+    SqIdPool(const SqIdPool &) noexcept = delete;
+    SqIdPool(SqIdPool &&) noexcept = delete;
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy/Move assignment operators (disabled).
+    */
+    SqIdPool & operator = (const SqIdPool &) noexcept = delete;
+    SqIdPool & operator = (SqIdPool &&) noexcept = delete;
+
+    /* --------------------------------------------------------------------------------------------
+     * Discard all current IDs (free and used) and reset the start to the specified start.
+     * This invalidates all IDs that are currently left in use.
+    */
+    void Reset()
+    {
+        mNext = mStart;
+        mPool.clear();
+        mUsed.clear();
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Acquire a unique ID from the pool.
+    */
+    SQMOD_NODISCARD Type Acquire()
+    {
+        Type id = mNext;
+        // Do we have some reusable IDs?
+        if (mPool.empty())
+        {
+            mNext += mStep; // Create a new one and update the next one
+        }
+        else
+        {
+            id = mPool.back(); // Get one from the back of the pool
+            mPool.pop_back(); // Remove it from the free pool
+        }
+        // Store it in the list of active IDs
+        mUsed.push_back(id);
+        // Return this ID
+        return id;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Release a unique ID back to the pool.
+    */
+    bool Release(Type id)
+    {
+        // Find the specified ID into 
+        for (Pool::size_type i = 0; i < mUsed.size(); ++i)
+        {
+            // Is this the ID we're looking for?
+            if (mUsed[i] == id)
+            {
+                // Swap the element with the last one
+                std::swap(mUsed[i], mUsed.back());
+                // Remove the last element
+                mUsed.pop_back();
+                // Make this ID available, again
+                mPool.push_back(id);
+                // We actually found this ID
+                return true;
+            }
+        }
+        // This ID does not belong to this pool
+        return false;
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Check if the pool has the specified ID currently in use.
+    */
+    SQMOD_NODISCARD bool Using(Type id)
+    {
+        return std::find(mUsed.begin(), mUsed.end(), id) != mUsed.end();
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve the number of IDs that are currently available in the free pool.
+    */
+    SQMOD_NODISCARD SQInteger FreeCount() const
+    {
+        return mPool.size();
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Retrieve the number of IDs that are currently in use.
+    */
+    SQMOD_NODISCARD SQInteger UsedCount() const
+    {
+        return mUsed.size();
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Iterate all used IDs through a functor.
+    */
+    void EachUsed(Function & fn) const
+    {
+        for (const auto & id : mUsed)
+        {
+            fn.Execute(id);
+        }
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Iterate all used IDs through a functor until stopped (i.e false is returned).
+    */
+    void WhileUsed(Function & fn) const
+    {
+        for (const auto & id : mUsed)
+        {
+            auto ret = fn.Eval(id);
+            // (null || true) == continue & false == break
+            if (!ret.IsNull() || !ret.template Cast< bool >())
+            {
+                break;
+            }
+        }
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Iterate all free IDs through a functor.
+    */
+    void EachFree(Function & fn) const
+    {
+        for (const auto & id : mPool)
+        {
+            fn.Execute(id);
+        }
+    }
+
+    /* --------------------------------------------------------------------------------------------
+     * Iterate all free IDs through a functor until stopped (i.e false is returned).
+    */
+    void WhileFree(Function & fn) const
+    {
+        for (const auto & id : mPool)
+        {
+            auto ret = fn.Eval(id);
+            // (null || true) == continue & false == break
+            if (!ret.IsNull() || !ret.template Cast< bool >())
+            {
+                break;
+            }
+        }
+    }
+};
+
 } // Namespace:: SqMod

module/Library/XML.cpp

@@ -138,9 +138,10 @@ SQInteger XmlAttribute::GetLong() const
 }
 
 // ------------------------------------------------------------------------------------------------
-void XmlAttribute::SetLong(SQInteger value)
+XmlAttribute & XmlAttribute::SetLong(SQInteger value)
 {
     m_Attr = value;
+    return *this;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -150,9 +151,10 @@ SQInteger XmlAttribute::GetUlong() const
 }
 
 // ------------------------------------------------------------------------------------------------
-void XmlAttribute::SetUlong(SQInteger value)
+XmlAttribute & XmlAttribute::SetUlong(SQInteger value)
 {
     m_Attr = static_cast< uint64_t >(value);
+    return *this;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -186,9 +188,10 @@ SQInteger XmlText::GetLong() const
 }
 
 // ------------------------------------------------------------------------------------------------
-void XmlText::SetLong(SQInteger value)
+XmlText & XmlText::SetLong(SQInteger value)
 {
     m_Text = value;
+    return *this;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -198,9 +201,10 @@ SQInteger XmlText::GetUlong() const
 }
 
 // ------------------------------------------------------------------------------------------------
-void XmlText::SetUlong(SQInteger value)
+XmlText & XmlText::SetUlong(SQInteger value)
 {
     m_Text = static_cast< uint64_t >(value);
+    return *this;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -259,8 +263,8 @@ void Register_XML(HSQUIRRELVM vm)
         .Prop(_SC("Next"), &XmlAttribute::NextAttribute)
         .Prop(_SC("Prev"), &XmlAttribute::PrevAttribute)
         // Member Methods
-        .Func(_SC("SetName"), &XmlAttribute::ApplyName)
-        .Func(_SC("SetValue"), &XmlAttribute::ApplyValue)
+        .FmtFunc(_SC("SetName"), &XmlAttribute::SetName)
+        .FmtFunc(_SC("SetValue"), &XmlAttribute::ApplyValue)
         .Func(_SC("AsString"), &XmlAttribute::AsString)
         .Func(_SC("AsInt"), &XmlAttribute::AsInt)
         .Func(_SC("AsUint"), &XmlAttribute::AsUint)
@@ -350,8 +354,8 @@ void Register_XML(HSQUIRRELVM vm)
         .Overload(_SC("AppendBuffer"), &XmlNode::AppendBuffer1)
         .Overload(_SC("AppendBuffer"), &XmlNode::AppendBuffer2)
         .Overload(_SC("AppendBuffer"), &XmlNode::AppendBuffer3)
-        .Func(_SC("SetName"), &XmlNode::ApplyName)
-        .Func(_SC("SetValue"), &XmlNode::ApplyValue)
+        .FmtFunc(_SC("SetName"), &XmlNode::SetName)
+        .FmtFunc(_SC("SetValue"), &XmlNode::ApplyValue)
         .Func(_SC("GetChild"), &XmlNode::Child)
         .Func(_SC("GetAttr"), &XmlNode::GetAttribute)
         .Func(_SC("GetAttribute"), &XmlNode::GetAttribute)
@@ -368,8 +372,8 @@ void Register_XML(HSQUIRRELVM vm)
         .Func(_SC("PrependAttrCopy"), &XmlNode::PrependAttrCopy)
         .Func(_SC("InsertAttrCopyAfter"), &XmlNode::InsertAttrCopyAfter)
         .Func(_SC("InsertAttrCopyBefore"), &XmlNode::InsertAttrCopyBefore)
-        .Func(_SC("AppendChild"), &XmlNode::AppendChild)
-        .Func(_SC("PrependChild"), &XmlNode::PrependChild)
+        .FmtFunc(_SC("AppendChild"), &XmlNode::AppendChild)
+        .FmtFunc(_SC("PrependChild"), &XmlNode::PrependChild)
         .Func(_SC("AppendChildNode"), &XmlNode::AppendChildNode)
         .Func(_SC("PrependChildNode"), &XmlNode::PrependChildNode)
         .Func(_SC("AppendChildType"), &XmlNode::AppendChildType)
@@ -386,9 +390,9 @@ void Register_XML(HSQUIRRELVM vm)
         .Func(_SC("PrependMove"), &XmlNode::PrependMove)
         .Func(_SC("InsertMoveAfter"), &XmlNode::InsertMoveAfter)
         .Func(_SC("InsertMoveBefore"), &XmlNode::InsertMoveBefore)
-        .Func(_SC("RemoveAttr"), &XmlNode::RemoveAttr)
+        .FmtFunc(_SC("RemoveAttr"), &XmlNode::RemoveAttr)
         .Func(_SC("RemoveAttrInst"), &XmlNode::RemoveAttrInst)
-        .Func(_SC("RemoveChild"), &XmlNode::RemoveChild)
+        .FmtFunc(_SC("RemoveChild"), &XmlNode::RemoveChild)
         .Func(_SC("RemoveChildInst"), &XmlNode::RemoveChildInst)
         .Overload(_SC("FindChildByAttr"), &XmlNode::FindChildByAttr2)
         .Overload(_SC("FindChildByAttr"), &XmlNode::FindChildByAttr3)
@@ -421,7 +425,7 @@ void Register_XML(HSQUIRRELVM vm)
         .Overload(_SC("SaveFile"), &XmlDocument::SaveFile4)
     );
 
-    RootTable(vm).Bind(_SC("SqXml"), xmlns);
+    RootTable(vm).Bind(_SC("SqXML"), xmlns);
 
     ConstTable(vm).Enum(_SC("SqXmlNodeType"), Enumeration(vm)
         .Const(_SC("Null"),                     static_cast< int32_t >(node_null))

module/Library/XML.hpp

@@ -663,7 +663,7 @@ protected:
      * Explicit constructor.
     */
     XmlNode(DocumentRef doc, const Type & node)
-        : m_Doc(std::move(doc)), m_Node(node)
+        : m_Node(node), m_Doc(std::move(doc))
     {
         /* ... */
     }
@@ -671,8 +671,8 @@ protected:
 private:
 
     // ---------------------------------------------------------------------------------------------
-    DocumentRef  m_Doc{}; // The main xml document instance.
     Type         m_Node{}; // The managed document node.
+    DocumentRef  m_Doc{}; // The main xml document instance.
 
 public:
 
@@ -777,20 +777,13 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify node name.
     */
-    void SetName(StackStrF & name)
+    XmlNode & SetName(StackStrF & name)
     {
         if (!m_Node.set_name(name.mPtr))
         {
-            STHROWF("Unable to set XML node name");
+            STHROWF("Unable to set XML node name `{}`", name.ToStr());
         }
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Modify the node name.
-    */
-    bool ApplyName(StackStrF & name)
-    {
-        return m_Node.set_name(name.mPtr);
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -804,12 +797,13 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify node value.
     */
-    void SetValue(StackStrF & name)
+    XmlNode & SetValue(StackStrF & name)
     {
         if (!m_Node.set_value(name.mPtr))
         {
             STHROWF("Unable to set XML node value");
         }
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1331,20 +1325,13 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Retrieve attribute name.
     */
-    void SetName(StackStrF & name)
+    XmlAttribute & SetName(StackStrF & name)
     {
         if (!m_Attr.set_name(name.mPtr))
         {
-            STHROWF("Unable to set XML attribute name");
+            STHROWF("Unable to set XML attribute name `{}`", name.ToStr());
         }
-    }
-
-    /* --------------------------------------------------------------------------------------------
-     * Modify the attribute name.
-    */
-    bool ApplyName(StackStrF & name)
-    {
-        return m_Attr.set_name(name.mPtr);
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1358,12 +1345,13 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Retrieve attribute value.
     */
-    void SetValue(StackStrF & name)
+    XmlAttribute SetValue(StackStrF & name)
     {
         if (!m_Attr.set_value(name.mPtr))
         {
             STHROWF("Unable to set XML attribute value");
         }
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1501,9 +1489,10 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a string.
     */
-    void SetString(StackStrF & value)
+    XmlAttribute & SetString(StackStrF & value)
     {
         m_Attr = value.mPtr;
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1517,9 +1506,10 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a integer.
     */
-    void SetInt(int32_t value)
+    XmlAttribute & SetInt(int32_t value)
     {
         m_Attr = value;
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1533,9 +1523,10 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a unsigned integer.
     */
-    void SetUint(uint32_t value)
+    XmlAttribute & SetUint(uint32_t value)
     {
         m_Attr = value;
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1549,9 +1540,10 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a floating point.
     */
-    void SetFloat(SQFloat value)
+    XmlAttribute & SetFloat(SQFloat value)
     {
         m_Attr = value;
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1565,9 +1557,10 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a double floating point.
     */
-    void SetDouble(SQFloat value)
+    XmlAttribute & SetDouble(SQFloat value)
     {
         m_Attr = value;
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1578,7 +1571,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a long integer.
     */
-    void SetLong(SQInteger value);
+    XmlAttribute & SetLong(SQInteger value);
 
     /* --------------------------------------------------------------------------------------------
      * Retrieve the value as a unsigned long integer.
@@ -1588,7 +1581,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a unsigned long integer.
     */
-    void SetUlong(SQInteger value);
+    XmlAttribute & SetUlong(SQInteger value);
 
     /* --------------------------------------------------------------------------------------------
      * Retrieve the value as a boolean.
@@ -1601,9 +1594,10 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a boolean.
     */
-    void SetBool(bool value)
+    XmlAttribute & SetBool(bool value)
     {
         m_Attr = value;
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1853,9 +1847,10 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a string.
     */
-    void SetString(StackStrF & value)
+    XmlText & SetString(StackStrF & value)
     {
         m_Text = value.mPtr;
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1869,9 +1864,10 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a integer.
     */
-    void SetInt(int32_t value)
+    XmlText & SetInt(int32_t value)
     {
         m_Text = value;
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1885,9 +1881,10 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a unsigned integer.
     */
-    void SetUint(uint32_t value)
+    XmlText & SetUint(uint32_t value)
     {
         m_Text = value;
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1901,9 +1898,10 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a floating point.
     */
-    void SetFloat(SQFloat value)
+    XmlText & SetFloat(SQFloat value)
     {
         m_Text = value;
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1917,9 +1915,10 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a double floating point.
     */
-    void SetDouble(SQFloat value)
+    XmlText & SetDouble(SQFloat value)
     {
         m_Text = value;
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------
@@ -1930,7 +1929,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a long integer.
     */
-    void SetLong(SQInteger value);
+    XmlText & SetLong(SQInteger value);
 
     /* --------------------------------------------------------------------------------------------
      * Retrieve the value as a unsigned long integer.
@@ -1940,7 +1939,7 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a unsigned long integer.
     */
-    void SetUlong(SQInteger value);
+    XmlText & SetUlong(SQInteger value);
 
     /* --------------------------------------------------------------------------------------------
      * Retrieve the value as a boolean.
@@ -1953,9 +1952,10 @@ public:
     /* --------------------------------------------------------------------------------------------
      * Modify the value as a boolean.
     */
-    void SetBool(bool value)
+    XmlText & SetBool(bool value)
     {
         m_Text = value;
+        return *this;
     }
 
     /* --------------------------------------------------------------------------------------------

module/Logger.cpp

@@ -556,6 +556,21 @@ void Logger::ProcessMessage()
     }
 }
 
+// ------------------------------------------------------------------------------------------------
+void Logger::Send(uint8_t level, bool sub, const char * msg)
+{
+    // Is this level even allowed?
+    if ((m_ConsoleLevels & level) || (m_LogFileLevels & level))
+    {
+        // Create a new message builder
+        MsgPtr message(new Message(level, sub));
+        // Generate the log message
+        message->Append(msg);
+        // Process the message in the buffer
+        PushMessage(message);
+    }
+}
+
 // ------------------------------------------------------------------------------------------------
 void Logger::Send(uint8_t level, bool sub, const char * msg, size_t len)
 {

module/Logger.hpp

@@ -409,6 +409,11 @@ public:
     */
     void BindCb(uint8_t level, Function & func);
 
+    /* --------------------------------------------------------------------------------------------
+     * Send a log message.
+    */
+    void Send(uint8_t level, bool sub, const char * msg);
+
     /* --------------------------------------------------------------------------------------------
      * Send a log message.
     */

module/Main.cpp

@@ -17,16 +17,13 @@ namespace SqMod {
 static bool g_Reload = false;
 
 // ------------------------------------------------------------------------------------------------
-//extern void InitExports();
+extern void InitExports();
 extern void InitializeNet();
 extern void InitializePocoDataConnectors();
 extern void ProcessRoutines();
 extern void ProcessTasks();
 extern void ProcessThreads();
 extern void ProcessNet();
-#ifdef VCMP_ENABLE_DISCORD
-    extern void ProcessDPP();
-#endif
 
 /* ------------------------------------------------------------------------------------------------
  * Will the scripts be reloaded at the end of the current event?
@@ -100,7 +97,7 @@ static uint8_t OnServerInitialise()
     {
         SQMOD_SV_EV_TRACEBACK("[TRACE<] OnServerInitialise")
         // Signal outside plug-ins to do fetch our proxies
-        //_Func->SendPluginCommand(0xDABBAD00, "%d", 1);
+        _Func->SendPluginCommand(SQMOD_INITIALIZE_CMD, "%d", 1);
         // Attempt to load the module core
         if (Core::Get().Execute())
         {
@@ -175,10 +172,6 @@ static void OnServerFrame(float elapsed_time)
     ProcessThreads();
     // Process network
     ProcessNet();
-    // Process DPP
-#ifdef VCMP_ENABLE_DISCORD
-    ProcessDPP();
-#endif
     // Process log messages from other threads
     Logger::Get().ProcessQueue();
     // See if a reload was requested
@@ -972,6 +965,11 @@ static void OnServerPerformanceReport(size_t /*entry_count*/, const char * * /*d
 
 } // Namespace:: SqMod
 
+/* ------------------------------------------------------------------------------------------------
+ * Automatically terminate the third-party allocator.
+*/
+static std::unique_ptr< SqMod::RPMallocInit > gsRPMallocInit;
+
 /* ------------------------------------------------------------------------------------------------
  * Plug-in initialization procedure.
 */
@@ -996,6 +994,8 @@ SQMOD_API_EXPORT unsigned int VcmpPluginInit(PluginFuncs * funcs, PluginCallback
     _Info->apiMinorVersion = PLUGIN_API_MINOR;
     // Assign the plug-in name
     std::snprintf(_Info->name, sizeof(_Info->name), "%s", SQMOD_HOST_NAME);
+    // Initialize third-party allocator
+    gsRPMallocInit = std::make_unique< RPMallocInit >();
     // Attempt to initialize the logger before anything else
     Logger::Get().Initialize(nullptr);
     // Attempt to initialize the plug-in core
@@ -1083,7 +1083,7 @@ SQMOD_API_EXPORT unsigned int VcmpPluginInit(PluginFuncs * funcs, PluginCallback
     _Clbk->OnEntityStreamingChange      = OnEntityStreamingChange;
 #endif
     // Attempt to initialize the plug-in exports
-    //InitExports();
+    InitExports();
     // Dummy spacing
     puts("");
     // Initialization was successful