Fix default init for safeMode

MPogotsky · Sep 3, 2024 · a5cab32 · a5cab32
1 parent 74eb04d
commit a5cab32
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 12 deletions.
diff --git a/xapi/Connection.cpp b/xapi/Connection.cpp
@@ -15,7 +15,7 @@ namespace internals
 Connection::Connection(boost::asio::io_context &ioContext)
     : m_ioContext(ioContext), m_sslContext(boost::asio::ssl::context::tlsv13_client),
       m_websocket(m_ioContext, m_sslContext), m_lastRequestTime(std::chrono::system_clock::now()),
-      m_connectionEstablished(false)
+      m_connectionEstablished(false), m_requestTimeout(200), m_websocketDefaultPort("443")
 {
 }
 

diff --git a/xapi/Connection.hpp b/xapi/Connection.hpp
@@ -19,8 +19,17 @@ namespace internals
 class Connection
 {
   public:
+    Connection() = delete;
+
+    Connection(const Connection &) = delete;
+    Connection &operator=(const Connection &) = delete;
+
+    Connection(Connection &&other) = default;
+    // Move assignment operatopr not supported because of boost::beast::websocket::stream
+    Connection &operator=(Connection &&other) = delete;
+
     Connection(boost::asio::io_context &ioContext);
-    ~Connection() {};
+    virtual ~Connection() = default;
 
     boost::asio::awaitable<void> connect(const std::string &url);
 
@@ -43,8 +52,8 @@ class Connection
     std::chrono::time_point<std::chrono::system_clock> m_lastRequestTime;
     bool m_connectionEstablished;
 
-    const std::chrono::milliseconds m_requestTimeout{200};
-    const std::string m_websocketDefaultPort{"443"};
+    const std::chrono::milliseconds m_requestTimeout;
+    const std::string m_websocketDefaultPort;
 };
 
 } // namespace internals

diff --git a/xapi/Socket.cpp b/xapi/Socket.cpp
@@ -4,6 +4,10 @@
 namespace xapi
 {
 
+Socket::Socket(boost::asio::io_context &ioContext)
+: Connection(ioContext), safeMode(true) 
+{}
+
 boost::asio::awaitable<void> Socket::initSession(const std::string &host, const std::string &type)
 {
     const std::string socketUrl = urlWithValidHost(host).value_or(host) + "/" + type;

diff --git a/xapi/Socket.hpp b/xapi/Socket.hpp
@@ -9,11 +9,16 @@ namespace xapi
 class Socket final : protected internals::Connection
 {
   public:
-
     Socket() = delete;
-    ~Socket() = default;
 
-    using Connection::Connection;
+    Socket(const Socket &) = delete;
+    Socket &operator=(const Socket &) = delete;
+
+    Socket(Socket &&other) = default;
+    Socket &operator=(Socket &&other) = delete;
+
+    Socket(boost::asio::io_context &ioContext);
+    ~Socket() override = default;
 
     bool safeMode;
 

diff --git a/xapi/Stream.cpp b/xapi/Stream.cpp
@@ -3,6 +3,11 @@
 
 namespace xapi
 {
+
+Stream::Stream(boost::asio::io_context &ioContext)
+: Connection(ioContext), m_streamSessionId("") 
+{}
+
 boost::asio::awaitable<void> Stream::initSession(const std::string &host, const std::string &type, const std::string& streamSessionId)
 {
     const std::string streamUrl = urlWithValidHost(host).value_or(host) + "/" + type + "Stream";

diff --git a/xapi/Stream.hpp b/xapi/Stream.hpp
@@ -9,13 +9,19 @@ namespace xapi
 class Stream final : protected internals::Connection
 {
   public:
-
     Stream() = delete;
-    ~Stream() = default;
 
-    using Connection::Connection;
+    Stream(const Stream &) = delete;
+    Stream &operator=(const Stream &) = delete;
+
+    Stream(Stream &&other) = default;
+    Stream &operator=(Stream &&other) = delete;
+
+    Stream(boost::asio::io_context &ioContext);
+    ~Stream() override = default;
 
-    boost::asio::awaitable<void> initSession(const std::string &host, const std::string &type, const std::string& streamSessionId);
+    boost::asio::awaitable<void> initSession(const std::string &host, const std::string &type,
+                                             const std::string &streamSessionId);
 
     boost::asio::awaitable<void> closeSession();
 
@@ -55,7 +61,7 @@ class Stream final : protected internals::Connection
 
     boost::asio::awaitable<void> ping();
 
-private:
+  private:
     std::string m_streamSessionId;
 };