add getPeers rpc implementation

WeBankBlockchain · Sep 9, 2024 · cb0f6e7 · cb0f6e7
1 parent 3c0b9fb
commit cb0f6e7
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 15 deletions.
diff --git a/cpp/ppc-framework/rpc/RpcTypeDef.h b/cpp/ppc-framework/rpc/RpcTypeDef.h
@@ -36,6 +36,7 @@ enum class RpcError : int32_t
 std::string const RUN_TASK_METHOD = "runTask";
 std::string const ASYNC_RUN_TASK_METHOD = "asyncRunTask";
 std::string const GET_TASK_STATUS = "getTaskStatus";
+std::string const GET_PEERS = "getPeers";
 
 std::string const ASYNC_RUN_BS_MODE_TASK = "asyncRunBsModeTask";
 std::string const FETCH_CIPHER = "fetchCipher";

diff --git a/cpp/wedpr-main/air-node/AirNodeInitializer.cpp b/cpp/wedpr-main/air-node/AirNodeInitializer.cpp
@@ -67,7 +67,7 @@ void AirNodeInitializer::init(std::string const& _configPath)
 
 
     auto rpcFactory = std::make_shared<RpcFactory>(m_nodeInitializer->config()->agencyID());
-    m_rpc = rpcFactory->buildRpc(m_nodeInitializer->config());
+    m_rpc = rpcFactory->buildRpc(m_nodeInitializer->config(), m_gateway);
     m_rpc->setRpcStorage(rpcStatusInterface);
     m_rpc->setBsEcdhPSI(m_nodeInitializer->bsEcdhPsi());
     m_nodeInitializer->registerRpcHandler(m_rpc);

diff --git a/cpp/wedpr-main/cem-node/CEMInitializer.cpp b/cpp/wedpr-main/cem-node/CEMInitializer.cpp
@@ -46,7 +46,7 @@ void CEMInitializer::init(std::string const& _configPath)
     auto storageConfig = ppcConfig->storageConfig();
     auto cemConfig = ppcConfig->cemConfig();
     auto rpcFactory = std::make_shared<RpcFactory>(ppcConfig->agencyID());
-    m_rpc = rpcFactory->buildRpc(ppcConfig);
+    m_rpc = rpcFactory->buildRpc(ppcConfig, nullptr);
     auto cemService = std::make_shared<CEMService>();
     cemService->setCEMConfig(cemConfig);
     cemService->setStorageConfig(storageConfig);

diff --git a/cpp/wedpr-main/mpc-node/MPCInitializer.cpp b/cpp/wedpr-main/mpc-node/MPCInitializer.cpp
@@ -47,7 +47,7 @@ void MPCInitializer::init(std::string const& _configPath)
     auto storageConfig = ppcConfig->storageConfig();
     auto mpcConfig = ppcConfig->mpcConfig();
     auto rpcFactory = std::make_shared<RpcFactory>(ppcConfig->agencyID());
-    m_rpc = rpcFactory->buildRpc(ppcConfig);
+    m_rpc = rpcFactory->buildRpc(ppcConfig, nullptr);
     auto mpcService = std::make_shared<MPCService>();
     mpcService->setMPCConfig(mpcConfig);
     mpcService->setStorageConfig(storageConfig);

diff --git a/cpp/wedpr-main/pro-node/ProNodeInitializer.cpp b/cpp/wedpr-main/pro-node/ProNodeInitializer.cpp
@@ -58,7 +58,8 @@ void ProNodeInitializer::init(std::string const& _configPath)
 
 
     auto rpcFactory = std::make_shared<RpcFactory>(m_nodeInitializer->config()->agencyID());
-    m_rpc = rpcFactory->buildRpc(m_nodeInitializer->config());
+    m_rpc = rpcFactory->buildRpc(
+        m_nodeInitializer->config(), m_nodeInitializer->transport()->gateway());
     m_rpc->setRpcStorage(rpcStatusInterface);
     m_rpc->setBsEcdhPSI(m_nodeInitializer->bsEcdhPsi());
     m_nodeInitializer->registerRpcHandler(m_rpc);

diff --git a/cpp/wedpr-transport/ppc-rpc/demo/rpc_demo.cpp b/cpp/wedpr-transport/ppc-rpc/demo/rpc_demo.cpp
@@ -50,7 +50,7 @@ int main(int argc, const char* argv[])
         // not specify the certPath in air-mode
         ppcConfig->loadRpcConfig(param.configFilePath);
         auto rpcFactory = std::make_shared<RpcFactory>("selfParty");
-        auto rpc = rpcFactory->buildRpc(ppcConfig);
+        auto rpc = rpcFactory->buildRpc(ppcConfig, nullptr);
         registerEchoHandler(rpc);
         // start the rpc
         rpc->start();

