couchbase 4.4.2 → 4.4.3

package/deps/couchbase-cxx-client/core/columnar/agent.cxx

@@ -49,7 +49,7 @@ public:
 
   auto free_form_http_request(const http_request& request,
                               free_form_http_request_callback&& callback)
-    -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>
+    -> tl::expected<std::shared_ptr<pending_operation>, error_union>
   {
     return http_.do_http_request(request, std::move(callback));
   }
@@ -102,7 +102,7 @@ agent::agent(asio::io_context& io, couchbase::core::columnar::agent_config confi
 auto
 agent::free_form_http_request(const http_request& request,
                               free_form_http_request_callback&& callback)
-  -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>
+  -> tl::expected<std::shared_ptr<pending_operation>, error_union>
 {
   return impl_->free_form_http_request(request, std::move(callback));
 }

package/deps/couchbase-cxx-client/core/columnar/agent.hxx

@@ -46,7 +46,7 @@ public:
 
   auto free_form_http_request(const http_request& request,
                               free_form_http_request_callback&& callback)
-    -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>;
+    -> tl::expected<std::shared_ptr<pending_operation>, error_union>;
 
   auto free_form_http_request_buffered(const http_request& request,
                                        buffered_free_form_http_request_callback&& callback)

package/deps/couchbase-cxx-client/core/columnar/management_component.cxx

@@ -189,7 +189,7 @@ public:
       "SELECT d.* FROM `System`.`Metadata`.`Database` AS d",
       options.timeout,
     };
