Replace web::json with signalr::value on public API (#12)

Author: BrennanConroy

README.md

@@ -11,7 +11,7 @@ PS> .\submodules\vcpkg\bootstrap-vcpkg.bat
 PS> .\submodules\vcpkg\vcpkg.exe install cpprestsdk:x64-windows
 PS> mkdir build.release
 PS> cd build.release
-PS> cmake .. -A x64 -DCMAKE_TOOLCHAIN_FILE="..\submodules\vcpkg\scripts\buildsystems\vcpkg.cmake" -DCMAKE_BUILD_TYPE=Release
+PS> cmake .. -A x64 -DCMAKE_TOOLCHAIN_FILE="..\submodules\vcpkg\scripts\buildsystems\vcpkg.cmake" -DCMAKE_BUILD_TYPE=Release -DUSE_CPPRESTSDK=true
 PS> cmake --build . --config Release
 ```
 Output will be in `build.release\bin\Release\`
@@ -24,7 +24,7 @@ $ ./submodules/vcpkg/bootstrap-vcpkg.sh
 $ ./submodules/vcpkg/vcpkg install cpprestsdk
 $ mkdir build.release
 $ cd build.release
-$ cmake .. -DCMAKE_TOOLCHAIN_FILE=../submodules/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release
+$ cmake .. -DCMAKE_TOOLCHAIN_FILE=../submodules/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DUSE_CPPRESTSDK=true
 $ cmake --build . --config Release
 ```
 Output will be in `build.release/bin/`
@@ -37,7 +37,7 @@ $ ./submodules/vcpkg/bootstrap-vcpkg.sh
 $ ./submodules/vcpkg/vcpkg install cpprestsdk boost-system boost-chrono boost-thread
 $ mkdir build.release
 $ cd build.release
-$ cmake .. -DCMAKE_TOOLCHAIN_FILE=../submodules/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release
+$ cmake .. -DCMAKE_TOOLCHAIN_FILE=../submodules/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DUSE_CPPRESTSDK=true
 $ cmake --build . --config Release
 ```
 Output will be in `build.release/bin/`

include/signalrclient/hub_connection.h

@@ -6,11 +6,11 @@
 #include "_exports.h"
 #include <memory>
 #include <functional>
-#include "cpprest/json.h"
 #include "connection_state.h"
 #include "trace_level.h"
 #include "log_writer.h"
 #include "signalr_client_config.h"
+#include "signalr_value.h"
 
 namespace signalr
 {
@@ -19,7 +19,7 @@ namespace signalr
     class hub_connection
     {
     public:
-        typedef std::function<void __cdecl (const web::json::value&)> method_invoked_handler;
+        typedef std::function<void __cdecl (const signalr::value&)> method_invoked_handler;
 
         SIGNALRCLIENT_API explicit hub_connection(const std::string& url, trace_level trace_level = trace_level::all,
             std::shared_ptr<log_writer> log_writer = nullptr);
@@ -42,9 +42,9 @@ namespace signalr
 
         SIGNALRCLIENT_API void __cdecl on(const std::string& event_name, const method_invoked_handler& handler);
 
-        SIGNALRCLIENT_API void invoke(const std::string& method_name, const web::json::value& arguments = web::json::value::array(), std::function<void(const web::json::value&, std::exception_ptr)> callback = [](const web::json::value&, std::exception_ptr) {}) noexcept;
+        SIGNALRCLIENT_API void invoke(const std::string& method_name, const signalr::value& arguments = signalr::value(), std::function<void(const signalr::value&, std::exception_ptr)> callback = [](const signalr::value&, std::exception_ptr) {}) noexcept;
 
-        SIGNALRCLIENT_API void send(const std::string& method_name, const web::json::value& arguments = web::json::value::array(), std::function<void(std::exception_ptr)> callback = [](std::exception_ptr) {}) noexcept;
+        SIGNALRCLIENT_API void send(const std::string& method_name, const signalr::value& arguments = signalr::value(), std::function<void(std::exception_ptr)> callback = [](std::exception_ptr) {}) noexcept;
 
     private:
         std::shared_ptr<hub_connection_impl> m_pImpl;

include/signalrclient/signalr_value.h

@@ -12,7 +12,7 @@ namespace signalr
     /**
      * An enum defining the types a signalr::value may be.
      */
-    enum class type
+    enum class value_type
     {
         map,
         array,
@@ -28,20 +28,88 @@ namespace signalr
     class value
     {
     public:
+        /**
+         * Create an object representing a value_type::null value.
+         */
         value();
-        value(int val);
+
+        /**
+         * Create an object representing a default value for the given value_type.
+         */
+        value(value_type t);
+
+        /**
+         * Create an object representing a value_type::boolean with the given bool value.
+         */
+        value(bool val);
+
+        /**
+         * Create an object representing a value_type::float64 with the given double value.
+         */
         value(double val);
+
+        /**
+         * Create an object representing a value_type::string with the given string value.
+         */
         value(const std::string& val);
+
+        /**
+         * Create an object representing a value_type::string with the given string value.
+         */
+        value(std::string&& val);
+
+        /**
+         * Create an object representing a value_type::array with the given vector of value's.
+         */
         value(const std::vector<value>& val);
+
+        /**
+         * Create an object representing a value_type::array with the given vector of value's.
+         */
+        value(std::vector<value>&& val);
+
+        /**
+         * Create an object representing a value_type::map with the given map of string-value's.
+         */
         value(const std::map<std::string, value>& map);
 
+        /**
+         * Create an object representing a value_type::map with the given map of string-value's.
+         */
+        value(std::map<std::string, value>&& map);
+
+        /**
+         * Copies an existing value.
+         */
+        value(const value& rhs);
+
+        /**
+         * Moves an existing value.
+         */
+        value(value&& rhs) noexcept;
+
+        /**
+         * Cleans up the resources associated with the value.
+         */
+        ~value();
+
+        /**
+         * Copies an existing value.
+         */
+        value& operator=(const value& rhs);
+
+        /**
+         * Moves an existing value.
+         */
+        value& operator=(value&& rhs) noexcept;
+
         /**
          * True if the object stored is a Key-Value pair.
          */
         bool is_map() const;
 
         /**
-         * True if the object stored is double.
+         * True if the object stored is a double.
          */
         bool is_double() const;
 
@@ -83,16 +151,33 @@ namespace signalr
         /**
          * Returns the stored object as an array of signalr::value's. This will throw if the underlying object is not a signalr::type::array.
          */
-        std::vector<value> as_array() const;
+        const std::vector<value>& as_array() const;
 
         /**
          * Returns the stored object as a map of property name to signalr::value. This will throw if the underlying object is not a signalr::type::map.
          */
-        std::map<std::string, value> as_map() const;
+        const std::map<std::string, value>& as_map() const;
 
         /**
          * Returns the signalr::type that represents the stored object.
          */
-        type type() const;
+        value_type type() const;
+
+    private:
+        value_type mType;
+
+        union storage
+        {
+            bool boolean;
+            std::string string;
+            std::vector<value> array;
+            double number;
+            std::map<std::string, value> map;
+
+            storage() {}
+            ~storage() {}
+        };
+
+        storage mStorage;
     };
 }

samples/HubConnectionSample/CMakeLists.txt

@@ -1,10 +1,10 @@
-set (SOURCES 
+set (SOURCES
   HubConnectionSample.cpp
 )
 
 include_directories(
     ../../include/signalrclient)
- 
+
 add_executable (HubConnectionSample ${SOURCES})
 
 target_link_libraries(HubConnectionSample signalrclient)

src/signalrclient/CMakeLists.txt

@@ -9,6 +9,7 @@ set (SOURCES
   logger.cpp
   negotiate.cpp
   signalr_client_config.cpp
+  signalr_value.cpp
   stdafx.cpp
   trace_log_writer.cpp
   transport.cpp

src/signalrclient/callback_manager.cpp

@@ -3,12 +3,13 @@
 
 #include "stdafx.h"
 #include "callback_manager.h"
+#include <sstream>
 
 namespace signalr
 {
     // dtor_clear_arguments will be passed when closing any pending callbacks when the `callback_manager` is
     // destroyed (i.e. in the dtor)
-    callback_manager::callback_manager(const web::json::value& dtor_clear_arguments)
+    callback_manager::callback_manager(const signalr::value& dtor_clear_arguments)
         : m_dtor_clear_arguments(dtor_clear_arguments)
     { }
 
@@ -18,7 +19,7 @@ namespace signalr
     }
 
     // note: callback must not throw except for the `on_progress` callback which will never be invoked from the dtor
-    std::string callback_manager::register_callback(const std::function<void(const web::json::value&)>& callback)
+    std::string callback_manager::register_callback(const std::function<void(const signalr::value&)>& callback)
     {
         auto callback_id = get_callback_id();
 
@@ -33,9 +34,9 @@ namespace signalr
 
 
     // invokes a callback and stops tracking it if remove callback set to true
-    bool callback_manager::invoke_callback(const std::string& callback_id, const web::json::value& arguments, bool remove_callback)
+    bool callback_manager::invoke_callback(const std::string& callback_id, const signalr::value& arguments, bool remove_callback)
     {
-        std::function<void(const web::json::value& arguments)> callback;
+        std::function<void(const signalr::value& arguments)> callback;
 
         {
             std::lock_guard<std::mutex> lock(m_map_lock);
@@ -67,7 +68,7 @@ namespace signalr
         }
     }
 
-    void callback_manager::clear(const web::json::value& arguments)
+    void callback_manager::clear(const signalr::value& arguments)
     {
         {
             std::lock_guard<std::mutex> lock(m_map_lock);

src/signalrclient/callback_manager.h

@@ -7,29 +7,29 @@
 #include <unordered_map>
 #include <functional>
 #include <mutex>
-#include "cpprest/json.h"
+#include "signalrclient/signalr_value.h"
 
 namespace signalr
 {
     class callback_manager
     {
     public:
-        explicit callback_manager(const web::json::value& dtor_error);
+        explicit callback_manager(const signalr::value& dtor_error);
         ~callback_manager();
 
         callback_manager(const callback_manager&) = delete;
         callback_manager& operator=(const callback_manager&) = delete;
 
-        std::string register_callback(const std::function<void(const web::json::value&)>& callback);
-        bool invoke_callback(const std::string& callback_id, const web::json::value& arguments, bool remove_callback);
+        std::string register_callback(const std::function<void(const signalr::value&)>& callback);
+        bool invoke_callback(const std::string& callback_id, const signalr::value& arguments, bool remove_callback);
         bool remove_callback(const std::string& callback_id);
-        void clear(const web::json::value& arguments);
+        void clear(const signalr::value& arguments);
 
     private:
         std::atomic<int> m_id { 0 };
-        std::unordered_map<std::string, std::function<void(const web::json::value&)>> m_callbacks;
+        std::unordered_map<std::string, std::function<void(const signalr::value&)>> m_callbacks;
         std::mutex m_map_lock;
-        const web::json::value m_dtor_clear_arguments;
+        const signalr::value m_dtor_clear_arguments;
 
         std::string get_callback_id();
     };

src/signalrclient/hub_connection.cpp

@@ -47,18 +47,18 @@ namespace signalr
         return m_pImpl->on(event_name, handler);
     }
 
-    void hub_connection::invoke(const std::string& method_name, const web::json::value& arguments, std::function<void(const web::json::value&, std::exception_ptr)> callback) noexcept
+    void hub_connection::invoke(const std::string& method_name, const signalr::value& arguments, std::function<void(const signalr::value&, std::exception_ptr)> callback) noexcept
     {
         if (!m_pImpl)
         {
-            callback(web::json::value(), std::make_exception_ptr(signalr_exception("invoke() cannot be called on destructed hub_connection instance")));
+            callback(signalr::value(), std::make_exception_ptr(signalr_exception("invoke() cannot be called on destructed hub_connection instance")));
             return;
         }
 
         return m_pImpl->invoke(method_name, arguments, callback);
     }
 
-    void hub_connection::send(const std::string& method_name, const web::json::value& arguments, std::function<void(std::exception_ptr)> callback) noexcept
+    void hub_connection::send(const std::string& method_name, const signalr::value& arguments, std::function<void(std::exception_ptr)> callback) noexcept
     {
         if (!m_pImpl)
         {