@midwayjs/faas 3.3.6-beta.4 → 3.4.0-beta.2

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/config.default.d.ts

@@ -1,7 +1,7 @@
 export declare const midwayLogger: {
     default: {
-        disableFile: boolean;
-        disableError: boolean;
+        enableFile: boolean;
+        enableError: boolean;
         printFormat: (info: any) => string;
     };
 };

package/dist/config.default.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.midwayLogger = void 0;
 exports.midwayLogger = {
     default: {
-        disableFile: true,
-        disableError: true,
+        enableFile: false,
+        enableError: false,
         printFormat: (info) => {
             var _a, _b, _c, _d, _e, _f;
             const requestId = (_f = (_c = (_b = (_a = info.ctx) === null || _a === void 0 ? void 0 : _a['originContext']) === null || _b === void 0 ? void 0 : _b['requestId']) !== null && _c !== void 0 ? _c : (_e = (_d = info.ctx) === null || _d === void 0 ? void 0 : _d['originContext']) === null || _e === void 0 ? void 0 : _e['request_id']) !== null && _f !== void 0 ? _f : '';

package/dist/framework.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Context, IFaaSConfigurationOptions, Application, NextFunction } from './interface';
+import { Context, IFaaSConfigurationOptions, Application, NextFunction, HandlerOptions } from './interface';
 import { BaseFramework, CommonMiddlewareUnion, ContextMiddlewareManager, FunctionMiddleware, IMidwayBootstrapOptions, MidwayEnvironmentService, MidwayFrameworkType, MidwayMiddlewareService, RouterInfo } from '@midwayjs/core';
 import { LoggerOptions } from '@midwayjs/logger';
 import * as http from 'http';
@@ -15,6 +15,7 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
     private server;
     private respond;
     private applicationAdapter;
+    private webRouterService;
     protected httpMiddlewareManager: ContextMiddlewareManager<Context, unknown, unknown>;
     protected eventMiddlewareManager: ContextMiddlewareManager<Context, unknown, unknown>;
     environmentService: MidwayEnvironmentService;
@@ -24,7 +25,12 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
     applicationInitialize(options: IMidwayBootstrapOptions): Promise<void>;
     run(): Promise<void>;
     getFrameworkType(): MidwayFrameworkType;
-    handleInvokeWrapper(handlerMapping: string): (...args: any[]) => Promise<{
+    /**
+     * @deprecated
+     * @param handlerMapping
+     */
+    handleInvokeWrapper(handlerMapping: string): (...args: any[]) => Promise<any>;
+    getTriggerFunction(handlerMapping: string): (context: any, options: HandlerOptions) => Promise<{
         result: any;
         error: Error;
     } | {
@@ -33,6 +39,7 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
         headers: any;
         body: any;
     }>;
+    wrapHttpRequest(req: http.IncomingMessage, res?: http.ServerResponse): Promise<unknown>;
     /**
      * @deprecated
      * @param middlewareId
@@ -48,6 +55,7 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
     useMiddleware(middleware: CommonMiddlewareUnion<Context, NextFunction, undefined>): void;
     useEventMiddleware(middleware: CommonMiddlewareUnion<Context, NextFunction, undefined>): void;
     getEventMiddleware(): ContextMiddlewareManager<Context, NextFunction, undefined>;
+    getAllHandlerNames(): string[];
 }
 export declare const createModuleServerlessFramework: (globalOption: Omit<IMidwayBootstrapOptions, 'applicationContext'> & IFaaSConfigurationOptions) => Promise<MidwayFaaSFramework>;
 //# sourceMappingURL=framework.d.ts.map

package/dist/framework.js

@@ -15,7 +15,6 @@ 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 http = require("http");
 const LOCK_KEY = '_faas_starter_start_key';
 let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework {
     constructor() {
@@ -44,13 +43,14 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         return !this.developmentRun;
     }
     async applicationInitialize(options) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!this.logger) {
             this.logger = options.logger || logger_1.loggers.getLogger('appLogger');
         }
-        this.applicationAdapter = this.configurationOptions.applicationAdapter;
+        this.applicationAdapter =
+            this.configurationOptions.applicationAdapter || {};
         this.app =
-            ((_a = this.applicationAdapter) === null || _a === void 0 ? void 0 : _a.getApplication()) ||
+            ((_b = (_a = this.applicationAdapter).getApplication) === null || _b === void 0 ? void 0 : _b.call(_a)) ||
                 new serverless_http_parser_1.Application();
         this.defineApplicationProperties({
             /**
@@ -68,29 +68,53 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             },
             getFunctionName: () => {
                 var _a;
-                return (_a = this.configurationOptions.applicationAdapter) === null || _a === void 0 ? void 0 : _a.getFunctionName();
+                return (process.env.MIDWAY_SERVERLESS_FUNCTION_NAME ||
+                    ((_a = this.configurationOptions.applicationAdapter) === null || _a === void 0 ? void 0 : _a.getFunctionName()) ||
+                    '');
             },
+            /**
+             * get function service/group in runtime
+             */
             getFunctionServiceName: () => {
                 var _a;
-                return (_a = this.configurationOptions.applicationAdapter) === null || _a === void 0 ? void 0 : _a.getFunctionServiceName();
+                return (process.env.MIDWAY_SERVERLESS_SERVICE_NAME ||
+                    ((_a = this.configurationOptions.applicationAdapter) === null || _a === void 0 ? void 0 : _a.getFunctionServiceName()) ||
+                    '');
+            },
+            useEventMiddleware: middleware => {
+                return this.useEventMiddleware(middleware);
+            },
+            getEventMiddleware: () => {
+                return this.getEventMiddleware();
+            },
+            getServerlessInstance: (serviceClass) => {
+                return this.app
+                    .createAnonymousContext()
+                    .requestContext.getAsync(serviceClass);
+            },
+            getTriggerFunction: (handlerMapping) => {
+                return this.getTriggerFunction(handlerMapping);
             },
-            useEventMiddleware: () => { },
         });
         // hack use method
         this.app.originUse = this.app.use;
         this.app.use = this.app.useMiddleware;
-        if ((_b = this.configurationOptions.applicationAdapter) === null || _b === void 0 ? void 0 : _b.runAppHook) {
+        if ((_c = this.configurationOptions.applicationAdapter) === null || _c === void 0 ? void 0 : _c.runAppHook) {
             this.configurationOptions.applicationAdapter.runAppHook(this.app);
         }
     }
     async run() {
         return this.lock.sureOnce(async () => {
-            var _a, _b;
+            var _a;
             // 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.webRouterService = await this.applicationContext.getAsync(core_1.MidwayWebRouterService, [
+                {
+                    includeFunctionRouter: true,
+                },
+            ]);
+            const functionList = await this.webRouterService.getFlattenRouterTable();
             for (const funcInfo of functionList) {
                 // store handler
                 this.funMappingStore.set(funcInfo.funcHandlerName, funcInfo);
@@ -103,40 +127,69 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                 }
             }
             this.respond = this.app.callback();
-            if (this.environmentService.isDevelopmentEnvironment()) {
-                const faasConfig = (_b = this.configService.getConfiguration('faas')) !== null && _b !== void 0 ? _b : {};
-                this.server = await new Promise(resolve => {
-                    const server = http.createServer((req, res) => {
-                        const url = new URL(req.url, `http://${req.headers.host}`);
-                        // create event and invoke
-                        this.handleInvokeWrapper(url.pathname)(req, res, {});
-                    });
-                    if (faasConfig['port']) {
-                        server.listen(faasConfig['port']);
-                    }
-                    resolve(server);
-                });
-            }
         }, LOCK_KEY);
     }
     getFrameworkType() {
         return core_1.MidwayFrameworkType.FAAS;
     }
