DiscordCoreAPI Release v1.50

-Implemented a new MessagePrinter class for handling access to std::cout and std::cerr.
-Switched to using a thread-local instance of JsonifierCore.
-Modified the TCPConnection and related classes to no longer use exceptions, instead returning error codes.
-Moved a bunch of the utilities into their own headers, to be inlined.
-Refactored the Https subsystem, as well as its ratelimiting system.
-Improved the exception structures.
-Improved the connection logic of the WebSocketSSLClients.
-Implemented new relational operators.
-Removed a bunch of superfluous operators.
-Implemented a timeout for CoRoutines.
-Implemented a UniquePtr class to improve handling of the Deleter class.
-Modified the CoRoutineThreadPool class.
-Refactored the SongAPI class.

Author: RealTimeChris

.clang-format

@@ -1,63 +1,63 @@
----
+# Format Style Options - Created with Clang Power Tools
+---
 AlignAfterOpenBracket: DontAlign
-AlignConsecutiveMacros: 'false'
-AlignConsecutiveAssignments: 'false'
-AlignConsecutiveDeclarations: 'false'
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignConsecutiveMacros: false
 AlignEscapedNewlines: DontAlign
-AlignOperands: 'false'
-AlignTrailingComments: 'false'
-AllowAllArgumentsOnNextLine: 'false'
-AllowAllConstructorInitializersOnNextLine: 'false'
-AllowAllParametersOfDeclarationOnNextLine: 'false'
-AllowShortBlocksOnASingleLine: 'false'
-AllowShortCaseLabelsOnASingleLine: 'false'
+AlignOperands: false
+AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortLambdasOnASingleLine: None
 AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: Never
-AllowShortLambdasOnASingleLine: None
-AllowShortLoopsOnASingleLine: 'false'
+AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
-AlwaysBreakTemplateDeclarations: 'No'
-ColumnLimit: '150'
-CompactNamespaces: 'false'
-ConstructorInitializerIndentWidth: '4'
-ContinuationIndentWidth: '4'
-Cpp11BracedListStyle: 'false'
-FixNamespaceComments: 'false'
-IndentCaseLabels: 'true'
+AlwaysBreakTemplateDeclarations: No
+ColumnLimit: 150
+CompactNamespaces: false
+ConstructorInitializerIndentWidth : 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: false
+FixNamespaceComments: false
+IndentCaseLabels: true
 IndentPPDirectives: BeforeHash
-IndentWidth: '4'
-IndentWrappedFunctionNames: 'false'
-KeepEmptyLinesAtTheStartOfBlocks: 'false'
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
 Language: Cpp
-MaxEmptyLinesToKeep: '4'
+MaxEmptyLinesToKeep: 4
 NamespaceIndentation: All
 ObjCBinPackProtocolList: Auto
-ObjCBlockIndentWidth: '4'
-ObjCSpaceAfterProperty: 'false'
-ObjCSpaceBeforeProtocolList: 'true'
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
 PointerAlignment: Left
-ReflowComments: 'false'
-SortIncludes: 'false'
-SortUsingDeclarations: 'false'
-SpaceAfterCStyleCast: 'false'
-SpaceAfterLogicalNot: 'false'
-SpaceAfterTemplateKeyword: 'false'
-SpaceBeforeAssignmentOperators: 'true'
-SpaceBeforeCpp11BracedList: 'false'
-SpaceBeforeCtorInitializerColon: 'true'
-SpaceBeforeInheritanceColon: 'true'
+ReflowComments: false
+SortIncludes: false
+SortUsingDeclarations: false
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: 'false'
-SpaceInEmptyParentheses: 'false'
-SpacesBeforeTrailingComments: '0'
-SpacesInAngles: 'false'
-SpacesInCStyleCastParentheses: 'true'
-SpacesInContainerLiterals: 'true'
-SpacesInParentheses: 'false'
-SpacesInSquareBrackets: 'false'
+SpaceBeforeRangeBasedForLoopColon: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 0
+SpacesInAngles: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: true
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
 Standard: Cpp11
-TabWidth: '4'
+TabWidth: 4
 UseTab: Always
-
 ...

BuildTools/Classes/Packager/Vcpkg.php

@@ -109,7 +109,7 @@ function checkoutRepository(string $tag = ""): bool
         chdir(getenv('HOME'));
         system('rm -rf ./discordcoreapi');
         $this->git('config --global user.email "[email protected]"');
-        $this->git('config --global user.name "realtimechris"');
+        $this->git('config --global user.name "RealTimeChris"');
         $this->git('clone ' . escapeshellarg($repositoryUrl) . ' ./discordcoreapi --depth=1');
 
         /* This is noisy, silence it */
@@ -133,8 +133,7 @@ function constructPortAndVersionFile(string $sha512 = "0"): string
     {
         echo GREEN . "Construct portfile for " . $this->getVersion() . ", sha512: $sha512\n" . WHITE;
         chdir(getenv("HOME") . '/discordcoreapi');
-        $date=date_create();
-        ;
+
         $portFileContent = 'if(VCPKG_TARGET_IS_LINUX)
     message(WARNING "DiscordCoreAPI only supports g++ 11 on linux.")
 endif()
@@ -144,6 +143,7 @@ function constructPortAndVersionFile(string $sha512 = "0"): string
 	REPO RealTimeChris/DiscordCoreAPI
 	REF "v${VERSION}"
     SHA512 ' . $sha512 . '
+    HEAD_REF main
 )
 
 vcpkg_cmake_configure(
@@ -188,9 +188,7 @@ function constructPortAndVersionFile(string $sha512 = "0"): string
       "host": true
     }
   ]
-}
-
-';
+}';
         echo GREEN . "Writing portfile...\n" . WHITE;
         file_put_contents('./Vcpkg/ports/discordcoreapi/vcpkg.json', $versionFileContent);
         return $portFileContent;
@@ -257,16 +255,17 @@ function secondBuild(string $portFileContent): bool
         $this->sudo('./vcpkg format-manifest ./ports/discordcoreapi/vcpkg.json');
         /* Note: We commit this in /usr/local, but we never push it (we can't) */
         $this->git('add .', true);
-        $this->git('commit -m "[bot] VCPKG info update"', true);
+        $this->git('commit -m "VCPKG info update"', true);
         $this->sudo('/usr/local/share/vcpkg/vcpkg x-add-version discordcoreapi');
 
         echo GREEN . "Copy back port files from /usr/local/share...\n" . WHITE;
         chdir(getenv('HOME') . '/discordcoreapi');
+        system('cp -v -R /usr/local/share/vcpkg/ports/discordcoreapi/vcpkg.json ./Vcpkg/ports/discordcoreapi/vcpkg.json');
         system('cp -v -R /usr/local/share/vcpkg/versions/d-/discordcoreapi.json ./Vcpkg/versions/d-/discordcoreapi.json');
 
         echo GREEN . "Commit and push changes to main branch\n" . WHITE;
         $this->git('add .');
-        $this->git('commit -m "[bot] VCPKG info update [skip ci]"');
+        $this->git('commit -m "VCPKG info update [skip ci]"');
         $this->git('config pull.rebase false');
         $this->git('pull');
         $this->git('push origin main');

BuildTools/make_vcpkg.php

@@ -4,7 +4,7 @@
  * Automatic CI process for generating new vcpkg releases.
  * Based loosely on RealTimeChris's shell script version.
  * 
- * This updates the content of ./vcpkg directory within the DiscordCoreAPI
+ * This updates the content of ./Vcpkg directory within the DiscordCoreAPI
  * repository on the main branch, which can then be diffed into
  * the microsoft/vcpkg main branch to build a PR for the new
  * release.
@@ -46,6 +46,7 @@
     if (!$vcpkg->checkoutRepository()) {
         exit(1);
     }
+
     /* Attempt second build with the valid SHA512 sum. Program exit
      * status is the exit status of `vcpkg install`
      */

CMakeLists.txt

@@ -21,12 +21,16 @@
 # CMakeLists.txt - The CMake script for building this library.
 # May 13, 2021
 # https://discordcoreapi.com
-set(VCPKG_ROOT_DIR "C:/vcpkg")
+set(VCPKG_ROOT_DIR "/home/chris/Vcpkg")
 set(Opus_DIR "C:/Vcpkg/installed/x64-windows/share/opus") # Set this one to the folder location of the file "OpusConfig.cmake".
 set(unofficial-sodium_DIR "C:/Vcpkg/installed/x64-windows/share/unofficial-sodium") # Set this one to the folder location of the file "unofficial-sodiumConfig.cmake".
-set(Jsonifier_DIR "C:/Vcpkg/installed/x64-windows/share/jsonifier") # Set this one to the folder location of the file "JsonifierConfig.cmake".
+set(Jsonifier_DIR "C:/Users/Chris/source/repos/Jsonifier/Install/Windows-Debug/share/jsonifier/") # Set this one to the folder location of the file "JsonifierConfig.cmake".
 set(OPENSSL_ROOT_DIR "C:/Vcpkg/installed/x64-windows/") # Set this one to the folder location of the include folder and library folders of OpenSSL.
 
