wip

Author: BrennanConroy

include/signalrclient/hub_connection_builder.h

@@ -12,7 +12,7 @@
 
 namespace signalr
 {
-    class hub_connection_builder
+    class hub_connection_builder final
     {
     public:
         SIGNALRCLIENT_API static hub_connection_builder create(const std::string& url);
@@ -27,19 +27,17 @@ namespace signalr
 
         SIGNALRCLIENT_API hub_connection_builder& operator=(const hub_connection_builder&);
 
-        SIGNALRCLIENT_API hub_connection_builder& with_logging(std::shared_ptr<log_writer> logger, trace_level logLevel);
+        SIGNALRCLIENT_API hub_connection_builder& with_logging(std::shared_ptr<log_writer> logger, trace_level log_level);
 
-        SIGNALRCLIENT_API hub_connection_builder& with_websocket_factory(std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> factory);
+        SIGNALRCLIENT_API hub_connection_builder& with_websocket_factory(std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory);
 
         SIGNALRCLIENT_API hub_connection_builder& with_http_client_factory(std::function<std::shared_ptr<http_client>(const signalr_client_config&)> http_client_factory);
 
         SIGNALRCLIENT_API hub_connection_builder& skip_negotiation(bool skip = true);
 
-#ifdef USE_MSGPACK
         SIGNALRCLIENT_API hub_connection_builder& with_messagepack_hub_protocol();
-#endif
 
-        SIGNALRCLIENT_API hub_connection build();
+        SIGNALRCLIENT_API std::unique_ptr<hub_connection> build();
     private:
         hub_connection_builder(const std::string& url);
 
@@ -50,5 +48,7 @@ namespace signalr
         std::function<std::shared_ptr<http_client>(const signalr_client_config&)> m_http_client_factory;
         bool m_skip_negotiation = false;
         bool m_use_messagepack = false;
+
+        bool m_built = false;
     };
 }

src/signalrclient/hub_connection_builder.cpp

@@ -51,17 +51,17 @@ namespace signalr
     hub_connection_builder::~hub_connection_builder()
     {}
 
-    hub_connection_builder& hub_connection_builder::with_logging(std::shared_ptr<log_writer> logger, trace_level logLevel)
+    hub_connection_builder& hub_connection_builder::with_logging(std::shared_ptr<log_writer> logger, trace_level log_level)
     {
         m_logger = logger;
-        m_log_level = logLevel;
+        m_log_level = log_level;
 
         return *this;
     }
 
-    hub_connection_builder& hub_connection_builder::with_websocket_factory(std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> factory)
+    hub_connection_builder& hub_connection_builder::with_websocket_factory(std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory)
     {
-        m_websocket_factory = factory;
+        m_websocket_factory = websocket_factory;
 
         return *this;
     }
@@ -80,15 +80,17 @@ namespace signalr
         return *this;
     }
 
-#ifdef USE_MSGPACK
     hub_connection_builder& hub_connection_builder::with_messagepack_hub_protocol()
     {
+#ifdef USE_MSGPACK
         m_use_messagepack = true;
         return *this;
-    }
+#else
+        throw std::runtime_error("library was not built with messagepack support. Define USE_MSGPACK when building.");
 #endif
+    }
 
-    hub_connection hub_connection_builder::build()
+    std::unique_ptr<hub_connection> hub_connection_builder::build()
     {
 #ifndef USE_CPPRESTSDK
         if (m_http_client_factory == nullptr)
@@ -115,6 +117,13 @@ namespace signalr
             hub_protocol = std::unique_ptr<json_hub_protocol>(new json_hub_protocol());
         }
 
-        return hub_connection(m_url, std::move(hub_protocol), m_log_level, m_logger, m_http_client_factory, m_websocket_factory, m_skip_negotiation);
+        if (m_built)
+        {
+            throw std::runtime_error("calling build() more than once is not supported.");
+        }
+
+        m_built = true;
+
+        return std::unique_ptr<hub_connection>(new hub_connection(m_url, std::move(hub_protocol), m_log_level, m_logger, m_http_client_factory, m_websocket_factory, m_skip_negotiation));
     }
 }

test/signalrclienttests/connection_tests.cpp

@@ -1519,7 +1519,7 @@ TEST(connection_impl_stop, dtor_stops_the_connection)
     // The connection_impl will be destroyed when the last reference to shared_ptr holding is released. This can happen
     // on a different thread in which case the dtor will be invoked on a different thread so we need to wait for this
     // to happen and if it does not the test will fail
-    for (int wait_time_ms = 5; wait_time_ms < 6000 && memory_writer->get_log_entries().size() < 6; wait_time_ms <<= 1)
+    for (int wait_time_ms = 5; wait_time_ms < 6000 && memory_writer->get_log_entries().size() < 12; wait_time_ms <<= 1)
     {
         std::this_thread::sleep_for(std::chrono::milliseconds(wait_time_ms));
     }