config

BrennanConroy · BrennanConroy · commit ca1137ec6380 · 2020-01-13T09:48:08.000-08:00
diff --git a/include/signalrclient/hub_connection.h b/include/signalrclient/hub_connection.h
@@ -55,7 +55,7 @@ namespace signalr
 
         explicit hub_connection(const std::string& url, trace_level trace_level = trace_level::all,
             std::shared_ptr<log_writer> log_writer = nullptr, std::shared_ptr<http_client> http_client = nullptr,
-            std::function<std::shared_ptr<websocket_client>()> websocket_factory = nullptr);
+            std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory = nullptr);
 
         std::shared_ptr<hub_connection_impl> m_pImpl;
     };
diff --git a/include/signalrclient/hub_connection_builder.h b/include/signalrclient/hub_connection_builder.h
@@ -28,7 +28,7 @@ namespace signalr
 
         SIGNALRCLIENT_API hub_connection_builder& with_logging(std::shared_ptr<log_writer> logger, trace_level logLevel);
 
-        SIGNALRCLIENT_API hub_connection_builder& with_websocket_factory(std::function<std::shared_ptr<websocket_client>()> factory);
+        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_http_client(std::shared_ptr<http_client> http_client);
 
@@ -39,7 +39,7 @@ namespace signalr
         std::string m_url;
         std::shared_ptr<log_writer> m_logger;
         trace_level m_log_level;
-        std::function<std::shared_ptr<websocket_client>()> m_websocket_factory;
+        std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> m_websocket_factory;
         std::shared_ptr<http_client> m_http_client;
     };
 }
diff --git a/src/signalrclient/connection_impl.cpp b/src/signalrclient/connection_impl.cpp
@@ -33,7 +33,7 @@ namespace signalr
     }
 
     std::shared_ptr<connection_impl> connection_impl::create(const std::string& url, trace_level trace_level, const std::shared_ptr<log_writer>& log_writer,
-        std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>()> websocket_factory)
+        std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory)
     {
         return std::shared_ptr<connection_impl>(new connection_impl(url, trace_level,
             log_writer ? log_writer : std::make_shared<trace_log_writer>(), http_client, websocket_factory));
@@ -57,7 +57,7 @@ namespace signalr
     }
 
     connection_impl::connection_impl(const std::string& url, trace_level trace_level, const std::shared_ptr<log_writer>& log_writer,
-        std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>()> websocket_factory)
+        std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory)
         : m_base_url(url), m_connection_state(connection_state::disconnected), m_logger(log_writer, trace_level), m_transport(nullptr),
         m_message_received([](const std::string&) noexcept {}), m_disconnected([]() noexcept {})
     {
@@ -75,7 +75,7 @@ namespace signalr
         if (websocket_factory == nullptr)
         {
 #ifdef USE_CPPRESTSDK
-            websocket_factory = []() { return std::make_shared<default_websocket_client>(); };
+            websocket_factory = [](const signalr_client_config& signalr_client_config) { return std::make_shared<default_websocket_client>(signalr_client_config); };
 #endif
         }
 
diff --git a/src/signalrclient/connection_impl.h b/src/signalrclient/connection_impl.h
@@ -29,7 +29,7 @@ namespace signalr
         static std::shared_ptr<connection_impl> create(const std::string& url, trace_level trace_level, const std::shared_ptr<log_writer>& log_writer);
 
         static std::shared_ptr<connection_impl> create(const std::string& url, trace_level trace_level, const std::shared_ptr<log_writer>& log_writer,
-            std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>()> websocket_factory);
+            std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory);
 
         connection_impl(const connection_impl&) = delete;
 
