Update WIP discord and some vendors.

CPR has features disabled and PCRE is fully disabled until updated to new code.

vendor/DPP/buildtools/changelog.php

@@ -22,6 +22,7 @@ $categories = [
     'improvement' => '♻️ Refactoring',
     'refactor' => '♻️ Refactoring',
     'refactored' => '♻️ Refactoring',
+    'refactoring' => '♻️ Refactoring',
     'deprecated' => '♻️ Refactoring',
     'deprecate' => '♻️ Refactoring',
     'remove' => '♻️ Refactoring',

vendor/DPP/buildtools/classes/Packager/Vcpkg.php

@@ -0,0 +1,287 @@
+<?php
+
+namespace Dpp\Packager;
+
+use \RuntimeException;
+
+const GREEN = "\033[32m";
+const RED   = "\033[31m";
+const WHITE = "\033[0m";
+
+class Vcpkg
+{
+    /**
+     * @var string Git Tag
+     */
+    private string $latestTag;
+
+    /**
+     * @var string Semver version
+     */
+    private string $version;
+
+    /**
+     * @var string Path to GIT
+     */
+    private string $git;
+
+    /**
+     * @var string Path to SUDO
+     */
+    private string $sudo;
+
+    /**
+     * @var bool True when we have done the first build to get the SHA512 sum
+     */
+    private bool $firstBuildComplete = false;
+
+    /**
+     * Constructor
+     * 
+     * Examines current diretory's git repository to get latest tag and version.
+     */
+    public function __construct()
+    {
+        global $argv;
+        if (count($argv) < 2) {
+            throw new RuntimeException(RED . "Missing github repository owner and access token\n" . WHITE);
+        }
+        echo GREEN . "Starting vcpkg updater...\n" . WHITE;
+            
+        /* Get the latest tag from the version of the repository checked out by default into the action */
+        $this->latestTag = preg_replace("/\n/", "", shell_exec("git describe --tags `git rev-list --tags --max-count=1`"));
+        $this->version = preg_replace('/^v/', '', $this->getTag());
+        echo GREEN . "Latest tag: " . $this->getTag() . " version: " . $this->getVersion() . "\n" . WHITE;
+
+	$this->git = trim(`which git`);
+	$this->sudo = trim(`which sudo`);
+    }
+
+    /**
+     * Get semver version
+     *
+     * @return string
+     */
+    public function getVersion(): string
+    {
+        return $this->version;
+    }
+
+    /**
+     * Get the git tag we are building
+     * 
+     * @return string
+     */
+    public function getTag(): string
+    {
+        return $this->latestTag;
+    }
+
+    private function git(string $parameters, bool $sudo = false): void
+    {
+        system(($sudo ? $this->sudo . ' ' : '') . $this->git . ' ' . $parameters);
+    }
+
+    private function sudo(string $command): void
+    {
+        system($this->sudo . ' ' . $command);
+    }
+
+    /**
+     * Check out a repository by tag or branch name to ~/dpp,
+     * using the personal access token and username passed in as command line parameters.
+     * 
+     * @param string $tag Tag to clone
+     * @return bool false if the repository could not be cloned
+     */
+    function checkoutRepository(string $tag = ""): bool
+    {
+        global $argv;
+
+        if (empty($tag)) {
+            /* Empty tag means use the main branch */
+            $tag = `{$this->git} config --get init.defaultBranch || echo master`;
+        }
+	$repositoryUrl = 'https://' . urlencode($argv[1]) . ':' . urlencode($argv[2]) . '@github.com/brainboxdotcc/DPP';
+
+        echo GREEN . "Check out repository: $tag (user: ". $argv[1] . " branch: " . $tag . ")\n" . WHITE;
+
+        chdir(getenv('HOME'));
+        system('rm -rf ./dpp');
+        $this->git('config --global user.email "noreply@dpp.dev"');
+        $this->git('config --global user.name "DPP VCPKG Bot"');
+        $this->git('clone ' . escapeshellarg($repositoryUrl) . ' ./dpp --depth=1');
+        
+        /* This is noisy, silence it */
+	$status = chdir(getenv("HOME") . '/dpp');
+        $this->git('fetch -at 2>/dev/null');
+        $this->git('checkout ' . escapeshellarg($tag) . ' 2>/dev/null');
+	
+	return $status;
+    }
+
+    /**
+     * Create ./vcpkg/ports/dpp/vcpkg.json and return the portfile contents to
+     * build the branch that is cloned at ~/dpp
+     * 
+     * @param string $sha512 The SHA512 sum of the tagged download, or initially
+     * zero, which means that the vcpkg install command should obtain it the
+     * second time around.
+     * @return string The portfile content
+     */
+    function constructPortAndVersionFile(string $sha512 = "0"): string
+    {
+        echo GREEN . "Construct portfile for " . $this->getVersion() . ", sha512: $sha512\n" . WHITE;
+        chdir(getenv("HOME") . '/dpp');
+
+        $portFileContent = 'vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO brainboxdotcc/DPP
+    REF "v${VERSION}"
+    # Auto-generated by release CI action at brainboxdotcc/DPP
+    SHA512 ' . $sha512 . '
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(NO_PREFIX_CORRECTION)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/dpp")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(
+    INSTALL "${SOURCE_PATH}/LICENSE"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+    RENAME copyright
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+';
+        // ./vcpkg/ports/dpp/vcpkg.json
+        $versionFileContent = '{
+  "name": "dpp",
+  "version": ' . json_encode($this->getVersion()) . ',
+  "description": "D++ Extremely Lightweight C++ Discord Library.",
+  "homepage": "https://dpp.dev/",
+  "license": "Apache-2.0",
+  "supports": "((windows & !static & !uwp) | linux | osx)",
+  "dependencies": [
+    "libsodium",
+    "nlohmann-json",
+    "openssl",
+    "opus",
+    "zlib",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}';
+        echo GREEN . "Writing portfile...\n" . WHITE;
+        file_put_contents('./vcpkg/ports/dpp/vcpkg.json', $versionFileContent);
+        return $portFileContent;
+    }
+
+    /**
+     * Attempt the first build of the vcpkg port. This will always fail, as it is given
+     * an SHA512 sum of 0. When it fails the output contains the SHA512 sum, which is then
+     * extracted from the error output using a regular expression, and saved for a second
+     * attempt.
+     * @param string $portFileContent Portfile content from constructPortAndVersionFile()
+     * with an SHA512 sum of 0 passed in.
+     * @return string SHA512 sum of build output
+     */
+    function firstBuild(string $portFileContent): string
+    {
+        echo GREEN . "Starting first build\n" . WHITE;
+
+        chdir(getenv("HOME") . '/dpp');
+        echo GREEN . "Create /usr/local/share/vcpkg/ports/dpp/\n" . WHITE;
+        $this->sudo('mkdir -p /usr/local/share/vcpkg/ports/dpp/');
+        echo GREEN . "Copy vcpkg.json to /usr/local/share/vcpkg/ports/dpp/vcpkg.json\n" . WHITE;
+        $this->sudo('cp -v -R ./vcpkg/ports/dpp/vcpkg.json /usr/local/share/vcpkg/ports/dpp/vcpkg.json');
+        file_put_contents('/tmp/portfile', $portFileContent);
+        $this->sudo('cp -v -R /tmp/portfile /usr/local/share/vcpkg/ports/dpp/portfile.cmake');
+        unlink('/tmp/portfile');
+        $buildResults = shell_exec($this->sudo . ' /usr/local/share/vcpkg/vcpkg install dpp:x64-linux');
+        $matches = [];
+        if (preg_match('/Actual hash:\s+([0-9a-fA-F]+)/', $buildResults, $matches)) {
+            echo GREEN . "Obtained SHA512 for first build: " . $matches[1] . "\n" . WHITE;
+            $this->firstBuildComplete = true;
+            return $matches[1];
+        }
+        echo RED . "No SHA512 found during first build :(\n" . WHITE;
+        return '';
+    }
+
+    /**
+     * Second build using a valid SHA512 sum. This attempt should succeed, allowing us to push
+     * the changed vcpkg portfiles into the master branch, where they can be used in a PR to
+     * microsoft/vcpkg repository later.
+     * 
+     * @param string $portFileContent the contents of the portfile, containing a valid SHA512
+     * sum from the first build attempt.
+     * @return bool False if the build failed
+     */
+    function secondBuild(string $portFileContent): bool
+    {
+
+        if (!$this->firstBuildComplete) {
+            throw new RuntimeException("No SHA512 sum is available, first build has not been run!");
+        }
+
+        echo GREEN . "Executing second build\n" . WHITE;
+        echo GREEN . "Copy local port files to /usr/local/share...\n" . WHITE;
+        chdir(getenv("HOME") . '/dpp');
+        file_put_contents('./vcpkg/ports/dpp/portfile.cmake', $portFileContent);
+        $this->sudo('cp -v -R ./vcpkg/ports/dpp/vcpkg.json /usr/local/share/vcpkg/ports/dpp/vcpkg.json');
+        $this->sudo('cp -v -R ./vcpkg/ports/dpp/portfile.cmake /usr/local/share/vcpkg/ports/dpp/portfile.cmake');
+        $this->sudo('cp -v -R ./vcpkg/ports/* /usr/local/share/vcpkg/ports/');
+
+        echo GREEN . "vcpkg x-add-version...\n" . WHITE;
+        chdir('/usr/local/share/vcpkg');
+        $this->sudo('./vcpkg format-manifest ./ports/dpp/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->sudo('/usr/local/share/vcpkg/vcpkg x-add-version dpp');
+
+        echo GREEN . "Copy back port files from /usr/local/share...\n" . WHITE;
+        chdir(getenv('HOME') . '/dpp');
+        system('cp -v -R /usr/local/share/vcpkg/ports/dpp/vcpkg.json ./vcpkg/ports/dpp/vcpkg.json');
+        system('cp -v -R /usr/local/share/vcpkg/versions/baseline.json ./vcpkg/versions/baseline.json');
+        system('cp -v -R /usr/local/share/vcpkg/versions/d-/dpp.json ./vcpkg/versions/d-/dpp.json');
+
+        echo GREEN . "Commit and push changes to master branch\n" . WHITE;
+        $this->git('add .');
+        $this->git('commit -m "[bot] VCPKG info update [skip ci]"');
+        $this->git('config pull.rebase false');
+        $this->git('pull');
+        $this->git('push origin master');
+
+        echo GREEN . "vcpkg install...\n" . WHITE;
+        $resultCode = 0;
+        $output = [];
+        exec($this->sudo . ' /usr/local/share/vcpkg/vcpkg install dpp:x64-linux', $output, $resultCode);
+
+        if ($resultCode != 0) {
+            echo RED . "There were build errors!\n\nBuild log:\n" . WHITE;
+            readfile("/usr/local/share/vcpkg/buildtrees/dpp/install-x64-linux-dbg-out.log");
+        }
+
+	return $resultCode == 0;
+    }
+};

vendor/DPP/buildtools/make_struct.php

@@ -42,6 +42,8 @@ $forcedReturn = [
     'message_create' => 'message',
     'message_edit' => 'message',
     'thread_create_in_forum' => 'thread',
+    'threads_get_active' => 'active_threads',
+    'user_get_cached' => 'user_identified',
 ];
 
 /* Get the contents of cluster.h into an array */
@@ -61,8 +63,11 @@ if (!$generator->checkForChanges()) {
     exit(0);
 }
 
+$lastFunc = '<none>';
+$l = 0;
 /* Scan every line of the C++ source */
 foreach ($clustercpp as $cpp) {
+    $l++;
     /* Look for declaration of function body */
     if ($state == STATE_SEARCH_FOR_FUNCTION &&
         preg_match('/^\s*void\s+cluster::([^(]+)\s*\((.*)command_completion_event_t\s*callback\s*\)/', $cpp, $matches)) {
@@ -111,10 +116,15 @@ foreach ($clustercpp as $cpp) {
             $content .= $generator->generateHeaderDef($returnType, $currentFunction, $parameters, $noDefaults, $parameterNames);
             $cppcontent .= $generator->generateCppDef($returnType, $currentFunction, $parameters, $noDefaults, $parameterNames);
         }
+	$lastFunc = $currentFunction;
         $currentFunction = $parameters = $returnType = '';
         $state = STATE_SEARCH_FOR_FUNCTION;
     }
 }
+if ($state != STATE_SEARCH_FOR_FUNCTION) {
+    die("\n\n\nBuilding headers is broken ($l) - state machine finished in the middle of function $currentFunction (previous $lastFunc) with parameters $parameters rv $returnType state=$state\n\n\n");
+}
+
 $content .= <<<EOT
 
 /* End of auto-generated definitions */

vendor/DPP/buildtools/make_vcpkg.php

@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * 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 DPP
+ * repository on the master branch, which can then be diffed into
+ * the microsoft/vcpkg master branch to build a PR for the new
+ * release.
+ * 
+ * The procedure for this is:
+ * 
+ * 1) Generate various configuration files and put them into the
+ *    systemwide vcpkg installation inside the CI container
+ * 2) Attempt to build the package from the release tag,
+ *    this will fail due to invalid SHA512 sum and return the
+ *    correct SHA512 sum in the error output. Inability to get the
+ *    SHA512 sum here will return nonzero from the script, failing
+ *    the CI action.
+ * 3) Capture the SHA512 from the error output, switch to master
+ * 4) Copy the correct configuration into both the systemwide
+ *    vcpkg install in the container, and into the vcpkg directory
+ *    of master branch.
+ * 5) Rerun the `vcpkg install` process again to verify it is working.
+ *    A build failure here will return a nonzero return code from
+ *    the script, failing the CI action.
+ */
+
+require __DIR__ . '/vendor/autoload.php';
+use Dpp\Packager\Vcpkg;
+
+$vcpkg = new Vcpkg();
+
+/* Check out source for latest tag */
+if (!$vcpkg->checkoutRepository($vcpkg->getTag())) {
+    exit(1);
+}
+
+/* First run with SHA512 of 0 to gather actual value and save it */
+$sha512 = $vcpkg->firstBuild(
+    $vcpkg->constructPortAndVersionFile()
+);
+if (!empty($sha512)) {
+    /* Now check out master */
+    if (!$vcpkg->checkoutRepository()) {
+        exit(1);
+    }
+
+    /* Attempt second build with the valid SHA512 sum. Program exit
+     * status is the exit status of `vcpkg install`
+     */
+    exit(
+        $vcpkg->secondBuild(
+            $vcpkg->constructPortAndVersionFile($sha512)
+        )
+    );
+    
+}
+
+/* Error if no SHA sum could be generated */
+exit(1);