@midwayjs/core 3.3.5 → 3.4.0-beta.2

package/dist/common/dataSourceManager.d.ts

@@ -0,0 +1,28 @@
+export declare abstract class DataSourceManager<T> {
+    protected dataSource: Map<string, T>;
+    protected options: {};
+    protected initDataSource(options?: any): Promise<void>;
+    /**
+     * get a data source instance
+     * @param dataSourceName
+     */
+    getDataSource(dataSourceName: string): T;
+    /**
+     * check data source has exists
+     * @param dataSourceName
+     */
+    hasDataSource(dataSourceName: string): boolean;
+    getDataSourceNames(): string[];
+    /**
+     * check the data source is connected
+     * @param dataSourceName
+     */
+    isConnected(dataSourceName: string): Promise<boolean>;
+    createInstance(config: any, clientName: any): Promise<T | void>;
+    abstract getName(): string;
+    protected abstract createDataSource(config: any, dataSourceName: string): Promise<T | void> | (T | void);
+    protected abstract checkConnected(dataSource: T): Promise<boolean>;
+    protected destroyDataSource(dataSource: T): Promise<void>;
+    stop(): Promise<void>;
+}
+//# sourceMappingURL=dataSourceManager.d.ts.map

package/dist/common/dataSourceManager.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataSourceManager = void 0;
+/**
+ * 数据源管理器实现
+ */
+const extend_1 = require("../util/extend");
+const error_1 = require("../error");
+class DataSourceManager {
+    constructor() {
+        this.dataSource = new Map();
+        this.options = {};
+    }
+    async initDataSource(options = {}) {
+        this.options = options;
+        if (options.dataSource) {
+            for (const dataSourceName in options.dataSource) {
+                // create data source
+                await this.createInstance(options.dataSource[dataSourceName], dataSourceName);
+            }
+        }
+        else {
+            throw new error_1.MidwayParameterError('DataSourceManager must set options.dataSource.');
+        }
+    }
+    /**
+     * get a data source instance
+     * @param dataSourceName
+     */
+    getDataSource(dataSourceName) {
+        return this.dataSource.get(dataSourceName);
+    }
+    /**
+     * check data source has exists
+     * @param dataSourceName
+     */
+    hasDataSource(dataSourceName) {
+        return this.dataSource.has(dataSourceName);
+    }
+    getDataSourceNames() {
+        return Array.from(this.dataSource.keys());
+    }
+    /**
+     * check the data source is connected
+     * @param dataSourceName
+     */
+    async isConnected(dataSourceName) {
+        return this.checkConnected(this.getDataSource(dataSourceName));
+    }
+    async createInstance(config, clientName) {
+        // options.default will be merge in to options.clients[id]
+        config = (0, extend_1.extend)(true, {}, this.options['default'], config);
+        const client = await this.createDataSource(config, clientName);
+        if (client) {
+            if (clientName) {
+                this.dataSource.set(clientName, client);
+            }
+            return client;
+        }
+    }
+    async destroyDataSource(dataSource) { }
+    async stop() {
+        for (const value of this.dataSource.values()) {
+            await this.destroyDataSource(value);
+        }
+    }
+}
+exports.DataSourceManager = DataSourceManager;
+//# sourceMappingURL=dataSourceManager.js.map

package/dist/common/fileDetector.d.ts