@@ -70,7 +70,7 @@ namespace signalr
             std::unique_ptr<http_client> http_client, std::unique_ptr<transport_factory> transport_factory);
 
         connection_impl(const std::string& url, trace_level trace_level, const std::shared_ptr<log_writer>& log_writer,
-            std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>()> websocket_factory);
+            std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory);
 
         void start_transport(const std::string& url, std::function<void(std::shared_ptr<transport>, std::exception_ptr)> callback);
         void send_connect_request(const std::shared_ptr<transport>& transport,
diff --git a/src/signalrclient/default_websocket_client.cpp b/src/signalrclient/default_websocket_client.cpp
@@ -13,7 +13,11 @@ namespace signalr
         static web::websockets::client::websocket_client_config create_client_config(const signalr_client_config& signalr_client_config) noexcept
         {
             auto websocket_client_config = signalr_client_config.get_websocket_client_config();
-            websocket_client_config.headers() = signalr_client_config.get_http_headers();
+            auto websocket_headers = websocket_client_config.headers();
+            for (auto& header : signalr_client_config.get_http_headers())
+            {
+                websocket_headers.add(utility::conversions::to_string_t(header.first), utility::conversions::to_string_t(header.second));
+            }
 
             return websocket_client_config;
         }
diff --git a/src/signalrclient/hub_connection.cpp b/src/signalrclient/hub_connection.cpp
@@ -12,7 +12,7 @@ namespace signalr
 {
     hub_connection::hub_connection(const std::string& url,
         trace_level trace_level, std::shared_ptr<log_writer> log_writer, std::shared_ptr<http_client> http_client,
-        std::function<std::shared_ptr<websocket_client>()> websocket_factory)
+        std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory)
         : m_pImpl(hub_connection_impl::create(url, trace_level, log_writer, http_client, websocket_factory))
     {}
 
diff --git a/src/signalrclient/hub_connection_builder.cpp b/src/signalrclient/hub_connection_builder.cpp
@@ -56,7 +56,7 @@ namespace signalr
         return *this;
     }
 
-    hub_connection_builder& hub_connection_builder::with_websocket_factory(std::function<std::shared_ptr<websocket_client>()> factory)
+    hub_connection_builder& hub_connection_builder::with_websocket_factory(std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> factory)
     {
         m_websocket_factory = factory;
 
diff --git a/src/signalrclient/hub_connection_impl.cpp b/src/signalrclient/hub_connection_impl.cpp
@@ -24,7 +24,7 @@ namespace signalr
 
     std::shared_ptr<hub_connection_impl> hub_connection_impl::create(const std::string& url, trace_level trace_level,
         const std::shared_ptr<log_writer>& log_writer, std::shared_ptr<http_client> http_client,
-        std::function<std::shared_ptr<websocket_client>()> websocket_factory)
+        std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory)
     {
         auto connection = std::shared_ptr<hub_connection_impl>(new hub_connection_impl(url, trace_level, log_writer, http_client, websocket_factory));
 
@@ -35,7 +35,7 @@ namespace signalr
 
     hub_connection_impl::hub_connection_impl(const std::string& url, trace_level trace_level,
         const std::shared_ptr<log_writer>& log_writer, std::shared_ptr<http_client> http_client,
-        std::function<std::shared_ptr<websocket_client>()> websocket_factory)
+        std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory)
         : m_connection(connection_impl::create(url, trace_level, log_writer,
             http_client, websocket_factory)), m_logger(log_writer, trace_level),
         m_callback_manager(signalr::value(std::map<std::string, signalr::value> { { std::string("error"), std::string("connection went out of scope before invocation result was received") } })),
diff --git a/src/signalrclient/hub_connection_impl.h b/src/signalrclient/hub_connection_impl.h
@@ -25,7 +25,7 @@ namespace signalr
     public:
         static std::shared_ptr<hub_connection_impl> create(const std::string& url, trace_level trace_level,
             const std::shared_ptr<log_writer>& log_writer, std::shared_ptr<http_client> http_client,
-            std::function<std::shared_ptr<websocket_client>()> websocket_factory);
+            std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory);
 
         hub_connection_impl(const hub_connection_impl&) = delete;
         hub_connection_impl& operator=(const hub_connection_impl&) = delete;
@@ -47,7 +47,7 @@ namespace signalr
     private:
         hub_connection_impl(const std::string& url, trace_level trace_level,
             const std::shared_ptr<log_writer>& log_writer, std::shared_ptr<http_client> http_client,
-            std::function<std::shared_ptr<websocket_client>()> websocket_factory);
+            std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory);
 
         std::shared_ptr<connection_impl> m_connection;
         logger m_logger;
