couchbase 4.4.4 → 4.4.6-dev.1

package/dist/binding.d.ts

@@ -453,6 +453,7 @@ export interface CppPrependRequest {
     value: Buffer;
     partition: number;
     opaque: number;
+    cas: CppCasInput;
     durability_level: CppDurabilityLevel;
     timeout?: CppMilliseconds;
 }
@@ -461,6 +462,7 @@ export interface CppPrependWithLegacyDurabilityRequest {
     value: Buffer;
     partition: number;
     opaque: number;
+    cas: CppCasInput;
     timeout?: CppMilliseconds;
     persist_to: CppPersistTo;
     replicate_to: CppReplicateTo;
@@ -556,6 +558,7 @@ export interface CppAppendRequest {
     value: Buffer;
     partition: number;
     opaque: number;
+    cas: CppCasInput;
     durability_level: CppDurabilityLevel;
     timeout?: CppMilliseconds;
 }
@@ -564,6 +567,7 @@ export interface CppAppendWithLegacyDurabilityRequest {
     value: Buffer;
     partition: number;
     opaque: number;
+    cas: CppCasInput;
     timeout?: CppMilliseconds;
     persist_to: CppPersistTo;
     replicate_to: CppReplicateTo;

package/dist/cluster.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { AnalyticsIndexManager } from './analyticsindexmanager';
 import { AnalyticsMetaData, AnalyticsQueryOptions, AnalyticsResult } from './analyticstypes';
 import { Authenticator } from './authenticators';
@@ -16,6 +17,7 @@ import { Transactions, TransactionsConfig } from './transactions';
 import { Transcoder } from './transcoders';
 import { UserManager } from './usermanager';
 import { NodeCallback } from './utilities';
+import { inspect } from 'util';
 /**
  * Specifies the timeout options for the client.
  *
@@ -224,6 +226,14 @@ export declare class Cluster {
     @internal
     */
     get resolveTimeout(): number | undefined;
+    /**
+     * @internal
+     */
+    [inspect.custom](): Record<string, any>;
+    /**
+     * @internal
+     */
+    toJSON(): Record<string, any>;
     /**
     @internal
     @deprecated Use the static sdk-level {@link connect} method instead.

package/dist/cluster.js

@@ -23,6 +23,7 @@ const transcoders_1 = require("./transcoders");
 const usermanager_1 = require("./usermanager");
 const utilities_1 = require("./utilities");
 const utilities_internal_1 = require("./utilities_internal");
+const util_1 = require("util");
 /**
  * Exposes the operations which are available to be performed against a cluster.
  * Namely the ability to access to Buckets as well as performing management
@@ -103,6 +104,22 @@ class Cluster {
     get resolveTimeout() {
         return this._resolveTimeout;
     }
+    /**
+     * @internal
+     */
+    [util_1.inspect.custom]() {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { _auth, ...rest } = this;
+        return { ...rest, _auth: "***hidden***" };
+    }
+    /**
+     * @internal
+     */
+    toJSON() {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { _auth, ...rest } = this;
+        return { ...rest, _auth: "***hidden***" };
+    }
     /**
     @internal
     @deprecated Use the static sdk-level {@link connect} method instead.

package/dist/collection.d.ts

@@ -607,7 +607,7 @@ export declare class Collection {
      * @param options Optional parameters for this operation.
      * @param callback A node-style callback to be invoked after execution.
      */
-    lookupInAnyReplica(key: string, specs: LookupInSpec[], options?: LookupInOptions, callback?: NodeCallback<LookupInReplicaResult>): Promise<LookupInReplicaResult>;
+    lookupInAnyReplica(key: string, specs: LookupInSpec[], options?: LookupInAnyReplicaOptions, callback?: NodeCallback<LookupInReplicaResult>): Promise<LookupInReplicaResult>;
     /**
      * Performs a lookup-in operation against a document, fetching individual fields or
      * information about specific fields inside the document value from all available replicas.
@@ -618,7 +618,7 @@ export declare class Collection {
      * @param options Optional parameters for this operation.
      * @param callback A node-style callback to be invoked after execution.
      */
-    lookupInAllReplicas(key: string, specs: LookupInSpec[], options?: LookupInOptions, callback?: NodeCallback<LookupInReplicaResult[]>): Promise<LookupInReplicaResult[]>;
+    lookupInAllReplicas(key: string, specs: LookupInSpec[], options?: LookupInAllReplicasOptions, callback?: NodeCallback<LookupInReplicaResult[]>): Promise<LookupInReplicaResult[]>;
     /**
      * Performs a mutate-in operation against a document.  Allowing atomic modification of
      * specific fields within a document.  Also enables access to document extended-attributes.

package/dist/collection.js

@@ -1067,7 +1067,7 @@ class Collection {
                         value,
                     }));
                 }
-                emitter.emit('replica', new crudoptypes_1.GetReplicaResult({
+                emitter.emit('replica', new crudoptypes_1.LookupInReplicaResult({
                     content: content,
                     cas: resp.cas,
                     isReplica: resp.is_replica,
@@ -1363,6 +1363,7 @@ class Collection {
         const durabilityLevel = options.durabilityLevel;
         const persistTo = options.durabilityPersistTo;
         const replicateTo = options.durabilityReplicateTo;
+        const cas = options.cas;
         const timeout = options.timeout || this.cluster.kvTimeout;
         return utilities_1.PromiseHelper.wrap((wrapCallback) => {
             if (!Buffer.isBuffer(value)) {
@@ -1371,6 +1372,7 @@ class Collection {
             const appendReq = {
                 id: this._cppDocId(key),
                 value,
+                cas: cas || binding_1.zeroCas,
                 timeout,
                 partition: 0,
                 opaque: 0,
@@ -1414,6 +1416,7 @@ class Collection {
         const durabilityLevel = options.durabilityLevel;
         const persistTo = options.durabilityPersistTo;
         const replicateTo = options.durabilityReplicateTo;
+        const cas = options.cas;
         const timeout = options.timeout || this.cluster.kvTimeout;
         return utilities_1.PromiseHelper.wrap((wrapCallback) => {
             if (!Buffer.isBuffer(value)) {
@@ -1422,6 +1425,7 @@ class Collection {
             const prependReq = {
                 id: this._cppDocId(key),
                 value,
+                cas: cas || binding_1.zeroCas,
                 timeout,
                 partition: 0,
                 opaque: 0,

package/dist/collectionmanager.d.ts

@@ -48,7 +48,7 @@ export declare class CollectionSpec {
      *
      * @see {@link IBucketSettings.maxExpiry}
      */
-    maxExpiry: number;
+    maxExpiry?: number;
     /**
      * The history retention override setting in this collection.
      * Only supported on Magma Buckets.

package/dist/collectionmanager.js

@@ -150,8 +150,8 @@ class CollectionManager {
         }
         const bucketName = this._bucket.name;
         const timeout = options.timeout || this._cluster.managementTimeout;
-        const maxExpiry = settings.maxExpiry || 0;
-        const history = settings.history || undefined;
+        const maxExpiry = settings === null || settings === void 0 ? void 0 : settings.maxExpiry;
+        const history = settings === null || settings === void 0 ? void 0 : settings.history;
         return utilities_1.PromiseHelper.wrap((wrapCallback) => {
             this._cluster.conn.managementCollectionCreate({
                 bucket_name: bucketName,

package/dist/sdspecs.js

@@ -407,7 +407,7 @@ class MutateInSpec {
      * attributes data for the document.
      */
     static decrement(path, value, options) {
-        return this._create(binding_1.default.protocol_subdoc_opcode.counter, path, +value, options);
+        return this._create(binding_1.default.protocol_subdoc_opcode.counter, path, -1 * +value, options);
     }
 }
 exports.MutateInSpec = MutateInSpec;

package/dist/utilities.js

@@ -40,8 +40,7 @@ class PromiseHelper {
         // callback specified.  We directly return the promise.
         if (callback) {
             const prom = fn();
-            prom.then((res) => callback(null, res));
-            prom.catch((err) => callback(err, null));
+            prom.then((res) => callback(null, res), (err) => callback(err, null));
             return prom;
         }
         return fn();
@@ -61,8 +60,7 @@ class PromiseHelper {
             });
         });
         if (callback) {
-            prom.then((res) => callback(null, res));
-            prom.catch((err) => callback(err, null));
+            prom.then((res) => callback(null, res), (err) => callback(err, null));
         }
         return prom;
     }