@@ -13,6 +13,7 @@ export declare class DirectoryFileDetector extends AbstractFileDetector<{
     namespace: string;
 }> {
     private directoryFilterArray;
+    private duplicateModuleCheckSet;
     run(container: any): void;
 }
 export declare class CustomModuleDetector extends AbstractFileDetector<{

package/dist/common/fileDetector.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomModuleDetector = exports.DirectoryFileDetector = exports.AbstractFileDetector = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const glob_1 = require("@midwayjs/glob");
+const error_1 = require("../error");
 class AbstractFileDetector {
     constructor(options) {
         this.options = options;
@@ -31,6 +32,7 @@ class DirectoryFileDetector extends AbstractFileDetector {
     constructor() {
         super(...arguments);
         this.directoryFilterArray = [];
+        this.duplicateModuleCheckSet = new Map();
     }
     run(container) {
         const loadDirs = []
@@ -41,6 +43,20 @@ class DirectoryFileDetector extends AbstractFileDetector {
                 cwd: dir,
                 ignore: DEFAULT_IGNORE_PATTERN.concat(this.options.ignore || []).concat(this.extraDetectorOptions.ignore || []),
             });
+            // 检查重复模块
+            const checkDuplicatedHandler = (module, options) => {
+                if (decorator_1.Types.isClass(module)) {
+                    const name = (0, decorator_1.getProviderName)(module);
+                    if (name) {
+                        if (this.duplicateModuleCheckSet.has(name)) {
+                            throw new error_1.MidwayDuplicateClassNameError(name, options.srcPath, this.duplicateModuleCheckSet.get(name));
+                        }
+                        else {
+                            this.duplicateModuleCheckSet.set(name, options.srcPath);
+                        }
+                    }
+                }
+            };
             for (const file of fileResults) {
                 if (this.directoryFilterArray.length) {
                     for (const resolveFilter of this.directoryFilterArray) {
@@ -68,6 +84,7 @@ class DirectoryFileDetector extends AbstractFileDetector {
                             namespace: this.options.namespace,
                             srcPath: file,
                             createFrom: 'file',
+                            bindHook: checkDuplicatedHandler,
                         });
                     }
                 }
@@ -78,10 +95,13 @@ class DirectoryFileDetector extends AbstractFileDetector {
                         namespace: this.options.namespace,
                         srcPath: file,
                         createFrom: 'file',
+                        bindHook: checkDuplicatedHandler,
                     });
                 }
             }
         }
+        // check end
+        this.duplicateModuleCheckSet.clear();
     }
 }
 exports.DirectoryFileDetector = DirectoryFileDetector;

package/dist/common/filterManager.d.ts

@@ -5,6 +5,7 @@ export declare class FilterManager<CTX extends IMidwayContext = IMidwayContext,
     private exceptionMap;
     private defaultErrFilter;
     private matchFnList;
+    private protoMatchList;
     useFilter(Filters: CommonFilterUnion<CTX, R, N>): void;
     init(applicationContext: IMidwayContainer): Promise<void>;
     runErrorFilter(err: Error, ctx: CTX, res?: R, next?: N): Promise<{

package/dist/common/filterManager.js

@@ -10,6 +10,7 @@ class FilterManager {
         this.exceptionMap = new WeakMap();
         this.defaultErrFilter = undefined;
         this.matchFnList = [];
+        this.protoMatchList = [];
     }
     useFilter(Filters) {
         if (!Array.isArray(Filters)) {
@@ -31,7 +32,20 @@ class FilterManager {
             const exceptionMetadata = (0, decorator_1.getClassMetadata)(decorator_1.CATCH_KEY, FilterClass);
             if (exceptionMetadata && exceptionMetadata.catchTargets) {
                 for (const Exception of exceptionMetadata.catchTargets) {
-                    this.exceptionMap.set(Exception, filter);
+                    this.exceptionMap.set(Exception, {
+                        filter,
+                        catchOptions: exceptionMetadata.catchOptions || {},
+                    });
+                    if (exceptionMetadata.catchOptions['matchPrototype']) {
+                        this.protoMatchList.push(err => {
+                            if (err instanceof Exception) {
+                                return Exception;
+                            }
+                            else {
+                                return false;
+                            }
+                        });
+                    }
                 }
             }
             else {
@@ -53,14 +67,32 @@ class FilterManager {
     }
     async runErrorFilter(err, ctx, res, next) {
         let result, error;
+        let matched = false;
         if (this.exceptionMap.has(err.constructor)) {
-            const filter = this.exceptionMap.get(err.constructor);
-            result = await filter.catch(err, ctx, res, next);
+            matched = true;
+            const filterData = this.exceptionMap.get(err.constructor);
+            result = await filterData.filter.catch(err, ctx, res, next);
         }
-        else if (this.defaultErrFilter) {
+        // match with prototype
+        if (!matched && this.protoMatchList.length) {
+            let protoException;
+            for (const matchPattern of this.protoMatchList) {
+                protoException = matchPattern(err);
+                if (protoException) {
+                    break;
+                }
+            }
+            if (protoException) {
+                matched = true;
+                const filterData = this.exceptionMap.get(protoException);
+                result = await filterData.filter.catch(err, ctx, res, next);
+            }
+        }
+        if (!matched && this.defaultErrFilter) {
+            matched = true;
             result = await this.defaultErrFilter.catch(err, ctx, res, next);
         }
-        else {
+        if (!matched) {
             error = err;
         }
         return {

package/dist/common/serviceFactory.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceFactory = void 0;
 const assert = require("assert");
+const extend_1 = require("../util/extend");
 /**
  * 多客户端工厂实现
  */
@@ -33,7 +34,7 @@ class ServiceFactory {
     }
     async createInstance(config, clientName) {
         // options.default will be merge in to options.clients[id]
-        config = Object.assign({}, this.options['default'], config);
+        config = (0, extend_1.extend)(true, {}, this.options['default'], config);
         const client = await this.createClient(config, clientName);
         if (client) {
             if (clientName) {

package/dist/common/webGenerator.d.ts

@@ -1,15 +1,16 @@
-import { RouterInfo, IMidwayApplication } from '../index';
+import { MidwayWebRouterService, RouterInfo, IMidwayApplication } from '../index';
 export declare abstract class WebControllerGenerator<Router extends {
     use: (...args: any[]) => void;
 }> {
     readonly app: IMidwayApplication;
-    protected constructor(app: IMidwayApplication);
+    readonly midwayWebRouterService: MidwayWebRouterService;
+    protected constructor(app: IMidwayApplication, midwayWebRouterService: MidwayWebRouterService);
     /**
      * wrap controller string to middleware function
      * @param routeInfo
      */
     generateKoaController(routeInfo: RouterInfo): (ctx: any, next: any) => Promise<void>;
-    loadMidwayController(globalPrefix: string, routerHandler?: (newRouter: Router) => void): Promise<void>;
+    loadMidwayController(routerHandler?: (newRouter: Router) => void): Promise<void>;
     abstract createRouter(routerOptions: any): Router;
     abstract generateController(routeInfo: RouterInfo): any;
 }

package/dist/common/webGenerator.js

@@ -12,8 +12,9 @@ const index_1 = require("../index");
 const util = require("util");
 const debug = util.debuglog('midway:debug');
 class WebControllerGenerator {
-    constructor(app) {
+    constructor(app, midwayWebRouterService) {
         this.app = app;
+        this.midwayWebRouterService = midwayWebRouterService;
     }
     /**
      * wrap controller string to middleware function
@@ -22,14 +23,24 @@ class WebControllerGenerator {
     generateKoaController(routeInfo) {
         return async (ctx, next) => {
             const args = [ctx, next];
-            const controller = await ctx.requestContext.getAsync(routeInfo.id);
-            // eslint-disable-next-line prefer-spread
-            const result = await controller[routeInfo.method].apply(controller, args);
-            if (result !== undefined) {
-                ctx.body = result;
+            let result;
+            if (typeof routeInfo.method !== 'string') {
+                result = await routeInfo.method(ctx, next);
+            }
+            else {
+                const controller = await ctx.requestContext.getAsync(routeInfo.id);
+                // eslint-disable-next-line prefer-spread
+                result = await controller[routeInfo.method].apply(controller, args);
             }
-            if (ctx.body === undefined && !ctx.response._explicitStatus) {
-                ctx.body = undefined;
+            if (result !== undefined) {
+                if (result === null) {
+                    // 这样设置可以绕过 koa 的 _explicitStatus 赋值机制
+                    ctx.response._body = null;
+                    ctx.response._midwayControllerNullBody = true;
+                }
+                else {
+                    ctx.body = result;
+                }
             }
             // implement response decorator
             if (Array.isArray(routeInfo.responseMetadata) &&
@@ -56,13 +67,10 @@ class WebControllerGenerator {
             }
         };
     }
-    async loadMidwayController(globalPrefix, routerHandler) {
+    async loadMidwayController(routerHandler) {
         var _a, _b;
-        const collector = new index_1.WebRouterCollector('', {
-            globalPrefix,
-        });
-        const routerTable = await collector.getRouterTable();
-        const routerList = await collector.getRoutePriorityList();
+        const routerTable = await this.midwayWebRouterService.getRouterTable();
+        const routerList = await this.midwayWebRouterService.getRoutePriorityList();
         const applicationContext = this.app.getApplicationContext();
         const logger = this.app.getCoreLogger();
         const middlewareService = applicationContext.get(index_1.MidwayMiddlewareService);

package/dist/context/container.js

@@ -274,6 +274,9 @@ class MidwayContainer {
             // 如果 definition 存在就不再重复 bind
             return;
         }
+        if (options === null || options === void 0 ? void 0 : options.bindHook) {
+            options.bindHook(target, options);
+        }
         let definition;
         if (decorator_1.Types.isClass(target)) {
             definition = new objectDefinition_1.ObjectDefinition();

package/dist/error/framework.d.ts

@@ -16,6 +16,7 @@ export declare const FrameworkErrorEnum: {
     readonly UTIL_HTTP_TIMEOUT: "MIDWAY_10012";
     readonly INCONSISTENT_VERSION: "MIDWAY_10013";
     readonly INVALID_CONFIG: "MIDWAY_10014";
+    readonly DUPLICATE_CLASS_NAME: "MIDWAY_10015";
 };
 export declare class MidwayCommonError extends MidwayError {
     constructor(message: string);
@@ -62,4 +63,7 @@ export declare class MidwayUtilHttpClientTimeoutError extends MidwayError {
 export declare class MidwayInconsistentVersionError extends MidwayError {
     constructor();
 }
+export declare class MidwayDuplicateClassNameError extends MidwayError {
+    constructor(className: string, existPath: string, existPathOther: string);
+}
 //# sourceMappingURL=framework.d.ts.map

package/dist/error/framework.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayInconsistentVersionError = exports.MidwayUtilHttpClientTimeoutError = exports.MidwayMissingImportComponentError = exports.MidwaySingletonInjectRequestError = exports.MidwayUseWrongMethodError = exports.MidwayDuplicateRouteError = exports.MidwayResolverMissingError = exports.MidwayInvalidConfigError = exports.MidwayConfigMissingError = exports.MidwayFeatureNotImplementedError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = exports.FrameworkErrorEnum = void 0;
+exports.MidwayDuplicateClassNameError = exports.MidwayInconsistentVersionError = exports.MidwayUtilHttpClientTimeoutError = exports.MidwayMissingImportComponentError = exports.MidwaySingletonInjectRequestError = exports.MidwayUseWrongMethodError = exports.MidwayDuplicateRouteError = exports.MidwayResolverMissingError = exports.MidwayInvalidConfigError = exports.MidwayConfigMissingError = exports.MidwayFeatureNotImplementedError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = exports.FrameworkErrorEnum = void 0;
 const base_1 = require("./base");
 exports.FrameworkErrorEnum = (0, base_1.registerErrorCode)('midway', {
     UNKNOWN: 10000,
@@ -18,6 +18,7 @@ exports.FrameworkErrorEnum = (0, base_1.registerErrorCode)('midway', {
     UTIL_HTTP_TIMEOUT: 10012,
     INCONSISTENT_VERSION: 10013,
     INVALID_CONFIG: 10014,
+    DUPLICATE_CLASS_NAME: 10015,
 });
 class MidwayCommonError extends base_1.MidwayError {
     constructor(message) {
@@ -122,4 +123,10 @@ class MidwayInconsistentVersionError extends base_1.MidwayError {
     }
 }
 exports.MidwayInconsistentVersionError = MidwayInconsistentVersionError;
+class MidwayDuplicateClassNameError extends base_1.MidwayError {
+    constructor(className, existPath, existPathOther) {
+        super(`"${className}" duplicated between "${existPath}" and "${existPathOther}"`, exports.FrameworkErrorEnum.DUPLICATE_CLASS_NAME);
+    }
+}
+exports.MidwayDuplicateClassNameError = MidwayDuplicateClassNameError;
 //# sourceMappingURL=framework.js.map

package/dist/index.d.ts

@@ -4,12 +4,10 @@ export { MidwayRequestContainer } from './context/requestContainer';
 export { BaseFramework } from './baseFramework';
 export * from './context/providerWrapper';
 export * from './common/constants';
-export { safelyGet, safeRequire, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, delegateTargetAllPrototypeMethod, deprecatedOutput, transformRequestObjectByType, pathMatching, wrapMiddleware, } from './util/';
+export { safelyGet, safeRequire, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, delegateTargetAllPrototypeMethod, deprecatedOutput, transformRequestObjectByType, pathMatching, wrapMiddleware, wrapAsync, } from './util/';
 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,9 +19,11 @@ 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, WebRouterCollector, } from './service/webRouterService';
 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';

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.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.WebRouterCollector = 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");
@@ -34,12 +34,11 @@ Object.defineProperty(exports, "deprecatedOutput", { enumerable: true, get: func
 Object.defineProperty(exports, "transformRequestObjectByType", { enumerable: true, get: function () { return util_1.transformRequestObjectByType; } });
 Object.defineProperty(exports, "pathMatching", { enumerable: true, get: function () { return util_1.pathMatching; } });
 Object.defineProperty(exports, "wrapMiddleware", { enumerable: true, get: function () { return util_1.wrapMiddleware; } });
+Object.defineProperty(exports, "wrapAsync", { enumerable: true, get: function () { return util_1.wrapAsync; } });
 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");
@@ -62,9 +61,13 @@ 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; } });
+Object.defineProperty(exports, "WebRouterCollector", { enumerable: true, get: function () { return webRouterService_1.WebRouterCollector; } });
 __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);

package/dist/interface.d.ts

@@ -14,6 +14,14 @@ export declare type ServiceFactoryConfigOption<OPTIONS> = {
         [key: string]: PowerPartial<OPTIONS>;
     };
 };
+export declare type DataSourceManagerConfigOption<OPTIONS> = {
+    default?: PowerPartial<OPTIONS>;
+    dataSource?: {
+        [key: string]: PowerPartial<{
+            entities: any[];
+        } & OPTIONS>;
+    };
+};
 declare type ConfigType<T> = T extends (...args: any[]) => any ? Writable<PowerPartial<ReturnType<T>>> : Writable<PowerPartial<T>>;
 /**
  * Get definition from config
@@ -127,6 +135,7 @@ export interface IObjectDefinition {
     }>;
     createFrom: 'framework' | 'file' | 'module';
     allowDowngrade: boolean;
+    bindHook?: (module: any, options?: IObjectDefinition) => void;
 }
 export interface IObjectCreator {
     load(): any;

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

@@ -88,13 +88,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/{common/webRouterCollector.d.ts → service/webRouterService.d.ts}

@@ -1,16 +1,17 @@
+import { ControllerOption } from '@midwayjs/decorator';
 export interface RouterInfo {
     /**
      * uuid
      */
-    id: string;
+    id?: string;
     /**
      * router prefix from controller
      */
-    prefix: string;
+    prefix?: string;
     /**
      * router alias name
      */
-    routerName: string;
+    routerName?: string;
     /**
      * router path, without prefix
      */
@@ -22,40 +23,40 @@ export interface RouterInfo {
     /**
      * invoke function method
      */
-    method: string;
+    method: string | ((...args: any[]) => void);
     /**
      * router description
      */
-    description: string;
-    summary: string;
+    description?: string;
+    summary?: string;
     /**
      * router handler function key，for IoC container load
      */
-    handlerName: string;
+    handlerName?: string;
     /**
      *  serverless func load key
      */
-    funcHandlerName: string;
+    funcHandlerName?: string;
     /**
      * controller provideId
      */
-    controllerId: string;
+    controllerId?: string;
     /**
      * router middleware
      */
-    middleware: any[];
+    middleware?: any[];
     /**
      * controller middleware in this router
      */
-    controllerMiddleware: any[];
+    controllerMiddleware?: any[];
     /**
      * request args metadata
      */
-    requestMetadata: any[];
+    requestMetadata?: any[];
     /**
      * response data metadata
      */
-    responseMetadata: any[];
+    responseMetadata?: any[];
     /**
      * serverless function name
      */
@@ -73,6 +74,7 @@ export interface RouterInfo {
      */
     functionMetadata?: any;
 }
+export declare type DynamicRouterInfo = Omit<RouterInfo, 'id' | 'url' | 'prefix' | 'method' | 'controllerId' | 'controllerMiddleware' | 'responseMetadata'>;
 export interface RouterPriority {
     prefix: string;
     priority: number;
@@ -88,15 +90,27 @@ export interface RouterCollectorOptions {
     includeFunctionRouter?: boolean;
     globalPrefix?: string;
 }
-export declare class WebRouterCollector {
-    protected readonly baseDir: string;
+export declare class MidwayWebRouterService {
+    readonly options: RouterCollectorOptions;
     private isReady;
     protected routes: Map<string, RouterInfo[]>;
     private routesPriority;
-    protected options: RouterCollectorOptions;
-    constructor(baseDir?: string, options?: RouterCollectorOptions);
-    protected analyze(): Promise<void>;
-    protected collectRoute(module: any, functionMeta?: boolean): void;
+    constructor(options?: RouterCollectorOptions);
+    private analyze;
+    /**
+     * dynamically add a controller
+     * @param controllerClz
+     * @param controllerOption
+     * @param functionMeta
+     */
+    addController(controllerClz: any, controllerOption: ControllerOption, functionMeta?: boolean): void;
+    /**
+     * dynamically add a route to root prefix
+     * @param routerPath
+     * @param routerFunction
+     * @param routerInfoOption
+     */
+    addRouter(routerPath: string | RegExp, routerFunction: (...args: any[]) => void, routerInfoOption: DynamicRouterInfo): void;
     protected collectFunctionRoute(module: any, functionMeta?: boolean): void;
     sortRouter(urlMatchList: RouterInfo[]): {
         _pureRouter: string;
@@ -107,15 +121,15 @@ export declare class WebRouterCollector {
         /**
          * uuid
          */
-        id: string;
+        id?: string;
         /**
          * router prefix from controller
          */
-        prefix: string;
+        prefix?: string;
         /**
          * router alias name
          */
-        routerName: string;
+        routerName?: string;
         /**
          * router path, without prefix
          */
@@ -127,40 +141,40 @@ export declare class WebRouterCollector {
         /**
          * invoke function method
          */
-        method: string;
+        method: string | ((...args: any[]) => void);
         /**
          * router description
          */
-        description: string;
-        summary: string;
+        description?: string;
+        summary?: string;
         /**
          * router handler function key，for IoC container load
          */
-        handlerName: string;
+        handlerName?: string;
         /**
          *  serverless func load key
          */
-        funcHandlerName: string;
+        funcHandlerName?: string;
         /**
          * controller provideId
          */
-        controllerId: string;
+        controllerId?: string;
         /**
          * router middleware
          */
-        middleware: any[];
+        middleware?: any[];
         /**
          * controller middleware in this router
          */
-        controllerMiddleware: any[];
+        controllerMiddleware?: any[];
         /**
          * request args metadata
          */
-        requestMetadata: any[];
+        requestMetadata?: any[];
         /**
          * response data metadata
          */
-        responseMetadata: any[];
+        responseMetadata?: any[];
         /**
          * serverless function name
          */
@@ -183,4 +197,17 @@ export declare class WebRouterCollector {
     getFlattenRouterTable(): Promise<RouterInfo[]>;
     private checkDuplicateAndPush;
 }
-//# sourceMappingURL=webRouterCollector.d.ts.map
+/**
+ * @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=webRouterService.d.ts.map

package/dist/{common/webRouterCollector.js → service/webRouterService.js}

@@ -1,37 +1,40 @@
 "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 = void 0;
+exports.WebRouterCollector = exports.MidwayWebRouterService = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const util_1 = require("../util");
-const container_1 = require("../context/container");
-const fileDetector_1 = require("./fileDetector");
-const util = require("util");
 const error_1 = require("../error");
+const util = require("util");
+const contextUtil_1 = require("../util/contextUtil");
+const container_1 = require("../context/container");
+const fileDetector_1 = require("../common/fileDetector");
 const debug = util.debuglog('midway:debug');
-class WebRouterCollector {
-    constructor(baseDir = '', options = {}) {
+let MidwayWebRouterService = class MidwayWebRouterService {
+    constructor(options = {}) {
+        this.options = options;
         this.isReady = false;
         this.routes = new Map();
         this.routesPriority = [];
-        this.baseDir = baseDir;
-        this.options = options;
     }
     async analyze() {
-        if (this.baseDir) {
-            const container = new container_1.MidwayContainer();
-            container.setFileDetector(new fileDetector_1.DirectoryFileDetector({
-                loadDir: this.baseDir,
-            }));
-            await container.ready();
-        }
         const controllerModules = (0, decorator_1.listModule)(decorator_1.CONTROLLER_KEY);
         for (const module of controllerModules) {
-            this.collectRoute(module);
+            const controllerOption = (0, decorator_1.getClassMetadata)(decorator_1.CONTROLLER_KEY, module);
+            this.addController(module, controllerOption, this.options.includeFunctionRouter);
         }
         if (this.options.includeFunctionRouter) {
             const fnModules = (0, decorator_1.listModule)(decorator_1.FUNC_KEY);
             for (const module of fnModules) {
-                this.collectFunctionRoute(module);
+                this.collectFunctionRoute(module, this.options.includeFunctionRouter);
             }
         }
         // filter empty prefix
@@ -54,13 +57,37 @@ class WebRouterCollector {
         this.routesPriority = this.routesPriority.sort((routeA, routeB) => {
             return routeB.prefix.length - routeA.prefix.length;
         });
+        // format function router meta
+        if (this.options.includeFunctionRouter) {
+            // 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',
+                        ];
+                    }
+                }
+            }
+        }
     }
-    collectRoute(module, functionMeta = false) {
+    /**
+     * dynamically add a controller
+     * @param controllerClz
+     * @param controllerOption
+     * @param functionMeta
+     */
+    addController(controllerClz, controllerOption, functionMeta = false) {
         var _a;
-        const controllerId = (0, decorator_1.getProviderName)(module);
+        const controllerId = (0, decorator_1.getProviderName)(controllerClz);
         debug(`[core]: Found Controller ${controllerId}.`);
-        const id = (0, decorator_1.getProviderUUId)(module);
-        const controllerOption = (0, decorator_1.getClassMetadata)(decorator_1.CONTROLLER_KEY, module);
+        const id = (0, decorator_1.getProviderUUId)(controllerClz);
         let priority;
         // implement middleware in controller
         const middleware = controllerOption.routerOptions.middleware;
@@ -83,7 +110,7 @@ class WebRouterCollector {
                 middleware,
                 routerOptions: controllerOption.routerOptions,
                 controllerId,
-                routerModule: module,
+                routerModule: controllerClz,
             });
         }
         // set ignorePrefix
@@ -95,14 +122,14 @@ class WebRouterCollector {
                 middleware,
                 routerOptions: controllerOption.routerOptions,
                 controllerId,
-                routerModule: module,
+                routerModule: controllerClz,
             });
         }
-        const webRouterInfo = (0, decorator_1.getClassMetadata)(decorator_1.WEB_ROUTER_KEY, module);
+        const webRouterInfo = (0, decorator_1.getClassMetadata)(decorator_1.WEB_ROUTER_KEY, controllerClz);
         if (webRouterInfo && typeof webRouterInfo[Symbol.iterator] === 'function') {
             for (const webRouter of webRouterInfo) {
-                const routeArgsInfo = (0, decorator_1.getPropertyDataFromClass)(decorator_1.WEB_ROUTER_PARAM_KEY, module, webRouter.method) || [];
-                const routerResponseData = (0, decorator_1.getPropertyMetadata)(decorator_1.WEB_RESPONSE_KEY, module, webRouter.method) || [];
+                const routeArgsInfo = (0, decorator_1.getPropertyDataFromClass)(decorator_1.WEB_ROUTER_PARAM_KEY, controllerClz, webRouter.method) || [];
+                const routerResponseData = (0, decorator_1.getPropertyMetadata)(decorator_1.WEB_RESPONSE_KEY, controllerClz, webRouter.method) || [];
                 const data = {
                     id,
                     prefix: webRouter.ignoreGlobalPrefix ? ignorePrefix : prefix,
@@ -136,6 +163,18 @@ class WebRouterCollector {
             }
         }
     }
+    /**
+     * dynamically add a route to root prefix
+     * @param routerPath
+     * @param routerFunction
+     * @param routerInfoOption
+     */
+    addRouter(routerPath, routerFunction, routerInfoOption) {
+        this.checkDuplicateAndPush('/', Object.assign(routerInfoOption, {
+            method: routerFunction,
+            url: routerPath,
+        }));
+    }
     collectFunctionRoute(module, functionMeta = false) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         // serverlessTrigger metadata
@@ -323,9 +362,56 @@ class WebRouterCollector {
         }
         prefixList.push(routerInfo);
     }
-}
-exports.WebRouterCollector = WebRouterCollector;
+};
+MidwayWebRouterService = __decorate([
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton),
+    __metadata("design:paramtypes", [Object])
+], MidwayWebRouterService);
+exports.MidwayWebRouterService = MidwayWebRouterService;
 function createFunctionName(target, functionName) {
     return (0, decorator_1.getProviderName)(target).replace(/[:#]/g, '-') + '-' + functionName;
 }
-//# sourceMappingURL=webRouterCollector.js.map
+/**
+ * @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 ((0, contextUtil_1.getCurrentMainFramework)()) {
+                this.proxy = await (0, contextUtil_1.getCurrentMainFramework)()
+                    .getApplicationContext()
+                    .getAsync(MidwayWebRouterService, [this.options]);
+            }
+            else {
+                this.proxy = new 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=webRouterService.js.map

package/dist/setup.js

@@ -95,6 +95,7 @@ function prepareGlobalApplicationContext(globalOptions) {
     applicationContext.bindClass(_1.MidwayMiddlewareService);
     applicationContext.bindClass(_1.MidwayLifeCycleService);
     applicationContext.bindClass(_1.MidwayMockService);
+    applicationContext.bindClass(_1.MidwayWebRouterService);
     // bind preload module
     if (globalOptions.preloadModules && globalOptions.preloadModules.length) {
         for (const preloadModule of globalOptions.preloadModules) {

package/dist/util/index.d.ts

@@ -90,4 +90,5 @@ export declare function pathMatching(options: any): (ctx?: any) => any;
  */
 export declare function wrapMiddleware(mw: FunctionMiddleware<any, any>, options: any): (context: any, next: any, options?: any) => any;
 export declare function isIncludeProperty(obj: any, prop: string): boolean;
+export declare function wrapAsync(handler: any): (...args: any[]) => any;
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIncludeProperty = exports.wrapMiddleware = exports.pathMatching = exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
+exports.wrapAsync = exports.isIncludeProperty = exports.wrapMiddleware = exports.pathMatching = exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
@@ -313,4 +313,25 @@ function isIncludeProperty(obj, prop) {
     return false;
 }
 exports.isIncludeProperty = isIncludeProperty;
+function wrapAsync(handler) {
+    return (...args) => {
+        if (typeof args[args.length - 1] === 'function') {
+            const callback = args.pop();
+            if (handler.constructor.name !== 'AsyncFunction') {
+                const err = new TypeError('Must be an AsyncFunction');
+                return callback(err);
+            }
+            // 其他事件场景
+            return handler.apply(handler, args).then(result => {
+                callback(null, result);
+            }, err => {
+                callback(err);
+            });
+        }
+        else {
+            return handler.apply(handler, args);
+        }
+    };
+}
+exports.wrapAsync = wrapAsync;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.3.5",
+  "version": "3.4.0-beta.2",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.3.4",
+    "@midwayjs/decorator": "^3.4.0-beta.2",
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "5a835008aaa26e1b3c7d99c525f4a9fdaa3e41d1"
+  "gitHead": "a61721d3946b30fd4cac183265edcd99b31ac72b"
 }

package/dist/common/triggerCollector.d.ts

@@ -1,8 +0,0 @@
-import { WebRouterCollector } from './webRouterCollector';
-export declare class ServerlessTriggerCollector extends WebRouterCollector {
-    protected analyze(): Promise<void>;
-    protected collectRoute(module: any): void;
-    protected collectFunctionRoute(module: any): void;
-    getFunctionList(): Promise<any[]>;
-}
-//# sourceMappingURL=triggerCollector.d.ts.map

package/dist/common/triggerCollector.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerlessTriggerCollector = void 0;
-const webRouterCollector_1 = require("./webRouterCollector");
-class ServerlessTriggerCollector extends webRouterCollector_1.WebRouterCollector {
-    async analyze() {
-        this.options.includeFunctionRouter = true;
-        await super.analyze();
-        // 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',
-                    ];
-                }
-            }
-        }
-    }
-    collectRoute(module) {
-        super.collectRoute(module, true);
-    }
-    collectFunctionRoute(module) {
-        super.collectFunctionRoute(module, true);
-    }
-    async getFunctionList() {
-        return this.getFlattenRouterTable();
-    }
-}
-exports.ServerlessTriggerCollector = ServerlessTriggerCollector;
-//# sourceMappingURL=triggerCollector.js.map