diff --git a/cpp/wedpr-transport/ppc-rpc/src/Rpc.cpp b/cpp/wedpr-transport/ppc-rpc/src/Rpc.cpp
@@ -31,10 +31,11 @@ using namespace ppc::rpc;
 using namespace ppc::tools;
 using namespace ppc::protocol;
 
-Rpc::Rpc(std::shared_ptr<boostssl::ws::WsService> _wsService, std::string const& _selfPartyID,
-    std::string const& _token, std::string const& _prePath)
+Rpc::Rpc(std::shared_ptr<boostssl::ws::WsService> _wsService, ppc::gateway::IGateway::Ptr gateway,
+    std::string const& _selfPartyID, std::string const& _token, std::string const& _prePath)
   : m_prePath(_prePath),
     m_wsService(std::move(_wsService)),
+    m_gateway(std::move(gateway)),
     m_taskFactory(std::make_shared<JsonTaskFactory>(_selfPartyID, _prePath)),
     m_token(_token)
 {
@@ -74,7 +75,8 @@ Rpc::Rpc(std::shared_ptr<boostssl::ws::WsService> _wsService, std::string const&
         boost::bind(&Rpc::killBsModeTask, this, boost::placeholders::_1, boost::placeholders::_2);
     m_methodToHandler[UPDATE_BS_MODE_TASK_STATUS] = boost::bind(
         &Rpc::updateBsModeTaskStatus, this, boost::placeholders::_1, boost::placeholders::_2);
-
+    m_methodToHandler[GET_PEERS] =
+        boost::bind(&Rpc::getPeers, this, boost::placeholders::_1, boost::placeholders::_2);
     RPC_LOG(INFO) << LOG_DESC("init rpc success") << LOG_KV("selfParty", _selfPartyID);
 }
 
@@ -345,6 +347,32 @@ void Rpc::sendEcdhCipher(Json::Value const& _req, RespFunc _respFunc)
     _respFunc(result->error(), result->serializeToJson());
 }
 
