couchbase 3.2.6 → 3.2.7

package/deps/lcb/CMakeLists.txt

@@ -30,7 +30,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1)
 # Couchbase mock path to download
 SET(COUCHBASE_MOCK_VERSION 1.5.25)
 SET(COUCHBASE_MOCK_URL "https://github.com/couchbase/CouchbaseMock/releases/download/${COUCHBASE_MOCK_VERSION}/CouchbaseMock-${COUCHBASE_MOCK_VERSION}.jar")
-project(libcouchbase VERSION 3.3.3 LANGUAGES C CXX)
+project(libcouchbase VERSION 3.3.4 LANGUAGES C CXX)
 
 if (NOT CMAKE_VERSION VERSION_LESS "3.13")
     # CMP0077: option() honors normal variables

package/deps/lcb/RELEASE_NOTES.markdown

@@ -1,6 +1,11 @@
 # Release Notes
 
+## 3.3.4 (2023-02-08)
+
+* CCBC-1583: disable collections support if KV does not ack it.
+
 ## 3.3.3 (2022-09-09)
+
 * CCBC-1565: load system CAs when the trust certificate is not provided
 
   When the user has not set any root ca provider but is using TLS then we

package/deps/lcb/doc/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "Couchbase C Client"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.3.3
+PROJECT_NUMBER         = 3.3.4
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

package/deps/lcb/gyp_config/common/libcouchbase/configuration.h

@@ -33,7 +33,7 @@
  */
 
 /** @brief libcouchbase version string */
-#define LCB_VERSION_STRING "3.3.3-njs"
+#define LCB_VERSION_STRING "3.3.4-njs"
 
 /**@brief libcouchbase hex version
  *
@@ -50,12 +50,12 @@
  * 2.1.3	| 0x020103
  * 3.0.15	| 0x030015
  */
-#define LCB_VERSION 0x030303
+#define LCB_VERSION 0x030304
 
 /**@brief The SCM revision ID
  * @see LCB_CNTL_CHANGESET
  */
-#define LCB_VERSION_CHANGESET "66ff4fad9947e6fb60be06b3aeb57a8b77fbada2"
+#define LCB_VERSION_CHANGESET "9bf9ef8624757474d57b06624fc55e470340d9dd"
 
 /**@brief The client ID
  */

package/deps/lcb/src/mcserver/mcserver.cc

@@ -990,6 +990,11 @@ void Server::handle_connected(lcbio_SOCKET *sock, lcb_STATUS err, lcbio_OSERR sy
         connreq = SessionRequest::start(sock, settings, settings->config_node_timeout, on_connected, this);
         return;
     } else {
+        if (settings->use_collections && !sessinfo->has_feature(PROTOCOL_BINARY_FEATURE_COLLECTIONS)) {
+            settings->use_collections = 0;
+            lcb_log(LOGARGS_T(DEBUG), "<%s:%s> (SRV=%p) Disable collections support as not every node support it",
+                    curhost->host, curhost->port, (void *)this);
+        }
         jsonsupport = sessinfo->has_feature(PROTOCOL_BINARY_FEATURE_JSON);
         compsupport = sessinfo->has_feature(PROTOCOL_BINARY_FEATURE_SNAPPY);
         mutation_tokens = sessinfo->has_feature(PROTOCOL_BINARY_FEATURE_MUTATION_SEQNO);

package/deps/lcb/tests/ioserver/ssl_connection.cc

@@ -69,14 +69,16 @@ static void log_callback(const SSL *ssl, int where, int ret)
 }
 }
 
-// http://stackoverflow.com/questions/256405/programmatically-create-x509-certificate-using-openss l
+// http://stackoverflow.com/questions/256405/programmatically-create-x509-certificate-using-openssl
 // http://www.opensource.apple.com/source/OpenSSL/OpenSSL-22/openssl/demos/x509/mkcert.c
 // Note we deviate from the examples by directly setting the certificate.
 
-static void genCertificate(SSL_CTX *ctx)
-{
-    EVP_PKEY *pkey = EVP_PKEY_new();
+static void genCertificate(SSL_CTX *ctx) {
     X509 *x509 = X509_new();
+#if OPENSSL_VERSION_NUMBER >= 0x3000000fL
+    EVP_PKEY *pkey = EVP_RSA_gen(2048);
+#else
+    EVP_PKEY *pkey = EVP_PKEY_new();
     RSA *rsa = RSA_new();
     BIGNUM *exponent = BN_new();
     BN_set_word(exponent, RSA_F4);
@@ -84,6 +86,7 @@ static void genCertificate(SSL_CTX *ctx)
     BN_free(exponent);
 
     EVP_PKEY_assign_RSA(pkey, rsa);
+#endif
     ASN1_INTEGER_set(X509_get_serialNumber(x509), 1);
     X509_gmtime_adj(X509_get_notBefore(x509), 0);
     X509_gmtime_adj(X509_get_notAfter(x509), 31536000L);
@@ -94,7 +97,7 @@ static void genCertificate(SSL_CTX *ctx)
     X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC, (unsigned char *)"MyCompany Inc.", -1, -1, 0);
     X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, (unsigned char *)"localhost", -1, -1, 0);
     X509_set_issuer_name(x509, name);
