Added protobuf descriptor support

Fixed cargo tests

Author: genevanmeter

rustecal-samples/pubsub/person_receive/Cargo.toml

@@ -6,8 +6,10 @@ build = "build.rs"
 
 [dependencies]
 prost = "0.14"
+prost-reflect = { version = "0.16.0", features = ["derive"] }
 rustecal = { path = "../../../rustecal", features = ["pubsub"] }
 rustecal-types-protobuf = { path = "../../../rustecal-types-protobuf" }
 
 [build-dependencies]
 prost-build = "0.14"
+prost-reflect-build = "0.16.0"

rustecal-samples/pubsub/person_receive/build.rs

@@ -1,11 +1,16 @@
 fn main() {
-    prost_build::compile_protos(
-        &[
-            "proto/person.proto",
-            "proto/animal.proto",
-            "proto/house.proto",
-        ],
-        &["proto"],
-    )
-    .unwrap();
+    let protos = [
+        "proto/person.proto",
+        "proto/animal.proto",
+        "proto/house.proto",
+    ];
+
+    let protos_inc = ["proto"];
+
+    prost_build::compile_protos(&protos, &protos_inc).unwrap();
+
+    prost_reflect_build::Builder::new()
+        .descriptor_pool("crate::DESCRIPTOR_POOL")
+        .compile_protos(&protos, &protos_inc)
+        .unwrap();
 }

rustecal-samples/pubsub/person_receive/src/main.rs

@@ -12,6 +12,16 @@ mod environment {
     include!(concat!(env!("OUT_DIR"), "/pb.environment.rs"));
 }
 
+use prost_reflect::DescriptorPool;
+use std::sync::LazyLock;
+
+static DESCRIPTOR_POOL: LazyLock<DescriptorPool> = LazyLock::new(|| {
+    DescriptorPool::decode(
+        include_bytes!(concat!(env!("OUT_DIR"), "/file_descriptor_set.bin")).as_ref(),
+    )
+    .unwrap()
+});
+
 use people::Person;
 impl IsProtobufType for Person {}
 

rustecal-samples/pubsub/person_send/Cargo.toml

@@ -6,8 +6,10 @@ build = "build.rs"
 
 [dependencies]
 prost = "0.14"
+prost-reflect = { version = "0.16.0", features = ["derive"] }
 rustecal = { path = "../../../rustecal", features = ["pubsub"] }
 rustecal-types-protobuf = { path = "../../../rustecal-types-protobuf" }
 
 [build-dependencies]
 prost-build = "0.14"
+prost-reflect-build = "0.16.0"

rustecal-samples/pubsub/person_send/build.rs

@@ -1,11 +1,16 @@
 fn main() {
-    prost_build::compile_protos(
-        &[
-            "proto/person.proto",
-            "proto/animal.proto",
-            "proto/house.proto",
-        ],
-        &["proto"],
-    )
-    .unwrap();
+    let protos = [
+        "proto/person.proto",
+        "proto/animal.proto",
+        "proto/house.proto",
+    ];
+
+    let protos_inc = ["proto"];
+
+    prost_build::compile_protos(&protos, &protos_inc).unwrap();
+
+    prost_reflect_build::Builder::new()
+        .descriptor_pool("crate::DESCRIPTOR_POOL")
+        .compile_protos(&protos, &protos_inc)
+        .unwrap();
 }

rustecal-samples/pubsub/person_send/src/main.rs

@@ -11,6 +11,16 @@ mod environment {
     include!(concat!(env!("OUT_DIR"), "/pb.environment.rs"));
 }
 
+use prost_reflect::DescriptorPool;
+use std::sync::LazyLock;
+
+static DESCRIPTOR_POOL: LazyLock<DescriptorPool> = LazyLock::new(|| {
+    DescriptorPool::decode(
+        include_bytes!(concat!(env!("OUT_DIR"), "/file_descriptor_set.bin")).as_ref(),
+    )
+    .unwrap()
+});
+
 use people::Person;
 use rustecal::pubsub::publisher::Timestamp;
 

rustecal-service/src/lib.rs

@@ -7,11 +7,11 @@
 //! - `ServiceServer`: host services, handle requests with callbacks.
 //!
 //! ## Example
-//! ```rust
+//! '''rust
 //! use rustecal_service::ServiceClient;
 //! let client = ServiceClient::new("mirror_service").unwrap();
 //! let response = client.call("Hello!".as_bytes(), std::time::Duration::from_millis(500));
-//! ```
+//! '''
 
 pub mod client;
 pub mod client_instance;

rustecal-types-protobuf/Cargo.toml

@@ -12,6 +12,7 @@ keywords      = ["ecal", "ipc", "pubsub", "message-support", "middleware"]
 categories    = ["network-programming", "api-bindings"]
 
 [dependencies]
-prost           = "0.14"
+prost = "0.14"
+prost-reflect = { version = "0.16.0", features = ["derive"] }
 rustecal-core   = { version = "0.1", path = "../rustecal-core" }
 rustecal-pubsub = { version = "0.1", path = "../rustecal-pubsub" }

rustecal-types-protobuf/src/lib.rs

@@ -3,6 +3,7 @@
 //! Provides support for Protobuf message serialization with rustecal.
 
 use prost::Message;
+use prost_reflect::ReflectMessage;
 use rustecal_core::types::DataTypeInfo;
 use rustecal_pubsub::typed_publisher::PublisherMessage;
 use rustecal_pubsub::typed_subscriber::SubscriberMessage;
@@ -26,7 +27,7 @@ pub struct ProtobufMessage<T> {
 
 impl<T> SubscriberMessage<'_> for ProtobufMessage<T>
 where
-    T: Message + Default + IsProtobufType,
+    T: Message + Default + IsProtobufType + ReflectMessage,
 {
     /// Returns metadata used by eCAL to describe the Protobuf type.
     ///
@@ -35,10 +36,12 @@ where
     /// - the Rust type name
     /// - an optional descriptor (currently empty)
     fn datatype() -> DataTypeInfo {
+        let default_instance = T::default();
+
         DataTypeInfo {
             encoding: "proto".to_string(),
-            type_name: std::any::type_name::<T>().to_string(),
-            descriptor: vec![], // descriptor injection planned
+            type_name: default_instance.descriptor().full_name().to_string(),
+            descriptor: default_instance.descriptor().parent_pool().encode_to_vec(), // descriptor injection planned
         }
     }
 
@@ -56,7 +59,7 @@ where
 
 impl<T> PublisherMessage for ProtobufMessage<T>
 where
-    T: Message + Default + IsProtobufType,
+    T: Message + Default + IsProtobufType + ReflectMessage,
 {
     /// Returns the same datatype information as [`SubscriberMessage`] implementation.
     fn datatype() -> DataTypeInfo {

rustecal/src/lib.rs

@@ -9,14 +9,14 @@
 //! - `service`: Synchronous RPC communication.
 //!
 //! ## Example
-//! ```rust
+//! '''rust
 //! use rustecal::{Ecal, TypedPublisher};
 //! use rustecal_types_string::StringMessage;
 //!
 //! Ecal::initialize(Some("example node"), EcalComponents::DEFAULT, None).unwrap();
 //! let pub_ = TypedPublisher::<StringMessage>::new("hello topic").unwrap();
 //! pub_.send(&StringMessage{data: "Hello!".into()}, Timestamp::Auto);
-//! ```
+//! '''
 //!
 
 // —————————————————————————————————————————————————————————————————————————————