+if (EXISTS "${VCPKG_ROOT_DIR}")
+	set(ENV{VCPKG_INSTALLATION_ROOT "${VCPKG_ROOT_DIR}")
+endif()
+
 cmake_minimum_required(VERSION 3.20)
 if (WIN32)
 	set(OS "windows")
@@ -43,6 +47,10 @@ if (NOT "$ENV{VCPKG_INSTALLATION_ROOT}" STREQUAL "")
 	set(Opus_DIR "${VCPKG_INSTALLATION_ROOT_NEW}/installed/x64-${OS}/share/opus")
 	set(unofficial-sodium_DIR "${VCPKG_INSTALLATION_ROOT_NEW}/installed/x64-${OS}/share/unofficial-sodium")
 	include("${VCPKG_INSTALLATION_ROOT_NEW}/scripts/buildsystems/vcpkg.cmake")
+	set(OS_NAME "${CMAKE_SYSTEM_NAME}")
+	string(TOLOWER "${OS_NAME}" OS_NAME)
+	set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}")
+	set(DEBUG_PREFIX "")
 else()
 	message(WARNING "No Vcpkg root folder found, Please make sure that you properly set the library folders.")
 	set(VCPKG_INSTALLATION_ROOT_NEW "${VCPKG_ROOT_DIR}")
@@ -64,11 +72,4 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/CMake;")
 set(CMAKE_CONFIGURATION_TYPES "${CMAKE_BUILD_TYPE}")
 set(CMAKE_CXX_STANDARD 23)
 
-if(EXISTS "${_VCPKG_INSTALLED_DIR}")
-	set(OS_NAME "${CMAKE_SYSTEM_NAME}")
-	string(TOLOWER "${OS_NAME}" OS_NAME)
-	set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}")
-	set(DEBUG_PREFIX "")
-endif()
-
 add_subdirectory(Library)

CMakePresets.json

@@ -8,9 +8,10 @@
         "rhs": "Windows",
         "type": "equals"
       },
-      "installDir": "${sourceDir}/Install/${presetName}",
       "description": "Target Windows with the Visual Studio development environment.",
+      "generator": "Visual Studio 17 2022",
       "hidden": true,
+      "installDir": "${sourceDir}/Install/${presetName}",
       "name": "Windows-Base"
     },
     {
@@ -25,10 +26,13 @@
     },
     {
       "architecture": {
-        "value": "x64",
-        "strategy": "external"
+        "strategy": "external",
+        "value": "x64"
+      },
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "DEV": true
       },
-      "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", "DEV": true },
       "description": "Target Windows (64-bit) with the Visual Studio development environment. (Release)",
       "inherits": "Windows-Base",
       "name": "Windows-Release-Dev"
@@ -45,10 +49,13 @@
     },
     {
       "architecture": {
-        "value": "x64",
-        "strategy": "external"
+        "strategy": "external",
+        "value": "x64"
+      },
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "DEV": true
       },
-      "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "DEV": true },
       "description": "Target Windows (64-bit) with the Visual Studio development environment. (Debug)",
       "inherits": "Windows-Base",
       "name": "Windows-Debug-Dev"
@@ -60,7 +67,8 @@
       },
       "cacheVariables": {
         "ASAN_ENABLED": "TRUE",
-        "CMAKE_BUILD_TYPE": "Release"
+        "CMAKE_BUILD_TYPE": "Release",
+        "DEV": true
       },
       "description": "Target Windows (64-bit) with the Visual Studio development environment. (Release)",
       "inherits": "Windows-Base",
@@ -73,7 +81,8 @@
       },
       "cacheVariables": {
         "ASAN_ENABLED": "TRUE",
-        "CMAKE_BUILD_TYPE": "Debug"
+        "CMAKE_BUILD_TYPE": "Debug",
+        "DEV": true
       },
       "description": "Target Windows (64-bit) with the Visual Studio development environment. (Debug)",
       "inherits": "Windows-Base",
@@ -167,6 +176,20 @@
       "name": "Windows-Debug-Asan",
       "verbose": true
     },
+    {
+      "configurePreset": "Windows-Release-Dev",
+      "inheritConfigureEnvironment": true,
+      "configuration": "Release",
+      "name": "Windows-Release-Dev",
+      "verbose": true
+    },
+    {
+      "configurePreset": "Windows-Debug-Dev",
+      "inheritConfigureEnvironment": true,
+      "configuration": "Debug",
+      "name": "Windows-Debug-Dev",
+      "verbose": true
+    },
     {
       "configurePreset": "Linux-Release",
       "inheritConfigureEnvironment": true,