spice-couchbase 2.0.51 → 2.0.53

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,21 @@ 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));
+  }
+
+  isCollectionAlreadyExistsError(error) {
+    var _error$cause, _error$cause2, _error$context, _error$context2;
+
+    var message = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : (_error$cause = error.cause) === null || _error$cause === void 0 ? void 0 : _error$cause.first_error_message) || (error === null || error === void 0 ? void 0 : (_error$context = error.context) === null || _error$context === void 0 ? void 0 : _error$context.first_error_message) || (error === null || error === void 0 ? void 0 : (_error$context2 = error.context) === null || _error$context2 === void 0 ? void 0 : _error$context2.http_response_body) || "";
+    return error instanceof couchbase.CollectionExistsError || (error === null || error === void 0 ? void 0 : (_error$cause2 = error.cause) === null || _error$cause2 === void 0 ? void 0 : _error$cause2.first_error_code) === 12003 || (error === null || error === void 0 ? void 0 : (_error$cause2 = error.cause) === null || _error$cause2 === void 0 ? void 0 : _error$cause2.first_error_code) === 12027 || /collection .*already exists|already exists/i.test(message);
+  }
+
   upsertCollection() {
     var _this3 = this;
 
@@ -207,46 +211,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 keyspace_id\n           FROM system:keyspaces\n           WHERE bucket_id = ?\n             AND scope_id = ?\n             AND keyspace_id = ?\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 +238,19 @@ 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) {
+        if (_this5.isCollectionAlreadyExistsError(e)) {
+          spice.db.collections.add(connection_name);
+          return;
+        }
+
+        console.log("CREATE Collection :::", e);
+      }
     })();
   }
 
@@ -301,12 +280,12 @@ module.exports = class Database {
           return;
         }
 
-        var response = yield _this7.query("CREATE PRIMARY INDEX ON default:`".concat(_this7.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$cause, _e$cause2;
+        var _e$cause3, _e$cause4;
 
-        if (e instanceof couchbase.IndexExistsError || (e === null || e === void 0 ? void 0 : (_e$cause = e.cause) === null || _e$cause === void 0 ? void 0 : _e$cause.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$cause2 = e.cause) === null || _e$cause2 === void 0 ? void 0 : _e$cause2.first_error_message) || "")) {
+        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;
         }
 
@@ -899,4 +878,4 @@ module.exports = class Database {
     })();
   }
 
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-couchbase",
-  "version": "2.0.51",
+  "version": "2.0.53",
   "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,36 @@ 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)}`;
+  }
+
+  isCollectionAlreadyExistsError(error) {
+    const message =
+      error?.message ||
+      error?.cause?.first_error_message ||
+      error?.context?.first_error_message ||
+      error?.context?.http_response_body ||
+      "";
+    return (
+      error instanceof couchbase.CollectionExistsError ||
+      error?.cause?.first_error_code === 12003 ||
+      error?.cause?.first_error_code === 12027 ||
+      /collection .*already exists|already exists/i.test(message)
+    );
+  }
+
   async upsertCollection() {
     try {
       if (!this.checkGlobelConnectionObject(this.collection_name)) {
@@ -199,55 +211,52 @@ 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 keyspace_id
+           FROM system:keyspaces
+           WHERE bucket_id = ?
+             AND scope_id = ?
+             AND keyspace_id = ?
+           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 (
+        this.isCollectionAlreadyExistsError(e)
+      ) {
+        spice.db.collections.add(connection_name);
+        return;
+      }
+      console.log("CREATE Collection :::", e);
+    }
   }
 
   async primaryIndexExists(scope_name, col_name) {
@@ -278,7 +287,7 @@ 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) {