couchbase 3.2.0 → 3.2.4

package/dist/viewexecutor.js

@@ -98,7 +98,7 @@ class ViewExecutor {
             queryOpts.startkey_docid = options.idRange.start;
             queryOpts.endkey_docid = options.idRange.end;
         }
-        const queryData = utilities_1.cbQsStringify(queryOpts);
+        const queryData = utilities_1.cbQsStringify(queryOpts, { boolAsString: true });
         const lcbTimeout = options.timeout ? options.timeout * 1000 : undefined;
         const emitter = new streamablepromises_1.StreamableRowPromise((rows, meta) => {
             return new viewtypes_1.ViewResult({

package/dist/viewindexmanager.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ViewIndexManager = exports.DesignDocument = exports.DesignDocumentView = void 0;
 const errors_1 = require("./errors");
@@ -107,38 +98,36 @@ class ViewIndexManager {
      * @param options Optional parameters for this operation.
      * @param callback A node-style callback to be invoked after execution.
      */
-    getAllDesignDocuments(options, callback) {
-        return __awaiter(this, arguments, void 0, function* () {
-            if (options instanceof Function) {
-                callback = arguments[0];
-                options = undefined;
-            }
-            if (!options) {
-                options = {};
+    async getAllDesignDocuments(options, callback) {
+        if (options instanceof Function) {
+            callback = arguments[0];
+            options = undefined;
+        }
+        if (!options) {
+            options = {};
+        }
+        const parentSpan = options.parentSpan;
+        const timeout = options.timeout;
+        return utilities_1.PromiseHelper.wrapAsync(async () => {
+            const bucketName = this._bucket.name;
+            const res = await this._http.request({
+                type: httpexecutor_1.HttpServiceType.Management,
+                method: httpexecutor_1.HttpMethod.Get,
+                path: `/pools/default/buckets/${bucketName}/ddocs`,
+                parentSpan: parentSpan,
+                timeout: timeout,
+            });
+            if (res.statusCode !== 200) {
+                const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
+                throw new errors_1.CouchbaseError('failed to get design documents', undefined, errCtx);
             }
-            const parentSpan = options.parentSpan;
-            const timeout = options.timeout;
-            return utilities_1.PromiseHelper.wrapAsync(() => __awaiter(this, void 0, void 0, function* () {
-                const bucketName = this._bucket.name;
-                const res = yield this._http.request({
-                    type: httpexecutor_1.HttpServiceType.Management,
-                    method: httpexecutor_1.HttpMethod.Get,
-                    path: `/pools/default/buckets/${bucketName}/ddocs`,
-                    parentSpan: parentSpan,
-                    timeout: timeout,
-                });
-                if (res.statusCode !== 200) {
-                    const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
-                    throw new errors_1.CouchbaseError('failed to get design documents', undefined, errCtx);
-                }
-                const ddocsData = JSON.parse(res.body.toString());
-                const ddocs = ddocsData.rows.map((ddocData) => {
-                    const ddocName = ddocData.doc.meta.id.substr(8);
-                    return DesignDocument._fromNsData(ddocName, ddocData.doc.json);
-                });
-                return ddocs;
-            }), callback);
-        });
+            const ddocsData = JSON.parse(res.body.toString());
+            const ddocs = ddocsData.rows.map((ddocData) => {
+                const ddocName = ddocData.doc.meta.id.substr(8);
+                return DesignDocument._fromNsData(ddocName, ddocData.doc.json);
+            });
+            return ddocs;
+        }, callback);
     }
     /**
      * Returns the specified design document.
@@ -147,36 +136,34 @@ class ViewIndexManager {
      * @param options Optional parameters for this operation.
      * @param callback A node-style callback to be invoked after execution.
      */
-    getDesignDocument(designDocName, options, callback) {
-        return __awaiter(this, arguments, void 0, function* () {
-            if (options instanceof Function) {
-                callback = arguments[1];
-                options = undefined;
-            }
-            if (!options) {
-                options = {};
-            }
-            const parentSpan = options.parentSpan;
-            const timeout = options.timeout;
-            return utilities_1.PromiseHelper.wrapAsync(() => __awaiter(this, void 0, void 0, function* () {
-                const res = yield this._http.request({
-                    type: httpexecutor_1.HttpServiceType.Views,
-                    method: httpexecutor_1.HttpMethod.Get,
-                    path: `/_design/${designDocName}`,
-                    parentSpan: parentSpan,
-                    timeout: timeout,
-                });
-                if (res.statusCode !== 200) {
-                    const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
-                    if (res.statusCode === 404) {
-                        throw new errors_1.DesignDocumentNotFoundError(undefined, errCtx);
-                    }
-                    throw new errors_1.CouchbaseError('failed to get the design document', undefined, errCtx);
+    async getDesignDocument(designDocName, options, callback) {
+        if (options instanceof Function) {
+            callback = arguments[1];
+            options = undefined;
+        }
+        if (!options) {
+            options = {};
+        }
+        const parentSpan = options.parentSpan;
+        const timeout = options.timeout;
+        return utilities_1.PromiseHelper.wrapAsync(async () => {
+            const res = await this._http.request({
+                type: httpexecutor_1.HttpServiceType.Views,
+                method: httpexecutor_1.HttpMethod.Get,
+                path: `/_design/${designDocName}`,
+                parentSpan: parentSpan,
+                timeout: timeout,
+            });
+            if (res.statusCode !== 200) {
+                const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
+                if (res.statusCode === 404) {
+                    throw new errors_1.DesignDocumentNotFoundError(undefined, errCtx);
                 }
-                const ddocData = JSON.parse(res.body.toString());
-                return DesignDocument._fromNsData(designDocName, ddocData);
-            }), callback);
-        });
+                throw new errors_1.CouchbaseError('failed to get the design document', undefined, errCtx);
+            }
+            const ddocData = JSON.parse(res.body.toString());
+            return DesignDocument._fromNsData(designDocName, ddocData);
+        }, callback);
     }
     /**
      * Creates or updates a design document.
@@ -185,37 +172,35 @@ class ViewIndexManager {
      * @param options Optional parameters for this operation.
      * @param callback A node-style callback to be invoked after execution.
      */
-    upsertDesignDocument(designDoc, options, callback) {
-        return __awaiter(this, arguments, void 0, function* () {
-            if (options instanceof Function) {
-                callback = arguments[2];
-                options = undefined;
-            }
-            if (!options) {
-                options = {};
+    async upsertDesignDocument(designDoc, options, callback) {
+        if (options instanceof Function) {
+            callback = arguments[1];
+            options = undefined;
+        }
+        if (!options) {
+            options = {};
+        }
+        const parentSpan = options.parentSpan;
+        const timeout = options.timeout;
+        return utilities_1.PromiseHelper.wrapAsync(async () => {
+            const designDocData = {
+                views: designDoc.views,
+            };
+            const encodedData = JSON.stringify(designDocData);
+            const res = await this._http.request({
+                type: httpexecutor_1.HttpServiceType.Views,
+                method: httpexecutor_1.HttpMethod.Put,
+                path: `/_design/${designDoc.name}`,
+                contentType: 'application/json',
+                body: encodedData,
+                parentSpan: parentSpan,
+                timeout: timeout,
+            });
+            if (res.statusCode !== 201) {
+                const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
+                throw new errors_1.CouchbaseError('failed to upsert the design document', undefined, errCtx);
             }
-            const parentSpan = options.parentSpan;
-            const timeout = options.timeout;
-            return utilities_1.PromiseHelper.wrapAsync(() => __awaiter(this, void 0, void 0, function* () {
-                const designDocData = {
-                    views: designDoc.views,
-                };
-                const encodedData = JSON.stringify(designDocData);
-                const res = yield this._http.request({
-                    type: httpexecutor_1.HttpServiceType.Views,
-                    method: httpexecutor_1.HttpMethod.Put,
-                    path: `/_design/${designDoc.name}`,
-                    contentType: 'application/json',
-                    body: encodedData,
-                    parentSpan: parentSpan,
-                    timeout: timeout,
-                });
-                if (res.statusCode !== 201) {
-                    const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
-                    throw new errors_1.CouchbaseError('failed to upsert the design document', undefined, errCtx);
-                }
-            }), callback);
-        });
+        }, callback);
     }
     /**
      * Drops an existing design document.
@@ -224,34 +209,32 @@ class ViewIndexManager {
      * @param options Optional parameters for this operation.
      * @param callback A node-style callback to be invoked after execution.
      */
-    dropDesignDocument(designDocName, options, callback) {
-        return __awaiter(this, arguments, void 0, function* () {
-            if (options instanceof Function) {
-                callback = arguments[1];
-                options = undefined;
-            }
-            if (!options) {
-                options = {};
-            }
-            const parentSpan = options.parentSpan;
-            const timeout = options.timeout;
-            return utilities_1.PromiseHelper.wrapAsync(() => __awaiter(this, void 0, void 0, function* () {
-                const res = yield this._http.request({
-                    type: httpexecutor_1.HttpServiceType.Views,
-                    method: httpexecutor_1.HttpMethod.Delete,
-                    path: `/_design/${designDocName}`,
-                    parentSpan: parentSpan,
-                    timeout: timeout,
-                });
-                if (res.statusCode !== 200) {
-                    const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
-                    if (res.statusCode === 404) {
-                        throw new errors_1.DesignDocumentNotFoundError(undefined, errCtx);
-                    }
-                    throw new errors_1.CouchbaseError('failed to drop the design document', undefined, errCtx);
+    async dropDesignDocument(designDocName, options, callback) {
+        if (options instanceof Function) {
+            callback = arguments[1];
+            options = undefined;
+        }
+        if (!options) {
+            options = {};
+        }
+        const parentSpan = options.parentSpan;
+        const timeout = options.timeout;
+        return utilities_1.PromiseHelper.wrapAsync(async () => {
+            const res = await this._http.request({
+                type: httpexecutor_1.HttpServiceType.Views,
+                method: httpexecutor_1.HttpMethod.Delete,
+                path: `/_design/${designDocName}`,
+                parentSpan: parentSpan,
+                timeout: timeout,
+            });
+            if (res.statusCode !== 200) {
+                const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
+                if (res.statusCode === 404) {
+                    throw new errors_1.DesignDocumentNotFoundError(undefined, errCtx);
                 }
-            }), callback);
-        });
+                throw new errors_1.CouchbaseError('failed to drop the design document', undefined, errCtx);
+            }
+        }, callback);
     }
     /**
      * Publishes a development design document to be a production design document.
@@ -263,30 +246,28 @@ class ViewIndexManager {
      * @param options Optional parameters for this operation.
      * @param callback A node-style callback to be invoked after execution.
      */
-    publishDesignDocument(designDocName, options, callback) {
-        return __awaiter(this, arguments, void 0, function* () {
-            if (options instanceof Function) {
-                callback = arguments[1];
-                options = undefined;
-            }
-            if (!options) {
-                options = {};
-            }
-            const parentSpan = options.parentSpan;
-            const timeout = options.timeout;
-            const timer = new utilities_1.CompoundTimeout(timeout);
-            return utilities_1.PromiseHelper.wrapAsync(() => __awaiter(this, void 0, void 0, function* () {
-                const designDoc = yield this.getDesignDocument(`dev_${designDocName}`, {
-                    parentSpan: parentSpan,
-                    timeout: timer.left(),
-                });
-                // Replace the name without the `dev_` prefix on it.
-                designDoc.name = designDocName;
-                yield this.upsertDesignDocument(designDoc, {
-                    timeout: timer.left(),
-                });
-            }), callback);
-        });
+    async publishDesignDocument(designDocName, options, callback) {
+        if (options instanceof Function) {
+            callback = arguments[1];
+            options = undefined;
+        }
+        if (!options) {
+            options = {};
+        }
+        const parentSpan = options.parentSpan;
+        const timeout = options.timeout;
+        const timer = new utilities_1.CompoundTimeout(timeout);
+        return utilities_1.PromiseHelper.wrapAsync(async () => {
+            const designDoc = await this.getDesignDocument(`dev_${designDocName}`, {
+                parentSpan: parentSpan,
+                timeout: timer.left(),
+            });
+            // Replace the name without the `dev_` prefix on it.
+            designDoc.name = designDocName;
+            await this.upsertDesignDocument(designDoc, {
+                timeout: timer.left(),
+            });
+        }, callback);
     }
 }
 exports.ViewIndexManager = ViewIndexManager;

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.2","nan":"^2.14.2","parse-duration":"^1.0.0","prebuild-install":"^6.1.3"},"devDependencies":{"@trivago/prettier-plugin-sort-imports":"^2.0.2","@types/bindings":"^1.5.1","@types/debug":"^4.1.6","@types/node":"^16.4.0","@typescript-eslint/eslint-plugin":"^4.28.4","@typescript-eslint/parser":"^4.28.4","chai":"^4.3.4","eslint":"^7.31.0","eslint-config-prettier":"^8.3.0","eslint-plugin-jsdoc":"^35.5.0","eslint-plugin-mocha":"^9.0.0","eslint-plugin-node":"^11.1.0","expose-gc":"^1.0.0","mocha":"^8.4.0","npm-check-updates":"^11.8.3","nyc":"^15.1.0","prebuild":"^10.0.1","prettier":"^2.3.2","semver":"^7.3.5","ts-mocha":"^8.0.0","typedoc":"^0.21.4","typescript":"^4.3.5","uuid":"^8.3.2"},"repository":{"type":"git","url":"http://github.com/couchbase/couchnode.git"},"version":"3.2.0","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.2","nan":"^2.15.0","parse-duration":"^1.0.0","prebuild-install":"^6.1.4"},"devDependencies":{"@trivago/prettier-plugin-sort-imports":"^2.0.4","@tsconfig/node10":"^1.0.8","@types/bindings":"^1.5.1","@types/debug":"^4.1.7","@types/node":"^16.7.2","@typescript-eslint/eslint-plugin":"^4.29.3","@typescript-eslint/parser":"^4.29.3","chai":"^4.3.4","eslint":"^7.32.0","eslint-config-prettier":"^8.3.0","eslint-plugin-jsdoc":"^36.0.8","eslint-plugin-mocha":"^9.0.0","eslint-plugin-node":"^11.1.0","expose-gc":"^1.0.0","mocha":"^8.4.0","npm-check-updates":"^11.8.3","nyc":"^15.1.0","prebuild":"^10.0.1","prettier":"^2.3.2","segfault-handler":"^1.3.0","semver":"^7.3.5","ts-mocha":"^8.0.0","ts-node":"^10.2.1","typedoc":"^0.21.6","typescript":"^4.3.5","uuid":"^8.3.2"},"repository":{"type":"git","url":"http://github.com/couchbase/couchnode.git"},"version":"3.2.4","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"}}

package/src/addondata.cpp

@@ -0,0 +1,58 @@
+#include "addondata.h"
+#include "connection.h"
+
+namespace couchnode
+{
+
+AddonData::AddonData()
+{
+}
+
+AddonData::~AddonData()
+{
+    auto instances = _instances;
+    std::for_each(instances.begin(), instances.end(),
+                  [](Instance *inst) { delete inst; });
+}
+
+void AddonData::add_instance(class Instance *conn)
+{
+    _instances.push_back(conn);
+}
+
+void AddonData::remove_instance(class Instance *conn)
+{
+    auto connIter = std::find(_instances.begin(), _instances.end(), conn);
+    if (connIter != _instances.end()) {
+        _instances.erase(connIter);
+    }
+}
+
+namespace addondata
+{
+
+NAN_MODULE_INIT(Init)
+{
+    auto data = new AddonData();
+
+    auto isolate = v8::Isolate::GetCurrent();
+    Nan::SetIsolateData(isolate, data);
+    node::AddEnvironmentCleanupHook(isolate, cleanup, isolate);
+}
+
+void cleanup(void *p)
+{
+    v8::Isolate *isolate = static_cast<v8::Isolate *>(p);
+    auto data = Nan::GetIsolateData<couchnode::AddonData>(isolate);
+    delete data;
+}
+
+AddonData *Get()
+{
+    return Nan::GetIsolateData<AddonData>(
+        Nan::GetCurrentContext()->GetIsolate());
+}
+
+} // namespace addondata
+
+} // namespace couchnode

package/src/addondata.h

@@ -0,0 +1,40 @@
+#pragma once
+#ifndef ADDONDATA_H
+#define ADDONDATA_H
+
+#include <list>
+#include <nan.h>
+#include <node.h>
+
+namespace couchnode
+{
+
+using namespace v8;
+
+class AddonData
+{
+public:
+    AddonData();
+    ~AddonData();
+
+    void add_instance(class Instance *conn);
+    void remove_instance(class Instance *conn);
+
+    std::list<class Instance *> _instances;
+    Nan::Persistent<Function> _connectionConstructor;
+    Nan::Persistent<Function> _casConstructor;
+    Nan::Persistent<Function> _mutationtokenConstructor;
+};
+
+namespace addondata
+{
+
+NAN_MODULE_INIT(Init);
+void cleanup(void *p);
+AddonData *Get();
+
+} // namespace addondata
+
+} // namespace couchnode
+
+#endif // ADDONDATA_H

package/src/binding.cpp

@@ -1,6 +1,7 @@
 #include <nan.h>
 #include <node.h>
 
+#include "addondata.h"
 #include "cas.h"
 #include "connection.h"
 #include "constants.h"
@@ -12,6 +13,7 @@ namespace couchnode
 
 static NAN_MODULE_INIT(init)
 {
+    addondata::Init(target);
     constants::Init(target);
 
     Cas::Init(target);
@@ -23,6 +25,6 @@ static NAN_MODULE_INIT(init)
              Nan::New<String>(lcb_get_version(NULL)).ToLocalChecked());
 }
 
-NODE_MODULE(couchbase_impl, couchnode::init)
+NAN_MODULE_WORKER_ENABLED(couchbase_impl, couchnode::init)
 
 } // namespace couchnode

package/src/cas.h

@@ -2,6 +2,7 @@
 #ifndef CAS_H
 #define CAS_H
 
+#include "addondata.h"
 #include <libcouchbase/sysdefs.h>
 #include <nan.h>
 #include <node.h>
@@ -22,8 +23,7 @@ public:
 
     static inline Nan::Persistent<Function> &constructor()
     {
-        static Nan::Persistent<Function> class_constructor;
-        return class_constructor;
+        return addondata::Get()->_casConstructor;
     }
 
 private: