update pipes

markaren · Sep 20, 2024 · fabe69f · fabe69f
1 parent 045d812
commit fabe69f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/include/simple_socket/Pipe.hpp b/include/simple_socket/Pipe.hpp
@@ -7,8 +7,13 @@
 #include <vector>
 
 class NamedPipe {
+
+    struct PassKey {
+        friend class NamedPipe;
+    };
+
 public:
-    NamedPipe();
+    explicit NamedPipe(PassKey passKey);
 
     NamedPipe(NamedPipe&& other) noexcept;
 
@@ -17,7 +22,7 @@ class NamedPipe {
 
     bool send(const std::string& message);
 
-    size_t receive(std::vector<unsigned char>& buffer);
+    int receive(std::vector<unsigned char>& buffer);
 
     static std::unique_ptr<NamedPipe> listen(const std::string& name);
 
@@ -26,6 +31,7 @@ class NamedPipe {
     ~NamedPipe();
 
 private:
+
     struct Impl;
     std::unique_ptr<Impl> pimpl_;
 };

diff --git a/src/simple_socket/Pipe.cpp b/src/simple_socket/Pipe.cpp
@@ -21,13 +21,14 @@ struct NamedPipe::Impl {
     }
 
     static std::unique_ptr<NamedPipe> createPipe(HANDLE hPipe) {
-        auto pipe = std::make_unique<NamedPipe>();
+        auto pipe = std::make_unique<NamedPipe>(PassKey());
         pipe->pimpl_->hPipe_ = hPipe;
         return pipe;
     }
 };
 
-NamedPipe::NamedPipe(): pimpl_(std::make_unique<Impl>()) {}
+NamedPipe::NamedPipe(PassKey)
+    : pimpl_(std::make_unique<Impl>()) {}
 
 NamedPipe::NamedPipe(NamedPipe&& other) noexcept: pimpl_(std::make_unique<Impl>()) {
     other.pimpl_->hPipe_ = INVALID_HANDLE_VALUE;
@@ -42,15 +43,15 @@ bool NamedPipe::send(const std::string& message) {
     return true;
 }
 
-size_t NamedPipe::receive(std::vector<unsigned char>& buffer) {
+int NamedPipe::receive(std::vector<unsigned char>& buffer) {
 
     DWORD bytesRead;
     if (!ReadFile(pimpl_->hPipe_, buffer.data(), buffer.size() - 1, &bytesRead, nullptr)) {
         std::cerr << "Failed to read from pipe. Error: " << GetLastError() << std::endl;
         return -1;
     }
     buffer[bytesRead] = '\0';
-    return bytesRead;
+    return static_cast<int>(bytesRead);
 }
 
 std::unique_ptr<NamedPipe> NamedPipe::listen(const std::string& name) {
@@ -70,14 +71,11 @@ std::unique_ptr<NamedPipe> NamedPipe::listen(const std::string& name) {
         return nullptr;
     }
 
-    std::cout << "Waiting for client connection..." << std::endl;
     if (!ConnectNamedPipe(hPipe, nullptr)) {
         std::cerr << "Failed to connect pipe. Error: " << GetLastError() << std::endl;
         return nullptr;
     }
 
-    std::cout << "Pipe created successfully!" << std::endl;
-
     return Impl::createPipe(hPipe);
 }
 
@@ -120,4 +118,5 @@ std::unique_ptr<NamedPipe> NamedPipe::connect(const std::string& name, long time
         std::this_thread::sleep_for(std::chrono::milliseconds(500));
     }
 }
-NamedPipe::~NamedPipe() = default;
+
+NamedPipe::~NamedPipe() = default;
diff --git a/tests/integration/run_pipe_client.cpp b/tests/integration/run_pipe_client.cpp
@@ -5,7 +5,7 @@
 
 int main() {
 
-    auto conn = NamedPipe::connect("PingPongPipe", 500);
+    const auto conn = NamedPipe::connect("PingPongPipe", 500);
 
     if (!conn) return 1;
 

diff --git a/tests/integration/run_pipe_server.cpp b/tests/integration/run_pipe_server.cpp
@@ -5,7 +5,8 @@
 
 int main() {
 
-    auto conn = NamedPipe::listen("PingPongPipe");
+    std::cout << "Waiting for client connection..." << std::endl;
+    const auto conn = NamedPipe::listen("PingPongPipe");
 
     if (!conn) return 1;