couchbase 4.4.2 → 4.4.4

package/src/binding.cpp

@@ -9,7 +9,6 @@
 #include <core/logger/configuration.hxx>
 #include <core/meta/version.hxx>
 #include <napi.h>
-#include <spdlog/spdlog.h>
 
 namespace couchnode
 {
@@ -39,40 +38,41 @@ Napi::Value shutdown_logger(const Napi::CallbackInfo &info)
 
 Napi::Object Init(Napi::Env env, Napi::Object exports)
 {
-    spdlog::set_pattern("[%Y-%m-%d %T.%e] [%P,%t] [%^%l%$] %oms, %v");
-
-    auto spdLogLevel = spdlog::level::off;
     auto cbppLogLevel = couchbase::core::logger::level::off;
     {
         const char *logLevelCstr = getenv("CBPPLOGLEVEL");
         if (logLevelCstr) {
             std::string logLevelStr = logLevelCstr;
             if (logLevelStr == "trace") {
-                spdLogLevel = spdlog::level::trace;
                 cbppLogLevel = couchbase::core::logger::level::trace;
             } else if (logLevelStr == "debug") {
-                spdLogLevel = spdlog::level::debug;
                 cbppLogLevel = couchbase::core::logger::level::debug;
             } else if (logLevelStr == "info") {
-                spdLogLevel = spdlog::level::info;
                 cbppLogLevel = couchbase::core::logger::level::info;
             } else if (logLevelStr == "warn") {
-                spdLogLevel = spdlog::level::warn;
                 cbppLogLevel = couchbase::core::logger::level::warn;
             } else if (logLevelStr == "err") {
-                spdLogLevel = spdlog::level::err;
                 cbppLogLevel = couchbase::core::logger::level::err;
             } else if (logLevelStr == "critical") {
-                spdLogLevel = spdlog::level::critical;
                 cbppLogLevel = couchbase::core::logger::level::critical;
             }
         }
     }
+
     if (cbppLogLevel != couchbase::core::logger::level::off) {
-        couchbase::core::logger::create_console_logger();
+        const char *logFileCstr = getenv("CBPPLOGFILE");
+        if (logFileCstr) {
+            std::string logFileStr = logFileCstr;
+            couchbase::core::logger::configuration configuration{};
+            configuration.filename = logFileStr;
+            configuration.log_level = cbppLogLevel;
+            couchbase::core::logger::create_file_logger(configuration);
+
+        } else {
+            couchbase::core::logger::create_console_logger();
+            couchbase::core::logger::set_log_levels(cbppLogLevel);
+        }
     }
-    spdlog::set_level(spdLogLevel);
-    couchbase::core::logger::set_log_levels(cbppLogLevel);
 
     AddonData::Init(env, exports);
     Constants::Init(env, exports);

package/src/connection.cpp

@@ -171,6 +171,17 @@ void Connection::Init(Napi::Env env, Napi::Object exports)
                 "managementEventingGetFunction"),
             InstanceMethod<&Connection::jsManagementViewIndexDrop>(
                 "managementViewIndexDrop"),
+            InstanceMethod<
+                &Connection::
+                    jsManagementAnalyticsLinkReplaceAzureBlobExternalLink>(
+                "managementAnalyticsLinkReplaceAzureBlobExternalLink"),
+            InstanceMethod<
+                &Connection::
+                    jsManagementAnalyticsLinkReplaceCouchbaseRemoteLink>(
+                "managementAnalyticsLinkReplaceCouchbaseRemoteLink"),
+            InstanceMethod<
+                &Connection::jsManagementAnalyticsLinkReplaceS3ExternalLink>(
+                "managementAnalyticsLinkReplaceS3ExternalLink"),
             InstanceMethod<&Connection::jsManagementAnalyticsLinkDisconnect>(
                 "managementAnalyticsLinkDisconnect"),
             InstanceMethod<&Connection::jsManagementUserUpsert>(
@@ -202,6 +213,17 @@ void Connection::Init(Napi::Env env, Napi::Object exports)
                 "managementRoleGetAll"),
             InstanceMethod<&Connection::jsManagementGroupGetAll>(
                 "managementGroupGetAll"),
+            InstanceMethod<
+                &Connection::
+                    jsManagementAnalyticsLinkCreateAzureBlobExternalLink>(
+                "managementAnalyticsLinkCreateAzureBlobExternalLink"),
+            InstanceMethod<
+                &Connection::
+                    jsManagementAnalyticsLinkCreateCouchbaseRemoteLink>(
+                "managementAnalyticsLinkCreateCouchbaseRemoteLink"),
+            InstanceMethod<
+                &Connection::jsManagementAnalyticsLinkCreateS3ExternalLink>(
+                "managementAnalyticsLinkCreateS3ExternalLink"),
             InstanceMethod<&Connection::jsManagementEventingDropFunction>(
                 "managementEventingDropFunction"),
             InstanceMethod<&Connection::jsManagementCollectionDrop>(

package/src/connection.hpp

@@ -161,6 +161,12 @@ public:
     Napi::Value jsManagementScopeCreate(const Napi::CallbackInfo &info);
     Napi::Value jsManagementEventingGetFunction(const Napi::CallbackInfo &info);
     Napi::Value jsManagementViewIndexDrop(const Napi::CallbackInfo &info);
+    Napi::Value jsManagementAnalyticsLinkReplaceAzureBlobExternalLink(
+        const Napi::CallbackInfo &info);
+    Napi::Value jsManagementAnalyticsLinkReplaceCouchbaseRemoteLink(
+        const Napi::CallbackInfo &info);
+    Napi::Value jsManagementAnalyticsLinkReplaceS3ExternalLink(
+        const Napi::CallbackInfo &info);
     Napi::Value
     jsManagementAnalyticsLinkDisconnect(const Napi::CallbackInfo &info);
     Napi::Value jsManagementUserUpsert(const Napi::CallbackInfo &info);
@@ -182,6 +188,12 @@ public:
     jsManagementSearchIndexControlQuery(const Napi::CallbackInfo &info);
     Napi::Value jsManagementRoleGetAll(const Napi::CallbackInfo &info);
     Napi::Value jsManagementGroupGetAll(const Napi::CallbackInfo &info);
+    Napi::Value jsManagementAnalyticsLinkCreateAzureBlobExternalLink(
+        const Napi::CallbackInfo &info);
+    Napi::Value jsManagementAnalyticsLinkCreateCouchbaseRemoteLink(
+        const Napi::CallbackInfo &info);
+    Napi::Value jsManagementAnalyticsLinkCreateS3ExternalLink(
+        const Napi::CallbackInfo &info);
     Napi::Value
     jsManagementEventingDropFunction(const Napi::CallbackInfo &info);
     Napi::Value jsManagementCollectionDrop(const Napi::CallbackInfo &info);

package/src/connection_autogen.cpp

@@ -1046,6 +1046,56 @@ Connection::jsManagementViewIndexDrop(const Napi::CallbackInfo &info)
     return info.Env().Null();
 }
 
+Napi::Value Connection::jsManagementAnalyticsLinkReplaceAzureBlobExternalLink(
+    const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp("managementAnalyticsLinkReplaceAzureBlobExternalLink",
+              jsToCbpp<couchbase::core::operations::management::
+                           analytics_link_replace_request<
+                               couchbase::core::management::analytics::
+                                   azure_blob_external_link>>(optsJsObj),
+              callbackJsFn);
+
+    return info.Env().Null();
+}
+
+Napi::Value Connection::jsManagementAnalyticsLinkReplaceCouchbaseRemoteLink(
+    const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp("managementAnalyticsLinkReplaceCouchbaseRemoteLink",
+              jsToCbpp<couchbase::core::operations::management::
+                           analytics_link_replace_request<
+                               couchbase::core::management::analytics::
+                                   couchbase_remote_link>>(optsJsObj),
+              callbackJsFn);
+
+    return info.Env().Null();
+}
+
+Napi::Value Connection::jsManagementAnalyticsLinkReplaceS3ExternalLink(
+    const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp(
+        "managementAnalyticsLinkReplaceS3ExternalLink",
+        jsToCbpp<
+            couchbase::core::operations::management::
+                analytics_link_replace_request<
+                    couchbase::core::management::analytics::s3_external_link>>(
+            optsJsObj),
+        callbackJsFn);
+
+    return info.Env().Null();
+}
+
 Napi::Value
 Connection::jsManagementAnalyticsLinkDisconnect(const Napi::CallbackInfo &info)
 {
@@ -1262,6 +1312,56 @@ Napi::Value Connection::jsManagementGroupGetAll(const Napi::CallbackInfo &info)
     return info.Env().Null();
 }
 
+Napi::Value Connection::jsManagementAnalyticsLinkCreateAzureBlobExternalLink(
+    const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp("managementAnalyticsLinkCreateAzureBlobExternalLink",
+              jsToCbpp<couchbase::core::operations::management::
+                           analytics_link_create_request<
+                               couchbase::core::management::analytics::
+                                   azure_blob_external_link>>(optsJsObj),
+              callbackJsFn);
+
+    return info.Env().Null();
+}
+
+Napi::Value Connection::jsManagementAnalyticsLinkCreateCouchbaseRemoteLink(
+    const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp("managementAnalyticsLinkCreateCouchbaseRemoteLink",
+              jsToCbpp<couchbase::core::operations::management::
+                           analytics_link_create_request<
+                               couchbase::core::management::analytics::
+                                   couchbase_remote_link>>(optsJsObj),
+              callbackJsFn);
+
+    return info.Env().Null();
+}
+
+Napi::Value Connection::jsManagementAnalyticsLinkCreateS3ExternalLink(
+    const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+
+    executeOp(
+        "managementAnalyticsLinkCreateS3ExternalLink",
+        jsToCbpp<
+            couchbase::core::operations::management::
+                analytics_link_create_request<
+                    couchbase::core::management::analytics::s3_external_link>>(
+            optsJsObj),
+        callbackJsFn);
+
+    return info.Env().Null();
+}
+
 Napi::Value
 Connection::jsManagementEventingDropFunction(const Napi::CallbackInfo &info)
 {

package/src/jstocbpp_autogen.hpp

@@ -1105,6 +1105,13 @@ struct js_to_cbpp_t<couchbase::core::management::rbac::role_and_description> {
         couchbase::core::management::rbac::role_and_description cppObj;
         js_to_cbpp<std::string>(cppObj.display_name, jsObj.Get("display_name"));
         js_to_cbpp<std::string>(cppObj.description, jsObj.Get("description"));
+        js_to_cbpp<std::string>(cppObj.name, jsObj.Get("name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.bucket,
+                                               jsObj.Get("bucket"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.scope,
+                                               jsObj.Get("scope"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.collection,
+                                               jsObj.Get("collection"));
         return cppObj;
     }
     static inline Napi::Value
@@ -1116,6 +1123,13 @@ struct js_to_cbpp_t<couchbase::core::management::rbac::role_and_description> {
                    cbpp_to_js<std::string>(env, cppObj.display_name));
         resObj.Set("description",
                    cbpp_to_js<std::string>(env, cppObj.description));
+        resObj.Set("name", cbpp_to_js<std::string>(env, cppObj.name));
+        resObj.Set("bucket",
+                   cbpp_to_js<std::optional<std::string>>(env, cppObj.bucket));
+        resObj.Set("scope",
+                   cbpp_to_js<std::optional<std::string>>(env, cppObj.scope));
+        resObj.Set("collection", cbpp_to_js<std::optional<std::string>>(
+                                     env, cppObj.collection));
         return resObj;
     }
 };
@@ -1152,6 +1166,13 @@ struct js_to_cbpp_t<couchbase::core::management::rbac::role_and_origins> {
         couchbase::core::management::rbac::role_and_origins cppObj;
         js_to_cbpp<std::vector<couchbase::core::management::rbac::origin>>(
             cppObj.origins, jsObj.Get("origins"));
+        js_to_cbpp<std::string>(cppObj.name, jsObj.Get("name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.bucket,
+                                               jsObj.Get("bucket"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.scope,
+                                               jsObj.Get("scope"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.collection,
+                                               jsObj.Get("collection"));
         return cppObj;
     }
     static inline Napi::Value
@@ -1163,6 +1184,13 @@ struct js_to_cbpp_t<couchbase::core::management::rbac::role_and_origins> {
             "origins",
             cbpp_to_js<std::vector<couchbase::core::management::rbac::origin>>(
                 env, cppObj.origins));
+        resObj.Set("name", cbpp_to_js<std::string>(env, cppObj.name));
+        resObj.Set("bucket",
+                   cbpp_to_js<std::optional<std::string>>(env, cppObj.bucket));
+        resObj.Set("scope",
+                   cbpp_to_js<std::optional<std::string>>(env, cppObj.scope));
+        resObj.Set("collection", cbpp_to_js<std::optional<std::string>>(
+                                     env, cppObj.collection));
         return resObj;
     }
 };
@@ -1219,6 +1247,14 @@ struct js_to_cbpp_t<couchbase::core::management::rbac::user_and_metadata> {
                                                jsObj.Get("password_changed"));
         js_to_cbpp<std::set<std::string>>(cppObj.external_groups,
                                           jsObj.Get("external_groups"));
+        js_to_cbpp<std::string>(cppObj.username, jsObj.Get("username"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.display_name,
+                                               jsObj.Get("display_name"));
+        js_to_cbpp<std::set<std::string>>(cppObj.groups, jsObj.Get("groups"));
+        js_to_cbpp<std::vector<couchbase::core::management::rbac::role>>(
+            cppObj.roles, jsObj.Get("roles"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.password,
+                                               jsObj.Get("password"));
         return cppObj;
     }
     static inline Napi::Value
@@ -1237,6 +1273,17 @@ struct js_to_cbpp_t<couchbase::core::management::rbac::user_and_metadata> {
                                            env, cppObj.password_changed));
         resObj.Set("external_groups", cbpp_to_js<std::set<std::string>>(
                                           env, cppObj.external_groups));
+        resObj.Set("username", cbpp_to_js<std::string>(env, cppObj.username));
+        resObj.Set("display_name", cbpp_to_js<std::optional<std::string>>(
+                                       env, cppObj.display_name));
+        resObj.Set("groups",
+                   cbpp_to_js<std::set<std::string>>(env, cppObj.groups));
+        resObj.Set(
+            "roles",
+            cbpp_to_js<std::vector<couchbase::core::management::rbac::role>>(
+                env, cppObj.roles));
+        resObj.Set("password", cbpp_to_js<std::optional<std::string>>(
+                                   env, cppObj.password));
         return resObj;
     }
 };
@@ -8329,6 +8376,134 @@ struct js_to_cbpp_t<couchbase::core::operations::management::
     }
 };
 
