spice-couchbase 2.0.50 → 2.0.52

package/build/index.js

@@ -14,12 +14,6 @@ var _ = require("lodash");
 
 var couchbase = require("couchbase");
 
-var {
-  default: axios
-} = require("axios");
-
-var qs = require("qs");
-
 var {
   ConflictResolutionType
 } = require("couchbase");
@@ -166,11 +160,6 @@ module.exports = class Database {
         console.log(e);
       }
     })();
-  }
-
-  getCouchbaseHost() {
-    var default_port = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 8091;
-    return (this.db_config.api_base || "http://".concat(_.last(_.first(this.db_config.nodes.split(",")).split("://")))) + ":" + default_port;
   } //create wait function
 
 
@@ -180,6 +169,14 @@ module.exports = class Database {
     })();
   }
 
+  quoteIdentifier(identifier) {
+    return "`".concat(String(identifier).replace(/`/g, "``"), "`");
+  }
+
+  collectionPath(scope_name, collection_name) {
+    return "default:".concat(this.quoteIdentifier(this.db_config.bucket), ".").concat(this.quoteIdentifier(scope_name), ".").concat(this.quoteIdentifier(collection_name));
+  }
+
   upsertCollection() {
     var _this3 = this;
 
@@ -207,46 +204,24 @@ module.exports = class Database {
       try {
         var _spice2, _spice2$db, _spice2$db$collection;
 
-        var that = _this4;
-
-        function loadAllCollections() {
-          return _loadAllCollections.apply(this, arguments);
-        }
-
-        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)) {
           return true;
         } else {
-          var _spice3, _spice3$db, _spice3$db$collection;
+          var response = yield _this4.cluster.query("SELECT RAW name\n           FROM system:keyspaces\n           WHERE bucket_id = ?\n             AND scope_id = ?\n             AND name = ?\n           LIMIT 1", {
+            parameters: [_this4.db_config.bucket, scope_name, collection_name],
+            scanConsistency: QueryScanConsistency.RequestPlus
+          });
+
+          if (Array.isArray(response === null || response === void 0 ? void 0 : response.rows) && response.rows.length > 0) {
+            spice.db.collections.add(collection_name);
+            return true;
+          }
 
-          spice.db.collections = yield loadAllCollections();
-          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);
+          return false;
         }
       } catch (e) {
         console.log("Exists error happened", e);
+        return false;
       }
     })();
   }
@@ -256,22 +231,21 @@ module.exports = class Database {
 
     return _asyncToGenerator(function* () {
       try {
-        var token = "".concat(_this5.db_config.username, ":").concat(_this5.db_config.password);
-        var encodedToken = Buffer.from(token).toString("base64");
-        var headers = {
-          Authorization: "Basic " + encodedToken,
-          "Content-Type": "application/x-www-form-urlencoded"
-        };
-        var response = yield axios({
-          method: "post",
-          url: "".concat(_this5.getCouchbaseHost(), "/pools/default/buckets/").concat(_this5.db_config.bucket, "/scopes/").concat(scope_name, "/collections"),
-          headers,
-          data: qs.stringify({
-            name: connection_name
-          })
-        }).data;
+        var response = yield _this5.cluster.query("CREATE COLLECTION ".concat(_this5.collectionPath(scope_name, connection_name)), {
+          scanConsistency: QueryScanConsistency.RequestPlus
+        });
+        spice.db.collections.add(connection_name);
         return response;
-      } catch (e) {}
+      } catch (e) {
+        var _e$cause, _e$cause2;
+
+        if (e instanceof couchbase.CollectionExistsError || (e === null || e === void 0 ? void 0 : (_e$cause = e.cause) === null || _e$cause === void 0 ? void 0 : _e$cause.first_error_code) === 12003 || /collection .*already exists|already exists/i.test((e === null || e === void 0 ? void 0 : e.message) || (e === null || e === void 0 ? void 0 : (_e$cause2 = e.cause) === null || _e$cause2 === void 0 ? void 0 : _e$cause2.first_error_message) || "")) {
+          spice.db.collections.add(connection_name);
+          return;
+        }
+
+        console.log("CREATE Collection :::", e);
+      }
     })();
   }
 
@@ -280,15 +254,11 @@ module.exports = class Database {
 
     return _asyncToGenerator(function* () {
       try {
-        var response = yield _this6.cluster.query("SELECT RAW name\n         FROM system:indexes\n         WHERE bucket_id = $bucket\n           AND scope_id = $scope\n           AND keyspace_id = $collection\n           AND is_primary = true\n         LIMIT 1", {
-          namedParameters: {
-            bucket: _this6.db_config.bucket,
-            scope: scope_name,
-            collection: col_name
-          },
+        var response = yield _this6.cluster.query("SELECT RAW name\n         FROM system:indexes\n         WHERE bucket_id = ?\n           AND scope_id = ?\n           AND keyspace_id = ?\n           AND is_primary = true\n         LIMIT 1", {
+          parameters: [_this6.db_config.bucket, scope_name, col_name],
           scanConsistency: QueryScanConsistency.RequestPlus
         });
-        return Array.isArray(response && response.rows) && response.rows.length > 0;
+        return Array.isArray(response === null || response === void 0 ? void 0 : response.rows) && response.rows.length > 0;
       } catch (e) {
         console.log("Primary index lookup failed:", e);
         return false;
@@ -297,28 +267,34 @@ module.exports = class Database {
   }
 
   createPrimaryIndex(scope_name, col_name) {
-    var _this6 = this;
+    var _this7 = this;
 
     return _asyncToGenerator(function* () {
       try {
-        if (yield _this6.primaryIndexExists(scope_name, col_name)) {
+        if (yield _this7.primaryIndexExists(scope_name, col_name)) {
           return;
         }
 
-        var response = yield _this6.query("CREATE PRIMARY INDEX ON default:`".concat(_this6.db_config.bucket, "`.`").concat(scope_name, "`.`").concat(col_name, "`"));
+        var response = yield _this7.query("CREATE PRIMARY INDEX ON ".concat(_this7.collectionPath(scope_name, col_name)));
         return response;
       } catch (e) {
+        var _e$cause3, _e$cause4;
+
+        if (e instanceof couchbase.IndexExistsError || (e === null || e === void 0 ? void 0 : (_e$cause3 = e.cause) === null || _e$cause3 === void 0 ? void 0 : _e$cause3.first_error_code) === 4300 || /index .*already exists|index_exists/i.test((e === null || e === void 0 ? void 0 : e.message) || (e === null || e === void 0 ? void 0 : (_e$cause4 = e.cause) === null || _e$cause4 === void 0 ? void 0 : _e$cause4.first_error_message) || "")) {
+          return;
+        }
+
         console.log("CREATE Index :::", e);
       }
     })();
   }
 
   createScope(scope_name) {
-    var _this7 = this;
+    var _this8 = this;
 
     return _asyncToGenerator(function* () {
       try {
-        yield _this7.collection_manager.createScope(scope_name);
+        yield _this8.collection_manager.createScope(scope_name);
       } catch (e) {
         if (e instanceof couchbase.ScopeExistsError) {
           console.log("The scope already exists");
@@ -330,7 +306,7 @@ module.exports = class Database {
   }
 
   get(doc_id) {
-    var _this8 = this;
+    var _this9 = this;
 
     var {
       columns = []
@@ -338,7 +314,7 @@ module.exports = class Database {
     return _asyncToGenerator(function* () {
       try {
         var useLookupIn = columns.length > 0;
-        var collection = _this8.use_bucket_name ? _this8.connection : _this8.collection;
+        var collection = _this9.use_bucket_name ? _this9.connection : _this9.collection;
 
         if (!useLookupIn) {
           var response = yield collection.get(doc_id);
@@ -379,36 +355,36 @@ module.exports = class Database {
   }
 
   insert(doc_id, document, expiry) {
-    var _this9 = this;
+    var _this10 = this;
 
     return _asyncToGenerator(function* () {
       try {
-        yield (_this9.use_bucket_name ? _this9.connection : _this9.collection).insert(doc_id, document, {
+        yield (_this10.use_bucket_name ? _this10.connection : _this10.collection).insert(doc_id, document, {
           expiry: expiry
         });
       } catch (e) {
         console.log(e.message, e, doc_id);
       }
 
-      return yield _this9.get(doc_id);
+      return yield _this10.get(doc_id);
     })();
   }
 
   touch(doc_id) {
-    var _this10 = this;
+    var _this11 = this;
 
     var expiry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     return _asyncToGenerator(function* () {
-      yield (_this10.use_bucket_name ? _this10.connection : _this10.collection).touch(doc_id, expiry);
-      return yield _this10.get(doc_id);
+      yield (_this11.use_bucket_name ? _this11.connection : _this11.collection).touch(doc_id, expiry);
+      return yield _this11.get(doc_id);
     })();
   }
 
   count(doc_id, adjustment, initial_value) {
-    var _this11 = this;
+    var _this12 = this;
 
     return _asyncToGenerator(function* () {
-      var res = yield (_this11.use_bucket_name ? _this11.connection : _this11.collection).counter(doc_id, adjustment, {
+      var res = yield (_this12.use_bucket_name ? _this12.connection : _this12.collection).counter(doc_id, adjustment, {
         initial: initial_value
       });
       return res.value;
@@ -416,10 +392,10 @@ module.exports = class Database {
   }
 
   update(doc_id, document, expiry) {
-    var _this12 = this;
+    var _this13 = this;
 
     return _asyncToGenerator(function* () {
-      var res = yield (_this12.use_bucket_name ? _this12.connection : _this12.collection).replace(doc_id, document, {
+      var res = yield (_this13.use_bucket_name ? _this13.connection : _this13.collection).replace(doc_id, document, {
         expiry: expiry
       });
       return res.value;
@@ -427,16 +403,16 @@ module.exports = class Database {
   }
 
   delete(doc_id) {
-    var _this13 = this;
+    var _this14 = this;
 
     return _asyncToGenerator(function* () {
-      var res = yield (_this13.use_bucket_name ? _this13.connection : _this13.collection).remove(doc_id);
+      var res = yield (_this14.use_bucket_name ? _this14.connection : _this14.collection).remove(doc_id);
       return res.value;
     })();
   }
 
   multi_get(keys) {
-    var _this14 = this;
+    var _this15 = this;
 
     var {
       keep_type = true,
@@ -449,7 +425,7 @@ module.exports = class Database {
 
       if (_.isArray(keys) && keys.length > 0) {
         var useLookupIn = columns.length > 0;
-        var collection = _this14.use_bucket_name ? _this14.connection : _this14.collection;
+        var collection = _this15.use_bucket_name ? _this15.connection : _this15.collection;
 
         if (!useLookupIn) {
           // Regular get - no batching needed
@@ -609,7 +585,7 @@ module.exports = class Database {
   }
 
   search(type) {
-    var _this15 = this;
+    var _this16 = this;
 
     var columns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
     var query = arguments.length > 2 ? arguments[2] : undefined;
@@ -620,8 +596,8 @@ module.exports = class Database {
     var query_scope = arguments.length > 7 ? arguments[7] : undefined;
     var join = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : "";
     return _asyncToGenerator(function* () {
-      var is_legacy = _this15.scope_name !== "_default" && _this15.collection_name !== "_default";
-      var bucket = "`".concat(_this15.use_bucket_name ? _this15.bucket : _this15.collection_name, "`");
+      var is_legacy = _this16.scope_name !== "_default" && _this16.collection_name !== "_default";
+      var bucket = "`".concat(_this16.use_bucket_name ? _this16.bucket : _this16.collection_name, "`");
 
       function processColumns(columnsStr) {
         // If columns is empty or *, return default
@@ -666,7 +642,7 @@ module.exports = class Database {
         var front_query = "SELECT ".concat(columns, " FROM ").concat(bucket, " ").concat(join);
         var conditions = [];
 
-        if (_this15.use_bucket_name) {
+        if (_this16.use_bucket_name) {
           conditions.push("type = '".concat(type, "'"));
         }
 
@@ -682,11 +658,11 @@ module.exports = class Database {
         var limit_clause = limit > 0 ? " LIMIT ".concat(limit) : "";
         var offset_clause = offset > 0 ? " OFFSET ".concat(offset) : "";
         query = query + order_by_clause + limit_clause + offset_clause;
-        var active_query_space = query_scope || !_this15.use_bucket_name ? "scope" : "cluster";
-        var queries = [_this15.getData(query, active_query_space)];
+        var active_query_space = query_scope || !_this16.use_bucket_name ? "scope" : "cluster";
+        var queries = [_this16.getData(query, active_query_space)];
 
         if (do_count != "false") {
-          queries.push(_this15.getCount(count_query, active_query_space));
+          queries.push(_this16.getCount(count_query, active_query_space));
         }
 
         var responses = yield Promise.all(queries);
@@ -770,21 +746,21 @@ module.exports = class Database {
   }
 
   getCount(count_query_element) {
-    var _this16 = this;
+    var _this17 = this;
 
     var query_scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "cluster";
     return _asyncToGenerator(function* () {
-      var response = yield _this16.query(count_query_element, query_scope);
+      var response = yield _this17.query(count_query_element, query_scope);
       return response.rows[0].count;
     })();
   }
 
   getData(query_element) {
-    var _this17 = this;
+    var _this18 = this;
 
     var query_scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "cluster";
     return _asyncToGenerator(function* () {
-      var response = yield _this17.query(query_element, query_scope);
+      var response = yield _this18.query(query_element, query_scope);
       return response.rows;
     })();
   }
@@ -826,7 +802,7 @@ module.exports = class Database {
   }
 
   optimize(query, exec_scope) {
-    var _this18 = this;
+    var _this19 = this;
 
     return _asyncToGenerator(function* () {
       try {
@@ -842,16 +818,16 @@ module.exports = class Database {
 
         var plan = explainResponse === null || explainResponse === void 0 ? void 0 : (_explainResponse$rows = explainResponse.rows) === null || _explainResponse$rows === void 0 ? void 0 : _explainResponse$rows[0];
 
-        if (!_this18.hasFetchOperator(plan)) {
+        if (!_this19.hasFetchOperator(plan)) {
           // Query is already covered, no need to create index
           return;
         } // 3. Build covering index from the query
 
 
         var indexStatement = buildCoveringIndex(query, {
-          bucket: _this18.bucket,
-          scope: _this18.scope_name,
-          collection: _this18.collection_name
+          bucket: _this19.bucket,
+          scope: _this19.scope_name,
+          collection: _this19.collection_name
         }); // 4. Execute the index creation if we got a valid statement
 
         if (indexStatement) {
@@ -863,19 +839,19 @@ module.exports = class Database {
   }
 
   query(query) {
-    var _this19 = this;
+    var _this20 = this;
 
     var query_scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "cluster";
     return _asyncToGenerator(function* () {
-      var scope = query_scope || _this19.query_scope;
+      var scope = query_scope || _this20.query_scope;
       var sanitizedQuery = query; //sanitization step to be implemented
 
       var exec_scope = null;
 
       if (scope === "cluster") {
-        exec_scope = _this19.cluster;
+        exec_scope = _this20.cluster;
       } else {
-        exec_scope = _this19.scope;
+        exec_scope = _this20.scope;
       } // Start time
 
 
@@ -890,11 +866,11 @@ module.exports = class Database {
       var durationInMilliseconds = (endTime - startTime) / BigInt(1000000); // optimize if response time is greater than 1 second
 
       if (durationInMilliseconds > 2000) {
-        _this19.optimize(query, exec_scope);
+        _this20.optimize(query, exec_scope);
       }
 
       return response;
     })();
   }
 
-};
+};

package/build/utility.js

@@ -389,4 +389,4 @@ module.exports = {
   extractOrderByFields,
   extractOrderByIndexFields,
   generateHash
-};
+};

package/build/utility.test.js

@@ -831,4 +831,4 @@ test("field order: WHERE -> GROUP BY -> ORDER BY -> SELECT", () => {
 console.log("\n========================================");
 console.log("Tests: ".concat(passed + failed, " | Passed: ").concat(passed, " | Failed: ").concat(failed));
 console.log("========================================\n");
-process.exit(failed > 0 ? 1 : 0);
+process.exit(failed > 0 ? 1 : 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-couchbase",
-  "version": "2.0.50",
+  "version": "2.0.52",
   "description": "",
   "main": "build/index.js",
   "scripts": {
@@ -9,10 +9,8 @@
   "author": "Chad Fraser <chad@sonover.com> (http://sonover.com)",
   "license": "ISC",
   "dependencies": {
-    "axios": "^0.26.1",
     "couchbase": "^4.6.0",
-    "lodash": "^4.17.15",
-    "qs": "^6.10.3"
+    "lodash": "^4.17.15"
   },
   "devDependencies": {
     "@babel/cli": "^7.7.7",

package/src/index.js

@@ -2,8 +2,6 @@
 
 let _ = require("lodash");
 let couchbase = require("couchbase");
-const { default: axios } = require("axios");
-var qs = require("qs");
 const { ConflictResolutionType } = require("couchbase");
 const { QueryScanConsistency } = require("couchbase");
 
@@ -163,22 +161,21 @@ module.exports = class Database {
     }
   }
 
-  getCouchbaseHost(default_port = 8091) {
-    return (
-      (this.db_config.api_base ||
-        `http://${_.last(
-          _.first(this.db_config.nodes.split(",")).split("://"),
-        )}`) +
-      ":" +
-      default_port
-    );
-  }
-
   //create wait function
   async wait(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
   }
 
+  quoteIdentifier(identifier) {
+    return `\`${String(identifier).replace(/`/g, "``")}\``;
+  }
+
+  collectionPath(scope_name, collection_name) {
+    return `default:${this.quoteIdentifier(this.db_config.bucket)}.${this.quoteIdentifier(
+      scope_name,
+    )}.${this.quoteIdentifier(collection_name)}`;
+  }
+
   async upsertCollection() {
     try {
       if (!this.checkGlobelConnectionObject(this.collection_name)) {
@@ -199,55 +196,56 @@ module.exports = class Database {
 
   async collectionExists(collection_name, scope_name) {
     try {
-      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;
-      }
       if (spice?.db?.collections?.has(collection_name)) {
         return true;
       } else {
-        spice.db.collections = await loadAllCollections();
-        return spice?.db?.collections?.has(collection_name);
+        let response = await this.cluster.query(
+          `SELECT RAW name
+           FROM system:keyspaces
+           WHERE bucket_id = ?
+             AND scope_id = ?
+             AND name = ?
+           LIMIT 1`,
+          {
+            parameters: [this.db_config.bucket, scope_name, collection_name],
+            scanConsistency: QueryScanConsistency.RequestPlus,
+          },
+        );
+        if (Array.isArray(response?.rows) && response.rows.length > 0) {
+          spice.db.collections.add(collection_name);
+          return true;
+        }
+        return false;
       }
     } catch (e) {
       console.log("Exists error happened", e);
+      return false;
     }
   }
 
   async createCollection(connection_name, scope_name) {
     try {
-      const token = `${this.db_config.username}:${this.db_config.password}`;
-      const encodedToken = Buffer.from(token).toString("base64");
-      const headers = {
-        Authorization: "Basic " + encodedToken,
-        "Content-Type": "application/x-www-form-urlencoded",
-      };
-      let response = await axios({
-        method: "post",
-        url: `${this.getCouchbaseHost()}/pools/default/buckets/${
-          this.db_config.bucket
-        }/scopes/${scope_name}/collections`,
-        headers,
-        data: qs.stringify({ name: connection_name }),
-      }).data;
+      let response = await this.cluster.query(
+        `CREATE COLLECTION ${this.collectionPath(scope_name, connection_name)}`,
+        {
+          scanConsistency: QueryScanConsistency.RequestPlus,
+        },
+      );
+      spice.db.collections.add(connection_name);
       return response;
-    } catch (e) {}
+    } catch (e) {
+      if (
+        e instanceof couchbase.CollectionExistsError ||
+        e?.cause?.first_error_code === 12003 ||
+        /collection .*already exists|already exists/i.test(
+          e?.message || e?.cause?.first_error_message || "",
+        )
+      ) {
+        spice.db.collections.add(connection_name);
+        return;
+      }
+      console.log("CREATE Collection :::", e);
+    }
   }
 
   async primaryIndexExists(scope_name, col_name) {
@@ -255,17 +253,13 @@ module.exports = class Database {
       let response = await this.cluster.query(
         `SELECT RAW name
          FROM system:indexes
-         WHERE bucket_id = $bucket
-           AND scope_id = $scope
-           AND keyspace_id = $collection
+         WHERE bucket_id = ?
+           AND scope_id = ?
+           AND keyspace_id = ?
            AND is_primary = true
          LIMIT 1`,
         {
-          namedParameters: {
-            bucket: this.db_config.bucket,
-            scope: scope_name,
-            collection: col_name,
-          },
+          parameters: [this.db_config.bucket, scope_name, col_name],
           scanConsistency: QueryScanConsistency.RequestPlus,
         },
       );
@@ -282,10 +276,19 @@ module.exports = class Database {
         return;
       }
       let response = await this.query(
-        `CREATE PRIMARY INDEX ON default:\`${this.db_config.bucket}\`.\`${scope_name}\`.\`${col_name}\``,
+        `CREATE PRIMARY INDEX ON ${this.collectionPath(scope_name, col_name)}`,
       );
       return response;
     } catch (e) {
+      if (
+        e instanceof couchbase.IndexExistsError ||
+        e?.cause?.first_error_code === 4300 ||
+        /index .*already exists|index_exists/i.test(
+          e?.message || e?.cause?.first_error_message || "",
+        )
+      ) {
+        return;
+      }
       console.log("CREATE Index :::", e);
     }
   }