Update to latest DelegateMQ library

endurodave · endurodave · commit b653023fa153 · 2025-04-13T06:47:39.000-07:00
diff --git a/DelegateMQ/predef/serialize/serialize/msg_serialize.h b/DelegateMQ/predef/serialize/serialize/msg_serialize.h
@@ -546,9 +546,40 @@ class serialize
                 std::is_class<typename std::remove_pointer<T>::type>::value)),
             "T cannot be a pointer to a built-in or custom data type");
 
+        // If C++17 or higher
+#if defined(_MSVC_LANG) && _MSVC_LANG >= 201703L || __cplusplus >= 201703L 
+        // Check if T is a user-defined class
+        if constexpr (std::is_class<T>::value)
+        {
+            // Ensure that the class T inherits from serialize::I
+            static_assert(std::is_base_of<serialize::I, T>::value, "T must inherit from serialize::I");
+
+            // Proceed with serialization for user-defined type
+            return write(os, (serialize::I*)&t_);
+        }
+        else
+        {
+            // If T is not a class, handle built-in data types
+            if (std::is_pointer<T>::value == false)
+            {
+                if (prependType)
+                {
+                    write_type(os, Type::LITERAL);
+                }
+                return write_internal(os, (const char*)&t_, sizeof(t_));
+            }
+            else
+            {
+                // Can't write pointers to built-in types
+                raiseError(ParsingError::INVALID_INPUT, __LINE__, __FILE__);
+                os.setstate(std::ios::failbit);
+                return os;
+            }
+        }
+#else
         // Is T type a built-in data type (e.g. float, int, ...)?
         if (std::is_class<T>::value == false)
-        {    
+        {
             // Is T is not a pointer type
             if (std::is_pointer<T>::value == false)
             {
@@ -568,12 +599,13 @@ class serialize
         }
         // Else T type is a user defined data type (e.g. MyData)
         else
-        {     
+        {
             return write(os, (serialize::I*)&t_);
         }
+#endif
     }
 
-     /// Write a vector container to a stream. The items in vector are stored
+    /// Write a vector container to a stream. The items in vector are stored
     /// by value. 
     /// @param[in] os - the output stream
     /// @param[in] container - the vector container to write 
diff --git a/DelegateMQ/predef/transport/ITransport.h b/DelegateMQ/predef/transport/ITransport.h
@@ -15,9 +15,10 @@ class ITransport
     virtual int Send(xostringstream& os, const DmqHeader& header) = 0;
 
     /// Receive data from a remote
+    /// @param[out] is The received incoming data bytes, not including the header.
     /// @param[out] header Incoming delegate message header.
-    /// @return The received incoming data bytes, not including the header.
-    virtual xstringstream Receive(DmqHeader& header) = 0;
+    /// @return 0 if success.
+    virtual int Receive(xstringstream& is, DmqHeader& header) = 0;
 };
 
 #endif
diff --git a/DelegateMQ/predef/transport/mqtt/MqttTransport.h b/DelegateMQ/predef/transport/mqtt/MqttTransport.h
@@ -185,12 +185,12 @@ class MqttTransport : public ITransport
         }
     }
 
-    virtual xstringstream Receive(DmqHeader& header) override
+    virtual int Receive(xstringstream& is, DmqHeader& header) override
     {
         xstringstream headerStream(std::ios::in | std::ios::out | std::ios::binary);
 
         if (!m_payload)
-            return headerStream;
+            return -1;
 
         // Find the position of the opening square bracket
         size_t headerStart = 0;
@@ -200,7 +200,7 @@ class MqttTransport : public ITransport
 
         if (headerStart == m_payloadLen) {
             std::cerr << "Invalid header format: Missing opening '['" << std::endl;
-            return headerStream;
+            return -1;
         }
 
         // Find the position of the closing square bracket
@@ -211,7 +211,7 @@ class MqttTransport : public ITransport
 
         if (headerEnd == m_payloadLen) {
             std::cerr << "Invalid header format: Missing closing ']'" << std::endl;
-            return headerStream;
+            return -1;
         }
 
         // Calculate the header size (everything between '[' and ']')
@@ -232,14 +232,12 @@ class MqttTransport : public ITransport
         // Check for the correct sync marker
         if (header.GetMarker() != DmqHeader::MARKER) {
             std::cerr << "Invalid sync marker!" << std::endl;
-            return headerStream;
+            return -1;
         }
 
-        xstringstream argStream(std::ios::in | std::ios::out | std::ios::binary);
-
         // The remaining data after the closing bracket is the JSON part
         size_t jsonStart = headerEnd + 1; // After the closing header bracket ']'
-        argStream.write(m_payload + jsonStart, m_payloadLen - jsonStart);
+        is.write(m_payload + jsonStart, m_payloadLen - jsonStart);
 
         if (id == dmq::ACK_REMOTE_ID)
         {
@@ -260,8 +258,8 @@ class MqttTransport : public ITransport
             }
         }
 
-        // argStream contains the serialized remote argument data
-        return argStream;
+        // `is` stream contains the serialized remote argument data
+        return 0;   // success
     }
 
     void SetReceiveHandler(IMqttReceiveHandler* handler)
