diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83ba18534..301029b35 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,7 +81,7 @@ jobs: gtest gmock sparsehash-devel - rapidjson-devel + discord-rpc-devel - name: Install kdsingleapplication-qt6-devel if: matrix.opensuse_version != 'leap:15.6' run: zypper -n --gpg-auto-import-keys in kdsingleapplication-qt6-devel @@ -207,7 +207,7 @@ jobs: gtest-devel gmock-devel sparsehash-devel - rapidjson-devel + discord-rpc-devel - name: Checkout uses: actions/checkout@v6 with: @@ -303,7 +303,7 @@ jobs: appstream appstream-util hicolor-icon-theme - rapidjson + discord-rpc-devel - name: Remove files run: rm -rf /usr/lib64/qt6/lib/cmake/Qt6Sql/{Qt6QMYSQL*,Qt6QODBCD*,Qt6QPSQL*,Qt6QIBase*} - name: Checkout @@ -399,7 +399,7 @@ jobs: appstream-util hicolor-icon-theme gtest - rapidjson + discord-rpc-devel - name: Build and install KDSingleApplication if: matrix.mageia_version == '9' run: | @@ -520,7 +520,7 @@ jobs: - name: Create Build Environment run: cmake -E make_directory build - name: Configure CMake - run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WERROR=ON + run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WERROR=ON -DENABLE_DISCORD_RPC=OFF - name: Delete build directory run: rm -rf build - name: make deb @@ -616,7 +616,7 @@ jobs: - name: Create Build Environment run: cmake -E make_directory build - name: Configure CMake - run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WERROR=ON + run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WERROR=ON -DENABLE_DISCORD_RPC=OFF - name: Delete build directory run: rm -rf build - name: make deb @@ -692,7 +692,6 @@ jobs: gstreamer1.0-alsa gstreamer1.0-pulseaudio libkdsingleapplication-qt6-dev - rapidjson-dev - name: Install keyboxd if: matrix.ubuntu_version == 'noble' env: @@ -712,7 +711,7 @@ jobs: - name: Create Build Environment run: cmake -E make_directory build - name: Configure CMake - run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WERROR=ON + run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WERROR=ON -DENABLE_DISCORD_RPC=OFF - name: Delete build directory run: rm -rf build - name: Import Ubuntu PPA GPG private key @@ -756,7 +755,7 @@ jobs: set -e git config --global --add safe.directory ${GITHUB_WORKSPACE} cmake -E make_directory build - cmake -S . -B build -DCMAKE_BUILD_TYPE="Debug" + cmake -S . -B build -DCMAKE_BUILD_TYPE="Debug" -DENABLE_DISCORD_RPC=OFF cmake --build build --config Debug --parallel 4 @@ -776,7 +775,7 @@ jobs: with: usesh: true mem: 4096 - prepare: pkg_add git cmake pkgconf boost glib2 qt6-qtbase qt6-qttools sqlite gstreamer1 gstreamer1-plugins-base chromaprint libebur128 taglib libcdio libmtp gdk-pixbuf libgpod fftw3 icu4c kdsingleapplication pulseaudio sparsehash rapidjson + prepare: pkg_add git cmake pkgconf boost glib2 qt6-qtbase qt6-qttools sqlite gstreamer1 gstreamer1-plugins-base chromaprint libebur128 taglib libcdio libmtp gdk-pixbuf libgpod fftw3 icu4c kdsingleapplication pulseaudio sparsehash run: | set -e export LDFLAGS="-L/usr/local/lib" diff --git a/3rdparty/discord-rpc/CMakeLists.txt b/3rdparty/discord-rpc/CMakeLists.txt deleted file mode 100644 index b86973762..000000000 --- a/3rdparty/discord-rpc/CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ -set(DISCORD_RPC_SOURCES - discord_rpc.h - discord_register.h - discord_rpc.cpp - discord_rpc_connection.h - discord_rpc_connection.cpp - discord_serialization.h - discord_serialization.cpp - discord_connection.h - discord_backoff.h - discord_msg_queue.h -) - -if(UNIX) - list(APPEND DISCORD_RPC_SOURCES discord_connection_unix.cpp) - if(APPLE) - list(APPEND DISCORD_RPC_SOURCES discord_register_osx.m) - add_definitions(-DDISCORD_OSX) - else() - list(APPEND DISCORD_RPC_SOURCES discord_register_linux.cpp) - add_definitions(-DDISCORD_LINUX) - endif() -endif() - -if(WIN32) - list(APPEND DISCORD_RPC_SOURCES discord_connection_win.cpp discord_register_win.cpp) - add_definitions(-DDISCORD_WINDOWS) -endif() - -add_library(discord-rpc STATIC ${DISCORD_RPC_SOURCES}) - -if(APPLE) - target_link_libraries(discord-rpc PRIVATE "-framework AppKit") -endif() - -if(WIN32) - target_link_libraries(discord-rpc PRIVATE psapi advapi32) -endif() - -target_include_directories(discord-rpc SYSTEM PRIVATE ${RapidJSON_INCLUDE_DIRS}) -target_include_directories(discord-rpc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/3rdparty/discord-rpc/LICENSE b/3rdparty/discord-rpc/LICENSE deleted file mode 100644 index 17fca3d50..000000000 --- a/3rdparty/discord-rpc/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright 2017 Discord, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/3rdparty/discord-rpc/README.md b/3rdparty/discord-rpc/README.md deleted file mode 100644 index 60def3c3a..000000000 --- a/3rdparty/discord-rpc/README.md +++ /dev/null @@ -1,162 +0,0 @@ -# Discord RPC - -## Fork Notice - -This library was slightly modified for Strawberry Music Player with some extra features from the new API and shared library support/more unnecessary components removed. The original repository is [here](https://github.com/discord/discord-rpc) - -## Deprecation Notice - -This library has been deprecated in favor of Discord's GameSDK. [Learn more here](https://discordapp.com/developers/docs/game-sdk/sdk-starter-guide) - ---- - -This is a library for interfacing your game with a locally running Discord desktop client. It's known to work on Windows, macOS, and Linux. You can use the lib directly if you like, or use it as a guide to writing your own if it doesn't suit your game as is. PRs/feedback welcome if you have an improvement everyone might want, or can describe how this doesn't meet your needs. - -Included here are some quick demos that implement the very minimal subset to show current status, and -have callbacks for where a more complete game would do more things (joining, spectating, etc). - -## Documentation - -The most up to date documentation for Rich Presence can always be found on our [developer site](https://discordapp.com/developers/docs/rich-presence/how-to)! If you're interested in rolling your own native implementation of Rich Presence via IPC sockets instead of using our SDK—hey, you've got free time, right?—check out the ["Hard Mode" documentation](https://github.com/discordapp/discord-rpc/blob/master/documentation/hard-mode.md). - -## Basic Usage - -Zeroith, you should be set up to build things because you are a game developer, right? - -First, head on over to the [Discord developers site](https://discordapp.com/developers/applications/me) and make yourself an app. Keep track of `Client ID` -- you'll need it here to pass to the init function. - -### Unreal Engine 4 Setup - -To use the Rich Presense plugin with Unreal Engine Projects: - -1. Download the latest [release](https://github.com/discordapp/discord-rpc/releases) for each operating system you are targeting and the zipped source code -2. In the source code zip, copy the UE plugin—`examples/unrealstatus/Plugins/discordrpc`—to your project's plugin directory -3. At `[YOUR_UE_PROJECT]/Plugins/discordrpc/source/ThirdParty/DiscordRpcLibrary/`, create an `Include` folder and copy `discord_rpc.h` and `discord_register.h` to it from the zip -4. Follow the steps below for each OS -5. Build your UE4 project -6. Launch the editor, and enable the Discord plugin. - -#### Windows - -- At `[YOUR_UE_PROJECT]/Plugins/discordrpc/source/ThirdParty/DiscordRpcLibrary/`, create a `Win64` folder -- Copy `lib/discord-rpc.lib` and `bin/discord-rpc.dll` from `[RELEASE_ZIP]/win64-dynamic` to the `Win64` folder - -#### Mac - -- At `[YOUR_UE_PROJECT]/Plugins/discordrpc/source/ThirdParty/DiscordRpcLibrary/`, create a `Mac` folder -- Copy `libdiscord-rpc.dylib` from `[RELEASE_ZIP]/osx-dynamic/lib` to the `Mac` folder - -#### Linux - -- At `[YOUR_UE_PROJECT]/Plugins/discordrpc/source/ThirdParty/DiscordRpcLibrary/`, create a `Linux` folder -- Inside, create another folder `x86_64-unknown-linux-gnu` -- Copy `libdiscord-rpc.so` from `[RELEASE_ZIP]/linux-dynamic/lib` to `Linux/x86_64-unknown-linux-gnu` - -### Unity Setup - -If you're a Unity developer looking to integrate Rich Presence into your game, follow this simple guide to get started towards success: - -1. Download the DLLs for any platform that you need from [our releases](https://github.com/discordapp/discord-rpc/releases) -2. In your Unity project, create a `Plugins` folder inside your `Assets` folder if you don't already have one -3. Copy the file `DiscordRpc.cs` from [here](https://github.com/discordapp/discord-rpc/blob/master/examples/button-clicker/Assets/DiscordRpc.cs) into your `Assets` folder. This is basically your header file for the SDK - -We've got our `Plugins` folder ready, so let's get platform-specific! - -#### Windows - -4. Create `x86` and `x86_64` folders inside `Assets/Plugins/` -5. Copy `discord-rpc-win/win64-dynamic/bin/discord-rpc.dll` to `Assets/Plugins/x86_64/` -6. Copy `discord-rpc-win/win32-dynamic/bin/discord-rpc.dll` to `Assets/Plugins/x86/` -7. Click on both DLLs and make sure they are targetting the correct architectures in the Unity editor properties pane -8. Done! - -#### MacOS - -4. Copy `discord-rpc-osx/osx-dynamic/lib/libdiscord-rpc.dylib` to `Assets/Plugins/` -5. Rename `libdiscord-rpc.dylib` to `discord-rpc.bundle` -6. Done! - -#### Linux - -4. Copy `discord-rpc-linux/linux-dynamic-lib/libdiscord-rpc.so` to `Assets/Plugins/` -5. Done! - -You're ready to roll! For code examples on how to interact with the SDK using the `DiscordRpc.cs` header file, check out [our example](https://github.com/discordapp/discord-rpc/blob/master/examples/button-clicker/Assets/DiscordController.cs) - -### From package - -Download a release package for your platform(s) -- they have subdirs with various prebuilt options, select the one you need add `/include` to your compile includes, `/lib` to your linker paths, and link with `discord-rpc`. For the dynamically linked builds, you'll need to ship the associated file along with your game. - -### From repo - -First-eth, you'll want `CMake`. There's a few different ways to install it on your system, and you should refer to [their website](https://cmake.org/install/). Many package managers provide ways of installing CMake as well. - -To make sure it's installed correctly, type `cmake --version` into your flavor of terminal/cmd. If you get a response with a version number, you're good to go! - -There's a [CMake](https://cmake.org/download/) file that should be able to generate the lib for you; Sometimes I use it like this: - -```sh - cd - mkdir build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX= - cmake --build . --config Release --target install -``` - -There is a wrapper build script `build.py` that runs `cmake` with a few different options. - -Usually, I run `build.py` to get things started, then use the generated project files as I work on things. It does depend on `click` library, so do a quick `pip install click` to make sure you have it if you want to run `build.py`. - -There are some CMake options you might care about: - -| flag | default | does | -| ---------------------------------------------------------------------------------------- | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | -| `ENABLE_IO_THREAD` | `ON` | When enabled, we start up a thread to do io processing, if disabled you should call `Discord_UpdateConnection` yourself. | -| `USE_STATIC_CRT` | `OFF` | (Windows) Enable to statically link the CRT, avoiding requiring users install the redistributable package. (The prebuilt binaries enable this option) | -| [`BUILD_SHARED_LIBS`](https://cmake.org/cmake/help/v3.7/variable/BUILD_SHARED_LIBS.html) | `OFF` | Build library as a DLL | -| `WARNINGS_AS_ERRORS` | `OFF` | When enabled, compiles with `-Werror` (on \*nix platforms). | - -## Continuous Builds - -Why do we have three of these? Three times the fun! - -| CI | badge | -| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ | -| TravisCI | [![Build status](https://travis-ci.org/discordapp/discord-rpc.svg?branch=master)](https://travis-ci.org/discordapp/discord-rpc) | -| AppVeyor | [![Build status](https://ci.appveyor.com/api/projects/status/qvkoc0w1c4f4b8tj?svg=true)](https://ci.appveyor.com/project/crmarsh/discord-rpc) | -| Buildkite (internal) | [![Build status](https://badge.buildkite.com/e103d79d247f6776605a15246352a04b8fd83d69211b836111.svg)](https://buildkite.com/discord/discord-rpc) | - -## Sample: send-presence - -This is a text adventure "game" that inits/deinits the connection to Discord, and sends a presence update on each command. - -## Sample: button-clicker - -This is a sample [Unity](https://unity3d.com/) project that wraps a DLL version of the library, and sends presence updates when you click on a button. Run `python build.py unity` in the root directory to build the correct library files and place them in their respective folders. - -## Sample: unrealstatus - -This is a sample [Unreal](https://www.unrealengine.com) project that wraps the DLL version of the library with an Unreal plugin, exposes a blueprint class for interacting with it, and uses that to make a very simple UI. Run `python build.py unreal` in the root directory to build the correct library files and place them in their respective folders. - -## Wrappers and Implementations - -Below is a table of unofficial, community-developed wrappers for and implementations of Rich Presence in various languages. If you would like to have yours added, please make a pull request adding your repository to the table. The repository should include: - -- The code -- A brief ReadMe of how to use it -- A working example - -###### Rich Presence Wrappers and Implementations - -| Name | Language | -| ------------------------------------------------------------------------- | --------------------------------- | -| [Discord RPC C#](https://github.com/Lachee/discord-rpc-csharp) | C# | -| [Discord RPC D](https://github.com/voidblaster/discord-rpc-d) | [D](https://dlang.org/) | -| [discord-rpc.jar](https://github.com/Vatuu/discord-rpc 'Discord-RPC.jar') | Java | -| [java-discord-rpc](https://github.com/MinnDevelopment/java-discord-rpc) | Java | -| [Discord-IPC](https://github.com/jagrosh/DiscordIPC) | Java | -| [Discord Rich Presence](https://npmjs.org/discord-rich-presence) | JavaScript | -| [drpc4k](https://github.com/Bluexin/drpc4k) | [Kotlin](https://kotlinlang.org/) | -| [lua-discordRPC](https://github.com/pfirsich/lua-discordRPC) | LuaJIT (FFI) | -| [pypresence](https://github.com/qwertyquerty/pypresence) | [Python](https://python.org/) | -| [SwordRPC](https://github.com/Azoy/SwordRPC) | [Swift](https://swift.org) | diff --git a/3rdparty/discord-rpc/discord_backoff.h b/3rdparty/discord-rpc/discord_backoff.h deleted file mode 100644 index 46dff7e9b..000000000 --- a/3rdparty/discord-rpc/discord_backoff.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#ifndef DISCORD_BACKOFF_H -#define DISCORD_BACKOFF_H - -#include -#include -#include -#include - -namespace discord_rpc { - -struct Backoff { - int64_t minAmount; - int64_t maxAmount; - int64_t current; - int fails; - std::mt19937_64 randGenerator; - std::uniform_real_distribution<> randDistribution; - - double rand01() { return randDistribution(randGenerator); } - - Backoff(int64_t min, int64_t max) - : minAmount(min), maxAmount(max), current(min), fails(0), randGenerator(static_cast(time(0))) { - } - - void reset() { - fails = 0; - current = minAmount; - } - - int64_t nextDelay() { - ++fails; - int64_t delay = static_cast(static_cast(current) * 2.0 * rand01()); - current = std::min(current + delay, maxAmount); - return current; - } -}; - -} // namespace discord_rpc - -#endif // DISCORD_BACKOFF_H diff --git a/3rdparty/discord-rpc/discord_connection.h b/3rdparty/discord-rpc/discord_connection.h deleted file mode 100644 index a8bfbec8c..000000000 --- a/3rdparty/discord-rpc/discord_connection.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#ifndef DISCORD_CONNECTION_H -#define DISCORD_CONNECTION_H - -// This is to wrap the platform specific kinds of connect/read/write. - -#include - -namespace discord_rpc { - -// not really connectiony, but need per-platform -int GetProcessId(); - -struct BaseConnection { - static BaseConnection *Create(); - static void Destroy(BaseConnection*&); - bool isOpen = false; - bool Open(); - bool Close(); - bool Write(const void *data, size_t length); - bool Read(void *data, size_t length); -}; - -} // namespace discord_rpc - -#endif // DISCORD_CONNECTION_H diff --git a/3rdparty/discord-rpc/discord_connection_unix.cpp b/3rdparty/discord-rpc/discord_connection_unix.cpp deleted file mode 100644 index 3fd3fbd74..000000000 --- a/3rdparty/discord-rpc/discord_connection_unix.cpp +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#include "discord_connection.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -namespace discord_rpc { - -int GetProcessId() { - return ::getpid(); -} - -struct BaseConnectionUnix : public BaseConnection { - int sock{ -1 }; -}; - -static BaseConnectionUnix Connection; -static sockaddr_un PipeAddr{}; -#ifdef MSG_NOSIGNAL -static int MsgFlags = MSG_NOSIGNAL; -#else -static int MsgFlags = 0; -#endif - -static const char *GetTempPath() { - - const char *temp = getenv("XDG_RUNTIME_DIR"); - temp = temp ? temp : getenv("TMPDIR"); - temp = temp ? temp : getenv("TMP"); - temp = temp ? temp : getenv("TEMP"); - temp = temp ? temp : "/tmp"; - - return temp; - -} - -BaseConnection *BaseConnection::Create() { - PipeAddr.sun_family = AF_UNIX; - return &Connection; -} - -void BaseConnection::Destroy(BaseConnection *&c) { - - auto self = reinterpret_cast(c); - self->Close(); - c = nullptr; - -} - -bool BaseConnection::Open() { - - const char *tempPath = GetTempPath(); - auto self = reinterpret_cast(this); - self->sock = socket(AF_UNIX, SOCK_STREAM, 0); - if (self->sock == -1) { - return false; - } - fcntl(self->sock, F_SETFL, O_NONBLOCK); -#ifdef SO_NOSIGPIPE - int optval = 1; - setsockopt(self->sock, SOL_SOCKET, SO_NOSIGPIPE, &optval, sizeof(optval)); -#endif - - for (int pipeNum = 0; pipeNum < 10; ++pipeNum) { - snprintf(PipeAddr.sun_path, sizeof(PipeAddr.sun_path), "%s/discord-ipc-%d", tempPath, pipeNum); - int err = connect(self->sock, reinterpret_cast(&PipeAddr), sizeof(PipeAddr)); - if (err == 0) { - self->isOpen = true; - return true; - } - } - self->Close(); - - return false; - -} - -bool BaseConnection::Close() { - - auto self = reinterpret_cast(this); - if (self->sock == -1) { - return false; - } - close(self->sock); - self->sock = -1; - self->isOpen = false; - - return true; - -} - -bool BaseConnection::Write(const void *data, size_t length) { - - auto self = reinterpret_cast(this); - - if (self->sock == -1) { - return false; - } - - ssize_t sentBytes = send(self->sock, data, length, MsgFlags); - if (sentBytes < 0) { - Close(); - } - - return sentBytes == static_cast(length); - -} - -bool BaseConnection::Read(void *data, size_t length) { - - auto self = reinterpret_cast(this); - - if (self->sock == -1) { - return false; - } - - long res = recv(self->sock, data, length, MsgFlags); - if (res < 0) { - if (errno == EAGAIN) { - return false; - } - Close(); - } - else if (res == 0) { - Close(); - } - - return static_cast(res) == length; - -} - -} // namespace discord_rpc diff --git a/3rdparty/discord-rpc/discord_connection_win.cpp b/3rdparty/discord-rpc/discord_connection_win.cpp deleted file mode 100644 index f85792bba..000000000 --- a/3rdparty/discord-rpc/discord_connection_win.cpp +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#include "discord_connection.h" - -#define WIN32_LEAN_AND_MEAN -#define NOMCX -#define NOSERVICE -#define NOIME - -#include -#include - -namespace discord_rpc { - -int GetProcessId() { - return static_cast(::GetCurrentProcessId()); -} - -struct BaseConnectionWin : public BaseConnection { - HANDLE pipe{ INVALID_HANDLE_VALUE }; -}; - -static BaseConnectionWin Connection; - -BaseConnection *BaseConnection::Create() { - return &Connection; -} - -void BaseConnection::Destroy(BaseConnection *&c) { - - auto self = reinterpret_cast(c); - self->Close(); - c = nullptr; - -} - -bool BaseConnection::Open() { - - wchar_t pipeName[]{ L"\\\\?\\pipe\\discord-ipc-0" }; - const size_t pipeDigit = sizeof(pipeName) / sizeof(wchar_t) - 2; - pipeName[pipeDigit] = L'0'; - auto self = reinterpret_cast(this); - for (;;) { - self->pipe = ::CreateFileW(pipeName, GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, 0, nullptr); - if (self->pipe != INVALID_HANDLE_VALUE) { - self->isOpen = true; - return true; - } - - auto lastError = GetLastError(); - if (lastError == ERROR_FILE_NOT_FOUND) { - if (pipeName[pipeDigit] < L'9') { - pipeName[pipeDigit]++; - continue; - } - } - else if (lastError == ERROR_PIPE_BUSY) { - if (!WaitNamedPipeW(pipeName, 10000)) { - return false; - } - continue; - } - return false; - } - -} - -bool BaseConnection::Close() { - - auto self = reinterpret_cast(this); - ::CloseHandle(self->pipe); - self->pipe = INVALID_HANDLE_VALUE; - self->isOpen = false; - - return true; - -} - -bool BaseConnection::Write(const void *data, size_t length) { - - if (length == 0) { - return true; - } - auto self = reinterpret_cast(this); - assert(self); - if (!self) { - return false; - } - if (self->pipe == INVALID_HANDLE_VALUE) { - return false; - } - assert(data); - if (!data) { - return false; - } - const DWORD bytesLength = static_cast(length); - DWORD bytesWritten = 0; - - return ::WriteFile(self->pipe, data, bytesLength, &bytesWritten, nullptr) == TRUE && bytesWritten == bytesLength; - -} - -bool BaseConnection::Read(void *data, size_t length) { - - assert(data); - if (!data) { - return false; - } - auto self = reinterpret_cast(this); - assert(self); - if (!self) { - return false; - } - if (self->pipe == INVALID_HANDLE_VALUE) { - return false; - } - DWORD bytesAvailable = 0; - if (::PeekNamedPipe(self->pipe, nullptr, 0, nullptr, &bytesAvailable, nullptr)) { - if (bytesAvailable >= length) { - DWORD bytesToRead = static_cast(length); - DWORD bytesRead = 0; - if (::ReadFile(self->pipe, data, bytesToRead, &bytesRead, nullptr) == TRUE) { - assert(bytesToRead == bytesRead); - return true; - } - else { - Close(); - } - } - } - else { - Close(); - } - - return false; - -} - -} // namespace discord_rpc diff --git a/3rdparty/discord-rpc/discord_msg_queue.h b/3rdparty/discord-rpc/discord_msg_queue.h deleted file mode 100644 index 07054d681..000000000 --- a/3rdparty/discord-rpc/discord_msg_queue.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#ifndef DISCORD_MSG_QUEUE_H -#define DISCORD_MSG_QUEUE_H - -#include - -// A simple queue. No locks, but only works with a single thread as producer and a single thread as -// a consumer. Mutex up as needed. - -namespace discord_rpc { - -template -class MsgQueue { - ElementType queue_[QueueSize]; - std::atomic_uint nextAdd_{ 0 }; - std::atomic_uint nextSend_{ 0 }; - std::atomic_uint pendingSends_{ 0 }; - - public: - MsgQueue() {} - - ElementType *GetNextAddMessage() { - // if we are falling behind, bail - if (pendingSends_.load() >= QueueSize) { - return nullptr; - } - auto index = (nextAdd_++) % QueueSize; - return &queue_[index]; - } - void CommitAdd() { ++pendingSends_; } - - bool HavePendingSends() const { return pendingSends_.load() != 0; } - ElementType *GetNextSendMessage() { - auto index = (nextSend_++) % QueueSize; - return &queue_[index]; - } - void CommitSend() { --pendingSends_; } -}; - -} // namespace discord_rpc - -#endif // DISCORD_MSG_QUEUE_H diff --git a/3rdparty/discord-rpc/discord_register.h b/3rdparty/discord-rpc/discord_register.h deleted file mode 100644 index 4e82fe9a4..000000000 --- a/3rdparty/discord-rpc/discord_register.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#ifndef DISCORD_REGISTER_H -#define DISCORD_REGISTER_H - -#ifdef __cplusplus -extern "C" { -#endif - -void Discord_Register(const char *applicationId, const char *command); - -#ifdef __cplusplus -} -#endif - -#endif // DISCORD_REGISTER_H diff --git a/3rdparty/discord-rpc/discord_register_linux.cpp b/3rdparty/discord-rpc/discord_register_linux.cpp deleted file mode 100644 index 554c7da37..000000000 --- a/3rdparty/discord-rpc/discord_register_linux.cpp +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#include "discord_rpc.h" -#include "discord_register.h" - -#include -#include -#include -#include -#include -#include -#include - -namespace { - -static bool Mkdir(const char *path) { - int result = mkdir(path, 0755); - if (result == 0) { - return true; - } - if (errno == EEXIST) { - return true; - } - return false; -} - -} // namespace - -// We want to register games so we can run them from Discord client as discord-:// -extern "C" void Discord_Register(const char *applicationId, const char *command) { - - // Add a desktop file and update some mime handlers so that xdg-open does the right thing. - - const char *home = getenv("HOME"); - if (!home) { - return; - } - - char exePath[1024]{}; - if (!command || !command[0]) { - const ssize_t size = readlink("/proc/self/exe", exePath, sizeof(exePath)); - if (size <= 0 || size >= static_cast(sizeof(exePath))) { - return; - } - exePath[size] = '\0'; - command = exePath; - } - - constexpr char desktopFileFormat[] = "[Desktop Entry]\n" - "Name=Game %s\n" - "Exec=%s %%u\n" // note: it really wants that %u in there - "Type=Application\n" - "NoDisplay=true\n" - "Categories=Discord;Games;\n" - "MimeType=x-scheme-handler/discord-%s;\n"; - char desktopFile[2048]{}; - int fileLen = snprintf(desktopFile, sizeof(desktopFile), desktopFileFormat, applicationId, command, applicationId); - if (fileLen <= 0) { - return; - } - - char desktopFilename[256]{}; - (void)snprintf(desktopFilename, sizeof(desktopFilename), "/discord-%s.desktop", applicationId); - - char desktopFilePath[1024]{}; - (void)snprintf(desktopFilePath, sizeof(desktopFilePath), "%s/.local", home); - if (!Mkdir(desktopFilePath)) { - return; - } - strcat(desktopFilePath, "/share"); - if (!Mkdir(desktopFilePath)) { - return; - } - strcat(desktopFilePath, "/applications"); - if (!Mkdir(desktopFilePath)) { - return; - } - strcat(desktopFilePath, desktopFilename); - - FILE *fp = fopen(desktopFilePath, "w"); - if (fp) { - fwrite(desktopFile, 1, fileLen, fp); - fclose(fp); - } - else { - return; - } - - char xdgMimeCommand[1024]{}; - snprintf(xdgMimeCommand, - sizeof(xdgMimeCommand), - "xdg-mime default discord-%s.desktop x-scheme-handler/discord-%s", - applicationId, - applicationId); - if (system(xdgMimeCommand) < 0) { - fprintf(stderr, "Failed to register mime handler\n"); - } - -} diff --git a/3rdparty/discord-rpc/discord_register_osx.m b/3rdparty/discord-rpc/discord_register_osx.m deleted file mode 100644 index 8226da8a4..000000000 --- a/3rdparty/discord-rpc/discord_register_osx.m +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#include -#include - -#import - -#include "discord_register.h" - -static void RegisterCommand(const char *applicationId, const char *command) { - - // There does not appear to be a way to register arbitrary commands on OSX, so instead we'll save the command - // to a file in the Discord config path, and when it is needed, Discord can try to load the file there, open - // the command therein (will pass to js's window.open, so requires a url-like thing) - - // Note: will not work for sandboxed apps - NSString *home = NSHomeDirectory(); - if (!home) { - return; - } - - NSString *path = [[[[[[home stringByAppendingPathComponent:@"Library"] - stringByAppendingPathComponent:@"Application Support"] - stringByAppendingPathComponent:@"discord"] - stringByAppendingPathComponent:@"games"] - stringByAppendingPathComponent:[NSString stringWithUTF8String:applicationId]] - stringByAppendingPathExtension:@"json"]; - [[NSFileManager defaultManager] createDirectoryAtPath:[path stringByDeletingLastPathComponent] withIntermediateDirectories:YES attributes:nil error:nil]; - - NSString *jsonBuffer = [NSString stringWithFormat:@"{\"command\": \"%s\"}", command]; - [jsonBuffer writeToFile:path atomically:NO encoding:NSUTF8StringEncoding error:nil]; - -} - -static void RegisterURL(const char *applicationId) { - - char url[256]; - snprintf(url, sizeof(url), "discord-%s", applicationId); - CFStringRef cfURL = CFStringCreateWithCString(NULL, url, kCFStringEncodingUTF8); - - NSString* myBundleId = [[NSBundle mainBundle] bundleIdentifier]; - if (!myBundleId) { - fprintf(stderr, "No bundle id found\n"); - return; - } - - NSURL* myURL = [[NSBundle mainBundle] bundleURL]; - if (!myURL) { - fprintf(stderr, "No bundle url found\n"); - return; - } - - OSStatus status = LSSetDefaultHandlerForURLScheme(cfURL, (__bridge CFStringRef)myBundleId); - if (status != noErr) { - fprintf(stderr, "Error in LSSetDefaultHandlerForURLScheme: %d\n", (int)status); - return; - } - - status = LSRegisterURL((__bridge CFURLRef)myURL, true); - if (status != noErr) { - fprintf(stderr, "Error in LSRegisterURL: %d\n", (int)status); - } - -} - -void Discord_Register(const char *applicationId, const char *command) { - - if (command) { - RegisterCommand(applicationId, command); - } - else { - // raii lite - @autoreleasepool { - RegisterURL(applicationId); - } - } - -} diff --git a/3rdparty/discord-rpc/discord_register_win.cpp b/3rdparty/discord-rpc/discord_register_win.cpp deleted file mode 100644 index 7503f13fe..000000000 --- a/3rdparty/discord-rpc/discord_register_win.cpp +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#include "discord_rpc.h" -#include "discord_register.h" - -#define WIN32_LEAN_AND_MEAN -#define NOMCX -#define NOSERVICE -#define NOIME - -#include -#include -#include - -/** - * Updated fixes for MinGW and WinXP - * This block is written the way it does not involve changing the rest of the code - * Checked to be compiling - * 1) strsafe.h belongs to Windows SDK and cannot be added to MinGW - * #include guarded, functions redirected to substitutes - * 2) RegSetKeyValueW and LSTATUS are not declared in - * The entire function is rewritten - */ -#ifdef __MINGW32__ -# include -/// strsafe.h fixes -static HRESULT StringCbPrintfW(LPWSTR pszDest, size_t cbDest, LPCWSTR pszFormat, ...) { - HRESULT ret; - va_list va; - va_start(va, pszFormat); - cbDest /= 2; // Size is divided by 2 to convert from bytes to wide characters - causes segfault - // othervise - ret = vsnwprintf(pszDest, cbDest, pszFormat, va); - pszDest[cbDest - 1] = 0; // Terminate the string in case a buffer overflow; -1 will be returned - va_end(va); - return ret; -} -#else -# include -# include -#endif // __MINGW32__ - -/// winreg.h fixes -#ifndef LSTATUS -# define LSTATUS LONG -#endif -#ifdef RegSetKeyValueW -# undefine RegSetKeyValueW -#endif -#define RegSetKeyValueW regset - -static LSTATUS regset(HKEY hkey, LPCWSTR subkey, LPCWSTR name, DWORD type, const void *data, DWORD len) { - - HKEY htkey = hkey, hsubkey = nullptr; - LSTATUS ret; - if (subkey && subkey[0]) { - if ((ret = RegCreateKeyExW(hkey, subkey, 0, 0, 0, KEY_ALL_ACCESS, 0, &hsubkey, 0)) != - ERROR_SUCCESS) - return ret; - htkey = hsubkey; - } - ret = RegSetValueExW(htkey, name, 0, type, static_cast(data), len); - if (hsubkey && hsubkey != hkey) - RegCloseKey(hsubkey); - return ret; - -} - -static void Discord_RegisterW(const wchar_t *applicationId, const wchar_t *command) { - - // https://msdn.microsoft.com/en-us/library/aa767914(v=vs.85).aspx - // we want to register games so we can run them as discord-:// - // Update the HKEY_CURRENT_USER, because it doesn't seem to require special permissions. - - wchar_t exeFilePath[MAX_PATH]{}; - DWORD exeLen = GetModuleFileNameW(nullptr, exeFilePath, MAX_PATH); - wchar_t openCommand[1024]{}; - - if (command && command[0]) { - StringCbPrintfW(openCommand, sizeof(openCommand), L"%s", command); - } - else { - // StringCbCopyW(openCommand, sizeof(openCommand), exeFilePath); - StringCbPrintfW(openCommand, sizeof(openCommand), L"%s", exeFilePath); - } - - wchar_t protocolName[64]{}; - StringCbPrintfW(protocolName, sizeof(protocolName), L"discord-%s", applicationId); - wchar_t protocolDescription[128]{}; - StringCbPrintfW(protocolDescription, sizeof(protocolDescription), L"URL:Run game %s protocol", applicationId); - wchar_t urlProtocol = 0; - - wchar_t keyName[256]{}; - StringCbPrintfW(keyName, sizeof(keyName), L"Software\\Classes\\%s", protocolName); - HKEY key; - auto status = RegCreateKeyExW(HKEY_CURRENT_USER, keyName, 0, nullptr, 0, KEY_WRITE, nullptr, &key, nullptr); - if (status != ERROR_SUCCESS) { - fprintf(stderr, "Error creating key\n"); - return; - } - DWORD len; - LSTATUS result; - len = static_cast(lstrlenW(protocolDescription) + 1); - result = RegSetKeyValueW(key, nullptr, nullptr, REG_SZ, protocolDescription, len * sizeof(wchar_t)); - if (FAILED(result)) { - fprintf(stderr, "Error writing description\n"); - } - - len = static_cast(lstrlenW(protocolDescription) + 1); - result = RegSetKeyValueW(key, nullptr, L"URL Protocol", REG_SZ, &urlProtocol, sizeof(wchar_t)); - if (FAILED(result)) { - fprintf(stderr, "Error writing description\n"); - } - - result = RegSetKeyValueW(key, L"DefaultIcon", nullptr, REG_SZ, exeFilePath, (exeLen + 1) * sizeof(wchar_t)); - if (FAILED(result)) { - fprintf(stderr, "Error writing icon\n"); - } - - len = static_cast(lstrlenW(openCommand) + 1); - result = RegSetKeyValueW(key, L"shell\\open\\command", nullptr, REG_SZ, openCommand, len * sizeof(wchar_t)); - if (FAILED(result)) { - fprintf(stderr, "Error writing command\n"); - } - RegCloseKey(key); - -} - -extern "C" void Discord_Register(const char *applicationId, const char *command) { - - wchar_t appId[32]{}; - MultiByteToWideChar(CP_UTF8, 0, applicationId, -1, appId, 32); - - wchar_t openCommand[1024]{}; - const wchar_t *wcommand = nullptr; - if (command && command[0]) { - const auto commandBufferLen = sizeof(openCommand) / sizeof(*openCommand); - MultiByteToWideChar(CP_UTF8, 0, command, -1, openCommand, commandBufferLen); - wcommand = openCommand; - } - - Discord_RegisterW(appId, wcommand); - -} diff --git a/3rdparty/discord-rpc/discord_rpc.cpp b/3rdparty/discord-rpc/discord_rpc.cpp deleted file mode 100644 index 84153be42..000000000 --- a/3rdparty/discord-rpc/discord_rpc.cpp +++ /dev/null @@ -1,510 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#include -#include -#include -#include -#include - -#include "discord_rpc.h" -#include "discord_backoff.h" -#include "discord_register.h" -#include "discord_msg_queue.h" -#include "discord_rpc_connection.h" -#include "discord_serialization.h" - -using namespace discord_rpc; - -static void Discord_UpdateConnection(); - -namespace { - -constexpr size_t MaxMessageSize{ 16 * 1024 }; -constexpr size_t MessageQueueSize{ 8 }; -constexpr size_t JoinQueueSize{ 8 }; - -struct QueuedMessage { - size_t length; - char buffer[MaxMessageSize]; - - void Copy(const QueuedMessage &other) { - length = other.length; - if (length) { - memcpy(buffer, other.buffer, length); - } - } -}; - -struct User { - // snowflake (64bit int), turned into a ascii decimal string, at most 20 chars +1 null - // terminator = 21 - char userId[32]; - // 32 unicode glyphs is max name size => 4 bytes per glyph in the worst case, +1 for null - // terminator = 129 - char username[344]; - // 4 decimal digits + 1 null terminator = 5 - char discriminator[8]; - // optional 'a_' + md5 hex digest (32 bytes) + null terminator = 35 - char avatar[128]; - // Rounded way up because I'm paranoid about games breaking from future changes in these sizes -}; - -static RpcConnection *Connection{ nullptr }; -static DiscordEventHandlers QueuedHandlers{}; -static DiscordEventHandlers Handlers{}; -static std::atomic_bool WasJustConnected{ false }; -static std::atomic_bool WasJustDisconnected{ false }; -static std::atomic_bool GotErrorMessage{ false }; -static std::atomic_bool WasJoinGame{ false }; -static std::atomic_bool WasSpectateGame{ false }; -static std::atomic_bool UpdatePresence{ false }; -static char JoinGameSecret[256]; -static char SpectateGameSecret[256]; -static int LastErrorCode{ 0 }; -static char LastErrorMessage[256]; -static int LastDisconnectErrorCode{ 0 }; -static char LastDisconnectErrorMessage[256]; -static std::mutex PresenceMutex; -static std::mutex HandlerMutex; -static QueuedMessage QueuedPresence{}; -static MsgQueue SendQueue; -static MsgQueue JoinAskQueue; -static User connectedUser; - -// We want to auto connect, and retry on failure, but not as fast as possible. This does expoential backoff from 0.5 seconds to 1 minute -static Backoff ReconnectTimeMs(500, 60 * 1000); -static auto NextConnect = std::chrono::system_clock::now(); -static int Pid{ 0 }; -static int Nonce{ 1 }; - -class IoThreadHolder { - private: - std::atomic_bool keepRunning{ true }; - std::mutex waitForIOMutex; - std::condition_variable waitForIOActivity; - std::thread ioThread; - - public: - void Start() { - keepRunning.store(true); - ioThread = std::thread([&]() { - const std::chrono::duration maxWait { 500LL }; - Discord_UpdateConnection(); - while (keepRunning.load()) { - std::unique_lock lock(waitForIOMutex); - waitForIOActivity.wait_for(lock, maxWait); - Discord_UpdateConnection(); - } - }); - } - - void Notify() { waitForIOActivity.notify_all(); } - - void Stop() { - keepRunning.exchange(false); - Notify(); - if (ioThread.joinable()) { - ioThread.join(); - } - } - - ~IoThreadHolder() { Stop(); } -}; - -static IoThreadHolder *IoThread{ nullptr }; - -static void UpdateReconnectTime() { - - NextConnect = std::chrono::system_clock::now() + std::chrono::duration { ReconnectTimeMs.nextDelay() }; - -} - -static void SignalIOActivity() { - - if (IoThread != nullptr) { - IoThread->Notify(); - } - -} - -static bool RegisterForEvent(const char *evtName) { - - auto qmessage = SendQueue.GetNextAddMessage(); - if (qmessage) { - qmessage->length = JsonWriteSubscribeCommand(qmessage->buffer, sizeof(qmessage->buffer), Nonce++, evtName); - SendQueue.CommitAdd(); - SignalIOActivity(); - return true; - } - - return false; - -} - -static bool DeregisterForEvent(const char *evtName) { - - auto qmessage = SendQueue.GetNextAddMessage(); - if (qmessage) { - qmessage->length = JsonWriteUnsubscribeCommand(qmessage->buffer, sizeof(qmessage->buffer), Nonce++, evtName); - SendQueue.CommitAdd(); - SignalIOActivity(); - return true; - } - - return false; - -} - -} // namespace - -static void Discord_UpdateConnection() { - - if (!Connection) { - return; - } - - if (!Connection->IsOpen()) { - if (std::chrono::system_clock::now() >= NextConnect) { - UpdateReconnectTime(); - Connection->Open(); - } - } - else { - // reads - - for (;;) { - JsonDocument message; - - if (!Connection->Read(message)) { - break; - } - - const char *evtName = GetStrMember(&message, "evt"); - const char *nonce = GetStrMember(&message, "nonce"); - - if (nonce) { - // in responses only -- should use to match up response when needed. - - if (evtName && strcmp(evtName, "ERROR") == 0) { - auto data = GetObjMember(&message, "data"); - LastErrorCode = GetIntMember(data, "code"); - StringCopy(LastErrorMessage, GetStrMember(data, "message", "")); - GotErrorMessage.store(true); - } - } - else { - // should have evt == name of event, optional data - if (evtName == nullptr) { - continue; - } - - auto data = GetObjMember(&message, "data"); - - if (strcmp(evtName, "ACTIVITY_JOIN") == 0) { - auto secret = GetStrMember(data, "secret"); - if (secret) { - StringCopy(JoinGameSecret, secret); - WasJoinGame.store(true); - } - } - else if (strcmp(evtName, "ACTIVITY_SPECTATE") == 0) { - auto secret = GetStrMember(data, "secret"); - if (secret) { - StringCopy(SpectateGameSecret, secret); - WasSpectateGame.store(true); - } - } - else if (strcmp(evtName, "ACTIVITY_JOIN_REQUEST") == 0) { - auto user = GetObjMember(data, "user"); - auto userId = GetStrMember(user, "id"); - auto username = GetStrMember(user, "username"); - auto avatar = GetStrMember(user, "avatar"); - auto joinReq = JoinAskQueue.GetNextAddMessage(); - if (userId && username && joinReq) { - StringCopy(joinReq->userId, userId); - StringCopy(joinReq->username, username); - auto discriminator = GetStrMember(user, "discriminator"); - if (discriminator) { - StringCopy(joinReq->discriminator, discriminator); - } - if (avatar) { - StringCopy(joinReq->avatar, avatar); - } - else { - joinReq->avatar[0] = 0; - } - JoinAskQueue.CommitAdd(); - } - } - } - } - - // writes - if (UpdatePresence.exchange(false) && QueuedPresence.length) { - QueuedMessage local; - { - std::lock_guard guard(PresenceMutex); - local.Copy(QueuedPresence); - } - if (!Connection->Write(local.buffer, local.length)) { - // if we fail to send, requeue - std::lock_guard guard(PresenceMutex); - QueuedPresence.Copy(local); - UpdatePresence.exchange(true); - } - } - - while (SendQueue.HavePendingSends()) { - auto qmessage = SendQueue.GetNextSendMessage(); - Connection->Write(qmessage->buffer, qmessage->length); - SendQueue.CommitSend(); - } - } - -} - -extern "C" void Discord_Initialize(const char *applicationId, DiscordEventHandlers *handlers, const int autoRegister) { - - IoThread = new (std::nothrow) IoThreadHolder(); - if (IoThread == nullptr) { - return; - } - - if (autoRegister) { - Discord_Register(applicationId, nullptr); - } - - Pid = GetProcessId(); - - { - std::lock_guard guard(HandlerMutex); - - if (handlers) { - QueuedHandlers = *handlers; - } - else { - QueuedHandlers = {}; - } - - Handlers = {}; - } - - if (Connection) { - return; - } - - Connection = RpcConnection::Create(applicationId); - Connection->onConnect = [](JsonDocument &readyMessage) { - Discord_UpdateHandlers(&QueuedHandlers); - if (QueuedPresence.length > 0) { - UpdatePresence.exchange(true); - SignalIOActivity(); - } - auto data = GetObjMember(&readyMessage, "data"); - auto user = GetObjMember(data, "user"); - auto userId = GetStrMember(user, "id"); - auto username = GetStrMember(user, "username"); - auto avatar = GetStrMember(user, "avatar"); - if (userId && username) { - StringCopy(connectedUser.userId, userId); - StringCopy(connectedUser.username, username); - auto discriminator = GetStrMember(user, "discriminator"); - if (discriminator) { - StringCopy(connectedUser.discriminator, discriminator); - } - if (avatar) { - StringCopy(connectedUser.avatar, avatar); - } - else { - connectedUser.avatar[0] = 0; - } - } - WasJustConnected.exchange(true); - ReconnectTimeMs.reset(); - }; - Connection->onDisconnect = [](int err, const char *message) { - LastDisconnectErrorCode = err; - StringCopy(LastDisconnectErrorMessage, message); - WasJustDisconnected.exchange(true); - UpdateReconnectTime(); - }; - - IoThread->Start(); - -} - -extern "C" void Discord_Shutdown() { - - if (!Connection) { - return; - } - Connection->onConnect = nullptr; - Connection->onDisconnect = nullptr; - Handlers = {}; - QueuedPresence.length = 0; - UpdatePresence.exchange(false); - if (IoThread != nullptr) { - IoThread->Stop(); - delete IoThread; - IoThread = nullptr; - } - - RpcConnection::Destroy(Connection); - -} - -extern "C" void Discord_UpdatePresence(const DiscordRichPresence *presence) { - - { - std::lock_guard guard(PresenceMutex); - QueuedPresence.length = JsonWriteRichPresenceObj(QueuedPresence.buffer, sizeof(QueuedPresence.buffer), Nonce++, Pid, presence); - UpdatePresence.exchange(true); - } - - SignalIOActivity(); - -} - -extern "C" void Discord_ClearPresence(void) { - Discord_UpdatePresence(nullptr); -} - -extern "C" void Discord_Respond(const char *userId, /* DISCORD_REPLY_ */ int reply) { - - // if we are not connected, let's not batch up stale messages for later - if (!Connection || !Connection->IsOpen()) { - return; - } - auto qmessage = SendQueue.GetNextAddMessage(); - if (qmessage) { - qmessage->length = JsonWriteJoinReply(qmessage->buffer, sizeof(qmessage->buffer), userId, reply, Nonce++); - SendQueue.CommitAdd(); - SignalIOActivity(); - } - -} - -extern "C" void Discord_RunCallbacks() { - - // Note on some weirdness: internally we might connect, get other signals, disconnect any number - // of times inbetween calls here. Externally, we want the sequence to seem sane, so any other - // signals are book-ended by calls to ready and disconnect. - - if (!Connection) { - return; - } - - const bool wasDisconnected = WasJustDisconnected.exchange(false); - const bool isConnected = Connection->IsOpen(); - - if (isConnected) { - // if we are connected, disconnect cb first - std::lock_guard guard(HandlerMutex); - if (wasDisconnected && Handlers.disconnected) { - Handlers.disconnected(LastDisconnectErrorCode, LastDisconnectErrorMessage); - } - } - - if (WasJustConnected.exchange(false)) { - std::lock_guard guard(HandlerMutex); - if (Handlers.ready) { - DiscordUser du{ connectedUser.userId, connectedUser.username, connectedUser.discriminator, connectedUser.avatar }; - Handlers.ready(&du); - } - } - - if (GotErrorMessage.exchange(false)) { - std::lock_guard guard(HandlerMutex); - if (Handlers.errored) { - Handlers.errored(LastErrorCode, LastErrorMessage); - } - } - - if (WasJoinGame.exchange(false)) { - std::lock_guard guard(HandlerMutex); - if (Handlers.joinGame) { - Handlers.joinGame(JoinGameSecret); - } - } - - if (WasSpectateGame.exchange(false)) { - std::lock_guard guard(HandlerMutex); - if (Handlers.spectateGame) { - Handlers.spectateGame(SpectateGameSecret); - } - } - - // Right now this batches up any requests and sends them all in a burst; I could imagine a world - // where the implementer would rather sequentially accept/reject each one before the next invite - // is sent. I left it this way because I could also imagine wanting to process these all and - // maybe show them in one common dialog and/or start fetching the avatars in parallel, and if - // not it should be trivial for the implementer to make a queue themselves. - while (JoinAskQueue.HavePendingSends()) { - const auto req = JoinAskQueue.GetNextSendMessage(); - { - std::lock_guard guard(HandlerMutex); - if (Handlers.joinRequest) { - DiscordUser du{ req->userId, req->username, req->discriminator, req->avatar }; - Handlers.joinRequest(&du); - } - } - JoinAskQueue.CommitSend(); - } - - if (!isConnected) { - // if we are not connected, disconnect message last - std::lock_guard guard(HandlerMutex); - if (wasDisconnected && Handlers.disconnected) { - Handlers.disconnected(LastDisconnectErrorCode, LastDisconnectErrorMessage); - } - } - -} - -extern "C" void Discord_UpdateHandlers(DiscordEventHandlers *newHandlers) { - - if (newHandlers) { -#define HANDLE_EVENT_REGISTRATION(handler_name, event) \ - if (!Handlers.handler_name && newHandlers->handler_name) { \ - RegisterForEvent(event); \ - } \ - else if (Handlers.handler_name && !newHandlers->handler_name) { \ - DeregisterForEvent(event); \ - } - - std::lock_guard guard(HandlerMutex); - HANDLE_EVENT_REGISTRATION(joinGame, "ACTIVITY_JOIN") - HANDLE_EVENT_REGISTRATION(spectateGame, "ACTIVITY_SPECTATE") - HANDLE_EVENT_REGISTRATION(joinRequest, "ACTIVITY_JOIN_REQUEST") - -#undef HANDLE_EVENT_REGISTRATION - - Handlers = *newHandlers; - } - else { - std::lock_guard guard(HandlerMutex); - Handlers = {}; - } - -} diff --git a/3rdparty/discord-rpc/discord_rpc.h b/3rdparty/discord-rpc/discord_rpc.h deleted file mode 100644 index d6b6dd3ce..000000000 --- a/3rdparty/discord-rpc/discord_rpc.h +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#ifndef DISCORD_RPC_H -#define DISCORD_RPC_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct DiscordRichPresence { - int type; - int status_display_type; - const char *name; /* max 128 bytes */ - const char *state; /* max 128 bytes */ - const char *details; /* max 128 bytes */ - int64_t startTimestamp; - int64_t endTimestamp; - const char *largeImageKey; /* max 32 bytes */ - const char *largeImageText; /* max 128 bytes */ - const char *smallImageKey; /* max 32 bytes */ - const char *smallImageText; /* max 128 bytes */ - const char *partyId; /* max 128 bytes */ - int partySize; - int partyMax; - int partyPrivacy; - const char *matchSecret; /* max 128 bytes */ - const char *joinSecret; /* max 128 bytes */ - const char *spectateSecret; /* max 128 bytes */ - int8_t instance; -} DiscordRichPresence; - -typedef struct DiscordUser { - const char *userId; - const char *username; - const char *discriminator; - const char *avatar; -} DiscordUser; - -typedef struct DiscordEventHandlers { - void (*ready)(const DiscordUser *request); - void (*disconnected)(int errorCode, const char *message); - void (*errored)(int errorCode, const char *message); - void (*joinGame)(const char *joinSecret); - void (*spectateGame)(const char *spectateSecret); - void (*joinRequest)(const DiscordUser *request); -} DiscordEventHandlers; - -#define DISCORD_REPLY_NO 0 -#define DISCORD_REPLY_YES 1 -#define DISCORD_REPLY_IGNORE 2 -#define DISCORD_PARTY_PRIVATE 0 -#define DISCORD_PARTY_PUBLIC 1 - -void Discord_Initialize(const char *applicationId, DiscordEventHandlers *handlers, const int autoRegister); -void Discord_Shutdown(void); - -// checks for incoming messages, dispatches callbacks -void Discord_RunCallbacks(void); - -void Discord_UpdatePresence(const DiscordRichPresence *presence); -void Discord_ClearPresence(void); - -void Discord_Respond(const char *userid, /* DISCORD_REPLY_ */ int reply); - -void Discord_UpdateHandlers(DiscordEventHandlers *handlers); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif // DISCORD_RPC_H diff --git a/3rdparty/discord-rpc/discord_rpc_connection.cpp b/3rdparty/discord-rpc/discord_rpc_connection.cpp deleted file mode 100644 index 94dc1c49f..000000000 --- a/3rdparty/discord-rpc/discord_rpc_connection.cpp +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#include "discord_rpc_connection.h" -#include "discord_serialization.h" - -namespace discord_rpc { - -static const int RpcVersion = 1; -static RpcConnection Instance; - -RpcConnection *RpcConnection::Create(const char *applicationId) { - - Instance.connection = BaseConnection::Create(); - StringCopy(Instance.appId, applicationId); - return &Instance; - -} - -void RpcConnection::Destroy(RpcConnection *&c) { - - c->Close(); - BaseConnection::Destroy(c->connection); - c = nullptr; - -} - -void RpcConnection::Open() { - - if (state == State::Connected) { - return; - } - - if (state == State::Disconnected && !connection->Open()) { - return; - } - - if (state == State::SentHandshake) { - JsonDocument message; - if (Read(message)) { - auto cmd = GetStrMember(&message, "cmd"); - auto evt = GetStrMember(&message, "evt"); - if (cmd && evt && !strcmp(cmd, "DISPATCH") && !strcmp(evt, "READY")) { - state = State::Connected; - if (onConnect) { - onConnect(message); - } - } - } - } - else { - sendFrame.opcode = Opcode::Handshake; - sendFrame.length = static_cast(JsonWriteHandshakeObj(sendFrame.message, sizeof(sendFrame.message), RpcVersion, appId)); - - if (connection->Write(&sendFrame, sizeof(MessageFrameHeader) + sendFrame.length)) { - state = State::SentHandshake; - } - else { - Close(); - } - } - -} - -void RpcConnection::Close() { - - if (onDisconnect && (state == State::Connected || state == State::SentHandshake)) { - onDisconnect(lastErrorCode, lastErrorMessage); - } - connection->Close(); - state = State::Disconnected; - -} - -bool RpcConnection::Write(const void *data, size_t length) { - - sendFrame.opcode = Opcode::Frame; - memcpy(sendFrame.message, data, length); - sendFrame.length = static_cast(length); - if (!connection->Write(&sendFrame, sizeof(MessageFrameHeader) + length)) { - Close(); - return false; - } - - return true; - -} - -bool RpcConnection::Read(JsonDocument &message) { - - if (state != State::Connected && state != State::SentHandshake) { - return false; - } - MessageFrame readFrame{}; - for (;;) { - bool didRead = connection->Read(&readFrame, sizeof(MessageFrameHeader)); - if (!didRead) { - if (!connection->isOpen) { - lastErrorCode = static_cast(ErrorCode::PipeClosed); - StringCopy(lastErrorMessage, "Pipe closed"); - Close(); - } - return false; - } - - if (readFrame.length > 0) { - didRead = connection->Read(readFrame.message, readFrame.length); - if (!didRead) { - lastErrorCode = static_cast(ErrorCode::ReadCorrupt); - StringCopy(lastErrorMessage, "Partial data in frame"); - Close(); - return false; - } - readFrame.message[readFrame.length] = 0; - } - - switch (readFrame.opcode) { - case Opcode::Close: { - message.ParseInsitu(readFrame.message); - lastErrorCode = GetIntMember(&message, "code"); - StringCopy(lastErrorMessage, GetStrMember(&message, "message", "")); - Close(); - return false; - } - case Opcode::Frame: - message.ParseInsitu(readFrame.message); - return true; - case Opcode::Ping: - readFrame.opcode = Opcode::Pong; - if (!connection->Write(&readFrame, sizeof(MessageFrameHeader) + readFrame.length)) { - Close(); - } - break; - case Opcode::Pong: - break; - case Opcode::Handshake: - default: - // something bad happened - lastErrorCode = static_cast(ErrorCode::ReadCorrupt); - StringCopy(lastErrorMessage, "Bad ipc frame"); - Close(); - return false; - } - } - -} - -} // namespace discord_rpc diff --git a/3rdparty/discord-rpc/discord_rpc_connection.h b/3rdparty/discord-rpc/discord_rpc_connection.h deleted file mode 100644 index e5cbe9da2..000000000 --- a/3rdparty/discord-rpc/discord_rpc_connection.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#ifndef DISCORD_RPC_CONNECTION_H -#define DISCORD_RPC_CONNECTION_H - -#include "discord_connection.h" -#include "discord_serialization.h" - -namespace discord_rpc { - -// I took this from the buffer size libuv uses for named pipes; I suspect ours would usually be much smaller. -constexpr size_t MaxRpcFrameSize = 64 * 1024; - -struct RpcConnection { - enum class ErrorCode : int { - Success = 0, - PipeClosed = 1, - ReadCorrupt = 2, - }; - - enum class Opcode : uint32_t { - Handshake = 0, - Frame = 1, - Close = 2, - Ping = 3, - Pong = 4, - }; - - struct MessageFrameHeader { - Opcode opcode; - uint32_t length; - }; - - struct MessageFrame : public MessageFrameHeader { - char message[MaxRpcFrameSize - sizeof(MessageFrameHeader)]; - }; - - enum class State : uint32_t { - Disconnected, - SentHandshake, - AwaitingResponse, - Connected, - }; - - BaseConnection *connection{ nullptr }; - State state{ State::Disconnected }; - void (*onConnect)(JsonDocument &message) { nullptr }; - void (*onDisconnect)(int errorCode, const char *message) { nullptr }; - char appId[64]{}; - int lastErrorCode{ 0 }; - char lastErrorMessage[256]{}; - RpcConnection::MessageFrame sendFrame; - - static RpcConnection *Create(const char *applicationId); - static void Destroy(RpcConnection*&); - - inline bool IsOpen() const { return state == State::Connected; } - - void Open(); - void Close(); - bool Write(const void *data, size_t length); - bool Read(JsonDocument &message); -}; - -} // namespace discord_rpc - -#endif // DISCORD_RPC_CONNECTION_H diff --git a/3rdparty/discord-rpc/discord_serialization.cpp b/3rdparty/discord-rpc/discord_serialization.cpp deleted file mode 100644 index ad763b908..000000000 --- a/3rdparty/discord-rpc/discord_serialization.cpp +++ /dev/null @@ -1,285 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#include "discord_serialization.h" -#include "discord_connection.h" -#include "discord_rpc.h" - -namespace discord_rpc { - -template -void NumberToString(char *dest, T number) { - - if (!number) { - *dest++ = '0'; - *dest++ = 0; - return; - } - if (number < 0) { - *dest++ = '-'; - number = -number; - } - char temp[32]; - int place = 0; - while (number) { - auto digit = number % 10; - number = number / 10; - temp[place++] = '0' + static_cast(digit); - } - for (--place; place >= 0; --place) { - *dest++ = temp[place]; - } - *dest = 0; - -} - -// it's ever so slightly faster to not have to strlen the key -template -void WriteKey(JsonWriter &w, T &k) { - w.Key(k, sizeof(T) - 1); -} - -struct WriteObject { - JsonWriter &writer; - WriteObject(JsonWriter &w) - : writer(w) { - writer.StartObject(); - } - template - WriteObject(JsonWriter &w, T &name) - : writer(w) { - WriteKey(writer, name); - writer.StartObject(); - } - ~WriteObject() { writer.EndObject(); } -}; - -struct WriteArray { - JsonWriter &writer; - template - WriteArray(JsonWriter &w, T &name) - : writer(w) { - WriteKey(writer, name); - writer.StartArray(); - } - ~WriteArray() { writer.EndArray(); } -}; - -template -void WriteOptionalString(JsonWriter &w, T &k, const char *value) { - - if (value && value[0]) { - w.Key(k, sizeof(T) - 1); - w.String(value); - } - -} - -static void JsonWriteNonce(JsonWriter &writer, const int nonce) { - - WriteKey(writer, "nonce"); - char nonceBuffer[32]; - NumberToString(nonceBuffer, nonce); - writer.String(nonceBuffer); - -} - -size_t JsonWriteRichPresenceObj(char *dest, const size_t maxLen, const int nonce, const int pid, const DiscordRichPresence *presence) { - - JsonWriter writer(dest, maxLen); - - { - WriteObject top(writer); - - JsonWriteNonce(writer, nonce); - - WriteKey(writer, "cmd"); - writer.String("SET_ACTIVITY"); - - { - WriteObject args(writer, "args"); - - WriteKey(writer, "pid"); - writer.Int(pid); - - if (presence != nullptr) { - WriteObject activity(writer, "activity"); - - if (presence->type >= 0 && presence->type <= 5) { - WriteKey(writer, "type"); - writer.Int(presence->type); - - WriteKey(writer, "status_display_type"); - writer.Int(presence->status_display_type); - } - - WriteOptionalString(writer, "name", presence->name); - WriteOptionalString(writer, "state", presence->state); - WriteOptionalString(writer, "details", presence->details); - - if (presence->startTimestamp || presence->endTimestamp) { - WriteObject timestamps(writer, "timestamps"); - - if (presence->startTimestamp) { - WriteKey(writer, "start"); - writer.Int64(presence->startTimestamp); - } - - if (presence->endTimestamp) { - WriteKey(writer, "end"); - writer.Int64(presence->endTimestamp); - } - } - - if ((presence->largeImageKey && presence->largeImageKey[0]) || - (presence->largeImageText && presence->largeImageText[0]) || - (presence->smallImageKey && presence->smallImageKey[0]) || - (presence->smallImageText && presence->smallImageText[0])) { - WriteObject assets(writer, "assets"); - WriteOptionalString(writer, "large_image", presence->largeImageKey); - WriteOptionalString(writer, "large_text", presence->largeImageText); - WriteOptionalString(writer, "small_image", presence->smallImageKey); - WriteOptionalString(writer, "small_text", presence->smallImageText); - } - - if ((presence->partyId && presence->partyId[0]) || presence->partySize || - presence->partyMax || presence->partyPrivacy) { - WriteObject party(writer, "party"); - WriteOptionalString(writer, "id", presence->partyId); - if (presence->partySize && presence->partyMax) { - WriteArray size(writer, "size"); - writer.Int(presence->partySize); - writer.Int(presence->partyMax); - } - - if (presence->partyPrivacy) { - WriteKey(writer, "privacy"); - writer.Int(presence->partyPrivacy); - } - } - - if ((presence->matchSecret && presence->matchSecret[0]) || - (presence->joinSecret && presence->joinSecret[0]) || - (presence->spectateSecret && presence->spectateSecret[0])) { - WriteObject secrets(writer, "secrets"); - WriteOptionalString(writer, "match", presence->matchSecret); - WriteOptionalString(writer, "join", presence->joinSecret); - WriteOptionalString(writer, "spectate", presence->spectateSecret); - } - - writer.Key("instance"); - writer.Bool(presence->instance != 0); - } - } - } - - return writer.Size(); -} - -size_t JsonWriteHandshakeObj(char *dest, size_t maxLen, int version, const char *applicationId) { - - JsonWriter writer(dest, maxLen); - - { - WriteObject obj(writer); - WriteKey(writer, "v"); - writer.Int(version); - WriteKey(writer, "client_id"); - writer.String(applicationId); - } - - return writer.Size(); - -} - -size_t JsonWriteSubscribeCommand(char *dest, size_t maxLen, int nonce, const char *evtName) { - - JsonWriter writer(dest, maxLen); - - { - WriteObject obj(writer); - - JsonWriteNonce(writer, nonce); - - WriteKey(writer, "cmd"); - writer.String("SUBSCRIBE"); - - WriteKey(writer, "evt"); - writer.String(evtName); - } - - return writer.Size(); - -} - -size_t JsonWriteUnsubscribeCommand(char *dest, size_t maxLen, int nonce, const char *evtName) { - - JsonWriter writer(dest, maxLen); - - { - WriteObject obj(writer); - - JsonWriteNonce(writer, nonce); - - WriteKey(writer, "cmd"); - writer.String("UNSUBSCRIBE"); - - WriteKey(writer, "evt"); - writer.String(evtName); - } - - return writer.Size(); - -} - -size_t JsonWriteJoinReply(char *dest, size_t maxLen, const char *userId, const int reply, const int nonce) { - - JsonWriter writer(dest, maxLen); - - { - WriteObject obj(writer); - - WriteKey(writer, "cmd"); - if (reply == DISCORD_REPLY_YES) { - writer.String("SEND_ACTIVITY_JOIN_INVITE"); - } - else { - writer.String("CLOSE_ACTIVITY_JOIN_REQUEST"); - } - - WriteKey(writer, "args"); - { - WriteObject args(writer); - - WriteKey(writer, "user_id"); - writer.String(userId); - } - - JsonWriteNonce(writer, nonce); - } - - return writer.Size(); - -} - -} // namespace discord_rpc diff --git a/3rdparty/discord-rpc/discord_serialization.h b/3rdparty/discord-rpc/discord_serialization.h deleted file mode 100644 index 2f68a6b77..000000000 --- a/3rdparty/discord-rpc/discord_serialization.h +++ /dev/null @@ -1,213 +0,0 @@ -/* - * Copyright 2017 Discord, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#ifndef DISCORD_SERIALIZATION_H -#define DISCORD_SERIALIZATION_H - -#include -#include -#include - -struct DiscordRichPresence; - -namespace discord_rpc { - -// if only there was a standard library function for this -template -inline size_t StringCopy(char (&dest)[Len], const char *src) { - if (!src || !Len) { - return 0; - } - size_t copied; - char *out = dest; - for (copied = 1; *src && copied < Len; ++copied) { - *out++ = *src++; - } - *out = 0; - return copied - 1; -} - -size_t JsonWriteHandshakeObj(char *dest, size_t maxLen, int version, const char *applicationId); - -// Commands -size_t JsonWriteRichPresenceObj(char *dest, const size_t maxLen, const int nonce, const int pid, const DiscordRichPresence *presence); -size_t JsonWriteSubscribeCommand(char *dest, size_t maxLen, int nonce, const char *evtName); - -size_t JsonWriteUnsubscribeCommand(char *dest, size_t maxLen, int nonce, const char *evtName); - -size_t JsonWriteJoinReply(char *dest, size_t maxLen, const char *userId, int reply, int nonce); - -// I want to use as few allocations as I can get away with, and to do that with RapidJson, you need -// to supply some of your own allocators for stuff rather than use the defaults - -class LinearAllocator { - public: - char *buffer_; - char *end_; - LinearAllocator() { - assert(0); // needed for some default case in rapidjson, should not use - } - LinearAllocator(char *buffer, size_t size) - : buffer_(buffer), end_(buffer + size) { - } - static const bool kNeedFree = false; - void *Malloc(size_t size) { - char *res = buffer_; - buffer_ += size; - if (buffer_ > end_) { - buffer_ = res; - return nullptr; - } - return res; - } - void *Realloc(void *originalPtr, size_t originalSize, size_t newSize) { - if (newSize == 0) { - return nullptr; - } - // allocate how much you need in the first place - assert(!originalPtr && !originalSize); - // unused parameter warning - (void)(originalPtr); - (void)(originalSize); - return Malloc(newSize); - } - static void Free(void *ptr) { - /* shrug */ - (void)ptr; - } -}; - -template -class FixedLinearAllocator : public LinearAllocator { - public: - char fixedBuffer_[Size]; - FixedLinearAllocator() - : LinearAllocator(fixedBuffer_, Size) { - } - static const bool kNeedFree = false; -}; - -// wonder why this isn't a thing already, maybe I missed it -class DirectStringBuffer { - public: - using Ch = char; - char *buffer_; - char *end_; - char *current_; - - DirectStringBuffer(char *buffer, size_t maxLen) - : buffer_(buffer), end_(buffer + maxLen), current_(buffer) { - } - - void Put(char c) { - if (current_ < end_) { - *current_++ = c; - } - } - void Flush() {} - size_t GetSize() const { return static_cast(current_ - buffer_); } -}; - -using MallocAllocator = rapidjson::CrtAllocator; -using PoolAllocator = rapidjson::MemoryPoolAllocator; -using UTF8 = rapidjson::UTF8; -// Writer appears to need about 16 bytes per nested object level (with 64bit size_t) -using StackAllocator = FixedLinearAllocator<2048>; -constexpr size_t WriterNestingLevels = 2048 / (2 * sizeof(size_t)); -using JsonWriterBase = - rapidjson::Writer; -class JsonWriter : public JsonWriterBase { - public: - DirectStringBuffer stringBuffer_; - StackAllocator stackAlloc_; - - JsonWriter(char *dest, size_t maxLen) - : JsonWriterBase(stringBuffer_, &stackAlloc_, WriterNestingLevels), stringBuffer_(dest, maxLen), stackAlloc_() { - } - - size_t Size() const { return stringBuffer_.GetSize(); } -}; - -using JsonDocumentBase = rapidjson::GenericDocument; -class JsonDocument : public JsonDocumentBase { - public: - static const int kDefaultChunkCapacity = 32 * 1024; - // json parser will use this buffer first, then allocate more if needed; I seriously doubt we - // send any messages that would use all of this, though. - char parseBuffer_[32 * 1024]; - MallocAllocator mallocAllocator_; - PoolAllocator poolAllocator_; - StackAllocator stackAllocator_; - JsonDocument() - : JsonDocumentBase(rapidjson::kObjectType, - &poolAllocator_, - sizeof(stackAllocator_.fixedBuffer_), - &stackAllocator_), - poolAllocator_(parseBuffer_, sizeof(parseBuffer_), kDefaultChunkCapacity, &mallocAllocator_), stackAllocator_() { - } -}; - -using JsonValue = rapidjson::GenericValue; - -inline JsonValue *GetObjMember(JsonValue *obj, const char *name) { - - if (obj) { - auto member = obj->FindMember(name); - if (member != obj->MemberEnd() && member->value.IsObject()) { - return &member->value; - } - } - - return nullptr; - -} - -inline int GetIntMember(JsonValue *obj, const char *name, int notFoundDefault = 0) { - - if (obj) { - auto member = obj->FindMember(name); - if (member != obj->MemberEnd() && member->value.IsInt()) { - return member->value.GetInt(); - } - } - - return notFoundDefault; - -} - -inline const char *GetStrMember(JsonValue *obj, const char *name, const char *notFoundDefault = nullptr) { - - if (obj) { - auto member = obj->FindMember(name); - if (member != obj->MemberEnd() && member->value.IsString()) { - return member->value.GetString(); - } - } - - return notFoundDefault; - -} - -} // namespace discord_rpc - -#endif // DISCORD_SERIALIZATION_H diff --git a/CMakeLists.txt b/CMakeLists.txt index 9db5a974a..629c2b33a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,7 +212,18 @@ find_package(GTest) pkg_check_modules(LIBSPARSEHASH IMPORTED_TARGET libsparsehash) -find_package(RapidJSON) +find_package(discord-rpc) +if(TARGET discord-rpc::discord-rpc) + set(DISCORD_RPC_FOUND ON) + set(DISCORD_RPC_LIBRARIES "discord-rpc::discord-rpc") +else() + find_library(DISCORD_RPC_LIBRARY discord-rpc) + find_path(DISCORD_RPC_INCLUDE_DIRS NAMES discord-rpc.h) + if(DISCORD_RPC_LIBRARY) + set(DISCORD_RPC_FOUND ON) + set(DISCORD_RPC_LIBRARIES ${DISCORD_RPC_LIBRARY}) + endif() +endif() set(QT_VERSION_MAJOR 6) set(QT_MIN_VERSION 6.4.0) @@ -378,7 +389,7 @@ optional_component(STREAMTAGREADER ON "Stream tagreader" ) optional_component(DISCORD_RPC ON "Discord Rich Presence" - DEPENDS "RapidJSON" RapidJSON_FOUND + DEPENDS "discord-rpc" DISCORD_RPC_FOUND ) if(HAVE_SONGFINGERPRINTING OR HAVE_MUSICBRAINZ) @@ -1503,11 +1514,6 @@ if(LINUX AND LSB_RELEASE_EXEC AND DPKG_BUILDPACKAGE) add_subdirectory(debian) endif() -if(HAVE_DISCORD_RPC) - add_subdirectory(3rdparty/discord-rpc) - target_include_directories(strawberry_lib PUBLIC 3rdparty/discord-rpc) -endif() - if(HAVE_TRANSLATIONS) qt_add_lupdate(strawberry_lib TS_FILES "${CMAKE_SOURCE_DIR}/src/translations/strawberry_en_US.ts" OPTIONS -locations none -no-ui-lines -no-obsolete) file(GLOB_RECURSE ts_files ${CMAKE_SOURCE_DIR}/src/translations/*.ts) @@ -1529,6 +1535,10 @@ if(SINGLEAPPLICATION_INCLUDE_DIRS) target_include_directories(strawberry_lib SYSTEM PUBLIC ${SINGLEAPPLICATION_INCLUDE_DIRS}) endif() +if(DISCORD_RPC_INCLUDE_DIRS) + target_include_directories(strawberry_lib SYSTEM PUBLIC ${DISCORD_RPC_INCLUDE_DIRS}) +endif() + target_link_libraries(strawberry_lib PUBLIC ${CMAKE_THREAD_LIBS_INIT} $<$:${Backtrace_LIBRARIES}> @@ -1568,7 +1578,7 @@ target_link_libraries(strawberry_lib PUBLIC $<$:dsound dwmapi ${GETOPT_LIBRARIES}> $<$:WindowsApp> KDAB::kdsingleapplication - $<$:discord-rpc> + $<$:${DISCORD_RPC_LIBRARIES}> ) if(APPLE) diff --git a/src/discord/richpresence.cpp b/src/discord/richpresence.cpp index 0aa7b5d01..474fd4f2b 100644 --- a/src/discord/richpresence.cpp +++ b/src/discord/richpresence.cpp @@ -75,7 +75,7 @@ void RichPresence::ReloadSettings() { s.endGroup(); if (enabled && !initialized_) { - Discord_Initialize(kDiscordApplicationId, nullptr, 0); + Discord_Initialize(kDiscordApplicationId, nullptr, 0, nullptr); initialized_ = true; } else if (!enabled && initialized_) { @@ -124,7 +124,6 @@ void RichPresence::SendPresenceUpdate() { // Listening to presence_data.type = 2; presence_data.status_display_type = status_display_type_; - presence_data.largeImageKey = kStrawberryIconResourceName; presence_data.smallImageKey = kStrawberryIconResourceName; presence_data.smallImageText = kStrawberryIconDescription;