ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-22 03:55:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Regularize RPC calling.

Browse Source
This commit is contained in:
Arthur Britto
2012-12-02 16:06:20 -08:00
parent fed1250218
commit ee3a2a0857
2 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/cpp/ripple/CallRPC.cpp
View File

@@ -51,18 +51,16 @@ std::string EncodeBase64(const std::string& s)
return result;
}
Json::Value RPCParser::parseAsIs(Json::Value jvReq, const Json::Value &params)
Json::Value RPCParser::parseAsIs(const Json::Value &params)
{
return jvReq;
return Json::Value(Json::objectValue);
}
// Convert a command plus args to a json request.
Json::Value RPCParser::parseCommand(Json::Value jvRequest)
// Convert a rpc method and params to a request.
// <-- { method: xyz, params: [... ] } or { error: ..., ... }
Json::Value RPCParser::parseCommand(std::string strMethod, Json::Value jvParams)
{
std::string strCommand = jvRequest["method"].asString();
Json::Value jvParams = jvRequest["params"];
cLog(lsTRACE) << "RPC:" << strCommand;
cLog(lsTRACE) << "RPC method:" << strMethod;
cLog(lsTRACE) << "RPC params:" << jvParams;
static struct {
@@ -128,24 +126,20 @@ Json::Value RPCParser::parseCommand(Json::Value jvRequest)
int i = NUMBER(commandsA);
while (i-- && strCommand != commandsA[i].pCommand)
while (i-- && strMethod != commandsA[i].pCommand)
;
if (i < 0)
{
return rpcError(rpcBAD_SYNTAX, jvRequest);
return rpcError(rpcBAD_SYNTAX);
}
else if (commandsA[i].iMinParams >= 0
? commandsA[i].iMaxParams
? (jvParams.size() < commandsA[i].iMinParams
else if ((commandsA[i].iMinParams >= 0 && jvParams.size() < commandsA[i].iMinParams)
|| (commandsA[i].iMaxParams >= 0 && jvParams.size() > commandsA[i].iMaxParams))
: false
: jvParams.isArray())
{
return rpcError(rpcBAD_SYNTAX, jvRequest);
return rpcError(rpcBAD_SYNTAX);
}
return (this->*(commandsA[i].pfpFunc))(jvRequest, jvParams);
return (this->*(commandsA[i].pfpFunc))(jvParams);
}
int commandLineRPC(const std::vector<std::string>& vCmd)
@@ -157,52 +151,62 @@ int commandLineRPC(const std::vector<std::string>& vCmd)
try
{
RPCParser rpParser;
Json::Value jvCliParams(Json::arrayValue);
Json::Value jvRpcParams(Json::arrayValue);
if (vCmd.empty()) return 1; // 1 = print usage.
jvRequest["method"] = vCmd[0];
for (int i = 1; i != vCmd.size(); i++)
jvCliParams.append(vCmd[i]);
jvRpcParams.append(vCmd[i]);
jvRequest["params"] = jvCliParams;
Json::Value jvRpc = Json::Value(Json::objectValue);
jvRequest = rpParser.parseCommand(jvRequest);
jvRpc["method"] = vCmd[0];
jvRpc["params"] = jvRpcParams;
jvRequest = rpParser.parseCommand(vCmd[0], jvRpcParams);
// std::cerr << "Request: " << jvRequest << std::endl;
Json::Value jvParams(Json::arrayValue);
jvParams.append(jvRequest);
Json::Value jvResult;
jvResult = jvRequest.isMember("error")
? jvRequest // Parse failed, return error.
: callRPC(jvRequest["method"].asString(), jvParams); // Parsed, execute.
if (jvResult.isMember("error"))
if (jvRequest.isMember("error"))
{
nRet = jvResult.isMember("error_code")
? lexical_cast_s<int>(jvResult["error_code"].asString())
jvOutput = jvRequest;
jvOutput["status"] = "error";
jvOutput["rpc"] = jvRpc;
}
else
{
jvOutput = callRPC(
jvRequest.isMember("method")
? jvRequest["method"].asString()
: vCmd[0],
jvRequest["params"]); // Parsed, execute.
if (jvOutput.isMember("error"))
{
jvOutput["rpc"] = jvRpc;
}
}
if (jvOutput.isMember("error"))
{
nRet = jvOutput.isMember("error_code")
? lexical_cast_s<int>(jvOutput["error_code"].asString())
: 1;
}
jvOutput = jvResult;
// YYY We could have a command line flag for single line output for scripts.
// YYY We would intercept output here and simplify it.
}
catch (std::exception& e)
{
jvRequest["error_what"] = e.what();
jvOutput = rpcError(rpcINTERNAL, jvRequest);
jvOutput = rpcError(rpcINTERNAL);
jvOutput["error_what"] = e.what();
nRet = rpcINTERNAL;
}
catch (...)
{
jvRequest["error_what"] = "exception";
jvOutput = rpcError(rpcINTERNAL, jvRequest);
jvOutput = rpcError(rpcINTERNAL);
jvOutput["error_what"] = "exception";
nRet = rpcINTERNAL;
}

6
src/cpp/ripple/CallRPC.h
View File

@@ -9,12 +9,12 @@
class RPCParser
{
protected:
typedef Json::Value (RPCParser::*parseFuncPtr)(Json::Value jvRet, const Json::Value &jvParams);
typedef Json::Value (RPCParser::*parseFuncPtr)(const Json::Value &jvParams);
Json::Value parseAsIs(Json::Value jvRet, const Json::Value &jvParams);
Json::Value parseAsIs(const Json::Value &jvParams);
public:
Json::Value parseCommand(Json::Value jvRequest);
Json::Value parseCommand(std::string strMethod, Json::Value jvParams);
};
extern int commandLineRPC(const std::vector<std::string>& vCmd);