+void Rpc::getPeers(Json::Value const& _req, RespFunc _respFunc)
+{
+    if (m_gateway == nullptr)
+    {
+        BOOST_THROW_EXCEPTION(BCOS_ERROR(-1, "the gateway not initialized!"));
+    }
+    m_gateway->asyncGetPeers([_respFunc](bcos::Error::Ptr error, std::string peersInfo) {
+        try
+        {
+            Json::Value root;
+            Json::Reader jsonReader;
+
+            if (!jsonReader.parse(peersInfo, root))
+            {
+                BOOST_THROW_EXCEPTION(BCOS_ERROR(-1, "Invalid json string: " + peersInfo));
+            }
+            _respFunc(error, std::move(root));
+        }
+        catch (std::exception const& e)
+        {
+            RPC_LOG(WARNING) << LOG_DESC("getPeers exception")
+                             << LOG_KV("error", boost::diagnostic_information(e));
+        }
+    });
+}
+
 void Rpc::sendPartnerCipher(Json::Value const& _req, RespFunc _respFunc)
 {
     if (!m_bsEcdhPSI)

diff --git a/cpp/wedpr-transport/ppc-rpc/src/Rpc.h b/cpp/wedpr-transport/ppc-rpc/src/Rpc.h
@@ -19,6 +19,7 @@
  */
 #pragma once
 #include "ppc-framework/front/FrontInterface.h"
+#include "ppc-framework/gateway/IGateway.h"
 #include "ppc-framework/rpc/RpcInterface.h"
 #include "ppc-framework/rpc/RpcStatusInterface.h"
 #include "protocol/src/JsonTaskImpl.h"
@@ -35,7 +36,8 @@ class Rpc : public RpcInterface
 {
 public:
     using Ptr = std::shared_ptr<Rpc>;
-    Rpc(std::shared_ptr<bcos::boostssl::ws::WsService> _wsService, std::string const& _selfPartyID,
+    Rpc(std::shared_ptr<bcos::boostssl::ws::WsService> _wsService,
+        ppc::gateway::IGateway::Ptr gateway, std::string const& _selfPartyID,
         std::string const& _token, std::string const& _prePath = "data");
     ~Rpc() override { stop(); }
     void start() override
@@ -131,11 +133,14 @@ class Rpc : public RpcInterface
     virtual void killBsModeTask(Json::Value const& _req, RespFunc _respFunc);
     virtual void updateBsModeTaskStatus(Json::Value const& _req, RespFunc _respFunc);
 
+    virtual void getPeers(Json::Value const& _req, RespFunc _respFunc);
+
     void checkHostResource();
 
 private:
     std::string m_prePath;
     std::shared_ptr<bcos::boostssl::ws::WsService> m_wsService;
+    ppc::gateway::IGateway::Ptr m_gateway;
     RpcStatusInterface::Ptr m_rpcStorage;
 
     // Note: here use jsonTaskFactory to decrease the overhead to convert json::value to string when

diff --git a/cpp/wedpr-transport/ppc-rpc/src/RpcFactory.cpp b/cpp/wedpr-transport/ppc-rpc/src/RpcFactory.cpp
@@ -27,7 +27,8 @@ using namespace bcos;
 using namespace ppc::rpc;
 using namespace ppc::tools;
 
-Rpc::Ptr RpcFactory::buildRpc(ppc::tools::PPCConfig::ConstPtr _config)
+Rpc::Ptr RpcFactory::buildRpc(
+    ppc::tools::PPCConfig::ConstPtr _config, ppc::gateway::IGateway::Ptr gateway)
 {
     auto wsConfig = initConfig(_config);
     // create the wsConfig
@@ -39,7 +40,7 @@ Rpc::Ptr RpcFactory::buildRpc(ppc::tools::PPCConfig::ConstPtr _config)
     initializer->initWsService(wsService);
 
     auto rpc = std::make_shared<Rpc>(
-        wsService, m_selfPartyID, _config->rpcConfig().token, _config->dataLocation());
+        wsService, gateway, m_selfPartyID, _config->rpcConfig().token, _config->dataLocation());
     rpc->setMinNeededMemory(_config->rpcConfig().minNeededMemoryGB);
     return rpc;
 }

diff --git a/cpp/wedpr-transport/ppc-rpc/src/RpcFactory.h b/cpp/wedpr-transport/ppc-rpc/src/RpcFactory.h
@@ -19,6 +19,7 @@
  */
 #pragma once
 #include "Rpc.h"
+#include "ppc-framework/gateway/IGateway.h"
 #include <memory>
 namespace bcos::boostssl::ws
 {
@@ -37,8 +38,8 @@ class RpcFactory
     RpcFactory(std::string const& _selfPartyID) : m_selfPartyID(_selfPartyID) {}
     virtual ~RpcFactory() = default;
 
-    Rpc::Ptr buildRpc(std::shared_ptr<ppc::tools::PPCConfig const> _config);
-
+    Rpc::Ptr buildRpc(
+        std::shared_ptr<ppc::tools::PPCConfig const> _config, ppc::gateway::IGateway::Ptr gateway);
 
 private:
     std::shared_ptr<bcos::boostssl::ws::WsConfig> initConfig(

diff --git a/cpp/wedpr-transport/sdk/ProTransportImpl.h b/cpp/wedpr-transport/sdk/ProTransportImpl.h
@@ -43,7 +43,6 @@ class ProTransportImpl : public Transport, public std::enable_shared_from_this<P
 
 protected:
     ppc::front::FrontConfig::Ptr m_config;
-    ppc::gateway::IGateway::Ptr m_gateway;
     std::shared_ptr<ppc::protocol::GrpcServer> m_server;
     int m_keepAlivePeriodMs;
     std::shared_ptr<bcos::Timer> m_timer;

diff --git a/cpp/wedpr-transport/sdk/Transport.h b/cpp/wedpr-transport/sdk/Transport.h
@@ -19,6 +19,7 @@
  */
 #pragma once
 #include "ppc-framework/front/IFront.h"
+#include "ppc-framework/gateway/IGateway.h"
 namespace ppc::sdk
 {
 class Transport
@@ -31,9 +32,12 @@ class Transport
     virtual void start() { m_front->start(); }
     virtual void stop() { m_front->stop(); }
 
-    virtual ppc::front::IFront::Ptr const& getFront() { return m_front; }
+    virtual ppc::front::IFront::Ptr const& getFront() const { return m_front; }
+
+    virtual ppc::gateway::IGateway::Ptr const& gateway() const { return m_gateway; }
 
 protected:
     ppc::front::IFront::Ptr m_front;
+    ppc::gateway::IGateway::Ptr m_gateway;
 };
 }  // namespace ppc::sdk
diff --git a/cpp/wedpr-transport/sdk/TransportImpl.h b/cpp/wedpr-transport/sdk/TransportImpl.h
@@ -33,6 +33,7 @@ class TransportImpl : public Transport
     TransportImpl(ppc::front::FrontConfig::Ptr config, ppc::gateway::IGateway::Ptr const& gateway)
       : m_config(std::move(config))
     {
+        m_gateway = gateway;
         ppc::front::FrontFactory frontFactory;
         m_front = frontFactory.build(std::make_shared<ppc::protocol::NodeInfoFactory>(),
             std::make_shared<ppc::protocol::MessagePayloadBuilderImpl>(),