+template <>
+struct js_to_cbpp_t<
+    couchbase::core::operations::management::analytics_link_replace_request<
+        couchbase::core::management::analytics::azure_blob_external_link>> {
+    static inline couchbase::core::operations::management::
+        analytics_link_replace_request<
+            couchbase::core::management::analytics::azure_blob_external_link>
+        from_js(Napi::Value jsVal)
+    {
+        auto jsObj = jsVal.ToObject();
+        couchbase::core::operations::management::analytics_link_replace_request<
+            couchbase::core::management::analytics::azure_blob_external_link>
+            cppObj;
+        js_to_cbpp<
+            couchbase::core::management::analytics::azure_blob_external_link>(
+            cppObj.link, jsObj.Get("link"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
+                                               jsObj.Get("client_context_id"));
+        js_to_cbpp<std::optional<std::chrono::milliseconds>>(
+            cppObj.timeout, jsObj.Get("timeout"));
+        return cppObj;
+    }
+    static inline Napi::Value
+    to_js(Napi::Env env, const couchbase::core::operations::management::
+                             analytics_link_replace_request<
+                                 couchbase::core::management::analytics::
+                                     azure_blob_external_link> &cppObj)
+    {
+        auto resObj = Napi::Object::New(env);
+        resObj.Set("link",
+                   cbpp_to_js<couchbase::core::management::analytics::
+                                  azure_blob_external_link>(env, cppObj.link));
+        resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
+                                            env, cppObj.client_context_id));
+        resObj.Set("timeout",
+                   cbpp_to_js<std::optional<std::chrono::milliseconds>>(
+                       env, cppObj.timeout));
+        return resObj;
+    }
+};
+
+template <>
+struct js_to_cbpp_t<
+    couchbase::core::operations::management::analytics_link_replace_request<
+        couchbase::core::management::analytics::couchbase_remote_link>> {
+    static inline couchbase::core::operations::management::
+        analytics_link_replace_request<
+            couchbase::core::management::analytics::couchbase_remote_link>
+        from_js(Napi::Value jsVal)
+    {
+        auto jsObj = jsVal.ToObject();
+        couchbase::core::operations::management::analytics_link_replace_request<
+            couchbase::core::management::analytics::couchbase_remote_link>
+            cppObj;
+        js_to_cbpp<
+            couchbase::core::management::analytics::couchbase_remote_link>(
+            cppObj.link, jsObj.Get("link"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
+                                               jsObj.Get("client_context_id"));
+        js_to_cbpp<std::optional<std::chrono::milliseconds>>(
+            cppObj.timeout, jsObj.Get("timeout"));
+        return cppObj;
+    }
+    static inline Napi::Value
+    to_js(Napi::Env env,
+          const couchbase::core::operations::management::
+              analytics_link_replace_request<
+                  couchbase::core::management::analytics::couchbase_remote_link>
+                  &cppObj)
+    {
+        auto resObj = Napi::Object::New(env);
+        resObj.Set(
+            "link",
+            cbpp_to_js<
+                couchbase::core::management::analytics::couchbase_remote_link>(
+                env, cppObj.link));
+        resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
+                                            env, cppObj.client_context_id));
+        resObj.Set("timeout",
+                   cbpp_to_js<std::optional<std::chrono::milliseconds>>(
+                       env, cppObj.timeout));
+        return resObj;
+    }
+};
+
+template <>
+struct js_to_cbpp_t<
+    couchbase::core::operations::management::analytics_link_replace_request<
+        couchbase::core::management::analytics::s3_external_link>> {
+    static inline couchbase::core::operations::management::
+        analytics_link_replace_request<
+            couchbase::core::management::analytics::s3_external_link>
+        from_js(Napi::Value jsVal)
+    {
+        auto jsObj = jsVal.ToObject();
+        couchbase::core::operations::management::analytics_link_replace_request<
+            couchbase::core::management::analytics::s3_external_link>
+            cppObj;
+        js_to_cbpp<couchbase::core::management::analytics::s3_external_link>(
+            cppObj.link, jsObj.Get("link"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
+                                               jsObj.Get("client_context_id"));
+        js_to_cbpp<std::optional<std::chrono::milliseconds>>(
+            cppObj.timeout, jsObj.Get("timeout"));
+        return cppObj;
+    }
+    static inline Napi::Value
+    to_js(Napi::Env env,
+          const couchbase::core::operations::management::
+              analytics_link_replace_request<
+                  couchbase::core::management::analytics::s3_external_link>
+                  &cppObj)
+    {
+        auto resObj = Napi::Object::New(env);
+        resObj.Set(
+            "link",
+            cbpp_to_js<
+                couchbase::core::management::analytics::s3_external_link>(
+                env, cppObj.link));
+        resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
+                                            env, cppObj.client_context_id));
+        resObj.Set("timeout",
+                   cbpp_to_js<std::optional<std::chrono::milliseconds>>(
+                       env, cppObj.timeout));
+        return resObj;
+    }
+};
+
 template <>
 struct js_to_cbpp_t<couchbase::core::operations::management::
                         analytics_link_disconnect_response> {
@@ -9415,6 +9590,134 @@ struct js_to_cbpp_t<couchbase::core::operations::management::
     }
 };
 
