@less-is-more/less-js 1.4.36 → 1.4.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@less-is-more/less-js",
-  "version": "1.4.36",
+  "version": "1.4.37",
   "description": "Fast develop kit for nodejs",
   "main": "src/index.js",
   "scripts": {

package/src/cache.js

@@ -46,7 +46,18 @@ module.exports = class Cache {
     for (let i = 0; i < args.length; i++) {
       fullKey += ":" + args[i].toString();
     }
-    let savedData = await Redis.exec("get", fullKey);
+    // 先从本地缓存取
+    let savedData = Cache._getLocal(fullKey);
+    let hasLocal = false;
+    if (Param.isBlank(savedData)) {
+      savedData = await Redis.exec("get", fullKey);
+      if (!Param.isBlank(savedData)) {
+        // 本地缓存1分钟
+        Cache._setLocal(fullKey, savedData, 60000);
+      }
+    } else {
+      hasLocal = true;
+    }
     if (savedData == null) {
       let result = await fn();
       if (!Param.isBlank(result)) {
@@ -66,11 +77,13 @@ module.exports = class Cache {
             redisContent = Cache._zip(redisContent);
           }
           await Redis.exec("setex", fullKey, timeSecond + "", redisContent);
+          // 本地缓存1分钟
+          Cache._setLocal(fullKey, redisContent, 60000);
         }
         return result;
       }
     } else {
-      console.log("Found cache", fullKey);
+      console.log("Found cache" + (hasLocal ? " local" : ""), fullKey);
       savedData = Cache._unzip(savedData);
       // 优先转成json
       if (savedData.startsWith("{") || savedData.startsWith("[")) {
@@ -106,4 +119,24 @@ module.exports = class Cache {
   static setWebCache(res, expireSecond) {
     res.setHeader("Cache-Control", "max-age=" + expireSecond);
   }
+
+  // 本地缓存
+  static localCache = {};
+
+  static _setLocal(key, value, ttl) {
+    const expireTime = ttl ? Date.now() + ttl : null;
+    Cache.localCache[key] = { value, expireTime };
+  }
+
+  static _getLocal(key) {
+    const item = Cache.localCache[key];
+    if (!item) return null;
+
+    if (item.expireTime && Date.now() > item.expireTime) {
+      delete Cache.localCache[key];
+      return null;
+    }
+
+    return item.value;
+  }
 };

package/test/test-cache.js

@@ -154,5 +154,19 @@ describe("cache.js", () => {
       console.log("result", result);
       assert(result === text);
     });
+
+    it("local cache", async () => {
+      async function test(a, b) {
+        return await Cache.auto("test3", 20, arguments, () => {
+          console.log(a, b);
+          return { a, b };
+        });
+      }
+      const result = await test(1, 2);
+      console.log("cache", Cache.localCache);
+      console.log("result", JSON.stringify(result));
+      const compare = { a: 1, b: 2 };
+      assert(result.a === compare.a);
+    });
   });
 });