diff --git a/DelegateMQ/predef/transport/win32-pipe/Win32PipeTransport.h b/DelegateMQ/predef/transport/win32-pipe/Win32PipeTransport.h
@@ -110,25 +110,25 @@ class Win32PipeTransport : public ITransport
         return 0;
     }
 
-    virtual xstringstream Receive(DmqHeader& header) override
+    virtual int Receive(xstringstream& is, DmqHeader& header) override
     {
         xstringstream headerStream(std::ios::in | std::ios::out | std::ios::binary);
 
         // Check if client connected
         BOOL connected = ConnectNamedPipe(m_hPipe, NULL) ?
             TRUE : (GetLastError() == ERROR_PIPE_CONNECTED);
         if (connected == FALSE)
-            return headerStream;
+            return -1;
 
         DWORD size = 0;
         BOOL success = ReadFile(m_hPipe, m_buffer, BUFFER_SIZE, &size, NULL);
 
         if (success == FALSE || size <= 0)
-            return headerStream;
+            return -1;
 
         if (size <= DmqHeader::HEADER_SIZE) {
             std::cerr << "Received data is too small to process." << std::endl;
-            return headerStream;
+            return -1;
         }
 
         // Write the received data into the stringstream
@@ -141,7 +141,7 @@ class Win32PipeTransport : public ITransport
 
         if (header.GetMarker() != DmqHeader::MARKER) {
             std::cerr << "Invalid sync marker!" << std::endl;
-            return headerStream;  // TODO: Optionally handle this case more gracefully
+            return -1;  // TODO: Optionally handle this case more gracefully
         }
 
         // Read the DelegateRemoteId (2 bytes) into the `id` variable
@@ -154,13 +154,11 @@ class Win32PipeTransport : public ITransport
         headerStream.read(reinterpret_cast<char*>(&seqNum), sizeof(seqNum));
         header.SetSeqNum(seqNum);
 
-        xstringstream argStream(std::ios::in | std::ios::out | std::ios::binary);
-
         // Write the remaining argument data to stream
-        argStream.write(m_buffer + DmqHeader::HEADER_SIZE, size - DmqHeader::HEADER_SIZE);
+        is.write(m_buffer + DmqHeader::HEADER_SIZE, size - DmqHeader::HEADER_SIZE);
 
         // Now `is` contains the rest of the remote argument data
-        return argStream;
+        return 0;  // Success
     }
 
 private:
diff --git a/DelegateMQ/predef/transport/win32-udp/Win32UdpTransport.h b/DelegateMQ/predef/transport/win32-udp/Win32UdpTransport.h
@@ -121,7 +121,7 @@ class Win32UdpTransport : public ITransport
         return 0;
     }
 
-    virtual xstringstream Receive(DmqHeader& header) override
+    virtual int Receive(xstringstream& is, DmqHeader& header) override
     {
         xstringstream headerStream(std::ios::in | std::ios::out | std::ios::binary);
 
@@ -130,7 +130,7 @@ class Win32UdpTransport : public ITransport
         if (size == SOCKET_ERROR) 
         {
             std::cerr << "recvfrom failed." << std::endl;
-            return headerStream;
+            return -1;
         }
 
         // Write the received data into the stringstream
@@ -143,7 +143,7 @@ class Win32UdpTransport : public ITransport
 
         if (header.GetMarker() != DmqHeader::MARKER) {
             std::cerr << "Invalid sync marker!" << std::endl;
-            return headerStream;  // TODO: Optionally handle this case more gracefully
+            return -1;  // TODO: Optionally handle this case more gracefully
         }
 
         // Read the DelegateRemoteId (2 bytes) into the `id` variable
@@ -156,13 +156,11 @@ class Win32UdpTransport : public ITransport
         headerStream.read(reinterpret_cast<char*>(&seqNum), sizeof(seqNum));
         header.SetSeqNum(seqNum);
 
-        xstringstream argStream(std::ios::in | std::ios::out | std::ios::binary);
-
         // Write the remaining argument data to stream
-        argStream.write(m_buffer + DmqHeader::HEADER_SIZE, size - DmqHeader::HEADER_SIZE);
+        is.write(m_buffer + DmqHeader::HEADER_SIZE, size - DmqHeader::HEADER_SIZE);
 
         // argStream contains the serialized remote argument data
-        return argStream;
+        return 0;   // Success
     }
 
 private:
diff --git a/DelegateMQ/predef/transport/zeromq/ZeroMqTransport.h b/DelegateMQ/predef/transport/zeromq/ZeroMqTransport.h
diff --git a/DelegateMQ/predef/util/TransportMonitor.h b/DelegateMQ/predef/util/TransportMonitor.h