+template <>
+struct js_to_cbpp_t<
+    couchbase::core::operations::management::analytics_link_create_request<
+        couchbase::core::management::analytics::azure_blob_external_link>> {
+    static inline couchbase::core::operations::management::
+        analytics_link_create_request<
+            couchbase::core::management::analytics::azure_blob_external_link>
+        from_js(Napi::Value jsVal)
+    {
+        auto jsObj = jsVal.ToObject();
+        couchbase::core::operations::management::analytics_link_create_request<
+            couchbase::core::management::analytics::azure_blob_external_link>
+            cppObj;
+        js_to_cbpp<
+            couchbase::core::management::analytics::azure_blob_external_link>(
+            cppObj.link, jsObj.Get("link"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
+                                               jsObj.Get("client_context_id"));
+        js_to_cbpp<std::optional<std::chrono::milliseconds>>(
+            cppObj.timeout, jsObj.Get("timeout"));
+        return cppObj;
+    }
+    static inline Napi::Value
+    to_js(Napi::Env env, const couchbase::core::operations::management::
+                             analytics_link_create_request<
+                                 couchbase::core::management::analytics::
+                                     azure_blob_external_link> &cppObj)
+    {
+        auto resObj = Napi::Object::New(env);
+        resObj.Set("link",
+                   cbpp_to_js<couchbase::core::management::analytics::
+                                  azure_blob_external_link>(env, cppObj.link));
+        resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
+                                            env, cppObj.client_context_id));
+        resObj.Set("timeout",
+                   cbpp_to_js<std::optional<std::chrono::milliseconds>>(
+                       env, cppObj.timeout));
+        return resObj;
+    }
+};
+
+template <>
+struct js_to_cbpp_t<
+    couchbase::core::operations::management::analytics_link_create_request<
+        couchbase::core::management::analytics::couchbase_remote_link>> {
+    static inline couchbase::core::operations::management::
+        analytics_link_create_request<
+            couchbase::core::management::analytics::couchbase_remote_link>
+        from_js(Napi::Value jsVal)
+    {
+        auto jsObj = jsVal.ToObject();
+        couchbase::core::operations::management::analytics_link_create_request<
+            couchbase::core::management::analytics::couchbase_remote_link>
+            cppObj;
+        js_to_cbpp<
+            couchbase::core::management::analytics::couchbase_remote_link>(
+            cppObj.link, jsObj.Get("link"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
+                                               jsObj.Get("client_context_id"));
+        js_to_cbpp<std::optional<std::chrono::milliseconds>>(
+            cppObj.timeout, jsObj.Get("timeout"));
+        return cppObj;
+    }
+    static inline Napi::Value
+    to_js(Napi::Env env,
+          const couchbase::core::operations::management::
+              analytics_link_create_request<
+                  couchbase::core::management::analytics::couchbase_remote_link>
+                  &cppObj)
+    {
+        auto resObj = Napi::Object::New(env);
+        resObj.Set(
+            "link",
+            cbpp_to_js<
+                couchbase::core::management::analytics::couchbase_remote_link>(
+                env, cppObj.link));
+        resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
+                                            env, cppObj.client_context_id));
+        resObj.Set("timeout",
+                   cbpp_to_js<std::optional<std::chrono::milliseconds>>(
+                       env, cppObj.timeout));
+        return resObj;
+    }
+};
+
+template <>
+struct js_to_cbpp_t<
+    couchbase::core::operations::management::analytics_link_create_request<
+        couchbase::core::management::analytics::s3_external_link>> {
+    static inline couchbase::core::operations::management::
+        analytics_link_create_request<
+            couchbase::core::management::analytics::s3_external_link>
+        from_js(Napi::Value jsVal)
+    {
+        auto jsObj = jsVal.ToObject();
+        couchbase::core::operations::management::analytics_link_create_request<
+            couchbase::core::management::analytics::s3_external_link>
+            cppObj;
+        js_to_cbpp<couchbase::core::management::analytics::s3_external_link>(
+            cppObj.link, jsObj.Get("link"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
+                                               jsObj.Get("client_context_id"));
+        js_to_cbpp<std::optional<std::chrono::milliseconds>>(
+            cppObj.timeout, jsObj.Get("timeout"));
+        return cppObj;
+    }
+    static inline Napi::Value
+    to_js(Napi::Env env,
+          const couchbase::core::operations::management::
+              analytics_link_create_request<
+                  couchbase::core::management::analytics::s3_external_link>
+                  &cppObj)
+    {
+        auto resObj = Napi::Object::New(env);
+        resObj.Set(
+            "link",
+            cbpp_to_js<
+                couchbase::core::management::analytics::s3_external_link>(
+                env, cppObj.link));
+        resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
+                                            env, cppObj.client_context_id));
+        resObj.Set("timeout",
+                   cbpp_to_js<std::optional<std::chrono::milliseconds>>(
+                       env, cppObj.timeout));
+        return resObj;
+    }
+};
+
 template <>
 struct js_to_cbpp_t<
     couchbase::core::operations::management::eventing_drop_function_response> {
@@ -10524,10 +10827,12 @@ struct js_to_cbpp_t<
         auto jsObj = jsVal.ToObject();
         couchbase::core::operations::management::analytics_link_get_all_request
             cppObj;
-        js_to_cbpp<std::string>(cppObj.link_type, jsObj.Get("link_type"));
-        js_to_cbpp<std::string>(cppObj.link_name, jsObj.Get("link_name"));
-        js_to_cbpp<std::string>(cppObj.dataverse_name,
-                                jsObj.Get("dataverse_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.link_type,
+                                               jsObj.Get("link_type"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.link_name,
+                                               jsObj.Get("link_name"));
+        js_to_cbpp<std::optional<std::string>>(cppObj.dataverse_name,
+                                               jsObj.Get("dataverse_name"));
         js_to_cbpp<std::optional<std::string>>(cppObj.client_context_id,
                                                jsObj.Get("client_context_id"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
@@ -10539,10 +10844,12 @@ struct js_to_cbpp_t<
                              analytics_link_get_all_request &cppObj)
     {
         auto resObj = Napi::Object::New(env);
-        resObj.Set("link_type", cbpp_to_js<std::string>(env, cppObj.link_type));
-        resObj.Set("link_name", cbpp_to_js<std::string>(env, cppObj.link_name));
-        resObj.Set("dataverse_name",
-                   cbpp_to_js<std::string>(env, cppObj.dataverse_name));
+        resObj.Set("link_type", cbpp_to_js<std::optional<std::string>>(
+                                    env, cppObj.link_type));
+        resObj.Set("link_name", cbpp_to_js<std::optional<std::string>>(
+                                    env, cppObj.link_name));
+        resObj.Set("dataverse_name", cbpp_to_js<std::optional<std::string>>(
+                                         env, cppObj.dataverse_name));
         resObj.Set("client_context_id", cbpp_to_js<std::optional<std::string>>(
                                             env, cppObj.client_context_id));
         resObj.Set("timeout",

package/src/jstocbpp_transactions.hpp

@@ -255,8 +255,7 @@ struct js_to_cbpp_t<cbcoretxns::transaction_get_result> {
     {
         auto resObj = Napi::Object::New(env);
         resObj.Set("id", cbpp_to_js(env, res.id()));
-        resObj.Set("content",
-                   cbpp_to_js<std::vector<std::byte>>(env, res.content().data));
+        resObj.Set("content", cbpp_to_js(env, res.content()));
         resObj.Set("cas", cbpp_to_js(env, couchbase::cas{res.cas()}));
         resObj.Set("links", cbpp_to_js(env, res.links()));
         resObj.Set("metadata", cbpp_to_js(env, res.metadata()));