couchbase 4.4.5 → 4.4.6

package/src/connection.cpp

@@ -442,15 +442,15 @@ Napi::Value Connection::jsScan(const Napi::CallbackInfo &info)
         bucketName,
         [barrier](
             std::error_code ec,
-            const couchbase::core::topology::configuration &config) mutable {
+            std::shared_ptr<couchbase::core::topology::configuration> config) mutable {
             if (ec) {
                 return barrier->set_value(tl::unexpected(ec));
             }
-            if (!config.vbmap || config.vbmap->empty()) {
+            if (!config->vbmap || config->vbmap->empty()) {
                 return barrier->set_value(tl::unexpected(
                     couchbase::errc::common::feature_not_available));
             }
-            barrier->set_value(config.vbmap.value());
+            barrier->set_value(config->vbmap.value());
         });
     auto vbucket_map = f.get();
     if (!vbucket_map.has_value()) {

package/src/jstocbpp_autogen.hpp

@@ -1692,6 +1692,7 @@ struct js_to_cbpp_t<couchbase::core::operations::prepend_request> {
         js_to_cbpp<std::vector<std::byte>>(cppObj.value, jsObj.Get("value"));
         js_to_cbpp<std::uint16_t>(cppObj.partition, jsObj.Get("partition"));
         js_to_cbpp<std::uint32_t>(cppObj.opaque, jsObj.Get("opaque"));
+        js_to_cbpp<couchbase::cas>(cppObj.cas, jsObj.Get("cas"));
         js_to_cbpp<couchbase::durability_level>(cppObj.durability_level,
                                                 jsObj.Get("durability_level"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
@@ -1712,6 +1713,7 @@ struct js_to_cbpp_t<couchbase::core::operations::prepend_request> {
         resObj.Set("partition",
                    cbpp_to_js<std::uint16_t>(env, cppObj.partition));
         resObj.Set("opaque", cbpp_to_js<std::uint32_t>(env, cppObj.opaque));
+        resObj.Set("cas", cbpp_to_js<couchbase::cas>(env, cppObj.cas));
         resObj.Set("durability_level", cbpp_to_js<couchbase::durability_level>(
                                            env, cppObj.durability_level));
         resObj.Set("timeout",
@@ -1737,6 +1739,7 @@ struct js_to_cbpp_t<
         js_to_cbpp<std::vector<std::byte>>(cppObj.value, jsObj.Get("value"));
         js_to_cbpp<std::uint16_t>(cppObj.partition, jsObj.Get("partition"));
         js_to_cbpp<std::uint32_t>(cppObj.opaque, jsObj.Get("opaque"));
+        js_to_cbpp<couchbase::cas>(cppObj.cas, jsObj.Get("cas"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
             cppObj.timeout, jsObj.Get("timeout"));
         // retries
@@ -1759,6 +1762,7 @@ struct js_to_cbpp_t<
         resObj.Set("partition",
                    cbpp_to_js<std::uint16_t>(env, cppObj.partition));
         resObj.Set("opaque", cbpp_to_js<std::uint32_t>(env, cppObj.opaque));
+        resObj.Set("cas", cbpp_to_js<couchbase::cas>(env, cppObj.cas));
         resObj.Set("timeout",
                    cbpp_to_js<std::optional<std::chrono::milliseconds>>(
                        env, cppObj.timeout));
@@ -2263,6 +2267,7 @@ struct js_to_cbpp_t<couchbase::core::operations::append_request> {
         js_to_cbpp<std::vector<std::byte>>(cppObj.value, jsObj.Get("value"));
         js_to_cbpp<std::uint16_t>(cppObj.partition, jsObj.Get("partition"));
         js_to_cbpp<std::uint32_t>(cppObj.opaque, jsObj.Get("opaque"));
+        js_to_cbpp<couchbase::cas>(cppObj.cas, jsObj.Get("cas"));
         js_to_cbpp<couchbase::durability_level>(cppObj.durability_level,
                                                 jsObj.Get("durability_level"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
@@ -2283,6 +2288,7 @@ struct js_to_cbpp_t<couchbase::core::operations::append_request> {
         resObj.Set("partition",
                    cbpp_to_js<std::uint16_t>(env, cppObj.partition));
         resObj.Set("opaque", cbpp_to_js<std::uint32_t>(env, cppObj.opaque));
+        resObj.Set("cas", cbpp_to_js<couchbase::cas>(env, cppObj.cas));
         resObj.Set("durability_level", cbpp_to_js<couchbase::durability_level>(
                                            env, cppObj.durability_level));
         resObj.Set("timeout",
@@ -2308,6 +2314,7 @@ struct js_to_cbpp_t<
         js_to_cbpp<std::vector<std::byte>>(cppObj.value, jsObj.Get("value"));
         js_to_cbpp<std::uint16_t>(cppObj.partition, jsObj.Get("partition"));
         js_to_cbpp<std::uint32_t>(cppObj.opaque, jsObj.Get("opaque"));
+        js_to_cbpp<couchbase::cas>(cppObj.cas, jsObj.Get("cas"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
             cppObj.timeout, jsObj.Get("timeout"));
         // retries
@@ -2331,6 +2338,7 @@ struct js_to_cbpp_t<
         resObj.Set("partition",
                    cbpp_to_js<std::uint16_t>(env, cppObj.partition));
         resObj.Set("opaque", cbpp_to_js<std::uint32_t>(env, cppObj.opaque));
+        resObj.Set("cas", cbpp_to_js<couchbase::cas>(env, cppObj.cas));
         resObj.Set("timeout",
                    cbpp_to_js<std::optional<std::chrono::milliseconds>>(
                        env, cppObj.timeout));

package/src/jstocbpp_transactions.hpp

@@ -374,6 +374,7 @@ struct js_to_cbpp_t<cbcoretxns::transaction_operation_failed> {
         jsErr.Set("should_not_rollback",
                   cbpp_to_js(env, !err.should_rollback()));
         jsErr.Set("cause", cbpp_to_js(env, err.cause()));
+        jsErr.Set("message", cbpp_to_js(env, std::string(err.what())));
         return jsErr.Value();
     }
 };
@@ -436,16 +437,17 @@ struct js_to_cbpp_t<cbcoretxns::op_exception> {
 template <>
 struct js_to_cbpp_t<couchbase::core::transaction_op_error_context> {
     static inline Napi::Value
-    to_js(Napi::Env env, const couchbase::core::transaction_op_error_context &res)
+    to_js(Napi::Env env,
+          const couchbase::core::transaction_op_error_context &res)
     {
         auto resObj = Napi::Object::New(env);
         resObj.Set("code", cbpp_to_js(env, res.ec()));
         resObj.Set(
             "cause",
-            cbpp_to_js<
-                std::variant<std::monostate, couchbase::core::key_value_error_context,
-                             couchbase::core::query_error_context>>(env,
-                                                              res.cause()));
+            cbpp_to_js<std::variant<std::monostate,
+                                    couchbase::core::key_value_error_context,
+                                    couchbase::core::query_error_context>>(
+                env, res.cause()));
         return resObj;
     }
 };

package/tools/gen-bindings-json.py

@@ -32,7 +32,6 @@ CXX_CLIENT_CACHE = os.path.join(pathlib.Path(__file__).parent.parent, 'deps', 'c
 
 CXX_DEPS_INCLUDE_PATHS = {
     'asio': ['-I{0}/asio/{1}/asio/asio/include'],
-    'fmt': ['-I{0}/fmt/{1}/fmt/include'],
     'gsl': ['-I{0}/gsl/{1}/gsl/include'],
     'json': ['-I{0}/json/{1}/json/include',
              '-I{0}/json/{1}/json/external/PEGTL/include'