From 6b605aa70b3f6b61b49245b8b0a1f95cc9299a23 Mon Sep 17 00:00:00 2001
From: halx99 <halx99@live.com>
Date: Mon, 3 Aug 2026 15:05:52 +0800
Subject: [PATCH 1/2] Version 4.4.1

Remove tlx::sbyte_buffer
---
 3rdparty/kcp                           |   2 +-
 3rdparty/lua                           |   2 +-
 3rdparty/sol/config.hpp                |  10 +-
 3rdparty/sol/forward.hpp               | 131 ++--
 3rdparty/sol/sol.hpp                   | 839 ++++++++++++++++++-------
 docs/api/reference/ibstream-class.md   |   2 +-
 docs/api/reference/io_event-class.md   |   2 +-
 docs/api/reference/io_service-class.md |   4 +-
 docs/api/reference/obstream-class.md   |   4 +-
 examples/ftp_server                    |   2 +-
 examples/lua/main.cpp                  |  11 +-
 tests/ssl/main.cpp                     |   9 +-
 tests/tcp/main.cpp                     |   4 +-
 yasio.pc                               |   2 +-
 yasio/bindings/lyasio.cpp              |  34 +-
 yasio/bindings/yasio_jsb.cpp           |   4 +-
 yasio/bindings/yasio_jsb20.cpp         |   4 +-
 yasio/bindings/yasio_ni.cpp            |   2 +-
 yasio/config.hpp                       |   2 +-
 yasio/ibstream.hpp                     |  10 +-
 yasio/io_service.cpp                   |  16 +-
 yasio/io_service.hpp                   |  44 +-
 yasio/obstream.hpp                     |  14 +-
 yasio/tlx/byte_buffer.hpp              |  22 +-
 24 files changed, 787 insertions(+), 389 deletions(-)

diff --git a/3rdparty/kcp b/3rdparty/kcp
index fbd716b25..b1a7a2101 160000
--- a/3rdparty/kcp
+++ b/3rdparty/kcp
@@ -1 +1 @@
-Subproject commit fbd716b257628036375b94061a38a188ea4ed0c8
+Subproject commit b1a7a2101dcbb96017681a500d6b82bbe5a88766
diff --git a/3rdparty/lua b/3rdparty/lua
index 1ab3208a1..a5522f06d 160000
--- a/3rdparty/lua
+++ b/3rdparty/lua
@@ -1 +1 @@
-Subproject commit 1ab3208a1fceb12fca8f24ba57d6e13c5bff15e3
+Subproject commit a5522f06d2679b8f18534fd6a9968f7eb539dc31
diff --git a/3rdparty/sol/config.hpp b/3rdparty/sol/config.hpp
index 3b7ef023f..8c3f1eb17 100644
--- a/3rdparty/sol/config.hpp
+++ b/3rdparty/sol/config.hpp
@@ -20,12 +20,12 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // This file was generated with a script.
-// Generated 2022-06-25 08:14:19.336233 UTC
-// This header was generated with sol v3.3.0 (revision eba86625)
+// Generated 2026-02-02 04:53:33.295593 UTC
+// This header was generated with sol v3.5.0.1 (revision c037c46a)
 // https://github.com/ThePhD/sol2
 
-#ifndef SOL_SINGLE_CONFIG_HPP
-#define SOL_SINGLE_CONFIG_HPP
+#ifndef SOL_SINGLE_SOL_CONFIG_HPP
+#define SOL_SINGLE_SOL_CONFIG_HPP
 
 // beginning of sol/config.hpp
 
@@ -50,4 +50,4 @@ the build system, or the command line options of your compiler.
 
 // end of sol/config.hpp
 
-#endif // SOL_SINGLE_CONFIG_HPP
+#endif // SOL_SINGLE_SOL_CONFIG_HPP
diff --git a/3rdparty/sol/forward.hpp b/3rdparty/sol/forward.hpp
index 869069087..51a4ad1d8 100644
--- a/3rdparty/sol/forward.hpp
+++ b/3rdparty/sol/forward.hpp
@@ -20,12 +20,12 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // This file was generated with a script.
-// Generated 2022-06-25 08:14:19.328625 UTC
-// This header was generated with sol v3.3.0 (revision eba86625)
+// Generated 2026-02-02 04:53:33.295593 UTC
+// This header was generated with sol v3.5.0.1 (revision c037c46a)
 // https://github.com/ThePhD/sol2
 
-#ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP
-#define SOL_SINGLE_INCLUDE_FORWARD_HPP
+#ifndef SOL_SINGLE_INCLUDE_SOL_FORWARD_HPP
+#define SOL_SINGLE_INCLUDE_SOL_FORWARD_HPP
 
 // beginning of sol/forward.hpp
 
@@ -37,9 +37,9 @@
 #include <sol/config.hpp>
 
 #define SOL_VERSION_MAJOR 3
-#define SOL_VERSION_MINOR 2
-#define SOL_VERSION_PATCH 3
-#define SOL_VERSION_STRING "3.2.3"
+#define SOL_VERSION_MINOR 5
+#define SOL_VERSION_PATCH 0
+#define SOL_VERSION_STRING "3.5.0"
 #define SOL_VERSION ((SOL_VERSION_MAJOR * 100000) + (SOL_VERSION_MINOR * 100) + (SOL_VERSION_PATCH))
 
 #define SOL_TOKEN_TO_STRING_POST_EXPANSION_I_(_TOKEN) #_TOKEN
@@ -48,6 +48,7 @@
 #define SOL_CONCAT_TOKENS_POST_EXPANSION_I_(_LEFT, _RIGHT) _LEFT##_RIGHT
 #define SOL_CONCAT_TOKENS_I_(_LEFT, _RIGHT) SOL_CONCAT_TOKENS_POST_EXPANSION_I_(_LEFT, _RIGHT)
 
+#define SOL_RAW_USE(SYMBOL) SYMBOL
 #define SOL_RAW_IS_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) != 0)
 #define SOL_RAW_IS_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3) == 0)
 #define SOL_RAW_IS_DEFAULT_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) > 3)
@@ -57,6 +58,7 @@
 #define SOL_IS_OFF(OP_SYMBOL) SOL_RAW_IS_OFF(OP_SYMBOL ## _I_)
 #define SOL_IS_DEFAULT_ON(OP_SYMBOL) SOL_RAW_IS_DEFAULT_ON(OP_SYMBOL ## _I_)
 #define SOL_IS_DEFAULT_OFF(OP_SYMBOL) SOL_RAW_IS_DEFAULT_OFF(OP_SYMBOL ## _I_)
+#define SOL_USE(SYMBOL) SOL_RAW_USE(SYMBOL ## _I_)
 
 #define SOL_ON          |
 #define SOL_OFF         ^
@@ -97,8 +99,16 @@
 	#include <climits>
 #endif
 
+#if defined(SOL_HAS_BUILTIN)
+	#define SOL_HAS_BUILTIN_I_(...) SOL_HAS_BUILTIN(__VA_ARGS__)
+#elif defined(__has_builtin)
+	#define SOL_HAS_BUILTIN_I_(...) __has_builtin(__VA_ARGS__)
+#else
+	#define SOL_HAS_BUILTIN_I_(...) 0
+#endif
+
 #if defined(SOL_COMPILER_VCXX)
-	#if defined(SOL_COMPILER_VCXX != 0)
+	#if (SOL_COMPILER_VCXX != 0)
 		#define SOL_COMPILER_VCXX_I_ SOL_ON
 	#else
 		#define SOL_COMPILER_VCXX_I_ SOL_OFF
@@ -110,7 +120,7 @@
 #endif
 
 #if defined(SOL_COMPILER_GCC)
-	#if defined(SOL_COMPILER_GCC != 0)
+	#if (SOL_COMPILER_GCC != 0)
 		#define SOL_COMPILER_GCC_I_ SOL_ON
 	#else
 		#define SOL_COMPILER_GCC_I_ SOL_OFF
@@ -122,7 +132,7 @@
 #endif
 
 #if defined(SOL_COMPILER_CLANG)
-	#if defined(SOL_COMPILER_CLANG != 0)
+	#if (SOL_COMPILER_CLANG != 0)
 		#define SOL_COMPILER_CLANG_I_ SOL_ON
 	#else
 		#define SOL_COMPILER_CLANG_I_ SOL_OFF
@@ -134,7 +144,7 @@
 #endif
 
 #if defined(SOL_COMPILER_EDG)
-	#if defined(SOL_COMPILER_EDG != 0)
+	#if (SOL_COMPILER_EDG != 0)
 		#define SOL_COMPILER_EDG_I_ SOL_ON
 	#else
 		#define SOL_COMPILER_EDG_I_ SOL_OFF
@@ -215,7 +225,7 @@
 		#define SOL_PLATFORM_UNIXLIKE_I_ SOL_OFF
 	#endif
 #elif defined(__unix__)
-	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAUKT_ON
+	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAULT_ON
 #else
 	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAULT_OFF
 #endif
@@ -227,7 +237,7 @@
 		#define SOL_PLATFORM_LINUXLIKE_I_ SOL_OFF
 	#endif
 #elif defined(__LINUX__)
-	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAUKT_ON
+	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAULT_ON
 #else
 	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAULT_OFF
 #endif
@@ -236,7 +246,7 @@
 #define SOL_PLATFORM_BSDLIKE_I_      SOL_OFF
 
 #if defined(SOL_IN_DEBUG_DETECTED)
-	#if SOL_IN_DEBUG_DETECTED != 0
+	#if (SOL_IN_DEBUG_DETECTED != 0)
 		#define SOL_DEBUG_BUILD_I_ SOL_ON
 	#else
 		#define SOL_DEBUG_BUILD_I_ SOL_OFF
@@ -298,7 +308,7 @@
 #endif
 
 #if defined(SOL_NO_THREAD_LOCAL)
-	#if SOL_NO_THREAD_LOCAL != 0
+	#if (SOL_NO_THREAD_LOCAL != 0)
 		#define SOL_USE_THREAD_LOCAL_I_ SOL_OFF
 	#else
 		#define SOL_USE_THREAD_LOCAL_I_ SOL_ON
@@ -308,7 +318,7 @@
 #endif // thread_local keyword is bjorked on some platforms
 
 #if defined(SOL_ALL_SAFETIES_ON)
-	#if SOL_ALL_SAFETIES_ON != 0
+	#if (SOL_ALL_SAFETIES_ON != 0)
 		#define SOL_ALL_SAFETIES_ON_I_ SOL_ON
 	#else
 		#define SOL_ALL_SAFETIES_ON_I_ SOL_OFF
@@ -318,7 +328,7 @@
 #endif
 
 #if defined(SOL_SAFE_GETTER)
-	#if SOL_SAFE_GETTER != 0
+	#if (SOL_SAFE_GETTER != 0)
 		#define SOL_SAFE_GETTER_I_ SOL_ON
 	#else
 		#define SOL_SAFE_GETTER_I_ SOL_OFF
@@ -334,7 +344,7 @@
 #endif
 
 #if defined(SOL_SAFE_USERTYPE)
-	#if SOL_SAFE_USERTYPE != 0
+	#if (SOL_SAFE_USERTYPE != 0)
 		#define SOL_SAFE_USERTYPE_I_ SOL_ON
 	#else
 		#define SOL_SAFE_USERTYPE_I_ SOL_OFF
@@ -350,7 +360,7 @@
 #endif
 
 #if defined(SOL_SAFE_REFERENCES)
-	#if SOL_SAFE_REFERENCES != 0
+	#if (SOL_SAFE_REFERENCES != 0)
 		#define SOL_SAFE_REFERENCES_I_ SOL_ON
 	#else
 		#define SOL_SAFE_REFERENCES_I_ SOL_OFF
@@ -366,13 +376,13 @@
 #endif
 
 #if defined(SOL_SAFE_FUNCTIONS)
-	#if SOL_SAFE_FUNCTIONS != 0
+	#if (SOL_SAFE_FUNCTIONS != 0)
 		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
 	#else
 		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_OFF
 	#endif
 #elif defined (SOL_SAFE_FUNCTION_OBJECTS)
-	#if SOL_SAFE_FUNCTION_OBJECTS != 0
+	#if (SOL_SAFE_FUNCTION_OBJECTS != 0)
 		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
 	#else
 		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_OFF
@@ -388,7 +398,7 @@
 #endif
 
 #if defined(SOL_SAFE_FUNCTION_CALLS)
-	#if SOL_SAFE_FUNCTION_CALLS != 0
+	#if (SOL_SAFE_FUNCTION_CALLS != 0)
 		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
 	#else
 		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_OFF
@@ -404,7 +414,7 @@
 #endif
 
 #if defined(SOL_SAFE_PROXIES)
-	#if SOL_SAFE_PROXIES != 0
+	#if (SOL_SAFE_PROXIES != 0)
 		#define SOL_SAFE_PROXIES_I_ SOL_ON
 	#else
 		#define SOL_SAFE_PROXIES_I_ SOL_OFF
@@ -420,7 +430,7 @@
 #endif
 
 #if defined(SOL_SAFE_NUMERICS)
-	#if SOL_SAFE_NUMERICS != 0
+	#if (SOL_SAFE_NUMERICS != 0)
 		#define SOL_SAFE_NUMERICS_I_ SOL_ON
 	#else
 		#define SOL_SAFE_NUMERICS_I_ SOL_OFF
@@ -450,7 +460,7 @@
 #endif
 
 #if defined(SOL_SAFE_STACK_CHECK)
-	#if SOL_SAFE_STACK_CHECK != 0
+	#if (SOL_SAFE_STACK_CHECK != 0)
 		#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
 	#else
 		#define SOL_SAFE_STACK_CHECK_I_ SOL_OFF
@@ -466,13 +476,13 @@
 #endif
 
 #if defined(SOL_NO_CHECK_NUMBER_PRECISION)
-	#if SOL_NO_CHECK_NUMBER_PRECISION != 0
+	#if (SOL_NO_CHECK_NUMBER_PRECISION != 0)
 		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
 	#else
 		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
 	#endif
 #elif defined(SOL_NO_CHECKING_NUMBER_PRECISION)
-	#if SOL_NO_CHECKING_NUMBER_PRECISION != 0
+	#if (SOL_NO_CHECKING_NUMBER_PRECISION != 0)
 		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
 	#else
 		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
@@ -500,13 +510,13 @@
 #endif
 
 #if defined(SOL_ENABLE_INTEROP)
-	#if SOL_ENABLE_INTEROP != 0
+	#if (SOL_ENABLE_INTEROP != 0)
 		#define SOL_USE_INTEROP_I_ SOL_ON
 	#else
 		#define SOL_USE_INTEROP_I_ SOL_OFF
 	#endif
 #elif defined(SOL_USE_INTEROP)
-	#if SOL_USE_INTEROP != 0
+	#if (SOL_USE_INTEROP != 0)
 		#define SOL_USE_INTEROP_I_ SOL_ON
 	#else
 		#define SOL_USE_INTEROP_I_ SOL_OFF
@@ -596,19 +606,19 @@
 	#endif
 #endif // noexcept is part of a function's type
 
-#if defined(SOL_STACK_STRING_OPTIMIZATION_SIZE) && SOL_STACK_STRING_OPTIMIZATION_SIZE > 0
+#if defined(SOL_STACK_STRING_OPTIMIZATION_SIZE) && (SOL_STACK_STRING_OPTIMIZATION_SIZE > 0)
 	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ SOL_STACK_STRING_OPTIMIZATION_SIZE
 #else
 	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ 1024
 #endif
 
-#if defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
+#if defined(SOL_ID_SIZE) && (SOL_ID_SIZE > 0)
 	#define SOL_ID_SIZE_I_ SOL_ID_SIZE
 #else
 	#define SOL_ID_SIZE_I_ 512
 #endif
 
-#if defined(LUA_IDSIZE) && LUA_IDSIZE > 0
+#if defined(LUA_IDSIZE) && (LUA_IDSIZE > 0)
 	#define SOL_FILE_ID_SIZE_I_ LUA_IDSIZE
 #elif defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
 	#define SOL_FILE_ID_SIZE_I_ SOL_FILE_ID_SIZE
@@ -644,34 +654,35 @@
 
 #if defined(SOL_USING_CXX_LUA)
 	#if (SOL_USING_CXX_LUA != 0)
-		#define SOL_USE_CXX_LUA_I_ SOL_ON
+		#define SOL_USING_CXX_LUA_I_ SOL_ON
 	#else
-		#define SOL_USE_CXX_LUA_I_ SOL_OFF
+		#define SOL_USING_CXX_LUA_I_ SOL_OFF
 	#endif
 #elif defined(SOL_USE_CXX_LUA)
+	// alternative spelling
 	#if (SOL_USE_CXX_LUA != 0)
-		#define SOL_USE_CXX_LUA_I_ SOL_ON
+		#define SOL_USING_CXX_LUA_I_ SOL_ON
 	#else
-		#define SOL_USE_CXX_LUA_I_ SOL_OFF
+		#define SOL_USING_CXX_LUA_I_ SOL_OFF
 	#endif
 #else
-	#define SOL_USE_CXX_LUA_I_ SOL_DEFAULT_OFF
+	#define SOL_USING_CXX_LUA_I_ SOL_DEFAULT_OFF
 #endif
 
 #if defined(SOL_USING_CXX_LUAJIT)
-	#if (SOL_USING_CXX_LUA != 0)
-		#define SOL_USE_CXX_LUAJIT_I_ SOL_ON
+	#if (SOL_USING_CXX_LUAJIT != 0)
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_ON
 	#else
