@midwayjs/core 3.10.10 → 3.11.0

package/dist/context/container.js

@@ -19,6 +19,7 @@ const types_1 = require("../util/types");
 const util_1 = require("../util");
 const debug = util.debuglog('midway:debug');
 const debugBind = util.debuglog('midway:bind');
+const debugSpaceLength = 9;
 class ContainerConfiguration {
     constructor(container) {
         this.container = container;
@@ -314,7 +315,7 @@ class MidwayContainer {
         const props = (0, decorator_1.getPropertyInject)(target);
         for (const p in props) {
             const propertyMeta = props[p];
-            debugBind(`  inject properties => [${JSON.stringify(propertyMeta)}]`);
+            debugBind(`${' '.repeat(debugSpaceLength)}inject properties => [${JSON.stringify(propertyMeta)}]`);
             const refManaged = new managedResolverFactory_1.ManagedReference();
             refManaged.args = propertyMeta.args;
             refManaged.name = propertyMeta.value;
@@ -330,19 +331,19 @@ class MidwayContainer {
         // @async, @init, @destroy @scope
         const objDefOptions = (_a = (0, decorator_1.getObjectDefinition)(target)) !== null && _a !== void 0 ? _a : {};
         if (objDefOptions.initMethod) {
-            debugBind(`  register initMethod = ${objDefOptions.initMethod}`);
+            debugBind(`${' '.repeat(debugSpaceLength)}register initMethod = ${objDefOptions.initMethod}`);
             definition.initMethod = objDefOptions.initMethod;
         }
         if (objDefOptions.destroyMethod) {
-            debugBind(`  register destroyMethod = ${objDefOptions.destroyMethod}`);
+            debugBind(`${' '.repeat(debugSpaceLength)}register destroyMethod = ${objDefOptions.destroyMethod}`);
             definition.destroyMethod = objDefOptions.destroyMethod;
         }
         if (objDefOptions.scope) {
-            debugBind(`  register scope = ${objDefOptions.scope}`);
+            debugBind(`${' '.repeat(debugSpaceLength)}register scope = ${objDefOptions.scope}`);
             definition.scope = objDefOptions.scope;
         }
         if (objDefOptions.allowDowngrade) {
-            debugBind(`  register allowDowngrade = ${objDefOptions.allowDowngrade}`);
+            debugBind(`${' '.repeat(debugSpaceLength)}register allowDowngrade = ${objDefOptions.allowDowngrade}`);
             definition.allowDowngrade = objDefOptions.allowDowngrade;
         }
         this.objectCreateEventTarget.emit(interface_1.ObjectLifeCycleEvent.BEFORE_BIND, target, {

package/dist/interface.d.ts

@@ -619,13 +619,14 @@ export interface Context {
 }
 export type IMidwayContext<FrameworkContext = unknown> = Context & FrameworkContext;
 export type NextFunction = () => Promise<any>;
+export type IgnoreMatcher<CTX> = string | RegExp | ((ctx: CTX) => boolean);
 /**
  * Common middleware definition
  */
 export interface IMiddleware<CTX, R, N = unknown> {
     resolve: (app: IMidwayApplication) => FunctionMiddleware<CTX, R, N> | Promise<FunctionMiddleware<CTX, R, N>>;
-    match?: (ctx: CTX) => boolean;
-    ignore?: (ctx: CTX) => boolean;
+    match?: IgnoreMatcher<CTX> | IgnoreMatcher<CTX>[];
+    ignore?: IgnoreMatcher<CTX> | IgnoreMatcher<CTX>[];
 }
 export type FunctionMiddleware<CTX, R, N = unknown> = N extends true ? (req: CTX, res: R, next: N) => any : (context: CTX, next: R, options?: any) => any;
 export type ClassMiddleware<CTX, R, N> = new (...args: any[]) => IMiddleware<CTX, R, N>;

package/dist/service/middlewareService.js

@@ -20,7 +20,6 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
         this.applicationContext = applicationContext;
     }
     async compose(middleware, app, name) {
-        var _a, _b;
         if (!Array.isArray(middleware)) {
             throw new error_1.MidwayParameterError('Middleware stack must be an array');
         }
@@ -49,8 +48,9 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                         // wrap ignore and match
                         const mw = fn;
                         const match = (0, util_1.pathMatching)({
-                            match: (_a = classMiddleware.match) === null || _a === void 0 ? void 0 : _a.bind(classMiddleware),
-                            ignore: (_b = classMiddleware.ignore) === null || _b === void 0 ? void 0 : _b.bind(classMiddleware),
+                            match: classMiddleware.match,
+                            ignore: classMiddleware.ignore,
+                            thisResolver: classMiddleware,
                         });
                         fn = (ctx, next, options) => {
                             if (!match(ctx))

package/dist/service/mockService.js

@@ -140,33 +140,45 @@ let MidwayMockService = MidwayMockService_1 = class MidwayMockService {
         }
     }
     async runSimulatorSetup() {
+        var _a;
         for (const simulator of this.simulatorList) {
-            await (simulator === null || simulator === void 0 ? void 0 : simulator.setup());
+            await ((_a = simulator.setup) === null || _a === void 0 ? void 0 : _a.call(simulator));
         }
     }
     async runSimulatorTearDown() {
-        for (const simulator of this.simulatorList) {
-            await (simulator === null || simulator === void 0 ? void 0 : simulator.tearDown());
+        var _a;
+        // reverse loop and not change origin simulatorList
+        for (let i = this.simulatorList.length - 1; i >= 0; i--) {
+            const simulator = this.simulatorList[i];
+            await ((_a = simulator.tearDown) === null || _a === void 0 ? void 0 : _a.call(simulator));
         }
     }
     async runSimulatorAppSetup(app) {
+        var _a;
         for (const simulator of this.simulatorList) {
-            await (simulator === null || simulator === void 0 ? void 0 : simulator.appSetup(app));
+            await ((_a = simulator.appSetup) === null || _a === void 0 ? void 0 : _a.call(simulator, app));
         }
     }
     async runSimulatorAppTearDown(app) {
-        for (const simulator of this.simulatorList) {
-            await (simulator === null || simulator === void 0 ? void 0 : simulator.appTearDown(app));
+        var _a;
+        // reverse loop and not change origin simulatorList
+        for (let i = this.simulatorList.length - 1; i >= 0; i--) {
+            const simulator = this.simulatorList[i];
+            await ((_a = simulator.appTearDown) === null || _a === void 0 ? void 0 : _a.call(simulator, app));
         }
     }
     async runSimulatorContextSetup(ctx, app) {
+        var _a;
         for (const simulator of this.simulatorList) {
-            await (simulator === null || simulator === void 0 ? void 0 : simulator.contextSetup(ctx, app));
+            await ((_a = simulator.contextSetup) === null || _a === void 0 ? void 0 : _a.call(simulator, ctx, app));
         }
     }
     async runSimulatorContextTearDown(ctx, app) {
-        for (const simulator of this.simulatorList) {
-            await (simulator === null || simulator === void 0 ? void 0 : simulator.contextTearDown(ctx, app));
+        var _a;
+        // reverse loop and not change origin simulatorList
+        for (let i = this.simulatorList.length - 1; i >= 0; i--) {
+            const simulator = this.simulatorList[i];
+            await ((_a = simulator === null || simulator === void 0 ? void 0 : simulator.contextTearDown) === null || _a === void 0 ? void 0 : _a.call(simulator, ctx, app));
         }
     }
 };

package/dist/service/slsFunctionService.js

@@ -52,7 +52,7 @@ let MidwayServerlessFunctionService = class MidwayServerlessFunctionService exte
         }
     }
     collectFunctionRoute(module) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         // serverlessTrigger metadata
         const webRouterInfo = (0, decorator_1.getClassMetadata)(decorator_1.FUNC_KEY, module);
         const controllerId = (0, decorator_1.getProviderName)(module);
@@ -94,7 +94,9 @@ let MidwayServerlessFunctionService = class MidwayServerlessFunctionService exte
                 };
                 const functionMeta = (0, decorator_1.getPropertyMetadata)(decorator_1.SERVERLESS_FUNC_KEY, module, webRouter['methodName']) || {};
                 const functionName = (_g = (_e = functionMeta['functionName']) !== null && _e !== void 0 ? _e : (_f = webRouter === null || webRouter === void 0 ? void 0 : webRouter['metadata']) === null || _f === void 0 ? void 0 : _f['functionName']) !== null && _g !== void 0 ? _g : createFunctionName(module, webRouter['methodName']);
+                const funcHandlerName = (_k = (_h = functionMeta['handlerName']) !== null && _h !== void 0 ? _h : (_j = webRouter === null || webRouter === void 0 ? void 0 : webRouter['metadata']) === null || _j === void 0 ? void 0 : _j['handlerName']) !== null && _k !== void 0 ? _k : data.funcHandlerName;
                 data.functionName = functionName;
+                data.funcHandlerName = funcHandlerName;
                 data.functionTriggerName = webRouter['type'];
                 data.functionTriggerMetadata = webRouter['metadata'];
                 data.functionMetadata = {
@@ -105,7 +107,8 @@ let MidwayServerlessFunctionService = class MidwayServerlessFunctionService exte
             }
             else {
                 const functionMeta = (0, decorator_1.getPropertyMetadata)(decorator_1.SERVERLESS_FUNC_KEY, module, webRouter['methodName']) || {};
-                const functionName = (_k = (_h = functionMeta['functionName']) !== null && _h !== void 0 ? _h : (_j = webRouter === null || webRouter === void 0 ? void 0 : webRouter['metadata']) === null || _j === void 0 ? void 0 : _j['functionName']) !== null && _k !== void 0 ? _k : createFunctionName(module, webRouter['methodName']);
+                const functionName = (_o = (_l = functionMeta['functionName']) !== null && _l !== void 0 ? _l : (_m = webRouter === null || webRouter === void 0 ? void 0 : webRouter['metadata']) === null || _m === void 0 ? void 0 : _m['functionName']) !== null && _o !== void 0 ? _o : createFunctionName(module, webRouter['methodName']);
+                const funcHandlerName = (_r = (_p = functionMeta['handlerName']) !== null && _p !== void 0 ? _p : (_q = webRouter === null || webRouter === void 0 ? void 0 : webRouter['metadata']) === null || _q === void 0 ? void 0 : _q['handlerName']) !== null && _r !== void 0 ? _r : `${controllerId}.${webRouter['methodName']}`;
                 // 其他类型的函数
                 this.checkDuplicateAndPush(prefix, {
                     id,
@@ -117,9 +120,9 @@ let MidwayServerlessFunctionService = class MidwayServerlessFunctionService exte
                     description: '',
                     summary: '',
                     handlerName: `${controllerId}.${webRouter['methodName']}`,
-                    funcHandlerName: `${controllerId}.${webRouter['methodName']}`,
+                    funcHandlerName: funcHandlerName,
                     controllerId,
-                    middleware: ((_l = webRouter['metadata']) === null || _l === void 0 ? void 0 : _l['middleware']) || [],
+                    middleware: ((_s = webRouter['metadata']) === null || _s === void 0 ? void 0 : _s['middleware']) || [],
                     controllerMiddleware: [],
                     requestMetadata: [],
                     responseMetadata: [],

package/dist/service/webRouterService.d.ts

@@ -37,7 +37,7 @@ export interface RouterInfo {
      */
     handlerName?: string;
     /**
-     *  serverless func load key
+     *  serverless func load key, will be override by @ServerlessTrigger and @ServerlessFunction
      */
     funcHandlerName?: string;
     /**
@@ -65,7 +65,7 @@ export interface RouterInfo {
      */
     responseMetadata?: any[];
     /**
-     * serverless function name
+     * serverless function name, will be override by @ServerlessTrigger and @ServerlessFunction
      */
     functionName?: string;
     /**
@@ -177,7 +177,7 @@ export declare class MidwayWebRouterService {
          */
         handlerName?: string;
         /**
-         *  serverless func load key
+         *  serverless func load key, will be override by @ServerlessTrigger and @ServerlessFunction
          */
         funcHandlerName?: string;
         /**
@@ -205,7 +205,7 @@ export declare class MidwayWebRouterService {
          */
         responseMetadata?: any[];
         /**
-         * serverless function name
+         * serverless function name, will be override by @ServerlessTrigger and @ServerlessFunction
          */
         functionName?: string;
         /**

package/dist/setup.js

@@ -8,12 +8,17 @@ const util = require("util");
 const path_1 = require("path");
 const slsFunctionService_1 = require("./service/slsFunctionService");
 const debug = util.debuglog('midway:debug');
+let stepIdx = 1;
+function printStepDebugInfo(stepInfo) {
+    debug(`\n\nStep ${stepIdx++}: ${stepInfo}\n`);
+}
 /**
  * midway framework main entry, this method bootstrap all service and framework.
  * @param globalOptions
  */
 async function initializeGlobalApplicationContext(globalOptions) {
     const applicationContext = prepareGlobalApplicationContext(globalOptions);
+    printStepDebugInfo('Init logger');
     // init logger
     const loggerService = await applicationContext.getAsync(_1.MidwayLoggerService, [
         applicationContext,
@@ -23,23 +28,28 @@ async function initializeGlobalApplicationContext(globalOptions) {
         // register global logger
         applicationContext.registerObject('logger', loggerService.getLogger('appLogger'));
     }
+    printStepDebugInfo('Init MidwayMockService');
+    // mock support
+    await applicationContext.getAsync(_1.MidwayMockService, [applicationContext]);
+    printStepDebugInfo('Init framework');
     // framework/config/plugin/logger/app decorator support
     await applicationContext.getAsync(_1.MidwayFrameworkService, [
         applicationContext,
         globalOptions,
     ]);
+    printStepDebugInfo('Init lifecycle');
     // lifecycle support
     await applicationContext.getAsync(_1.MidwayLifeCycleService, [
         applicationContext,
     ]);
-    // mock support
-    await applicationContext.get(_1.MidwayMockService, [applicationContext]);
+    printStepDebugInfo('Init preload modules');
     // some preload module init
     const modules = (0, decorator_1.listPreloadModule)();
     for (const module of modules) {
         // preload init context
         await applicationContext.getAsync(module);
     }
+    printStepDebugInfo('End of initialize and start');
     return applicationContext;
 }
 exports.initializeGlobalApplicationContext = initializeGlobalApplicationContext;
@@ -63,6 +73,7 @@ exports.destroyGlobalApplicationContext = destroyGlobalApplicationContext;
  */
 function prepareGlobalApplicationContext(globalOptions) {
     var _a, _b, _c, _d;
+    printStepDebugInfo('Ready to create applicationContext');
     debug('[core]: start "initializeGlobalApplicationContext"');
     debug(`[core]: bootstrap options = ${util.inspect(globalOptions)}`);
     const appDir = (_a = globalOptions.appDir) !== null && _a !== void 0 ? _a : '';
@@ -76,6 +87,7 @@ function prepareGlobalApplicationContext(globalOptions) {
     // register baseDir and appDir
     applicationContext.registerObject('baseDir', baseDir);
     applicationContext.registerObject('appDir', appDir);
+    printStepDebugInfo('Ready module detector');
     if (globalOptions.moduleDetector !== false) {
         if (globalOptions.moduleDetector === undefined ||
             globalOptions.moduleDetector === 'file') {
@@ -88,6 +100,7 @@ function prepareGlobalApplicationContext(globalOptions) {
             applicationContext.setFileDetector(globalOptions.moduleDetector);
         }
     }
+    printStepDebugInfo('Binding inner service');
     // bind inner service
     applicationContext.bindClass(_1.MidwayEnvironmentService);
     applicationContext.bindClass(_1.MidwayInformationService);
@@ -102,12 +115,14 @@ function prepareGlobalApplicationContext(globalOptions) {
     applicationContext.bindClass(_1.MidwayMockService);
     applicationContext.bindClass(_1.MidwayWebRouterService);
     applicationContext.bindClass(slsFunctionService_1.MidwayServerlessFunctionService);
+    printStepDebugInfo('Binding preload module');
     // bind preload module
     if (globalOptions.preloadModules && globalOptions.preloadModules.length) {
         for (const preloadModule of globalOptions.preloadModules) {
             applicationContext.bindClass(preloadModule);
         }
     }
+    printStepDebugInfo('Init MidwayConfigService, MidwayAspectService and MidwayDecoratorService');
     // init default config
     const configService = applicationContext.get(_1.MidwayConfigService);
     configService.add([
@@ -119,6 +134,7 @@ function prepareGlobalApplicationContext(globalOptions) {
     applicationContext.get(_1.MidwayAspectService, [applicationContext]);
     // init decorator service
     applicationContext.get(_1.MidwayDecoratorService, [applicationContext]);
+    printStepDebugInfo('Load imports(component) and user code configuration module');
     if (!globalOptions.imports) {
         globalOptions.imports = [
             (0, _1.safeRequire)((0, path_1.join)(globalOptions.baseDir, 'configuration')),
@@ -132,6 +148,7 @@ function prepareGlobalApplicationContext(globalOptions) {
             applicationContext.load(configurationModule);
         }
     }
+    printStepDebugInfo('Run applicationContext ready method');
     // bind user code module
     applicationContext.ready();
     if (globalOptions.globalConfig) {
@@ -142,6 +159,7 @@ function prepareGlobalApplicationContext(globalOptions) {
             configService.addObject(globalOptions.globalConfig);
         }
     }
+    printStepDebugInfo('Load config file');
     // merge config
     configService.load();
     debug('[core]: Current config = %j', configService.getConfiguration());

package/dist/util/httpclient.js

@@ -13,6 +13,11 @@ const mimeMap = {
     json: 'application/json',
     octet: 'application/octet-stream',
 };
+function isHeaderExists(headers, headerKey) {
+    return (headers[headerKey] ||
+        headers[headerKey.toLowerCase()] ||
+        headers[headerKey.toUpperCase()]);
+}
 async function makeHttpRequest(url, options = {}) {
     debug(`request '${url}'`);
     const whatwgUrl = new URL(url);
@@ -34,8 +39,12 @@ async function makeHttpRequest(url, options = {}) {
     }
     else if (options.data) {
         data = Buffer.from(JSON.stringify(options.data));
-        headers['Content-Type'] = mimeMap[contentType] || mimeMap.octet;
-        headers['Content-Length'] = data.byteLength;
+        if (!isHeaderExists(headers, 'Content-Type')) {
+            headers['Content-Type'] = mimeMap[contentType] || mimeMap.octet;
+        }
+        if (!isHeaderExists(headers, 'Content-Length')) {
+            headers['Content-Length'] = data.byteLength;
+        }
     }
     return new Promise((resolve, reject) => {
         const req = client.request(whatwgUrl.toString(), {

package/dist/util/index.d.ts

@@ -1,4 +1,4 @@
-import { FunctionMiddleware } from '../interface';
+import { FunctionMiddleware, IgnoreMatcher } from '../interface';
 import { camelCase, pascalCase } from './camelCase';
 import { randomUUID } from './uuid';
 import { safeParse, safeStringify } from './flatted';
@@ -85,7 +85,11 @@ export declare const deprecatedOutput: (message: string) => void;
  */
 export declare const transformRequestObjectByType: (originValue: any, targetType?: any) => any;
 export declare function toPathMatch(pattern: any): any;
-export declare function pathMatching(options: any): (ctx?: any) => any;
+export declare function pathMatching(options: {
+    match?: IgnoreMatcher<any> | IgnoreMatcher<any>[];
+    ignore?: IgnoreMatcher<any> | IgnoreMatcher<any>[];
+    thisResolver?: any;
+}): (ctx?: any) => boolean;
 /**
  * wrap function middleware with match and ignore
  * @param mw

package/dist/util/index.js

@@ -12,7 +12,7 @@ const uuid_1 = require("./uuid");
 const flatted_1 = require("./flatted");
 const crypto = require("crypto");
 const types_1 = require("./types");
-const debug = (0, util_1.debuglog)('midway:container:util');
+const debug = (0, util_1.debuglog)('midway:debug');
 /**
  * @since 2.0.0
  * @param env
@@ -49,7 +49,7 @@ const safeRequire = (p, enabledCache = true) => {
         }
     }
     catch (err) {
-        debug(`SafeRequire Warning, message = ${err.message}`);
+        debug(`[core]: SafeRequire Warning\n\n${err.message}\n`);
         return undefined;
     }
 };
@@ -270,9 +270,32 @@ function pathMatching(options) {
         throw new error_1.MidwayCommonError('options.match and options.ignore can not both present');
     if (!options.match && !options.ignore)
         return () => true;
+    if (options.match && !Array.isArray(options.match)) {
+        options.match = [options.match];
+    }
+    if (options.ignore && !Array.isArray(options.ignore)) {
+        options.ignore = [options.ignore];
+    }
+    const createMatch = (ignoreMatcherArr) => {
+        const matchedArr = ignoreMatcherArr.map(item => {
+            if (options.thisResolver) {
+                return toPathMatch(item).bind(options.thisResolver);
+            }
+            return toPathMatch(item);
+        });
+        return ctx => {
+            for (let i = 0; i < matchedArr.length; i++) {
+                const matched = matchedArr[i](ctx);
+                if (matched) {
+                    return true;
+                }
+            }
+            return false;
+        };
+    };
     const matchFn = options.match
-        ? toPathMatch(options.match)
-        : toPathMatch(options.ignore);
+        ? createMatch(options.match)
+        : createMatch(options.ignore);
     return function pathMatch(ctx) {
         const matched = matchFn(ctx);
         return options.match ? matched : !matched;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.10.10",
+  "version": "3.11.0",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -24,8 +24,8 @@
   "devDependencies": {
     "koa": "2.14.1",
     "mm": "3.2.1",
-    "raw-body": "2.5.1",
-    "sinon": "15.0.1"
+    "raw-body": "2.5.2",
+    "sinon": "15.0.3"
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
@@ -42,5 +42,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "93d333e82e75b6eb44ab83f74a378172508730d6"
+  "gitHead": "eadb977e7fddcd4287c099fc32b601cd51702514"
 }