mirrors/discord-rpc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix up simple version to new protocol

Browse source
This commit is contained in:
Chris Marsh 2017-07-10 14:55:30 -07:00
parent 381edef1fa
commit 2a31affb81
1 changed files with 49 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/discord-rpc-simple.cpp
View file

@ -13,12 +13,21 @@
namespace { namespace {
struct RpcMessageFrame { const int RpcVersion = 1;
uint32_t length;
char message[64 * 1024 - sizeof(uint32_t)]; enum class OPCODE : uint32_t {
HANDSHAKE = 0,
FRAME = 1,
CLOSE = 2,
}; };
static const wchar_t* PipeName = L"\\\\.\\pipe\\DiscordRpcServer"; struct RpcMessageFrame {
OPCODE opcode;
uint32_t length;
char message[64 * 1024 - 8];
};
static const wchar_t* PipeName = L"\\\\?\\pipe\\discord-ipc";
static HANDLE PipeHandle{ INVALID_HANDLE_VALUE }; static HANDLE PipeHandle{ INVALID_HANDLE_VALUE };
static char ApplicationId[64]{}; static char ApplicationId[64]{};
@ -203,12 +212,27 @@ void JsonWriteRichPresenceObj(char*& dest, const DiscordRichPresence* presence)
JsonWriteStringProp(dest, "spectate_secret", presence->spectateSecret); JsonWriteStringProp(dest, "spectate_secret", presence->spectateSecret);
} }
JsonWriteBoolProp(dest, "instance", presence->instance); JsonWriteBoolProp(dest, "instance", presence->instance != 0);
dest -= 1; dest -= 1;
*(dest - 1) = '}'; *(dest - 1) = '}';
*dest = 0;
} }
void JsonWriteHandshakeObj(char*& dest, const char* applicationId)
{
*dest++ = '{';
JsonWriteNumberProp(dest, "v", RpcVersion);
JsonWriteStringProp(dest, "client_id", applicationId);
dest -= 1;
*(dest - 1) = '}';
*dest = 0;
}
void ConnectionWrite(const RpcMessageFrame* frame);
void ConnectionOpen() void ConnectionOpen()
{ {
for (;;) { for (;;) {
@ -220,7 +244,14 @@ void ConnectionOpen()
break; break;
} }
if (GetLastError() != ERROR_PIPE_BUSY) { DWORD err = GetLastError();
if (err == ERROR_FILE_NOT_FOUND) {
printf("No server running\n");
return;
}
if (err != ERROR_PIPE_BUSY) {
printf("Could not open pipe. Error: %d\n", GetLastError()); printf("Could not open pipe. Error: %d\n", GetLastError());
return; return;
} }
@ -230,6 +261,13 @@ void ConnectionOpen()
return; return;
} }
} }
RpcMessageFrame frame;
frame.opcode = OPCODE::HANDSHAKE;
char* msg = frame.message;
JsonWriteHandshakeObj(msg, ApplicationId);
frame.length = msg - frame.message;
ConnectionWrite(&frame);
} }
void ConnectionClose() void ConnectionClose()
@ -241,7 +279,7 @@ void ConnectionClose()
} }
} }
void ConnectionWrite(const void* data, size_t length) void ConnectionWrite(const RpcMessageFrame* frame)
{ {
if (PipeHandle == INVALID_HANDLE_VALUE) { if (PipeHandle == INVALID_HANDLE_VALUE) {
ConnectionOpen(); ConnectionOpen();
@ -249,7 +287,7 @@ void ConnectionWrite(const void* data, size_t length)
return; return;
} }
} }
BOOL success = WriteFile(PipeHandle, &Frame, Frame.length, nullptr, nullptr); BOOL success = WriteFile(PipeHandle, frame, 8 + frame->length, nullptr, nullptr);
if (!success) { if (!success) {
ConnectionClose(); ConnectionClose();
} }
@ -278,11 +316,9 @@ extern "C" void Discord_Shutdown()
extern "C" void Discord_UpdatePresence(const DiscordRichPresence* presence) extern "C" void Discord_UpdatePresence(const DiscordRichPresence* presence)
{ {
Frame.opcode = OPCODE::FRAME;
char* jsonWrite = Frame.message; char* jsonWrite = Frame.message;
JsonWriteRichPresenceObj(jsonWrite, presence); JsonWriteRichPresenceObj(jsonWrite, presence);
Frame.length = jsonWrite - Frame.message;
Frame.length = sizeof(uint32_t) + (jsonWrite - Frame.message); ConnectionWrite(&Frame);
ConnectionWrite(&Frame, Frame.length);
} }