@midwayjs/core 3.11.0 → 3.11.1

package/dist/decorator/decoratorManager.js

@@ -7,6 +7,7 @@ const constant_1 = require("./constant");
 const types_1 = require("../util/types");
 const camelCase_1 = require("../util/camelCase");
 const util_1 = require("../util");
+const pathFileUtil_1 = require("../util/pathFileUtil");
 const debug = require('util').debuglog('midway:core');
 exports.PRELOAD_MODULE_KEY = 'INJECTION_PRELOAD_MODULE_KEY';
 exports.INJECT_CLASS_KEY_PREFIX = 'INJECTION_CLASS_META_DATA';
@@ -249,6 +250,13 @@ let manager = new DecoratorManager();
 if (typeof global === 'object') {
     if (global['MIDWAY_GLOBAL_DECORATOR_MANAGER']) {
         console.warn('DecoratorManager not singleton and please check @midwayjs/core version by "npm ls @midwayjs/core"');
+        const coreModulePathList = (0, pathFileUtil_1.getModuleRequirePathList)('@midwayjs/core');
+        if (coreModulePathList.length) {
+            console.info('The module may be located in:');
+            coreModulePathList.forEach((path, index) => {
+                console.info(`${index + 1}. ${path}`);
+            });
+        }
         manager = global['MIDWAY_GLOBAL_DECORATOR_MANAGER'];
     }
     else {

package/dist/interface.d.ts

@@ -243,6 +243,7 @@ export interface JoinPoint {
     target: any;
     args: any[];
     proceed?(...args: any[]): any;
+    proceedIsAsyncFunction?: boolean;
 }
 export interface AspectMetadata {
     aspectTarget: any;

package/dist/service/aspectService.js

@@ -78,6 +78,7 @@ let MidwayAspectService = class MidwayAspectService {
                     target: this,
                     args: args,
                     proceed: newProceed,
+                    proceedIsAsyncFunction: true,
                 };
                 if (typeof aspectObject === 'function') {
                     aspectObject = aspectObject();
@@ -122,6 +123,7 @@ let MidwayAspectService = class MidwayAspectService {
                     target: this,
                     args: args,
                     proceed: newProceed,
+                    proceedIsAsyncFunction: false,
                 };
                 if (typeof aspectObject === 'function') {
                     aspectObject = aspectObject();

package/dist/service/middlewareService.js

@@ -15,6 +15,8 @@ const interface_1 = require("../interface");
 const error_1 = require("../error");
 const util_1 = require("../util");
 const types_1 = require("../util/types");
+const util_2 = require("util");
+const debug = (0, util_2.debuglog)('midway:debug');
 let MidwayMiddlewareService = class MidwayMiddlewareService {
     constructor(applicationContext) {
         this.applicationContext = applicationContext;
@@ -89,6 +91,9 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                     fn = next;
                 if (!fn)
                     return Promise.resolve();
+                const middlewareName = `${name ? `${name}.` : ''}${index} ${fn._name || fn.name || 'anonymous'}`;
+                const startTime = Date.now();
+                debug(`[middleware]: in ${middlewareName} +0`);
                 try {
                     if (supportBody) {
                         return Promise.resolve(fn(context, dispatch.bind(null, i + 1), {
@@ -105,16 +110,21 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                             else if (context['body'] !== undefined) {
                                 result = context['body'];
                             }
+                            debug(`[middleware]: out ${middlewareName} +${Date.now() - startTime} with body`);
                             return result;
                         });
                     }
                     else {
                         return Promise.resolve(fn(context, dispatch.bind(null, i + 1), {
                             index,
-                        }));
+                        })).then(result => {
+                            debug(`[middleware]: out ${middlewareName} +${Date.now() - startTime}`);
+                            return result;
+                        });
                     }
                 }
                 catch (err) {
+                    debug(`[middleware]: out ${middlewareName} +${Date.now() - startTime} with err ${err.message}`);
                     return Promise.reject(err);
                 }
             }

package/dist/util/pathFileUtil.d.ts

@@ -7,4 +7,5 @@ export declare const PathFileUtil: {
     isPathEqual: typeof isPathEqual;
     getFileContentSync: typeof getFileContentSync;
 };
+export declare function getModuleRequirePathList(moduleName: string): string[];
 //# sourceMappingURL=pathFileUtil.d.ts.map

package/dist/util/pathFileUtil.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PathFileUtil = exports.getFileContentSync = exports.isPathEqual = exports.isPath = void 0;
+exports.getModuleRequirePathList = exports.PathFileUtil = exports.getFileContentSync = exports.isPathEqual = exports.isPath = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 function isPath(p) {
@@ -32,4 +32,31 @@ exports.PathFileUtil = {
     isPathEqual,
     getFileContentSync,
 };
+function getModuleRequirePathList(moduleName) {
+    const moduleNameList = [moduleName, moduleName.replace(/\//g, '_')];
+    let moduleNameMap = {};
+    const modulePathList = [];
+    Object.keys(require.cache || {}).forEach(moduleName => {
+        let moduleIndex = -1;
+        for (const moduleName of moduleNameList) {
+            const index = moduleName.indexOf(moduleName);
+            if (index !== -1) {
+                moduleIndex = index;
+                break;
+            }
+        }
+        if (moduleIndex === -1) {
+            return;
+        }
+        const modulePath = moduleName.slice(0, moduleIndex);
+        if (moduleNameMap[modulePath]) {
+            return;
+        }
+        moduleNameMap[modulePath] = true;
+        modulePathList.push(modulePath);
+    });
+    moduleNameMap = undefined;
+    return modulePathList;
+}
+exports.getModuleRequirePathList = getModuleRequirePathList;
 //# sourceMappingURL=pathFileUtil.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.11.0",
+  "version": "3.11.1",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -42,5 +42,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "eadb977e7fddcd4287c099fc32b601cd51702514"
+  "gitHead": "bd9375874eb8cfaa49fbcfaa0497021cea06a394"
 }