-    return execute(std::move(req), [cb = std::move(callback)](auto raw_res, auto err) {
+    return execute(std::move(req), [cb = std::move(callback)](const auto& raw_res, auto err) {
       if (err) {
         cb({}, std::move(err));
         return;
@@ -216,7 +216,7 @@ public:
     if (options.ignore_if_exists) {
       req.statement += " IF NOT EXISTS";
     }
-    return execute(std::move(req), [cb = std::move(callback)](auto /*raw_res*/, auto err) {
+    return execute(std::move(req), [cb = std::move(callback)](const auto& /*raw_res*/, auto err) {
       cb(std::move(err));
     });
   }
@@ -231,7 +231,7 @@ public:
     if (options.ignore_if_not_exists) {
       req.statement += " IF EXISTS";
     }
-    return execute(std::move(req), [cb = std::move(callback)](auto /*raw_res*/, auto err) {
+    return execute(std::move(req), [cb = std::move(callback)](const auto& /*raw_res*/, auto err) {
       cb(std::move(err));
     });
   }

package/deps/couchbase-cxx-client/core/columnar/query_component.cxx

@@ -79,17 +79,28 @@ public:
 
   auto dispatch() -> error
   {
-    auto op =
-      http_.do_http_request(http_req_, [self = shared_from_this()](auto resp, auto ec) mutable {
+    auto op = http_.do_http_request(
+      http_req_, [self = shared_from_this()](auto resp, error_union err) mutable {
         std::shared_ptr<pending_operation> op;
         {
           const std::scoped_lock lock{ self->pending_op_mutex_ };
           std::swap(op, self->pending_op_);
         }
-        if (ec) {
-          self->invoke_callback(
-            {},
-            { maybe_convert_error_code(ec), "Failed to execute the HTTP request for the query" });
+        if (!std::holds_alternative<std::monostate>(err)) {
+          if (std::holds_alternative<impl::bootstrap_error>(err)) {
+            auto bootstrap_error = std::get<impl::bootstrap_error>(err);
+            auto message = fmt::format(
+              "Failed to execute the HTTP request for the query due to a bootstrap error.  "
+              "See logs for further details.  bootstrap_error.message={}",
+              bootstrap_error.error_message);
+            self->invoke_callback({}, { maybe_convert_error_code(bootstrap_error.ec), message });
+          } else {
+            auto ec = maybe_convert_error_code(std::get<std::error_code>(err));
+            if (ec == errc::timeout) {
+              return self->trigger_timeout();
+            }
+            self->invoke_callback({}, { ec, "Failed to execute the HTTP request for the query" });
+          }
           return;
         }
         // op can be null if the pending_query_operation was cancelled.
@@ -101,7 +112,7 @@ public:
         }
         auto streamer = std::make_shared<row_streamer>(self->io_, resp.body(), "/results/^");
         return streamer->start(
-          [self, streamer, resp = std::move(resp)](auto metadata_header, auto ec) mutable {
+          [self, streamer, resp = std::move(resp)](const auto& metadata_header, auto ec) mutable {
             if (ec) {
               self->invoke_callback({}, { maybe_convert_error_code(ec) });
               return;
@@ -127,7 +138,27 @@ public:
       pending_op_ = op.value();
       return {};
     }
-    return error{ op.error() };
+    retry_timer_.cancel();
+    deadline_.cancel();
+    error return_error{};
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+    if (std::holds_alternative<impl::bootstrap_error>(op.error())) {
+      auto bootstrap_error = std::get<impl::bootstrap_error>(op.error());
+      auto message =
+        fmt::format("Failed to create the HTTP pending operation due to a bootstrap error.  "
+                    "See logs for further details.  bootstrap_error.message={}",
+                    bootstrap_error.error_message);
+      return_error.ec = bootstrap_error.ec;
+      return_error.message = message;
+    } else {
+      return_error.ec = std::get<std::error_code>(op.error());
+      return_error.message = "Failed to create the HTTP pending operation.";
+    }
+#else
+    return_error.ec = op.error();
+#endif
+    invoke_callback({}, return_error);
+    return return_error;
   }
 
   auto start(query_callback&& callback) -> error
@@ -252,11 +283,13 @@ private:
           break;
       }
     }
+
+    const std::chrono::milliseconds server_timeout = timeout_ + std::chrono::seconds(5);
+    payload["timeout"] = fmt::format("{}ms", server_timeout.count());
+
     for (const auto& [key, val] : options.raw) {
       payload[key] = utils::json::parse(val);
     }
-    const std::chrono::milliseconds server_timeout = timeout_ + std::chrono::seconds(5);
-    payload["timeout"] = fmt::format("{}ms", server_timeout.count());
 
     return payload;
   }
@@ -296,7 +329,7 @@ private:
     // retryable errors should be listed.
     if (err.ec == errc::timeout && retry_info_.last_error) {
       if (const auto* e = retry_info_.last_error.ctx.find("errors"); e != nullptr) {
-        err.ctx["last_errors"] = e;
+        err.ctx["last_errors"] = e->get_array();
       }
     }
   }
@@ -334,53 +367,71 @@ private:
     std::int32_t first_error_code{ 0 };
     std::string first_error_msg{};
 
+    std::int32_t first_non_retr_error_code{ 0 };
+    std::string first_non_retr_error_msg{};
+
     for (auto error_json : errors_json->get_array()) {
-      auto* retr = error_json.find("retriable");
-      if (retr == nullptr) {
-        // An error is assumed to not be retriable if the field is missing
-        res.retriable = false;
-      } else if (!retr->is_boolean()) {
-        return { { errc::generic,
-                   "Could not parse error from server response - 'retriable' was not boolean" } };
-      } else {
-        // Operation is retriable iff all errors are retriable
-        res.retriable = res.retriable && retr->get_boolean();
+      bool retr{ false }; // An error is assumed to not be retriable if the field is missing
+      {
+        auto* r = error_json.find("retriable");
+        if (r != nullptr) {
+          if (!r->is_boolean()) {
+            return {
+              { errc::generic,
+                "Could not parse error from server response - 'retriable' was not boolean" }
+            };
+          }
+          retr = r->get_boolean();
+        }
       }
 
-      auto* msg = error_json.find("msg");
-      if (msg == nullptr) {
-        return { { errc::generic,
-                   "Could not parse error from server response - could not find 'msg' field" } };
-      }
-      if (!msg->is_string()) {
-        return { { errc::generic,
-                   "Could not parse error from server response - 'msg' field was not string" } };
-      }
+      // Operation is retriable iff all errors are retriable
+      res.retriable = res.retriable && retr;
 
-      auto* c = error_json.find("code");
-      if (c == nullptr) {
-        return { { errc::generic,
-                   "Could not parse error from server response - could not find 'code' field" } };
-      }
-      if (!(c->is_unsigned() || c->is_signed())) {
-        return {
-          { errc::generic,
-            "Could not parse error from server response - 'code' field was not an integer" }
-        };
+      std::string msg{};
+      {
+        auto* m = error_json.find("msg");
+        if (m == nullptr) {
+          return { { errc::generic,
+                     "Could not parse error from server response - could not find 'msg' field" } };
+        }
+        if (!m->is_string()) {
+          return { { errc::generic,
+                     "Could not parse error from server response - 'msg' field was not string" } };
+        }
+        msg = m->get_string();
       }
 
-      std::int32_t code = c->is_signed() ? gsl::narrow_cast<std::int32_t>(c->get_signed())
-                                         : gsl::narrow_cast<std::int32_t>(c->get_unsigned());
+      std::int32_t code{};
+      {
+        auto* c = error_json.find("code");
+        if (c == nullptr) {
+          return { { errc::generic,
+                     "Could not parse error from server response - could not find 'code' field" } };
+        }
+        if (!(c->is_unsigned() || c->is_signed())) {
+          return {
+            { errc::generic,
+              "Could not parse error from server response - 'code' field was not an integer" }
+          };
+        }
+        code = c->is_signed() ? gsl::narrow_cast<std::int32_t>(c->get_signed())
+                              : gsl::narrow_cast<std::int32_t>(c->get_unsigned());
+      }
 
       tao::json::value error = {
         { "code", code },
-        { "msg", msg->get_string() },
+        { "msg", msg },
       };
       res.err.ctx["errors"].get_array().emplace_back(std::move(error));
 
       if (first_error_code == 0) {
         first_error_code = code;
-        first_error_msg = msg->get_string();
+        first_error_msg = msg;
+      }
+      if (!retr && first_non_retr_error_code == 0) {
+        first_non_retr_error_code = code;
+        first_non_retr_error_msg = msg;
       }
 
       switch (code) {
@@ -396,7 +447,14 @@ private:
     }
 
     if (res.err.ec == errc::query_error) {
-      res.err.properties = query_error_properties{ first_error_code, first_error_msg };
+      // If any of the errors is not retriable, report the first non-retriable code/message in the
+      // error properties
+      if (first_non_retr_error_code != 0) {
+        res.err.properties =
+          query_error_properties{ first_non_retr_error_code, first_non_retr_error_msg };
+      } else {
+        res.err.properties = query_error_properties{ first_error_code, first_error_msg };
+      }
     }
 
     return res;

package/deps/couchbase-cxx-client/core/columnar/query_component.hxx

@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include "core/impl/bootstrap_error.hxx"
 #include "core/pending_operation.hxx"
 #include "error.hxx"
 #include "query_options.hxx"

package/deps/couchbase-cxx-client/core/free_form_http_request.hxx

@@ -15,6 +15,9 @@
 
 #pragma once
 
+#include <couchbase/build_config.hxx>
+
+#include "core/impl/bootstrap_error.hxx"
 #include "service_type.hxx"
 #include "utils/movable_function.hxx"
 
@@ -101,8 +104,13 @@ private:
   std::shared_ptr<http_response_impl> impl_;
 };
 
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+using free_form_http_request_callback =
+  utils::movable_function<void(http_response response, couchbase::core::error_union err)>;
+#else
 using free_form_http_request_callback =
   utils::movable_function<void(http_response response, std::error_code ec)>;
+#endif
 
 class buffered_http_response_impl;
 

package/deps/couchbase-cxx-client/core/http_component.cxx

@@ -131,19 +131,22 @@ public:
     invoke_response_handler(errc::common::request_canceled, {});
   }
 
-  void invoke_response_handler(std::error_code ec, io::http_streaming_response resp)
-  {
-    deadline_.cancel();
 #ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+  void invoke_response_handler(error_union err, io::http_streaming_response resp)
+  {
     dispatch_deadline_.cancel();
+#else
+  void invoke_response_handler(std::error_code err, io::http_streaming_response resp)
+  {
 #endif
+    deadline_.cancel();
     free_form_http_request_callback callback{};
     {
       const std::scoped_lock lock(callback_mutex_);
       std::swap(callback, callback_);
     }
     if (callback) {
-      callback(http_response{ std::move(resp) }, ec);
+      callback(http_response{ std::move(resp) }, err);
     }
   }
 
@@ -157,12 +160,22 @@ public:
     auto start_op = [self = shared_from_this()]() {
       self->session_->write_and_stream(
         self->encoded_,
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+        [self](error_union err, io::http_streaming_response resp) {
+          if (std::holds_alternative<std::error_code>(err) &&
+              std::get<std::error_code>(err) == asio::error::operation_aborted) {
+            return;
+          }
+          self->invoke_response_handler(err, std::move(resp));
+        },
+#else
         [self](std::error_code ec, io::http_streaming_response resp) {
           if (ec == asio::error::operation_aborted) {
             return;
           }
           self->invoke_response_handler(ec, std::move(resp));
         },
+#endif
         [self]() {
           self->stream_end_callback_();
         });
@@ -409,8 +422,13 @@ public:
   {
   }
 
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+  auto do_http_request(const http_request& request, free_form_http_request_callback&& callback)
+    -> tl::expected<std::shared_ptr<pending_operation>, error_union>
+#else
   auto do_http_request(const http_request& request, free_form_http_request_callback&& callback)
     -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>
+#endif
   {
     std::shared_ptr<io::http_session_manager> session_manager;
     {
@@ -436,9 +454,9 @@ public:
     auto op =
       std::make_shared<pending_http_operation>(io_, request, session_manager->dispatch_timeout());
     if (!session_manager->is_configured()) {
-      auto ec = defer_command(op, session_manager, credentials, std::move(callback));
-      if (ec) {
-        return tl::unexpected{ ec };
+      auto err = defer_command(op, session_manager, credentials, std::move(callback));
+      if (!std::holds_alternative<std::monostate>(err)) {
+        return tl::unexpected{ err };
       }
       return op;
     }
@@ -478,8 +496,11 @@ public:
     auto op = std::make_shared<pending_buffered_http_operation>(
       io_, request, session_manager->dispatch_timeout());
     if (!session_manager->is_configured()) {
-      auto ec = defer_command(op, session_manager, credentials, std::move(callback));
-      if (ec) {
+      auto err = defer_command(op, session_manager, credentials, std::move(callback));
+      if (!std::holds_alternative<std::monostate>(err)) {
+        auto ec = std::holds_alternative<impl::bootstrap_error>(err)
+                    ? std::get<impl::bootstrap_error>(err).ec
+                    : std::get<std::error_code>(err);
         return tl::unexpected{ ec };
       }
       return op;
@@ -498,16 +519,19 @@ private:
                            const couchbase::core::cluster_credentials& credentials,
                            free_form_http_request_callback&& callback)
   {
-    op->start([callback = std::move(callback)](auto resp, auto ec) mutable {
-      callback(std::move(resp), ec);
-    });
-
 #ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+    op->start([callback = std::move(callback)](auto resp, error_union err) mutable {
+      callback(std::move(resp), err);
+    });
     // don't do anything if the op wasn't dispatched or has already timed out
     auto now = std::chrono::steady_clock::now();
     if (op->dispatch_deadline_expiry() < now || op->deadline_expiry() < now) {
       return;
     }
+#else
+    op->start([callback = std::move(callback)](auto resp, auto ec) mutable {
+      callback(std::move(resp), ec);
+    });
 #endif
     std::shared_ptr<io::http_session> session;
     {
@@ -592,10 +616,10 @@ private:
   auto defer_command(std::shared_ptr<PendingHttpOp> pending_op,
                      const std::shared_ptr<io::http_session_manager>& session_manager,
                      const couchbase::core::cluster_credentials& credentials,
-                     Callback&& callback) -> std::error_code
+                     Callback&& callback) -> error_union
   {
     if (auto last_error = session_manager->last_bootstrap_error(); last_error.has_value()) {
-      return last_error->ec;
+      return last_error.value();
     }
     CB_LOG_DEBUG(
       R"(Adding pending HTTP operation to deferred queue: service={}, client_context_id={})",
@@ -605,26 +629,26 @@ private:
                                             callback = std::forward<Callback>(callback),
                                             op = std::move(pending_op),
                                             session_manager,
-                                            credentials](std::error_code ec) mutable {
-      if (ec) {
+                                            credentials](error_union err) mutable {
+      if (!std::holds_alternative<std::monostate>(err)) {
         // The deferred operation was cancelled - currently this can happen due to closing the
         // cluster
-        return callback({}, ec);
+        return callback({}, err);
       }
 
       return send_http_operation(
         op, session_manager, credentials, std::forward<Callback>(callback));
     });
-    return {};
+    return std::monostate{};
   }
 
   auto defer_command(std::shared_ptr<pending_buffered_http_operation> pending_op,
                      const std::shared_ptr<io::http_session_manager>& session_manager,
                      const couchbase::core::cluster_credentials& credentials,
-                     buffered_free_form_http_request_callback&& callback) -> std::error_code
+                     buffered_free_form_http_request_callback&& callback) -> error_union
   {
     if (auto last_error = session_manager->last_bootstrap_error(); last_error.has_value()) {
-      return last_error->ec;
+      return last_error.value();
     }
     CB_LOG_DEBUG(
       R"(Adding pending HTTP operation to deferred queue: service={}, client_context_id={})",
@@ -634,8 +658,11 @@ private:
                                             callback = std::move(callback),
                                             op = std::move(pending_op),
                                             session_manager,
-                                            credentials](std::error_code ec) mutable {
-      if (ec) {
+                                            credentials](error_union err) mutable {
+      if (!std::holds_alternative<std::monostate>(err)) {
+        auto ec = std::holds_alternative<impl::bootstrap_error>(err)
+                    ? std::get<impl::bootstrap_error>(err).ec
+                    : std::get<std::error_code>(err);
         // The deferred operation was cancelled - currently this can happen due to closing the
         // cluster
         return callback({}, ec);
@@ -643,7 +670,7 @@ private:
 
       return send_http_operation(op, session_manager, credentials, std::move(callback));
     });
-    return {};
+    return std::monostate{};
   }
 #endif
 
@@ -664,7 +691,11 @@ http_component::http_component(asio::io_context& io,
 auto
 http_component::do_http_request(const http_request& request,
                                 free_form_http_request_callback&& callback)
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+  -> tl::expected<std::shared_ptr<pending_operation>, error_union>
+#else
   -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>
+#endif
 {
   return impl_->do_http_request(request, std::move(callback));
 }

package/deps/couchbase-cxx-client/core/http_component.hxx

@@ -49,7 +49,11 @@ public:
                  std::shared_ptr<retry_strategy> default_retry_strategy = {});
 
   auto do_http_request(const http_request& request, free_form_http_request_callback&& callback)
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+    -> tl::expected<std::shared_ptr<pending_operation>, error_union>;
+#else
     -> tl::expected<std::shared_ptr<pending_operation>, std::error_code>;
+#endif
 
   auto do_http_request_buffered(const http_request& request,
                                 buffered_free_form_http_request_callback&& callback)

package/deps/couchbase-cxx-client/core/impl/analytics_index_manager.cxx

@@ -159,7 +159,7 @@ public:
         {},
         options.timeout,
       },
-      [dataverse_name, handler = std::move(handler)](auto resp) {
+      [dataverse_name, handler = std::move(handler)](const auto& resp) {
         CB_LOG_DEBUG(
           "Dataverse create for {} error code = {}", dataverse_name, resp.ctx.ec.value());
         handler(core::impl::make_error(resp.ctx));
@@ -177,7 +177,7 @@ public:
         {},
         options.timeout,
       },
-      [handler = std::move(handler)](auto resp) {
+      [handler = std::move(handler)](const auto& resp) {
         handler(core::impl::make_error(resp.ctx));
       });
   }
@@ -197,7 +197,7 @@ public:
         options.timeout,
         options.ignore_if_exists,
       },
-      [handler = std::move(handler)](auto resp) {
+      [handler = std::move(handler)](const auto& resp) {
         handler(core::impl::make_error(resp.ctx));
       });
   }
@@ -214,7 +214,7 @@ public:
         {},
         options.timeout,
       },
-      [handler = std::move(handler)](auto resp) {
+      [handler = std::move(handler)](const auto& resp) {
         handler(core::impl::make_error(resp.ctx));
       });
   }
@@ -262,7 +262,7 @@ public:
         {},
         options.timeout,
       },
-      [handler = std::move(handler)](auto resp) {
+      [handler = std::move(handler)](const auto& resp) {
         handler(core::impl::make_error(resp.ctx));
       });
   }
@@ -281,7 +281,7 @@ public:
         {},
         options.timeout,
       },
-      [handler = std::move(handler)](auto resp) {
+      [handler = std::move(handler)](const auto& resp) {
         handler(core::impl::make_error(resp.ctx));
       });
   }
@@ -324,7 +324,7 @@ public:
         {},
         options.timeout,
       },
-      [handler = std::move(handler)](auto resp) {
+      [handler = std::move(handler)](const auto& resp) {
         handler(core::impl::make_error(resp.ctx));
       });
   }
@@ -339,7 +339,7 @@ public:
         {},
         options.timeout,
       },
-      [handler = std::move(handler)](auto resp) {
+      [handler = std::move(handler)](const auto& resp) {
         handler(core::impl::make_error(resp.ctx));
       });
   }
@@ -386,7 +386,7 @@ public:
             {},
             options.timeout,
           },
-          [handler = std::move(handler)](auto resp) {
+          [handler = std::move(handler)](const auto& resp) {
             handler(core::impl::make_error(resp.ctx));
           });
 
@@ -398,7 +398,7 @@ public:
             {},
             options.timeout,
           },
-          [handler = std::move(handler)](auto resp) {
+          [handler = std::move(handler)](const auto& resp) {
             handler(core::impl::make_error(resp.ctx));
           });
 
@@ -410,7 +410,7 @@ public:
             {},
             options.timeout,
           },
-          [handler = std::move(handler)](auto resp) {
+          [handler = std::move(handler)](const auto& resp) {
             handler(core::impl::make_error(resp.ctx));
           });
     }
