@midwayjs/core 3.4.0-beta.9 → 3.4.3

package/dist/baseFramework.d.ts

@@ -8,6 +8,7 @@ import { ContextMiddlewareManager } from './common/middlewareManager';
 import { MidwayMiddlewareService } from './service/middlewareService';
 import { FilterManager } from './common/filterManager';
 import { MidwayMockService } from './service/mockService';
+import { AsyncContextManager } from './common/asyncContextManager';
 export declare abstract class BaseFramework<APP extends IMidwayApplication<CTX>, CTX extends IMidwayContext, OPT extends IConfigurationOptions, ResOrNext = unknown, Next = unknown> implements IMidwayFramework<APP, CTX, OPT, ResOrNext, Next> {
     readonly applicationContext: IMidwayContainer;
     app: APP;
@@ -21,6 +22,7 @@ export declare abstract class BaseFramework<APP extends IMidwayApplication<CTX>,
     protected filterManager: FilterManager<CTX, ResOrNext, Next>;
     protected composeMiddleware: any;
     protected bootstrapOptions: IMidwayBootstrapOptions;
+    protected asyncContextManager: AsyncContextManager;
     loggerService: MidwayLoggerService;
     environmentService: MidwayEnvironmentService;
     configService: MidwayConfigService;

package/dist/baseFramework.js

@@ -234,18 +234,22 @@ class BaseFramework {
     async afterContainerReady(options) { }
     async applyMiddleware(lastMiddleware) {
         var _a;
-        const asyncContextManagerEnabled = this.configService.getConfiguration('asyncContextManager.enable') ||
-            false;
-        const contextManager = asyncContextManagerEnabled
-            ? ((_a = this.bootstrapOptions) === null || _a === void 0 ? void 0 : _a.contextManager) || new asyncContextManager_1.NoopContextManager()
-            : new asyncContextManager_1.NoopContextManager();
-        if (asyncContextManagerEnabled) {
-            contextManager.enable();
+        if (!this.applicationContext.hasObject(interface_1.ASYNC_CONTEXT_MANAGER_KEY)) {
+            const asyncContextManagerEnabled = this.configService.getConfiguration('asyncContextManager.enable') ||
+                false;
+            const contextManager = asyncContextManagerEnabled
+                ? ((_a = this.bootstrapOptions) === null || _a === void 0 ? void 0 : _a.asyncContextManager) || new asyncContextManager_1.NoopContextManager()
+                : new asyncContextManager_1.NoopContextManager();
+            if (asyncContextManagerEnabled) {
+                contextManager.enable();
+            }
+            this.applicationContext.registerObject(interface_1.ASYNC_CONTEXT_MANAGER_KEY, contextManager);
         }
         if (!this.composeMiddleware) {
             this.middlewareManager.insertFirst((async (ctx, next) => {
                 // warp with context manager
                 const rootContext = asyncContextManager_1.ASYNC_ROOT_CONTEXT.setValue(interface_1.ASYNC_CONTEXT_KEY, ctx);
+                const contextManager = this.applicationContext.get(interface_1.ASYNC_CONTEXT_MANAGER_KEY);
                 return await contextManager.with(rootContext, async () => {
                     this.mockService.applyContextMocks(this.app, ctx);
                     let returnResult = undefined;

package/dist/common/fileDetector.d.ts

@@ -11,6 +11,7 @@ export declare class DirectoryFileDetector extends AbstractFileDetector<{
     pattern: string | string[];
     ignore: string | string[];
     namespace: string;
+    conflictCheck: boolean;
 }> {
     private directoryFilterArray;
     private duplicateModuleCheckSet;

package/dist/common/fileDetector.js

@@ -45,7 +45,7 @@ class DirectoryFileDetector extends AbstractFileDetector {
             });
             // 检查重复模块
             const checkDuplicatedHandler = (module, options) => {
-                if (decorator_1.Types.isClass(module)) {
+                if (this.extraDetectorOptions.conflictCheck && decorator_1.Types.isClass(module)) {
                     const name = (0, decorator_1.getProviderName)(module);
                     if (name) {
                         if (this.duplicateModuleCheckSet.has(name)) {

package/dist/common/filterManager.js

@@ -31,10 +31,11 @@ class FilterManager {
             const filter = await applicationContext.getAsync(FilterClass);
             const exceptionMetadata = (0, decorator_1.getClassMetadata)(decorator_1.CATCH_KEY, FilterClass);
             if (exceptionMetadata && exceptionMetadata.catchTargets) {
+                exceptionMetadata.catchOptions = exceptionMetadata.catchOptions || {};
                 for (const Exception of exceptionMetadata.catchTargets) {
                     this.exceptionMap.set(Exception, {
                         filter,
-                        catchOptions: exceptionMetadata.catchOptions || {},
+                        catchOptions: exceptionMetadata.catchOptions,
                     });
                     if (exceptionMetadata.catchOptions['matchPrototype']) {
                         this.protoMatchList.push(err => {

package/dist/context/container.js

@@ -53,9 +53,10 @@ class ContainerConfiguration {
                     namespace = configurationOptions.namespace;
                     this.namespaceList.push(namespace);
                 }
-                if (configurationOptions.detectorOptions) {
-                    this.detectorOptionsList.push(configurationOptions.detectorOptions);
-                }
+                this.detectorOptionsList.push({
+                    conflictCheck: configurationOptions.conflictCheck,
+                    ...configurationOptions.detectorOptions,
+                });
                 debug(`[core]: load configuration in namespace="${namespace}"`);
                 this.addImports(configurationOptions.imports);
                 this.addImportObjects(configurationOptions.importObjects);

package/dist/error/base.d.ts

@@ -22,7 +22,7 @@ export declare class MidwayError extends Error {
 }
 export declare type ResOrMessage = string | {
     message: string;
-};
+} | undefined;
 export declare class MidwayHttpError extends MidwayError {
     status: number;
     constructor(resOrMessage: ResOrMessage, status: number);

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

@@ -482,5 +482,6 @@ 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.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;
+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";
@@ -20,4 +20,5 @@ var MidwayProcessTypeEnum;
 })(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/webRouterService.js

@@ -95,7 +95,7 @@ let MidwayWebRouterService = class MidwayWebRouterService {
         }
         else {
             // 不同的 controller，可能会有相同的 prefix，一旦 options 不同，就要报错
-            if (middleware) {
+            if (middleware && middleware.length > 0) {
                 const originRoute = this.routesPriority.filter(el => {
                     return el.prefix === prefix;
                 })[0];

package/dist/util/contextUtil.d.ts

@@ -1,5 +1,7 @@
 import { IConfigurationOptions, IMidwayContainer, IMidwayFramework } from '../interface';
+import { AsyncContextManager } from '../common/asyncContextManager';
 export declare const getCurrentApplicationContext: () => IMidwayContainer;
 export declare const getCurrentMainFramework: <APP extends import("../interface").IMidwayBaseApplication<CTX>, CTX extends import("../interface").Context, CONFIG extends IConfigurationOptions>() => IMidwayFramework<APP, CTX, CONFIG, unknown, unknown>;
 export declare const getCurrentMainApp: <APP extends import("../interface").IMidwayBaseApplication<import("../interface").Context>>() => APP;
+export declare const getCurrentAsyncContextManager: () => AsyncContextManager;
 //# sourceMappingURL=contextUtil.d.ts.map

package/dist/util/contextUtil.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentMainApp = exports.getCurrentMainFramework = exports.getCurrentApplicationContext = void 0;
+exports.getCurrentAsyncContextManager = exports.getCurrentMainApp = exports.getCurrentMainFramework = exports.getCurrentApplicationContext = void 0;
+const interface_1 = require("../interface");
 const getCurrentApplicationContext = () => {
     return global['MIDWAY_APPLICATION_CONTEXT'];
 };
@@ -17,4 +18,8 @@ const getCurrentMainApp = () => {
     return undefined;
 };
 exports.getCurrentMainApp = getCurrentMainApp;
+const getCurrentAsyncContextManager = () => {
+    return (0, exports.getCurrentApplicationContext)().get(interface_1.ASYNC_CONTEXT_MANAGER_KEY);
+};
+exports.getCurrentAsyncContextManager = getCurrentAsyncContextManager;
 //# sourceMappingURL=contextUtil.js.map

package/package.json

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