Merge pull request #277 from yourWaifu/boost-v1_87_0

Support for Boost 1.87.0 or ASIO 1.32.0

Author: yourWaifu

CMakeLists.txt

@@ -9,14 +9,14 @@ if (NOT ONLY_SLEEPY_DISCORD)
 	option(AUTO_DOWNLOAD_LIBRARY         "Automatically download sleepy discord standard config dependencies" ON )
 	option(SLEEPY_VCPKG                  "VCPKG with Sleepy Discord"                                          OFF)
 	option(USE_CPR                       "Use CPR http library"                                               ON )
-	option(USE_WEBSOCKETPP               "Use websocketpp websockets library"                                 ON )
-	option(USE_UWEBSOCKETS               "Use uWebsockets websockets library"                                 OFF)
-	option(USE_ASIO                      "Use ASIO network and I/O library (Used for UDP)"                    OFF)
+	option(USE_ASIO                      "Use ASIO network and I/O library (Used for UDP and TCP)"            ON)
 	option(USE_BOOST_ASIO                "Same as USE_ASIO but for boost library"                             OFF)
 	option(USE_LIBOPUS                   "Use Opus audio codec library"                                       OFF)
 	option(USE_LIBSODIUM                 "Use libsodium cryptography library"                                 OFF)
 	option(USE_ZLIB_NG                   "Use zlib-ng for data compression"                                   OFF)
 	option(USE_ZLIB                      "Use zlib for data compression"                                      OFF)
+	#option(USE_Boost_BEAST               "Use Boost Beast for http library"                                   OFF)
+	#option(USE_IXWEBSOCKET               "Use IXWebSocket for websockets"                                     OFF)
 endif()
 
 #Define a variable to use to check if this file has been executed
@@ -32,14 +32,6 @@ if(ENABLE_VOICE)
 	set(USE_LIBSODIUM ON)
 endif()
 
-if(USE_WEBSOCKETPP OR USE_UWEBSOCKETS)
-	if(Boost_FOUND OR USE_BOOST_ASIO) #checks if already defined
-		set(USE_BOOST_ASIO ON)
-	else()
-		set(USE_ASIO ON)
-	endif()
-endif()
-
 if(USE_ZLIB_NG AND USE_ZLIB)
 	message(FATAL_ERROR "can't use zlib and zlib-ng at the same time")
 endif()
@@ -116,8 +108,6 @@ if(USE_ASIO)
 		find_package(asio CONFIG REQUIRED)
 	else()
 		if(AUTO_DOWNLOAD_LIBRARY)