+    /**
+     * @deprecated
+     * @param handlerMapping
+     */
     handleInvokeWrapper(handlerMapping) {
-        let funOptions = this.funMappingStore.get(handlerMapping);
+        const funOptions = this.funMappingStore.get(handlerMapping);
         return async (...args) => {
-            var _a, _b;
             if (args.length === 0) {
                 throw new Error('first parameter must be function context');
             }
-            const event = args[0];
-            const isLegacyMode = event.originContext && event.originEvent;
-            const isHttpFunction = event.constructor.name === 'IncomingMessage' ||
-                event.constructor.name === 'EventEmitter' ||
-                !!(event.headers && event.get);
+            if (!funOptions) {
+                throw new Error(`function handler = ${handlerMapping} not found`);
+            }
+            const context = this.getContext(args.shift());
+            const isHttpFunction = !!(context.headers && context.get);
+            const globalMiddlewareFn = await this.applyMiddleware();
+            const middlewareManager = new core_1.ContextMiddlewareManager();
+            middlewareManager.insertLast(globalMiddlewareFn);
+            middlewareManager.insertLast(async (ctx, next) => {
+                const fn = await this.middlewareService.compose([
+                    ...(isHttpFunction
+                        ? this.httpMiddlewareManager
+                        : this.eventMiddlewareManager),
+                    ...funOptions.controllerMiddleware,
+                    ...funOptions.middleware,
+                    async (ctx, next) => {
+                        if (isHttpFunction) {
+                            args = [ctx];
+                        }
+                        // invoke handler
+                        const result = await this.invokeHandler(funOptions, ctx, args, isHttpFunction);
+                        if (isHttpFunction && result !== undefined) {
+                            if (result === null) {
+                                // 这样设置可以绕过 koa 的 _explicitStatus 赋值机制
+                                ctx.response._body = null;
+                            }
+                            else {
+                                ctx.body = result;
+                            }
+                        }
+                        return result;
+                    },
+                ], this.app);
+                return await fn(ctx, next);
+            });
+            const composeMiddleware = await this.middlewareService.compose(middlewareManager, this.app);
+            return await composeMiddleware(context);
+        };
+    }
+    getTriggerFunction(handlerMapping) {
+        let funOptions = this.funMappingStore.get(handlerMapping);
+        return async (context, options) => {
+            var _a;
+            const isHttpFunction = options.isHttpFunction;
             if (!funOptions && isHttpFunction) {
                 for (const item of this.serverlessRoutes) {
-                    if (item.matchPattern.test(event.path)) {
+                    if (context.method === item.funcInfo['requestMethod'].toUpperCase() &&
+                        item.matchPattern.test(context.path)) {
                         funOptions = item.funcInfo;
                         break;
                     }
@@ -145,19 +198,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             if (!funOptions) {
                 throw new Error(`function handler = ${handlerMapping} not found`);
             }
-            let context;
-            if (isLegacyMode) {
-                context = this.getContext(args.shift());
-            }
-            else if (isHttpFunction) {
-                const newReq = ((_a = this.applicationAdapter) === null || _a === void 0 ? void 0 : _a.runRequestHook(...args)) ||
-                    new serverless_http_parser_1.HTTPRequest(args[0], args[1]);
-                const newRes = new serverless_http_parser_1.HTTPResponse();
-                context = this.getContext(await this.createHttpContext(newReq, newRes));
-            }
-            else {
-                context = this.getContext(await ((_b = this.applicationAdapter) === null || _b === void 0 ? void 0 : _b.runEventHook(...args)));
-            }
+            context = this.getContext(context);
             const result = await (await this.applyMiddleware(async (ctx, next) => {
                 const fn = await this.middlewareService.compose([
                     ...(isHttpFunction
@@ -166,24 +207,34 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                     ...funOptions.controllerMiddleware,
                     ...funOptions.middleware,
                     async (ctx, next) => {
+                        let args;
                         if (isHttpFunction) {
                             args = [ctx];
                         }
+                        else {
+                            args = [options.originEvent, options.originContext];
+                        }
                         // 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);
             }))(context);
-            if (isLegacyMode) {
-                return result;
-            }
-            else if (isHttpFunction) {
-                if (!context.response._explicitStatus) {
+            if (isHttpFunction) {
+                if (!((_a = context.response) === null || _a === void 0 ? void 0 : _a._explicitStatus)) {
                     if (context.body === null || context.body === 'undefined') {
                         context.body = '';
                         context.type = 'text';
@@ -220,6 +271,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,
@@ -232,6 +290,11 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             }
         };
     }
+    async wrapHttpRequest(req, res) {
+        const newReq = res ? new serverless_http_parser_1.HTTPRequest(req, res) : req;
+        const newRes = new serverless_http_parser_1.HTTPResponse();
+        return this.createHttpContext(newReq, newRes);
+    }
     /**
      * @deprecated
      * @param middlewareId
@@ -325,6 +388,9 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
     getEventMiddleware() {
         return this.eventMiddlewareManager;
     }
+    getAllHandlerNames() {
+        return Array.from(this.funMappingStore.keys());
+    }
 };
 __decorate([
     (0, decorator_1.Inject)(),

package/dist/interface.d.ts

@@ -1,4 +1,4 @@
-import { MidwayRequestContainer, IMidwayApplication, IConfigurationOptions, IMidwayContext, NextFunction as BaseNextFunction, CommonMiddlewareUnion, ContextMiddlewareManager } from '@midwayjs/core';
+import { MidwayRequestContainer, IMidwayApplication, IConfigurationOptions, IMidwayContext, NextFunction as BaseNextFunction, CommonMiddlewareUnion, ContextMiddlewareManager, IMidwayBootstrapOptions } from '@midwayjs/core';
 import { FaaSHTTPContext } from '@midwayjs/faas-typings';
 import { ILogger } from '@midwayjs/logger';
 import { Application as ServerlessHttpApplication } from '@midwayjs/serverless-http-parser';
@@ -12,6 +12,11 @@ export interface FaaSContext extends IMidwayContext<FaaSHTTPContext> {
  * @deprecated
  */
 export declare type FaaSMiddleware = ((context: Context, next: () => Promise<any>) => any) | string;
+export interface HandlerOptions {
+    isHttpFunction: boolean;
+    originEvent: any;
+    originContext: any;
+}
 export declare type IMidwayFaaSApplication = IMidwayApplication<Context, {
     getInitializeContext(): any;
     use(middleware: FaaSMiddleware): any;
@@ -30,6 +35,8 @@ export declare type IMidwayFaaSApplication = IMidwayApplication<Context, {
     getFunctionServiceName(): string;
     useEventMiddleware(middleware: CommonMiddlewareUnion<Context, NextFunction, undefined>): void;
     getEventMiddleware: ContextMiddlewareManager<Context, NextFunction, undefined>;
+    getTriggerFunction(handler: string): (context: any, options: HandlerOptions) => Promise<any>;
+    getServerlessInstance<T>(serviceClass: T): Promise<T>;
 }> & ServerlessHttpApplication;
 export interface Application extends IMidwayFaaSApplication {
 }
@@ -44,8 +51,6 @@ export interface IFaaSConfigurationOptions extends IConfigurationOptions {
         getFunctionName(): string;
         getFunctionServiceName(): string;
         runAppHook?(app: Application): void;
-        runEventHook?(...args: any[]): any | void;
-        runRequestHook?(...args: any[]): any | void;
     };
 }
 /**
@@ -54,4 +59,16 @@ export interface IFaaSConfigurationOptions extends IConfigurationOptions {
 export interface IWebMiddleware {
     resolve(): FaaSMiddleware;
 }
+export interface ServerlessStarterOptions extends IMidwayBootstrapOptions {
+    initializeMethodName?: string;
+    createAdapter?: () => Promise<{
+        close(): any;
+        createAppHook(app?: any): any;
+    }>;
+    performance?: {
+        mark(label: string): any;
+        end(): any;
+    };
+    exportAllHandler?: boolean;
+}
 //# sourceMappingURL=interface.d.ts.map

package/package.json

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