C++: add missing implementations for client advertised schema/encoding

foxglove · Nov 13, 2024 · 3df102a · 3df102a
1 parent a28e0b9
commit 3df102a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/cpp/foxglove-websocket/include/foxglove/websocket/common.hpp b/cpp/foxglove-websocket/include/foxglove/websocket/common.hpp
@@ -79,7 +79,8 @@ struct ClientAdvertisement {
   std::string topic;
   std::string encoding;
   std::string schemaName;
-  std::vector<uint8_t> schema;
+  std::optional<std::string> schema;
+  std::optional<std::string> schemaEncoding;
 };
 
 struct ClientMessage {

diff --git a/cpp/foxglove-websocket/include/foxglove/websocket/websocket_client.hpp b/cpp/foxglove-websocket/include/foxglove/websocket/websocket_client.hpp
@@ -23,6 +23,12 @@ inline void to_json(nlohmann::json& j, const ClientAdvertisement& p) {
                      {"topic", p.topic},
                      {"encoding", p.encoding},
                      {"schemaName", p.schemaName}};
+  if (p.schema) {
+    j["schema"] = *p.schema;
+  }
+  if (p.schemaEncoding) {
+    j["schemaEncoding"] = *p.schemaEncoding;
+  }
 }
 
 using TextMessageHandler = std::function<void(const std::string&)>;

diff --git a/cpp/foxglove-websocket/include/foxglove/websocket/websocket_server.hpp b/cpp/foxglove-websocket/include/foxglove/websocket/websocket_server.hpp
@@ -1339,6 +1339,12 @@ void Server<ServerConfiguration>::handleAdvertise(const nlohmann::json& payload,
     advertisement.topic = topic;
     advertisement.encoding = chan.at("encoding").get<std::string>();
     advertisement.schemaName = chan.at("schemaName").get<std::string>();
+    if (chan.contains("schema")) {
+      *advertisement.schema = chan.at("schema").get<std::string>();
+    }
+    if (chan.contains("schemaEncoding")) {
+      *advertisement.schemaEncoding = chan.at("schemaEncoding").get<std::string>();
+    }
 
     clientPublications.emplace(channelId, advertisement);
     {