@@ -429,7 +429,7 @@ public:
             {},
             options.timeout,
           },
-          [handler = std::move(handler)](auto resp) {
+          [handler = std::move(handler)](const auto& resp) {
             handler(core::impl::make_error(resp.ctx));
           });
 
@@ -441,7 +441,7 @@ public:
             {},
             options.timeout,
           },
-          [handler = std::move(handler)](auto resp) {
+          [handler = std::move(handler)](const auto& resp) {
             handler(core::impl::make_error(resp.ctx));
           });
 
@@ -453,7 +453,7 @@ public:
             {},
             options.timeout,
           },
-          [handler = std::move(handler)](auto resp) {
+          [handler = std::move(handler)](const auto& resp) {
             handler(core::impl::make_error(resp.ctx));
           });
     }
@@ -471,7 +471,7 @@ public:
         {},
         options.timeout,
       },
-      [handler = std::move(handler)](auto resp) {
+      [handler = std::move(handler)](const auto& resp) {
         handler(core::impl::make_error(resp.ctx));
       });
   }

package/deps/couchbase-cxx-client/core/impl/bootstrap_error.hxx

@@ -20,8 +20,12 @@
 #include <optional>
 #include <string>
 #include <system_error>
+#include <variant>
 
-namespace couchbase::core::impl
+namespace couchbase::core
+{
+
+namespace impl
 {
 
 struct bootstrap_error {
@@ -31,4 +35,8 @@ struct bootstrap_error {
   std::optional<std::string> port;
 };
 
-} // namespace couchbase::core::impl
+} // namespace impl
+
+using error_union = std::variant<std::monostate, std::error_code, impl::bootstrap_error>;
+
+} // namespace couchbase::core

package/deps/couchbase-cxx-client/core/impl/bucket.cxx

@@ -59,7 +59,7 @@ public:
                       name_,
                       core::impl::to_core_service_types(options.service_types),
                       options.timeout,
-                      [handler = std::move(handler)](auto resp) mutable {
+                      [handler = std::move(handler)](const auto& resp) mutable {
                         return handler({}, core::impl::build_result(resp));
                       });
   }