@midwayjs/core 3.3.6 → 3.4.0-beta.11

package/dist/error/base.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayHttpError = exports.MidwayError = exports.registerErrorCode = void 0;
+const http_1 = require("http");
 const codeGroup = new Set();
 /**
  * Register error group and code, return the standard ErrorCode
@@ -40,7 +41,11 @@ class MidwayError extends Error {
 exports.MidwayError = MidwayError;
 class MidwayHttpError extends MidwayError {
     constructor(resOrMessage, status, code, options) {
-        super(typeof resOrMessage === 'string' ? resOrMessage : resOrMessage.message, code !== null && code !== void 0 ? code : String(status), options);
+        super(resOrMessage
+            ? typeof resOrMessage === 'string'
+                ? resOrMessage
+                : resOrMessage.message
+            : http_1.STATUS_CODES[status], code !== null && code !== void 0 ? code : String(status), options);
         this.status = status;
     }
 }

package/dist/error/framework.d.ts

@@ -16,6 +16,8 @@ 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";
+    readonly DUPLICATE_CONTROLLER_PREFIX_OPTIONS: "MIDWAY_10016";
 };
 export declare class MidwayCommonError extends MidwayError {
     constructor(message: string);
@@ -62,4 +64,10 @@ 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);
+}
+export declare class MidwayDuplicateControllerOptionsError extends MidwayError {
+    constructor(prefix: string, existController: string, existControllerOther: 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.MidwayDuplicateControllerOptionsError = 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,8 @@ exports.FrameworkErrorEnum = (0, base_1.registerErrorCode)('midway', {
     UTIL_HTTP_TIMEOUT: 10012,
     INCONSISTENT_VERSION: 10013,
     INVALID_CONFIG: 10014,
+    DUPLICATE_CLASS_NAME: 10015,
+    DUPLICATE_CONTROLLER_PREFIX_OPTIONS: 10016,
 });
 class MidwayCommonError extends base_1.MidwayError {
     constructor(message) {
@@ -122,4 +124,16 @@ 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;
+class MidwayDuplicateControllerOptionsError extends base_1.MidwayError {
+    constructor(prefix, existController, existControllerOther) {
+        super(`"Prefix ${prefix}" with duplicated controller options between "${existController}" and "${existControllerOther}"`, exports.FrameworkErrorEnum.DUPLICATE_CONTROLLER_PREFIX_OPTIONS);
+    }
+}
+exports.MidwayDuplicateControllerOptionsError = MidwayDuplicateControllerOptionsError;
 //# sourceMappingURL=framework.js.map

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

@@ -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,6 +19,9 @@ 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';
@@ -34,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.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");
@@ -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,6 +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; } });
+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);
@@ -75,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];
 };
@@ -14,6 +15,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 +136,7 @@ export interface IObjectDefinition {
     }>;
     createFrom: 'framework' | 'file' | 'module';
     allowDowngrade: boolean;
+    bindHook?: (module: any, options?: IObjectDefinition) => void;
 }
 export interface IObjectCreator {
     load(): any;
@@ -305,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
  */
@@ -426,6 +433,7 @@ export interface IMidwayBootstrapOptions {
     globalConfig?: Array<{
         [environmentName: string]: Record<string, any>;
     }> | Record<string, any>;
+    asyncContextManager?: AsyncContextManager;
 }
 export interface IConfigurationOptions {
     logger?: ILogger;
@@ -473,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/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