yuzu/discord-rpc
1
0
Fork 0
mirror of https://github.com/yuzu-emu/discord-rpc.git synced 2024-12-23 06:15:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up sync version to new protocol

Browse source
This commit is contained in:
Chris Marsh 2017-07-10 15:25:47 -07:00
parent 2a31affb81
commit f41137e5cf
4 changed files with 45 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/connection.h
View file

@ -4,16 +4,24 @@
#include <stdint.h> #include <stdint.h>
enum class OPCODE : uint32_t {
HANDSHAKE = 0,
FRAME = 1,
CLOSE = 2,
};
struct RpcMessageFrame { struct RpcMessageFrame {
OPCODE opcode;
uint32_t length; uint32_t length;
char message[64 * 1024 - sizeof(uint32_t)]; char message[64 * 1024 - 8];
}; };
struct RpcConnection { struct RpcConnection {
void (*onConnect)() = nullptr; void (*onConnect)() = nullptr;
void (*onDisconnect)() = nullptr; void (*onDisconnect)() = nullptr;
char appId[64];
static RpcConnection* Create(); static RpcConnection* Create(const char* applicationId);
static void Destroy(RpcConnection*&); static void Destroy(RpcConnection*&);
void Open(); void Open();
void Close(); void Close();

21
src/connection_win_sync.cpp
View file

@ -8,16 +8,22 @@
#define NOIME #define NOIME
#include <windows.h> #include <windows.h>
#include "yolojson.h"
const int RpcVersion = 1;
struct WinRpcConnection : public RpcConnection { struct WinRpcConnection : public RpcConnection {
HANDLE pipe{INVALID_HANDLE_VALUE}; HANDLE pipe{INVALID_HANDLE_VALUE};
RpcMessageFrame frame; RpcMessageFrame frame;
}; };
static const wchar_t* PipeName = L"\\\\.\\pipe\\DiscordRpcServer"; static const wchar_t* PipeName = L"\\\\?\\pipe\\discord-ipc";
/*static*/ RpcConnection* RpcConnection::Create() /*static*/ RpcConnection* RpcConnection::Create(const char* applicationId)
{ {
return new WinRpcConnection; auto connection = new WinRpcConnection;
StringCopy(connection->appId, applicationId, sizeof(connection->appId));
return connection;
} }
/*static*/ void RpcConnection::Destroy(RpcConnection*& c) /*static*/ void RpcConnection::Destroy(RpcConnection*& c)
@ -49,6 +55,13 @@ void RpcConnection::Open()
return; return;
} }
} }
RpcMessageFrame* frame = GetNextFrame();
frame->opcode = OPCODE::HANDSHAKE;
char* msg = frame->message;
JsonWriteHandshakeObj(msg, RpcVersion, appId);
frame->length = msg - frame->message;
WriteFrame(frame);
} }
void RpcConnection::Close() void RpcConnection::Close()
@ -86,5 +99,5 @@ RpcMessageFrame* RpcConnection::GetNextFrame()
void RpcConnection::WriteFrame(RpcMessageFrame* frame) void RpcConnection::WriteFrame(RpcMessageFrame* frame)
{ {
auto self = reinterpret_cast<WinRpcConnection*>(this); auto self = reinterpret_cast<WinRpcConnection*>(this);
self->Write(frame, frame->length); self->Write(frame, 8 + frame->length);
} }

5
src/discord-rpc.cpp
View file

@ -11,7 +11,6 @@ static bool wasJustDisconnected = false;
extern "C" void Discord_Initialize(const char* applicationId, DiscordEventHandlers* handlers) extern "C" void Discord_Initialize(const char* applicationId, DiscordEventHandlers* handlers)
{ {
StringCopy(ApplicationId, applicationId, sizeof(ApplicationId));
if (handlers) { if (handlers) {
Handlers = *handlers; Handlers = *handlers;
} }
@ -19,7 +18,7 @@ extern "C" void Discord_Initialize(const char* applicationId, DiscordEventHandle
Handlers = {}; Handlers = {};
} }
MyConnection = RpcConnection::Create(); MyConnection = RpcConnection::Create(applicationId);
MyConnection->onConnect = []() { wasJustConnected = true; }; MyConnection->onConnect = []() { wasJustConnected = true; };
MyConnection->onDisconnect = []() { wasJustDisconnected = true; }; MyConnection->onDisconnect = []() { wasJustDisconnected = true; };
MyConnection->Open(); MyConnection->Open();
@ -37,7 +36,7 @@ extern "C" void Discord_UpdatePresence(const DiscordRichPresence* presence)
auto frame = MyConnection->GetNextFrame(); auto frame = MyConnection->GetNextFrame();
char* jsonWrite = frame->message; char* jsonWrite = frame->message;
JsonWriteRichPresenceObj(jsonWrite, presence); JsonWriteRichPresenceObj(jsonWrite, presence);
frame->length = sizeof(uint32_t) + (jsonWrite - frame->message); frame->length = jsonWrite - frame->message;
MyConnection->WriteFrame(frame); MyConnection->WriteFrame(frame);
} }

16
src/yolojson.h
View file

@ -1,5 +1,8 @@
#pragma once #pragma once
#include "connection.h"
#include "discord-rpc.h"
/* /*
This is as simple of a json writing thing as possible; does not try to keep you This is as simple of a json writing thing as possible; does not try to keep you
from overflowing buffer, so make sure you have room. from overflowing buffer, so make sure you have room.
@ -188,3 +191,16 @@ inline void JsonWriteRichPresenceObj(char*& dest, const DiscordRichPresence* pre
dest -= 1; dest -= 1;
*(dest - 1) = '}'; *(dest - 1) = '}';
} }
inline void JsonWriteHandshakeObj(char*& dest, int version, const char* applicationId)
{
*dest++ = '{';
JsonWriteNumberProp(dest, "v", version);
JsonWriteStringProp(dest, "client_id", applicationId);
dest -= 1;
*(dest - 1) = '}';
*dest = 0;
}