@less-is-more/less-js 1.4.27-8 → 1.4.28-0

package/package.json

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

package/src/cache.js

@@ -1,5 +1,6 @@
 const Redis = require("./redis");
 const Param = require("./param");
+const zlib = require("zlib");
 
 module.exports = class Cache {
   /**
@@ -37,9 +38,10 @@ module.exports = class Cache {
    * @param {number} timeSecond 缓存时间
    * @param {*} args 直接传arguments，用于拼接缓存key
    * @param {function} fn 没有缓存的实现
+   * @param {boolean} zip 是否压缩
    * @returns 优先返回对象
    */
-  static async auto(keyPrefix, timeSecond, args, fn) {
+  static async auto(keyPrefix, timeSecond, args, fn, zip = false) {
     let fullKey = keyPrefix;
     for (let i = 0; i < args.length; i++) {
       fullKey += ":" + args[i].toString();
@@ -57,7 +59,7 @@ module.exports = class Cache {
               "setex",
               fullKey,
               timeSecond + "",
-              JSON.stringify(result)
+              zip ? await _zip(JSON.stringify(result)) : JSON.stringify(result)
             );
           }
         } else {
@@ -65,13 +67,16 @@ module.exports = class Cache {
             "setex",
             fullKey,
             timeSecond + "",
-            result.toString()
+            zip ? await Cache._zip(result.toString()) : result.toString()
           );
         }
         return result;
       }
     } else {
       console.log("Found cache", fullKey);
+      if (zip) {
+        savedData = await Cache._unzip(savedData);
+      }
       // 优先转成json
       if (savedData.startsWith("{") || savedData.startsWith("[")) {
         return JSON.parse(savedData);
@@ -81,6 +86,17 @@ module.exports = class Cache {
     }
   }
 
+  static async _zip(text) {
+    const zipData = zlib.deflateSync(text).toString("base64");
+    return zipData;
+  }
+
+  static async _unzip(base64) {
+    const buffer = Buffer.from(base64, "base64");
+    const text = zlib.inflateSync(buffer).toString();
+    return text;
+  }
+
   static setWebCache(res, expireSecond) {
     res.setHeader("Cache-Control", "max-age=" + expireSecond);
   }

package/src/router.js

@@ -13,32 +13,38 @@ module.exports = class Router {
    * @param {object} targets 路由表。支持before和after，如果提供了会在执行主方法前后执行。需要async的方法。并且before返回值为Ret，如果不为true，会直接返回
    * @param {*} event 事件载体
    * @param {*} context 系统属性
-   * @param {*} callback 回调
    * @returns 设置了useDefaultFormat为true，会返回错误信息
    */
-  static async routeEvent(targets, event, context, callback) {
+  static async routeEvent(targets, event, context) {
     const eventObj = JSON.parse(event.toString());
     const req = {
       path: eventObj.rawPath,
+      method: eventObj.requestContext.http.method,
+      sourceIp: eventObj.requestContext.http.sourceIp,
       queries: eventObj.queryParameters,
       headers: eventObj.headers,
-      body: eventObj.body,
+      body: eventObj.isBase64Encoded
+        ? Buffer.from(eventObj.body, "base64").toString("utf-8")
+        : eventObj.body,
       isBase64Encoded: eventObj.isBase64Encoded,
     };
+    // 格式兼容
+    if (req.headers) {
+      req.headers["content-type"] = req.headers["Content-Type"];
+    }
     let res = {
+      content: "",
       send: function (content) {
         this.content = content;
       },
-      content: "",
     };
     // 转换后调用原来的方法
-    const result = this.route(targets, req, res, context);
-    const finalResponse = {
-      headers: Object.assign(result.headers || {}, event.resHeaders || {}),
-      body: res.content,
+    await this.route(targets, req, res, context);
+    return {
+      statusCode: 200,
+      headers: Object.assign(res.headers || {}, event.resHeaders || {}),
+      body: res.content.startsWith("{") ? JSON.parse(res.content) : res.content,
     };
-
-    callback(null, finalResponse);
   }
 
   /**
@@ -58,7 +64,9 @@ module.exports = class Router {
       "p:",
       req.method,
       req.path,
-      req.headers ? req.headers["content-type"] : "",
+      req.headers
+        ? req.headers["content-type"] || req.headers["Content-Type"]
+        : "",
       "q:",
       req.queries ? qs.stringify(req.queries).substring(0, 500) : "",
       "b:",
@@ -136,7 +144,7 @@ module.exports = class Router {
       if (isFile) {
         await this._getFile(req);
       } else if (isJson) {
-        const data = await promisify(body)(req);
+        const data = req.body || (await promisify(body)(req));
         if (!Param.isBlank(data)) {
           try {
             req.sourceBody = data.toString();
@@ -146,7 +154,7 @@ module.exports = class Router {
           }
         }
       } else {
-        const data = await promisify(body)(req);
+        const data = req.body || (await promisify(body)(req));
         req.sourceBody = decodeURIComponent(data.toString());
         req.body = qs.parse(data.toString());
       }

package/test/test-cache.js

@@ -103,5 +103,42 @@ describe("cache.js", () => {
       console.log("result", JSON.stringify(result));
       assert(result.success === false);
     });
+
+    it("auto base64", async () => {
+      let a = 1,
+        b = 2;
+      let result = await Cache.auto(
+        "test",
+        20,
+        [],
+        async () => {
+          console.log(a + b);
+          return a + b + "";
+        },
+        true
+      );
+      console.log("result", result);
+      assert(result === "3");
+    });
+
+    it("auto long text base64", async () => {
+      let result = await Cache.auto(
+        "test",
+        20,
+        [],
+        async () => {
+          let text = "";
+          // 循环1000次
+          for (let i = 0; i < 1000; i++) {
+            text += "a";
+          }
+          console.log(text);
+          return text;
+        },
+        true
+      );
+      console.log("result", result);
+      assert(result === "3");
+    });
   });
 });