-		#define SOL_USE_CXX_LUAJIT_I_ SOL_OFF
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_OFF
 	#endif
 #elif defined(SOL_USE_CXX_LUAJIT)
-	#if (SOL_USE_CXX_LUA != 0)
-		#define SOL_USE_CXX_LUAJIT_I_ SOL_ON
+	#if (SOL_USE_CXX_LUAJIT != 0)
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_ON
 	#else
-		#define SOL_USE_CXX_LUAJIT_I_ SOL_OFF
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_OFF
 	#endif
 #else
-	#define SOL_USE_CXX_LUAJIT_I_ SOL_DEFAULT_OFF
+	#define SOL_USING_CXX_LUAJIT_I_ SOL_DEFAULT_OFF
 #endif
 
 #if defined(SOL_NO_LUA_HPP)
@@ -680,7 +691,7 @@
 	#else
 		#define SOL_USE_LUA_HPP_I_ SOL_ON
 	#endif
-#elif defined(SOL_USING_CXX_LUA)
+#elif SOL_IS_ON(SOL_USING_CXX_LUA)
 	#define SOL_USE_LUA_HPP_I_ SOL_OFF
 #elif defined(__has_include)
 	#if __has_include(<lua.hpp>)
@@ -766,6 +777,16 @@
 	#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_DEFAULT_OFF
 #endif
 
+#if defined(SOL_CONTAINER_CHECK_IS_EXHAUSTIVE)
+	#if (SOL_CONTAINER_CHECK_IS_EXHAUSTIVE != 0)
+		#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_ON
+	#else
+		#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_DEFAULT_OFF
+#endif
+
 #if defined(SOL_FUNCTION_CALL_VALUE_SEMANTICS)
 	#if (SOL_FUNCTION_CALL_VALUE_SEMANTICS != 0)
 		#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_ON
@@ -826,16 +847,16 @@
 	#define SOL2_CI_I_ SOL_DEFAULT_OFF
 #endif
 
-#if defined(SOL_C_ASSERT)
-	#define SOL_USER_C_ASSERT_I_ SOL_ON
+#if defined(SOL_ASSERT)
+	#define SOL_USER_ASSERT_I_ SOL_ON
 #else
-	#define SOL_USER_C_ASSERT_I_ SOL_DEFAULT_OFF
+	#define SOL_USER_ASSERT_I_ SOL_DEFAULT_OFF
 #endif
 
-#if defined(SOL_M_ASSERT)
-	#define SOL_USER_M_ASSERT_I_ SOL_ON
+#if defined(SOL_ASSERT_MSG)
+	#define SOL_USER_ASSERT_MSG_I_ SOL_ON
 #else
-	#define SOL_USER_M_ASSERT_I_ SOL_DEFAULT_OFF
+	#define SOL_USER_ASSERT_MSG_I_ SOL_DEFAULT_OFF
 #endif
 
 // beginning of sol/prologue.hpp
@@ -1082,7 +1103,7 @@
 #include <type_traits>
 #include <string_view>
 
-#if SOL_IS_ON(SOL_USE_CXX_LUA) || SOL_IS_ON(SOL_USE_CXX_LUAJIT)
+#if SOL_IS_ON(SOL_USING_CXX_LUA) || SOL_IS_ON(SOL_USING_CXX_LUAJIT)
 struct lua_State;
 #else
 extern "C" {
@@ -1305,7 +1326,7 @@ namespace sol {
 			typedef ::sol::types<__VA_ARGS__> type; \
 		};                                           \
 	}                                                 \
-	void a_sol3_detail_function_decl_please_no_collide()
+	static_assert(true, "")
 #define SOL_DERIVED_CLASSES(T, ...)                    \
 	namespace sol {                                   \
 		template <>                                  \
@@ -1313,9 +1334,9 @@ namespace sol {
 			typedef ::sol::types<__VA_ARGS__> type; \
 		};                                           \
 	}                                                 \
-	void a_sol3_detail_function_decl_please_no_collide()
+	static_assert(true, "")
 
 #endif // SOL_FORWARD_HPP
 // end of sol/forward.hpp
 
-#endif // SOL_SINGLE_INCLUDE_FORWARD_HPP
+#endif // SOL_SINGLE_INCLUDE_SOL_FORWARD_HPP
diff --git a/3rdparty/sol/sol.hpp b/3rdparty/sol/sol.hpp
index 8b0b7d36e..ffa145979 100644
--- a/3rdparty/sol/sol.hpp
+++ b/3rdparty/sol/sol.hpp
@@ -20,12 +20,12 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // This file was generated with a script.
-// Generated 2022-06-25 08:14:19.151876 UTC
-// This header was generated with sol v3.3.0 (revision eba86625)
+// Generated 2026-02-02 04:53:33.200584 UTC
+// This header was generated with sol v3.5.0.1 (revision c037c46a)
 // https://github.com/ThePhD/sol2
 
-#ifndef SOL_SINGLE_INCLUDE_HPP
-#define SOL_SINGLE_INCLUDE_HPP
+#ifndef SOL_SINGLE_INCLUDE_SOL_HPP
+#define SOL_SINGLE_INCLUDE_SOL_HPP
 
 // beginning of sol/sol.hpp
 
@@ -37,9 +37,9 @@
 #include <sol/config.hpp>
 
 #define SOL_VERSION_MAJOR 3
-#define SOL_VERSION_MINOR 2
-#define SOL_VERSION_PATCH 3
-#define SOL_VERSION_STRING "3.2.3"
+#define SOL_VERSION_MINOR 5
+#define SOL_VERSION_PATCH 0
+#define SOL_VERSION_STRING "3.5.0"
 #define SOL_VERSION ((SOL_VERSION_MAJOR * 100000) + (SOL_VERSION_MINOR * 100) + (SOL_VERSION_PATCH))
 
 #define SOL_TOKEN_TO_STRING_POST_EXPANSION_I_(_TOKEN) #_TOKEN
@@ -48,6 +48,7 @@
 #define SOL_CONCAT_TOKENS_POST_EXPANSION_I_(_LEFT, _RIGHT) _LEFT##_RIGHT
 #define SOL_CONCAT_TOKENS_I_(_LEFT, _RIGHT) SOL_CONCAT_TOKENS_POST_EXPANSION_I_(_LEFT, _RIGHT)
 
+#define SOL_RAW_USE(SYMBOL) SYMBOL
 #define SOL_RAW_IS_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) != 0)
 #define SOL_RAW_IS_OFF(OP_SYMBOL) ((3 OP_SYMBOL 3) == 0)
 #define SOL_RAW_IS_DEFAULT_ON(OP_SYMBOL) ((3 OP_SYMBOL 3) > 3)
@@ -57,6 +58,7 @@
 #define SOL_IS_OFF(OP_SYMBOL) SOL_RAW_IS_OFF(OP_SYMBOL ## _I_)
 #define SOL_IS_DEFAULT_ON(OP_SYMBOL) SOL_RAW_IS_DEFAULT_ON(OP_SYMBOL ## _I_)
 #define SOL_IS_DEFAULT_OFF(OP_SYMBOL) SOL_RAW_IS_DEFAULT_OFF(OP_SYMBOL ## _I_)
+#define SOL_USE(SYMBOL) SOL_RAW_USE(SYMBOL ## _I_)
 
 #define SOL_ON          |
 #define SOL_OFF         ^
@@ -97,8 +99,16 @@
 	#include <climits>
 #endif
 
+#if defined(SOL_HAS_BUILTIN)
+	#define SOL_HAS_BUILTIN_I_(...) SOL_HAS_BUILTIN(__VA_ARGS__)
+#elif defined(__has_builtin)
+	#define SOL_HAS_BUILTIN_I_(...) __has_builtin(__VA_ARGS__)
+#else
+	#define SOL_HAS_BUILTIN_I_(...) 0
+#endif
+
 #if defined(SOL_COMPILER_VCXX)
-	#if defined(SOL_COMPILER_VCXX != 0)
+	#if (SOL_COMPILER_VCXX != 0)
 		#define SOL_COMPILER_VCXX_I_ SOL_ON
 	#else
 		#define SOL_COMPILER_VCXX_I_ SOL_OFF
@@ -110,7 +120,7 @@
 #endif
 
 #if defined(SOL_COMPILER_GCC)
-	#if defined(SOL_COMPILER_GCC != 0)
+	#if (SOL_COMPILER_GCC != 0)
 		#define SOL_COMPILER_GCC_I_ SOL_ON
 	#else
 		#define SOL_COMPILER_GCC_I_ SOL_OFF
@@ -122,7 +132,7 @@
 #endif
 
 #if defined(SOL_COMPILER_CLANG)
-	#if defined(SOL_COMPILER_CLANG != 0)
+	#if (SOL_COMPILER_CLANG != 0)
 		#define SOL_COMPILER_CLANG_I_ SOL_ON
 	#else
 		#define SOL_COMPILER_CLANG_I_ SOL_OFF
@@ -134,7 +144,7 @@
 #endif
 
 #if defined(SOL_COMPILER_EDG)
-	#if defined(SOL_COMPILER_EDG != 0)
+	#if (SOL_COMPILER_EDG != 0)
 		#define SOL_COMPILER_EDG_I_ SOL_ON
 	#else
 		#define SOL_COMPILER_EDG_I_ SOL_OFF
@@ -215,7 +225,7 @@
 		#define SOL_PLATFORM_UNIXLIKE_I_ SOL_OFF
 	#endif
 #elif defined(__unix__)
-	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAUKT_ON
+	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAULT_ON
 #else
 	#define SOL_PLATFORM_UNIXLIKE_I_ SOL_DEFAULT_OFF
 #endif
@@ -227,7 +237,7 @@
 		#define SOL_PLATFORM_LINUXLIKE_I_ SOL_OFF
 	#endif
 #elif defined(__LINUX__)
-	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAUKT_ON
+	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAULT_ON
 #else
 	#define SOL_PLATFORM_LINUXLIKE_I_ SOL_DEFAULT_OFF
 #endif
@@ -236,7 +246,7 @@
 #define SOL_PLATFORM_BSDLIKE_I_      SOL_OFF
 
 #if defined(SOL_IN_DEBUG_DETECTED)
-	#if SOL_IN_DEBUG_DETECTED != 0
+	#if (SOL_IN_DEBUG_DETECTED != 0)
 		#define SOL_DEBUG_BUILD_I_ SOL_ON
 	#else
 		#define SOL_DEBUG_BUILD_I_ SOL_OFF
@@ -298,7 +308,7 @@
 #endif
 
 #if defined(SOL_NO_THREAD_LOCAL)
-	#if SOL_NO_THREAD_LOCAL != 0
+	#if (SOL_NO_THREAD_LOCAL != 0)
 		#define SOL_USE_THREAD_LOCAL_I_ SOL_OFF
 	#else
 		#define SOL_USE_THREAD_LOCAL_I_ SOL_ON
@@ -308,7 +318,7 @@
 #endif // thread_local keyword is bjorked on some platforms
 
 #if defined(SOL_ALL_SAFETIES_ON)
-	#if SOL_ALL_SAFETIES_ON != 0
+	#if (SOL_ALL_SAFETIES_ON != 0)
 		#define SOL_ALL_SAFETIES_ON_I_ SOL_ON
 	#else
 		#define SOL_ALL_SAFETIES_ON_I_ SOL_OFF
@@ -318,7 +328,7 @@
 #endif
 
 #if defined(SOL_SAFE_GETTER)
-	#if SOL_SAFE_GETTER != 0
+	#if (SOL_SAFE_GETTER != 0)
 		#define SOL_SAFE_GETTER_I_ SOL_ON
 	#else
 		#define SOL_SAFE_GETTER_I_ SOL_OFF
@@ -334,7 +344,7 @@
 #endif
 
 #if defined(SOL_SAFE_USERTYPE)
-	#if SOL_SAFE_USERTYPE != 0
+	#if (SOL_SAFE_USERTYPE != 0)
 		#define SOL_SAFE_USERTYPE_I_ SOL_ON
 	#else
 		#define SOL_SAFE_USERTYPE_I_ SOL_OFF
@@ -350,7 +360,7 @@
 #endif
 
 #if defined(SOL_SAFE_REFERENCES)
-	#if SOL_SAFE_REFERENCES != 0
+	#if (SOL_SAFE_REFERENCES != 0)
 		#define SOL_SAFE_REFERENCES_I_ SOL_ON
 	#else
 		#define SOL_SAFE_REFERENCES_I_ SOL_OFF
@@ -366,13 +376,13 @@
 #endif
 
 #if defined(SOL_SAFE_FUNCTIONS)
-	#if SOL_SAFE_FUNCTIONS != 0
+	#if (SOL_SAFE_FUNCTIONS != 0)
 		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
 	#else
 		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_OFF
 	#endif
 #elif defined (SOL_SAFE_FUNCTION_OBJECTS)
-	#if SOL_SAFE_FUNCTION_OBJECTS != 0
+	#if (SOL_SAFE_FUNCTION_OBJECTS != 0)
 		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_ON
 	#else
 		#define SOL_SAFE_FUNCTION_OBJECTS_I_ SOL_OFF
@@ -388,7 +398,7 @@
 #endif
 
 #if defined(SOL_SAFE_FUNCTION_CALLS)
-	#if SOL_SAFE_FUNCTION_CALLS != 0
+	#if (SOL_SAFE_FUNCTION_CALLS != 0)
 		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_ON
 	#else
 		#define SOL_SAFE_FUNCTION_CALLS_I_ SOL_OFF
@@ -404,7 +414,7 @@
 #endif
 
 #if defined(SOL_SAFE_PROXIES)
-	#if SOL_SAFE_PROXIES != 0
+	#if (SOL_SAFE_PROXIES != 0)
 		#define SOL_SAFE_PROXIES_I_ SOL_ON
 	#else
 		#define SOL_SAFE_PROXIES_I_ SOL_OFF
@@ -420,7 +430,7 @@
 #endif
 
 #if defined(SOL_SAFE_NUMERICS)
-	#if SOL_SAFE_NUMERICS != 0
+	#if (SOL_SAFE_NUMERICS != 0)
 		#define SOL_SAFE_NUMERICS_I_ SOL_ON
 	#else
 		#define SOL_SAFE_NUMERICS_I_ SOL_OFF
@@ -450,7 +460,7 @@
 #endif
 
 #if defined(SOL_SAFE_STACK_CHECK)
-	#if SOL_SAFE_STACK_CHECK != 0
+	#if (SOL_SAFE_STACK_CHECK != 0)
 		#define SOL_SAFE_STACK_CHECK_I_ SOL_ON
 	#else
 		#define SOL_SAFE_STACK_CHECK_I_ SOL_OFF
@@ -466,13 +476,13 @@
 #endif
 
 #if defined(SOL_NO_CHECK_NUMBER_PRECISION)
-	#if SOL_NO_CHECK_NUMBER_PRECISION != 0
+	#if (SOL_NO_CHECK_NUMBER_PRECISION != 0)
 		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
 	#else
 		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
 	#endif
 #elif defined(SOL_NO_CHECKING_NUMBER_PRECISION)
-	#if SOL_NO_CHECKING_NUMBER_PRECISION != 0
+	#if (SOL_NO_CHECKING_NUMBER_PRECISION != 0)
 		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_OFF
 	#else
 		#define SOL_NUMBER_PRECISION_CHECKS_I_ SOL_ON
@@ -500,13 +510,13 @@
 #endif
 
 #if defined(SOL_ENABLE_INTEROP)
-	#if SOL_ENABLE_INTEROP != 0
+	#if (SOL_ENABLE_INTEROP != 0)
 		#define SOL_USE_INTEROP_I_ SOL_ON
 	#else
 		#define SOL_USE_INTEROP_I_ SOL_OFF
 	#endif
 #elif defined(SOL_USE_INTEROP)
-	#if SOL_USE_INTEROP != 0
+	#if (SOL_USE_INTEROP != 0)
 		#define SOL_USE_INTEROP_I_ SOL_ON
 	#else
 		#define SOL_USE_INTEROP_I_ SOL_OFF
@@ -596,19 +606,19 @@
 	#endif
 #endif // noexcept is part of a function's type
 
-#if defined(SOL_STACK_STRING_OPTIMIZATION_SIZE) && SOL_STACK_STRING_OPTIMIZATION_SIZE > 0
+#if defined(SOL_STACK_STRING_OPTIMIZATION_SIZE) && (SOL_STACK_STRING_OPTIMIZATION_SIZE > 0)
 	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ SOL_STACK_STRING_OPTIMIZATION_SIZE
 #else
 	#define SOL_OPTIMIZATION_STRING_CONVERSION_STACK_SIZE_I_ 1024
 #endif
 
-#if defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
+#if defined(SOL_ID_SIZE) && (SOL_ID_SIZE > 0)
 	#define SOL_ID_SIZE_I_ SOL_ID_SIZE
 #else
 	#define SOL_ID_SIZE_I_ 512
 #endif
 
-#if defined(LUA_IDSIZE) && LUA_IDSIZE > 0
+#if defined(LUA_IDSIZE) && (LUA_IDSIZE > 0)
 	#define SOL_FILE_ID_SIZE_I_ LUA_IDSIZE
 #elif defined(SOL_ID_SIZE) && SOL_ID_SIZE > 0
 	#define SOL_FILE_ID_SIZE_I_ SOL_FILE_ID_SIZE