diff --git a/src/signalrclient/transport_factory.cpp b/src/signalrclient/transport_factory.cpp
@@ -9,17 +9,16 @@
 
 namespace signalr
 {
-    transport_factory::transport_factory(std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>()> websocket_factory)
+    transport_factory::transport_factory(std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory)
         : m_http_client(http_client), m_websocket_factory(websocket_factory)
     {}
 
     std::shared_ptr<transport> transport_factory::create_transport(transport_type transport_type, const logger& logger,
         const signalr_client_config& signalr_client_config)
     {
-        // TODO: Handle config with transport(s)
         if (transport_type == signalr::transport_type::websockets)
         {
-            return websocket_transport::create(m_websocket_factory,
+            return websocket_transport::create(m_websocket_factory, signalr_client_config,
                 logger);
         }
 
diff --git a/src/signalrclient/transport_factory.h b/src/signalrclient/transport_factory.h
@@ -16,14 +16,14 @@ namespace signalr
     class transport_factory
     {
     public:
-        transport_factory(std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>()> websocket_factory);
+        transport_factory(std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory);
 
         virtual std::shared_ptr<transport> create_transport(transport_type transport_type, const logger& logger,
             const signalr_client_config& signalr_client_config);
 
         virtual ~transport_factory();
     private:
         std::shared_ptr<http_client> m_http_client;
-        std::function<std::shared_ptr<websocket_client>()> m_websocket_factory;
+        std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> m_websocket_factory;
     };
 }
diff --git a/src/signalrclient/websocket_transport.cpp b/src/signalrclient/websocket_transport.cpp
@@ -10,17 +10,18 @@
 
 namespace signalr
 {
-    std::shared_ptr<transport> websocket_transport::create(const std::function<std::shared_ptr<websocket_client>()>& websocket_client_factory,
-        const logger& logger)
+    std::shared_ptr<transport> websocket_transport::create(const std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)>& websocket_client_factory,
+        const signalr_client_config& signalr_client_config, const logger& logger)
     {
         return std::shared_ptr<transport>(
-            new websocket_transport(websocket_client_factory, logger));
+            new websocket_transport(websocket_client_factory, signalr_client_config, logger));
     }
 
-    websocket_transport::websocket_transport(const std::function<std::shared_ptr<websocket_client>()>& websocket_client_factory,
-        const logger& logger)
+    websocket_transport::websocket_transport(const std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)>& websocket_client_factory,
+        const signalr_client_config& signalr_client_config, const logger& logger)
         : transport(logger), m_websocket_client_factory(websocket_client_factory), m_close_callback([](std::exception_ptr) {}),
-        m_process_response_callback([](std::string, std::exception_ptr) {}), m_receive_loop_cts(std::make_shared<cancellation_token>())
+        m_process_response_callback([](std::string, std::exception_ptr) {}), m_receive_loop_cts(std::make_shared<cancellation_token>()),
+        m_signalr_client_config(signalr_client_config)
     {
         // we use this cts to check if the receive loop is running so it should be
         // initially canceled to indicate that the receive loop is not running
@@ -161,7 +162,7 @@ namespace signalr
                 std::string("[websocket transport] connecting to: ")
                 .append(url));
 
-            auto websocket_client = m_websocket_client_factory();
+            auto websocket_client = m_websocket_client_factory(m_signalr_client_config);
 
             {
                 std::lock_guard<std::mutex> client_lock(m_websocket_client_lock);
diff --git a/src/signalrclient/websocket_transport.h b/src/signalrclient/websocket_transport.h
@@ -13,8 +13,8 @@ namespace signalr
     class websocket_transport : public transport, public std::enable_shared_from_this<websocket_transport>
     {
     public:
-        static std::shared_ptr<transport> create(const std::function<std::shared_ptr<websocket_client>()>& websocket_client_factory,
-            const logger& logger);
+        static std::shared_ptr<transport> create(const std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)>& websocket_client_factory,
+            const signalr_client_config& signalr_client_config, const logger& logger);
 
         ~websocket_transport();
 
@@ -33,15 +33,16 @@ namespace signalr
         void on_receive(std::function<void(std::string&&, std::exception_ptr)>) override;
 
     private:
-        websocket_transport(const std::function<std::shared_ptr<websocket_client>()>& websocket_client_factory,
-            const logger& logger);
+        websocket_transport(const std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)>& websocket_client_factory,
+            const signalr_client_config& signalr_client_config, const logger& logger);
 
-        std::function<std::shared_ptr<websocket_client>()> m_websocket_client_factory;
+        std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> m_websocket_client_factory;
         std::shared_ptr<websocket_client> m_websocket_client;
         std::mutex m_websocket_client_lock;
         std::mutex m_start_stop_lock;
         std::function<void(std::string, std::exception_ptr)> m_process_response_callback;
         std::function<void(std::exception_ptr)> m_close_callback;
+        signalr_client_config m_signalr_client_config;
 
         std::shared_ptr<cancellation_token> m_receive_loop_cts;
 
