@less-is-more/less-js 1.4.33-0 → 1.4.33-2

package/package.json

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

package/src/cache.js

@@ -50,33 +50,28 @@ module.exports = class Cache {
     if (savedData == null) {
       let result = await fn();
       if (!Param.isBlank(result)) {
+        let redisContent = "";
         // 处理JSON
         if (result instanceof Object) {
           if (result.success === false) {
             console.log("Do not cache fail result");
           } else {
-            await Redis.exec(
-              "setex",
-              fullKey,
-              timeSecond + "",
-              zip ? Cache._zip(JSON.stringify(result)) : JSON.stringify(result)
-            );
+            redisContent = JSON.stringify(result);
           }
         } else {
-          await Redis.exec(
-            "setex",
-            fullKey,
-            timeSecond + "",
-            zip ? Cache._zip(result.toString()) : result.toString()
-          );
+          redisContent = result.toString();
+        }
+        if (redisContent != "") {
+          if (Cache._needZip(redisContent, zip)) {
+            redisContent = Cache._zip(redisContent);
+          }
+          await Redis.exec("setex", fullKey, timeSecond + "", redisContent);
         }
         return result;
       }
     } else {
       console.log("Found cache", fullKey);
-      if (zip) {
-        savedData = Cache._unzip(savedData);
-      }
+      savedData = Cache._unzip(savedData);
       // 优先转成json
       if (savedData.startsWith("{") || savedData.startsWith("[")) {
         return JSON.parse(savedData);
@@ -87,18 +82,28 @@ module.exports = class Cache {
   }
 
   static _zip(text) {
-    const zipData = zlib
-      .gzipSync(Buffer.from(text, "utf-8"))
-      .toString("base64");
-    return zipData;
+    const zipData = zlib.gzipSync(Buffer.from(text));
+    return zipData.toString("base64");
   }
 
-  static _unzip(base64) {
-    const buffer = Buffer.from(base64, "base64");
-    const text = zlib.gunzipSync(buffer).toString();
+  static _unzip(content) {
+    // 判断content是否是buffer
+    let text = "";
+    const buffer = Buffer.from(content, "base64");
+    // 判断是否gzip
+    if (buffer.length > 2 && buffer[0] === 0x1f && buffer[1] === 0x8b) {
+      console.log("unzip");
+      text = zlib.gunzipSync(buffer).toString();
+    } else {
+      text = content;
+    }
     return text;
   }
 
+  static _needZip(text, zip) {
+    return zip || Buffer.byteLength(text) / 1024 > 1;
+  }
+
   static setWebCache(res, expireSecond) {
     res.setHeader("Cache-Control", "max-age=" + expireSecond);
   }

package/test/test-cache.js

@@ -140,5 +140,19 @@ describe("cache.js", () => {
       console.log("result", result);
       assert(result === "3");
     });
+
+    it("auto long text default zip", async () => {
+      let text = "";
+      // 循环1000次
+      for (let i = 0; i < 2000; i++) {
+        text += "a";
+      }
+      console.log(text);
+      let result = await Cache.auto("test", 20, [], async () => {
+        return text;
+      });
+      console.log("result", result);
+      assert(result === text);
+    });
   });
 });