@midwayjs/core 3.4.0-beta.1 → 3.4.0-beta.12

package/dist/error/http.js

@@ -57,7 +57,7 @@ var HttpStatus;
  * 400 http error, Means that the request can be fulfilled because of the bad syntax.
  */
 class BadRequestError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Bad Request') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.BAD_REQUEST);
     }
 }
@@ -66,7 +66,7 @@ exports.BadRequestError = BadRequestError;
  * 401 http error, Means that the request was legal, but the server is rejecting to answer it. For the use when authentication is required and has failed or has not yet been provided.
  */
 class UnauthorizedError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Unauthorized') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.UNAUTHORIZED);
     }
 }
@@ -75,7 +75,7 @@ exports.UnauthorizedError = UnauthorizedError;
  * 	4o4 http error, Means that the requested page cannot be found at the moment, but it may be available again in the future.
  */
 class NotFoundError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Not Found') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.NOT_FOUND);
     }
 }
@@ -84,7 +84,7 @@ exports.NotFoundError = NotFoundError;
  * 403 http error, Means that the request is legal, but the server is rejecting to answer it.
  */
 class ForbiddenError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Forbidden') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.FORBIDDEN);
     }
 }
@@ -93,7 +93,7 @@ exports.ForbiddenError = ForbiddenError;
  * 406 http error, Means that the server can only generate an answer which the client doesn't accept.
  */
 class NotAcceptableError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Not Acceptable') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.NOT_ACCEPTABLE);
     }
 }
@@ -102,7 +102,7 @@ exports.NotAcceptableError = NotAcceptableError;
  * 408 http error, Means that the server timed out waiting for the request.
  */
 class RequestTimeoutError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Request Timeout') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.REQUEST_TIMEOUT);
     }
 }
@@ -111,7 +111,7 @@ exports.RequestTimeoutError = RequestTimeoutError;
  * 409 http error, Means that the request cannot be completed, because of a conflict in the request.
  */
 class ConflictError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Conflict') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.CONFLICT);
     }
 }
@@ -120,7 +120,7 @@ exports.ConflictError = ConflictError;
  * 410 http error, Means that the requested page is not available anymore.
  */
 class GoneError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Gone') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.GONE);
     }
 }
@@ -129,7 +129,7 @@ exports.GoneError = GoneError;
  * 413 http error, Means that the request entity is too large and that's why the server won't accept the request.
  */
 class PayloadTooLargeError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Request Entity Too Large') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.PAYLOAD_TOO_LARGE);
     }
 }
@@ -138,13 +138,13 @@ exports.PayloadTooLargeError = PayloadTooLargeError;
  * 415 http error, Means that the media type is not supported and that's why the server won't accept the request.
  */
 class UnsupportedMediaTypeError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Unsupported Media Type') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.UNSUPPORTED_MEDIA_TYPE);
     }
 }
 exports.UnsupportedMediaTypeError = UnsupportedMediaTypeError;
 class UnprocessableEntityError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Unprocessable Entity') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.UNPROCESSABLE_ENTITY);
     }
 }
@@ -153,7 +153,7 @@ exports.UnprocessableEntityError = UnprocessableEntityError;
  * 500 http error, Is a generic error and users receive this error message when there is no more suitable specific message.
  */
 class InternalServerErrorError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Internal Server Error') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.INTERNAL_SERVER_ERROR);
     }
 }
@@ -162,7 +162,7 @@ exports.InternalServerErrorError = InternalServerErrorError;
  * 501 http error, Means that the server doesn't recognize the request method or it lacks the ability to fulfill the request.
  */
 class NotImplementedError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Not Implemented') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.NOT_IMPLEMENTED);
     }
 }
@@ -171,7 +171,7 @@ exports.NotImplementedError = NotImplementedError;
  * 502 http error, Means that the server was acting as a gateway or proxy and it received an invalid answer from the upstream server.
  */
 class BadGatewayError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Bad Gateway') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.BAD_GATEWAY);
     }
 }
@@ -180,7 +180,7 @@ exports.BadGatewayError = BadGatewayError;
  * 503 http error, Means that the server is not available now (It may be overloaded or down).
  */
 class ServiceUnavailableError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Service Unavailable') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.SERVICE_UNAVAILABLE);
     }
 }
@@ -189,7 +189,7 @@ exports.ServiceUnavailableError = ServiceUnavailableError;
  * 504 http error, Means that the server was acting as a gateway or proxy and it didn't get answer on time from the upstream server.
  */
 class GatewayTimeoutError extends base_1.MidwayHttpError {
-    constructor(resOrMessage = 'Gateway Timeout') {
+    constructor(resOrMessage) {
         super(resOrMessage, HttpStatus.GATEWAY_TIMEOUT);
     }
 }

package/dist/index.d.ts

@@ -8,8 +8,6 @@ export { safelyGet, safeRequire, delegateTargetPrototypeMethod, delegateTargetMe
 export { extend } from './util/extend';
 export * from './util/pathFileUtil';
 export * from './util/webRouterParam';
-export * from './common/webRouterCollector';
-export * from './common/triggerCollector';
 export { createConfiguration } from './functional/configuration';
 export { MidwayConfigService } from './service/configService';
 export { MidwayEnvironmentService } from './service/environmentService';
@@ -21,10 +19,12 @@ export { MidwayLifeCycleService } from './service/lifeCycleService';
 export { MidwayMiddlewareService } from './service/middlewareService';
 export { MidwayDecoratorService } from './service/decoratorService';
 export { MidwayMockService } from './service/mockService';
+export { RouterInfo, DynamicRouterInfo, RouterPriority, RouterCollectorOptions, MidwayWebRouterService, } from './service/webRouterService';
+export { MidwayServerlessFunctionService, WebRouterCollector, } from './service/slsFunctionService';
+export { DataSourceManager } from './common/dataSourceManager';
 export * from './service/pipelineService';
 export * from './util/contextUtil';
 export * from './common/serviceFactory';
-export * from './common/dataSourceManager';
 export * from './common/dataListener';
 export * from './common/fileDetector';
 export * from './common/webGenerator';
@@ -35,6 +35,7 @@ export * from './common/filterManager';
 export * from './common/applicationManager';
 export * from './setup';
 export * from './error';
+export { AsyncContextManager, ASYNC_ROOT_CONTEXT, AsyncContext, } from './common/asyncContextManager';
 /**
  * proxy
  */

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayFrameworkType = exports.MidwayMockService = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.extend = exports.wrapAsync = exports.wrapMiddleware = exports.pathMatching = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
+exports.MidwayFrameworkType = exports.ASYNC_ROOT_CONTEXT = exports.DataSourceManager = exports.WebRouterCollector = exports.MidwayServerlessFunctionService = exports.MidwayWebRouterService = exports.MidwayMockService = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.extend = exports.wrapAsync = exports.wrapMiddleware = exports.pathMatching = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
 __exportStar(require("./interface"), exports);
 __exportStar(require("./context/container"), exports);
 var requestContainer_1 = require("./context/requestContainer");
@@ -39,8 +39,6 @@ var extend_1 = require("./util/extend");
 Object.defineProperty(exports, "extend", { enumerable: true, get: function () { return extend_1.extend; } });
 __exportStar(require("./util/pathFileUtil"), exports);
 __exportStar(require("./util/webRouterParam"), exports);
-__exportStar(require("./common/webRouterCollector"), exports);
-__exportStar(require("./common/triggerCollector"), exports);
 var configuration_1 = require("./functional/configuration");
 Object.defineProperty(exports, "createConfiguration", { enumerable: true, get: function () { return configuration_1.createConfiguration; } });
 var configService_1 = require("./service/configService");
@@ -63,10 +61,16 @@ var decoratorService_1 = require("./service/decoratorService");
 Object.defineProperty(exports, "MidwayDecoratorService", { enumerable: true, get: function () { return decoratorService_1.MidwayDecoratorService; } });
 var mockService_1 = require("./service/mockService");
 Object.defineProperty(exports, "MidwayMockService", { enumerable: true, get: function () { return mockService_1.MidwayMockService; } });
+var webRouterService_1 = require("./service/webRouterService");
+Object.defineProperty(exports, "MidwayWebRouterService", { enumerable: true, get: function () { return webRouterService_1.MidwayWebRouterService; } });
+var slsFunctionService_1 = require("./service/slsFunctionService");
+Object.defineProperty(exports, "MidwayServerlessFunctionService", { enumerable: true, get: function () { return slsFunctionService_1.MidwayServerlessFunctionService; } });
+Object.defineProperty(exports, "WebRouterCollector", { enumerable: true, get: function () { return slsFunctionService_1.WebRouterCollector; } });
+var dataSourceManager_1 = require("./common/dataSourceManager");
+Object.defineProperty(exports, "DataSourceManager", { enumerable: true, get: function () { return dataSourceManager_1.DataSourceManager; } });
 __exportStar(require("./service/pipelineService"), exports);
 __exportStar(require("./util/contextUtil"), exports);
 __exportStar(require("./common/serviceFactory"), exports);
-__exportStar(require("./common/dataSourceManager"), exports);
 __exportStar(require("./common/dataListener"), exports);
 __exportStar(require("./common/fileDetector"), exports);
 __exportStar(require("./common/webGenerator"), exports);
@@ -77,6 +81,8 @@ __exportStar(require("./common/filterManager"), exports);
 __exportStar(require("./common/applicationManager"), exports);
 __exportStar(require("./setup"), exports);
 __exportStar(require("./error"), exports);
+var asyncContextManager_1 = require("./common/asyncContextManager");
+Object.defineProperty(exports, "ASYNC_ROOT_CONTEXT", { enumerable: true, get: function () { return asyncContextManager_1.ASYNC_ROOT_CONTEXT; } });
 /**
  * proxy
  */

package/dist/interface.d.ts

@@ -4,6 +4,7 @@ import { ILogger, LoggerOptions, LoggerContextFormat } from '@midwayjs/logger';
 import * as EventEmitter from 'events';
 import { ContextMiddlewareManager } from './common/middlewareManager';
 import _default from './config/config.default';
+import { AsyncContextManager } from './common/asyncContextManager';
 export declare type PowerPartial<T> = {
     [U in keyof T]?: T[U] extends {} ? PowerPartial<T[U]> : T[U];
 };
@@ -314,10 +315,7 @@ export declare type FunctionMiddleware<CTX, R, N = unknown> = N extends true ? (
 export declare type ClassMiddleware<CTX, R, N> = new (...args: any[]) => IMiddleware<CTX, R, N>;
 export declare type CommonMiddleware<CTX, R, N> = ClassMiddleware<CTX, R, N> | FunctionMiddleware<CTX, R, N>;
 export declare type CommonMiddlewareUnion<CTX, R, N> = CommonMiddleware<CTX, R, N> | Array<CommonMiddleware<CTX, R, N>>;
-export declare type MiddlewareRespond<CTX, R, N> = (context: CTX, nextOrRes?: N extends true ? R : NextFunction, next?: N) => Promise<{
-    result: any;
-    error: Error | undefined;
-}>;
+export declare type MiddlewareRespond<CTX, R, N> = (context: CTX, nextOrRes?: N extends true ? R : NextFunction, next?: N) => Promise<any>;
 /**
  * Common Exception Filter definition
  */
@@ -435,6 +433,7 @@ export interface IMidwayBootstrapOptions {
     globalConfig?: Array<{
         [environmentName: string]: Record<string, any>;
     }> | Record<string, any>;
+    asyncContextManager?: AsyncContextManager;
 }
 export interface IConfigurationOptions {
     logger?: ILogger;
@@ -482,5 +481,7 @@ export interface MidwayAppInfo {
 export interface MidwayConfig extends FileConfigOption<typeof _default> {
     [customConfigKey: string]: unknown;
 }
+export declare const ASYNC_CONTEXT_KEY: unique symbol;
+export declare const ASYNC_CONTEXT_MANAGER_KEY = "MIDWAY_ASYNC_CONTEXT_MANAGER_KEY";
 export {};
 //# sourceMappingURL=interface.d.ts.map

package/dist/interface.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MIDWAY_LOGGER_WRITEABLE_DIR = exports.MidwayProcessTypeEnum = exports.REQUEST_CTX_LOGGER_CACHE_KEY = exports.HTTP_SERVER_KEY = exports.REQUEST_OBJ_CTX_KEY = exports.REQUEST_CTX_KEY = exports.ObjectLifeCycleEvent = void 0;
+exports.ASYNC_CONTEXT_MANAGER_KEY = exports.ASYNC_CONTEXT_KEY = exports.MIDWAY_LOGGER_WRITEABLE_DIR = exports.MidwayProcessTypeEnum = exports.REQUEST_CTX_LOGGER_CACHE_KEY = exports.HTTP_SERVER_KEY = exports.REQUEST_OBJ_CTX_KEY = exports.REQUEST_CTX_KEY = exports.ObjectLifeCycleEvent = void 0;
 var ObjectLifeCycleEvent;
 (function (ObjectLifeCycleEvent) {
     ObjectLifeCycleEvent["BEFORE_BIND"] = "beforeBind";
@@ -19,4 +19,6 @@ var MidwayProcessTypeEnum;
     MidwayProcessTypeEnum["AGENT"] = "AGENT";
 })(MidwayProcessTypeEnum = exports.MidwayProcessTypeEnum || (exports.MidwayProcessTypeEnum = {}));
 exports.MIDWAY_LOGGER_WRITEABLE_DIR = 'MIDWAY_LOGGER_WRITEABLE_DIR';
+exports.ASYNC_CONTEXT_KEY = Symbol('ASYNC_CONTEXT_KEY');
+exports.ASYNC_CONTEXT_MANAGER_KEY = 'MIDWAY_ASYNC_CONTEXT_MANAGER_KEY';
 //# sourceMappingURL=interface.js.map

package/dist/service/configService.js

@@ -175,11 +175,14 @@ let MidwayConfigService = class MidwayConfigService {
         let exports = typeof configFilename === 'string'
             ? require(configFilename)
             : configFilename;
-        if (exports && exports.default) {
-            if (Object.keys(exports).length > 1) {
-                throw new error_1.MidwayInvalidConfigError(`${configFilename} should not have both a default export and named export`);
+        // if es module
+        if (exports && exports.__esModule) {
+            if (exports && exports.default) {
+                if (Object.keys(exports).length > 1) {
+                    throw new error_1.MidwayInvalidConfigError(`${configFilename} should not have both a default export and named export`);
+                }
+                exports = exports.default;
             }
-            exports = exports.default;
         }
         return exports;
     }

package/dist/service/frameworkService.js

@@ -50,11 +50,11 @@ let MidwayFrameworkService = class MidwayFrameworkService {
             return new pipelineService_1.MidwayPipelineService((_b = (_a = instance[interface_1.REQUEST_OBJ_CTX_KEY]) === null || _a === void 0 ? void 0 : _a.requestContext) !== null && _b !== void 0 ? _b : this.applicationContext, meta.valves);
         });
         // register @App decorator handler
-        this.decoratorService.registerPropertyHandler(decorator_1.APPLICATION_KEY, (propertyName, mete) => {
-            if (mete.type) {
-                const framework = this.applicationManager.getApplication(mete.type);
+        this.decoratorService.registerPropertyHandler(decorator_1.APPLICATION_KEY, (propertyName, meta) => {
+            if (meta.type) {
+                const framework = this.applicationManager.getApplication(meta.type);
                 if (!framework) {
-                    throw new error_1.MidwayCommonError(`Framework ${mete.type} not Found`);
+                    throw new error_1.MidwayCommonError(`Framework ${meta.type} not Found`);
                 }
                 return framework;
             }
@@ -62,8 +62,9 @@ let MidwayFrameworkService = class MidwayFrameworkService {
                 return this.getMainApp();
             }
         });
-        this.decoratorService.registerPropertyHandler(decorator_1.PLUGIN_KEY, (key, target) => {
-            return this.getMainApp()[key];
+        this.decoratorService.registerPropertyHandler(decorator_1.PLUGIN_KEY, (propertyName, meta) => {
+            var _a;
+            return this.getMainApp()[(_a = meta.identifier) !== null && _a !== void 0 ? _a : propertyName];
         });
         let frameworks = (0, decorator_1.listModule)(decorator_1.FRAMEWORK_KEY);
         // filter proto

package/dist/service/middlewareService.js

@@ -32,6 +32,10 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                 const classMiddleware = await this.applicationContext.getAsync(fn);
                 if (classMiddleware) {
                     fn = await classMiddleware.resolve(app);
+                    if (!fn) {
+                        // for middleware enabled
+                        continue;
+                    }
                     if (!classMiddleware.match && !classMiddleware.ignore) {
                         if (!fn.name) {
                             fn._name = classMiddleware.constructor.name;
@@ -88,13 +92,17 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                         return Promise.resolve(fn(context, dispatch.bind(null, i + 1), {
                             index,
                         })).then(result => {
-                            // need to set body
-                            if (context['body'] && !result) {
-                                result = context['body'];
-                            }
-                            else if (result && context['body'] !== result) {
+                            /**
+                             * 1、return 和 ctx.body，return 的优先级更高
+                             * 2、如果 result 有值（非 undefined），则不管什么情况，都会覆盖当前 body，注意，这里有可能赋值 null，导致 status 为 204，会在中间件处进行修正
+                             * 3、如果 result 没值，且 ctx.body 已经赋值，则向 result 赋值
+                             */
+                            if (result !== undefined) {
                                 context['body'] = result;
                             }
+                            else if (context['body'] !== undefined) {
+                                result = context['body'];
+                            }
                             return result;
                         });
                     }

package/dist/service/slsFunctionService.d.ts

@@ -0,0 +1,25 @@
+import { FaaSMetadata } from '@midwayjs/decorator';
+import { MidwayWebRouterService, RouterCollectorOptions, RouterInfo, RouterPriority } from './webRouterService';
+export declare class MidwayServerlessFunctionService extends MidwayWebRouterService {
+    readonly options: RouterCollectorOptions;
+    constructor(options?: RouterCollectorOptions);
+    protected analyze(): Promise<void>;
+    protected analyzeFunction(): void;
+    protected collectFunctionRoute(module: any): void;
+    getFunctionList(): Promise<RouterInfo[]>;
+    addServerlessFunction(func: (...args: any[]) => Promise<any>, triggerOptions: FaaSMetadata.TriggerMetadata, functionOptions?: FaaSMetadata.ServerlessFunctionOptions): void;
+}
+/**
+ * @deprecated use built-in MidwayWebRouterService first
+ */
+export declare class WebRouterCollector {
+    private baseDir;
+    private options;
+    private proxy;
+    constructor(baseDir?: string, options?: RouterCollectorOptions);
+    protected init(): Promise<void>;
+    getRoutePriorityList(): Promise<RouterPriority[]>;
+    getRouterTable(): Promise<Map<string, RouterInfo[]>>;
+    getFlattenRouterTable(): Promise<RouterInfo[]>;
+}
+//# sourceMappingURL=slsFunctionService.d.ts.map

package/dist/service/slsFunctionService.js

@@ -0,0 +1,242 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebRouterCollector = exports.MidwayServerlessFunctionService = void 0;
+const decorator_1 = require("@midwayjs/decorator");
+const webRouterService_1 = require("./webRouterService");
+const container_1 = require("../context/container");
+const fileDetector_1 = require("../common/fileDetector");
+const contextUtil_1 = require("../util/contextUtil");
+let MidwayServerlessFunctionService = class MidwayServerlessFunctionService extends webRouterService_1.MidwayWebRouterService {
+    constructor(options = {}) {
+        super(Object.assign({}, options, {
+            includeFunctionRouter: true,
+        }));
+        this.options = options;
+    }
+    async analyze() {
+        this.analyzeController();
+        this.analyzeFunction();
+        this.sortPrefixAndRouter();
+        // requestMethod all transform to other method
+        for (const routerInfo of this.routes.values()) {
+            for (const info of routerInfo) {
+                if (info.requestMethod === 'all') {
+                    info.functionTriggerMetadata.method = [
+                        'get',
+                        'post',
+                        'put',
+                        'delete',
+                        'head',
+                        'patch',
+                        'options',
+                    ];
+                }
+            }
+        }
+    }
+    analyzeFunction() {
+        const fnModules = (0, decorator_1.listModule)(decorator_1.FUNC_KEY);
+        for (const module of fnModules) {
+            this.collectFunctionRoute(module);
+        }
+    }
+    collectFunctionRoute(module) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        // serverlessTrigger metadata
+        const webRouterInfo = (0, decorator_1.getClassMetadata)(decorator_1.FUNC_KEY, module);
+        const controllerId = (0, decorator_1.getProviderName)(module);
+        const id = (0, decorator_1.getProviderUUId)(module);
+        const prefix = '/';
+        if (!this.routes.has(prefix)) {
+            this.routes.set(prefix, []);
+            this.routesPriority.push({
+                prefix,
+                priority: -999,
+                middleware: [],
+                routerOptions: {},
+                controllerId,
+                routerModule: module,
+            });
+        }
+        for (const webRouter of webRouterInfo) {
+            // 新的 @ServerlessTrigger 写法
+            if ((_a = webRouter['metadata']) === null || _a === void 0 ? void 0 : _a['path']) {
+                const routeArgsInfo = (0, decorator_1.getPropertyDataFromClass)(decorator_1.WEB_ROUTER_PARAM_KEY, module, webRouter['methodName']) || [];
+                const routerResponseData = (0, decorator_1.getPropertyMetadata)(decorator_1.WEB_RESPONSE_KEY, module, webRouter['methodName']) || [];
+                // 新 http/api gateway 函数
+                const data = {
+                    id,
+                    prefix,
+                    routerName: '',
+                    url: webRouter['metadata']['path'],
+                    requestMethod: (_c = (_b = webRouter['metadata']) === null || _b === void 0 ? void 0 : _b['method']) !== null && _c !== void 0 ? _c : 'get',
+                    method: webRouter['methodName'],
+                    description: '',
+                    summary: '',
+                    handlerName: `${controllerId}.${webRouter['methodName']}`,
+                    funcHandlerName: `${controllerId}.${webRouter['methodName']}`,
+                    controllerId,
+                    middleware: ((_d = webRouter['metadata']) === null || _d === void 0 ? void 0 : _d['middleware']) || [],
+                    controllerMiddleware: [],
+                    requestMetadata: routeArgsInfo,
+                    responseMetadata: routerResponseData,
+                };
+                const functionMeta = (0, decorator_1.getPropertyMetadata)(decorator_1.SERVERLESS_FUNC_KEY, module, webRouter['methodName']) || {};
+                const functionName = (_f = (_e = functionMeta['functionName']) !== null && _e !== void 0 ? _e : webRouter['functionName']) !== null && _f !== void 0 ? _f : createFunctionName(module, webRouter['methodName']);
+                data.functionName = functionName;
+                data.functionTriggerName = webRouter['type'];
+                data.functionTriggerMetadata = webRouter['metadata'];
+                data.functionMetadata = {
+                    functionName,
+                    ...functionMeta,
+                };
+                this.checkDuplicateAndPush(prefix, data);
+            }
+            else {
+                const functionMeta = (0, decorator_1.getPropertyMetadata)(decorator_1.SERVERLESS_FUNC_KEY, module, webRouter['methodName']) || {};
+                const functionName = (_h = (_g = functionMeta['functionName']) !== null && _g !== void 0 ? _g : webRouter['functionName']) !== null && _h !== void 0 ? _h : createFunctionName(module, webRouter['methodName']);
+                // 其他类型的函数
+                this.checkDuplicateAndPush(prefix, {
+                    id,
+                    prefix,
+                    routerName: '',
+                    url: '',
+                    requestMethod: '',
+                    method: webRouter['methodName'],
+                    description: '',
+                    summary: '',
+                    handlerName: `${controllerId}.${webRouter['methodName']}`,
+                    funcHandlerName: `${controllerId}.${webRouter['methodName']}`,
+                    controllerId,
+                    middleware: ((_j = webRouter['metadata']) === null || _j === void 0 ? void 0 : _j['middleware']) || [],
+                    controllerMiddleware: [],
+                    requestMetadata: [],
+                    responseMetadata: [],
+                    functionName,
+                    functionTriggerName: webRouter['type'],
+                    functionTriggerMetadata: webRouter['metadata'],
+                    functionMetadata: {
+                        functionName,
+                        ...functionMeta,
+                    },
+                });
+            }
+        }
+    }
+    async getFunctionList() {
+        return this.getFlattenRouterTable({
+            compileUrlPattern: true,
+        });
+    }
+    addServerlessFunction(func, triggerOptions, functionOptions = {}) {
+        var _a, _b;
+        const prefix = '';
+        if (!this.routes.has(prefix)) {
+            this.routes.set(prefix, []);
+            this.routesPriority.push({
+                prefix,
+                priority: 0,
+                middleware: [],
+                routerOptions: {},
+                controllerId: undefined,
+                routerModule: undefined,
+            });
+        }
+        const functionName = (_a = triggerOptions.functionName) !== null && _a !== void 0 ? _a : functionOptions.functionName;
+        this.checkDuplicateAndPush(prefix, {
+            id: null,
+            method: func,
+            url: triggerOptions.metadata['path'] || '',
+            requestMethod: triggerOptions.metadata['method'] || '',
+            description: '',
+            summary: '',
+            handlerName: '',
+            funcHandlerName: triggerOptions.handlerName || functionOptions.handlerName,
+            controllerId: '',
+            middleware: ((_b = triggerOptions.metadata) === null || _b === void 0 ? void 0 : _b.middleware) || [],
+            controllerMiddleware: [],
+            requestMetadata: [],
+            responseMetadata: [],
+            functionName,
+            functionTriggerName: triggerOptions.metadata.name,
+            functionTriggerMetadata: triggerOptions.metadata,
+            functionMetadata: {
+                functionName,
+                ...functionOptions,
+            },
+        });
+    }
+};
+MidwayServerlessFunctionService = __decorate([
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton),
+    __metadata("design:paramtypes", [Object])
+], MidwayServerlessFunctionService);
+exports.MidwayServerlessFunctionService = MidwayServerlessFunctionService;
+function createFunctionName(target, functionName) {
+    return (0, decorator_1.getProviderName)(target).replace(/[:#]/g, '-') + '-' + functionName;
+}
+/**
+ * @deprecated use built-in MidwayWebRouterService first
+ */
+class WebRouterCollector {
+    constructor(baseDir = '', options = {}) {
+        this.baseDir = baseDir;
+        this.options = options;
+    }
+    async init() {
+        if (!this.proxy) {
+            if (this.baseDir) {
+                const container = new container_1.MidwayContainer();
+                (0, decorator_1.bindContainer)(container);
+                container.setFileDetector(new fileDetector_1.DirectoryFileDetector({
+                    loadDir: this.baseDir,
+                }));
+                await container.ready();
+            }
+            if (this.options.includeFunctionRouter) {
+                if ((0, contextUtil_1.getCurrentMainFramework)()) {
+                    this.proxy = await (0, contextUtil_1.getCurrentMainFramework)()
+                        .getApplicationContext()
+                        .getAsync(MidwayServerlessFunctionService, [this.options]);
+                }
+                else {
+                    this.proxy = new MidwayServerlessFunctionService(this.options);
+                }
+            }
+            else {
+                if ((0, contextUtil_1.getCurrentMainFramework)()) {
+                    this.proxy = await (0, contextUtil_1.getCurrentMainFramework)()
+                        .getApplicationContext()
+                        .getAsync(webRouterService_1.MidwayWebRouterService, [this.options]);
+                }
+                else {
+                    this.proxy = new webRouterService_1.MidwayWebRouterService(this.options);
+                }
+            }
+        }
+    }
+    async getRoutePriorityList() {
+        await this.init();
+        return this.proxy.getRoutePriorityList();
+    }
+    async getRouterTable() {
+        await this.init();
+        return this.proxy.getRouterTable();
+    }
+    async getFlattenRouterTable() {
+        await this.init();
+        return this.proxy.getFlattenRouterTable();
+    }
+}
+exports.WebRouterCollector = WebRouterCollector;
+//# sourceMappingURL=slsFunctionService.js.map