couchbase 4.4.6-dev.1 → 4.4.6

package/deps/couchbase-cxx-client/CMakeLists.txt

@@ -21,7 +21,7 @@ endif()
 
 project(
   couchbase_cxx_client
-  VERSION "1.0.6"
+  VERSION "1.0.7"
   LANGUAGES CXX C)
 message(STATUS "Couchbase C++ client ${couchbase_cxx_client_VERSION} build ${couchbase_cxx_client_BUILD_NUMBER}, master: ${COUCHBASE_CXX_CLIENT_MASTER_PROJECT}")
 message(STATUS "System: ${CMAKE_SYSTEM_NAME}, ${CMAKE_SYSTEM_VERSION}, ${CMAKE_SYSTEM_PROCESSOR}")

package/deps/couchbase-cxx-client/README.md

@@ -21,9 +21,9 @@ CPMAddPackage(
   NAME
   couchbase_cxx_client
   GIT_TAG
-  1.0.6
+  1.0.7
   VERSION
-  1.0.6
+  1.0.7
   GITHUB_REPOSITORY
   "couchbase/couchbase-cxx-client"
   OPTIONS

package/dist/binding.d.ts

@@ -2710,17 +2710,20 @@ export interface CppTxnOperationFailed extends CppErrorBase {
     should_not_retry: boolean;
     should_not_rollback: boolean;
     cause: CppTxnExternalException;
+    message?: string;
 }
 export interface CppTxnOpException extends CppErrorBase {
     ctxtype: 'transaction_op_exception';
     ctx: CppTransactionOpErrorContext | undefined;
     cause: CppTxnExternalException;
+    message?: string;
 }
 export interface CppTxnError extends CppErrorBase {
     ctxtype: 'transaction_exception';
     result: CppTransactionResult;
     cause: CppTxnExternalException;
     type: CppTxnFailureType;
+    message?: string;
 }
 export interface CppTransactionErrorContext {
     code: CppErrc;

package/dist/bindingutilities.d.ts

@@ -88,7 +88,7 @@ export declare function endpointStateFromCpp(service: CppDiagEndpointState): End
 /**
  * @internal
  */
-export declare function txnExternalExceptionStringFromCpp(cause: CppTxnExternalException): string;
+export declare function txnExternalExceptionStringFromCpp(cause: CppTxnExternalException, message?: string): string;
 /**
  * @internal
  */

package/dist/bindingutilities.js

@@ -431,8 +431,11 @@ exports.endpointStateFromCpp = endpointStateFromCpp;
 /**
  * @internal
  */
-function txnExternalExceptionStringFromCpp(cause) {
+function txnExternalExceptionStringFromCpp(cause, message) {
     if (cause === binding_1.default.txn_external_exception.unknown) {
+        if (message) {
+            return message;
+        }
         return 'unknown';
     }
     else if (cause ===
@@ -501,7 +504,7 @@ function txnExternalExceptionStringFromCpp(cause) {
     else if (cause === binding_1.default.txn_external_exception.transaction_already_committed) {
         return 'transaction_already_committed';
     }
-    throw new errs.InvalidArgumentError();
+    return 'unknown';
 }
 exports.txnExternalExceptionStringFromCpp = txnExternalExceptionStringFromCpp;
 /**
@@ -513,16 +516,16 @@ function txnOpExeptionFromCpp(err, ctx) {
     }
     const context = ctx ? ctx : undefined;
     if (err.cause === binding_1.default.txn_external_exception.document_exists_exception) {
-        return new errs.DocumentExistsError(new Error(txnExternalExceptionStringFromCpp(err.cause)), context);
+        return new errs.DocumentExistsError(new Error(txnExternalExceptionStringFromCpp(err.cause, err.message)), context);
     }
     else if (err.cause === binding_1.default.txn_external_exception.document_not_found_exception) {
-        return new errs.DocumentNotFoundError(new Error(txnExternalExceptionStringFromCpp(err.cause)), context);
+        return new errs.DocumentNotFoundError(new Error(txnExternalExceptionStringFromCpp(err.cause, err.message)), context);
     }
     else if (err.cause === binding_1.default.txn_external_exception.parsing_failure) {
-        return new errs.ParsingFailureError(new Error(txnExternalExceptionStringFromCpp(err.cause)), context);
+        return new errs.ParsingFailureError(new Error(txnExternalExceptionStringFromCpp(err.cause, err.message)), context);
     }
     else if (err.cause === binding_1.default.txn_external_exception.couchbase_exception) {
-        const cause = txnExternalExceptionStringFromCpp(err.cause);
+        const cause = txnExternalExceptionStringFromCpp(err.cause, err.message);
         return new errs.CouchbaseError(cause, new Error(cause), context);
     }
     return err;
@@ -622,12 +625,12 @@ function errorFromCpp(err) {
     }
     // BUG(JSCBC-1010): We shouldn't need to special case these.
     if (err.ctxtype === 'transaction_operation_failed') {
-        const cause = txnExternalExceptionStringFromCpp(err.cause);
+        const cause = txnExternalExceptionStringFromCpp(err.cause, err.message);
         if (cause == 'feature_not_available_exception') {
             const msg = 'Possibly attempting a binary transaction operation with a server version < 7.6.2';
             return new errs.TransactionOperationFailedError(new errs.FeatureNotAvailableError(new Error(msg)));
         }
-        return new errs.TransactionOperationFailedError(new Error(txnExternalExceptionStringFromCpp(err.cause)));
+        return new errs.TransactionOperationFailedError(new Error(txnExternalExceptionStringFromCpp(err.cause, err.message)));
     }
     else if (err.ctxtype === 'transaction_op_exception') {
         let txnContext = null;
@@ -638,15 +641,15 @@ function errorFromCpp(err) {
     }
     else if (err.ctxtype === 'transaction_exception') {
         if (err.type === binding_1.default.txn_failure_type.fail) {
-            return new errs.TransactionFailedError(new Error(txnExternalExceptionStringFromCpp(err.cause)));
+            return new errs.TransactionFailedError(new Error(txnExternalExceptionStringFromCpp(err.cause, err.message)));
         }
         else if (err.type === binding_1.default.txn_failure_type.expiry) {
-            return new errs.TransactionExpiredError(new Error(txnExternalExceptionStringFromCpp(err.cause)));
+            return new errs.TransactionExpiredError(new Error(txnExternalExceptionStringFromCpp(err.cause, err.message)));
         }
         else if (err.type === binding_1.default.txn_failure_type.commit_ambiguous) {
-            return new errs.TransactionCommitAmbiguousError(new Error(txnExternalExceptionStringFromCpp(err.cause)));
+            return new errs.TransactionCommitAmbiguousError(new Error(txnExternalExceptionStringFromCpp(err.cause, err.message)));
         }
-        throw new errs.InvalidArgumentError();
+        return new errs.TransactionFailedError(new Error(txnExternalExceptionStringFromCpp(err.cause, err.message)));
     }
     const baseErr = err;
     const contextOrNull = contextFromCpp(err);

package/dist/transactions.js

@@ -387,6 +387,9 @@ class Transactions {
                 if (e instanceof errors_1.TransactionOperationFailedError) {
                     throw new errors_1.TransactionFailedError(e.cause, e.context);
                 }
+                else if (e instanceof errors_1.TransactionFailedError) {
+                    throw e;
+                }
                 throw new errors_1.TransactionFailedError(e);
             }
             try {

package/package.json

@@ -54,7 +54,7 @@
     "type": "git",
     "url": "http://github.com/couchbase/couchnode.git"
   },
-  "version": "4.4.6-dev.1",
+  "version": "4.4.6",
   "config": {
     "native": false
   },
@@ -79,13 +79,13 @@
     ]
   },
   "optionalDependencies": {
-    "@couchbase/couchbase-darwin-arm64-napi": "4.4.6-dev.1",
-    "@couchbase/couchbase-darwin-x64-napi": "4.4.6-dev.1",
-    "@couchbase/couchbase-linux-arm64-napi": "4.4.6-dev.1",
-    "@couchbase/couchbase-linuxmusl-arm64-napi": "4.4.6-dev.1",
-    "@couchbase/couchbase-linuxmusl-x64-napi": "4.4.6-dev.1",
-    "@couchbase/couchbase-linux-x64-napi": "4.4.6-dev.1",
-    "@couchbase/couchbase-win32-x64-napi": "4.4.6-dev.1"
+    "@couchbase/couchbase-darwin-arm64-napi": "4.4.6",
+    "@couchbase/couchbase-darwin-x64-napi": "4.4.6",
+    "@couchbase/couchbase-linux-arm64-napi": "4.4.6",
+    "@couchbase/couchbase-linuxmusl-arm64-napi": "4.4.6",
+    "@couchbase/couchbase-linuxmusl-x64-napi": "4.4.6",
+    "@couchbase/couchbase-linux-x64-napi": "4.4.6",
+    "@couchbase/couchbase-win32-x64-napi": "4.4.6"
   },
   "files": [
     "LICENSE",

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;
     }
 };