spice-js 2.6.55 → 2.6.57

package/build/cache/providers/SpiceCache.js

@@ -8,6 +8,13 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 var NodeCache = require("node-cache");
 
+var crypto = require("crypto");
+
+function generateCacheKey(input) {
+  // Create an MD5 hash of the input string and return it in hexadecimal format
+  return crypto.createHash("md5").update(input).digest("hex");
+}
+
 module.exports = class SpiceCache {
   constructor(args) {
     if (args === void 0) {
@@ -45,9 +52,9 @@ module.exports = class SpiceCache {
         ttl,
         namespace = ""
       } = working_options;
-      if (value === undefined) return console.log("Value is undefined");
+      var workingKey = namespace + key;
 
-      _this2.client.set(namespace + key, value, ttl || 60);
+      _this2.client.set(generateCacheKey(workingKey), value, ttl == undefined ? 60 : ttl);
     })();
   }
 
@@ -60,7 +67,12 @@ module.exports = class SpiceCache {
       }
 
       try {
-        return _this3.client.get(key);
+        var {
+          namespace = ""
+        } = options;
+        var workingKey = namespace + key;
+        var cacheKey = generateCacheKey(workingKey);
+        return _this3.client.get(cacheKey);
       } catch (e) {
         return null;
       }
@@ -71,7 +83,8 @@ module.exports = class SpiceCache {
     var _this4 = this;
 
     return _asyncToGenerator(function* () {
-      return yield _this4.client.has(key);
+      var cacheKey = generateCacheKey(key);
+      return yield _this4.client.has(cacheKey);
     })();
   }
 

package/build/models/SpiceModel.js

@@ -929,10 +929,6 @@ class SpiceModel {
   }
 
   filterResultsByColumns(data, columns) {
-    if (this.type === "user") {
-      console.log("Filter Columns::", columns);
-    }
-
     if (columns && columns !== "") {
       // Remove backticks and replace meta().id with id
       var cleanedColumns = columns.replace(/`/g, "").replace(/meta\(\)\.id/g, "id"); // Process each column by splitting on comma and trimming
@@ -1126,12 +1122,17 @@ class SpiceModel {
         if (_this12.shouldUseCache(_this12.type)) {
           var cachedResults = yield _this12.getCacheProviderObject(_this12.type).get(cacheKey);
           results = cachedResults == null ? void 0 : cachedResults.value;
-          if ((cachedResults == null ? void 0 : cachedResults.value) === undefined) if (!results || (yield _this12.shouldForceRefresh(cachedResults))) {
+
+          if ((cachedResults == null ? void 0 : cachedResults.value) === undefined) {
             results = yield _this12.fetchResults(args, query);
-            yield _this12.getCacheProviderObject(_this12.type).set(cacheKey, {
-              value: results,
-              time: new Date().getTime()
-            }, _this12.getCacheConfig(_this12.type));
+          } else {
+            if (!results || (yield _this12.shouldForceRefresh(cachedResults))) {
+              results = yield _this12.fetchResults(args, query);
+              yield _this12.getCacheProviderObject(_this12.type).set(cacheKey, {
+                value: results,
+                time: new Date().getTime()
+              }, _this12.getCacheConfig(_this12.type));
+            }
           }
         } else {
           results = yield _this12.fetchResults(args, query);
@@ -1141,8 +1142,6 @@ class SpiceModel {
           results.data = yield _this12.do_serialize(results.data, "read", {}, args, (yield _this12.propsToBeRemoved(results.data)));
         }
 
-        if (_this12.type == "user") console.log("results", results.data);
-
         if (args.skip_hooks !== true) {
           yield _this12.run_hook(results.data, "list", "after");
         }

package/package.json

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

package/src/cache/providers/SpiceCache.js

@@ -1,4 +1,11 @@
 const NodeCache = require("node-cache");
+const crypto = require("crypto");
+
+function generateCacheKey(input) {
+  // Create an MD5 hash of the input string and return it in hexadecimal format
+  return crypto.createHash("md5").update(input).digest("hex");
+}
+
 module.exports = class SpiceCache {
   constructor(args = {}) {
     this.options = args;
@@ -12,19 +19,27 @@ module.exports = class SpiceCache {
   async set(key, value, options = {}) {
     let working_options = { ...this.options, ...options };
     const { ttl, namespace = "" } = working_options;
-    if (value === undefined) return console.log("Value is undefined");
-    this.client.set(namespace + key, value, ttl || 60);
+    const workingKey = namespace + key;
+    this.client.set(
+      generateCacheKey(workingKey),
+      value,
+      ttl == undefined ? 60 : ttl
+    );
   }
 
   async get(key, options = {}) {
     try {
-      return this.client.get(key);
+      const { namespace = "" } = options;
+      const workingKey = namespace + key;
+      const cacheKey = generateCacheKey(workingKey);
+      return this.client.get(cacheKey);
     } catch (e) {
       return null;
     }
   }
 
   async exists(key) {
-    return await this.client.has(key);
+    const cacheKey = generateCacheKey(key);
+    return await this.client.has(cacheKey);
   }
 };

package/src/models/SpiceModel.js

@@ -838,9 +838,6 @@ export default class SpiceModel {
   }
 
   filterResultsByColumns(data, columns) {
-    if (this.type === "user") {
-      console.log("Filter Columns::", columns);
-    }
     if (columns && columns !== "") {
       // Remove backticks and replace meta().id with id
       const cleanedColumns = columns
@@ -1065,7 +1062,9 @@ export default class SpiceModel {
         );
         results = cachedResults?.value;
 
-        if (cachedResults?.value === undefined)
+        if (cachedResults?.value === undefined) {
+          results = await this.fetchResults(args, query);
+        } else {
           if (!results || (await this.shouldForceRefresh(cachedResults))) {
             results = await this.fetchResults(args, query);
             await this.getCacheProviderObject(this.type).set(
@@ -1074,6 +1073,7 @@ export default class SpiceModel {
               this.getCacheConfig(this.type)
             );
           }
+        }
       } else {
         results = await this.fetchResults(args, query);
       }
@@ -1088,8 +1088,6 @@ export default class SpiceModel {
         );
       }
 
-      if (this.type == "user") console.log("results", results.data);
-
       if (args.skip_hooks !== true) {
         await this.run_hook(results.data, "list", "after");
       }