spice-js 2.6.0 → 2.6.1

package/build/bootstrap/cache.js

@@ -12,6 +12,7 @@ function _connect() {
   _connect = _asyncToGenerator(function* () {
     try {
       spice.cache_providers = {};
+      spice.monitor = {};
 
       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] || {});

package/build/models/SpiceModel.js

@@ -455,6 +455,25 @@ class SpiceModel {
     })();
   }
 
+  shouldForceRefresh(response) {
+    var monitor_record = _.get(spice.monitor, this.type);
+
+    if (monitor_record == undefined) {
+      return false;
+    }
+
+    if (monitor_record > (response == null ? void 0 : response.time)) {
+      return true;
+    }
+
+    return false;
+  }
+
+  setMonitor() {
+    var current_time = new Date().getTime();
+    spice.monitor[this.type] = current_time; //console.log("Monitor Set", spice.monitor);
+  }
+
   get(args) {
     var _this3 = this;
 
@@ -471,20 +490,14 @@ class SpiceModel {
 
           if (_this3.shouldCache(_this3.type)) {
             var cached_results = yield _this3.getCacheProviderObject(_this3.type).get(key);
+            results = cached_results == null ? void 0 : cached_results.value;
 
-            if (cached_results) {
-              //calculate time taken to get data from Cache
-              results = cached_results;
-              /* if (this.type == "user") {
-                console.log("results from Cache", results);
-              } */
-            } else {
+            if ((cached_results == null ? void 0 : cached_results.value) == undefined || _this3.shouldForceRefresh(cached_results)) {
               results = yield _this3.database.get(args.id);
-              /* if (this.type == "user") {
-                console.log("results from DB", results);
-              } */
-
-              yield _this3.getCacheProviderObject(_this3.type).set(key, results, _this3.getCacheConfig(_this3.type));
+              yield _this3.getCacheProviderObject(_this3.type).set(key, {
+                value: results,
+                time: new Date().getTime()
+              }, _this3.getCacheConfig(_this3.type));
             }
           } else {
             results = yield _this3.database.get(args.id);
@@ -545,13 +558,15 @@ class SpiceModel {
         if (args.ids.length > 0) {
           if (_this5.shouldCache(_this5.type)) {
             var cached_results = yield _this5.getCacheProviderObject(_this5.type).get(key);
+            results = cached_results == null ? void 0 : cached_results.value;
 
-            if (cached_results) {
-              results = cached_results;
-            } else {
+            if ((cached_results == null ? void 0 : cached_results.value) == undefined || _this5.shouldForceRefresh(cached_results)) {
               results = yield _this5.database.multi_get(args.ids, true);
 
-              _this5.getCacheProviderObject(_this5.type).set(key, results, _this5.getCacheConfig(_this5.type));
+              _this5.getCacheProviderObject(_this5.type).set(key, {
+                value: results,
+                time: new Date().getTime()
+              }, _this5.getCacheConfig(_this5.type));
             }
           } else {
             results = yield _this5.database.multi_get(args.ids, true);
@@ -635,6 +650,8 @@ class SpiceModel {
         var db_data = form || _this7;
         yield _this7.database.update(args.id, db_data);
 
+        _this7.setMonitor();
+
         if (args.skip_hooks != true) {
           yield _this7.run_hook(_extends({}, _this7, {
             id: args.id
@@ -682,6 +699,9 @@ class SpiceModel {
         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);
+
+        _this8.setMonitor();
+
         yield _this8.run_hook(_extends({}, results, {
           id
         }), "create", "after");
@@ -714,6 +734,8 @@ class SpiceModel {
 
         if (args.hard) {
           delete_response = yield _this9.database.delete(args.id);
+
+          _this9.setMonitor();
         } else {
           delete results["id"];
           results.deleted = true;
@@ -783,13 +805,15 @@ class SpiceModel {
           if (args.ids.length > 0) {
             if (_this10.shouldCache(_this10.type)) {
               var cached_results = yield _this10.getCacheProviderObject(_this10.type).get(key);
+              results = cached_results == null ? void 0 : cached_results.value;
 
-              if (cached_results) {
-                results = cached_results;
-              } else {
+              if ((cached_results == null ? void 0 : cached_results.value) == undefined || _this10.shouldForceRefresh(cached_results)) {
                 results = yield _this10.database.query(query);
 
-                _this10.getCacheProviderObject(_this10.type).set(key, results, _this10.getCacheConfig(_this10.type));
+                _this10.getCacheProviderObject(_this10.type).set(key, {
+                  value: results,
+                  time: new Date().getTime()
+                }, _this10.getCacheConfig(_this10.type));
               }
             } else {
               results = yield _this10.database.query(query);
@@ -800,12 +824,15 @@ class SpiceModel {
             if (_this10.shouldCache(_this10.type)) {
               var _cached_results = yield _this10.getCacheProviderObject(_this10.type).get(key);
 
-              if (_cached_results) {
-                results = _cached_results;
-              } else {
+              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);
 
-                _this10.getCacheProviderObject(_this10.type).set(key, results, _this10.getCacheConfig(_this10.type));
+                _this10.getCacheProviderObject(_this10.type).set(key, {
+                  value: results,
+                  time: new Date().getTime()
+                }, _this10.getCacheConfig(_this10.type));
               }
             } else {
               results = yield _this10.database.full_text_search(_this10.type, query || "", args.limit, args.offset);
@@ -814,12 +841,15 @@ class SpiceModel {
             if (_this10.shouldCache(_this10.type)) {
               var _cached_results2 = yield _this10.getCacheProviderObject(_this10.type).get(key);
 
-              if (_cached_results2) {
-                results = _cached_results2;
-              } else {
+              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);
 
-                _this10.getCacheProviderObject(_this10.type).set(key, results, _this10.getCacheConfig(_this10.type));
+                _this10.getCacheProviderObject(_this10.type).set(key, {
+                  value: results,
+                  time: new Date().getTime()
+                }, _this10.getCacheConfig(_this10.type));
               }
             } else {
               results = yield _this10.database.search(_this10.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/bootstrap/cache.js

@@ -3,6 +3,7 @@
 async function connect() {
   try {
     spice.cache_providers = {};
+    spice.monitor = {};
     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

@@ -386,6 +386,23 @@ export default class SpiceModel {
     return false;
   }
 
+  shouldForceRefresh(response) {
+    let monitor_record = _.get(spice.monitor, this.type);
+    if (monitor_record == undefined) {
+      return false;
+    }
+    if (monitor_record > response?.time) {
+      return true;
+    }
+    return false;
+  }
+
+  setMonitor() {
+    let current_time = new Date().getTime();
+    spice.monitor[this.type] = current_time;
+    //console.log("Monitor Set", spice.monitor);
+  }
+
   async get(args) {
     try {
       if (!args) {
@@ -399,21 +416,15 @@ export default class SpiceModel {
           let cached_results = await this.getCacheProviderObject(this.type).get(
             key
           );
-          if (cached_results) {
-            //calculate time taken to get data from Cache
-            results = cached_results;
-
-            /* if (this.type == "user") {
-              console.log("results from Cache", results);
-            } */
-          } else {
+          results = cached_results?.value;
+          if (
+            cached_results?.value == undefined ||
+            this.shouldForceRefresh(cached_results)
+          ) {
             results = await this.database.get(args.id);
-            /* if (this.type == "user") {
-              console.log("results from DB", results);
-            } */
             await this.getCacheProviderObject(this.type).set(
               key,
-              results,
+              { value: results, time: new Date().getTime() },
               this.getCacheConfig(this.type)
             );
           }
@@ -474,13 +485,15 @@ export default class SpiceModel {
           let cached_results = await this.getCacheProviderObject(this.type).get(
             key
           );
-          if (cached_results) {
-            results = cached_results;
-          } else {
+          results = cached_results?.value;
+          if (
+            cached_results?.value == undefined ||
+            this.shouldForceRefresh(cached_results)
+          ) {
             results = await this.database.multi_get(args.ids, true);
             this.getCacheProviderObject(this.type).set(
               key,
-              results,
+              { value: results, time: new Date().getTime() },
               this.getCacheConfig(this.type)
             );
           }
@@ -561,6 +574,8 @@ export default class SpiceModel {
       let db_data = form || this;
 
       await this.database.update(args.id, db_data);
+      this.setMonitor();
+
       if (args.skip_hooks != true) {
         await this.run_hook(
           {
@@ -610,6 +625,7 @@ export default class SpiceModel {
       workingForm = await this.do_serialize(workingForm, "write", {}, args);
 
       let results = await this.database.insert(id, workingForm, args.expiry);
+      this.setMonitor();
       await this.run_hook(
         {
           ...results,
@@ -644,6 +660,7 @@ export default class SpiceModel {
       let delete_response = {};
       if (args.hard) {
         delete_response = await this.database.delete(args.id);
+        this.setMonitor();
       } else {
         delete results["id"];
         results.deleted = true;
@@ -713,13 +730,15 @@ export default class SpiceModel {
             let cached_results = await this.getCacheProviderObject(
               this.type
             ).get(key);
-            if (cached_results) {
-              results = cached_results;
-            } else {
+            results = cached_results?.value;
+            if (
+              cached_results?.value == undefined ||
+              this.shouldForceRefresh(cached_results)
+            ) {
               results = await this.database.query(query);
               this.getCacheProviderObject(this.type).set(
                 key,
-                results,
+                { value: results, time: new Date().getTime() },
                 this.getCacheConfig(this.type)
               );
             }
@@ -733,9 +752,11 @@ export default class SpiceModel {
             let cached_results = await this.getCacheProviderObject(
               this.type
             ).get(key);
-            if (cached_results) {
-              results = cached_results;
-            } else {
+            results = cached_results?.value;
+            if (
+              cached_results?.value == undefined ||
+              this.shouldForceRefresh(cached_results)
+            ) {
               results = await this.database.full_text_search(
                 this.type,
                 query || "",
@@ -744,7 +765,7 @@ export default class SpiceModel {
               );
               this.getCacheProviderObject(this.type).set(
                 key,
-                results,
+                { value: results, time: new Date().getTime() },
                 this.getCacheConfig(this.type)
               );
             }
@@ -761,9 +782,11 @@ export default class SpiceModel {
             let cached_results = await this.getCacheProviderObject(
               this.type
             ).get(key);
-            if (cached_results) {
-              results = cached_results;
-            } else {
+            results = cached_results?.value;
+            if (
+              cached_results?.value == undefined ||
+              this.shouldForceRefresh(cached_results)
+            ) {
               results = await this.database.search(
                 this.type,
                 args.columns || "",
@@ -776,7 +799,7 @@ export default class SpiceModel {
               );
               this.getCacheProviderObject(this.type).set(
                 key,
-                results,
+                { value: results, time: new Date().getTime() },
                 this.getCacheConfig(this.type)
               );
             }