From 7ed57acdeee7ae87a6a2b9cfd620c672beee537e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20L=C3=BCke?= <f.lueke@mesytec.com>
Date: Thu, 28 Nov 2024 02:52:15 +0100
Subject: [PATCH] node_nng: hide some nng details

---
 include/mesytec-node/mesytec_node_nng.h | 49 +++++--------------------
 src/mesytec_node_nng.cc                 | 48 ++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/include/mesytec-node/mesytec_node_nng.h b/include/mesytec-node/mesytec_node_nng.h
index 8058aad..106676d 100644
--- a/include/mesytec-node/mesytec_node_nng.h
+++ b/include/mesytec-node/mesytec_node_nng.h
@@ -2,13 +2,6 @@
 #define B18E3651_CA9A_43BC_AA25_810EA16533CD
 
 #include <nng/nng.h>
-#include <nng/protocol/pair0/pair.h>
-#include <nng/protocol/pipeline0/pull.h>
-#include <nng/protocol/pipeline0/push.h>
-#include <nng/protocol/pubsub0/pub.h>
-#include <nng/protocol/pubsub0/sub.h>
-#include <nng/protocol/reqrep0/req.h>
-#include <nng/protocol/reqrep0/rep.h>
 #include <spdlog/spdlog.h>
 
 #include <optional>
@@ -117,40 +110,16 @@ inline nng_socket make_socket(socket_factory factory, nng_duration timeout = Def
     return socket;
 }
 
-inline nng_socket make_pair_socket(nng_duration timeout = DefaultTimeout)
-{
-    return make_socket(nng_pair0_open, timeout);
-}
+nng_socket make_pair_socket(nng_duration timeout = DefaultTimeout);
 
-inline nng_socket make_push_socket(nng_duration timeout = DefaultTimeout)
-{
-    return make_socket(nng_push0_open, timeout);
-}
+nng_socket make_push_socket(nng_duration timeout = DefaultTimeout);
+nng_socket make_pull_socket(nng_duration timeout = DefaultTimeout);
 
-inline nng_socket make_pull_socket(nng_duration timeout = DefaultTimeout)
-{
-    return make_socket(nng_pull0_open, timeout);
-}
+nng_socket make_pub_socket(nng_duration timeout = DefaultTimeout);
+nng_socket make_sub_socket(nng_duration timeout = DefaultTimeout);
 
-inline nng_socket make_pub_socket(nng_duration timeout = DefaultTimeout)
-{
-    return make_socket(nng_pub0_open, timeout);
-}
-
-inline nng_socket make_sub_socket(nng_duration timeout = DefaultTimeout)
-{
-    return make_socket(nng_sub0_open, timeout);
-}
-
-inline nng_socket make_req_socket(nng_duration timeout = DefaultTimeout)
-{
-    return make_socket(nng_req0_open, timeout);
-}
-
-inline nng_socket make_rep_socket(nng_duration timeout = DefaultTimeout)
-{
-    return make_socket(nng_rep0_open, timeout);
-}
+nng_socket make_req_socket(nng_duration timeout = DefaultTimeout);
+nng_socket make_rep_socket(nng_duration timeout = DefaultTimeout);
 
 inline std::string socket_get_string_opt(nng_socket s, const char *opt)
 {
@@ -440,11 +409,11 @@ inline unique_msg make_message(const std::string &data)
     if (int res = nng_msg_alloc(&msg, data.size()))
     {
         mesy_nng_error("nng_msg_alloc", res);
-        return unique_msg(nullptr, nng_msg_free);
+        return make_unique_msg();
     }
 
     std::memcpy(nng_msg_body(msg), data.data(), data.size());
-    return unique_msg(msg, nng_msg_free);
+    return make_unique_msg(msg);
 }
 
 }
diff --git a/src/mesytec_node_nng.cc b/src/mesytec_node_nng.cc
index a8c74ba..a20179a 100644
--- a/src/mesytec_node_nng.cc
+++ b/src/mesytec_node_nng.cc
@@ -1 +1,49 @@
 #include "mesytec-node/mesytec_node_nng.h"
+
+#include <nng/protocol/pair0/pair.h>
+#include <nng/protocol/pipeline0/pull.h>
+#include <nng/protocol/pipeline0/push.h>
+#include <nng/protocol/pubsub0/pub.h>
+#include <nng/protocol/pubsub0/sub.h>
+#include <nng/protocol/reqrep0/req.h>
+#include <nng/protocol/reqrep0/rep.h>
+
+namespace mesytec::nng
+{
+
+nng_socket make_pair_socket(nng_duration timeout)
+{
+    return make_socket(nng_pair0_open, timeout);
+}
+
+nng_socket make_push_socket(nng_duration timeout)
+{
+    return make_socket(nng_push0_open, timeout);
+}
+
+nng_socket make_pull_socket(nng_duration timeout)
+{
+    return make_socket(nng_pull0_open, timeout);
+}
+
+nng_socket make_pub_socket(nng_duration timeout)
+{
+    return make_socket(nng_pub0_open, timeout);
+}
+
+nng_socket make_sub_socket(nng_duration timeout)
+{
+    return make_socket(nng_sub0_open, timeout);
+}
+
+nng_socket make_req_socket(nng_duration timeout)
+{
+    return make_socket(nng_req0_open, timeout);
+}
+
+nng_socket make_rep_socket(nng_duration timeout)
+{
+    return make_socket(nng_rep0_open, timeout);
+}
+
+}