Add non-async overloads for JsonRpc::ReadMessage() and JsonRpc::SendMessage()

diff --git a/lib/remote/jsonrpc.cpp b/lib/remote/jsonrpc.cpp
index 03f3c7d0e08a7ea0e87ba0b5660a6cc463dbe06a..63bc5ff85aa6128f41a0b18c3b6d4cef6f59bc83 100644 (file)
--- a/lib/remote/jsonrpc.cpp
+++ b/lib/remote/jsonrpc.cpp
@@ -59,6 +59,25 @@ size_t JsonRpc::SendMessage(const Stream::Ptr& stream, const Dictionary::Ptr& me
        return NetString::WriteStringToStream(stream, json);
 }
 
+/**
+ * Sends a message to the connected peer and returns the bytes sent.
+ *
+ * @param message The message.
+ *
+ * @return The amount of bytes sent.
+ */
+size_t JsonRpc::SendMessage(const std::shared_ptr<AsioTlsStream>& stream, const Dictionary::Ptr& message)
+{
+       String json = JsonEncode(message);
+
+#ifdef I2_DEBUG
+       if (GetDebugJsonRpcCached())
+               std::cerr << ConsoleColorTag(Console_ForegroundBlue) << ">> " << json << ConsoleColorTag(Console_Normal) << "\n";
+#endif /* I2_DEBUG */
+
+       return NetString::WriteStringToStream(stream, json);
+}
+
 /**
  * Sends a message to the connected peer and returns the bytes sent.
  *
@@ -106,6 +125,18 @@ StreamReadStatus JsonRpc::ReadMessage(const Stream::Ptr& stream, String *message
        return StatusNewItem;
 }
 
+String JsonRpc::ReadMessage(const std::shared_ptr<AsioTlsStream>& stream, ssize_t maxMessageLength)
+{
+       String jsonString = NetString::ReadStringFromStream(stream, maxMessageLength);
+
+#ifdef I2_DEBUG
+       if (GetDebugJsonRpcCached())
+               std::cerr << ConsoleColorTag(Console_ForegroundBlue) << "<< " << jsonString << ConsoleColorTag(Console_Normal) << "\n";
+#endif /* I2_DEBUG */
+
+       return std::move(jsonString);
+}
+
 String JsonRpc::ReadMessage(const std::shared_ptr<AsioTlsStream>& stream, boost::asio::yield_context yc, ssize_t maxMessageLength)
 {
        String jsonString = NetString::ReadStringFromStream(stream, yc, maxMessageLength);

diff --git a/lib/remote/jsonrpc.hpp b/lib/remote/jsonrpc.hpp
index faf9c07e8d212ba13fc5fe22d36fff7eee32231d..98187fe6cf8d1c03525a258ed98bca0ee14423e0 100644 (file)
--- a/lib/remote/jsonrpc.hpp
+++ b/lib/remote/jsonrpc.hpp
@@ -22,9 +22,11 @@ class JsonRpc
 {
 public:
        static size_t SendMessage(const Stream::Ptr& stream, const Dictionary::Ptr& message);
+       static size_t SendMessage(const std::shared_ptr<AsioTlsStream>& stream, const Dictionary::Ptr& message);
        static size_t SendMessage(const std::shared_ptr<AsioTlsStream>& stream, const Dictionary::Ptr& message, boost::asio::yield_context yc);
        static size_t SendRawMessage(const std::shared_ptr<AsioTlsStream>& stream, const String& json, boost::asio::yield_context yc);
        static StreamReadStatus ReadMessage(const Stream::Ptr& stream, String *message, StreamReadContext& src, bool may_wait = false, ssize_t maxMessageLength = -1);
+       static String ReadMessage(const std::shared_ptr<AsioTlsStream>& stream, ssize_t maxMessageLength = -1);
        static String ReadMessage(const std::shared_ptr<AsioTlsStream>& stream, boost::asio::yield_context yc, ssize_t maxMessageLength = -1);
        static Dictionary::Ptr DecodeMessage(const String& message);