adapt to intializer (#20)

* rename ppc-main to wedpr-main * adapt to intializer * add gateway initializer
WeBankBlockchain · Sep 5, 2024 · cddb3ee · cddb3ee
1 parent 0fba05a
commit cddb3ee
Show file tree

Hide file tree

Showing 64 changed files with 825 additions and 675 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -88,7 +88,8 @@ set(ALL_SOURCE_LIST
         wedpr-storage/ppc-io wedpr-storage/ppc-storage
         wedpr-transport/ppc-gateway wedpr-transport/ppc-front 
         wedpr-transport/ppc-http wedpr-transport/ppc-rpc wedpr-transport/sdk
-        wedpr-computing/ppc-psi wedpr-computing/ppc-mpc wedpr-computing/ppc-pir ${CEM_SOURCE})
+        wedpr-computing/ppc-psi wedpr-computing/ppc-mpc wedpr-computing/ppc-pir ${CEM_SOURCE}
+        wedpr-initializer wedpr-main)
 
 if(BUILD_WEDPR_TOOLKIT)
     # fetch the python dependencies

diff --git a/cpp/cmake/TargetSettings.cmake b/cpp/cmake/TargetSettings.cmake
@@ -63,8 +63,8 @@ set(RPC_TARGET "ppc-rpc")
 # libhelper
 set(HELPER_TARGET "ppc-helper")
 
-# libinitializer
-set(INIT_LIB init)
+# wedpr-initializer
+set(INIT_LIB "wedpr-inititializer")
 
 # ppc-cem
 set(CEM_TARGET "ppc-cem")

diff --git a/cpp/libinitializer/CMakeLists.txt b/cpp/libinitializer/CMakeLists.txt
diff --git a/cpp/libinitializer/FrontInitializer.cpp b/cpp/libinitializer/FrontInitializer.cpp
diff --git a/cpp/libinitializer/FrontInitializer.h b/cpp/libinitializer/FrontInitializer.h
diff --git a/cpp/libinitializer/ProFrontInitializer.h b/cpp/libinitializer/ProFrontInitializer.h
diff --git a/cpp/ppc-framework/front/FrontConfig.h b/cpp/ppc-framework/front/FrontConfig.h
@@ -20,7 +20,10 @@
 
 #pragma once
 #include "ppc-framework/protocol/EndPoint.h"
+#include "ppc-framework/protocol/GrpcConfig.h"
+#include "ppc-framework/protocol/INodeInfo.h"
 #include <memory>
+#include <sstream>
 #include <string>
 #include <vector>
 
@@ -49,40 +52,58 @@ class FrontConfig
 
     virtual void appendGatewayInfo(ppc::protocol::EndPoint&& endpoint)
     {
-        // TODO:check the endpoint
         m_gatewayInfo.push_back(endpoint);
     }
 
     ppc::protocol::EndPoint const& selfEndPoint() const { return m_selfEndPoint; }
     void setSelfEndPoint(ppc::protocol::EndPoint const& endPoint) { m_selfEndPoint = endPoint; }
 
-    // TODO here
-    std::string gatewayEndPoints() { return ""; }
+    // refer to: https://github.com/grpc/grpc-node/issues/2066
+    // grpc prefer to using ipv4:${host1}:${port1},${host2}:${port2} as target to support multiple
+    // servers
+    std::string gatewayGrpcTarget()
+    {
+        std::stringstream oss;
+        oss << "ipv4:";
+        for (auto const& endPoint : m_gatewayInfo)
+        {
+            oss << endPoint.entryPoint() << ",";
+        }
+        return oss.str();
+    }
 
-    std::string const& loadBalancePolicy() const { return m_loadBanlancePolicy; }
-    void setLoadBalancePolicy(std::string const& loadBanlancePolicy)
+    void setGrpcConfig(ppc::protocol::GrpcConfig::Ptr grpcConfig)
     {
-        m_loadBanlancePolicy = loadBanlancePolicy;
+        m_grpcConfig = std::move(grpcConfig);
     }
+    ppc::protocol::GrpcConfig::Ptr const& grpcConfig() const { return m_grpcConfig; }
+
+    // generate the nodeInfo
+    virtual ppc::protocol::INodeInfo::Ptr generateNodeInfo() const = 0;
+
+    virtual std::vector<std::string> const& getComponents() const { return m_components; }
+    void setComponents(std::vector<std::string> const& components) { m_components = components; }
 
-private:
-    std::string m_loadBanlancePolicy = "round_robin";
+protected:
+    ppc::protocol::GrpcConfig::Ptr m_grpcConfig;
     ppc::protocol::EndPoint m_selfEndPoint;
     int m_threadPoolSize;
     std::string m_nodeID;
     std::vector<ppc::protocol::EndPoint> m_gatewayInfo;
+    std::vector<std::string> m_components;
 };
 
-class FrontConfigBuilder
+inline std::string printFrontDesc(FrontConfig::Ptr const& config)
 {
-public:
-    using Ptr = std::shared_ptr<FrontConfigBuilder>;
-    FrontConfigBuilder() = default;
-    virtual ~FrontConfigBuilder() = default;
-
-    FrontConfig::Ptr build(int threadPoolSize, std::string nodeID)
+    if (!config)
     {
-        return std::make_shared<FrontConfig>(threadPoolSize, nodeID);
+        return "nullptr";
     }
-};
+    std::ostringstream stringstream;
+    stringstream << LOG_KV("endPoint", config->selfEndPoint().entryPoint())
+                 << LOG_KV("nodeID", config->nodeID())
+                 << LOG_KV("poolSize", config->threadPoolSize())
+                 << LOG_KV("target", config->gatewayGrpcTarget());
+    return stringstream.str();
+}
 }  // namespace ppc::front
diff --git a/cpp/ppc-framework/front/FrontInterface.h b/cpp/ppc-framework/front/FrontInterface.h
@@ -60,6 +60,8 @@ class FrontInterface
     virtual void asyncSendResponse(const std::string& _agencyID, std::string const& _uuid,
         front::PPCMessageFace::Ptr _message, ErrorCallbackFunc _callback) = 0;
 
+    virtual void registerMessageHandler(uint8_t _taskType, uint8_t _algorithmType,
+        std::function<void(front::PPCMessageFace::Ptr)> _handler) = 0;
     /**
      * @brief notice task info to gateway
      * @param _taskInfo the latest task information
@@ -69,9 +71,6 @@ class FrontInterface
     // erase the task-info when task finished
     virtual bcos::Error::Ptr eraseTaskInfo(std::string const& _taskID) = 0;
 
-    // get the agencyList from the gateway
-    virtual void asyncGetAgencyList(GetAgencyListCallback _callback) = 0;
-
     virtual std::string const& selfEndPoint() const { return m_selfEndPoint; }
 
 protected: