@midwayjs/core 3.20.4 → 4.0.0-beta.1

package/dist/setup.js

@@ -3,16 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareGlobalApplicationContext = exports.prepareGlobalApplicationContextAsync = exports.destroyGlobalApplicationContext = exports.initializeGlobalApplicationContext = void 0;
 const _1 = require("./");
 const config_default_1 = require("./config/config.default");
-const decorator_1 = require("./decorator");
 const util = require("util");
 const slsFunctionService_1 = require("./service/slsFunctionService");
-const path_1 = require("path");
 const healthService_1 = require("./service/healthService");
+const componentLoader_1 = require("./context/componentLoader");
+const util_1 = require("./util");
+const asyncContextManager_1 = require("./common/asyncContextManager");
 const performanceManager_1 = require("./common/performanceManager");
 const debug = util.debuglog('midway:debug');
 let stepIdx = 1;
+let projectIdx = 1;
 function printStepDebugInfo(stepInfo) {
-    debug(`\n\nStep ${stepIdx++}: ${stepInfo}\n`);
+    debug(`\n\nProject ${projectIdx} - Step ${stepIdx++}: ${stepInfo}\n`);
 }
 /**
  * midway framework main entry, this method bootstrap all service and framework.
@@ -51,12 +53,12 @@ async function initializeGlobalApplicationContext(globalOptions) {
         applicationContext,
     ]);
     performanceManager_1.MidwayInitializerPerformanceManager.markEnd(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.LIFECYCLE_PREPARE);
-    printStepDebugInfo('Init preload modules');
+    printStepDebugInfo('Init pre-start modules');
     performanceManager_1.MidwayInitializerPerformanceManager.markStart(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.PRELOAD_MODULE_PREPARE);
-    // some preload module init
-    const modules = (0, decorator_1.listPreloadModule)();
+    // some pre-start module init
+    const modules = _1.DecoratorManager.listPreStartModule();
     for (const module of modules) {
-        // preload init context
+        // pre-start init context
         await applicationContext.getAsync(module);
     }
     performanceManager_1.MidwayInitializerPerformanceManager.markEnd(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.PRELOAD_MODULE_PREPARE);
@@ -66,18 +68,25 @@ async function initializeGlobalApplicationContext(globalOptions) {
 }
 exports.initializeGlobalApplicationContext = initializeGlobalApplicationContext;
 async function destroyGlobalApplicationContext(applicationContext) {
+    printStepDebugInfo('Ready to destroy applicationContext');
     const loggerService = await applicationContext.getAsync(_1.MidwayLoggerService);
     const loggerFactory = loggerService.getCurrentLoggerFactory();
+    printStepDebugInfo('Stopping lifecycle');
     // stop lifecycle
     const lifecycleService = await applicationContext.getAsync(_1.MidwayLifeCycleService);
     await lifecycleService.stop();
+    printStepDebugInfo('Stopping applicationContext');
     // stop container
     await applicationContext.stop();
-    (0, decorator_1.clearBindContainer)();
+    printStepDebugInfo('Closing loggerFactory');
     loggerFactory.close();
+    printStepDebugInfo('Cleaning performance manager');
     performanceManager_1.MidwayPerformanceManager.cleanAll();
     global['MIDWAY_APPLICATION_CONTEXT'] = undefined;
     global['MIDWAY_MAIN_FRAMEWORK'] = undefined;
+    // reset counter
+    stepIdx = 1;
+    projectIdx++;
 }
 exports.destroyGlobalApplicationContext = destroyGlobalApplicationContext;
 /**
@@ -85,22 +94,22 @@ exports.destroyGlobalApplicationContext = destroyGlobalApplicationContext;
  * @param globalOptions
  */
 async function prepareGlobalApplicationContextAsync(globalOptions) {
-    var _a, _b, _c, _d, _e;
     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 : '';
-    const baseDir = (_b = globalOptions.baseDir) !== null && _b !== void 0 ? _b : '';
+    const appDir = globalOptions.appDir ?? '';
+    const baseDir = globalOptions.baseDir ?? '';
     performanceManager_1.MidwayInitializerPerformanceManager.markStart(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.METADATA_PREPARE);
     // new container
-    const applicationContext = (_c = globalOptions.applicationContext) !== null && _c !== void 0 ? _c : new _1.MidwayContainer();
-    // bind container to decoratorManager
-    debug('[core]: delegate module map from decoratorManager');
-    (0, decorator_1.bindContainer)(applicationContext);
+    const applicationContext = globalOptions.applicationContext ?? new _1.MidwayContainer();
     global['MIDWAY_APPLICATION_CONTEXT'] = applicationContext;
     // register baseDir and appDir
     applicationContext.registerObject('baseDir', baseDir);
     applicationContext.registerObject('appDir', appDir);
+    if (!globalOptions.asyncContextManager) {
+        globalOptions.asyncContextManager = new asyncContextManager_1.AsyncLocalStorageContextManager();
+    }
+    debug('[core]: set default module load type and entry file');
     performanceManager_1.MidwayInitializerPerformanceManager.markEnd(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.METADATA_PREPARE);
     debug('[core]: set default file detector');
     performanceManager_1.MidwayInitializerPerformanceManager.markStart(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.DETECTOR_PREPARE);
@@ -108,37 +117,14 @@ async function prepareGlobalApplicationContextAsync(globalOptions) {
     if (!globalOptions.moduleLoadType) {
         globalOptions.moduleLoadType = 'commonjs';
     }
-    // set module detector
-    if (globalOptions.moduleDetector !== false) {
-        debug('[core]: set module load type = %s', globalOptions.moduleLoadType);
-        // set default entry file
-        if (!globalOptions.imports) {
-            globalOptions.imports = [
-                await (0, _1.loadModule)((0, path_1.join)(baseDir, `configuration${(0, _1.isTypeScriptEnvironment)() ? '.ts' : '.js'}`), {
-                    loadMode: globalOptions.moduleLoadType,
-                    safeLoad: true,
-                }),
-            ];
-        }
-        if (globalOptions.moduleDetector === undefined) {
-            if (globalOptions.moduleLoadType === 'esm') {
-                applicationContext.setFileDetector(new _1.ESModuleFileDetector({
-                    loadDir: baseDir,
-                    ignore: (_d = globalOptions.ignore) !== null && _d !== void 0 ? _d : [],
-                }));
-                globalOptions.moduleLoadType = 'esm';
-            }
-            else {
-                applicationContext.setFileDetector(new _1.CommonJSFileDetector({
-                    loadDir: baseDir,
-                    ignore: (_e = globalOptions.ignore) !== null && _e !== void 0 ? _e : [],
-                }));
-            }
-        }
-    }
+    // set entry file
+    globalOptions.imports = [
+        ...(globalOptions.imports ?? []),
+        await (0, util_1.findProjectEntryFile)(appDir, baseDir, globalOptions.moduleLoadType),
+    ];
     performanceManager_1.MidwayInitializerPerformanceManager.markEnd(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.DETECTOR_PREPARE);
-    printStepDebugInfo('Binding inner service');
-    // bind inner service
+    printStepDebugInfo('Binding built-in service');
+    // bind built-in service
     applicationContext.bindClass(_1.MidwayEnvironmentService);
     applicationContext.bindClass(_1.MidwayInformationService);
     applicationContext.bindClass(_1.MidwayAspectService);
@@ -154,13 +140,6 @@ async function prepareGlobalApplicationContextAsync(globalOptions) {
     applicationContext.bindClass(slsFunctionService_1.MidwayServerlessFunctionService);
     applicationContext.bindClass(healthService_1.MidwayHealthService);
     applicationContext.bindClass(_1.MidwayPriorityManager);
-    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 environment
     const environmentService = applicationContext.get(_1.MidwayEnvironmentService);
@@ -176,12 +155,27 @@ async function prepareGlobalApplicationContextAsync(globalOptions) {
     applicationContext.get(_1.MidwayAspectService, [applicationContext]);
     // init decorator service
     applicationContext.get(_1.MidwayDecoratorService, [applicationContext]);
+    printStepDebugInfo('Binding preload module');
+    // bind preload module
+    if (globalOptions.preloadModules && globalOptions.preloadModules.length) {
+        for (const preloadModule of globalOptions.preloadModules) {
+            applicationContext.bindClass(preloadModule);
+        }
+    }
     printStepDebugInfo('Load imports(component) and user code configuration module');
-    applicationContext.load([].concat(globalOptions.imports).concat(globalOptions.configurationModule));
-    printStepDebugInfo('Run applicationContext ready method');
     performanceManager_1.MidwayInitializerPerformanceManager.markStart(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.DEFINITION_PREPARE);
-    // bind user code module
-    await applicationContext.ready();
+    // load configuration
+    const componentConfigurationLoader = new componentLoader_1.ComponentConfigurationLoader(applicationContext);
+    const importModules = [...(globalOptions.imports ?? [])];
+    for (const mod of importModules) {
+        if (mod) {
+            await componentConfigurationLoader.load(mod);
+        }
+    }
+    for (const ns of componentConfigurationLoader.getNamespaceList()) {
+        applicationContext.addNamespace(ns);
+        debug(`[core]: load configuration in namespace="${ns}" complete`);
+    }
     performanceManager_1.MidwayInitializerPerformanceManager.markEnd(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.DEFINITION_PREPARE);
     performanceManager_1.MidwayInitializerPerformanceManager.markStart(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.CONFIG_LOAD);
     if (globalOptions.globalConfig) {
@@ -207,41 +201,33 @@ exports.prepareGlobalApplicationContextAsync = prepareGlobalApplicationContextAs
  * @param globalOptions
  */
 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 : '';
-    const baseDir = (_b = globalOptions.baseDir) !== null && _b !== void 0 ? _b : '';
+    const appDir = globalOptions.appDir ?? '';
+    const baseDir = globalOptions.baseDir ?? '';
     performanceManager_1.MidwayInitializerPerformanceManager.markStart(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.METADATA_PREPARE);
     // new container
-    const applicationContext = (_c = globalOptions.applicationContext) !== null && _c !== void 0 ? _c : new _1.MidwayContainer();
-    // bind container to decoratorManager
-    debug('[core]: delegate module map from decoratorManager');
-    (0, decorator_1.bindContainer)(applicationContext);
+    const applicationContext = globalOptions.applicationContext ?? new _1.MidwayContainer();
     global['MIDWAY_APPLICATION_CONTEXT'] = applicationContext;
     // register baseDir and appDir
     applicationContext.registerObject('baseDir', baseDir);
     applicationContext.registerObject('appDir', appDir);
+    if (!globalOptions.asyncContextManager) {
+        globalOptions.asyncContextManager = new asyncContextManager_1.AsyncLocalStorageContextManager();
+    }
     performanceManager_1.MidwayInitializerPerformanceManager.markEnd(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.METADATA_PREPARE);
-    printStepDebugInfo('Ready module detector');
-    performanceManager_1.MidwayInitializerPerformanceManager.markStart(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.DETECTOR_PREPARE);
+    debug('[core]: set default module load type and entry file');
     if (!globalOptions.moduleLoadType) {
         globalOptions.moduleLoadType = 'commonjs';
     }
-    if (globalOptions.moduleDetector !== false) {
-        if (globalOptions.moduleDetector === undefined) {
-            applicationContext.setFileDetector(new _1.CommonJSFileDetector({
-                ignore: (_d = globalOptions.ignore) !== null && _d !== void 0 ? _d : [],
-            }));
-        }
-        else if (globalOptions.moduleDetector) {
-            applicationContext.setFileDetector(globalOptions.moduleDetector);
-        }
-    }
-    performanceManager_1.MidwayInitializerPerformanceManager.markEnd(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.DETECTOR_PREPARE);
-    printStepDebugInfo('Binding inner service');
-    // bind inner service
+    // set entry file
+    globalOptions.imports = [
+        ...(globalOptions.imports ?? []),
+        (0, util_1.findProjectEntryFileSync)(appDir, baseDir),
+    ];
+    printStepDebugInfo('Binding built-in service');
+    // bind built-in service
     applicationContext.bindClass(_1.MidwayEnvironmentService);
     applicationContext.bindClass(_1.MidwayInformationService);
     applicationContext.bindClass(_1.MidwayAspectService);
@@ -257,13 +243,6 @@ function prepareGlobalApplicationContext(globalOptions) {
     applicationContext.bindClass(slsFunctionService_1.MidwayServerlessFunctionService);
     applicationContext.bindClass(healthService_1.MidwayHealthService);
     applicationContext.bindClass(_1.MidwayPriorityManager);
-    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 environment
     const environmentService = applicationContext.get(_1.MidwayEnvironmentService);
@@ -279,17 +258,27 @@ 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')),
-        ];
+    printStepDebugInfo('Binding preload module');
+    // bind preload module
+    if (globalOptions.preloadModules && globalOptions.preloadModules.length) {
+        for (const preloadModule of globalOptions.preloadModules) {
+            applicationContext.bindClass(preloadModule);
+        }
     }
-    applicationContext.load([].concat(globalOptions.imports).concat(globalOptions.configurationModule));
-    printStepDebugInfo('Run applicationContext ready method');
+    printStepDebugInfo('Load imports(component) and user code configuration module');
+    // load configuration
+    const componentConfigurationLoader = new componentLoader_1.ComponentConfigurationLoader(applicationContext);
+    const importModules = [...(globalOptions.imports ?? [])];
     performanceManager_1.MidwayInitializerPerformanceManager.markStart(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.DEFINITION_PREPARE);
-    // bind user code module
-    applicationContext.ready();
+    for (const mod of importModules) {
+        if (mod) {
+            componentConfigurationLoader.loadSync(mod);
+        }
+    }
+    for (const ns of componentConfigurationLoader.getNamespaceList()) {
+        applicationContext.addNamespace(ns);
+        debug(`[core]: load configuration in namespace="${ns}" complete`);
+    }
     performanceManager_1.MidwayInitializerPerformanceManager.markEnd(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.DEFINITION_PREPARE);
     performanceManager_1.MidwayInitializerPerformanceManager.markStart(performanceManager_1.MidwayInitializerPerformanceManager.MEASURE_KEYS.CONFIG_LOAD);
     if (globalOptions.globalConfig) {

package/dist/util/contextUtil.d.ts

@@ -1,6 +1,6 @@
-import { IConfigurationOptions, IMidwayContainer, IMidwayFramework } from '../interface';
+import { IConfigurationOptions, IMidwayFramework, IMidwayGlobalContainer } from '../interface';
 import { AsyncContextManager } from '../common/asyncContextManager';
-export declare const getCurrentApplicationContext: () => IMidwayContainer;
+export declare const getCurrentApplicationContext: () => IMidwayGlobalContainer;
 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;

package/dist/util/httpclient.d.ts

@@ -2,8 +2,8 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import http = require('http');
-import https = require('https');
+import * as http from 'http';
+import * as https from 'https';
 export type HttpClientMimeType = 'text' | 'json' | undefined;
 export interface HttpClientOptions<Data = any> extends https.RequestOptions {
     headers?: any;

package/dist/util/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { FunctionMiddleware, IgnoreMatcher } from '../interface';
 import { camelCase, pascalCase } from './camelCase';
 import { randomUUID } from './uuid';
@@ -27,7 +28,18 @@ export declare const loadModule: (p: string, options?: {
     enableCache?: boolean;
     loadMode?: 'commonjs' | 'esm';
     safeLoad?: boolean;
+    warnOnLoadError?: boolean;
 }) => Promise<any>;
+/**
+ * load module sync, and it must be commonjs mode
+ * @param p
+ * @param options
+ */
+export declare const loadModuleSync: (p: string, options?: {
+    enableCache?: boolean;
+    safeLoad?: boolean;
+    warnOnLoadError?: boolean;
+}) => any;
 /**
  *  @example
  *  safelyGet(['a','b'],{a: {b: 2}})  // => 2
@@ -110,7 +122,7 @@ export declare function pathMatching(options: {
 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;
-export declare function sleep(sleepTime?: number): Promise<void>;
+export declare function sleep(sleepTime?: number, abortController?: AbortController): Promise<void>;
 /**
  * get parameter name from function
  * @param func
@@ -123,22 +135,9 @@ export declare function generateRandomId(): string;
 export declare function merge(target: any, src: any): any;
 export declare function toAsyncFunction<T extends (...args: any[]) => any>(method: T): (...args: Parameters<T>) => Promise<ReturnType<T>>;
 export declare function isTypeScriptEnvironment(): boolean;
-/**
- * Create a Promise that resolves after the specified time
- * @param options
- */
-export declare function createPromiseTimeoutInvokeChain<Result>(options: {
-    promiseItems: Array<Promise<any> | {
-        item: Promise<any>;
-        meta?: any;
-        timeout?: number;
-    }>;
-    timeout: number;
-    methodName: string;
-    onSuccess?: (result: any, meta: any) => Result | Promise<Result>;
-    onFail: (err: Error, meta: any) => Result | Promise<Result>;
-    isConcurrent?: boolean;
-}): Promise<Result[]>;
+export declare function isConfigurationExport(exports: any): boolean;
+export declare function findProjectEntryFile(appDir: string, baseDir: string, loadMode: 'commonjs' | 'esm'): Promise<any>;
+export declare function findProjectEntryFileSync(appDir: string, baseDir: string): any;
 export declare const Utils: {
     sleep: typeof sleep;
     getParamNames: typeof getParamNames;