suyu/discord-rpc
26
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do/wrap error checking around json reading

Browse source
This commit is contained in:
Chris Marsh 2017-07-28 10:03:05 -07:00
parent 6774b5d881
commit ef60ec40c3
3 changed files with 57 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/discord-rpc.cpp
View file

@ -100,20 +100,16 @@ extern "C" void Discord_UpdateConnection()
break; break;
} }
const char* evtName = nullptr; const char* evtName = GetStrMember(&message, "evt");
auto evt = message.FindMember("evt"); const char* nonce = GetStrMember(&message, "nonce");
if (evt != message.MemberEnd() && evt->value.IsString()) {
evtName = evt->value.GetString();
}
auto nonce = message.FindMember("nonce"); if (nonce) {
if (nonce != message.MemberEnd() && nonce->value.IsString()) {
// in responses only -- should use to match up response when needed. // in responses only -- should use to match up response when needed.
if (evtName && strcmp(evtName, "ERROR") == 0) { if (evtName && strcmp(evtName, "ERROR") == 0) {
auto data = message.FindMember("data"); auto data = GetObjMember(&message, "data");
LastErrorCode = data->value["code"].GetInt(); LastErrorCode = GetIntMember(data, "code");
StringCopy(LastErrorMessage, data->value["message"].GetString()); StringCopy(LastErrorMessage, GetStrMember(data, "message", ""));
GotErrorMessage.store(true); GotErrorMessage.store(true);
} }
} }
@ -124,19 +120,23 @@ extern "C" void Discord_UpdateConnection()
} }
if (strcmp(evtName, "GAME_JOIN") == 0) { if (strcmp(evtName, "GAME_JOIN") == 0) {
auto data = message.FindMember("data"); auto data = GetObjMember(&message, "data");
auto secret = data->value["secret"].GetString(); auto secret = GetStrMember(data, "secret");
if (secret) {
StringCopy(JoinGameSecret, secret); StringCopy(JoinGameSecret, secret);
WasJoinGame.store(true); WasJoinGame.store(true);
} }
}
else if (strcmp(evtName, "GAME_SPECTATE") == 0) { else if (strcmp(evtName, "GAME_SPECTATE") == 0) {
auto data = message.FindMember("data"); auto data = GetObjMember(&message, "data");
auto secret = data->value["secret"].GetString(); auto secret = GetStrMember(data, "secret");
if (secret) {
StringCopy(SpectateGameSecret, secret); StringCopy(SpectateGameSecret, secret);
WasSpectateGame.store(true); WasSpectateGame.store(true);
} }
} }
} }
}
// writes // writes
while (SendQueuePendingSends.load()) { while (SendQueuePendingSends.load()) {

5
src/rpc_connection.cpp
View file

@ -114,9 +114,8 @@ bool RpcConnection::Read(JsonDocument& message)
switch (readFrame.opcode) { switch (readFrame.opcode) {
case Opcode::Close: { case Opcode::Close: {
message.ParseInsitu(readFrame.message); message.ParseInsitu(readFrame.message);
lastErrorCode = message["code"].GetInt(); lastErrorCode = GetIntMember(&message, "code");
const auto& m = message["message"]; StringCopy(lastErrorMessage, GetStrMember(&message, "message", ""));
StringCopy(lastErrorMessage, m.GetString());
Close(); Close();
return false; return false;
} }

37
src/serialization.h
View file

@ -142,3 +142,40 @@ public:
{ {
} }
}; };
using JsonValue = rapidjson::GenericValue<UTF8, PoolAllocator>;
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;
}