mqtt: fixes for msvc-22/gcc/clang building

viacheslauK · viacheslauK · commit 810dc2a0ed66 · 2026-01-12T15:42:53.000+03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,6 @@ if (POLICY CMP0077)
     cmake_policy(SET CMP0077 NEW)
 endif()
 
-
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 list(APPEND CMAKE_MESSAGE_CONTEXT ${REPO_NAME})
 set(CMAKE_MESSAGE_CONTEXT_SHOW ON CACHE BOOL "Show CMake message context")
@@ -39,6 +38,7 @@ if ((CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) AND NOT MSVC)
     if (NOT WIN32)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
     endif()
+	add_compile_options(-Wno-deprecated-declarations)
 endif()
 
 include(CommonUtils)
diff --git a/external/mqtt/CMakeLists.txt b/external/mqtt/CMakeLists.txt
@@ -22,28 +22,37 @@ endif()
 set(PAHO_BUILD_STATIC ON CACHE BOOL "Build static paho library" FORCE)
 set(PAHO_BUILD_SHARED OFF CACHE BOOL "Build dynamic paho library" FORCE)
 set(CMAKE_POSITION_INDEPENDENT_CODE ${PAHO_BUILD_STATIC} CACHE BOOL "" FORCE)
-set(PAHO_ENABLE_TESTING ON CACHE BOOL "" FORCE)
+set(PAHO_ENABLE_TESTING OFF CACHE BOOL "" FORCE)
 
 set(CMAKE_FOLDER "${CMAKE_FOLDER}/mqtt")
 
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+
 add_subdirectory(${paho_mqtt_c_SOURCE_DIR} ${paho_mqtt_c_BINARY_DIR})
 
 # Apply WIN32_LEAN_AND_MEAN to the Paho MQTT C library as well
 if(WIN32)
     # Add global compile definition to prevent inclusion of winsock.h and force winsock2.h
-    if(PAHO_WITH_SSL)
-		target_compile_definitions(paho-mqtt3as PRIVATE _WINSOCKAPI_)
-		target_compile_definitions(paho-mqtt3as PRIVATE NOMINMAX)
-		target_compile_definitions(paho-mqtt3as PRIVATE WIN32_LEAN_AND_MEAN)
-    	target_compile_definitions(common_ssl_obj PRIVATE _WINSOCKAPI_)
-    	target_compile_definitions(common_ssl_obj PRIVATE NOMINMAX)
-    	target_compile_definitions(common_ssl_obj PRIVATE WIN32_LEAN_AND_MEAN)
-    else()
-    	target_compile_definitions(paho-mqtt3a PRIVATE _WINSOCKAPI_)
-    	target_compile_definitions(paho-mqtt3a PRIVATE NOMINMAX)
-    	target_compile_definitions(paho-mqtt3a PRIVATE WIN32_LEAN_AND_MEAN)
-    	target_compile_definitions(common_obj PRIVATE _WINSOCKAPI_)
-    	target_compile_definitions(common_obj PRIVATE NOMINMAX)
-    	target_compile_definitions(common_obj PRIVATE WIN32_LEAN_AND_MEAN)
-    endif()
-endif()
+    foreach(tgt
+        paho-mqtt3a
+        paho-mqtt3a-static
+        paho-mqtt3c
+        paho-mqtt3c-static
+        paho-mqtt3as
+        paho-mqtt3as-static
+        common_obj
+        common_ssl_obj
+        common_obj_static
+        common_ssl_obj_static
+    )
+        if(TARGET ${tgt})
+            target_compile_definitions("${tgt}" PRIVATE _WINSOCKAPI_ NOMINMAX WIN32_LEAN_AND_MEAN)
+            if(MSVC)
+                target_compile_options(${tgt} PRIVATE /WX-)
+            endif()
+        endif()
+    endforeach()
+    target_compile_options(Base64Test PRIVATE /WX-)
+    target_compile_options(Sha1Test PRIVATE /WX-)
+endif()
diff --git a/mqtt_streaming_module/CMakeLists.txt b/mqtt_streaming_module/CMakeLists.txt
@@ -7,6 +7,12 @@ set(MQTT_MODULE_PRJ_NAME "OpenDaqMqttModule")
 message(STATUS "${MQTT_MODULE_PRJ_NAME} version: ${MQTT_MODULE_VERSION}")
 project(${MQTT_MODULE_PRJ_NAME} VERSION ${MQTT_MODULE_VERSION} LANGUAGES C CXX)
 
+if(MSVC)
+    add_compile_options(
+        $<$<CONFIG:Release>:/wd4201>
+    )
+endif()
+
 add_subdirectory(src)
 if (OPENDAQ_MQTT_ENABLE_TESTS)
     add_subdirectory(tests)
diff --git a/mqtt_streaming_module/include/mqtt_streaming_module/common.h b/mqtt_streaming_module/include/mqtt_streaming_module/common.h
@@ -19,3 +19,13 @@
 
 #define BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE BEGIN_NAMESPACE_OPENDAQ_MODULE(mqtt_streaming_module)
 #define END_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE END_NAMESPACE_OPENDAQ_MODULE
+
+#if defined(_WIN32)
+    #ifdef OPENDAQ_MODULE_DLL_IMPORT
+        #define DAQ_MQTT_STREAM_MODULE_API __declspec(dllexport)
+    #else
+        #define DAQ_MQTT_STREAM_MODULE_API __declspec(dllimport)
+    #endif
+#else
+    #define DAQ_MQTT_STREAM_MODULE_API
+#endif
diff --git a/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_base_fb.h b/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_base_fb.h
@@ -50,13 +50,13 @@ class MqttBaseFb : public FunctionBlock
     };
 
 
-    explicit MqttBaseFb(const ContextPtr& ctx,
+    explicit DAQ_MQTT_STREAM_MODULE_API MqttBaseFb(const ContextPtr& ctx,
                                 const ComponentPtr& parent,
                                 const FunctionBlockTypePtr& type,
                                 const StringPtr& localId,
                                 std::shared_ptr<mqtt::MqttAsyncClient> subscriber,
                                 const PropertyObjectPtr& config = nullptr);
-    ~MqttBaseFb() = default;
+    virtual ~MqttBaseFb() = default;
 
     virtual std::string getSubscribedTopic() const = 0;
 
@@ -72,7 +72,7 @@ class MqttBaseFb : public FunctionBlock
     void initProperties(const PropertyObjectPtr& config);
     virtual void readProperties() = 0;
 
-    void onSignalsMessage(const mqtt::MqttAsyncClient& subscriber, const mqtt::MqttMessage& msg);
+    DAQ_MQTT_STREAM_MODULE_API void onSignalsMessage(const mqtt::MqttAsyncClient& subscriber, const mqtt::MqttMessage& msg);
 
     virtual void clearSubscribedTopic() = 0;
     CmdResult subscribeToTopic();
diff --git a/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_json_receiver_fb_impl.h b/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_json_receiver_fb_impl.h
@@ -29,16 +29,16 @@ class MqttJsonReceiverFbImpl final : public MqttBaseFb
     friend class MqttJsonDecoderFbHelper;
 
 public:
-    explicit MqttJsonReceiverFbImpl(const ContextPtr& ctx,
+    explicit DAQ_MQTT_STREAM_MODULE_API MqttJsonReceiverFbImpl(const ContextPtr& ctx,
                                 const ComponentPtr& parent,
                                 const FunctionBlockTypePtr& type,
                                 std::shared_ptr<mqtt::MqttAsyncClient> subscriber,
                                 const PropertyObjectPtr& config = nullptr);
-    ~MqttJsonReceiverFbImpl() override;
+    DAQ_MQTT_STREAM_MODULE_API ~MqttJsonReceiverFbImpl() override;
 
-    static FunctionBlockTypePtr CreateType();
+    DAQ_MQTT_STREAM_MODULE_API static FunctionBlockTypePtr CreateType();
 
-    std::string getSubscribedTopic() const override;
+    DAQ_MQTT_STREAM_MODULE_API std::string getSubscribedTopic() const override;
 
 protected:
     mqtt::MqttDataWrapper jsonDataWorker;
diff --git a/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_publisher_fb_impl.h b/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_publisher_fb_impl.h
@@ -55,15 +55,22 @@ class MqttPublisherFbImpl final : public FunctionBlock
                                  const PropertyObjectPtr& config = nullptr);
     ~MqttPublisherFbImpl();
 
-    static FunctionBlockTypePtr CreateType();
-    PublisherFbConfig getFbConfig() const;
+    DAQ_MQTT_STREAM_MODULE_API static FunctionBlockTypePtr CreateType();
+    DAQ_MQTT_STREAM_MODULE_API PublisherFbConfig getFbConfig() const;
 
     void onConnected(const InputPortPtr& port) override;
     void onDisconnected(const InputPortPtr& port) override;
 
-    static const std::vector<std::pair<SignalStatus, std::string>> signalStatusMap;
-    static const std::vector<std::pair<PublishingStatus, std::string>> publishingStatusMap;
-    static const std::vector<std::pair<SettingStatus, std::string>> settingStatusMap;
+    inline static const std::vector<std::pair<SignalStatus, std::string>> signalStatusMap =
+		{{SignalStatus::NotConnected, "NotConnected"},
+		 {SignalStatus::Invalid, "Invalid"},
+		 {SignalStatus::Valid, "Valid"}};
+    inline static const std::vector<std::pair<PublishingStatus, std::string>> publishingStatusMap =
+		{{PublishingStatus::Ok, "Ok"},
+		 {PublishingStatus::SampleSkipped, "SampleSkipped"}};
+    inline static const std::vector<std::pair<SettingStatus, std::string>> settingStatusMap =
+		{{SettingStatus::Valid, "Valid"},
+		 {SettingStatus::Invalid, "Invalid"}};
 
 private:
     static std::atomic<int> localIndex;
diff --git a/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_raw_receiver_fb_impl.h b/mqtt_streaming_module/include/mqtt_streaming_module/mqtt_raw_receiver_fb_impl.h
@@ -27,12 +27,12 @@ class MqttRawReceiverFbImpl final : public MqttBaseFb
     friend class MqttRawFbTest;
 
 public:
-    explicit MqttRawReceiverFbImpl(const ContextPtr& ctx,
+    explicit DAQ_MQTT_STREAM_MODULE_API MqttRawReceiverFbImpl(const ContextPtr& ctx,
                                    const ComponentPtr& parent,
                                    const FunctionBlockTypePtr& type,
                                    std::shared_ptr<mqtt::MqttAsyncClient> subscriber,
                                    const PropertyObjectPtr& config = nullptr);
-    ~MqttRawReceiverFbImpl() override;
+    DAQ_MQTT_STREAM_MODULE_API ~MqttRawReceiverFbImpl() override;
 
     static FunctionBlockTypePtr CreateType();
 
diff --git a/mqtt_streaming_module/src/CMakeLists.txt b/mqtt_streaming_module/src/CMakeLists.txt
@@ -90,6 +90,10 @@ if (MSVC)
     target_compile_options(${LIB_NAME} PRIVATE /bigobj)
 endif()
 
+if (WIN32)
+    target_compile_definitions(${LIB_NAME} PRIVATE OPENDAQ_MODULE_DLL_IMPORT)
+endif()
+
 target_link_libraries(${LIB_NAME} PUBLIC  daq::opendaq
                                           mqtt_streaming_protocol
                                           mqtt_streaming_helper
diff --git a/mqtt_streaming_module/src/mqtt_json_decoder_fb_impl.cpp b/mqtt_streaming_module/src/mqtt_json_decoder_fb_impl.cpp
@@ -1,6 +1,7 @@
 #include "mqtt_streaming_module/constants.h"
 #include <mqtt_streaming_module/helper.h>
 #include <mqtt_streaming_module/mqtt_json_decoder_fb_impl.h>
+#include <chrono>
 
 BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE
 
diff --git a/mqtt_streaming_module/src/mqtt_json_receiver_fb_impl.cpp b/mqtt_streaming_module/src/mqtt_json_receiver_fb_impl.cpp
@@ -8,8 +8,6 @@
 
 BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE
 
-constexpr int MQTT_JSON_FB_UNSUBSCRIBE_TOUT = 3000;
-
 std::atomic<int> MqttJsonReceiverFbImpl::localIndex = 0;
 
 MqttJsonReceiverFbImpl::MqttJsonReceiverFbImpl(const ContextPtr& ctx,
@@ -231,16 +229,16 @@ void MqttJsonReceiverFbImpl::setJsonConfig(const std::string config)
             }
             if (const auto signalDscs = jsonDataWorker.extractDescription(); !signalDscs.empty())
             {
-                auto config = MqttJsonDecoderFbImpl::CreateType().createDefaultConfig();
+                auto fbConfig = MqttJsonDecoderFbImpl::CreateType().createDefaultConfig();
                 for (const auto& [signalName, descriptor] : signalDscs)
                 {
                     LOG_I("Creating a decoder FB for the signal \"{}\":", signalName);
-                    config.setPropertyValue(PROPERTY_NAME_VALUE_NAME, descriptor.valueFieldName);
-                    config.setPropertyValue(PROPERTY_NAME_TS_NAME, descriptor.tsFieldName);
-                    config.setPropertyValue(PROPERTY_NAME_SIGNAL_NAME, signalName);
+                    fbConfig.setPropertyValue(PROPERTY_NAME_VALUE_NAME, descriptor.valueFieldName);
+                    fbConfig.setPropertyValue(PROPERTY_NAME_TS_NAME, descriptor.tsFieldName);
+                    fbConfig.setPropertyValue(PROPERTY_NAME_SIGNAL_NAME, signalName);
                     if (descriptor.unit.assigned())
-                        config.setPropertyValue(PROPERTY_NAME_UNIT, descriptor.unit.getSymbol());
-                    MqttJsonReceiverFbImpl::onAddFunctionBlock(JSON_DECODER_FB_NAME, config);
+                        fbConfig.setPropertyValue(PROPERTY_NAME_UNIT, descriptor.unit.getSymbol());
+                    MqttJsonReceiverFbImpl::onAddFunctionBlock(JSON_DECODER_FB_NAME, fbConfig);
                 }
             }
         }
diff --git a/mqtt_streaming_module/src/mqtt_publisher_fb_impl.cpp b/mqtt_streaming_module/src/mqtt_publisher_fb_impl.cpp
@@ -9,19 +9,6 @@ BEGIN_NAMESPACE_OPENDAQ_MQTT_STREAMING_MODULE
 
 std::atomic<int> MqttPublisherFbImpl::localIndex = 0;
 
-const std::vector<std::pair<MqttPublisherFbImpl::SignalStatus, std::string>> MqttPublisherFbImpl::signalStatusMap =
-    {{SignalStatus::NotConnected, "NotConnected"},
-     {SignalStatus::Invalid, "Invalid"},
-     {SignalStatus::Valid, "Valid"}};
-
-const std::vector<std::pair<MqttPublisherFbImpl::PublishingStatus, std::string>> MqttPublisherFbImpl::publishingStatusMap =
-    {{PublishingStatus::Ok, "Ok"},
-     {PublishingStatus::SampleSkipped, "SampleSkipped"}};
-
-const std::vector<std::pair<MqttPublisherFbImpl::SettingStatus, std::string>> MqttPublisherFbImpl::settingStatusMap =
-    {{SettingStatus::Valid, "Valid"},
-     {SettingStatus::Invalid, "Invalid"}};
-
 MqttPublisherFbImpl::MqttPublisherFbImpl(const ContextPtr& ctx,
                                          const ComponentPtr& parent,
                                          const FunctionBlockTypePtr& type,
@@ -34,8 +21,6 @@ MqttPublisherFbImpl::MqttPublisherFbImpl(const ContextPtr& ctx,
       running(true),
       hasSignalError(false),
       hasSettingError(false),
-      skippedMsgCnt(0),
-      publishingStatusTimer(helper::utils::Timer(1000, false)),
       signalStatus(MQTT_PUB_FB_SIG_STATUS_TYPE,
                    MQTT_PUB_FB_SIG_STATUS_NAME,
                    statusContainer,
@@ -53,7 +38,9 @@ MqttPublisherFbImpl::MqttPublisherFbImpl(const ContextPtr& ctx,
                     statusContainer,
                     settingStatusMap,
                     SettingStatus::Valid,
-                    context.getTypeManager())
+                    context.getTypeManager()),
+      skippedMsgCnt(0),
+      publishingStatusTimer(helper::utils::Timer(1000, false))
 {
     initComponentStatus();
     if (config.assigned())
@@ -195,7 +182,7 @@ void MqttPublisherFbImpl::updateInputPorts()
 
     const auto inputPort = createAndAddInputPort(fmt::format("Input{}", inputPortCount++), PacketReadyNotification::SameThread);
 
-    signalContexts.emplace_back(SignalContext{0, inputPort});
+    signalContexts.emplace_back(SignalContext{0, inputPort, {}});
     for (size_t i = 0; i < signalContexts.size(); i++)
         signalContexts[i].index = i;
 }
diff --git a/mqtt_streaming_module/tests/CMakeLists.txt b/mqtt_streaming_module/tests/CMakeLists.txt
@@ -17,11 +17,14 @@ add_executable(${TEST_APP} ${TEST_SOURCES}
 
 target_link_libraries(${TEST_APP} PRIVATE daq::test_utils
                                           ${MODULE_NAME}
-                                          mqtt_stream_module
                                           mqtt_streaming_protocol_test_helper
                                           mqtt_streaming_helper
 )
 
+if (MSVC)
+    target_compile_options(${TEST_APP} PRIVATE /bigobj)
+endif()
+
 add_custom_command(
     TARGET ${TEST_APP} POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory
diff --git a/mqtt_streaming_module/tests/test_mqtt_json_decoder_fb.cpp b/mqtt_streaming_module/tests/test_mqtt_json_decoder_fb.cpp
@@ -11,6 +11,7 @@
 #include <mqtt_streaming_module/constants.h>
 #include <opendaq/reader_factory.h>
 #include <testutils/testutils.h>
+#include <chrono>
 
 using namespace daq;
 using namespace daq::modules::mqtt_streaming_module;
@@ -310,7 +311,6 @@ class MqttJsonDecoderFbHelper : public DaqTestHelper
             if (packet.getType() == PacketType::Data)
             {
                 const auto dataPacket = packet.asPtr<IDataPacket>();
-                const auto dataType = dataPacket.getDataDescriptor().getSampleType();
                 if constexpr (is_pair<T>::value)
                 {
                     T dataToReceiveEntry;
diff --git a/mqtt_streaming_module/tests/test_mqtt_publisher_fb.cpp b/mqtt_streaming_module/tests/test_mqtt_publisher_fb.cpp
@@ -174,7 +174,7 @@ class SignalHelper
             {
                 if constexpr (std::is_integral_v<T>)
                 {
-                    sampleData = i;
+                    sampleData = static_cast<T>(i);
                     if constexpr (std::is_signed_v<T>)
                     {
                         sampleData *= ((i % 2 == 0) ? 1 : -1);
@@ -214,9 +214,9 @@ class MqttPublisherFbHelper : public DaqTestHelper
                            bool groupV,
                            bool useSignalNames,
                            const std::string& topicName,
-                           uint valuePackSize = 0,
-                           uint qos = 2,
-                           uint readPeriod = 20)
+                           size_t valuePackSize = 0,
+                           int qos = 2,
+                           uint32_t readPeriod = 20)
     {
         auto config = rootMqttFb.getAvailableFunctionBlockTypes().get(PUB_FB_NAME).createDefaultConfig();
         config.setPropertyValue(PROPERTY_NAME_PUB_TOPIC_MODE, multiTopic ? 1 : 0);
@@ -1104,18 +1104,18 @@ TEST_F(MqttPublisherFbTest, DISABLED_MultiReaderTest)
         if (status.getReadStatus() == ReadStatus::Ok && count > 0)
         {
             sampleCnt += count;
-            for (SizeT sampleCnt = 0; sampleCnt < count; ++sampleCnt)
+            for (SizeT cnt = 0; cnt < count; ++cnt)
             {
                 std::vector<std::string> fields;
                 for (size_t signalCnt = 0; signalCnt < signalNum; ++signalCnt)
                 {
                     std::string valueFieldName = "Signal" + std::to_string(signalCnt);
-                    fields.emplace_back(toString(valueFieldName, dataBuffers[signalCnt], sampleCnt));
+                    fields.emplace_back(toString(valueFieldName, dataBuffers[signalCnt], cnt));
                 }
                 for (size_t signalCnt = 0; signalCnt < signalNum; ++signalCnt)
                 {
                     std::string valueFieldName = "TS" + std::to_string(signalCnt);
-                    fields.emplace_back(toString(valueFieldName, domainBuffers[signalCnt], sampleCnt));
+                    fields.emplace_back(toString(valueFieldName, domainBuffers[signalCnt], cnt));
                 }
                 std::string msg;
                 for (size_t i = 0; i < fields.size(); ++i)
diff --git a/mqtt_streaming_module/tests/test_mqtt_root_fb.cpp b/mqtt_streaming_module/tests/test_mqtt_root_fb.cpp
@@ -58,12 +58,12 @@ TEST_F(MqttFbTest, CreatingMqttFbWithDefaultConfig)
     auto fbs = instance.getFunctionBlocks();
     bool contain = false;
     daq::FunctionBlockPtr fbFromList;
-    for (const auto& fb : fbs)
+    for (const auto& fbInst : fbs)
     {
-        contain = (fb.getName() == std::string(MQTT_LOCAL_ROOT_FB_ID_PREFIX) + std::to_string(0));
+        contain = (fbInst.getName() == std::string(MQTT_LOCAL_ROOT_FB_ID_PREFIX) + std::to_string(0));
         if (contain)
         {
-            fbFromList = fb;
+            fbFromList = fbInst;
             break;
         }
     }
diff --git a/mqtt_streaming_module/tests/test_mqtt_streaming_module.cpp b/mqtt_streaming_module/tests/test_mqtt_streaming_module.cpp
diff --git a/mqtt_streaming_protocol/CMakeLists.txt b/mqtt_streaming_protocol/CMakeLists.txt
diff --git a/mqtt_streaming_protocol/include/timestampConverter.h b/mqtt_streaming_protocol/include/timestampConverter.h
diff --git a/mqtt_streaming_protocol/src/MqttAsyncClient.cpp b/mqtt_streaming_protocol/src/MqttAsyncClient.cpp
diff --git a/mqtt_streaming_protocol/src/MqttDataWrapper.cpp b/mqtt_streaming_protocol/src/MqttDataWrapper.cpp
diff --git a/mqtt_streaming_protocol/tests/MqttAsyncClientWrapper.cpp b/mqtt_streaming_protocol/tests/MqttAsyncClientWrapper.cpp
diff --git a/mqtt_streaming_protocol/tests/MqttAsyncClientWrapper.h b/mqtt_streaming_protocol/tests/MqttAsyncClientWrapper.h