-			# Note websocketpp doesn't work with the latest version of asio
-			# Remember to go back to the master version after they are fixed
 			download_project(
 				PROJ           asio
 				GIT_REPOSITORY https://github.com/chriskohlhoff/asio.git
@@ -133,54 +123,6 @@ if(USE_ASIO)
 	endif()
 endif()
 
-if(USE_WEBSOCKETPP)
-	if (SLEEPY_VCPKG)
-		find_package(websocketpp CONFIG REQUIRED)
-	else()
-		if(AUTO_DOWNLOAD_LIBRARY)
-			download_project(
-				PROJ           websocketpp
-				GIT_REPOSITORY https://github.com/zaphoyd/websocketpp.git
-				GIT_TAG        master
-				SOURCE_DIR     ${PROJECT_SOURCE_DIR}/deps/websocketpp
-				UPDATE_DISCONNECTED 1
-			)
-		endif()
-
-		set(THREADS_PREFER_PTHREAD_FLAG ON)
-		find_package(Threads REQUIRED)
-		add_subdirectory(deps/websocketpp)
-
-		if(NOT DEFINED websocketpp_SOURCE_DIR)
-			set(websocketpp_SOURCE_DIR ${PROJECT_SOURCE_DIR}/deps/websocketpp)
-		endif()
-	endif()
-endif()
-
-if(USE_UWEBSOCKETS)
-	if(SLEEPY_VCPKG)
-		find_path(UWEBSOCKETS_INCLUDE_DIRS "uwebsockets/App.h")
-		set(uwebsockets_SOURCE_DIR "${UWEBSOCKETS_INCLUDE_DIRS}/..")
-	else()
-		if(AUTO_DOWNLOAD_LIBRARY)
-			#to do install zlib
-			download_project(
-				PROJ           uwebsockets
-				GIT_REPOSITORY https://github.com/uNetworking/uWebSockets.git
-				GIT_TAG        master
-				SOURCE_DIR     ${PROJECT_SOURCE_DIR}/deps/uwebsockets
-				UPDATE_DISCONNECTED 1
-				BUILD_COMMAND  ${MAKE}
-			)
-			set(UWEBSOCKETS_INCLUDE_DIRS "${uwebsockets_SOURCE_DIR}/include")
-		endif()
-
-		if(NOT DEFINED uwebsockets_SOURCE_DIR)
-			set(uwebsockets_SOURCE_DIR ${PROJECT_SOURCE_DIR}/deps/uwebsockets)
-		endif()
-	endif()
-endif()
-
 if(USE_LIBOPUS)
 	if(SLEEPY_VCPKG)
 		find_package(Opus CONFIG REQUIRED)
@@ -248,6 +190,45 @@ if(USE_ZLIB)
 	#to do add auto download
 endif()
 
+if (USE_BEAST)
+	if(SLEEPY_VCPKG)
+		find_package(Boost REQUIRED COMPONENTS beast)
+	else()
+		if(AUTO_DOWNLOAD_LIBRARY)
+			download_project(
+				PROJ           beast
+				GIT_REPOSITORY https://github.com/boostorg/beast.git
+				GIT_TAG        master
+				SOURCE_DIR     ${PROJECT_SOURCE_DIR}/deps/beast
+				UPDATE_DISCONNECTED 1
+			)
+		endif()
+	endif()
+
+	add_subdirectory(deps/beast)
+endif()
+
+if (USE_IXWEBSOCKET)
+	if (SLEEPY_VCPKG)
+		find_path(IXWEBSOCKET_INCLUDE_DIR ixwebsocket/IXWebSocket.h)
+		find_library(IXWEBSOCKET_LIBRARY ixwebsocket)
+	else()
+		if (AUTO_DOWNLOAD_LIBRARY)
+			download_project(
+				PROJ           IXWebSocket
+				GIT_REPOSITORY https://github.com/machinezone/IXWebSocket.git
+				GIT_TAG        master
+				SOURCE_DIR     ${PROJECT_SOURCE_DIR}/deps/ixwebsocket
+				UPDATE_DISCONNECTED 1
+			)
+		endif()
+
+		add_subdirectory(deps/ixwebsocket)
+		set(IXWEBSOCKET_LIBRARY ixwebsocket)
+		set(IXWEBSOCKET_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/deps/ixwebsocket/ixwebsocket)
+	endif()
+endif ()
+
 # Get Version Info
 # Not needed for vcpkg
 if(NOT SLEEPY_VCPKG)

README.md

@@ -58,9 +58,7 @@ Sleepy Discord doesn't require you to use any libraries, so that you can use any
 
 * [OpenSSL](https://www.openssl.org/)
 * [cpr](https://github.com/whoshuu/cpr)
-* [Websocket++](https://github.com/zaphoyd/websocketpp)
-or
-[uWebSockets](https://github.com/uWebSockets/uWebSockets)
+* [ASIO](https://think-async.com/Asio/)
 
 # Develop Branch
 For the cutting edge of Sleepy Discord, check out the develop branch. Please use the develop branch with caution because it may not even be able to compile or it is 100% not tested at all. Other then that, the branch is used for code that may not work. Also check to see if it's not behind the master branch, unless you want to use an older version of Sleepy Discord.

azure-pipelines.yml

@@ -4,11 +4,11 @@
 # https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
 
 pool:
-  vmImage: 'VS2017-Win2016'
+  vmImage: 'windows-2022'
 
 variables:
   solution: 'build/*.sln'
-  buildPlatform: Win32
+  buildPlatform: 'x86'
   buildConfiguration: 'Release'
 
 steps:
@@ -24,15 +24,13 @@ steps:
 
 - script: |
     cd vcpkg
-    .\vcpkg install openssl-windows:x86-windows-static
+    .\vcpkg install openssl:x86-windows-static
   displayName: 'OpenSSL Install'
 
 - task: CMake@1
   inputs:
-    CMakeArgs: .. -DBUILD_SLEEPY_DISCORD_EXAMPLES=1 -DCMAKE_TOOLCHAIN_FILE=D:\a\1\s\vcpkg\scripts\buildsystems\vcpkg.cmake -DOPENSSL_USE_STATIC_LIBS=TRUE -DOPENSSL_ROOT_DIR="D:\a\1\s\vcpkg\installed\x86-windows-static" -DBUILD_CPR_TESTS=OFF
+    CMakeArgs: .. -A Win32 -DBUILD_SLEEPY_DISCORD_EXAMPLES=1 -DCMAKE_TOOLCHAIN_FILE=D:\a\1\s\vcpkg\scripts\buildsystems\vcpkg.cmake -DOPENSSL_USE_STATIC_LIBS=TRUE -DOPENSSL_ROOT_DIR="D:\a\1\s\vcpkg\installed\x86-windows-static" -DBUILD_CPR_TESTS=OFF
 
-- task: VSBuild@1
+- task: CMake@1
   inputs:
-    solution: '$(solution)'
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
+    CMakeArgs: --build . --config Release

examples/hello/example0.cpp

@@ -11,6 +11,6 @@ class MyClientClass : public SleepyDiscord::DiscordClient {
 
 int main() {
 	MyClientClass client("token", SleepyDiscord::USER_CONTROLED_THREADS);
-	client.setIntents(SleepyDiscord::Intent::SERVER_MESSAGES);
+	client.setIntents(SleepyDiscord::Intent::SERVER_MESSAGES, SleepyDiscord::Intent::MESSAGE_CONTENT);
 	client.run();
 }

examples/rock-paper-scissors/main.cpp

@@ -139,6 +139,7 @@ int main() {
 	GameClient client("Your Token Goes Here", SleepyDiscord::USER_CONTROLED_THREADS);
 	client.setIntents(
 		SleepyDiscord::Intent::SERVER_MESSAGES,
-		SleepyDiscord::Intent::DIRECT_MESSAGES);
+		SleepyDiscord::Intent::DIRECT_MESSAGES,
+		SleepyDiscord::Intent::MESSAGE_CONTENT);
 	client.run();
 }

examples/sound-player/main.cpp

@@ -1,4 +1,5 @@
 #include <random> //For noise
+#include <queue>
 #include "sleepy_discord/sleepy_discord.h"
 #include "IO_file.h" //For music
 
@@ -319,6 +320,7 @@ int main()
 	auto intentsList = {
 		SleepyDiscord::Intent::SERVER_MESSAGES,	//required for commands via messages
 		SleepyDiscord::Intent::SERVER_VOICE_STATES, //required for connecting to voice
+		SleepyDiscord::Intent::MESSAGE_CONTENT,
 	};
 	client.setIntents(intentsList);
 	client.run();

include/sleepy_discord/IncludeNonexistent/uWS/uWS.h

@@ -1,37 +1,40 @@
 #pragma once
 
-#ifdef _WIN32
-#include <winsock2.h>
-#elif defined(unix) || defined(__unix__) || defined(__unix)
-#include <netinet/in.h>
-#endif
+#if !defined(NONEXISTENT_ASIO)
+	#ifdef _WIN32
+	#include <winsock2.h>
+	#elif defined(unix) || defined(__unix__) || defined(__unix)
+	#include <netinet/in.h>
+	#endif
 
-#if !defined(SLEEPY_USE_BOOST) && !defined(EXISTENT_BOOST_ASIO)
-	#define ASIO_STANDALONE
-	#include "websocketpp_common.h"
-	#ifdef NONEXISTENT_WEBSOCKETPP
+	#if !defined(SLEEPY_USE_BOOST) && !defined(EXISTENT_BOOST_ASIO)
+		#define ASIO_STANDALONE
 		#include <asio.hpp>
 		#ifdef NONEXISTENT_ASIO
 			#undef ASIO_STANDALONE
 			#define SLEEPY_USE_BOOST
 		#endif
-	#else
-		namespace asio {
-			using namespace websocketpp::lib::asio;
-		}
 	#endif
-#endif
 
-#if defined(SLEEPY_USE_BOOST) || defined(EXISTENT_BOOST_ASIO)
-	#include <boost/asio.hpp>
-	#ifndef NONEXISTENT_BOOST_ASIO
-		#undef NONEXISTENT_ASIO
-		namespace asio {
-			using namespace boost::asio;
-			using boost::system::error_code;
+#	if defined(ASIO_STANDALONE)
+#		include <asio.hpp>
+		namespace SleepyDiscord {
+			using namespace ::asio;
 		}
-		#ifdef ASIO_STANDALONE
-			#undef ASIO_STANDALONE
+	#elif defined(SLEEPY_USE_BOOST) || defined(EXISTENT_BOOST_ASIO)
+		#include <boost/asio.hpp>
+		#ifndef NONEXISTENT_BOOST_ASIO
+			#undef NONEXISTENT_ASIO
+			#define SLEEPY_USE_BOOST_ASIO
+			namespace SleepyDiscord {
+				namespace asio {
+					using namespace boost::asio;
+					using boost::system::error_code;
+				}
+			}
+			#ifdef ASIO_STANDALONE
+				#undef ASIO_STANDALONE
+			#endif
 		#endif
 	#endif
 #endif

include/sleepy_discord/IncludeNonexistent/websocketpp/config/asio_client.hpp

@@ -14,16 +14,17 @@ namespace SleepyDiscord {
 	class ASIOBasedScheduleHandler : public GenericScheduleHandler {
 	public:
 		virtual ~ASIOBasedScheduleHandler() = default;
-		virtual asio::io_service& getIOService() = 0;
+		virtual asio::io_context& getIOContext() = 0;
 	};
 
 	class ASIOScheduleHandler : public ASIOBasedScheduleHandler {
 	public:
-		ASIOScheduleHandler() {}
+		ASIOScheduleHandler(std::shared_ptr<asio::io_context> _io):
+			io(_io) {}
 		virtual ~ASIOScheduleHandler() = default;
 
-		inline asio::io_service& getIOService() override {
-			return io;
+		inline asio::io_context& getIOContext() override {
+			return *io;
 		}
 
 		static void handleTimer(const asio::error_code &ec, std::function<void()>& code) {
@@ -32,20 +33,24 @@ namespace SleepyDiscord {
 			}
 		}
 
-		inline Timer schedule(TimedTask code, const time_t milliseconds) override {
+		inline static Timer schedule(asio::io_context& io, TimedTask code, const time_t milliseconds) {
 			auto timer = std::make_shared<asio::steady_timer>(io, asio::chrono::milliseconds(milliseconds));
 			timer->async_wait(std::bind(&handleTimer, std::placeholders::_1, code));
 			return Timer([timer]() {
 				timer->cancel();
 			});
 		}
 
+		inline Timer schedule(TimedTask code, const time_t milliseconds) override {
+			return ASIOScheduleHandler::schedule(*io, std::move(code), std::move(milliseconds));
+		}
+
 		inline void run() {
-			io.run();
+			io->run();
 		}
 
 	private:
-		asio::io_service io;
+		std::shared_ptr<asio::io_context> io;
 	};
 #endif
 }