SwitchEmu/discord-rpc
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/discord-rpc.git synced 2026-03-20 22:22:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Just use stack allocations in parsing by default.

Browse Source
This commit is contained in:
Chris Marsh
2017-07-24 14:59:45 -07:00
parent 63058ddf23
commit 38c0599380
4 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/discord-rpc.cpp
View File

@@ -82,35 +82,56 @@ extern "C" void Discord_UpdateConnection()
}
else {
// reads
JsonDocument message;
while (Connection->Read(message)) {
// 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];
for (;;) {
PoolAllocator pa(parseBuffer, sizeof(parseBuffer));
StackAllocator sa;
JsonDocument message(rapidjson::kObjectType, &pa, sizeof(sa.fixedBuffer_), &sa);
if (!Connection->Read(message)) {
break;
}
const char* evtName = nullptr;
auto evt = message.FindMember("evt");
if (evt != message.MemberEnd() && evt->value.IsString()) {
evtName = evt->value.GetString();
}
auto nonce = message.FindMember("nonce");
if (nonce != message.MemberEnd() && nonce->value.IsString()) {
// in responses only -- should use to match up response when needed.
//auto cmd = message.FindMember("cmd"); needed?
if (evtName && strcmp(evtName, "ERROR") == 0) {
auto data = message.FindMember("data");
LastErrorCode = data->value["code"].GetInt();
StringCopy(LastErrorMessage, data->value["message"].GetString());
GotErrorMessage.store(true);
}
}
else {
// should have evt == name of event, optional data
auto evt = message.FindMember("evt");
if (evt != message.MemberEnd() && evt->value.IsString()) {
const char* evtName = evt->value.GetString();
if (evtName == nullptr) {
continue;
}
// todo ug
if (strcmp(evtName, "PRESENCE_REQUESTED") == 0) {
WasPresenceRequested.store(true);
}
else if (strcmp(evtName, "JOIN_GAME") == 0) {
auto data = message.FindMember("data");
auto secret = data->value["secret"].GetString();
StringCopy(JoinGameSecret, secret);
WasJoinGame.store(true);
}
else if (strcmp(evtName, "SPECTATE_GAME") == 0) {
auto data = message.FindMember("data");
auto secret = data->value["secret"].GetString();
StringCopy(SpectateGameSecret, secret);
WasSpectateGame.store(true);
}
// todo ug
if (strcmp(evtName, "PRESENCE_REQUESTED") == 0) {
WasPresenceRequested.store(true);
}
else if (strcmp(evtName, "JOIN_GAME") == 0) {
auto data = message.FindMember("data");
auto secret = data->value["secret"].GetString();
StringCopy(JoinGameSecret, secret);
WasJoinGame.store(true);
}
else if (strcmp(evtName, "SPECTATE_GAME") == 0) {
auto data = message.FindMember("data");
auto secret = data->value["secret"].GetString();
StringCopy(SpectateGameSecret, secret);
WasSpectateGame.store(true);
}
}
}