Original file line number	Diff line number	Diff line change
`@@ -185,12 +185,12 @@ class MqttTransport : public ITransport`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`
`188`		`- virtual xstringstream Receive(DmqHeader& header) override`
	`188`	`+ virtual int Receive(xstringstream& is, DmqHeader& header) override`
`189`	`189`	`{`
`190`	`190`	`xstringstream headerStream(std::ios::in \| std::ios::out \| std::ios::binary);`
`191`	`191`
`192`	`192`	`if (!m_payload)`
`193`		`- return headerStream;`
	`193`	`+ return -1;`
`194`	`194`
`195`	`195`	`// Find the position of the opening square bracket`
`196`	`196`	`size_t headerStart = 0;`
`@@ -200,7 +200,7 @@ class MqttTransport : public ITransport`
`200`	`200`
`201`	`201`	`if (headerStart == m_payloadLen) {`
`202`	`202`	`std::cerr << "Invalid header format: Missing opening '['" << std::endl;`
`203`		`- return headerStream;`
	`203`	`+ return -1;`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`// Find the position of the closing square bracket`
`@@ -211,7 +211,7 @@ class MqttTransport : public ITransport`
`211`	`211`
`212`	`212`	`if (headerEnd == m_payloadLen) {`
`213`	`213`	`std::cerr << "Invalid header format: Missing closing ']'" << std::endl;`
`214`		`- return headerStream;`
	`214`	`+ return -1;`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`// Calculate the header size (everything between '[' and ']')`
`@@ -232,14 +232,12 @@ class MqttTransport : public ITransport`
`232`	`232`	`// Check for the correct sync marker`
`233`	`233`	`if (header.GetMarker() != DmqHeader::MARKER) {`
`234`	`234`	`std::cerr << "Invalid sync marker!" << std::endl;`
`235`		`- return headerStream;`
	`235`	`+ return -1;`
`236`	`236`	`}`
`237`	`237`
`238`		`- xstringstream argStream(std::ios::in \| std::ios::out \| std::ios::binary);`
`239`		`-`
`240`	`238`	`// The remaining data after the closing bracket is the JSON part`
`241`	`239`	`size_t jsonStart = headerEnd + 1; // After the closing header bracket ']'`
`242`		`- argStream.write(m_payload + jsonStart, m_payloadLen - jsonStart);`
	`240`	`+ is.write(m_payload + jsonStart, m_payloadLen - jsonStart);`
`243`	`241`
`244`	`242`	`if (id == dmq::ACK_REMOTE_ID)`
`245`	`243`	`{`
`@@ -260,8 +258,8 @@ class MqttTransport : public ITransport`
`260`	`258`	`}`
`261`	`259`	`}`
`262`	`260`
`263`		`- // argStream contains the serialized remote argument data`
`264`		`- return argStream;`
	`261`	+ // `is` stream contains the serialized remote argument data
	`262`	`+ return 0; // success`
`265`	`263`	`}`
`266`	`264`
`267`	`265`	`void SetReceiveHandler(IMqttReceiveHandler* handler)`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ class Win32UdpTransport : public ITransport`
`121`	`121`	`return 0;`
`122`	`122`	`}`
`123`	`123`
`124`		`- virtual xstringstream Receive(DmqHeader& header) override`
	`124`	`+ virtual int Receive(xstringstream& is, DmqHeader& header) override`
`125`	`125`	`{`
`126`	`126`	`xstringstream headerStream(std::ios::in \| std::ios::out \| std::ios::binary);`
`127`	`127`
`@@ -130,7 +130,7 @@ class Win32UdpTransport : public ITransport`
`130`	`130`	`if (size == SOCKET_ERROR)`
`131`	`131`	`{`
`132`	`132`	`std::cerr << "recvfrom failed." << std::endl;`
`133`		`- return headerStream;`
	`133`	`+ return -1;`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// Write the received data into the stringstream`
`@@ -143,7 +143,7 @@ class Win32UdpTransport : public ITransport`
`143`	`143`
`144`	`144`	`if (header.GetMarker() != DmqHeader::MARKER) {`
`145`	`145`	`std::cerr << "Invalid sync marker!" << std::endl;`
`146`		`- return headerStream; // TODO: Optionally handle this case more gracefully`
	`146`	`+ return -1; // TODO: Optionally handle this case more gracefully`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	// Read the DelegateRemoteId (2 bytes) into the `id` variable
`@@ -156,13 +156,11 @@ class Win32UdpTransport : public ITransport`
`156`	`156`	`headerStream.read(reinterpret_cast<char*>(&seqNum), sizeof(seqNum));`
`157`	`157`	`header.SetSeqNum(seqNum);`
`158`	`158`
`159`		`- xstringstream argStream(std::ios::in \| std::ios::out \| std::ios::binary);`
`160`		`-`
`161`	`159`	`// Write the remaining argument data to stream`
`162`		`- argStream.write(m_buffer + DmqHeader::HEADER_SIZE, size - DmqHeader::HEADER_SIZE);`
	`160`	`+ is.write(m_buffer + DmqHeader::HEADER_SIZE, size - DmqHeader::HEADER_SIZE);`
`163`	`161`
`164`	`162`	`// argStream contains the serialized remote argument data`
`165`		`- return argStream;`
	`163`	`+ return 0; // Success`
`166`	`164`	`}`
`167`	`165`
`168`	`166`	`private:`