feat(node-gateway): Add installation of gRPC for Nix

JitpanuM · JitpanuM · commit c1fc66f42834 · 2026-01-09T19:54:19.000Z
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -80,8 +80,6 @@ find_package(Criterion)
 find_package(OpalOrchestra)
 find_package(LibXml2)
 find_package(OpalAsyncApi)
-find_package(Protobuf)
-find_package(gRPC)
 
 # Check for tools
 find_program(PROTOBUFC_COMPILER NAMES protoc-c)
@@ -120,7 +118,10 @@ pkg_check_modules(NANOMSG IMPORTED_TARGET nanomsg)
 if(NOT NANOMSG_FOUND)
     pkg_check_modules(NANOMSG IMPORTED_TARGET libnanomsg>=1.0.0)
 endif()
-
+pkg_check_modules(GRPC IMPORTED_TARGET grpc grpc++)
+if (TARGET PkgConfig::GRPC)
+    set_property(TARGET PkgConfig::GRPC PROPERTY INTERFACE_COMPILE_OPTIONS "")
+endif()
 
 if (REDISPP_FOUND)
     file(READ "${REDISPP_INCLUDEDIR}/sw/redis++/tls.h" CONTENTS)
@@ -182,6 +183,7 @@ cmake_dependent_option(WITH_SRC                 "Build executables"
 cmake_dependent_option(WITH_TESTS               "Run tests"                                             "${WITH_DEFAULTS}" "TOPLEVEL_PROJECT" OFF)
 cmake_dependent_option(WITH_TOOLS               "Build auxilary tools"                                  "${WITH_DEFAULTS}" "TOPLEVEL_PROJECT" OFF)
 cmake_dependent_option(WITH_WEB                 "Build with internal webserver"                         "${WITH_DEFAULTS}" "LIBWEBSOCKETS_FOUND" OFF)
+cmake_dependent_option(WITH_GRPC                "Build with grpc api"                                   "${WITH_DEFAULTS}" "GRPC_FOUND" OFF)
 
 cmake_dependent_option(WITH_NODE_AMQP           "Build with amqp node-type"                             "${WITH_DEFAULTS}" "RABBITMQ_C_FOUND" OFF)
 cmake_dependent_option(WITH_NODE_CAN            "Build with can node-type"                              "${WITH_DEFAULTS}" "" OFF)
@@ -216,7 +218,6 @@ cmake_dependent_option(WITH_NODE_ULDAQ          "Build with uldaq node-type"
 cmake_dependent_option(WITH_NODE_WEBRTC         "Build with webrtc node-type"                           "${WITH_DEFAULTS}" "WITH_WEB; LibDataChannel_FOUND" OFF)
 cmake_dependent_option(WITH_NODE_WEBSOCKET      "Build with websocket node-type"                        "${WITH_DEFAULTS}" "WITH_WEB" OFF)
 cmake_dependent_option(WITH_NODE_ZEROMQ         "Build with zeromq node-type"                           "${WITH_DEFAULTS}" "LIBZMQ_FOUND; NOT WITHOUT_GPL" OFF)
-cmake_dependent_option(WITH_GRPC                "Build with grpc api"                                   "${WITH_DEFAULTS}" "gRPC_FOUND" OFF)
 
 # Set a default for the build type
 if("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -293,6 +294,7 @@ add_feature_info(SRC                    WITH_SRC                    "Build execu
 add_feature_info(TESTS                  WITH_TESTS                  "Run tests")
 add_feature_info(TOOLS                  WITH_TOOLS                  "Build auxilary tools")
 add_feature_info(WEB                    WITH_WEB                    "Build with internal webserver")
+add_feature_info(GRPC_API               WITH_GRPC                   "Build with gRPC API")
 
 add_feature_info(NODE_AMQP              WITH_NODE_AMQP              "Build with amqp node-type")
 add_feature_info(NODE_CAN               WITH_NODE_CAN               "Build with can node-type")
diff --git a/flake.nix b/flake.nix
@@ -116,6 +116,7 @@
 
         opendssc = pkgs.callPackage (nixDir + "/opendssc.nix") { };
         orchestra = pkgs.callPackage (nixDir + "/orchestra.nix") { };
+        grpc-server-reflection = pkgs.callPackage (nixDir + "/opendssc.nix") { };
       };
     in
     {
diff --git a/lib/api/CMakeLists.txt b/lib/api/CMakeLists.txt
@@ -52,7 +52,7 @@ if (WITH_GRPC)
             ${REFLECTION_INCLUDE_DIR}/grpc/reflection/v1alpha/reflection.pb.cc
             ${REFLECTION_INCLUDE_DIR}/grpc/reflection/v1alpha/reflection.grpc.pb.cc
         )
-        list(APPEND LIBRARIES protobuf::libprotobuf gRPC::grpc++)
+        list(APPEND LIBRARIES PkgConfig::PROTOBUF PkgConfig::GRPC)
     endif()
 endif()
 
diff --git a/lib/api/requests/gateway/grpc.cpp b/lib/api/requests/gateway/grpc.cpp
@@ -249,7 +249,7 @@ class grpcRequest : public NodeRequest {
     int field_count = req_desc->field_count();
     for (int i = 0; i < field_count; i++) {
       if (const FieldDescriptor *f = req_desc->field(i)) {
-        json_t *json_val = json_object_get(body, f->name().c_str());
+        json_t *json_val = json_object_get(body, f->name().data());
         if (!json_val) {
           if (f->is_required()) {
             std::cerr << "Missing required field: " << f->name() << std::endl;
@@ -432,32 +432,32 @@ class grpcRequest : public NodeRequest {
                 break;
               }
             }
-            json_object_set_new(root, f->name().c_str(), json_arr);
+            json_object_set_new(root, f->name().data(), json_arr);
           } else {
             switch (f->type()) {
             case grpc::protobuf::FieldDescriptor::Type::TYPE_STRING:
               json_object_set_new(
-                  root, f->name().c_str(),
+                  root, f->name().data(),
                   json_string(resp_refl->GetString(*response, f).c_str()));
               break;
             case grpc::protobuf::FieldDescriptor::Type::TYPE_INT32:
               json_object_set_new(
-                  root, f->name().c_str(),
+                  root, f->name().data(),
                   json_integer(resp_refl->GetInt32(*response, f)));
               break;
             case grpc::protobuf::FieldDescriptor::Type::TYPE_INT64:
               json_object_set_new(
-                  root, f->name().c_str(),
+                  root, f->name().data(),
                   json_integer(resp_refl->GetInt64(*response, f)));
               break;
             case grpc::protobuf::FieldDescriptor::Type::TYPE_DOUBLE:
               json_object_set_new(
-                  root, f->name().c_str(),
+                  root, f->name().data(),
                   json_real(resp_refl->GetDouble(*response, f)));
               break;
             case grpc::protobuf::FieldDescriptor::Type::TYPE_BOOL:
               json_object_set_new(
-                  root, f->name().c_str(),
+                  root, f->name().data(),
                   json_boolean(resp_refl->GetBool(*response, f)));
               break;
             default:
diff --git a/packaging/nix/grpc_server_reflection.nix b/packaging/nix/grpc_server_reflection.nix
@@ -0,0 +1,38 @@
+{
+  stdenv,
+  fetchurl,
+  protobuf,
+  grpc
+}:
+
+stdenv.mkDerivation {
+  name = "grpc-server-reflection";
+
+  dontUnpack = true;
+  nativeBuildInputs = [ protobuf grpc ];
+
+  src = fetchurl {
+    url = "https://raw.githubusercontent.com/grpc/grpc/refs/heads/master/src/proto/grpc/reflection/v1alpha/reflection.proto";
+    sha256 = "sha256-c1kQAgFlRRDNFZy7XEaKi+wUtUmXPG+P967poSN67Ec=";
+  };
+
+  buildPhase = ''
+    # Create a temporary build directory
+    mkdir -p tmp
+    ln -s $src tmp/reflection.proto
+
+    # Generate code into build_tmp
+    protoc --cpp_out=tmp \
+           --grpc_out=tmp \
+           --plugin=protoc-gen-grpc=${grpc}/bin/grpc_cpp_plugin \
+           -I tmp \
+           tmp/reflection.proto
+  '';
+
+  # Install into standard 'include' path so CMake finds it
+  installPhase = ''
+    mkdir -p $out/include/grpc/reflection/v1alpha
+    cp tmp/*.pb.h $out/include/grpc/reflection/v1alpha/
+    cp tmp/*.pb.cc $out/include/grpc/reflection/v1alpha/
+  '';
+}
diff --git a/packaging/nix/villas.nix b/packaging/nix/villas.nix
@@ -21,6 +21,7 @@
   withNodeAmqp ? withAllNodes,
   withNodeComedi ? withAllNodes,
   withNodeEthercat ? (withAllNodes && system == "x86_64-linux"),
+  withNodeGateway ? withAllNodes,
   withNodeIec60870 ? withAllNodes,
   withNodeIec61850 ? withAllNodes,
   withNodeInfiniband ? withAllNodes,
@@ -57,6 +58,8 @@
   cyrus_sasl,
   ethercat,
   gnugrep,
+  grpc,
+  grpc-server-reflection,
   jansson,
   lib60870,
   libconfig,
@@ -164,6 +167,8 @@ stdenv.mkDerivation {
   ++ lib.optionals withNodeAmqp [ rabbitmq-c ]
   ++ lib.optionals withNodeComedi [ comedilib ]
   ++ lib.optionals withNodeEthercat [ ethercat ]
+  ++ lib.optionals withNodeGateway [ grpc ]
+  ++ lib.optionals withNodeGateway [ grpc-server-reflection ]
   ++ lib.optionals withNodeIec60870 [ lib60870 ]
   ++ lib.optionals withNodeIec61850 [ libiec61850 ]
   ++ lib.optionals withNodeKafka [

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@`
`116`	`116`
`117`	`117`	`opendssc = pkgs.callPackage (nixDir + "/opendssc.nix") { };`
`118`	`118`	`orchestra = pkgs.callPackage (nixDir + "/orchestra.nix") { };`
	`119`	`+ grpc-server-reflection = pkgs.callPackage (nixDir + "/opendssc.nix") { };`
`119`	`120`	`};`
`120`	`121`	`in`
`121`	`122`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ if (WITH_GRPC)`
`52`	`52`	`${REFLECTION_INCLUDE_DIR}/grpc/reflection/v1alpha/reflection.pb.cc`
`53`	`53`	`${REFLECTION_INCLUDE_DIR}/grpc/reflection/v1alpha/reflection.grpc.pb.cc`
`54`	`54`	`)`
`55`		`- list(APPEND LIBRARIES protobuf::libprotobuf gRPC::grpc++)`
	`55`	`+ list(APPEND LIBRARIES PkgConfig::PROTOBUF PkgConfig::GRPC)`
`56`	`56`	`endif()`
`57`	`57`	`endif()`
`58`	`58`