package/package.json

@@ -54,7 +54,7 @@
     "type": "git",
     "url": "http://github.com/couchbase/couchnode.git"
   },
-  "version": "4.4.4",
+  "version": "4.4.6-dev.1",
   "config": {
     "native": false
   },
@@ -79,13 +79,13 @@
     ]
   },
   "optionalDependencies": {
-    "@couchbase/couchbase-darwin-arm64-napi": "4.4.4",
-    "@couchbase/couchbase-darwin-x64-napi": "4.4.4",
-    "@couchbase/couchbase-linux-arm64-napi": "4.4.4",
-    "@couchbase/couchbase-linuxmusl-arm64-napi": "4.4.4",
-    "@couchbase/couchbase-linuxmusl-x64-napi": "4.4.4",
-    "@couchbase/couchbase-linux-x64-napi": "4.4.4",
-    "@couchbase/couchbase-win32-x64-napi": "4.4.4"
+    "@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"
   },
   "files": [
     "LICENSE",
@@ -125,13 +125,6 @@
     "deps/couchbase-cxx-cache/boringssl/*/boringssl/**/*.{cc,h,c,asm,S}",
     "deps/couchbase-cxx-cache/boringssl/*/boringssl/**/CMakeLists.txt",
     "deps/couchbase-cxx-cache/boringssl/*/boringssl/LICENSE",
-    "deps/couchbase-cxx-cache/fmt/*/fmt/CMakeLists.txt",
-    "deps/couchbase-cxx-cache/fmt/*/fmt/ChangeLog.md",
-    "deps/couchbase-cxx-cache/fmt/*/fmt/LICENSE",
-    "deps/couchbase-cxx-cache/fmt/*/fmt/README.md",
-    "deps/couchbase-cxx-cache/fmt/*/fmt/include/**/*",
-    "deps/couchbase-cxx-cache/fmt/*/fmt/src/**/*",
-    "deps/couchbase-cxx-cache/fmt/*/fmt/support/cmake/**/*",
     "deps/couchbase-cxx-cache/gsl/*/gsl/CMakeLists.txt",
     "deps/couchbase-cxx-cache/gsl/*/gsl/GSL.natvis",
     "deps/couchbase-cxx-cache/gsl/*/gsl/LICENSE*",

package/scripts/buildPrebuild.js

@@ -66,7 +66,7 @@ if (args.length > 0) {
     let rt = undefined
     if (args[runtimeIdx].includes('=')) {
       rt = args[runtimeIdx].split('=')[1]
-    } else if (args.length - 1 <= runtimeIdx + 1) {
+    } else if (args.length - 1 >= runtimeIdx + 1) {
       rt = args[runtimeIdx + 1]
     }
 
@@ -81,7 +81,7 @@ if (args.length > 0) {
     let rtv = undefined
     if (args[runtimeVersionIdx].includes('=')) {
       rtv = args[runtimeVersionIdx].split('=')[1]
-    } else if (args.length - 1 <= runtimeVersionIdx + 1) {
+    } else if (args.length - 1 >= runtimeVersionIdx + 1) {
       rtv = args[runtimeVersionIdx + 1]
     }
 
@@ -112,11 +112,12 @@ if (args.length > 0) {
     let pv = undefined
     if (args[parallelIdx].includes('=')) {
       pv = args[parallelIdx].split('=')[1]
-    } else if (args.length - 1 <= parallelIdx + 1) {
+    } else if (args.length - 1 >= parallelIdx + 1) {
       pv = args[parallelIdx + 1]
     }
 
     if (pv && !isNaN(parseInt(pv))) {
+      const os = require('os')
       const pvi = parseInt(pv)
       if (pvi <= os.cpus().length) {
         cmakeParallel = pvi

package/scripts/prebuilds.js

@@ -376,6 +376,9 @@ function matchingPlatformPrebuild(filename, useElectronRuntime = false) {
     _runtime = 'electron'
   } else if (runtime === 'node') {
     _runtime = 'napi'
+  } else if (runtime === 'electron') {
+    // NOTE: electron support is experimental
+    _runtime = 'electron'
   } else {
     console.log(`Unsupported runtime: ${runtime}`)
     return false
@@ -439,6 +442,9 @@ function resolvePrebuild(
     _runtime = 'electron'
   } else if (runtime === 'node') {
     _runtime = 'napi'
+  } else if (runtime === 'electron') {
+    // NOTE: electron support is experimental
+    _runtime = 'electron'
   } else {
     throw new Error(`Unsupported runtime: ${runtime}`)
   }

package/src/binding.cpp

@@ -66,6 +66,8 @@ Napi::Object Init(Napi::Env env, Napi::Object exports)
             couchbase::core::logger::configuration configuration{};
             configuration.filename = logFileStr;
             configuration.log_level = cbppLogLevel;
+            const char *enableConsoleLoggingCstr = getenv("CBPPENABLECONSOLE");
+            configuration.console = enableConsoleLoggingCstr != nullptr;
             couchbase::core::logger::create_file_logger(configuration);
 
         } else {

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/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'