diff --git a/test/signalrclienttests/connection_impl_tests.cpp b/test/signalrclienttests/connection_impl_tests.cpp
diff --git a/test/signalrclienttests/hub_connection_tests.cpp b/test/signalrclienttests/hub_connection_tests.cpp
diff --git a/test/signalrclienttests/websocket_transport_tests.cpp b/test/signalrclienttests/websocket_transport_tests.cpp

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ namespace signalr`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`std::shared_ptr<connection_impl> connection_impl::create(const std::string& url, trace_level trace_level, const std::shared_ptr<log_writer>& log_writer,`
`36`		`- std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>()> websocket_factory)`
	`36`	`+ std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory)`
`37`	`37`	`{`
`38`	`38`	`return std::shared_ptr<connection_impl>(new connection_impl(url, trace_level,`
`39`	`39`	`log_writer ? log_writer : std::make_shared<trace_log_writer>(), http_client, websocket_factory));`
`@@ -57,7 +57,7 @@ namespace signalr`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`connection_impl::connection_impl(const std::string& url, trace_level trace_level, const std::shared_ptr<log_writer>& log_writer,`
`60`		`- std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>()> websocket_factory)`
	`60`	`+ std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory)`
`61`	`61`	`: m_base_url(url), m_connection_state(connection_state::disconnected), m_logger(log_writer, trace_level), m_transport(nullptr),`
`62`	`62`	`m_message_received([](const std::string&) noexcept {}), m_disconnected([]() noexcept {})`
`63`	`63`	`{`
`@@ -75,7 +75,7 @@ namespace signalr`
`75`	`75`	`if (websocket_factory == nullptr)`
`76`	`76`	`{`
`77`	`77`	`#ifdef USE_CPPRESTSDK`
`78`		`- websocket_factory = []() { return std::make_shared<default_websocket_client>(); };`
	`78`	`+ websocket_factory = [](const signalr_client_config& signalr_client_config) { return std::make_shared<default_websocket_client>(signalr_client_config); };`
`79`	`79`	`#endif`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,11 @@ namespace signalr`
`13`	`13`	`static web::websockets::client::websocket_client_config create_client_config(const signalr_client_config& signalr_client_config) noexcept`
`14`	`14`	`{`
`15`	`15`	`auto websocket_client_config = signalr_client_config.get_websocket_client_config();`
`16`		`- websocket_client_config.headers() = signalr_client_config.get_http_headers();`
	`16`	`+ auto websocket_headers = websocket_client_config.headers();`
	`17`	`+ for (auto& header : signalr_client_config.get_http_headers())`
	`18`	`+ {`
	`19`	`+ websocket_headers.add(utility::conversions::to_string_t(header.first), utility::conversions::to_string_t(header.second));`
	`20`	`+ }`
`17`	`21`
`18`	`22`	`return websocket_client_config;`
`19`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace signalr`
`12`	`12`	`{`
`13`	`13`	`hub_connection::hub_connection(const std::string& url,`
`14`	`14`	`trace_level trace_level, std::shared_ptr<log_writer> log_writer, std::shared_ptr<http_client> http_client,`
`15`		`- std::function<std::shared_ptr<websocket_client>()> websocket_factory)`
	`15`	`+ std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory)`
`16`	`16`	`: m_pImpl(hub_connection_impl::create(url, trace_level, log_writer, http_client, websocket_factory))`
`17`	`17`	`{}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ namespace signalr`
`56`	`56`	`return *this;`
`57`	`57`	`}`
`58`	`58`
`59`		`- hub_connection_builder& hub_connection_builder::with_websocket_factory(std::function<std::shared_ptr<websocket_client>()> factory)`
	`59`	`+ hub_connection_builder& hub_connection_builder::with_websocket_factory(std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> factory)`
`60`	`60`	`{`
`61`	`61`	`m_websocket_factory = factory;`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -9,17 +9,16 @@`
`9`	`9`
`10`	`10`	`namespace signalr`
`11`	`11`	`{`
`12`		`- transport_factory::transport_factory(std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>()> websocket_factory)`
	`12`	`+ transport_factory::transport_factory(std::shared_ptr<http_client> http_client, std::function<std::shared_ptr<websocket_client>(const signalr_client_config&)> websocket_factory)`
`13`	`13`	`: m_http_client(http_client), m_websocket_factory(websocket_factory)`
`14`	`14`	`{}`
`15`	`15`
`16`	`16`	`std::shared_ptr<transport> transport_factory::create_transport(transport_type transport_type, const logger& logger,`
`17`	`17`	`const signalr_client_config& signalr_client_config)`
`18`	`18`	`{`
`19`		`- // TODO: Handle config with transport(s)`
`20`	`19`	`if (transport_type == signalr::transport_type::websockets)`
`21`	`20`	`{`
`22`		`- return websocket_transport::create(m_websocket_factory,`
	`21`	`+ return websocket_transport::create(m_websocket_factory, signalr_client_config,`
`23`	`22`	`logger);`
`24`	`23`	`}`
`25`	`24`