spice-js 2.6.4 → 2.6.6

package/build/bootstrap/cache.js

@@ -12,11 +12,11 @@ function _connect() {
   _connect = _asyncToGenerator(function* () {
     try {
       spice.cache_providers = {};
-      spice.monitor = {};
+      spice.monitor = new Map();
 
       for (var key of Object.keys(spice.config.cache.providers)) {
         spice.cache_providers[key] = new spice.config.cache.providers[key](spice.config.cache.drivers[key] || {});
-        yield spice.cache_providers[key].initialize();
+        spice.cache_providers[key].initialize();
       }
     } catch (e) {
       console.log(e.stack);

package/build/models/SpiceModel.js

@@ -433,7 +433,9 @@ class SpiceModel {
   }
 
   shouldCache(resource_type) {
-    return spice.cache[resource_type] != undefined;
+    var _spice$systemconfig, _spice$systemconfig$c;
+
+    return spice.cache[resource_type] != undefined || ((_spice$systemconfig = spice.systemconfig) == null ? void 0 : (_spice$systemconfig$c = _spice$systemconfig.cache) == null ? void 0 : _spice$systemconfig$c.status) == "disable";
   }
 
   getCacheConfig(resource_type) {
@@ -441,7 +443,7 @@ class SpiceModel {
   }
 
   getCacheProviderObject(resource_type) {
-    return spice.cache_providers[this.getCacheConfig(resource_type).driver || spice.config.cache.default_driver];
+    return spice.cache_providers[this.getCacheConfig(resource_type).driver || this.getCacheConfig(resource_type).provider || spice.config.cache.default_driver];
   }
 
   exists(item_type, key) {
@@ -456,26 +458,37 @@ class SpiceModel {
   }
 
   shouldForceRefresh(response) {
-    var monitor_record = _.get(spice.monitor, this.type);
+    var _this3 = this;
 
-    if (monitor_record == undefined) {
-      return false;
-    }
+    return _asyncToGenerator(function* () {
+      var obj = _this3.getCacheProviderObject();
 
-    if (monitor_record > (response == null ? void 0 : response.time)) {
-      return true;
-    }
+      var monitor_record = yield obj.get("monitor::" + _this3.type);
+
+      if (monitor_record == undefined) {
+        return false;
+      }
+
+      if (monitor_record.time > (response == null ? void 0 : response.time)) {
+        return true;
+      }
 
-    return false;
+      return false;
+    })();
   }
 
   setMonitor() {
     var current_time = new Date().getTime();
-    spice.monitor[this.type] = current_time; //console.log("Monitor Set", spice.monitor);
+    var obj = this.getCacheProviderObject();
+    obj.set("monitor::" + this.type, {
+      time: current_time
+    }, {
+      ttl: 0
+    }); //console.log("Monitor Set", spice.monitor);
   }
 
   get(args) {
-    var _this3 = this;
+    var _this4 = this;
 
     return _asyncToGenerator(function* () {
       try {
@@ -484,39 +497,39 @@ class SpiceModel {
         }
 
         if (_.isString(args.id)) {
-          yield _this3.run_hook(args, "get", "before");
-          var key = _this3.type + "::" + args.id;
+          yield _this4.run_hook(args, "get", "before");
+          var key = _this4.type + "::" + args.id;
           var results = {};
 
-          if (_this3.shouldCache(_this3.type)) {
-            var cached_results = yield _this3.getCacheProviderObject(_this3.type).get(key);
+          if (_this4.shouldCache(_this4.type)) {
+            var cached_results = yield _this4.getCacheProviderObject(_this4.type).get(key);
             results = cached_results == null ? void 0 : cached_results.value;
 
-            if ((cached_results == null ? void 0 : cached_results.value) == undefined || _this3.shouldForceRefresh(cached_results)) {
-              results = yield _this3.database.get(args.id);
-              yield _this3.getCacheProviderObject(_this3.type).set(key, {
+            if ((cached_results == null ? void 0 : cached_results.value) == undefined || (yield _this4.shouldForceRefresh(cached_results))) {
+              results = yield _this4.database.get(args.id);
+              yield _this4.getCacheProviderObject(_this4.type).set(key, {
                 value: results,
                 time: new Date().getTime()
-              }, _this3.getCacheConfig(_this3.type));
+              }, _this4.getCacheConfig(_this4.type));
             }
           } else {
-            results = yield _this3.database.get(args.id);
+            results = yield _this4.database.get(args.id);
           }
 
           if (results.type != undefined) {
-            if (results.type != _this3.type) throw new Error(_this3.type + " does not exist type");
+            if (results.type != _this4.type) throw new Error(_this4.type + " does not exist type");
           }
 
           if (results._type != undefined) {
-            if (results._type != _this3.type) throw new Error(_this3.type + " does not exist _type");
+            if (results._type != _this4.type) throw new Error(_this4.type + " does not exist _type");
           }
 
           if (results.deleted == undefined || results.deleted == false) {
-            yield _this3.run_hook(results, "get", "after");
-            results = yield _this3.do_serialize(results, "read", {}, args, (yield _this3.propsToBeRemoved(results)));
+            yield _this4.run_hook(results, "get", "after");
+            results = yield _this4.do_serialize(results, "read", {}, args, (yield _this4.propsToBeRemoved(results)));
             return results;
           } else {
-            throw new Error(_this3.type + " does not exist");
+            throw new Error(_this4.type + " does not exist");
           }
         }
       } catch (e) {
@@ -526,11 +539,11 @@ class SpiceModel {
   }
 
   query(query, scope) {
-    var _this4 = this;
+    var _this5 = this;
 
     return _asyncToGenerator(function* () {
       try {
-        var results = yield _this4.database.query(query, scope);
+        var results = yield _this5.database.query(query, scope);
         return results;
       } catch (error) {
         throw error;
@@ -539,7 +552,7 @@ class SpiceModel {
   }
 
   getMulti(args) {
-    var _this5 = this;
+    var _this6 = this;
 
     return _asyncToGenerator(function* () {
       try {
@@ -547,36 +560,36 @@ class SpiceModel {
           args = {};
         }
 
-        yield _this5.run_hook(_this5, "list", "before");
+        yield _this6.run_hook(_this6, "list", "before");
 
         _.remove(args.ids, o => o == undefined);
 
-        var key = _this5.type + "::" + _.join(args.ids, "|");
+        var key = _this6.type + "::" + _.join(args.ids, "|");
 
         var results = [];
 
         if (args.ids.length > 0) {
-          if (_this5.shouldCache(_this5.type)) {
-            var cached_results = yield _this5.getCacheProviderObject(_this5.type).get(key);
+          if (_this6.shouldCache(_this6.type)) {
+            var cached_results = yield _this6.getCacheProviderObject(_this6.type).get(key);
             results = cached_results == null ? void 0 : cached_results.value;
 
-            if ((cached_results == null ? void 0 : cached_results.value) == undefined || _this5.shouldForceRefresh(cached_results)) {
-              results = yield _this5.database.multi_get(args.ids, true);
+            if ((cached_results == null ? void 0 : cached_results.value) == undefined || (yield _this6.shouldForceRefresh(cached_results))) {
+              results = yield _this6.database.multi_get(args.ids, true);
 
-              _this5.getCacheProviderObject(_this5.type).set(key, {
+              _this6.getCacheProviderObject(_this6.type).set(key, {
                 value: results,
                 time: new Date().getTime()
-              }, _this5.getCacheConfig(_this5.type));
+              }, _this6.getCacheConfig(_this6.type));
             }
           } else {
-            results = yield _this5.database.multi_get(args.ids, true);
+            results = yield _this6.database.multi_get(args.ids, true);
           }
         }
 
-        _.remove(results, o => o.type != _this5.type);
+        _.remove(results, o => o.type != _this6.type);
 
-        yield _this5.run_hook(results, "list", "after", args.context);
-        results = yield _this5.do_serialize(results, "read", {}, args, (yield _this5.propsToBeRemoved(results)));
+        yield _this6.run_hook(results, "list", "after", args.context);
+        results = yield _this6.do_serialize(results, "read", {}, args, (yield _this6.propsToBeRemoved(results)));
         return results;
       } catch (e) {
         console.log(e.stack);
@@ -586,23 +599,23 @@ class SpiceModel {
   }
 
   exist(data) {
-    var _this6 = this;
+    var _this7 = this;
 
     return _asyncToGenerator(function* () {
       try {
         if (_.isString(data)) {
-          var result = yield _this6.database.get(data);
-          if (result.type) if (result.type != _this6.type) {
+          var result = yield _this7.database.get(data);
+          if (result.type) if (result.type != _this7.type) {
             return false;
           }
-          if (result._type) if (result._type != _this6.type) {
+          if (result._type) if (result._type != _this7.type) {
             return false;
           }
         } else {
-          if (data.type) if (data.type != _this6.type) {
+          if (data.type) if (data.type != _this7.type) {
             return false;
           }
-          if (data._type) if (data._type != _this6.type) {
+          if (data._type) if (data._type != _this7.type) {
             return false;
           }
         }
@@ -615,54 +628,54 @@ class SpiceModel {
   }
 
   update(args) {
-    var _this7 = this;
+    var _this8 = this;
 
     return _asyncToGenerator(function* () {
       try {
-        _this7.updated_at = new SDate().now();
-        var results = yield _this7.database.get(args.id);
-        var item_exist = yield _this7.exist(results);
+        _this8.updated_at = new SDate().now();
+        var results = yield _this8.database.get(args.id);
+        var item_exist = yield _this8.exist(results);
 
         if (!item_exist) {
-          throw new Error(_this7.type + " does not exist. in update");
+          throw new Error(_this8.type + " does not exist. in update");
         }
 
         delete results["id"];
 
-        _.defaults(_this7, results);
+        _.defaults(_this8, results);
 
         var cover_obj = {
           old: results,
-          new: _this7,
+          new: _this8,
           id: args.id
         };
 
         if (args.skip_hooks != true) {
-          yield _this7.run_hook(cover_obj, "update", "before", results);
+          yield _this8.run_hook(cover_obj, "update", "before", results);
         }
 
         var form;
 
         if (args.skip_write_serialize != true && args.skip_serialize != true) {
-          form = yield _this7.do_serialize(_this7, "write", cover_obj.new, args);
+          form = yield _this8.do_serialize(_this8, "write", cover_obj.new, args);
         }
 
-        var db_data = form || _this7;
-        yield _this7.database.update(args.id, db_data);
+        var db_data = form || _this8;
+        yield _this8.database.update(args.id, db_data);
 
-        _this7.setMonitor();
+        _this8.setMonitor();
 
         if (args.skip_hooks != true) {
-          yield _this7.run_hook(_extends({}, _this7, {
+          yield _this8.run_hook(_extends({}, _this8, {
             id: args.id
           }), "update", "after", results);
         }
 
         if (args.skip_read_serialize != true && args.skip_serialize != true) {
-          form = yield _this7.do_serialize(form, "read", {}, args, (yield _this7.propsToBeRemoved(form)));
+          form = yield _this8.do_serialize(form, "read", {}, args, (yield _this8.propsToBeRemoved(form)));
         }
 
-        _this7.id = args.id;
+        _this8.id = args.id;
         return _extends({}, form, {
           id: args.id
         });
@@ -674,38 +687,38 @@ class SpiceModel {
   }
 
   create(args) {
-    var _this8 = this;
+    var _this9 = this;
 
     return _asyncToGenerator(function* () {
       try {
         var form;
-        _this8.created_at = new SDate().now();
+        _this9.created_at = new SDate().now();
 
         if (args.body) {
           form = _.defaults({}, args.body);
-          form.created_at = _this8.created_at;
-          form.updated_at = _this8.created_at;
+          form.created_at = _this9.created_at;
+          form.updated_at = _this9.created_at;
           delete form["bucket"];
         }
 
-        var workingForm = form || _this8;
-        _this8.updated_at = new SDate().now();
+        var workingForm = form || _this9;
+        _this9.updated_at = new SDate().now();
         var id = args.id_prefix + "-" + UUID.v4();
 
         if (args && args.id) {
           id = args.id;
         }
 
-        yield _this8.run_hook(workingForm, "create", "before");
-        workingForm = yield _this8.do_serialize(workingForm, "write", {}, args);
-        var results = yield _this8.database.insert(id, workingForm, args.expiry);
+        yield _this9.run_hook(workingForm, "create", "before");
+        workingForm = yield _this9.do_serialize(workingForm, "write", {}, args);
+        var results = yield _this9.database.insert(id, workingForm, args.expiry);
 
-        _this8.setMonitor();
+        _this9.setMonitor();
 
-        yield _this8.run_hook(_extends({}, results, {
+        yield _this9.run_hook(_extends({}, results, {
           id
         }), "create", "after");
-        results = yield _this8.do_serialize(results, "read", {}, args, (yield _this8.propsToBeRemoved(results)));
+        results = yield _this9.do_serialize(results, "read", {}, args, (yield _this9.propsToBeRemoved(results)));
         return _extends({}, results, {
           id
         });
@@ -717,32 +730,32 @@ class SpiceModel {
   }
 
   delete(args) {
-    var _this9 = this;
+    var _this10 = this;
 
     return _asyncToGenerator(function* () {
-      var item_exist = yield _this9.exist(args.id);
+      var item_exist = yield _this10.exist(args.id);
 
       if (!item_exist) {
-        throw new Error(_this9.type + " does not exist.");
+        throw new Error(_this10.type + " does not exist.");
       }
 
-      var results = yield _this9.database.get(args.id);
+      var results = yield _this10.database.get(args.id);
 
       try {
-        yield _this9.run_hook(args, "delete", "before");
+        yield _this10.run_hook(args, "delete", "before");
         var delete_response = {};
 
         if (args.hard) {
-          delete_response = yield _this9.database.delete(args.id);
+          delete_response = yield _this10.database.delete(args.id);
 
-          _this9.setMonitor();
+          _this10.setMonitor();
         } else {
           delete results["id"];
           results.deleted = true;
-          delete_response = yield _this9.database.update(args.id, "");
+          delete_response = yield _this10.database.update(args.id, "");
         }
 
-        yield _this9.run_hook(results, "delete", "after", results);
+        yield _this10.run_hook(results, "delete", "after", results);
         return {};
       } catch (e) {
         console.log(e.stack);
@@ -756,7 +769,7 @@ class SpiceModel {
   }
 
   list(args) {
-    var _this10 = this;
+    var _this11 = this;
 
     return _asyncToGenerator(function* () {
       function filterResultsByColumns(data, columns) {
@@ -784,7 +797,7 @@ class SpiceModel {
           query = args.query;
         } else {
           if (args.filters) {
-            query = _this10.makeQueryFromFilter(args.filters);
+            query = _this11.makeQueryFromFilter(args.filters);
           } else {
             if (args.query) {
               query = args.query + " AND (deleted = false OR deleted IS MISSING) ";
@@ -806,69 +819,69 @@ class SpiceModel {
           args.sort = "created_at DESC";
         }
 
-        yield _this10.run_hook(_this10, "list", "before");
+        yield _this11.run_hook(_this11, "list", "before");
 
         function removeSpaceAndSpecialCharacters(str) {
           return str.replace(/[^a-zA-Z0-9]/g, "");
         }
 
-        var key = removeSpaceAndSpecialCharacters(_this10.type + "::" + query + "::" + args.limit + "::" + args.offset + "::" + args.sort + "::" + args.do_count + "::" + args.statement_consistent + "::" + args.columns + "::" + args.is_full_text + "::" + args.is_custom_query);
+        var key = removeSpaceAndSpecialCharacters(_this11.type + "::" + query + "::" + args.limit + "::" + args.offset + "::" + args.sort + "::" + args.do_count + "::" + args.statement_consistent + "::" + args.columns + "::" + args.is_full_text + "::" + args.is_custom_query);
         var results;
 
         if (args.is_custom_query && args.is_custom_query === "true") {
           if (args.ids.length > 0) {
-            if (_this10.shouldCache(_this10.type)) {
-              var cached_results = yield _this10.getCacheProviderObject(_this10.type).get(key);
+            if (_this11.shouldCache(_this11.type)) {
+              var cached_results = yield _this11.getCacheProviderObject(_this11.type).get(key);
               results = cached_results == null ? void 0 : cached_results.value;
 
-              if ((cached_results == null ? void 0 : cached_results.value) == undefined || _this10.shouldForceRefresh(cached_results)) {
-                results = yield _this10.database.query(query);
+              if ((cached_results == null ? void 0 : cached_results.value) == undefined || (yield _this11.shouldForceRefresh(cached_results))) {
+                results = yield _this11.database.query(query);
 
-                _this10.getCacheProviderObject(_this10.type).set(key, {
+                _this11.getCacheProviderObject(_this11.type).set(key, {
                   value: results,
                   time: new Date().getTime()
-                }, _this10.getCacheConfig(_this10.type));
+                }, _this11.getCacheConfig(_this11.type));
               }
             } else {
-              results = yield _this10.database.query(query);
+              results = yield _this11.database.query(query);
             }
           }
         } else {
           if (args.is_full_text && args.is_full_text === "true") {
-            if (_this10.shouldCache(_this10.type)) {
-              var _cached_results = yield _this10.getCacheProviderObject(_this10.type).get(key);
+            if (_this11.shouldCache(_this11.type)) {
+              var _cached_results = yield _this11.getCacheProviderObject(_this11.type).get(key);
 
               results = _cached_results == null ? void 0 : _cached_results.value;
 
-              if ((_cached_results == null ? void 0 : _cached_results.value) == undefined || _this10.shouldForceRefresh(_cached_results)) {
-                results = yield _this10.database.full_text_search(_this10.type, query || "", args.limit, args.offset);
+              if ((_cached_results == null ? void 0 : _cached_results.value) == undefined || (yield _this11.shouldForceRefresh(_cached_results))) {
+                results = yield _this11.database.full_text_search(_this11.type, query || "", args.limit, args.offset);
 
-                _this10.getCacheProviderObject(_this10.type).set(key, {
+                _this11.getCacheProviderObject(_this11.type).set(key, {
                   value: results,
                   time: new Date().getTime()
-                }, _this10.getCacheConfig(_this10.type));
+                }, _this11.getCacheConfig(_this11.type));
               }
             } else {
-              results = yield _this10.database.full_text_search(_this10.type, query || "", args.limit, args.offset);
+              results = yield _this11.database.full_text_search(_this11.type, query || "", args.limit, args.offset);
             }
           } else {
-            if (_this10.shouldCache(_this10.type)) {
-              var _cached_results2 = yield _this10.getCacheProviderObject(_this10.type).get(key);
+            if (_this11.shouldCache(_this11.type)) {
+              var _cached_results2 = yield _this11.getCacheProviderObject(_this11.type).get(key);
 
               results = _cached_results2 == null ? void 0 : _cached_results2.value;
 
-              if ((_cached_results2 == null ? void 0 : _cached_results2.value) == undefined || _this10.shouldForceRefresh(_cached_results2)) {
-                results = yield _this10.database.search(_this10.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent);
+              if ((_cached_results2 == null ? void 0 : _cached_results2.value) == undefined || (yield _this11.shouldForceRefresh(_cached_results2))) {
+                results = yield _this11.database.search(_this11.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent);
 
-                _this10.getCacheProviderObject(_this10.type).set(key, {
+                _this11.getCacheProviderObject(_this11.type).set(key, {
                   value: results,
                   time: new Date().getTime()
-                }, _this10.getCacheConfig(_this10.type));
+                }, _this11.getCacheConfig(_this11.type));
               }
             } else {
-              results = yield _this10.database.search(_this10.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent);
+              results = yield _this11.database.search(_this11.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent);
 
-              if (_this10.type == "user") {
+              if (_this11.type == "user") {
                 console.log("results from DB No Chache available", results);
               }
             }
@@ -876,8 +889,8 @@ class SpiceModel {
         }
 
         try {
-          yield _this10.run_hook(results.data, "list", "after");
-          results.data = yield _this10.do_serialize(results.data, "read", {}, args, (yield _this10.propsToBeRemoved(results.data)));
+          yield _this11.run_hook(results.data, "list", "after");
+          results.data = yield _this11.do_serialize(results.data, "read", {}, args, (yield _this11.propsToBeRemoved(results.data)));
         } catch (e) {
           console.log(e);
         }
@@ -903,26 +916,26 @@ class SpiceModel {
   }
 
   run_hook(data, op, when, old_data) {
-    var _this11 = this;
+    var _this12 = this;
 
     return _asyncToGenerator(function* () {
       try {
-        if (_this11[_disable_lifecycle_events] == false) {
+        if (_this12[_disable_lifecycle_events] == false) {
           var resourceLifecycleTriggered = new _ResourceLifecycleTriggered.default({
             data: {
               data,
               operation: op,
               when,
               old_data,
-              resource: _this11.type,
-              ctx: _this11[_ctx]
+              resource: _this12.type,
+              ctx: _this12[_ctx]
             }
           });
           resourceLifecycleTriggered.dispatch();
         }
 
-        if (_this11[_hooks] && _this11[_hooks][op] && _this11[_hooks][op][when]) {
-          for (var i of _this11[_hooks][op][when]) {
+        if (_this12[_hooks] && _this12[_hooks][op] && _this12[_hooks][op][when]) {
+          for (var i of _this12[_hooks][op][when]) {
             data = yield i(data, old_data);
           }
         }
@@ -955,7 +968,7 @@ class SpiceModel {
   }
 
   mapToObject(data, Class, source_property, store_property, property) {
-    var _this12 = this;
+    var _this13 = this;
 
     return _asyncToGenerator(function* () {
       var original_is_array = _.isArray(data);
@@ -984,7 +997,7 @@ class SpiceModel {
       });
 
       var returned_all = yield Promise.allSettled(_.map(classes, obj => {
-        return new obj(_this12[_args]).getMulti({
+        return new obj(_this13[_args]).getMulti({
           ids: ids
         });
       }));
@@ -1006,7 +1019,7 @@ class SpiceModel {
   }
 
   mapToObjectArray(data, Class, source_property, store_property, property) {
-    var _this13 = this;
+    var _this14 = this;
 
     return _asyncToGenerator(function* () {
       var original_is_array = _.isArray(data);
@@ -1035,7 +1048,7 @@ class SpiceModel {
 
       var classes = _.isArray(Class) ? Class : [Class];
       var returned_all = yield Promise.allSettled(_.map(classes, obj => {
-        return new obj(_this13[_args]).getMulti({
+        return new obj(_this14[_args]).getMulti({
           ids: ids
         });
       }));
@@ -1095,7 +1108,7 @@ class SpiceModel {
   }
 
   createMofifier(properties) {
-    var _this14 = this;
+    var _this15 = this;
 
     var _loop = function _loop(i) {
       if (properties[i].map) {
@@ -1106,11 +1119,11 @@ class SpiceModel {
                 case String:
                 case "string":
                   {
-                    _this14.addModifier({
+                    _this15.addModifier({
                       when: properties[i].map.when || "read",
                       execute: function () {
                         var _execute = _asyncToGenerator(function* (data) {
-                          return yield _this14.mapToObject(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
+                          return yield _this15.mapToObject(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
                         });
 
                         function execute(_x) {
@@ -1127,11 +1140,11 @@ class SpiceModel {
                 case Array:
                 case "array":
                   {
-                    _this14.addModifier({
+                    _this15.addModifier({
                       when: properties[i].map.when || "read",
                       execute: function () {
                         var _execute2 = _asyncToGenerator(function* (data) {
-                          return yield _this14.mapToObjectArray(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
+                          return yield _this15.mapToObjectArray(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
                         });
 
                         function execute(_x2) {
@@ -1163,7 +1176,7 @@ class SpiceModel {
   }
 
   do_serialize(data, type, old_data, args, path_to_be_removed) {
-    var _this15 = this;
+    var _this16 = this;
 
     return _asyncToGenerator(function* () {
       //console.log("CTX INside Model DO", this[_ctx]);
@@ -1173,16 +1186,16 @@ class SpiceModel {
           path_to_be_removed = [];
         }
 
-        if (_this15.shouldSerializerRun(args, type)) {
-          if (_this15.type != "" && _this15.type != undefined && _this15[_external_modifier_loaded] != true) {
-            _this15.addExternalModifiers(_this15.type);
+        if (_this16.shouldSerializerRun(args, type)) {
+          if (_this16.type != "" && _this16.type != undefined && _this16[_external_modifier_loaded] != true) {
+            _this16.addExternalModifiers(_this16.type);
 
-            _this15[_external_modifier_loaded] = true;
+            _this16[_external_modifier_loaded] = true;
           }
 
-          for (var i of _this15[_serializers][type]["modifiers"]) {
+          for (var i of _this16[_serializers][type]["modifiers"]) {
             try {
-              data = yield i(data, old_data, _this15[_ctx], _this15.type);
+              data = yield i(data, old_data, _this16[_ctx], _this16.type);
             } catch (e) {
               console.log(e.stack);
             }
@@ -1198,12 +1211,12 @@ class SpiceModel {
 
           var defaults = {};
 
-          for (var _i in _this15.props) {
-            if (_this15.props[_i].defaults != undefined && _this15.props[_i].defaults[type] != undefined && _this15.props[_i].defaults[type] != undefined) {
-              defaults[_i] = _.isFunction(_this15.props[_i].defaults[type]) ? _this15.props[_i].defaults[type]({
+          for (var _i in _this16.props) {
+            if (_this16.props[_i].defaults != undefined && _this16.props[_i].defaults[type] != undefined && _this16.props[_i].defaults[type] != undefined) {
+              defaults[_i] = _.isFunction(_this16.props[_i].defaults[type]) ? _this16.props[_i].defaults[type]({
                 old_data: data,
                 new_data: old_data
-              }) : _this15.props[_i].defaults[type];
+              }) : _this16.props[_i].defaults[type];
             }
           } // apply defaults
 
@@ -1216,8 +1229,8 @@ class SpiceModel {
           if (type == "read") {
             var props_to_clean = ["deleted", "type", ...path_to_be_removed];
 
-            for (var _i3 in _this15.props) {
-              if (_this15.props[_i3].hide) {
+            for (var _i3 in _this16.props) {
+              if (_this16.props[_i3].hide) {
                 props_to_clean.push(_i3);
               }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.6.4",
+  "version": "2.6.6",
   "description": "spice",
   "main": "build/index.js",
   "repository": {
@@ -39,7 +39,6 @@
     "regenerator-runtime": "^0.13.7",
     "socket.io-client": "^4.0.1",
     "sonover-date": "^1.0.1",
-    "spice-couchbase": "^2.0.14",
     "uuid": "^3.3.3",
     "winston": "^3.2.1"
   },

package/src/bootstrap/cache.js

@@ -3,7 +3,7 @@
 async function connect() {
   try {
     spice.cache_providers = {};
-    spice.monitor = {};
+    spice.monitor = new Map();
     for (let key of Object.keys(spice.config.cache.providers)) {
       spice.cache_providers[key] = new spice.config.cache.providers[key](
         spice.config.cache.drivers[key] || {}

package/src/models/SpiceModel.js

@@ -366,7 +366,10 @@ export default class SpiceModel {
   }
 
   shouldCache(resource_type) {
-    return spice.cache[resource_type] != undefined;
+    return (
+      spice.cache[resource_type] != undefined ||
+      spice.systemconfig?.cache?.status == "disable"
+    );
   }
 
   getCacheConfig(resource_type) {
@@ -376,6 +379,7 @@ export default class SpiceModel {
   getCacheProviderObject(resource_type) {
     return spice.cache_providers[
       this.getCacheConfig(resource_type).driver ||
+        this.getCacheConfig(resource_type).provider ||
         spice.config.cache.default_driver
     ];
   }
@@ -386,12 +390,13 @@ export default class SpiceModel {
     return false;
   }
 
-  shouldForceRefresh(response) {
-    let monitor_record = _.get(spice.monitor, this.type);
+  async shouldForceRefresh(response) {
+    let obj = this.getCacheProviderObject();
+    let monitor_record = await obj.get(`monitor::${this.type}`);
     if (monitor_record == undefined) {
       return false;
     }
-    if (monitor_record > response?.time) {
+    if (monitor_record.time > response?.time) {
       return true;
     }
     return false;
@@ -399,7 +404,8 @@ export default class SpiceModel {
 
   setMonitor() {
     let current_time = new Date().getTime();
-    spice.monitor[this.type] = current_time;
+    let obj = this.getCacheProviderObject();
+    obj.set(`monitor::${this.type}`, { time: current_time }, { ttl: 0 });
     //console.log("Monitor Set", spice.monitor);
   }
 
@@ -419,7 +425,7 @@ export default class SpiceModel {
           results = cached_results?.value;
           if (
             cached_results?.value == undefined ||
-            this.shouldForceRefresh(cached_results)
+            (await this.shouldForceRefresh(cached_results))
           ) {
             results = await this.database.get(args.id);
             await this.getCacheProviderObject(this.type).set(
@@ -488,7 +494,7 @@ export default class SpiceModel {
           results = cached_results?.value;
           if (
             cached_results?.value == undefined ||
-            this.shouldForceRefresh(cached_results)
+            (await this.shouldForceRefresh(cached_results))
           ) {
             results = await this.database.multi_get(args.ids, true);
             this.getCacheProviderObject(this.type).set(
@@ -743,7 +749,7 @@ export default class SpiceModel {
             results = cached_results?.value;
             if (
               cached_results?.value == undefined ||
-              this.shouldForceRefresh(cached_results)
+              (await this.shouldForceRefresh(cached_results))
             ) {
               results = await this.database.query(query);
               this.getCacheProviderObject(this.type).set(
@@ -765,7 +771,7 @@ export default class SpiceModel {
             results = cached_results?.value;
             if (
               cached_results?.value == undefined ||
-              this.shouldForceRefresh(cached_results)
+              (await this.shouldForceRefresh(cached_results))
             ) {
               results = await this.database.full_text_search(
                 this.type,
@@ -795,7 +801,7 @@ export default class SpiceModel {
             results = cached_results?.value;
             if (
               cached_results?.value == undefined ||
-              this.shouldForceRefresh(cached_results)
+              (await this.shouldForceRefresh(cached_results))
             ) {
               results = await this.database.search(
                 this.type,