Fix connection in stream class

MPogotsky · MPogotsky · commit 46d1af24203d · 2024-11-11T17:10:40.000+01:00
diff --git a/xapi/XStationClientStream.cpp b/xapi/XStationClientStream.cpp
@@ -5,23 +5,23 @@ namespace xapi
 {
 
 XStationClientStream::XStationClientStream(boost::asio::io_context &ioContext, const std::string &accountType, const std::string& streamSessionId) 
-: Connection(ioContext), m_streamUrl(boost::urls::format("wss://ws.xtb.com/{}Stream", accountType)), m_streamSessionId(streamSessionId)
+: m_connection(std::make_unique<internals::Connection>(ioContext)), m_streamUrl(boost::urls::format("wss://ws.xtb.com/{}Stream", accountType)), m_streamSessionId(streamSessionId)
 {
 }
 
 boost::asio::awaitable<void> XStationClientStream::open()
 {
-    co_await connect(m_streamUrl);
+    co_await m_connection->connect(m_streamUrl);
 }
 
 boost::asio::awaitable<void> XStationClientStream::close()
 {
-    co_await disconnect();
+    co_await m_connection->disconnect();
 }
 
 boost::asio::awaitable<boost::json::object> XStationClientStream::listen()
 {
-    auto result = co_await waitResponse();
+    auto result = co_await m_connection->waitResponse();
     co_return result;
 }
 
@@ -31,15 +31,15 @@ boost::asio::awaitable<void> XStationClientStream::getBalance()
         {"command", "getBalance"},
         {"streamSessionId", m_streamSessionId}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::stopBalance()
 {
     boost::json::object command = {
         {"command", "stopBalance"}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::getCandles(const std::string &symbol)
@@ -49,7 +49,7 @@ boost::asio::awaitable<void> XStationClientStream::getCandles(const std::string
         {"streamSessionId", m_streamSessionId},
         {"symbol", symbol}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::stopCandles(const std::string &symbol)
@@ -58,7 +58,7 @@ boost::asio::awaitable<void> XStationClientStream::stopCandles(const std::string
         {"command", "stopCandles"},
         {"symbol", symbol}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::getKeepAlive()
@@ -67,15 +67,15 @@ boost::asio::awaitable<void> XStationClientStream::getKeepAlive()
         {"command", "getKeepAlive"},
         {"streamSessionId", m_streamSessionId}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::stopKeepAlive()
 {
     boost::json::object command = {
         {"command", "stopKeepAlive"}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::getNews()
@@ -84,15 +84,15 @@ boost::asio::awaitable<void> XStationClientStream::getNews()
         {"command", "getNews"},
         {"streamSessionId", m_streamSessionId}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::stopNews()
 {
     boost::json::object command = {
         {"command", "stopNews"}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::getProfits()
@@ -101,15 +101,15 @@ boost::asio::awaitable<void> XStationClientStream::getProfits()
         {"command", "getProfits"},
         {"streamSessionId", m_streamSessionId}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::stopProfits()
 {
     boost::json::object command = {
         {"command", "stopProfits"}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::getTickPrices(const std::string &symbol, int minArrivalTime, int maxLevel)
@@ -121,7 +121,7 @@ boost::asio::awaitable<void> XStationClientStream::getTickPrices(const std::stri
         {"minArrivalTime", minArrivalTime},
         {"maxLevel", maxLevel}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::stopTickPrices(const std::string &symbol)
@@ -130,7 +130,7 @@ boost::asio::awaitable<void> XStationClientStream::stopTickPrices(const std::str
         {"command", "stopTickPrices"},
         {"symbol", symbol}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::getTrades()
@@ -139,15 +139,15 @@ boost::asio::awaitable<void> XStationClientStream::getTrades()
         {"command", "getTrades"},
         {"streamSessionId", m_streamSessionId}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::stopTrades()
 {
     boost::json::object command = {
         {"command", "stopTrades"}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::getTradeStatus()
@@ -156,15 +156,15 @@ boost::asio::awaitable<void> XStationClientStream::getTradeStatus()
         {"command", "getTradeStatus"},
         {"streamSessionId", m_streamSessionId}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::stopTradeStatus()
 {
     boost::json::object command = {
         {"command", "stopTradeStatus"}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 boost::asio::awaitable<void> XStationClientStream::ping()
@@ -173,7 +173,7 @@ boost::asio::awaitable<void> XStationClientStream::ping()
         {"command", "ping"},
         {"streamSessionId", m_streamSessionId}
     };
-    co_await makeRequest(command);
+    co_await m_connection->makeRequest(command);
 }
 
 } // namespace xapi
diff --git a/xapi/XStationClientStream.hpp b/xapi/XStationClientStream.hpp
@@ -19,7 +19,7 @@ namespace xapi
  * The XStationClientStream class provides a high-level interface for streaming real-time data
  * from xAPI.
  */
-class XStationClientStream : protected internals::Connection
+class XStationClientStream
 {
   public:
     XStationClientStream() = delete;
@@ -35,7 +35,7 @@ class XStationClientStream : protected internals::Connection
      * @param ioContext The IO context for asynchronous operations.
      */
     explicit XStationClientStream(boost::asio::io_context &ioContext, const std::string &accountType, const std::string& streamSessionId);
-    ~XStationClientStream() override = default;
+    ~XStationClientStream() = default;
 
     /**
      * @brief Opens a connection to the streaming server.
@@ -95,6 +95,8 @@ class XStationClientStream : protected internals::Connection
     boost::asio::awaitable<void> ping();
 
   private:
+    std::unique_ptr<internals::IConnection> m_connection;
+
     // The stream session ID.
     const boost::url m_streamUrl;
     const std::string m_streamSessionId;

Original file line number	Diff line number	Diff line change
`@@ -5,23 +5,23 @@ namespace xapi`
`5`	`5`	`{`
`6`	`6`
`7`	`7`	`XStationClientStream::XStationClientStream(boost::asio::io_context &ioContext, const std::string &accountType, const std::string& streamSessionId)`
`8`		`-: Connection(ioContext), m_streamUrl(boost::urls::format("wss://ws.xtb.com/{}Stream", accountType)), m_streamSessionId(streamSessionId)`
	`8`	`+: m_connection(std::make_unique<internals::Connection>(ioContext)), m_streamUrl(boost::urls::format("wss://ws.xtb.com/{}Stream", accountType)), m_streamSessionId(streamSessionId)`
`9`	`9`	`{`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`boost::asio::awaitable<void> XStationClientStream::open()`
`13`	`13`	`{`
`14`		`- co_await connect(m_streamUrl);`
	`14`	`+ co_await m_connection->connect(m_streamUrl);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`boost::asio::awaitable<void> XStationClientStream::close()`
`18`	`18`	`{`
`19`		`- co_await disconnect();`
	`19`	`+ co_await m_connection->disconnect();`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`boost::asio::awaitable<boost::json::object> XStationClientStream::listen()`
`23`	`23`	`{`
`24`		`- auto result = co_await waitResponse();`
	`24`	`+ auto result = co_await m_connection->waitResponse();`
`25`	`25`	`co_return result;`
`26`	`26`	`}`
`27`	`27`
`@@ -31,15 +31,15 @@ boost::asio::awaitable<void> XStationClientStream::getBalance()`
`31`	`31`	`{"command", "getBalance"},`
`32`	`32`	`{"streamSessionId", m_streamSessionId}`
`33`	`33`	`};`
`34`		`- co_await makeRequest(command);`
	`34`	`+ co_await m_connection->makeRequest(command);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`boost::asio::awaitable<void> XStationClientStream::stopBalance()`
`38`	`38`	`{`
`39`	`39`	`boost::json::object command = {`
`40`	`40`	`{"command", "stopBalance"}`
`41`	`41`	`};`
`42`		`- co_await makeRequest(command);`
	`42`	`+ co_await m_connection->makeRequest(command);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`boost::asio::awaitable<void> XStationClientStream::getCandles(const std::string &symbol)`
`@@ -49,7 +49,7 @@ boost::asio::awaitable<void> XStationClientStream::getCandles(const std::string`
`49`	`49`	`{"streamSessionId", m_streamSessionId},`
`50`	`50`	`{"symbol", symbol}`
`51`	`51`	`};`
`52`		`- co_await makeRequest(command);`
	`52`	`+ co_await m_connection->makeRequest(command);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`boost::asio::awaitable<void> XStationClientStream::stopCandles(const std::string &symbol)`
`@@ -58,7 +58,7 @@ boost::asio::awaitable<void> XStationClientStream::stopCandles(const std::string`
`58`	`58`	`{"command", "stopCandles"},`
`59`	`59`	`{"symbol", symbol}`
`60`	`60`	`};`
`61`		`- co_await makeRequest(command);`
	`61`	`+ co_await m_connection->makeRequest(command);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`boost::asio::awaitable<void> XStationClientStream::getKeepAlive()`
`@@ -67,15 +67,15 @@ boost::asio::awaitable<void> XStationClientStream::getKeepAlive()`
`67`	`67`	`{"command", "getKeepAlive"},`
`68`	`68`	`{"streamSessionId", m_streamSessionId}`
`69`	`69`	`};`
`70`		`- co_await makeRequest(command);`
	`70`	`+ co_await m_connection->makeRequest(command);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`boost::asio::awaitable<void> XStationClientStream::stopKeepAlive()`
`74`	`74`	`{`
`75`	`75`	`boost::json::object command = {`
`76`	`76`	`{"command", "stopKeepAlive"}`
`77`	`77`	`};`
`78`		`- co_await makeRequest(command);`
	`78`	`+ co_await m_connection->makeRequest(command);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`boost::asio::awaitable<void> XStationClientStream::getNews()`
`@@ -84,15 +84,15 @@ boost::asio::awaitable<void> XStationClientStream::getNews()`
`84`	`84`	`{"command", "getNews"},`
`85`	`85`	`{"streamSessionId", m_streamSessionId}`
`86`	`86`	`};`
`87`		`- co_await makeRequest(command);`
	`87`	`+ co_await m_connection->makeRequest(command);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`boost::asio::awaitable<void> XStationClientStream::stopNews()`
`91`	`91`	`{`
`92`	`92`	`boost::json::object command = {`
`93`	`93`	`{"command", "stopNews"}`
`94`	`94`	`};`
`95`		`- co_await makeRequest(command);`
	`95`	`+ co_await m_connection->makeRequest(command);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`boost::asio::awaitable<void> XStationClientStream::getProfits()`
`@@ -101,15 +101,15 @@ boost::asio::awaitable<void> XStationClientStream::getProfits()`
`101`	`101`	`{"command", "getProfits"},`
`102`	`102`	`{"streamSessionId", m_streamSessionId}`
`103`	`103`	`};`
`104`		`- co_await makeRequest(command);`
	`104`	`+ co_await m_connection->makeRequest(command);`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`boost::asio::awaitable<void> XStationClientStream::stopProfits()`
`108`	`108`	`{`
`109`	`109`	`boost::json::object command = {`
`110`	`110`	`{"command", "stopProfits"}`
`111`	`111`	`};`
`112`		`- co_await makeRequest(command);`
	`112`	`+ co_await m_connection->makeRequest(command);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`boost::asio::awaitable<void> XStationClientStream::getTickPrices(const std::string &symbol, int minArrivalTime, int maxLevel)`
`@@ -121,7 +121,7 @@ boost::asio::awaitable<void> XStationClientStream::getTickPrices(const std::stri`
`121`	`121`	`{"minArrivalTime", minArrivalTime},`
`122`	`122`	`{"maxLevel", maxLevel}`
`123`	`123`	`};`
`124`		`- co_await makeRequest(command);`
	`124`	`+ co_await m_connection->makeRequest(command);`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`boost::asio::awaitable<void> XStationClientStream::stopTickPrices(const std::string &symbol)`
`@@ -130,7 +130,7 @@ boost::asio::awaitable<void> XStationClientStream::stopTickPrices(const std::str`
`130`	`130`	`{"command", "stopTickPrices"},`
`131`	`131`	`{"symbol", symbol}`
`132`	`132`	`};`
`133`		`- co_await makeRequest(command);`
	`133`	`+ co_await m_connection->makeRequest(command);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`boost::asio::awaitable<void> XStationClientStream::getTrades()`
`@@ -139,15 +139,15 @@ boost::asio::awaitable<void> XStationClientStream::getTrades()`
`139`	`139`	`{"command", "getTrades"},`
`140`	`140`	`{"streamSessionId", m_streamSessionId}`
`141`	`141`	`};`
`142`		`- co_await makeRequest(command);`
	`142`	`+ co_await m_connection->makeRequest(command);`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`boost::asio::awaitable<void> XStationClientStream::stopTrades()`
`146`	`146`	`{`
`147`	`147`	`boost::json::object command = {`
`148`	`148`	`{"command", "stopTrades"}`
`149`	`149`	`};`
`150`		`- co_await makeRequest(command);`
	`150`	`+ co_await m_connection->makeRequest(command);`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`boost::asio::awaitable<void> XStationClientStream::getTradeStatus()`
`@@ -156,15 +156,15 @@ boost::asio::awaitable<void> XStationClientStream::getTradeStatus()`
`156`	`156`	`{"command", "getTradeStatus"},`
`157`	`157`	`{"streamSessionId", m_streamSessionId}`
`158`	`158`	`};`
`159`		`- co_await makeRequest(command);`
	`159`	`+ co_await m_connection->makeRequest(command);`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`boost::asio::awaitable<void> XStationClientStream::stopTradeStatus()`
`163`	`163`	`{`
`164`	`164`	`boost::json::object command = {`
`165`	`165`	`{"command", "stopTradeStatus"}`
`166`	`166`	`};`
`167`		`- co_await makeRequest(command);`
	`167`	`+ co_await m_connection->makeRequest(command);`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`boost::asio::awaitable<void> XStationClientStream::ping()`
`@@ -173,7 +173,7 @@ boost::asio::awaitable<void> XStationClientStream::ping()`
`173`	`173`	`{"command", "ping"},`
`174`	`174`	`{"streamSessionId", m_streamSessionId}`
`175`	`175`	`};`
`176`		`- co_await makeRequest(command);`
	`176`	`+ co_await m_connection->makeRequest(command);`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`} // namespace xapi`