@less-is-more/less-js 1.4.27-17 → 1.4.27-2

package/package.json

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

package/src/router.js

@@ -4,6 +4,7 @@ const qs = require("qs");
 const body = require("body");
 const multiparty = require("multiparty");
 const { promisify } = require("util");
+const { log } = require("console");
 
 module.exports = class Router {
   static #defaultFormat = true;
@@ -13,38 +14,35 @@ 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) {
-    const eventObj = JSON.parse(event.toString());
+  static async routeEvent(targets, event, context, callback) {
+    log("event:", event);
+    const eventObj = JSON.parse(event);
     const req = {
       path: eventObj.rawPath,
-      method: eventObj.requestContext.http.method,
-      sourceIp: eventObj.requestContext.http.sourceIp,
-      queries: eventObj.queryParameters,
+      queries: Param.isBlank(rawQueryString)
+        ? {}
+        : qs.parse(eventObj.rawQueryString),
       headers: eventObj.headers,
-      body: eventObj.isBase64Encoded
-        ? Buffer.from(eventObj.body, "base64").toString("utf-8")
-        : eventObj.body,
+      body: eventObj.body,
       isBase64Encoded: eventObj.isBase64Encoded,
     };
-    // 格式兼容
-    if (req.headers) {
-      req.headers["content-type"] = req.headers["Content-Type"];
-    }
     let res = {
-      content: "",
-      send: function (content) {
+      send: (content) => {
         this.content = content;
       },
+      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,
+    const result = this.route(targets, req, res, context);
+    const finalResponse = {
+      headers: Object.assign(result.headers, event.resHeaders),
+      body: res.content,
     };
+
+    callback(null, finalResponse);
   }
 
   /**
@@ -64,9 +62,7 @@ module.exports = class Router {
       "p:",
       req.method,
       req.path,
-      req.headers
-        ? req.headers["content-type"] || req.headers["Content-Type"]
-        : "",
+      req.headers ? req.headers["content-type"] : "",
       "q:",
       req.queries ? qs.stringify(req.queries).substring(0, 500) : "",
       "b:",
@@ -144,7 +140,7 @@ module.exports = class Router {
       if (isFile) {
         await this._getFile(req);
       } else if (isJson) {
-        const data = req.body || (await promisify(body)(req));
+        const data = await promisify(body)(req);
         if (!Param.isBlank(data)) {
           try {
             req.sourceBody = data.toString();
@@ -154,7 +150,7 @@ module.exports = class Router {
           }
         }
       } else {
-        const data = req.body || (await promisify(body)(req));
+        const data = await promisify(body)(req);
         req.sourceBody = decodeURIComponent(data.toString());
         req.body = qs.parse(data.toString());
       }