spice-couchbase 2.0.31 → 2.0.33

package/build/index.js

@@ -24,6 +24,10 @@ var {
   ConflictResolutionType
 } = require("couchbase");
 
+var {
+  QueryScanConsistency
+} = require("couchbase");
+
 if (!Promise.allSettled) {
   Promise.allSettled = promises => Promise.all(promises.map((promise, i) => promise.then(value => ({
     status: "fulfilled",
@@ -45,6 +49,8 @@ module.exports = class Database {
     } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
     if (connection) {
+      var _spice, _spice$db;
+
       this.connection_name = connection;
       this.connection = spice.database.connections[connection];
       this.query_scope = query_scope;
@@ -69,6 +75,11 @@ module.exports = class Database {
       this.collection = this.scope.collection(this.collection_name);
       this.userManager = this.getUserManager(connection);
 
+      if (!((_spice = spice) === null || _spice === void 0 ? void 0 : (_spice$db = _spice.db) === null || _spice$db === void 0 ? void 0 : _spice$db.collections)) {
+        spice.db = spice.db || {};
+        spice.db.collections = new Set();
+      }
+
       if (this.auto_create_collection) {
         this.upsertCollection();
       }
@@ -170,9 +181,9 @@ module.exports = class Database {
 
         if (!_this3.checkGlobelConnectionObject(_this3.collection_name)) {
           if (!collection_exists) {
-            yield _this3.createCollection(_this3.collection_name, _this3.scope_name);
-            yield _this3.wait(2000);
-            yield _this3.createPrimaryIndex(_this3.scope_name, _this3.collection_name);
+            /* await this.createCollection(this.collection_name, this.scope_name);
+            await this.wait(2000);
+            await this.createPrimaryIndex(this.scope_name, this.collection_name); */
           }
         }
       } catch (e) {
@@ -186,20 +197,56 @@ module.exports = class Database {
 
     return _asyncToGenerator(function* () {
       try {
-        var _$find;
+        var _spice2, _spice2$db, _spice2$db$collection;
 
-        var all_scopes = yield axios.get("".concat(_this4.getCouchbaseHost(), "/pools/default/buckets/").concat(_this4.db_config.bucket, "/scopes"), {
-          auth: {
-            username: _this4.db_config.username,
-            password: _this4.db_config.password
-          }
-        });
-        var collection_e = _.find(((_$find = _.find(all_scopes.data.scopes, {
-          name: scope_name
-        })) === null || _$find === void 0 ? void 0 : _$find.collections) || [], {
-          name: collection_name
-        }) != undefined;
-        return collection_e;
+        var that = _this4;
+
+        function loadAllCollections() {
+          return _loadAllCollections.apply(this, arguments);
+        }
+        /* console.log("================================");
+        console.log(
+          "Collection Set",
+          spice?.db?.collections?.has(collection_name),
+          collection_name
+        ); */
+
+
+        function _loadAllCollections() {
+          _loadAllCollections = _asyncToGenerator(function* () {
+            var all_scopes = yield axios.get("".concat(that.getCouchbaseHost(), "/pools/default/buckets/").concat(that.db_config.bucket, "/scopes"), {
+              auth: {
+                username: that.db_config.username,
+                password: that.db_config.password
+              }
+            });
+
+            var scope = _.find(all_scopes.data.scopes, {
+              name: scope_name
+            });
+
+            var collectionSet = new Set();
+
+            _.each(scope.collections, collection => {
+              collectionSet.add(collection.name);
+            });
+
+            return collectionSet;
+          });
+          return _loadAllCollections.apply(this, arguments);
+        }
+
+        if ((_spice2 = spice) === null || _spice2 === void 0 ? void 0 : (_spice2$db = _spice2.db) === null || _spice2$db === void 0 ? void 0 : (_spice2$db$collection = _spice2$db.collections) === null || _spice2$db$collection === void 0 ? void 0 : _spice2$db$collection.has(collection_name)) {
+          //console.log("Using Internal Collection Set", true);
+          return true;
+        } else {
+          var _spice3, _spice3$db, _spice3$db$collection;
+
+          //console.log("Using Internal Collection Set", false);
+          spice.db.collections = yield loadAllCollections(); //console.log("Collection Set", spice.db.collections.entries());
+
+          return (_spice3 = spice) === null || _spice3 === void 0 ? void 0 : (_spice3$db = _spice3.db) === null || _spice3$db === void 0 ? void 0 : (_spice3$db$collection = _spice3$db.collections) === null || _spice3$db$collection === void 0 ? void 0 : _spice3$db$collection.has(collection_name);
+        }
       } catch (e) {
         console.log("Exists error happened", e);
       }
@@ -623,7 +670,10 @@ module.exports = class Database {
 
 
       var startTime = process.hrtime.bigint();
-      var response = yield exec_scope.query(sanitizedQuery); // End time
+      var options = {
+        scanConsistency: QueryScanConsistency.RequestPlus
+      };
+      var response = yield exec_scope.query(sanitizedQuery, options); // End time
 
       var endTime = process.hrtime.bigint(); // Calculate duration in microseconds
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-couchbase",
-  "version": "2.0.31",
+  "version": "2.0.33",
   "description": "",
   "main": "build/index.js",
   "scripts": {
@@ -10,7 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "axios": "^0.26.1",
-    "couchbase": "4.2.4",
+    "couchbase": "^4.2.7",
     "lodash": "^4.17.15",
     "qs": "^6.10.3"
   },

package/src/index.js

@@ -5,6 +5,7 @@ let couchbase = require("couchbase");
 const { default: axios } = require("axios");
 var qs = require("qs");
 const { ConflictResolutionType } = require("couchbase");
+const { QueryScanConsistency } = require("couchbase");
 
 if (!Promise.allSettled) {
   Promise.allSettled = (promises) =>
@@ -76,6 +77,10 @@ module.exports = class Database {
       this.SearchQuery = couchbase.SearchQuery;
       this.collection = this.scope.collection(this.collection_name);
       this.userManager = this.getUserManager(connection);
+      if (!spice?.db?.collections) {
+        spice.db = spice.db || {};
+        spice.db.collections = new Set();
+      }
       if (this.auto_create_collection) {
         this.upsertCollection();
       }
@@ -174,9 +179,9 @@ module.exports = class Database {
       );
       if (!this.checkGlobelConnectionObject(this.collection_name)) {
         if (!collection_exists) {
-          await this.createCollection(this.collection_name, this.scope_name);
+          /* await this.createCollection(this.collection_name, this.scope_name);
           await this.wait(2000);
-          await this.createPrimaryIndex(this.scope_name, this.collection_name);
+          await this.createPrimaryIndex(this.scope_name, this.collection_name); */
         }
       }
     } catch (e) {
@@ -186,24 +191,42 @@ module.exports = class Database {
 
   async collectionExists(collection_name, scope_name) {
     try {
-      let all_scopes = await axios.get(
-        `${this.getCouchbaseHost()}/pools/default/buckets/${
-          this.db_config.bucket
-        }/scopes`,
-        {
-          auth: {
-            username: this.db_config.username,
-            password: this.db_config.password,
-          },
-        }
-      );
-      let collection_e =
-        _.find(
-          _.find(all_scopes.data.scopes, { name: scope_name })?.collections ||
-            [],
-          { name: collection_name }
-        ) != undefined;
-      return collection_e;
+      let that = this;
+      async function loadAllCollections() {
+        let all_scopes = await axios.get(
+          `${that.getCouchbaseHost()}/pools/default/buckets/${
+            that.db_config.bucket
+          }/scopes`,
+          {
+            auth: {
+              username: that.db_config.username,
+              password: that.db_config.password,
+            },
+          }
+        );
+        let scope = _.find(all_scopes.data.scopes, { name: scope_name });
+        let collectionSet = new Set();
+        _.each(scope.collections, (collection) => {
+          collectionSet.add(collection.name);
+        });
+        return collectionSet;
+      }
+      /* console.log("================================");
+      console.log(
+        "Collection Set",
+        spice?.db?.collections?.has(collection_name),
+        collection_name
+      ); */
+      if (spice?.db?.collections?.has(collection_name)) {
+        //console.log("Using Internal Collection Set", true);
+        return true;
+      } else {
+        //console.log("Using Internal Collection Set", false);
+
+        spice.db.collections = await loadAllCollections();
+        //console.log("Collection Set", spice.db.collections.entries());
+        return spice?.db?.collections?.has(collection_name);
+      }
     } catch (e) {
       console.log("Exists error happened", e);
     }
@@ -561,7 +584,10 @@ module.exports = class Database {
     }
     // Start time
     let startTime = process.hrtime.bigint();
-    let response = await exec_scope.query(sanitizedQuery);
+    const options = {
+      scanConsistency: QueryScanConsistency.RequestPlus,
+    };
+    let response = await exec_scope.query(sanitizedQuery, options);
     // End time
     let endTime = process.hrtime.bigint();
     // Calculate duration in microseconds