@@ -644,34 +654,35 @@
 
 #if defined(SOL_USING_CXX_LUA)
 	#if (SOL_USING_CXX_LUA != 0)
-		#define SOL_USE_CXX_LUA_I_ SOL_ON
+		#define SOL_USING_CXX_LUA_I_ SOL_ON
 	#else
-		#define SOL_USE_CXX_LUA_I_ SOL_OFF
+		#define SOL_USING_CXX_LUA_I_ SOL_OFF
 	#endif
 #elif defined(SOL_USE_CXX_LUA)
+	// alternative spelling
 	#if (SOL_USE_CXX_LUA != 0)
-		#define SOL_USE_CXX_LUA_I_ SOL_ON
+		#define SOL_USING_CXX_LUA_I_ SOL_ON
 	#else
-		#define SOL_USE_CXX_LUA_I_ SOL_OFF
+		#define SOL_USING_CXX_LUA_I_ SOL_OFF
 	#endif
 #else
-	#define SOL_USE_CXX_LUA_I_ SOL_DEFAULT_OFF
+	#define SOL_USING_CXX_LUA_I_ SOL_DEFAULT_OFF
 #endif
 
 #if defined(SOL_USING_CXX_LUAJIT)
-	#if (SOL_USING_CXX_LUA != 0)
-		#define SOL_USE_CXX_LUAJIT_I_ SOL_ON
+	#if (SOL_USING_CXX_LUAJIT != 0)
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_ON
 	#else
-		#define SOL_USE_CXX_LUAJIT_I_ SOL_OFF
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_OFF
 	#endif
 #elif defined(SOL_USE_CXX_LUAJIT)
-	#if (SOL_USE_CXX_LUA != 0)
-		#define SOL_USE_CXX_LUAJIT_I_ SOL_ON
+	#if (SOL_USE_CXX_LUAJIT != 0)
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_ON
 	#else
-		#define SOL_USE_CXX_LUAJIT_I_ SOL_OFF
+		#define SOL_USING_CXX_LUAJIT_I_ SOL_OFF
 	#endif
 #else
-	#define SOL_USE_CXX_LUAJIT_I_ SOL_DEFAULT_OFF
+	#define SOL_USING_CXX_LUAJIT_I_ SOL_DEFAULT_OFF
 #endif
 
 #if defined(SOL_NO_LUA_HPP)
@@ -680,7 +691,7 @@
 	#else
 		#define SOL_USE_LUA_HPP_I_ SOL_ON
 	#endif
-#elif defined(SOL_USING_CXX_LUA)
+#elif SOL_IS_ON(SOL_USING_CXX_LUA)
 	#define SOL_USE_LUA_HPP_I_ SOL_OFF
 #elif defined(__has_include)
 	#if __has_include(<lua.hpp>)
@@ -766,6 +777,16 @@
 	#define SOL_GET_FUNCTION_POINTER_UNSAFE_I_ SOL_DEFAULT_OFF
 #endif
 
+#if defined(SOL_CONTAINER_CHECK_IS_EXHAUSTIVE)
+	#if (SOL_CONTAINER_CHECK_IS_EXHAUSTIVE != 0)
+		#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_ON
+	#else
+		#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_OFF
+	#endif
+#else
+	#define SOL_CONTAINER_CHECK_IS_EXHAUSTIVE_I_ SOL_DEFAULT_OFF
+#endif
+
 #if defined(SOL_FUNCTION_CALL_VALUE_SEMANTICS)
 	#if (SOL_FUNCTION_CALL_VALUE_SEMANTICS != 0)
 		#define SOL_FUNCTION_CALL_VALUE_SEMANTICS_I_ SOL_ON
@@ -826,16 +847,16 @@
 	#define SOL2_CI_I_ SOL_DEFAULT_OFF
 #endif
 
-#if defined(SOL_C_ASSERT)
-	#define SOL_USER_C_ASSERT_I_ SOL_ON
+#if defined(SOL_ASSERT)
+	#define SOL_USER_ASSERT_I_ SOL_ON
 #else
-	#define SOL_USER_C_ASSERT_I_ SOL_DEFAULT_OFF
+	#define SOL_USER_ASSERT_I_ SOL_DEFAULT_OFF
 #endif
 
-#if defined(SOL_M_ASSERT)
-	#define SOL_USER_M_ASSERT_I_ SOL_ON
+#if defined(SOL_ASSERT_MSG)
+	#define SOL_USER_ASSERT_MSG_I_ SOL_ON
 #else
-	#define SOL_USER_M_ASSERT_I_ SOL_DEFAULT_OFF
+	#define SOL_USER_ASSERT_MSG_I_ SOL_DEFAULT_OFF
 #endif
 
 // beginning of sol/prologue.hpp
@@ -1107,7 +1128,7 @@
 #include <type_traits>
 #include <string_view>
 
-#if SOL_IS_ON(SOL_USE_CXX_LUA) || SOL_IS_ON(SOL_USE_CXX_LUAJIT)
+#if SOL_IS_ON(SOL_USING_CXX_LUA) || SOL_IS_ON(SOL_USING_CXX_LUAJIT)
 struct lua_State;
 #else
 extern "C" {
@@ -1330,7 +1351,7 @@ namespace sol {
 			typedef ::sol::types<__VA_ARGS__> type; \
 		};                                           \
 	}                                                 \
-	void a_sol3_detail_function_decl_please_no_collide()
+	static_assert(true, "")
 #define SOL_DERIVED_CLASSES(T, ...)                    \
 	namespace sol {                                   \
 		template <>                                  \
@@ -1338,7 +1359,7 @@ namespace sol {
 			typedef ::sol::types<__VA_ARGS__> type; \
 		};                                           \
 	}                                                 \
-	void a_sol3_detail_function_decl_please_no_collide()
+	static_assert(true, "")
 
 #endif // SOL_FORWARD_HPP
 // end of sol/forward.hpp
@@ -1392,6 +1413,39 @@ namespace sol {
 		template <template <class...> class Trait, class... Args>
 		constexpr inline bool is_detected_v = is_detected<Trait, Args...>::value;
 
+		template <typename _Default, typename _Void, template <typename...> typename _Op, typename... _Args>
+		class detector {
+		public:
+			using value_t = ::std::false_type;
+			using type = _Default;
+		};
+
+		template <typename _Default, template <typename...> typename _Op, typename... _Args>
+		class detector<_Default, void_t<_Op<_Args...>>, _Op, _Args...> {
+		public:
+			using value_t = ::std::true_type;
+			using type = _Op<_Args...>;
+		};
+
+		class nonesuch {
+		public:
+			~nonesuch() = delete;
+			nonesuch(nonesuch const&) = delete;
+			nonesuch& operator=(nonesuch const&) = delete;
+		};
+
+		template <template <typename...> typename _Op, typename... _Args>
+		using detected_t = typename detector<nonesuch, void, _Op, _Args...>::type;
+
+		template <typename _Default, template <typename...> typename _Op, typename... _Args>
+		using detected_or = detector<_Default, void, _Op, _Args...>;
+
+		template <typename _Default, template <typename...> typename _Op, typename... _Args>
+		using detected_or_t = typename detector<_Default, void, _Op, _Args...>::type;
+
+		template <typename _Default, template <typename...> typename _Op, typename... _Args>
+		constexpr inline bool detected_or_v = detector<_Default, void, _Op, _Args...>::value;
+
 		template <std::size_t I>
 		using index_value = std::integral_constant<std::size_t, I>;
 
@@ -2640,8 +2694,20 @@ namespace sol { namespace meta {
 
 		template <typename T>
 		using non_void_t = meta::conditional_t<std::is_void_v<T>, ::sol::detail::unchecked_t, T>;
+
+		template <typename T>
+		using detect_sentinel = typename T::sentinel;
 	} // namespace meta_detail
 
+	template <typename T, typename Fallback>
+	class sentinel_or {
+	public:
+		using type = detected_or_t<Fallback, meta_detail::detect_sentinel, T>;
+	};
+
+	template <typename T, typename Fallback>
+	using sentinel_or_t = typename sentinel_or<T, Fallback>::type;
+
 	template <typename T, typename U = T>
 	class supports_op_less : public meta_detail::supports_op_less_test<T, U> { };
 
@@ -2736,11 +2802,12 @@ namespace sol { namespace meta {
 	constexpr inline bool is_string_literal_array_of_v = is_string_literal_array_of<T, CharT>::value;
 
 	template <typename T>
-	using is_string_literal_array = boolean<std::is_array_v<T> && any_same_v<std::remove_all_extents_t<T>, char,
+	using is_string_literal_array = boolean<std::is_array_v<T>
+		&& any_same_v<std::remove_all_extents_t<T>, char,
 #if SOL_IS_ON(SOL_CHAR8_T)
-	char8_t,
+		     char8_t,
 #endif
-	char16_t, char32_t, wchar_t>>;
+		     char16_t, char32_t, wchar_t>>;
 
 	template <typename T>
 	constexpr inline bool is_string_literal_array_v = is_string_literal_array<T>::value;
@@ -2771,9 +2838,8 @@ namespace sol { namespace meta {
 	constexpr inline bool is_string_like_v = is_string_like<T>::value;
 
 	template <typename T, typename CharT = char>
-	using is_string_constructible = meta::boolean<
-		is_string_literal_array_of_v<T,
-		     CharT> || std::is_same_v<T, const CharT*> || std::is_same_v<T, CharT> || is_string_of_v<T, CharT> || std::is_same_v<T, std::initializer_list<CharT>> || is_string_view_of_v<T, CharT> || std::is_null_pointer_v<T>>;
+	using is_string_constructible = meta::boolean<is_string_literal_array_of_v<T, CharT> || std::is_same_v<T, const CharT*> || std::is_same_v<T, CharT>
+		|| is_string_of_v<T, CharT> || std::is_same_v<T, std::initializer_list<CharT>> || is_string_view_of_v<T, CharT> || std::is_null_pointer_v<T>>;
 
 	template <typename T, typename CharT = char>
 	constexpr inline bool is_string_constructible_v = is_string_constructible<T, CharT>::value;
@@ -2843,8 +2909,7 @@ namespace sol { namespace meta {
 	struct iterator_tag<T, conditional_t<false, typename std::iterator_traits<T>::iterator_category, void>> {
 		using type = typename std::iterator_traits<T>::iterator_category;
 	};
-
-}} // namespace sol::meta
+}}     // namespace sol::meta
 
 // end of sol/traits.hpp
 
@@ -2888,15 +2953,15 @@ struct pre_main {
 
 #endif // Prevent lockup when doing Continuous Integration
 
-#if SOL_IS_ON(SOL_USER_C_ASSERT)
-	#define sol_c_assert(...) SOL_C_ASSERT(__VA_ARGS__)
+#if SOL_IS_ON(SOL_USER_ASSERT)
+	#define SOL_ASSERT(...) SOL_C_ASSERT(__VA_ARGS__)
 #else
 	#if SOL_IS_ON(SOL_DEBUG_BUILD)
 		#include <exception>
 		#include <iostream>
 		#include <cstdlib>
 
-			#define sol_c_assert(...)                                                                                               \
+			#define SOL_ASSERT(...)                                                                                               \
 				do {                                                                                                               \
 					if (!(__VA_ARGS__)) {                                                                                           \
 						std::cerr << "Assertion `" #__VA_ARGS__ "` failed in " << __FILE__ << " line " << __LINE__ << std::endl; \
@@ -2904,7 +2969,7 @@ struct pre_main {
 					}                                                                                                             \
 				} while (false)
 	#else
-		#define sol_c_assert(...)           \
+		#define SOL_ASSERT(...)           \
 			do {                           \
 				if (false) {              \
 					(void)(__VA_ARGS__); \
@@ -2913,15 +2978,15 @@ struct pre_main {
 	#endif
 #endif
 
-#if SOL_IS_ON(SOL_USER_M_ASSERT)
-	#define sol_m_assert(message, ...) SOL_M_ASSERT(message, __VA_ARGS__)
+#if SOL_IS_ON(SOL_USER_ASSERT_MSG)
+	#define SOL_ASSERT_MSG(message, ...) SOL_ASSERT_MSG(message, __VA_ARGS__)
 #else
 	#if SOL_IS_ON(SOL_DEBUG_BUILD)
 		#include <exception>
 		#include <iostream>
 		#include <cstdlib>
 
-		#define sol_m_assert(message, ...)                                                                                                         \
+		#define SOL_ASSERT_MSG(message, ...)                                                                                                         \
 			do {                                                                                                                                  \
 				if (!(__VA_ARGS__)) {                                                                                                              \
 					std::cerr << "Assertion `" #__VA_ARGS__ "` failed in " << __FILE__ << " line " << __LINE__ << ": " << message << std::endl; \
@@ -2929,7 +2994,7 @@ struct pre_main {
 				}                                                                                                                                \
 			} while (false)
 	#else
-		#define sol_m_assert(message, ...)    \
+		#define SOL_ASSERT_MSG(message, ...)    \
 			do {                             \
 				if (false) {                \
 					(void)(__VA_ARGS__);   \
@@ -2947,17 +3012,33 @@ struct pre_main {
 
 // beginning of sol/compatibility/lua_version.hpp
 
-#if SOL_IS_ON(SOL_USE_CXX_LUA)
-	#include <lua.h>
-	#include <lualib.h>
-	#include <lauxlib.h>
-#elif SOL_IS_ON(SOL_USE_LUA_HPP)
-	#include <lua.hpp>
-#else
-	extern "C" {
+#if SOL_IS_ON(SOL_USING_CXX_LUA)
+	#if __has_include(<lua/lua.h>)
+		#include <lua/lua.h>
+		#include <lua/lauxlib.h>
+		#include <lua/lualib.h>
+	#else
 		#include <lua.h>
 		#include <lauxlib.h>
 		#include <lualib.h>
+	#endif
+#elif SOL_IS_ON(SOL_USE_LUA_HPP)
+	#if __has_include(<lua/lua.hpp>)
+		#include <lua/lua.hpp>
+	#else
+		#include <lua.hpp>
+	#endif
+#else
+	extern "C" {
+		#if __has_include(<lua/lua.h>)
+			#include <lua/lua.h>
+			#include <lua/lauxlib.h>
+			#include <lua/lualib.h>
+		#else
+			#include <lua.h>
+			#include <lauxlib.h>
+			#include <lualib.h>
+		#endif
 	}
 #endif // C++ Mangling for Lua vs. Not
 
@@ -2969,11 +3050,13 @@ struct pre_main {
 	#endif
 #elif defined(LUAJIT_VERSION)
 	#define SOL_USE_LUAJIT_I_ SOL_ON
+#elif SOL_IS_ON(SOL_USING_CXX_LUAJIT)
+	#define SOL_USE_LUAJIT_I_ SOL_ON
 #else
 	#define SOL_USE_LUAJIT_I_ SOL_DEFAULT_OFF
 #endif // luajit
 
-#if SOL_IS_ON(SOL_USE_CXX_LUAJIT)
+#if SOL_IS_ON(SOL_USING_CXX_LUAJIT)
 	#include <luajit.h>
 #elif SOL_IS_ON(SOL_USE_LUAJIT)
 	extern "C" {
@@ -3035,21 +3118,25 @@ struct pre_main {
 	#else
 		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
 	#endif
-#elif SOL_LUAJIT_VERSION_I_ >= 20100
-	// LuaJIT 2.1.0-beta3 and better have exception support locked in for all platforms (mostly)
-	#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_ON
-#elif SOL_LUAJIT_VERSION_I_ >= 20000
-	// LuaJIT 2.0.x have exception support only on x64 builds
-	#if SOL_IS_ON(SOL_PLATFORM_X64)
-		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_ON
+#else
+	#if SOL_IS_ON(SOL_USE_LUAJIT)
+		#if SOL_USE(SOL_LUAJIT_VERSION) >= 20100
+			// LuaJIT 2.1.0-beta3 and better have exception support locked in for all platforms (mostly)
+			#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_ON
+		#elif SOL_USE(SOL_LUAJIT_VERSION) >= 20000
+			// LuaJIT 2.0.x have exception support only on x64 builds
+			#if SOL_IS_ON(SOL_PLATFORM_X64)
+				#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_ON
+			#else
+				#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_OFF
+			#endif
+		#endif
 	#else
-		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_OFF
+		// otherwise, there is no exception safety for
+		// shoving exceptions through Lua and errors should
+		// always be serialized
+		#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_OFF
 	#endif
-#else
-	// otherwise, there is no exception safety for
-	// shoving exceptions through Lua and errors should
-	// always be serialized
-	#define SOL_PROPAGATE_EXCEPTIONS_I_ SOL_DEFAULT_OFF
 #endif
 
 #if defined(SOL_EXCEPTIONS_CATCH_ALL)
@@ -3059,13 +3146,14 @@ struct pre_main {
 		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_OFF
 	#endif
 #else
-	#if SOL_IS_ON(SOL_USE_LUAJIT)
+	#if SOL_IS_ON(SOL_USE_LUAJIT) || SOL_IS_ON(SOL_USING_CXX_LUAJIT)
 		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_OFF
-	#elif SOL_IS_ON(SOL_USE_CXX_LUAJIT)
-		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_OFF
-	#elif SOL_IS_ON(SOL_USE_CXX_LUA)
+	#elif SOL_IS_ON(SOL_USING_CXX_LUA)
+		// C++ builds of Lua will throw an exception to implement its `yield` behavior;
+		// it is irresponsible to "catch all" on this setting.
 		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_OFF
 	#else
+		// Otherwise, by default, everyhting should be caught.
 		#define SOL_EXCEPTIONS_CATCH_ALL_I_ SOL_DEFAULT_ON
 	#endif
 #endif
@@ -3107,7 +3195,11 @@ struct pre_main {
 #else
 	// Lua 5.2 only (deprecated in 5.3 (503)) (Can be turned on with Compat flags)
 	// Lua 5.2, or other versions of Lua with the compat flag, or Lua that is not 5.2 with the specific define (5.4.1 either removed it entirely or broke it)
-	#if (SOL_LUA_VERSION_I_ == 502) || (defined(LUA_COMPAT_BITLIB) && (LUA_COMPAT_BITLIB != 0)) || (SOL_LUA_VERSION_I_ < 504 && (defined(LUA_COMPAT_5_2) && (LUA_COMPAT_5_2 != 0)))
+	#if (SOL_LUA_VERSION_I_ == 502)
+		#define SOL_LUA_BIT32_LIB_I_ SOL_ON
+	#elif defined(LUA_COMPAT_BITLIB)
+		#define SOL_LUA_BIT32_LIB_I_ SOL_ON
+	#elif (SOL_LUA_VERSION_I_ < 504 && defined(LUA_COMPAT_5_2))
 		#define SOL_LUA_BIT32_LIB_I_ SOL_ON
 	#else
 		#define SOL_LUA_BIT32_LIB_I_ SOL_DEFAULT_OFF
@@ -3132,15 +3224,14 @@ struct pre_main {
 
 #if SOL_IS_ON(SOL_USE_COMPATIBILITY_LAYER)
 
-#if SOL_IS_ON(SOL_USE_CXX_LUA) || SOL_IS_ON(SOL_USE_CXX_LUAJIT)
-#ifndef COMPAT53_LUA_CPP
-#define COMPAT53_LUA_CPP 1
-#endif // Build Lua Compat layer as C++
+#if SOL_IS_ON(SOL_USING_CXX_LUA) || SOL_IS_ON(SOL_USING_CXX_LUAJIT)
+	#ifndef COMPAT53_LUA_CPP
+		#define COMPAT53_LUA_CPP 1
+	#endif // Build Lua Compat layer as C++
 #endif
-#ifndef COMPAT53_INCLUDE_SOURCE
-#define COMPAT53_INCLUDE_SOURCE 1
-#endif // Build Compat Layer Inline
-
+	#ifndef COMPAT53_INCLUDE_SOURCE
+		#define COMPAT53_INCLUDE_SOURCE 1
+	#endif // Build Compat Layer Inline
 // beginning of sol/compatibility/compat-5.3.h
 
 #ifndef KEPLER_PROJECT_COMPAT53_H_
@@ -3152,9 +3243,15 @@ struct pre_main {
 #if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
 extern "C" {
 #endif
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
+#if __has_include(<lua/lua.h>)
+  #include <lua/lua.h>
+  #include <lua/lauxlib.h>
+  #include <lua/lualib.h>
+#else
+  #include <lua.h>
+  #include <lauxlib.h>
+  #include <lualib.h>
+#endif
 #if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
 }
 #endif
@@ -3535,11 +3632,11 @@ COMPAT53_API void luaL_requiref(lua_State *L, const char *modname,
 #endif /* Lua 5.2 only */
 
 /* other Lua versions */
-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 504
+#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 505
 
-#  error "unsupported Lua version (i.e. not Lua 5.1, 5.2, 5.3, or 5.4)"
+#  error "unsupported Lua version (i.e. not Lua 5.1, 5.2, 5.3, 5.4 or 5.5)"
 
-#endif /* other Lua versions except 5.1, 5.2, 5.3, and 5.4 */
+#endif /* other Lua versions except 5.1, 5.2, 5.3, 5.4 and 5.5 */
 
 /* helper macro for defining continuation functions (for every version
 * *except* Lua 5.2) */
@@ -4412,23 +4509,29 @@ COMPAT53_API void luaL_requiref(lua_State* L, const char* modname, lua_CFunction
 #if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
 extern "C" {
 #endif
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
+#if __has_include(<lua/lua.h>)
+  #include <lua/lua.h>
+  #include <lua/lauxlib.h>
+  #include <lua/lualib.h>
+#else
+  #include <lua.h>
+  #include <lauxlib.h>
+  #include <lualib.h>
+#endif
 #if defined(__cplusplus) && !defined(COMPAT53_LUA_CPP)
 }
 #endif
 
-#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 504
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504
 
 #if !defined(LUA_ERRGCMM)
-/* So Lua 5.4 actually removes this, which breaks sol2...
+/* So Lua 5.4 or later actually removes this, which breaks sol2...
  man, this API is quite unstable...!
 */
 #  define LUA_ERRGCMM (LUA_ERRERR + 2)
 #endif /* LUA_ERRGCMM define */
 
-#endif // Lua 5.4 only
+#endif // Lua 5.4 or later
 
 #endif // NOT_KEPLER_PROJECT_COMPAT54_H_// end of sol/compatibility/compat-5.4.h
 
@@ -4568,6 +4671,23 @@ namespace sol {
 			}
 			return luaL_error(L, er.format_string, er.argument_strings[0], er.argument_strings[1], er.argument_strings[2], er.argument_strings[3]);
 		}
+
+		class error_exception : public std::runtime_error {
+		public:
+			error_exception(const std::string& str) : error_exception(detail::direct_error, "lua: error: " + str) {
+			}
+			error_exception(std::string&& str) : error_exception(detail::direct_error, "lua: error: " + std::move(str)) {
+			}
+			error_exception(detail::direct_error_tag, const std::string& str) : std::runtime_error(str) {
+			}
+			error_exception(detail::direct_error_tag, std::string&& str) : std::runtime_error(str) {
+			}
+
+			error_exception(const error_exception& e) = default;
+			error_exception(error_exception&& e) = default;
+			error_exception& operator=(const error_exception& e) = default;
+			error_exception& operator=(error_exception&& e) = default;
+		};
 	} // namespace detail
 
 	class error : public std::runtime_error {
@@ -4580,19 +4700,15 @@ namespace sol {
 		}
 		error(std::string&& str) : error(detail::direct_error, "lua: error: " + std::move(str)) {
 		}
-		error(detail::direct_error_tag, const std::string& str) : std::runtime_error(""), what_reason(str) {
+		error(detail::direct_error_tag, const std::string& str) : std::runtime_error(str) {
 		}
-		error(detail::direct_error_tag, std::string&& str) : std::runtime_error(""), what_reason(std::move(str)) {
+		error(detail::direct_error_tag, std::string&& str) : std::runtime_error(str) {
 		}
 
 		error(const error& e) = default;
 		error(error&& e) = default;
 		error& operator=(const error& e) = default;
 		error& operator=(error&& e) = default;
-
-		virtual const char* what() const noexcept override {
-			return what_reason.c_str();
-		}
 	};
 
 } // namespace sol
@@ -6747,12 +6863,10 @@ namespace sol {
 		/// one.
 		///
 		/// \group emplace
-		template <class... Args>
-		T& emplace(Args&&... args) noexcept {
-			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
-
+		T& emplace(T& arg) noexcept {
 			*this = nullopt;
-			this->construct(std::forward<Args>(args)...);
+			m_value = &arg;
+			return **this;
 		}
 
 		/// Swaps this optional with the other.
@@ -7264,6 +7378,7 @@ namespace sol { namespace detail {
 #include <initializer_list>
 #include <string>
 #include <string_view>
+#include <limits>
 #include <optional>
 #include <memory>
 #if SOL_IS_ON(SOL_STD_VARIANT)
@@ -7690,6 +7805,63 @@ namespace sol {
 		return as_container_t<T>(std::forward<T>(value));
 	}
 
+	template <typename T, std::size_t Limit = 15>
+	struct exhaustive_until : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		using base_t::value;
+
+		operator std::add_pointer_t<std::remove_reference_t<T>>() {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_pointer_t<std::add_const_t<std::remove_reference_t<T>>>() const {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>&() const {
+			return this->base_t::value();
+		}
+	};
+
+	template <typename T>
+	using exhaustive = exhaustive_until<T, (std::numeric_limits<size_t>::max)()>;
+
+	template <typename T>
+	struct non_exhaustive : private detail::ebco<T> {
+	private:
+		using base_t = detail::ebco<T>;
+
+	public:
+		using base_t::base_t;
+
+		using base_t::value;
+
+		operator std::add_pointer_t<std::remove_reference_t<T>>() {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_pointer_t<std::add_const_t<std::remove_reference_t<T>>>() const {
+			return std::addressof(this->base_t::value());
+		}
+
+		operator std::add_lvalue_reference_t<T>() {
+			return this->base_t::value();
+		}
+
+		operator std::add_const_t<std::add_lvalue_reference_t<T>>&() const {
+			return this->base_t::value();
+		}
+	};
+
 	template <typename T>
 	struct push_invoke_t : private detail::ebco<T> {
 	private:
@@ -8418,12 +8590,14 @@ namespace sol {
 	} // namespace detail
 
 	template <typename T>
-	struct is_lua_primitive
-	: std::integral_constant<bool,
-	       type::userdata
-	                 != lua_type_of_v<
-	                      T> || ((type::userdata == lua_type_of_v<T>)&&meta::meta_detail::has_internal_marker_v<lua_type_of<T>> && !meta::meta_detail::has_internal_marker_v<lua_size<T>>)
-	            || is_lua_reference_or_proxy_v<T> || meta::is_specialization_of_v<T, std::tuple> || meta::is_specialization_of_v<T, std::pair>> { };
+	struct is_lua_primitive : std::integral_constant<bool,
+	                               type::userdata != lua_type_of_v<T>                                   // cf
+	                                    || ((type::userdata == lua_type_of_v<T>)                        // cf
+	                                         &&meta::meta_detail::has_internal_marker_v<lua_type_of<T>> // cf
+	                                         && !meta::meta_detail::has_internal_marker_v<lua_size<T>>) // cf
+	                                    || is_lua_reference_or_proxy_v<T>                               // cf
+	                                    || meta::is_specialization_of_v<T, std::tuple>                  // cf
+	                                    || meta::is_specialization_of_v<T, std::pair>> { };
 
 	template <typename T>
 	constexpr inline bool is_lua_primitive_v = is_lua_primitive<T>::value;
@@ -8816,7 +8990,7 @@ namespace sol {
 			catch (...) {
 				call_exception_handler(L, optional<const std::exception&>(nullopt), "caught (...) exception");
 			}
-#endif // LuaJIT cannot have the catchall, but we must catch std::exceps for it
+#endif
 			return lua_error(L);
 #endif // Safe exceptions
 		}
@@ -8880,11 +9054,12 @@ namespace sol {
 		template <typename F, F fx>
 		inline int typed_static_trampoline(lua_State* L) {
 #if 0
-			// TODO: you must evaluate the get/check_get of every
+			// NOTE: you must evaluate the get/check_get of every
 			// argument, to ensure it doesn't throw
 			// (e.g., for the sol_lua_check_access extension point!)
 			// This incluudes properly noexcept-ing all the above
 			// trampolines / safety nets
+			// This is currently not done properly because it's an enormous pain in the ass to attempt to accomplish.
 			if constexpr (meta::bind_traits<F>::is_noexcept) {
 				return static_trampoline_noexcept<fx>(L);
 			}
@@ -9493,6 +9668,8 @@ namespace sol {
 
 // beginning of sol/error_handler.hpp
 
+#include <sol/config.hpp>
+
 #include <cstdio>
 
 namespace sol {
@@ -9550,7 +9727,7 @@ namespace sol {
 
 	inline int push_type_panic_string(lua_State* L, int index, type expected, type actual, string_view message, string_view aux_message) noexcept {
 		const char* err = message.size() == 0
-		     ? (aux_message.size() == 0 ? "stack index %d, expected %s, received %s" : "stack index %d, expected %s, received %s: %s")
+		     ? (aux_message.size() == 0 ? "stack index %d, expected %s, received %s" : "stack index %d, expected %s, received %s: %s%s")
 		     : "stack index %d, expected %s, received %s: %s %s";
 		const char* type_name = expected == type::poly ? "anything" : lua_typename(L, static_cast<int>(expected));
 		{
@@ -9562,12 +9739,16 @@ namespace sol {
 
 	inline int type_panic_string(lua_State* L, int index, type expected, type actual, string_view message = "") noexcept(false) {
 		push_type_panic_string(L, index, expected, actual, message, "");
-		return lua_error(L);
+		size_t str_size = 0;
+		const char* str = lua_tolstring(L, -1, &str_size);
+		return luaL_error(L, str);
 	}
 
 	inline int type_panic_c_str(lua_State* L, int index, type expected, type actual, const char* message = nullptr) noexcept(false) {
 		push_type_panic_string(L, index, expected, actual, message == nullptr ? "" : message, "");
-		return lua_error(L);
+		size_t str_size = 0;
+		const char* str = lua_tolstring(L, -1, &str_size);
+		return luaL_error(L, str);
 	}
 
 	struct type_panic_t {
@@ -9584,7 +9765,9 @@ namespace sol {
 	struct constructor_handler {
 		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
 			push_type_panic_string(L, index, expected, actual, message, "(type check failed in constructor)");
-			return lua_error(L);
+			size_t str_size = 0;
+			const char* str = lua_tolstring(L, -1, &str_size);
+			return luaL_error(L, str);
 		}
 	};
 
@@ -9592,7 +9775,9 @@ namespace sol {
 	struct argument_handler {
 		int operator()(lua_State* L, int index, type expected, type actual, string_view message) const noexcept(false) {
 			push_type_panic_string(L, index, expected, actual, message, "(bad argument to variable or function call)");
-			return lua_error(L);
+			size_t str_size = 0;
+			const char* str = lua_tolstring(L, -1, &str_size);
+			return luaL_error(L, str);
 		}
 	};
 
@@ -9608,7 +9793,9 @@ namespace sol {
 				aux_message += ")')";
 				push_type_panic_string(L, index, expected, actual, message, aux_message);
 			}
-			return lua_error(L);
+			size_t str_size = 0;
+			const char* str = lua_tolstring(L, -1, &str_size);
+			return luaL_error(L, str);
 		}
 	};
 
@@ -11252,10 +11439,10 @@ namespace sol {
 
 			constexpr std::size_t initial_size = aligned_space_for<T*, unique_destructor, unique_tag, Real>();
 
-			void* pointer_adjusted;
-			void* dx_adjusted;
-			void* id_adjusted;
-			void* data_adjusted;
+			void* pointer_adjusted = nullptr;
+			void* dx_adjusted = nullptr;
+			void* id_adjusted = nullptr;
+			void* data_adjusted = nullptr;
 			bool result = attempt_alloc_unique(L,
 			     std::alignment_of_v<T*>,
 			     sizeof(T*),
@@ -12521,6 +12708,7 @@ namespace sol { namespace stack {
 			}
 			else if constexpr (is_unique_usertype_v<T>) {
 				using element = unique_usertype_element_t<T>;
+				using element_no_cv = meta::unqualified_t<element>;
 				using actual = unique_usertype_actual_t<T>;
 				const type indextype = type_of(L_, index);
 				tracking.use(1);
@@ -12532,7 +12720,7 @@ namespace sol { namespace stack {
 					return true;
 				}
 				int metatableindex = lua_gettop(L_);
-				if (stack_detail::check_metatable<d::u<element>>(L_, metatableindex)) {
+				if (stack_detail::check_metatable<d::u<element_no_cv>>(L_, metatableindex)) {
 					void* memory = lua_touserdata(L_, index);
 					memory = detail::align_usertype_unique_destructor(memory);
 					detail::unique_destructor& pdx = *static_cast<detail::unique_destructor*>(memory);
@@ -12882,6 +13070,104 @@ namespace sol { namespace stack {
 		}
 	};
 
+	template <typename T, std::size_t N, type expect>
+	struct unqualified_checker<exhaustive_until<T, N>, expect> {
+		template <typename K, typename V, typename Handler>
+		static bool check_two(types<K, V>, lua_State* arg_L, int relindex, type, Handler&& handler, record& tracking) {
+			tracking.use(1);
+
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+			luaL_checkstack(arg_L, 3, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+
+			int index = lua_absindex(arg_L, relindex);
+			lua_pushnil(arg_L);
+			while (lua_next(arg_L, index) != 0) {
+				const bool is_key_okay = stack::check<K>(arg_L, -2, std::forward<Handler>(handler), tracking);
+				if (!is_key_okay) {
+					lua_pop(arg_L, 2);
+					return false;
+				}
+				const bool is_value_okay = stack::check<V>(arg_L, -1, std::forward<Handler>(handler), tracking);
+				if (!is_value_okay) {
+					lua_pop(arg_L, 2);
+					return false;
+				}
+				lua_pop(arg_L, 1);
+			}
+			return true;
+		}
+
+		template <typename V, typename Handler>
+		static bool check_one(types<V>, lua_State* arg_L, int relindex, type, Handler&& handler, record& tracking) {
+			tracking.use(1);
+
+			size_t index = lua_absindex(arg_L, relindex);
+			// Zzzz slower but necessary thanks to the lower version API and missing functions qq
+			std::size_t idx = 0;
+			int vi = 0;
+			for (lua_Integer i = 0;; (void)(i += lua_size<V>::value), lua_pop(arg_L, static_cast<int>(vi))) {
+				vi = 0;
+				if (idx >= N) {
+					return true;
+				}
+#if SOL_IS_ON(SOL_SAFE_STACK_CHECK)
+				luaL_checkstack(arg_L, 2, detail::not_enough_stack_space_generic);
+#endif // make sure stack doesn't overflow
+				bool isnil = false;
+				for (; vi < static_cast<int>(lua_size<V>::value); ++vi) {
+					lua_pushinteger(arg_L, i);
+					lua_gettable(arg_L, static_cast<int>(index));
+					type vt = type_of(arg_L, -1);
+					isnil = vt == type::lua_nil;
+					if (isnil) {
+						if (i == 0) {
+							vi += 1;
+							goto loop_continue;
+						}
+						lua_pop(arg_L, static_cast<int>(vi + 1));
+						return true;
+					}
+				}
+				if (!stack::check<V>(arg_L, -lua_size<V>::value, std::forward<Handler>(handler), tracking)) {
+					lua_pop(arg_L, lua_size<V>::value);
+					return false;
+				}
+				++idx;
+			loop_continue:;
+			}
+		}
+
+		template <typename Handler>
+		static bool check(lua_State* arg_L, int index, Handler&& handler, record& tracking) {
+			using Tu = meta::unqualified_t<T>;
+			if constexpr (is_container_v<Tu>) {
+				if constexpr (meta::is_associative<Tu>::value) {
+					typedef typename Tu::value_type P;
+					typedef typename P::first_type K;
+					typedef typename P::second_type V;
+					return check_two(types<K, V>(), arg_L, index, expect, std::forward<Handler>(handler), tracking);
+				}
+				else {
+					typedef typename Tu::value_type V;
+					return check_one(types<V>(), arg_L, index, expect, std::forward<Handler>(handler), tracking);
+				}
+			}
+			else {
+				unqualified_checker<Tu, expect> c {};
+				return c.check(arg_L, index, std::forward<Handler>(handler), tracking);
+			}
+		}
+	};
+
+	template <typename T, type expect>
+	struct unqualified_checker<non_exhaustive<T>, expect> {
+		template <typename Handler>
+		static bool check(lua_State* arg_L, int index, Handler&& handler, record& tracking) {
+			return stack::check<T>(arg_L, index, std::forward<Handler>(handler), tracking);
+		}
+	};
+
 	template <typename... Args>
 	struct unqualified_checker<std::tuple<Args...>, type::poly> {
 		template <typename Handler>
@@ -13345,6 +13631,24 @@ namespace sol {
 } // namespace sol
 // end of sol/unicode.hpp
 
+// beginning of sol/abort.hpp
+
+#include <cstdlib>
+
+#if SOL_IS_ON(SOL_DEBUG_BUILD)
+	#if SOL_IS_ON(SOL_COMPILER_VCXX)
+		#define SOL_DEBUG_ABORT() \
+			if (true) { ::std::abort(); } \
+			static_assert(true, "")
+	#else
+		#define SOL_DEBUG_ABORT() ::std::abort()
+	#endif
+#else
+	#define SOL_DEBUG_ABORT() static_assert(true, "")
+#endif
+
+// end of sol/abort.hpp
+
 #include <memory>
 #include <functional>
 #include <utility>
@@ -13498,10 +13802,10 @@ namespace sol { namespace stack {
 	struct qualified_getter {
 		static decltype(auto) get(lua_State* L, int index, record& tracking) {
 			using Tu = meta::unqualified_t<X>;
-			static constexpr bool is_userdata_of_some_kind
+			static constexpr bool is_maybe_userdata_of_some_kind
 				= !std::is_reference_v<
 				       X> && is_container_v<Tu> && std::is_default_constructible_v<Tu> && !is_lua_primitive_v<Tu> && !is_transparent_argument_v<Tu>;
-			if constexpr (is_userdata_of_some_kind) {
+			if constexpr (is_maybe_userdata_of_some_kind) {
 				if (type_of(L, index) == type::userdata) {
 					return static_cast<Tu>(stack_detail::unchecked_unqualified_get<Tu>(L, index, tracking));
 				}
@@ -13524,11 +13828,9 @@ namespace sol { namespace stack {
 				}
 				actual r {};
 				if constexpr (!derive<element>::value) {
-#if SOL_IS_ON(SOL_DEBUG_BUILD)
 					// In debug mode we would rather abort you for this grave failure rather
 					// than let you deref a null pointer and fuck everything over
-					std::abort();
-#endif
+					SOL_DEBUG_ABORT();
 					return static_cast<actual>(std::move(r));
 				}
 				else {
@@ -13561,11 +13863,7 @@ namespace sol { namespace stack {
 						// uh oh..
 						break;
 					}
-#if SOL_IS_ON(SOL_DEBUG_BUILD)
-					// In debug mode we would rather abort you for this grave failure rather
-					// than let you deref a null pointer and fuck everything over
-					std::abort();
-#endif
+					SOL_DEBUG_ABORT();
 					return static_cast<actual>(r);
 				}
 			}
@@ -13892,20 +14190,20 @@ namespace sol { namespace stack {
 			using Tu = meta::unqualified_t<T>;
 			if constexpr (is_container_v<Tu>) {
 				if constexpr (meta::is_associative<Tu>::value) {
-					typedef typename T::value_type P;
+					typedef typename Tu::value_type P;
 					typedef typename P::first_type K;
 					typedef typename P::second_type V;
-					unqualified_getter<as_table_t<T>> g{};
+					unqualified_getter<as_table_t<T>> g {};
 					return g.get(types<K, nested<V>>(), L, index, tracking);
 				}
 				else {
-					typedef typename T::value_type V;
-					unqualified_getter<as_table_t<T>> g{};
+					typedef typename Tu::value_type V;
+					unqualified_getter<as_table_t<T>> g {};
 					return g.get(types<nested<V>>(), L, index, tracking);
 				}
 			}
 			else {
-				unqualified_getter<Tu> g{};
+				unqualified_getter<Tu> g {};
 				return g.get(L, index, tracking);
 			}
 		}
@@ -13925,6 +14223,20 @@ namespace sol { namespace stack {
 		}
 	};
 
+	template <typename T>
+	struct unqualified_getter<exhaustive<T>> {
+		static decltype(auto) get(lua_State* arg_L, int index, record& tracking) {
+			return stack::get<T>(arg_L, index, tracking);
+		}
+	};
+
+	template <typename T>
+	struct unqualified_getter<non_exhaustive<T>> {
+		static decltype(auto) get(lua_State* arg_L, int index, record& tracking) {
+			return stack::get<T>(arg_L, index, tracking);
+		}
+	};
+
 	template <>
 	struct unqualified_getter<userdata_value> {
 		static userdata_value get(lua_State* L, int index, record& tracking) {
@@ -14538,7 +14850,9 @@ namespace sol { namespace stack {
 
 #if SOL_IS_ON(SOL_COMPILER_GCC)
 #pragma GCC diagnostic push
+#if !SOL_IS_ON(SOL_COMPILER_CLANG)
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
 #endif
 
 	namespace stack_detail {
@@ -14667,34 +14981,6 @@ namespace sol { namespace stack {
 #include <variant>
 #endif // Can use variant
 
-// beginning of sol/debug.hpp
-
-#include <iostream>
-
-namespace sol { namespace detail { namespace debug {
-	inline std::string dump_types(lua_State* L) {
-		std::string visual;
-		std::size_t size = lua_gettop(L) + 1;
-		for (std::size_t i = 1; i < size; ++i) {
-			if (i != 1) {
-				visual += " | ";
-			}
-			visual += type_name(L, stack::get<type>(L, static_cast<int>(i)));
-		}
-		return visual;
-	}
-
-	inline void print_stack(lua_State* L) {
-		std::cout << dump_types(L) << std::endl;
-	}
-
-	inline void print_section(const std::string& message, lua_State* L) {
-		std::cout << "-- " << message << " -- [ " << dump_types(L) << " ]" << std::endl;
-	}
-}}} // namespace sol::detail::debug
-
-// end of sol/debug.hpp
-
 namespace sol { namespace stack {
 	namespace stack_detail {
 		template <typename T>
@@ -14796,7 +15082,7 @@ namespace sol { namespace stack {
 		lua_State* target_L = target.lua_state();
 		int target_index = absolute_index(target_L, -target.push());
 		int env_count = push_environment_of(target_L, target_index);
-		sol_c_assert(env_count == 1);
+		SOL_ASSERT(env_count == 1);
 		lua_rotate(target_L, target_index, 1);
 		lua_pop(target_L, 1);
 		return env_count;
@@ -14974,7 +15260,7 @@ namespace sol { namespace stack {
 				if (static_cast<T>(llround(static_cast<lua_Number>(value))) != value) {
 #if SOL_IS_OFF(SOL_EXCEPTIONS)
 					// Is this really worth it?
-					sol_m_assert(false, "integer value will be misrepresented in lua");
+					SOL_ASSERT_MSG(false, "integer value will be misrepresented in lua");
 					lua_pushinteger(L, static_cast<lua_Integer>(value));
 					return 1;
 #else
@@ -16494,7 +16780,10 @@ namespace sol {
 			template <bool checked, typename Arg, typename... Args, std::size_t I, std::size_t... Is, typename Handler, typename Fx, typename... FxArgs>
 			static decltype(auto) eval(types<Arg, Args...>, std::index_sequence<I, Is...>, lua_State* L_, int start_index_, Handler&& handler_,
 			     record& tracking_, Fx&& fx_, FxArgs&&... fxargs_) {
-#if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS)
+#if 0 && SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS)
+				// NOTE: THIS IS TERMPORARILY TURNED OFF BECAUSE IT IMPACTS ACTUAL SEMANTICS W.R.T. THINGS LIKE LUAJIT,
+				// SO IT MUST REMAIN OFF UNTIL WE CAN ESTABLISH SIMILAR BEHAVIOR IN MODES WHERE `checked == false`!
+
 				// We can save performance/time by letting errors unwind produced arguments
 				// rather than checking everything once, and then potentially re-doing work
 				if constexpr (checked) {
@@ -16549,9 +16838,9 @@ namespace sol {
 			template <typename T>
 			void raw_table_set(lua_State* L, T&& arg, int tableindex = -2) {
 				int push_count = push(L, std::forward<T>(arg));
-				sol_c_assert(push_count == 1);
+				SOL_ASSERT(push_count == 1);
 				std::size_t unique_index = static_cast<std::size_t>(luaL_len(L, tableindex) + 1u);
-				lua_rawseti(L, tableindex, unique_index);
+				lua_rawseti(L, tableindex, static_cast<int>(unique_index));
 			}
 
 		} // namespace stack_detail
@@ -16559,7 +16848,7 @@ namespace sol {
 		template <typename T>
 		int set_ref(lua_State* L, T&& arg, int tableindex = -2) {
 			int push_count = push(L, std::forward<T>(arg));
-			sol_c_assert(push_count == 1);
+			SOL_ASSERT(push_count == 1);
 			return luaL_ref(L, tableindex);
 		}
 
@@ -16700,6 +16989,24 @@ namespace sol {
 			(void)L;
 #endif
 		}
+
+		namespace stack_detail {
+			inline error get_error(lua_State* L, int target) {
+				auto maybe_exc = stack::check_get<error&>(L, target);
+				if (maybe_exc.has_value()) {
+					return maybe_exc.value();
+				}
+				return error(detail::direct_error, stack::get<std::string>(L, target));
+			}
+
+			inline detail::error_exception get_error_exception(lua_State* L, int target) {
+				auto maybe_exc = stack::check_get<detail::error_exception&>(L, target);
+				if (maybe_exc.has_value()) {
+					return maybe_exc.value();
+				}
+				return detail::error_exception(detail::direct_error, stack::get<std::string>(L, target));
+			}
+		}
 	} // namespace stack
 } // namespace sol
 
@@ -17246,7 +17553,7 @@ namespace sol {
 
 		protected_function_result() noexcept : protected_function_result(nullptr) {}
 		protected_function_result(lua_State* Ls, int idx = -1, int retnum = 0, int popped = 0, call_status pferr = call_status::ok) noexcept
-		: L(Ls), index(idx), returncount(retnum), popcount(popped), err(pferr) {
+		: L( Ls), index(idx), returncount(retnum), popcount(popped), err(pferr) {
 		}
 
 		// We do not want anyone to copy these around willy-nilly
@@ -17291,7 +17598,9 @@ namespace sol {
 
 #if SOL_IS_ON(SOL_COMPILER_GCC)
 #pragma GCC diagnostic push
+#if !SOL_IS_ON(SOL_COMPILER_CLANG)
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
 #endif
 
 		template <typename T>
@@ -17304,7 +17613,7 @@ namespace sol {
 					if (valid()) {
 						return UT();
 					}
-					return UT(error(detail::direct_error, stack::get<std::string>(L, target)));
+					return UT(stack::stack_detail::get_error(L, target));
 				}
 				else {
 					if (!valid()) {
@@ -17321,7 +17630,7 @@ namespace sol {
 						type_panic_c_str(L, target, t, type::none, "bad get from protected_function_result (is an error)");
 					}
 #endif // Check Argument Safety
-					return error(detail::direct_error, stack::get<std::string>(L, target));
+					return stack::stack_detail::get_error(L, target);
 				}
 				else {
 #if SOL_IS_ON(SOL_SAFE_PROXIES)
@@ -18513,12 +18822,13 @@ namespace sol {
 					using object_type = typename wrap::object_type;
 					if constexpr (sizeof...(Args) < 1) {
 						using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
-						static_assert(std::is_base_of_v<object_type, Ta>,
+						static_assert(std::is_same_v<object_type, Ta> || std::is_base_of_v<object_type, Ta>,
 						     "It seems like you might have accidentally bound a class type with a member function method that does not correspond to the "
 						     "class. For example, there could be a small type in your new_usertype<T>(...) binding, where you specify one class \"T\" "
 						     "but then bind member methods from a complete unrelated class. Check things over!");
 #if SOL_IS_ON(SOL_SAFE_USERTYPE)
-						auto maybeo = stack::check_get<Ta*>(L, 1);
+						stack::record tracking {};
+						auto maybeo = stack::stack_detail::check_get_arg<Ta*>(L, 1, &no_panic, tracking);
 						if (!maybeo || maybeo.value() == nullptr) {
 							return luaL_error(L,
 							     "sol: received nil for 'self' argument (use ':' for accessing member functions, make sure member variables are "
@@ -18546,12 +18856,13 @@ namespace sol {
 					if constexpr (is_index) {
 						if constexpr (sizeof...(Args) < 1) {
 							using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
-							static_assert(std::is_base_of_v<object_type, Ta>,
+							static_assert(std::is_same_v<object_type, Ta> || std::is_base_of_v<object_type, Ta>,
 							     "It seems like you might have accidentally bound a class type with a member function method that does not correspond "
 							     "to the class. For example, there could be a small type in your new_usertype<T>(...) binding, where you specify one "
 							     "class \"T\" but then bind member methods from a complete unrelated class. Check things over!");
 #if SOL_IS_ON(SOL_SAFE_USERTYPE)
-							auto maybeo = stack::check_get<Ta*>(L, 1);
+							stack::record tracking {};
+							auto maybeo = stack::stack_detail::check_get_arg<Ta*>(L, 1, &no_panic, tracking);
 							if (!maybeo || maybeo.value() == nullptr) {
 								if (is_variable) {
 									return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
@@ -18609,7 +18920,8 @@ namespace sol {
 								else {
 									using Ta = meta::conditional_t<std::is_void_v<T>, object_type, T>;
 #if SOL_IS_ON(SOL_SAFE_USERTYPE)
-									auto maybeo = stack::check_get<Ta*>(L, 1);
+								stack::record tracking {};
+								auto maybeo = stack::stack_detail::check_get_arg<Ta*>(L, 1, &no_panic, tracking);
 									if (!maybeo || maybeo.value() == nullptr) {
 										if (is_variable) {
 											return luaL_error(L, "sol: received nil for 'self' argument (bad '.' access?)");
@@ -18847,7 +19159,8 @@ namespace sol {
 						using Ta = T;
 						using Oa = std::remove_pointer_t<object_type>;
 #if SOL_IS_ON(SOL_SAFE_USERTYPE)
-						auto maybeo = stack::check_get<Ta*>(L, 1);
+						stack::record tracking {};
+						auto maybeo = stack::stack_detail::check_get_arg<Ta*>(L, 1, &no_panic, tracking);
 						if (!maybeo || maybeo.value() == nullptr) {
 							if (is_variable) {
 								return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
@@ -21671,6 +21984,7 @@ namespace sol {
 
 		public:
 			typedef lua_nil_t iterator;
+			typedef iterator sentinel;
 			typedef lua_nil_t value_type;
 
 			static int at(lua_State* L_) {
@@ -21743,7 +22057,7 @@ namespace sol {
 				return lua_nil;
 			}
 
-			static iterator end(lua_State* L_, T&) {
+			static sentinel end(lua_State* L_, T&) {
 				luaL_error(L_, "sol: cannot call 'end' on type '%s': it is not recognized as a container", detail::demangle<T>().c_str());
 				return lua_nil;
 			}
@@ -21763,6 +22077,7 @@ namespace sol {
 			using is_ordered = meta::is_ordered<T>;
 			using is_matched_lookup = meta::is_matched_lookup<T>;
 			using iterator = typename T::iterator;
+			using sentinel = meta::sentinel_or_t<T, iterator>;
 			using value_type = typename T::value_type;
 			typedef meta::conditional_t<is_matched_lookup::value, std::pair<value_type, value_type>,
 			     meta::conditional_t<is_associative::value || is_lookup::value, value_type, std::pair<std::ptrdiff_t, value_type>>>
@@ -21782,16 +22097,30 @@ namespace sol {
 			typedef meta::unqualified_t<decltype(get_key(is_associative(), std::declval<std::add_lvalue_reference_t<value_type>>()))> key_type;
 			typedef meta::all<std::is_integral<K>, meta::neg<meta::any<is_associative, is_lookup>>> is_linear_integral;
 
-			struct iter {
-				reference keep_alive;
-				T& source;
-				iterator it;
+			struct iter : detail::ebco<iterator, 0>, detail::ebco<sentinel, 1> {
+				using it_base = detail::ebco<iterator, 0>;
+				using sen_base = detail::ebco<sentinel, 1>;
+				main_reference keep_alive;
 				std::size_t index;
 
-				iter(lua_State* L_, int stack_index, T& source_, iterator it_) : keep_alive(sol::main_thread(L_, L_), stack_index), source(source_), it(std::move(it_)), index(0) {
+				iter(lua_State* L_, int stack_index_, iterator it_, sentinel sen_) noexcept
+				: it_base(std::move(it_)), sen_base(std::move(sen_)), keep_alive(L_, stack_index_), index(0) {
+				}
+
+				iterator& it() noexcept {
+					return it_base::value();
+				}
+
+				const iterator& it() const noexcept {
+					return it_base::value();
+				}
+
+				sentinel& sen() noexcept {
+					return sen_base::value();
 				}
 
-				~iter() {
+				const sentinel& sen() const noexcept {
+					return sen_base::value();
 				}
 			};
 
@@ -22443,9 +22772,9 @@ namespace sol {
 			template <bool ip>
 			static int next_associative(std::true_type, lua_State* L_) {
 				iter& i = stack::unqualified_get<user<iter>>(L_, 1);
-				auto& source = i.source;
-				auto& it = i.it;
-				if (it == deferred_uc::end(L_, source)) {
+				auto& it = i.it();
+				auto& end = i.end();
+				if (it == end) {
 					return stack::push(L_, lua_nil);
 				}
 				int p;
@@ -22464,10 +22793,10 @@ namespace sol {
 			template <bool>
 			static int next_associative(std::false_type, lua_State* L_) {
 				iter& i = stack::unqualified_get<user<iter>>(L_, 1);
-				auto& source = i.source;
-				auto& it = i.it;
+				auto& it = i.it();
+				auto& end = i.sen();
 				next_K k = stack::unqualified_get<next_K>(L_, 2);
-				if (it == deferred_uc::end(L_, source)) {
+				if (it == end) {
 					return stack::push(L_, lua_nil);
 				}
 				int p;
@@ -22492,7 +22821,7 @@ namespace sol {
 			static int pairs_associative(std::true_type, lua_State* L_) {
 				auto& src = get_src(L_);
 				stack::push(L_, next_iter<ip>);
-				stack::push<user<iter>>(L_, L_, 1, src, deferred_uc::begin(L_, src));
+				stack::push<user<iter>>(L_, L_, 1, deferred_uc::begin(L_, src), deferred_uc::begin(L_, src));
 				stack::push(L_, lua_nil);
 				return 3;
 			}
@@ -22501,7 +22830,7 @@ namespace sol {
 			static int pairs_associative(std::false_type, lua_State* L_) {
 				auto& src = get_src(L_);
 				stack::push(L_, next_iter<ip>);
-				stack::push<user<iter>>(L_, L_, 1, src, deferred_uc::begin(L_, src));
+				stack::push<user<iter>>(L_, L_, 1, deferred_uc::begin(L_, src), deferred_uc::end(L_, src));
 				stack::push(L_, 0);
 				return 3;
 			}
@@ -22593,7 +22922,7 @@ namespace sol {
 				}
 			}
 
-			static iterator end(lua_State*, T& self) {
+			static sentinel end(lua_State*, T& self) {
 				if constexpr (meta::has_begin_end_v<T>) {
 					return self.end();
 				}
@@ -22658,19 +22987,32 @@ namespace sol {
 		public:
 			typedef std::remove_extent_t<T> value_type;
 			typedef value_type* iterator;
+			typedef iterator sentinel;
 
 		private:
-			struct iter {
+			struct iter : detail::ebco<iterator, 0>, detail::ebco<sentinel, 1> {
+				using it_base = detail::ebco<iterator, 0>;
+				using sen_base = detail::ebco<sentinel, 1>;
 				reference keep_alive;
-				T& source;
-				iterator it;
+				
+				iter(lua_State* L_, int stack_index_, iterator it_, sentinel sen_) noexcept
+				: it_base(std::move(it_)), sen_base(std::move(sen_)), keep_alive(sol::main_thread(L_, L_), stack_index_) {
+				}
 
-				iter(lua_State* L_, int stack_index, T& source, iterator it) noexcept
-				: keep_alive(sol::main_thread(L_, L_), stack_index), source(source), it(std::move(it)) {
+				iterator& it() noexcept {
+					return it_base::value();
 				}
 
-				~iter() {
+				const iterator& it() const noexcept {
+					return it_base::value();
+				}
+
+				sentinel& sen() noexcept {
+					return sen_base::value();
+				}
 
+				const sentinel& sen() const noexcept {
+					return sen_base::value();
 				}
 			};
 
@@ -22711,10 +23053,10 @@ namespace sol {
 
 			static int next_iter(lua_State* L_) {
 				iter& i = stack::unqualified_get<user<iter>>(L_, 1);
-				auto& source = i.source;
-				auto& it = i.it;
+				auto& it = i.it();
+				auto& end = i.sen();
 				std::size_t k = stack::unqualified_get<std::size_t>(L_, 2);
-				if (it == deferred_uc::end(L_, source)) {
+				if (it == end) {
 					return 0;
 				}
 				int p;
@@ -22796,7 +23138,7 @@ namespace sol {
 			static int pairs(lua_State* L_) {
 				auto& src = get_src(L_);
 				stack::push(L_, next_iter);
-				stack::push<user<iter>>(L_, L_, 1, src, deferred_uc::begin(L_, src));
+				stack::push<user<iter>>(L_, L_, 1, deferred_uc::begin(L_, src), deferred_uc::end(L_, src));
 				stack::push(L_, 0);
 				return 3;
 			}
@@ -22817,7 +23159,7 @@ namespace sol {
 				return std::addressof(self[0]);
 			}
 
-			static iterator end(lua_State*, T& self) {
+			static sentinel end(lua_State*, T& self) {
 				return std::addressof(self[0]) + std::extent<T>::value;
 			}
 		};
@@ -24763,6 +25105,15 @@ namespace sol {
 		table_proxy(Table table, T&& k) : tbl(table), key(std::forward<T>(k)) {
 		}
 
+		table_proxy(const table_proxy&) = default;
+		table_proxy(table_proxy&&) = default;
+		table_proxy& operator=(const table_proxy& right) {
+			return set(right);
+		}
+		table_proxy& operator=(table_proxy&& right) {
+			return set(std::move(right));
+		}
+
 		template <typename T>
 		table_proxy& set(T&& item) & {
 			tuple_set(std::make_index_sequence<std::tuple_size_v<meta::unqualified_t<key_type>>>(), std::forward<T>(item));
@@ -24787,7 +25138,7 @@ namespace sol {
 			return std::move(*this);
 		}
 
-		template <typename T>
+		template <typename T, std::enable_if_t<!std::is_same_v<meta::unqualified_t<T>, table_proxy>>* = nullptr>
 		table_proxy& operator=(T&& other) & {
 			using Tu = meta::unwrap_unqualified_t<T>;
 			if constexpr (!is_lua_reference_or_proxy_v<Tu> && meta::is_invocable_v<Tu>) {
@@ -24798,7 +25149,7 @@ namespace sol {
 			}
 		}
 
-		template <typename T>
+		template <typename T, std::enable_if_t<!std::is_same_v<meta::unqualified_t<T>, table_proxy>>* = nullptr>
 		table_proxy&& operator=(T&& other) && {
 			using Tu = meta::unwrap_unqualified_t<T>;
 			if constexpr (!is_lua_reference_or_proxy_v<Tu> && meta::is_invocable_v<Tu> && !detail::is_msvc_callable_rigged_v<T>) {
@@ -25175,7 +25526,7 @@ namespace sol { namespace stack { namespace stack_detail {
 			pushed += 1;
 		}
 		int metatable_exists = lua_getmetatable(L_, 1);
-		sol_c_assert(metatable_exists == 1);
+		SOL_ASSERT(metatable_exists == 1);
 		const auto& index_key = to_string(sol::meta_function::index);
 		lua_getfield(L_, lua_gettop(L_), index_key.c_str());
 		lua_remove(L_, -2);
@@ -26874,7 +27225,7 @@ namespace sol {
 					if (valid()) {
 						return UT(nullopt);
 					}
-					return error(detail::direct_error, stack::get<std::string>(L, index));
+					return stack::stack_detail::get_error(L, index);
 				}
 				else {
 					if (!valid()) {
@@ -26890,7 +27241,7 @@ namespace sol {
 						type_panic_c_str(L, index, type_of(L, index), type::none, "expecting an error type (a string, from Lua)");
 					}
 #endif // Check proxy type's safety
-					return error(detail::direct_error, stack::get<std::string>(L, index));
+					return stack::stack_detail::get_error(L, index);
 				}
 				else {
 #if SOL_IS_ON(SOL_SAFE_PROXIES)
@@ -28233,6 +28584,14 @@ namespace sol {
 
 // end of sol/thread.hpp
 
+inline lua_State* sol_lua_newstate(lua_Alloc f, void* ud, [[maybe_unused]] unsigned seed = 0) {
+#if LUA_VERSION_NUM >= 505
+	return ::lua_newstate(f, ud, seed);
+#else
+	return ::lua_newstate(f, ud);
+#endif
+}
+
 namespace sol {
 
 	class state : private std::unique_ptr<lua_State, detail::state_deleter>, public state_view {
@@ -28245,7 +28604,7 @@ namespace sol {
 		}
 
 		state(lua_CFunction panic, lua_Alloc alfunc, void* alpointer = nullptr)
-		: unique_base(lua_newstate(alfunc, alpointer)), state_view(unique_base::get()) {
+		: unique_base(sol_lua_newstate(alfunc, alpointer)), state_view(unique_base::get()) {
 			set_default_state(unique_base::get(), panic);
 		}
 
@@ -28848,6 +29207,8 @@ namespace sol {
 
 		basic_variadic_results(const basic_variadic_results&) = default;
 		basic_variadic_results(basic_variadic_results&&) = default;
+		basic_variadic_results& operator=(const basic_variadic_results&) = default;
+		basic_variadic_results& operator=(basic_variadic_results&&) = default;
 	};
 
 	struct variadic_results : public basic_variadic_results<> {
@@ -28904,4 +29265,4 @@ namespace sol {
 #endif // SOL_HPP
 // end of sol/sol.hpp
 
-#endif // SOL_SINGLE_INCLUDE_HPP
+#endif // SOL_SINGLE_INCLUDE_SOL_HPP
diff --git a/docs/api/reference/ibstream-class.md b/docs/api/reference/ibstream-class.md
index 7ebf27f70..5d474a2db 100644
--- a/docs/api/reference/ibstream-class.md
+++ b/docs/api/reference/ibstream-class.md
@@ -306,7 +306,7 @@ using fast_ibstream = basic_ibstream<endian::host_convert_tag>;
 构造一个 `ibstream` 对象。
 
 ```cpp
-ibstream(yasio::sbyte_buffer blob);
+ibstream(tlx::byte_buffer blob);
 
 ibstream(const obstream* obs);
 ```
diff --git a/docs/api/reference/io_event-class.md b/docs/api/reference/io_event-class.md
index 6c4dcc10f..5dbf92046 100644
--- a/docs/api/reference/io_event-class.md
+++ b/docs/api/reference/io_event-class.md
@@ -85,7 +85,7 @@ int passive() const
 获取事件携带的消息包
 
 ```cpp
-yasio::sbyte_buffer& packet()
+tlx::byte_buffer& packet()
 ```
 
 ## 返回值
diff --git a/docs/api/reference/io_service-class.md b/docs/api/reference/io_service-class.md
index 0cbdfe44b..9b81b1640 100644
--- a/docs/api/reference/io_service-class.md
+++ b/docs/api/reference/io_service-class.md
@@ -282,7 +282,7 @@ yasio_shared_service()->dispatch(128);
 ```cpp
 int write(
     transport_handle_t thandle,
-    yasio::sbyte_buffer buffer,
+    tlx::byte_buffer buffer,
     io_completion_cb_t completion_handler = nullptr
 );
 ```
@@ -315,7 +315,7 @@ int write(
 ```cpp
 int write_to(
     transport_handle_t thandle,
-    yasio::sbyte_buffer buffer,
+    tlx::byte_buffer buffer,
     const ip::endpoint& to,
     io_completion_cb_t completion_handler = nullptr
 );
diff --git a/docs/api/reference/obstream-class.md b/docs/api/reference/obstream-class.md
index 1f39ca3bf..214f5dcc2 100644
--- a/docs/api/reference/obstream-class.md
+++ b/docs/api/reference/obstream-class.md
@@ -232,9 +232,9 @@ size_t length() const;
 获取流内部缓冲区。
 
 ```cpp
-const yasio::sbyte_buffer& buffer() const;
+const tlx::byte_buffer& buffer() const;
 
-yasio::sbyte_buffer& buffer();
+tlx::byte_buffer& buffer();
 ```
 
 ### 返回值
diff --git a/examples/ftp_server b/examples/ftp_server
index cf822f511..c6681bcde 160000
--- a/examples/ftp_server
+++ b/examples/ftp_server
@@ -1 +1 @@
-Subproject commit cf822f51127780dffbbe39789a9fac5102e0a4ec
+Subproject commit c6681bcdedadd14cbcc583ab6046d97e452967de
diff --git a/examples/lua/main.cpp b/examples/lua/main.cpp
index a0d8b66da..c84dd831d 100644
--- a/examples/lua/main.cpp
+++ b/examples/lua/main.cpp
@@ -1,6 +1,7 @@
 #include <thread>
+#include <string_view>
+#include "yasio/compiler/feature_test.hpp"
 #include "yasio/bindings/lyasio.hpp"
-#include "yasio/string_view.hpp"
 #if YASIO__HAS_CXX14
 #  if YASIO__HAS_CXX17 // use sol2-3.x
 #    include "sol/sol.hpp"
@@ -31,9 +32,9 @@ int main(int argc, char** argv)
   s.open_libraries();
   luaregister_yasio(s.lua_state());
 
-  cxx17::string_view path = argv[0];
+  std::string_view path = argv[0];
   auto pos                = path.find_last_of("/\\");
-  if (pos != cxx17::string_view::npos)
+  if (pos != std::string_view::npos)
     path.remove_suffix(path.size() - pos - 1);
   std::string package_path = s["package"]["path"];
   package_path.push_back(';');
@@ -62,9 +63,9 @@ int main(int argc, char** argv)
   s.openlibs();
   luaregister_yasio(s.state());
 
-  cxx17::string_view path = argv[0];
+  std::string_view path = argv[0];
   auto pos                = path.find_last_of("/\\");
-  if (pos != cxx17::string_view::npos)
+  if (pos != std::string_view::npos)
     path.remove_suffix(path.size() - pos - 1);
   std::string package_path = s["package"]["path"];
   package_path.push_back(';');
diff --git a/tests/ssl/main.cpp b/tests/ssl/main.cpp
index 7456c38f9..9b446f24e 100644
--- a/tests/ssl/main.cpp
+++ b/tests/ssl/main.cpp
@@ -35,7 +35,7 @@ void yasioTest()
   service.set_option(YOPT_S_SSL_CERT, SSLTEST_CERT, SSLTEST_PKEY);
   service.set_option(YOPT_C_MOD_FLAGS, SSLTEST_CHANNEL_SERVER, YCF_REUSEADDR, 0);
 
-  tlx::sbyte_buffer http_resp_data;
+  tlx::byte_buffer http_resp_data;
 
   service.start([&](event_ptr&& event) {
     switch (event->kind())
@@ -47,17 +47,16 @@ void yasioTest()
           case SSLTEST_CHANNEL_HTTP_CLIENT: {
             auto packet = event->packet_view();
             http_client_bytes_transferred += static_cast<int>(packet.size());
-            http_resp_data.insert(http_resp_data.end(), packet.data(),
-                                  packet.data() + packet.size());
+            http_resp_data.insert(http_resp_data.end(), packet.data(), packet.data() + packet.size());
           }
           break;
           case SSLTEST_CHANNEL_CLIENT:
-            fprintf(stdout, "==> ssl client: recv message '%s' from server\n", std::string{packet.data(), packet.size()}.c_str());
+            fprintf(stdout, "==> ssl client: recv message '%s' from server\n", std::string{reinterpret_cast<const char*>(packet.data()), packet.size()}.c_str());
             fflush(stdout);
             service.close(event->transport());
             break;
           case SSLTEST_CHANNEL_SERVER:
-            fprintf(stdout, "==> ssl server: recv message '%s' from client\n", std::string{packet.data(), packet.size()}.c_str());
+            fprintf(stdout, "==> ssl server: recv message '%s' from client\n", std::string{reinterpret_cast<const char*>(packet.data()), packet.size()}.c_str());
             fflush(stdout);
             break;
         }
diff --git a/tests/tcp/main.cpp b/tests/tcp/main.cpp
index 305c1632d..043b361b4 100644
--- a/tests/tcp/main.cpp
+++ b/tests/tcp/main.cpp
@@ -57,11 +57,11 @@ void yasioTest()
   std::cout << r0 << ", " << r1 << ", " << f1 << ", " << v5 << ", " << v6 << ", " << v8 << "\n";
 #endif
 
-  tlx::sbyte_buffer vecbuf;
+  tlx::byte_buffer vecbuf;
   std::string strbuf;
   std::array<char, 16> arrbuf;
   char raw_arrbuf[16];
-  yasio::obstream_span<tlx::sbyte_buffer>{vecbuf}.write_bytes("hello world!");
+  yasio::obstream_span<tlx::byte_buffer>{vecbuf}.write_bytes("hello world!");
   yasio::obstream_span<std::string>{strbuf}.write_bytes("hello world!");
   yasio::obstream_span<yasio::fixed_buffer_span>{arrbuf}.write_bytes("hello world!");
   yasio::obstream_span<yasio::fixed_buffer_span>{raw_arrbuf}.write_bytes("hello world!");
diff --git a/yasio.pc b/yasio.pc
index 63b815fc2..dcc1ab474 100644
--- a/yasio.pc
+++ b/yasio.pc
@@ -5,6 +5,6 @@ includedir=${exec_prefix}/include
 
 Name: yasio
 Description:  A multi-platform support c++11 library with focus on asio (asynchronous socket I/O) for any client application. 
-Version: 4.4.0
+Version: 4.4.1
 Libs: -L${libdir} 
 Cflags: -I${includedir}/yasio
diff --git a/yasio/bindings/lyasio.cpp b/yasio/bindings/lyasio.cpp
index 8c053f5b4..ac75f95d8 100644
--- a/yasio/bindings/lyasio.cpp
+++ b/yasio/bindings/lyasio.cpp
@@ -120,14 +120,14 @@ static void register_obstream(sol::table& lib, const char* usertype)
         return obstream_write_v<_Stream>(obs, sv, lfl);
       },
       "write_bytes", static_cast<void (_Stream::*)(std::string_view)>(&_Stream::write_bytes), "length", &_Stream::length, "to_string",
-      [](_Stream* obs) { return std::string_view(obs->data(), obs->length()); }, "save", &_Stream::save);
+      [](_Stream* obs) { return std::string_view(obs->buffer().as_chars().data(), obs->length()); }, "save", &_Stream::save);
 }
 
 template <typename _Stream, typename _StreamView, typename _OStream>
 static void register_ibstream(sol::table& lib, const char* usertype)
 {
   lib.new_usertype<_Stream>(
-      usertype, sol::constructors<_Stream(), _Stream(tlx::sbyte_buffer), _Stream(const _OStream*)>(), "load", &_Stream::load, "read_ix",
+      usertype, sol::constructors<_Stream(), _Stream(tlx::byte_buffer), _Stream(const _OStream*)>(), "load", &_Stream::load, "read_ix",
       &_Stream::template read_ix<int64_t>, "read_bool", &_Stream::template read<bool>, "read_i8", &_Stream::template read<int8_t>, "read_i16",
       &_Stream::template read<int16_t>, "read_i32", &_Stream::template read<int32_t>, "read_i64", &_Stream::template read<int64_t>, "read_u8",
       &_Stream::template read<uint8_t>, "read_u16", &_Stream::template read<uint16_t>, "read_u32", &_Stream::template read<uint32_t>, "read_u64",
@@ -170,7 +170,7 @@ YASIO_LUA_API int luaopen_yasio(lua_State* L)
         switch (buffer_type)
         {
           case lyasio::BUFFER_RAW:
-            return sol::make_object(L, std::string_view{packet_data(pkt), packet_len(pkt)});
+            return sol::make_object(L, std::string_view{forward_packet(pkt).as_chars().data(), packet_len(pkt)});
           case lyasio::BUFFER_FAST:
             return sol::make_object(L, std::make_unique<yasio::fast_ibstream>(forward_packet((packet_t &&) pkt)));
           default:
@@ -259,13 +259,13 @@ YASIO_LUA_API int luaopen_yasio(lua_State* L)
       "write",
       sol::overload(
           [](io_service* service, transport_handle_t transport, std::string_view s) {
-            return service->write(transport, tlx::sbyte_buffer{s.data(), s.data() + s.length()});
+            return service->write(transport, tlx::byte_buffer{(const unsigned char*)s.data(), (const unsigned char*)s.data() + s.length()});
           },
           [](io_service* service, transport_handle_t transport, yasio::obstream* obs) { return service->write(transport, std::move(obs->buffer())); }),
       "write_to",
       sol::overload(
           [](io_service* service, transport_handle_t transport, std::string_view s, std::string_view ip, u_short port) {
-            return service->write_to(transport, tlx::sbyte_buffer{s.data(), s.data() + s.length()}, ip::endpoint{ip.data(), port});
+            return service->write_to(transport, tlx::byte_buffer{(const unsigned char*)s.data(), (const unsigned char*)s.data() + s.length()}, ip::endpoint{ip.data(), port});
           },
           [](io_service* service, transport_handle_t transport, yasio::obstream* obs, std::string_view ip, u_short port) {
             return service->write_to(transport, std::move(obs->buffer()), ip::endpoint{ip.data(), port});
@@ -391,11 +391,11 @@ struct lua_type_traits<std::string_view> {
     return 1;
   }
 };
-// yasio::sbyte_buffer
+// yasio::byte_buffer
 template <>
-struct lua_type_traits<yasio::sbyte_buffer> {
-  typedef yasio::sbyte_buffer get_type;
-  typedef const yasio::sbyte_buffer& push_type;
+struct lua_type_traits<tlx::byte_buffer> {
+  typedef tlx::byte_buffer get_type;
+  typedef const tlx::byte_buffer& push_type;
 
   static bool strictCheckType(lua_State* l, int index) { return lua_type(l, index) == LUA_TSTRING; }
   static bool checkType(lua_State* l, int index) { return lua_isstring(l, index) != 0; }
@@ -403,7 +403,7 @@ struct lua_type_traits<yasio::sbyte_buffer> {
   {
     size_t size        = 0;
     const char* buffer = lua_tolstring(l, index, &size);
-    return yasio::sbyte_buffer(buffer, buffer + size);
+    return tlx::byte_buffer((const unsigned char*)buffer, (const unsigned char*)buffer + size);
   }
   static int push(lua_State* l, push_type s)
   {
@@ -483,7 +483,7 @@ namespace lyasio
 #  define kaguya_ibstream_view_class(_StreamView, _OStream) \
     kaguya::UserdataMetatable<_StreamView>().setConstructors<_StreamView(), _StreamView(const void*, size_t), _StreamView(const _OStream*)>()
 #  define kaguya_ibstream_class(_Stream, _StreamView, _OStream) \
-    kaguya::UserdataMetatable<_Stream, _StreamView>().setConstructors<_Stream(yasio::sbyte_buffer), _Stream(const _OStream*)>()
+    kaguya::UserdataMetatable<_Stream, _StreamView>().setConstructors<_Stream(tlx::byte_buffer), _Stream(const _OStream*)>()
 
 template <typename _Stream, typename _BaseStream>
 static void register_obstream(kaguya::LuaTable& lib, const char* usertype, const char* basetype, kaguya::UserdataMetatable<_Stream, _BaseStream>& userclass,
@@ -533,9 +533,9 @@ static void register_obstream(kaguya::LuaTable& lib, const char* usertype, const
                                  lfl = static_cast<int>(args[0]);
                                return lyasio::obstream_write_v(obs, sv, lfl);
                              })
-          .addFunction("write_bytes", static_cast<void (_BaseStream::*)(std::string_view)>(&_BaseStream::write_bytes))
-          .addFunction("length", &_BaseStream::length)
-          .addStaticFunction("to_string", [](_BaseStream* obs) { return std::string_view(obs->data(), obs->length()); }));
+           .addFunction("write_bytes", static_cast<void (_BaseStream::*)(std::string_view)>(&_BaseStream::write_bytes))
+           .addFunction("length", &_BaseStream::length)
+           .addStaticFunction("to_string", [](_BaseStream* obs) { return std::string_view(obs->buffer().as_chars().data(), obs->length()); }));
   // ##-- obstream
   lib[usertype].setClass(userclass);
 }
@@ -603,7 +603,7 @@ YASIO_LUA_API int luaopen_yasio(lua_State* L)
                                                           auto& pkt = ev->packet();
                                                           if (is_packet_empty(pkt))
                                                             return std::string_view{""};
-                                                          return std::string_view{packet_data(pkt), packet_len(pkt)};
+                                                          return std::string_view{forward_packet(pkt).as_chars().data(), packet_len(pkt)};
                                                         })
                                      .addStaticFunction("fast_packet",
                                                         [](io_event* ev) {
@@ -653,13 +653,13 @@ end
           .addOverloadedFunctions(
               "write",
               [](io_service* service, transport_handle_t transport, std::string_view s) {
-                return service->write(transport, yasio::sbyte_buffer(s.data(), s.data() + s.length()));
+                return service->write(transport, tlx::byte_buffer((const unsigned char*)s.data(), (const unsigned char*)s.data() + s.length()));
               },
               [](io_service* service, transport_handle_t transport, yasio::obstream* obs) { return service->write(transport, std::move(obs->buffer())); })
           .addOverloadedFunctions(
               "write_to",
               [](io_service* service, transport_handle_t transport, std::string_view s, std::string_view ip, u_short port) {
-                return service->write_to(transport, yasio::sbyte_buffer(s.data(), s.data() + s.length()), ip::endpoint{ip.data(), port});
+                return service->write_to(transport, tlx::byte_buffer((const unsigned char*)s.data(), (const unsigned char*)s.data() + s.length()), ip::endpoint{ip.data(), port});
               },
               [](io_service* service, transport_handle_t transport, yasio::obstream* obs, std::string_view ip, u_short port) {
                 return service->write_to(transport, std::move(obs->buffer()), ip::endpoint{ip.data(), port});
diff --git a/yasio/bindings/yasio_jsb.cpp b/yasio/bindings/yasio_jsb.cpp
index c27454383..7937d6f7c 100644
--- a/yasio/bindings/yasio_jsb.cpp
+++ b/yasio/bindings/yasio_jsb.cpp
@@ -1745,7 +1745,7 @@ bool js_yasio_io_service_write(JSContext* ctx, uint32_t argc, jsval* vp)
       sva.set(arg1, ctx, &unrecognized_object);
       if (!sva.empty())
       {
-        cobj->write(transport, yasio::sbyte_buffer(sva.data(), sva.data() + sva.size()));
+        cobj->write(transport, tlx::byte_buffer((const unsigned char*)sva.data(), (const unsigned char*)sva.data() + sva.size()));
       }
       else if (unrecognized_object)
       {
@@ -1800,7 +1800,7 @@ bool js_yasio_io_service_write_to(JSContext* ctx, uint32_t argc, jsval* vp)
       sva.set(arg1, ctx, &unrecognized_object);
       if (!sva.empty())
       {
-        cobj->write_to(transport, yasio::sbyte_buffer(sva.data(), sva.data() + sva.size()), ip::endpoint{ip.data(), port});
+        cobj->write_to(transport, tlx::byte_buffer((const unsigned char*)sva.data(), (const unsigned char*)sva.data() + sva.size()), ip::endpoint{ip.data(), port});
       }
       else if (unrecognized_object)
       {
diff --git a/yasio/bindings/yasio_jsb20.cpp b/yasio/bindings/yasio_jsb20.cpp
index b791425e9..e60e46bb6 100644
--- a/yasio/bindings/yasio_jsb20.cpp
+++ b/yasio/bindings/yasio_jsb20.cpp
@@ -1424,7 +1424,7 @@ bool js_yasio_io_service_write(se::State& s)
         bool unrecognized_object = false;
         auto data                = seval_to_string_view(arg1, &unrecognized_object);
         if (!data.empty())
-          cobj->write(transport, yasio::sbyte_buffer(data.data(), data.data() + data.size()));
+          cobj->write(transport, tlx::byte_buffer((const unsigned char*)data.data(), (const unsigned char*)data.data() + data.size()));
         else if (unrecognized_object)
         {
           yasio::obstream* obs = nullptr;
@@ -1467,7 +1467,7 @@ bool js_yasio_io_service_write_to(se::State& s)
         bool unrecognized_object = false;
         auto data                = seval_to_string_view(arg1, &unrecognized_object);
         if (!data.empty())
-          cobj->write_to(transport, yasio::sbyte_buffer(data.data(), data.data() + data.size()), ip::endpoint{ip.data(), port});
+          cobj->write_to(transport, tlx::byte_buffer((const unsigned char*)data.data(), (const unsigned char*)data.data() + data.size()), ip::endpoint{ip.data(), port});
         else if (unrecognized_object)
         {
           yasio::obstream* obs = nullptr;
diff --git a/yasio/bindings/yasio_ni.cpp b/yasio/bindings/yasio_ni.cpp
index 68b1af2d9..6210335a9 100644
--- a/yasio/bindings/yasio_ni.cpp
+++ b/yasio/bindings/yasio_ni.cpp
@@ -236,7 +236,7 @@ YASIO_NI_API int yasio_write(void* service_ptr, void* thandle, const char* bytes
 {
   auto service = reinterpret_cast<io_service*>(service_ptr);
   if (service)
-    return service->write(reinterpret_cast<transport_handle_t>(thandle), tlx::sbyte_buffer(bytes, bytes + len));
+    return service->write(reinterpret_cast<transport_handle_t>(thandle), tlx::byte_buffer((const unsigned char*)bytes, (const unsigned char*)bytes + len));
   return -1;
 }
 YASIO_NI_API int yasio_forward(void* service_ptr, void* thandle, void* bufferHandle,
diff --git a/yasio/config.hpp b/yasio/config.hpp
index 7fea9b7a7..95fc04c5e 100644
--- a/yasio/config.hpp
+++ b/yasio/config.hpp
@@ -199,7 +199,7 @@ SOFTWARE.
 /*
 **  The yasio version macros
 */
-#define YASIO_VERSION_NUM 0x040400
+#define YASIO_VERSION_NUM 0x040401
 
 /*
 ** The macros used by io_service.
diff --git a/yasio/ibstream.hpp b/yasio/ibstream.hpp
index b5ff39301..b395ef30a 100644
--- a/yasio/ibstream.hpp
+++ b/yasio/ibstream.hpp
@@ -123,7 +123,7 @@ class binary_reader_impl {
   using convert_traits_type = _Traits;
   using this_type           = binary_reader_impl<_Traits>;
   binary_reader_impl() { this->reset("", 0); }
-  binary_reader_impl(const tlx::sbyte_buffer& d) { this->reset(d); }
+  binary_reader_impl(const tlx::byte_buffer& d) { this->reset(d); }
   binary_reader_impl(const std::string_view& d) { this->reset(d); }
   binary_reader_impl(const void* data, size_t size) { this->reset(data, size); }
   template <typename _BufferType>
@@ -143,7 +143,7 @@ class binary_reader_impl {
 
   ~binary_reader_impl() {}
 
-  void reset(const tlx::sbyte_buffer& d) { reset(d.data(), d.size()); }
+  void reset(const tlx::byte_buffer& d) { reset(d.data(), d.size()); }
   void reset(const std::string_view& d) { reset(d.data(), d.length()); }
   void reset(const void* data, size_t size)
   {
@@ -305,7 +305,7 @@ template <typename _Traits>
 class basic_ibstream : public binary_reader_impl<_Traits> {
 public:
   basic_ibstream() {}
-  basic_ibstream(tlx::sbyte_buffer blob) : binary_reader_impl<_Traits>(), blob_(std::move(blob)) { this->reset(blob_.data(), static_cast<int>(blob_.size())); }
+  basic_ibstream(tlx::byte_buffer blob) : binary_reader_impl<_Traits>(), blob_(std::move(blob)) { this->reset(blob_.data(), static_cast<int>(blob_.size())); }
   basic_ibstream(const basic_obstream<_Traits>* obs) : binary_reader_impl<_Traits>(), blob_(obs->buffer())
   {
     this->reset(blob_.data(), static_cast<int>(blob_.size()));
@@ -323,7 +323,7 @@ class basic_ibstream : public binary_reader_impl<_Traits> {
       {
         blob_.resize(static_cast<size_t>(size));
         fin.seekg(0, std::ios_base::beg);
-        fin.read(blob_.data(), blob_.size());
+        fin.read(blob_.as_chars().data(), blob_.size());
         this->reset(blob_.data(), static_cast<int>(blob_.size()));
         return true;
       }
@@ -332,7 +332,7 @@ class basic_ibstream : public binary_reader_impl<_Traits> {
   }
 
 protected:
-  tlx::sbyte_buffer blob_;
+  tlx::byte_buffer blob_;
 };
 
 using ibstream_view = binary_reader_impl<convert_traits<network_convert_tag>>;
diff --git a/yasio/io_service.cpp b/yasio/io_service.cpp
index 59681f4c4..f0522a7de 100644
--- a/yasio/io_service.cpp
+++ b/yasio/io_service.cpp
@@ -664,7 +664,7 @@ void io_transport_udp::set_primitives()
     };
   }
 }
-int io_transport_udp::handle_input(char* data, int bytes_transferred, int& /*error*/, tlx::highp_time_t&)
+int io_transport_udp::handle_input(uint8_t* data, int bytes_transferred, int& /*error*/, tlx::highp_time_t&)
 { // pure udp, dispatch to upper layer directly
   auto& service = get_service();
   if (!service.options_.forward_packet_)
@@ -737,7 +737,7 @@ int io_transport_kcp::do_read(int revent, int& error, tlx::highp_time_t& wait_du
       auto need_size = static_cast<size_t>(kdata_size + offset_);
       if (buffer_.size() < need_size)
         buffer_.resize(kdata_size + offset_);
-      n = ::ikcp_recv(kcp_, buffer_.data() + offset_, kdata_size);
+      n = ::ikcp_recv(kcp_, buffer_.as_chars().data() + offset_, kdata_size);
     }
     if (n > 0) // If got data from kcp, don't wait
       wait_duration = 0;
@@ -746,10 +746,10 @@ int io_transport_kcp::do_read(int revent, int& error, tlx::highp_time_t& wait_du
   }
   return n;
 }
-int io_transport_kcp::handle_input(char* buf, int len, int& error, tlx::highp_time_t& wait_duration)
+int io_transport_kcp::handle_input(uint8_t* buf, int len, int& error, tlx::highp_time_t& wait_duration)
 {
   // ikcp in event always in service thread, so no need to lock
-  if (0 == ::ikcp_input(kcp_, buf, len))
+  if (0 == ::ikcp_input(kcp_, reinterpret_cast<char*>(buf), len))
   {
     expire_time_ = 0;
     return len;
@@ -1192,7 +1192,7 @@ void io_service::handle_close(transport_handle_t thandle)
     cleanup_channel(ctx, false);
   }
 }
-int io_service::write(transport_handle_t transport, tlx::sbyte_buffer buffer, completion_cb_t handler)
+int io_service::write(transport_handle_t transport, tlx::byte_buffer buffer, completion_cb_t handler)
 {
   if (transport && transport->is_open())
     return !buffer.empty() ? transport->write(io_send_buffer{std::move(buffer)}, std::move(handler)) : 0;
@@ -1205,14 +1205,14 @@ int io_service::write(transport_handle_t transport, tlx::sbyte_buffer buffer, co
 int io_service::forward(transport_handle_t transport, const void* buf, size_t len, completion_cb_t handler)
 {
   if (transport && transport->is_open())
-    return len != 0 ? transport->write(io_send_buffer{(const char*)buf, len}, std::move(handler)) : 0;
+    return len != 0 ? transport->write(io_send_buffer{(const uint8_t*)buf, len}, std::move(handler)) : 0;
   else
   {
     YASIO_KLOGE("write failed, the connection not ok!");
     return -1;
   }
 }
-int io_service::write_to(transport_handle_t transport, tlx::sbyte_buffer buffer, const ip::endpoint& to, completion_cb_t handler)
+int io_service::write_to(transport_handle_t transport, tlx::byte_buffer buffer, const ip::endpoint& to, completion_cb_t handler)
 {
   if (transport && transport->is_open())
     return !buffer.empty() ? transport->write_to(io_send_buffer{std::move(buffer)}, to, std::move(handler)) : 0;
@@ -1225,7 +1225,7 @@ int io_service::write_to(transport_handle_t transport, tlx::sbyte_buffer buffer,
 int io_service::forward_to(transport_handle_t transport, const void* buf, size_t len, const ip::endpoint& to, completion_cb_t handler)
 {
   if (transport && transport->is_open())
-    return len != 0 ? transport->write_to(io_send_buffer{(const char*)buf, len}, to, std::move(handler)) : 0;
+    return len != 0 ? transport->write_to(io_send_buffer{(const uint8_t*)buf, len}, to, std::move(handler)) : 0;
   else
   {
     YASIO_KLOGE("write_to failed, the connection not ok!");
diff --git a/yasio/io_service.hpp b/yasio/io_service.hpp
index b70c5d930..fb0f74a36 100644
--- a/yasio/io_service.hpp
+++ b/yasio/io_service.hpp
@@ -642,7 +642,7 @@ class YASIO_API io_channel : public io_base {
   ip::endpoint multiaddr_, multiif_;
 
   // Current it's only for UDP
-  tlx::sbyte_buffer buffer_;
+  tlx::byte_buffer buffer_;
 
   // The bytes transferred from socket low layer, currently, only works for client channel
   long long bytes_transferred_ = 0;
@@ -655,13 +655,13 @@ class YASIO_API io_channel : public io_base {
 
 class io_send_buffer {
 public:
-  explicit io_send_buffer(tlx::sbyte_buffer&& mutable_buffer)
+  explicit io_send_buffer(tlx::byte_buffer&& mutable_buffer)
   {
     mutable_buffer_ = std::move(mutable_buffer);
     data_           = mutable_buffer_.data();
     size_           = mutable_buffer_.size();
   }
-  io_send_buffer(const char* const_buffer, size_t const_buffer_size)
+  io_send_buffer(const uint8_t* const_buffer, size_t const_buffer_size)
   {
     data_ = const_buffer;
     size_ = const_buffer_size;
@@ -676,13 +676,13 @@ class io_send_buffer {
 
   bool empty() const { return size_ == 0; }
 
-  const char* data() const { return data_; }
+  const uint8_t* data() const { return data_; }
   size_t size() const { return size_; }
 
 private:
-  tlx::sbyte_buffer mutable_buffer_;
+  tlx::byte_buffer mutable_buffer_;
 
-  const char* data_;
+  const uint8_t* data_;
   size_t size_;
 };
 
@@ -742,7 +742,7 @@ class io_transport : public io_base {
 protected:
   io_service& get_service() const { return ctx_->get_service(); }
   bool is_open() const { return state_ == state::OPENED && socket_ && socket_->is_open(); }
-  tlx::sbyte_buffer fetch_packet()
+  tlx::byte_buffer fetch_packet()
   {
     expected_size_ = -1;
     return std::move(expected_packet_);
@@ -778,11 +778,11 @@ class io_transport : public io_base {
 
   bool is_valid() const { return ctx_ != nullptr; }
 
-  tlx::sbyte_buffer buffer_;
+  tlx::byte_buffer buffer_;
   int offset_ = 0; // recv buffer offset
 
   int expected_size_ = -1;
-  tlx::sbyte_buffer expected_packet_;
+  tlx::byte_buffer expected_packet_;
 
   io_channel* ctx_;
 
@@ -838,7 +838,7 @@ class YASIO_API io_transport_udp : public io_transport {
   YASIO__DECL void confgure_remote(const ip::endpoint& peer);
 
   // process received data from low level
-  YASIO__DECL virtual int handle_input(char* data, int bytes_transferred, int& error, tlx::highp_time_t& wait_duration);
+  YASIO__DECL virtual int handle_input(uint8_t* data, int bytes_transferred, int& error, tlx::highp_time_t& wait_duration);
 
   ip::endpoint peer_;                // for recv only, unstable
   mutable ip::endpoint destination_; // for sendto only, stable
@@ -860,11 +860,11 @@ class io_transport_kcp : public io_transport_udp {
 
   YASIO__DECL bool do_write(tlx::highp_time_t& wait_duration) override;
 
-  YASIO__DECL int handle_input(char* buf, int len, int& error, tlx::highp_time_t& wait_duration) override;
+  YASIO__DECL int handle_input(uint8_t* buf, int len, int& error, tlx::highp_time_t& wait_duration) override;
 
   int interval() const { return kcp_->interval * std::milli::den; }
 
-  tlx::sbyte_buffer rawbuf_; // the low level raw buffer
+  tlx::byte_buffer rawbuf_; // the low level raw buffer
   ikcpcb* kcp_{nullptr};
   IUINT32 expire_time_{0}; // the next expire time(ms) to call ikcp_update
   std::function<int(const void*, int, const ip::endpoint*, int&)> underlaying_write_cb_;
@@ -873,7 +873,7 @@ class io_transport_kcp : public io_transport_udp {
 class io_transport_kcp {};
 #endif
 
-using io_packet = tlx::sbyte_buffer;
+using io_packet = tlx::byte_buffer;
 #if !defined(YASIO_USE_SHARED_PACKET)
 using packet_t = io_packet;
 inline packet_t wrap_packet(io_packet& raw_packet) { return std::move(raw_packet); }
@@ -895,14 +895,14 @@ inline io_packet::size_type packet_len(packet_t& pkt) { return pkt->size(); }
 class io_packet_view {
 public:
   io_packet_view() = default;
-  io_packet_view(char* d, int n) : data_(d), size_(n) {}
-  char* data() { return this->data_; }
-  const char* data() const { return this->data_; }
+  io_packet_view(uint8_t* d, int n) : data_(d), size_(n) {}
+  uint8_t* data() { return this->data_; }
+  const uint8_t* data() const { return this->data_; }
   size_t size() const { return this->size_; }
 
 private:
-  char* data_  = nullptr;
-  size_t size_ = 0;
+  uint8_t* data_ = nullptr;
+  size_t size_   = 0;
 };
 
 /*
@@ -1097,9 +1097,9 @@ class YASIO_API io_service // lgtm [cpp/class-many-fields]
   */
   int write(transport_handle_t thandle, const void* buf, size_t len, completion_cb_t completion_handler = nullptr)
   {
-    return write(thandle, tlx::sbyte_buffer{(const char*)buf, (const char*)buf + len}, std::move(completion_handler));
+    return write(thandle, tlx::byte_buffer{(const unsigned char*)buf, (const unsigned char*)buf + len}, std::move(completion_handler));
   }
-  YASIO__DECL int write(transport_handle_t thandle, tlx::sbyte_buffer buffer, completion_cb_t completion_handler = nullptr);
+  YASIO__DECL int write(transport_handle_t thandle, tlx::byte_buffer buffer, completion_cb_t completion_handler = nullptr);
   YASIO__DECL int forward(transport_handle_t thandle, const void* buf, size_t len, completion_cb_t completion_handler);
 
   /*
@@ -1111,9 +1111,9 @@ class YASIO_API io_service // lgtm [cpp/class-many-fields]
    */
   int write_to(transport_handle_t thandle, const void* buf, size_t len, const ip::endpoint& to, completion_cb_t completion_handler = nullptr)
   {
-    return write_to(thandle, tlx::sbyte_buffer{(const char*)buf, (const char*)buf + len}, to, std::move(completion_handler));
+    return write_to(thandle, tlx::byte_buffer{(const unsigned char*)buf, (const unsigned char*)buf + len}, to, std::move(completion_handler));
   }
-  YASIO__DECL int write_to(transport_handle_t thandle, tlx::sbyte_buffer buffer, const ip::endpoint& to, completion_cb_t completion_handler = nullptr);
+  YASIO__DECL int write_to(transport_handle_t thandle, tlx::byte_buffer buffer, const ip::endpoint& to, completion_cb_t completion_handler = nullptr);
   YASIO__DECL int forward_to(transport_handle_t thandle, const void* buf, size_t len, const ip::endpoint& to, completion_cb_t completion_handler);
 
   // The highp_timer support, !important, the callback is called on the thread of io_service
diff --git a/yasio/obstream.hpp b/yasio/obstream.hpp
index 9c03bc3f8..36c4e2a9b 100644
--- a/yasio/obstream.hpp
+++ b/yasio/obstream.hpp
@@ -143,7 +143,7 @@ class fixed_buffer : public fixed_buffer_span {
   std::array<char, _Extent> impl_;
 };
 
-template <typename _Cont = tlx::sbyte_buffer>
+template <typename _Cont = tlx::byte_buffer>
 class dynamic_buffer_span {
 public:
   using implementation_type = _Cont;
@@ -171,7 +171,7 @@ class dynamic_buffer_span {
   void reserve(size_t capacity) { outs_->reserve(static_cast<size_type>(capacity)); }
   void shrink_to_fit() { outs_->shrink_to_fit(); };
   void clear() { outs_->clear(); }
-  char* data() { return outs_->data(); }
+  uint8_t* data() { return outs_->data(); }
   size_t length() const { return outs_->size(); }
   bool empty() const { return outs_->empty(); }
 
@@ -179,7 +179,7 @@ class dynamic_buffer_span {
   implementation_type* outs_;
 };
 
-template <typename _Cont = tlx::sbyte_buffer>
+template <typename _Cont = tlx::byte_buffer>
 class dynamic_buffer : public dynamic_buffer_span<_Cont> {
 public:
   using super_type = dynamic_buffer_span<_Cont>;
@@ -342,8 +342,8 @@ class binary_writer_impl {
 
   bool empty() const { return outs_->empty(); }
   size_t length() const { return outs_->length(); }
-  const char* data() const { return outs_->data(); }
-  char* data() { return outs_->data(); }
+  const uint8_t* data() const { return outs_->data(); }
+  uint8_t* data() { return outs_->data(); }
 
   const buffer_implementation_type& buffer() const { return outs_->get_implementation(); }
   buffer_implementation_type& buffer() { return outs_->get_implementation(); }
@@ -396,7 +396,7 @@ class binary_writer_impl {
     std::ofstream fout;
     fout.open(filename, std::ios::binary);
     if (!this->empty())
-      fout.write(this->data(), this->length());
+      fout.write(reinterpret_cast<const char*>(this->data()), this->length());
   }
 
 private:
@@ -500,7 +500,7 @@ using obstream      = obstream_any<dynamic_extent>;
 using fast_obstream = fast_obstream_any<dynamic_extent>;
 
 //-------- basic_obstream_span
-template <typename _ConvertTraits, typename _Cont = tlx::sbyte_buffer>
+template <typename _ConvertTraits, typename _Cont = tlx::byte_buffer>
 class basic_obstream_span;
 
 template <typename _ConvertTraits, typename _Cont>
diff --git a/yasio/tlx/byte_buffer.hpp b/yasio/tlx/byte_buffer.hpp
index 31b3d43ed..aecab3855 100644
--- a/yasio/tlx/byte_buffer.hpp
+++ b/yasio/tlx/byte_buffer.hpp
@@ -27,16 +27,32 @@ SOFTWARE.
 */
 #ifndef YASIO__BYTE_BUFFER_HPP
 #define YASIO__BYTE_BUFFER_HPP
+#include <span>
 #include "yasio/tlx/array_buffer.hpp"
 
 namespace tlx
 {
 // basic_byte_buffer restricted to byte types
 template <typename _Ty, typename _Alloc = tlx::crt_buffer_allocator<_Ty>>
-using basic_byte_buffer = typename std::enable_if<tlx::is_byte_type<_Ty>::value, tlx::array_buffer<_Ty, _Alloc>>::type;
+class basic_byte_buffer : public tlx::array_buffer<_Ty, _Alloc> {
+  static_assert(tlx::is_byte_type<_Ty>::value, "basic_byte_buffer only supports byte types!");
+  using base_type = tlx::array_buffer<_Ty, _Alloc>;
 
-using sbyte_buffer = basic_byte_buffer<char>;
-using byte_buffer  = basic_byte_buffer<unsigned char>;
+public:
+  using base_type::base_type;
+  using base_type::operator=;
+
+  std::span<char> as_chars() & noexcept
+  {
+    return {reinterpret_cast<char*>(this->data()), this->size()};
+  }
+  std::span<const char> as_chars() const & noexcept
+  {
+    return {reinterpret_cast<const char*>(this->data()), this->size()};
+  }
+};
+
+using byte_buffer = basic_byte_buffer<unsigned char>;
 
 } // namespace tlx
 #endif

From 8572dd90bbc6e9609c32e82d94c0f06e54751673 Mon Sep 17 00:00:00 2001
From: halx99 <halx99@live.com>
Date: Mon, 3 Aug 2026 15:12:49 +0800
Subject: [PATCH 2/2] Update README.md & changelog

---
 CHANGELOG.md | 15 +++++++++++++++
 README.md    |  2 ++
 README_EN.md |  4 +++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53a8d47f8..68d727c32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+yasio-4.4.1
+
+  1. Remove `tlx::sbyte_buffer`
+
+
+yasio-4.4.0
+
+  1. Update codebase to c++20
+
+
+yasio-4.3.3
+
+  1. Fix some minor issues
+
+
 yasio-4.3.2
 
   1. Fix API `xxsocket::resolve` compatibility issue on android and freebsd
diff --git a/README.md b/README.md
index ee5b3f813..d4877c95b 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,8 @@
   
 **yasio** 是一个轻量级跨平台的异步网络库，专注于客户端和基于各种游戏引擎的游戏客户端网络服务， 支持 windows、macos、ios、android、ohos、linux、freebsd 以及其他类 unix 操作系统。  
 
+*说明: 自 4.4.0 版本起，最低支持的 C++ 标准为 C++20。*
+
 ## 支持平台
 
 - Windows
diff --git a/README_EN.md b/README_EN.md
index 3efe2301c..64ecb919b 100644
--- a/README_EN.md
+++ b/README_EN.md
@@ -14,7 +14,9 @@
   
 **[简体中文](README.md)**
   
-**yasio** is a multi-platform support and lightweight library with focus on asynchronous socket I/O for any client application, support windows, macos, ios, android, ohos, linux, freebsd and other unix-like systems.
+**yasio** is a multi-platform support and lightweight library with focus on asynchronous socket I/O for any client application, support windows, macos, ios, android, ohos, linux, freebsd and other unix-like systems.  
+
+*Starting with version 4.4.0, C++20 or later is required.*
 
 ## Supported Platforms