-    X509_sign(x509, pkey, EVP_sha1());
+    X509_sign(x509, pkey, EVP_sha384());
 
     SSL_CTX_use_PrivateKey(ctx, pkey);
     SSL_CTX_use_certificate(ctx, x509);

package/dist/authenticators.d.ts

@@ -79,4 +79,4 @@ export declare class CertificateAuthenticator implements ICertificateAuthenticat
  *
  * @category Authentication
  */
-export declare type Authenticator = IPasswordAuthenticator | ICertificateAuthenticator;
+export type Authenticator = IPasswordAuthenticator | ICertificateAuthenticator;

package/dist/binding.d.ts

@@ -64,10 +64,10 @@ export interface CppRequestSpan {
 export interface CppTracer {
     requestSpan(name: string, parent: CppRequestSpan | undefined): CppRequestSpan;
 }
-export declare type CppBytes = string | Buffer;
-export declare type CppTranscoder = any;
-export declare type CppCas = any;
-export declare type CppMutationToken = any;
+export type CppBytes = string | Buffer;
+export type CppTranscoder = any;
+export type CppCas = any;
+export type CppMutationToken = any;
 export interface CppErrorBase extends Error {
     code: number;
 }
@@ -125,7 +125,7 @@ export interface CppAnalyticsError extends CppErrorBase {
     http_response_code: number;
     http_response_body: string;
 }
-export declare type CppError = CppGenericError | CppKeyValueError | CppViewError | CppQueryError | CppSearchError | CppAnalyticsError;
+export type CppError = CppGenericError | CppKeyValueError | CppViewError | CppQueryError | CppSearchError | CppAnalyticsError;
 export interface CppConnection {
     new (connType: CppConnType, connStr: string, username: string | undefined, password: string | undefined, logFn: CppLogFunc, tracer: CppTracer | undefined, meter: CppMeter | undefined): any;
     connect(callback: (err: CppError | null) => void): void;

package/dist/cluster.js

@@ -28,6 +28,12 @@ const utilities_1 = require("./utilities");
  * @category Core
  */
 class Cluster {
+    /**
+    @internal
+    */
+    get transcoder() {
+        return this._transcoder;
+    }
     /**
     @internal
     @deprecated Use the static sdk-level {@link connect} method instead.
@@ -94,12 +100,6 @@ class Cluster {
     /**
     @internal
     */
-    get transcoder() {
-        return this._transcoder;
-    }
-    /**
-    @internal
-    */
     static async connect(connStr, options, callback) {
         return utilities_1.PromiseHelper.wrapAsync(async () => {
             const cluster = new Cluster(connStr, options);

package/dist/collection.js

@@ -22,6 +22,12 @@ const utilities_1 = require("./utilities");
  * @category Core
  */
 class Collection {
+    /**
+     * @internal
+     */
+    static get DEFAULT_NAME() {
+        return '_default';
+    }
     /**
     @internal
     */
@@ -30,12 +36,6 @@ class Collection {
         this._name = collectionName;
         this._conn = scope.conn;
     }
-    /**
-     * @internal
-     */
-    static get DEFAULT_NAME() {
-        return '_default';
-    }
     /**
     @internal
     */

package/dist/connection.d.ts

@@ -22,8 +22,8 @@ export interface ConnectionOptions {
     meter?: Meter;
     logFunc?: LogFunc;
 }
-declare type MergeArgs<A, B> = A extends [...infer Params] ? [...Params, ...(B extends [...infer Params2] ? Params2 : [])] : never;
-declare type CppCbToNew<T extends (...fargs: any[]) => void> = T extends (...fargs: [
+type MergeArgs<A, B> = A extends [...infer Params] ? [...Params, ...(B extends [...infer Params2] ? Params2 : [])] : never;
+type CppCbToNew<T extends (...fargs: any[]) => void> = T extends (...fargs: [
     ...infer FArgs,
     (err: CppError | null, ...cbArgs: infer CbArgs) => void
 ]) => void ? [

package/dist/scope.js

@@ -12,6 +12,12 @@ const utilities_1 = require("./utilities");
  * @category Core
  */
 class Scope {
+    /**
+     * @internal
+     */
+    static get DEFAULT_NAME() {
+        return '_default';
+    }
     /**
     @internal
     */
@@ -20,12 +26,6 @@ class Scope {
         this._name = scopeName;
         this._conn = bucket.conn;
     }
-    /**
-     * @internal
-     */
-    static get DEFAULT_NAME() {
-        return '_default';
-    }
     /**
     @internal
     */

package/dist/sdspecs.js

@@ -103,11 +103,6 @@ exports.MutateInMacro = MutateInMacro;
  * @category Key-Value
  */
 class LookupInSpec {
-    constructor(op, path, flags) {
-        this._op = op;
-        this._path = path;
-        this._flags = flags;
-    }
     /**
      * BUG(JSCBC-756): Previously provided access to the expiry macro for a
      * lookup-in operation.
@@ -117,6 +112,11 @@ class LookupInSpec {
     static get Expiry() {
         return LookupInMacro.Expiry;
     }
+    constructor(op, path, flags) {
+        this._op = op;
+        this._path = path;
+        this._flags = flags;
+    }
     static _create(op, path, options) {
         if (!options) {
             options = {};
@@ -175,12 +175,6 @@ exports.LookupInSpec = LookupInSpec;
  * @category Key-Value
  */
 class MutateInSpec {
-    constructor(op, path, flags, data) {
-        this._op = op;
-        this._path = path;
-        this._flags = flags;
-        this._data = data;
-    }
     /**
      * BUG(JSCBC-756): Previously provided access to the document cas mutate
      * macro.
@@ -190,6 +184,12 @@ class MutateInSpec {
     static get CasPlaceholder() {
         return MutateInMacro.Cas;
     }
+    constructor(op, path, flags, data) {
+        this._op = op;
+        this._path = path;
+        this._flags = flags;
+        this._data = data;
+    }
     static _create(op, path, value, options) {
         if (!options) {
             options = {};

package/dist/searchquery.d.ts

@@ -20,7 +20,7 @@ export declare enum MatchOperator {
  *
  * @category Full Text Search
  */
-export declare type GeoPoint = [longitude: number, latitude: number] | {
+export type GeoPoint = [longitude: number, latitude: number] | {
     lon: number;
     lat: number;
 } | {

package/dist/streamablepromises.d.ts

@@ -3,7 +3,7 @@ import EventEmitter from 'events';
 /**
  * @internal
  */
-declare type PromisifyFunc<T> = (emitter: StreamablePromise<T>, resolve: (result: T) => void, reject: (err: Error) => void) => void;
+type PromisifyFunc<T> = (emitter: StreamablePromise<T>, resolve: (result: T) => void, reject: (err: Error) => void) => void;
 /**
  * @internal
  */

package/dist/usermanager.js

@@ -204,6 +204,15 @@ exports.User = User;
  * @category Management
  */
 class UserAndMetadata extends User {
+    /**
+     * Same as {@link effectiveRoles}, which already contains the roles
+     * including their origins.
+     *
+     * @deprecated Use {@link effectiveRoles} instead.
+     */
+    get effectiveRolesAndOrigins() {
+        return this.effectiveRoles;
+    }
     /**
      * @internal
      */
@@ -214,15 +223,6 @@ class UserAndMetadata extends User {
         this.passwordChanged = data.passwordChanged;
         this.externalGroups = data.externalGroups;
     }
-    /**
-     * Same as {@link effectiveRoles}, which already contains the roles
-     * including their origins.
-     *
-     * @deprecated Use {@link effectiveRoles} instead.
-     */
-    get effectiveRolesAndOrigins() {
-        return this.effectiveRoles;
-    }
     /**
      * @internal
      */

package/dist/utilities.d.ts

@@ -5,7 +5,7 @@ import { DurabilityLevel } from './generaltypes';
  *
  * @category Key-Value
  */
-export declare type Cas = any;
+export type Cas = any;
 /**
  * Reprents a node-style callback which receives an optional error or result.
  *

package/dist/viewindexmanager.js

@@ -35,6 +35,14 @@ exports.DesignDocumentView = DesignDocumentView;
  * @category Management
  */
 class DesignDocument {
+    /**
+     * Same as {@link DesignDocumentView}.
+     *
+     * @deprecated Use {@link DesignDocumentView} directly.
+     */
+    static get View() {
+        return DesignDocumentView;
+    }
     /**
      * @internal
      */
@@ -52,14 +60,6 @@ class DesignDocument {
         this.name = data.name;
         this.views = data.views || {};
     }
-    /**
-     * Same as {@link DesignDocumentView}.
-     *
-     * @deprecated Use {@link DesignDocumentView} directly.
-     */
-    static get View() {
-        return DesignDocumentView;
-    }
     /**
      * @internal
      */

package/package.json

@@ -1 +1 @@
-{"bugs":{"url":"http://www.couchbase.com/issues/browse/JSCBC"},"description":"The official Couchbase Node.js Client Library.","engines":{"node":">=10.0.0"},"homepage":"http://www.couchbase.com/communities/nodejs","keywords":["couchbase","libcouchbase","memcached","nosql","json","document"],"main":"dist/couchbase.js","types":"dist/couchbase.d.ts","license":"Apache-2.0","name":"couchbase","dependencies":{"bindings":"^1.5.0","debug":"^4.3.4","nan":"^2.17.0","parse-duration":"^1.0.2","prebuild-install":"^7.1.1"},"devDependencies":{"@trivago/prettier-plugin-sort-imports":"^3.4.0","@tsconfig/node10":"^1.0.9","@types/bindings":"^1.5.1","@types/debug":"^4.1.7","@types/node":"^18.11.9","@typescript-eslint/eslint-plugin":"^5.42.0","@typescript-eslint/parser":"^5.42.0","chai":"^4.3.6","eslint":"^8.26.0","eslint-config-prettier":"^8.5.0","eslint-plugin-jsdoc":"^39.6.2","eslint-plugin-mocha":"^10.1.0","eslint-plugin-node":"^11.1.0","expose-gc":"^1.0.0","mocha":"^10.1.0","npm-check-updates":"^16.3.16","nyc":"^15.1.0","prebuild":"^11.0.4","prettier":"^2.7.1","segfault-handler":"^1.3.0","semver":"^7.3.8","ts-mocha":"^10.0.0","ts-node":"^10.9.1","typedoc":"^0.23.20","typescript":"^4.8.4","uuid":"^9.0.0"},"repository":{"type":"git","url":"http://github.com/couchbase/couchnode.git"},"version":"3.2.6","config":{"native":false},"scripts":{"install":"prebuild-install || node-gyp rebuild","build":"node-gyp build && tsc","rebuild":"node-gyp rebuild && tsc","prebuild":"prebuild --verbose --strip","prepare":"tsc","build-docs":"typedoc","test":"ts-mocha test/*.test.*","test-fast":"ts-mocha test/*.test.* -ig '(slow)'","cover":"nyc ts-mocha test/*.test.*","cover-fast":"nyc ts-mocha test/*.test.* -ig '(slow)'","lint":"eslint ./lib/ ./test/","check-deps":"ncu"}}
+{"bugs":{"url":"http://www.couchbase.com/issues/browse/JSCBC"},"description":"The official Couchbase Node.js Client Library.","engines":{"node":">=10.0.0"},"homepage":"http://www.couchbase.com/communities/nodejs","keywords":["couchbase","libcouchbase","memcached","nosql","json","document"],"main":"dist/couchbase.js","types":"dist/couchbase.d.ts","license":"Apache-2.0","name":"couchbase","dependencies":{"bindings":"^1.5.0","debug":"^4.3.4","nan":"^2.17.0","parse-duration":"^1.0.2","prebuild-install":"^7.1.1"},"devDependencies":{"@trivago/prettier-plugin-sort-imports":"^4.0.0","@tsconfig/node10":"^1.0.9","@types/bindings":"^1.5.1","@types/debug":"^4.1.7","@types/node":"^18.11.9","@typescript-eslint/eslint-plugin":"^5.42.0","@typescript-eslint/parser":"^5.42.0","chai":"^4.3.6","eslint":"^8.26.0","eslint-config-prettier":"^8.5.0","eslint-plugin-jsdoc":"^39.6.2","eslint-plugin-mocha":"^10.1.0","eslint-plugin-node":"^11.1.0","expose-gc":"^1.0.0","mocha":"^10.1.0","npm-check-updates":"^16.3.16","nyc":"^15.1.0","prebuild":"^11.0.4","prettier":"^2.7.1","segfault-handler":"^1.3.0","semver":"^7.3.8","ts-mocha":"^10.0.0","ts-node":"^10.9.1","typedoc":"^0.23.20","typescript":"^4.8.4","uuid":"^9.0.0"},"repository":{"type":"git","url":"http://github.com/couchbase/couchnode.git"},"version":"3.2.7","config":{"native":false},"scripts":{"install":"prebuild-install || node-gyp rebuild","build":"node-gyp build && tsc","rebuild":"node-gyp rebuild && tsc","prebuild":"prebuild --verbose --strip","prepare":"tsc","build-docs":"typedoc","test":"ts-mocha test/*.test.*","test-fast":"ts-mocha test/*.test.* -ig '(slow)'","cover":"nyc ts-mocha test/*.test.*","cover-fast":"nyc ts-mocha test/*.test.* -ig '(slow)'","lint":"eslint ./lib/ ./test/","check-deps":"ncu"}}