ti2 1.0.66 → 1.0.68

package/cache.js

@@ -11,12 +11,13 @@ const save = async ({
   value,
   ttl = defaultTTL,
 }) => {
-  const key = `${pluginName}:${keyParam}`;
-  const keyType = typeof value === 'string';
-  await cache.set(key, JSON.stringify({
-    keyType,
-    value: keyType === 'string' ? value : JSON.stringify(value),
-  }));
+  const key = `${pluginName}:${(() => {
+    if (typeof keyParam !== 'string') {
+      return hash(keyParam);
+    }
+    return keyParam;
+  })()}`;
+  await cache.set(key, JSON.stringify(value));
   await cache.expire(key, ttl);
 };
 
@@ -24,14 +25,15 @@ const get = async ({
   pluginName,
   key: keyParam,
 }) => {
-  const key = `${pluginName}:${keyParam}`;
+  const key = `${pluginName}:${(() => {
+    if (typeof keyParam !== 'string') {
+      return hash(keyParam);
+    }
+    return keyParam;
+  })()}`;
   const storeVal = await cache.get(key);
   if (!storeVal) return storeVal;
-  const { keyType, value } = JSON.parse(storeVal);
-  if (keyType === 'string') {
-    return value;
-  }
-  return JSON.parse(value);
+  return JSON.parse(storeVal);
 };
 
 const getOrExec = async ({
@@ -41,7 +43,15 @@ const getOrExec = async ({
   fn,
   fnParams,
 }) => {
-  const key = keyParam || hash({ fn, fnParams });
+  const key = (() => {
+    if (!keyParam) {
+      return hash({ fn, fnParams });
+    }
+    if (typeof keyParam !== 'string') {
+      return hash(keyParam);
+    }
+    return keyParam;
+  })();
   let value = await get({ pluginName, key });
   if (value !== null) return value;
   value = await fn(...fnParams);
@@ -60,7 +70,15 @@ const drop = async ({
   fn,
   fnParams,
 }) => {
-  let key = keyParam || hash({ fn, fnParams });
+  const key = `${pluginName}:${(() => {
+    if (!keyParam) {
+      return hash({ fn, fnParams });
+    }
+    if (typeof keyParam !== 'string') {
+      return hash(keyParam);
+    }
+    return keyParam;
+  })()}`;
   key = `${pluginName}:${key}`;
   await cache.del(key);
 };

package/controllers/user.js

@@ -24,6 +24,7 @@ const getAllFuncs = toCheck => {
 
   return props.sort().filter((e, i, arr) => {
     try {
+      if (e === 'cache') return false;
       if (e !== arr[i + 1] && typeof toCheck[e] === 'function') return true;
     } catch {
       return undefined;

package/index.js

@@ -79,8 +79,14 @@ module.exports = async ({
       params[nuName] = value;
     });
     const pluginInstance = await new Plugin({
-      name: pluginName,
+      cache: {
+        drop: args => cache.getOrExec({ ...args, pluginName }),
+        get: args => cache.getOrExec({ ...args, pluginName }),
+        getOrExec: args => cache.getOrExec({ ...args, pluginName }),
+        save: args => cache.getOrExec({ ...args, pluginName }),
+      },
       events: ti2Events,
+      name: pluginName,
       ...params,
     });
     return pluginInstance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2",
-  "version": "1.0.66",
+  "version": "1.0.68",
   "description": "Tourist Industry Exchange (TI2)",
   "main": "index.js",
   "scripts": {