spice-couchbase 2.0.19 → 2.0.21

package/build/index.js

@@ -20,6 +20,10 @@ var {
 
 var qs = require("qs");
 
+var {
+  ConflictResolutionType
+} = require("couchbase");
+
 if (!Promise.allSettled) {
   Promise.allSettled = promises => Promise.all(promises.map((promise, i) => promise.then(value => ({
     status: "fulfilled",
@@ -50,20 +54,48 @@ module.exports = class Database {
       this.collection_manager = spice.database.buckets[connection].collections();
       this.auto_create_collection = auto_create_collection || (collection || spice.config.database.connections[connection].collection) != undefined && (collection || spice.config.database.connections[connection].collection) != "default" && (scope || spice.config.database.connections[connection].scope) != "_default";
       this.collection_name = collection || spice.config.database.connections[connection].collection || "_default";
+      /* console.log(
+        "Collection",
+        collection,
+        spice.config.database.connections[connection].collection,
+        this.collection_name 
+      );*/
+
       this.scope_name = scope || spice.config.database.connections[connection].scope || "_default";
       this.scope = spice.database.scopes[connection];
       this.full_text_index = spice.config.database.connections[connection].full_text_index || full_text_index;
       this.N1qlQuery = couchbase.N1qlQuery;
       this.SearchQuery = couchbase.SearchQuery;
-      this.connection = this.scope.collection(this.collection_name);
+      this.collection = this.scope.collection(this.collection_name);
       this.userManager = this.getUserManager(connection);
 
       if (this.auto_create_collection) {
         this.upsertCollection();
       }
 
-      this.use_bucket_name = !spice.config.database.connections[this.connection_name].scope;
+      this.use_bucket_name = spice.config.database.connections[this.connection_name].scope == undefined;
+    }
+  }
+
+  setGlobalConnectionObject(connection) {
+    if (spice.checked_collections == undefined) {
+      spice.checked_collections = {};
+    }
+
+    _.set(spice.checked_collections, connection, true);
+  }
+
+  checkGlobelConnectionObject(connection) {
+    if (spice.checked_collections == undefined) {
+      spice.checked_collections = {};
     }
+
+    if (_.get(spice.checked_collections, connection)) {
+      return true;
+    }
+
+    this.setGlobalConnectionObject(connection);
+    return false;
   }
 
   connect(connection_name, config) {
@@ -136,10 +168,12 @@ module.exports = class Database {
       try {
         var collection_exists = yield _this3.collectionExists(_this3.collection_name, _this3.scope_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);
+        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);
+          }
         }
       } catch (e) {
         console.log(e);
@@ -244,9 +278,15 @@ module.exports = class Database {
     var _this9 = this;
 
     return _asyncToGenerator(function* () {
-      yield (_this9.use_bucket_name ? _this9.connection : _this9.collection).insert(doc_id, document, {
-        expiry: expiry
-      });
+      try {
+        yield (_this9.use_bucket_name ? _this9.connection : _this9.collection).insert(doc_id, document, {
+          expiry: expiry
+        });
+      } catch (e) {
+        console.log(e.message, e, doc_id);
+      }
+
+      console.log("Return from Insert", doc_id);
       return yield _this9.get(doc_id);
     })();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-couchbase",
-  "version": "2.0.19",
+  "version": "2.0.21",
   "description": "",
   "main": "build/index.js",
   "scripts": {

package/src/index.js

@@ -4,6 +4,7 @@ let _ = require("lodash");
 let couchbase = require("couchbase");
 const { default: axios } = require("axios");
 var qs = require("qs");
+const { ConflictResolutionType } = require("couchbase");
 
 if (!Promise.allSettled) {
   Promise.allSettled = (promises) =>
@@ -21,6 +22,7 @@ if (!Promise.allSettled) {
       )
     );
 }
+
 module.exports = class Database {
   constructor(
     connection,
@@ -51,10 +53,17 @@ module.exports = class Database {
             "default" &&
           (scope || spice.config.database.connections[connection].scope) !=
             "_default");
+
       this.collection_name =
         collection ||
         spice.config.database.connections[connection].collection ||
         "_default";
+      /* console.log(
+        "Collection",
+        collection,
+        spice.config.database.connections[connection].collection,
+        this.collection_name 
+      );*/
       this.scope_name =
         scope ||
         spice.config.database.connections[connection].scope ||
@@ -65,15 +74,34 @@ module.exports = class Database {
         full_text_index;
       this.N1qlQuery = couchbase.N1qlQuery;
       this.SearchQuery = couchbase.SearchQuery;
-      this.connection = this.scope.collection(this.collection_name);
+      this.collection = this.scope.collection(this.collection_name);
       this.userManager = this.getUserManager(connection);
       if (this.auto_create_collection) {
         this.upsertCollection();
       }
 
       this.use_bucket_name =
-        !spice.config.database.connections[this.connection_name].scope;
+        spice.config.database.connections[this.connection_name].scope ==
+        undefined;
+    }
+  }
+
+  setGlobalConnectionObject(connection) {
+    if (spice.checked_collections == undefined) {
+      spice.checked_collections = {};
     }
+    _.set(spice.checked_collections, connection, true);
+  }
+
+  checkGlobelConnectionObject(connection) {
+    if (spice.checked_collections == undefined) {
+      spice.checked_collections = {};
+    }
+    if (_.get(spice.checked_collections, connection)) {
+      return true;
+    }
+    this.setGlobalConnectionObject(connection);
+    return false;
   }
 
   async connect(connection_name, config) {
@@ -144,10 +172,12 @@ module.exports = class Database {
         this.collection_name,
         this.scope_name
       );
-      if (!collection_exists) {
-        await this.createCollection(this.collection_name, this.scope_name);
-        await this.wait(2000);
-        await this.createPrimaryIndex(this.scope_name, this.collection_name);
+      if (!this.checkGlobelConnectionObject(this.collection_name)) {
+        if (!collection_exists) {
+          await this.createCollection(this.collection_name, this.scope_name);
+          await this.wait(2000);
+          await this.createPrimaryIndex(this.scope_name, this.collection_name);
+        }
       }
     } catch (e) {
       console.log(e);
@@ -236,13 +266,18 @@ module.exports = class Database {
   }
 
   async insert(doc_id, document, expiry) {
-    await (this.use_bucket_name ? this.connection : this.collection).insert(
-      doc_id,
-      document,
-      {
-        expiry: expiry,
-      }
-    );
+    try {
+      await (this.use_bucket_name ? this.connection : this.collection).insert(
+        doc_id,
+        document,
+        {
+          expiry: expiry,
+        }
+      );
+    } catch (e) {
+      console.log(e.message, e, doc_id);
+    }
+    console.log("Return from Insert", doc_id);
     return await this.get(doc_id);
   }