@midwayjs/faas 3.4.0-beta.1 → 3.4.0-beta.4

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2013 - Now midwayjs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/framework.d.ts

@@ -15,6 +15,7 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
     private server;
     private respond;
     private applicationAdapter;
+    private serverlessFunctionService;
     protected httpMiddlewareManager: ContextMiddlewareManager<Context, unknown, unknown>;
     protected eventMiddlewareManager: ContextMiddlewareManager<Context, unknown, unknown>;
     environmentService: MidwayEnvironmentService;
@@ -29,15 +30,7 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
      * @param handlerMapping
      */
     handleInvokeWrapper(handlerMapping: string): (...args: any[]) => Promise<any>;
-    getTriggerFunction(handlerMapping: string): (context: any, options: HandlerOptions) => Promise<{
-        result: any;
-        error: Error;
-    } | {
-        isBase64Encoded: boolean;
-        statusCode: any;
-        headers: any;
-        body: any;
-    }>;
+    getTriggerFunction(handlerMapping: string): (context: any, options: HandlerOptions) => Promise<any>;
     wrapHttpRequest(req: http.IncomingMessage, res?: http.ServerResponse): Promise<unknown>;
     /**
      * @deprecated

package/dist/framework.js

@@ -15,6 +15,8 @@ const decorator_1 = require("@midwayjs/decorator");
 const simple_lock_1 = require("@midwayjs/simple-lock");
 const logger_1 = require("@midwayjs/logger");
 const serverless_http_parser_1 = require("@midwayjs/serverless-http-parser");
+const util_1 = require("util");
+const { isAnyArrayBuffer, isUint8Array } = util_1.types;
 const LOCK_KEY = '_faas_starter_start_key';
 let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework {
     constructor() {
@@ -109,8 +111,8 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             // set app keys
             this.app['keys'] = (_a = this.configService.getConfiguration('keys')) !== null && _a !== void 0 ? _a : '';
             // store all http function entry
-            const collector = new core_1.ServerlessTriggerCollector();
-            const functionList = await collector.getFunctionList();
+            this.serverlessFunctionService = await this.applicationContext.getAsync(core_1.MidwayServerlessFunctionService);
+            const functionList = await this.serverlessFunctionService.getFunctionList();
             for (const funcInfo of functionList) {
                 // store handler
                 this.funMappingStore.set(funcInfo.funcHandlerName, funcInfo);
@@ -160,7 +162,13 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                         // invoke handler
                         const result = await this.invokeHandler(funOptions, ctx, args, isHttpFunction);
                         if (isHttpFunction && result !== undefined) {
-                            ctx.body = result;
+                            if (result === null) {
+                                // 这样设置可以绕过 koa 的 _explicitStatus 赋值机制
+                                ctx.response._body = null;
+                            }
+                            else {
+                                ctx.body = result;
+                            }
                         }
                         return result;
                     },
@@ -207,9 +215,18 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                         // invoke handler
                         const result = await this.invokeHandler(funOptions, ctx, args, isHttpFunction);
                         if (isHttpFunction && result !== undefined) {
-                            ctx.body = result;
+                            if (result === null) {
+                                // 这样设置可以绕过 koa 的 _explicitStatus 赋值机制
+                                ctx.response._body = null;
+                            }
+                            else {
+                                ctx.body = result;
+                            }
+                        }
+                        // http 靠 ctx.body，否则会出现状态码不正确的问题
+                        if (!isHttpFunction) {
+                            return result;
                         }
-                        return result;
                     },
                 ], this.app);
                 return await fn(ctx, next);
@@ -230,13 +247,13 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                     }
                     context.body = data;
                 }
-                else if (Buffer.isBuffer(data)) {
+                else if (isAnyArrayBuffer(data) || isUint8Array(data)) {
                     encoded = true;
                     if (!context.type) {
                         context.type = 'application/octet-stream';
                     }
                     // data is reserved as buffer
-                    context.body = data.toString('base64');
+                    context.body = Buffer.from(data).toString('base64');
                 }
                 else if (typeof data === 'object') {
                     if (!context.type) {
@@ -252,6 +269,13 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                     // set data to string
                     context.body = data = data + '';
                 }
+                // middleware return value and will be got 204 status
+                if (context.body === undefined &&
+                    !context.response._explicitStatus &&
+                    context._matchedRoute) {
+                    // 如果进了路由，重新赋值，防止 404
+                    context.body = undefined;
+                }
                 return {
                     isBase64Encoded: encoded,
                     statusCode: context.status,

package/dist/interface.d.ts

@@ -61,6 +61,7 @@ export interface IWebMiddleware {
 }
 export interface ServerlessStarterOptions extends IMidwayBootstrapOptions {
     initializeMethodName?: string;
+    handlerName?: string;
     createAdapter?: () => Promise<{
         close(): any;
         createAppHook(app?: any): any;

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@midwayjs/faas",
-  "version": "3.4.0-beta.1",
+  "version": "3.4.0-beta.4",
   "main": "dist/index",
   "typings": "index.d.ts",
   "dependencies": {
-    "@midwayjs/core": "^3.4.0-beta.1",
+    "@midwayjs/core": "^3.4.0-beta.4",
     "@midwayjs/faas-typings": "^3.3.5",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/serverless-http-parser": "^3.3.5",
+    "@midwayjs/serverless-http-parser": "^3.4.0-beta.4",
     "@midwayjs/simple-lock": "^1.1.4"
   },
   "devDependencies": {
-    "@midwayjs/decorator": "^3.4.0-beta.1",
-    "@midwayjs/mock": "^3.4.0-beta.1",
-    "@midwayjs/serverless-fc-starter": "^3.4.0-beta.1",
-    "@midwayjs/serverless-scf-starter": "^3.3.5",
+    "@midwayjs/decorator": "^3.4.0-beta.4",
+    "@midwayjs/mock": "^3.4.0-beta.4",
+    "@midwayjs/serverless-fc-starter": "^3.4.0-beta.4",
+    "@midwayjs/serverless-scf-starter": "^3.4.0-beta.4",
     "mm": "3.2.0"
   },
   "engines": {
@@ -46,5 +46,5 @@
     "url": "git@github.com:midwayjs/midway.git"
   },
   "license": "MIT",
-  "gitHead": "a603d2348d6141f8f723901498f03a162a037708"
+  "gitHead": "3b686101f7802f87d47b8c9d25561339d556e573"
 }