mqtt: dynamic properties for publisher FB

Author: viacheslauK

mqtt_streaming_module/include/mqtt_streaming_module/handler_factory.h

@@ -31,7 +31,8 @@ class HandlerFactory
     {
         if (config.sharedTs)
         {
-            return std::make_unique<MultipleSharedHandler>(config.useSignalNames, config.topicName);
+            return std::make_unique<MultipleSharedHandler>(config.useSignalNames,
+                                                           config.topicName.empty() ? publisherFbGlobalId : config.topicName);
         }
         else if (config.topicMode == TopicMode::Single)
         {
@@ -42,7 +43,8 @@ class HandlerFactory
         }
         else if (config.topicMode == TopicMode::Multi)
         {
-            return std::make_unique<MultipleHandler>(config.useSignalNames, config.topicName);
+            return std::make_unique<MultipleHandler>(config.useSignalNames,
+                                                     config.topicName.empty() ? publisherFbGlobalId : config.topicName);
         }
 
         return std::make_unique<SingleHandler>(config.useSignalNames);

mqtt_streaming_module/include/mqtt_streaming_module/mqtt_publisher_fb_impl.h

@@ -55,6 +55,7 @@ class MqttPublisherFbImpl final : public FunctionBlock
     static std::string getLocalId();
     void initProperties(const PropertyObjectPtr& config);
     void readProperties();
+    void propertyChanged();
     void updateInputPorts();
     void validateInputPorts();
     template <typename retT, typename intfT>

mqtt_streaming_module/src/mqtt_publisher_fb_impl.cpp

@@ -52,9 +52,11 @@ FunctionBlockTypePtr MqttPublisherFbImpl::CreateType()
         defaultConfig.addProperty(builder.build());
     }
     {
-        auto builder = StringPropertyBuilder(PROPERTY_NAME_PUB_TOPIC_NAME, "")
-                           .setDescription("")
-                           .setVisible(EvalValue(std::string("$") + PROPERTY_NAME_PUB_TOPIC_MODE + " == 1"));
+        auto builder =
+            StringPropertyBuilder(PROPERTY_NAME_PUB_TOPIC_NAME, "")
+                .setDescription(
+                    "Topic name for publishing in multiple-topic mode. If left empty, the Publisher's Global ID is used as the topic name.")
+                .setVisible(EvalValue(std::string("$") + PROPERTY_NAME_PUB_TOPIC_MODE + " == 1"));
         defaultConfig.addProperty(builder.build());
     }
     {
@@ -190,6 +192,8 @@ void MqttPublisherFbImpl::initProperties(const PropertyObjectPtr& config)
             if (const auto internalProp = prop.asPtrOrNull<IPropertyInternal>(true); internalProp.assigned())
             {
                 objPtr.addProperty(internalProp.clone());
+                objPtr.getOnPropertyValueWrite(prop.getName()) +=
+                    [this](PropertyObjectPtr& obj, PropertyValueEventArgsPtr& args) { propertyChanged(); };
             }
         }
         objPtr.setPropertyValue(propName, prop.getValue());
@@ -200,7 +204,7 @@ void MqttPublisherFbImpl::initProperties(const PropertyObjectPtr& config)
 void MqttPublisherFbImpl::readProperties()
 {
     auto lock = this->getRecursiveConfigLock();
-    int tmpTopicMode = readProperty<int, IInteger>(PROPERTY_NAME_PUB_TOPIC_MODE, false);
+    int tmpTopicMode = readProperty<int, IInteger>(PROPERTY_NAME_PUB_TOPIC_MODE, 0);
     if (tmpTopicMode < static_cast<int>(TopicMode::_count) && tmpTopicMode >= 0)
         config.topicMode = static_cast<TopicMode>(tmpTopicMode);
     else
@@ -218,6 +222,14 @@ void MqttPublisherFbImpl::readProperties()
     config.topicName = readProperty<std::string, IString>(PROPERTY_NAME_PUB_TOPIC_NAME, DEFAULT_PUB_TOPIC_NAME);
 }
 
+void MqttPublisherFbImpl::propertyChanged()
+{
+    auto lock = this->getRecursiveConfigLock();
+    readProperties();
+    handler = HandlerFactory::create(this->config, globalId.toStdString());
+    validateInputPorts();
+}
+
 template <typename retT, typename intfT>
 retT MqttPublisherFbImpl::readProperty(const std::string& propertyName, const retT defaultValue)
 {