only expose call to asio_client

Author: stephenberry

include/glaze/ext/glaze_asio.hpp

@@ -323,11 +323,10 @@ namespace glz
          }
       }
 
-      template <class... Params>
-      void notify(repe::user_header&& header, repe::message& response, Params&&... params)
+      template <class Header = repe::user_header, class... Params>
+      void call(Header&& header, repe::message& response, Params&&... params)
       {
          auto request = message_pool->borrow();
-         header.notify(true);
          repe::request<Opts>(std::move(header), *request, std::forward<Params>(params)...);
          if (bool(request->error())) {
             encode_error(request->error(), response, "bad request");
@@ -351,88 +350,17 @@ namespace glz
             encode_error(ec, response, "send failure");
             return;
          }
-      }
-
-      void get(repe::user_header&& header, repe::message& response)
-      {
-         auto request = message_pool->borrow();
-         header.notify(false);
-         header.read(true);
-         repe::request<Opts>(std::move(header), *request);
-         if (bool(request->error())) {
-            encode_error(request->error(), response, "bad request");
-            return;
-         }
-
-         unique_socket socket{socket_pool.get()};
-         if (not socket) {
-            socket.ptr.reset();
-            (*is_connected) = false;
-            encode_error(error_code::send_error, response, "socket failure");
-            return;
-         }
-
-         error_code ec{};
-         send_buffer(*socket, *request, ec);
-
-         if (bool(ec)) {
-            socket.ptr.reset();
-            (*is_connected) = false;
-            encode_error(ec, response, "send failure");
-            return;
-         }
 
-         receive_buffer(*socket, response, ec);
-         if (bool(ec)) {
-            socket.ptr.reset();
-            (*is_connected) = false;
-            encode_error(ec, response, "receive failure");
-            return;
-         }
-      }
-
-      template <class... Params>
-      void set(repe::user_header&& header, repe::message& response, Params&&... params)
-      {
-         auto request = message_pool->borrow();
-         repe::request<Opts>(std::move(header), *request, std::forward<Params>(params)...);
-         if (bool(request->error())) {
-            encode_error(request->error(), response, "bad request");
-            return;
-         }
-
-         unique_socket socket{socket_pool.get()};
-         if (not socket) {
-            socket.ptr.reset();
-            (*is_connected) = false;
-            encode_error(error_code::send_error, response, "socket failure");
-            return;
-         }
-
-         error_code ec{};
-         send_buffer(*socket, *request, ec);
-
-         if (bool(ec)) {
-            socket.ptr.reset();
-            (*is_connected) = false;
-            encode_error(ec, response, "send failure");
-            return;
-         }
-
-         receive_buffer(*socket, response, ec);
-         if (bool(ec)) {
-            socket.ptr.reset();
-            (*is_connected) = false;
-            encode_error(ec, response, "receive failure");
-            return;
+         if (not header.notify()) {
+            receive_buffer(*socket, response, ec);
+            if (bool(ec)) {
+               socket.ptr.reset();
+               (*is_connected) = false;
+               encode_error(ec, response, "receive failure");
+               return;
+            }
          }
       }
-
-      template <class... Params>
-      void call(repe::user_header&& header, repe::message& response, Params&&... params)
-      {
-         set(std::move(header), response, std::forward<Params>(params)...);
-      }
    };
 
    template <opts Opts = opts{}>

tests/asio_repe/asio_repe.cpp

@@ -41,7 +41,9 @@ void notify_test()
       }
 
       glz::repe::message msg{};
-      client.notify({"/hello"}, msg);
+      glz::repe::user_header header{"/hello"};
+      header.notify(true);
+      client.call(header, msg);
       if (bool(msg.error())) {
          throw std::runtime_error(glz::repe::decode_error(msg));
       }
@@ -91,7 +93,7 @@ void async_clients_test()
       }
 
       glz::repe::message msg{};
-      client.set({"/age"}, msg, 29);
+      client.call({"/age"}, msg, 29);
       if (bool(msg.error())) {
          std::cerr << glz::repe::decode_error(msg) << '\n';
       }
@@ -297,7 +299,7 @@ void raw_json_tests()
    (void)client.init();
 
    glz::repe::message msg{};
-   client.get({"/do_nothing"}, msg);
+   client.call({"/do_nothing"}, msg);
    if (bool(msg.error())) {
       std::cerr << glz::repe::decode_error(msg) << '\n';
    }