@less-is-more/less-js 1.4.27-1 → 1.4.27-11

package/package.json

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

package/src/router.js

@@ -13,34 +13,30 @@ 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) {
-    const eventObj = JSON.parse(event);
+  static async routeEvent(targets, event, context) {
+    const eventObj = JSON.parse(event.toString());
     const req = {
       path: eventObj.rawPath,
-      queries: Param.isBlank(rawQueryString)
-        ? {}
-        : qs.parse(eventObj.rawQueryString),
+      queries: eventObj.queryParameters,
       headers: eventObj.headers,
       body: eventObj.body,
       isBase64Encoded: eventObj.isBase64Encoded,
     };
     let res = {
-      send: (content) => {
+      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,
+    const result = await this.route(targets, req, res, context);
+    return {
+      statusCode: 200,
+      headers: Object.assign(result.headers || {}, event.resHeaders || {}),
+      body: res.content.startsWith("{") ? JSON.parse(res.content) : res.content,
     };
-
-    callback(null, finalResponse);
   }
 
   /**