@midwayjs/core 3.14.0 → 3.14.4

package/dist/common/dataSourceManager.d.ts

@@ -1,12 +1,15 @@
 import { ModuleLoadType, DataSourceManagerConfigOption } from '../interface';
 import { MidwayEnvironmentService } from '../service/environmentService';
+import { MidwayPriorityManager } from './priorityManager';
 export declare abstract class DataSourceManager<T, ConnectionOpts extends Record<string, any> = Record<string, any>> {
     protected dataSource: Map<string, T>;
     protected options: DataSourceManagerConfigOption<ConnectionOpts>;
     protected modelMapping: WeakMap<object, any>;
     private innerDefaultDataSourceName;
-    appDir: string;
-    environmentService: MidwayEnvironmentService;
+    protected dataSourcePriority: Record<string, string>;
+    protected appDir: string;
+    protected environmentService: MidwayEnvironmentService;
+    protected priorityManager: MidwayPriorityManager;
     protected initDataSource(dataSourceConfig: DataSourceManagerConfigOption<ConnectionOpts>, baseDirOrOptions: {
         baseDir: string;
         entitiesConfigKey?: string;
@@ -22,6 +25,7 @@ export declare abstract class DataSourceManager<T, ConnectionOpts extends Record
      */
     hasDataSource(dataSourceName: string): boolean;
     getDataSourceNames(): string[];
+    getAllDataSources(): Map<string, T>;
     /**
      * check the data source is connected
      * @param dataSourceName
@@ -42,6 +46,10 @@ export declare abstract class DataSourceManager<T, ConnectionOpts extends Record
     protected abstract destroyDataSource(dataSource: T): Promise<void>;
     stop(): Promise<void>;
     getDefaultDataSourceName(): string;
+    getDataSourcePriority(name: string): string;
+    isHighPriority(name: string): boolean;
+    isMediumPriority(name: string): boolean;
+    isLowPriority(name: string): boolean;
 }
 export declare function formatGlobString(globString: string): string[];
 export declare function globModels(globString: string, appDir: string, loadMode?: ModuleLoadType): Promise<any[]>;

package/dist/common/dataSourceManager.js

@@ -23,6 +23,7 @@ const util_1 = require("util");
 const util_2 = require("../util");
 const decorator_1 = require("../decorator");
 const environmentService_1 = require("../service/environmentService");
+const priorityManager_1 = require("./priorityManager");
 const debug = (0, util_1.debuglog)('midway:debug');
 class DataSourceManager {
     constructor() {
@@ -92,6 +93,9 @@ class DataSourceManager {
     getDataSourceNames() {
         return Array.from(this.dataSource.keys());
     }
+    getAllDataSources() {
+        return this.dataSource;
+    }
     /**
      * check the data source is connected
      * @param dataSourceName
@@ -152,6 +156,18 @@ class DataSourceManager {
         }
         return this.innerDefaultDataSourceName;
     }
+    getDataSourcePriority(name) {
+        return this.priorityManager.getPriority(this.dataSourcePriority[name]);
+    }
+    isHighPriority(name) {
+        return this.priorityManager.isHighPriority(this.dataSourcePriority[name]);
+    }
+    isMediumPriority(name) {
+        return this.priorityManager.isMediumPriority(this.dataSourcePriority[name]);
+    }
+    isLowPriority(name) {
+        return this.priorityManager.isLowPriority(this.dataSourcePriority[name]);
+    }
 }
 __decorate([
     (0, decorator_1.Inject)(),
@@ -161,6 +177,10 @@ __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", environmentService_1.MidwayEnvironmentService)
 ], DataSourceManager.prototype, "environmentService", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", priorityManager_1.MidwayPriorityManager)
+], DataSourceManager.prototype, "priorityManager", void 0);
 exports.DataSourceManager = DataSourceManager;
 function formatGlobString(globString) {
     let pattern;

package/dist/common/priorityManager.d.ts

@@ -0,0 +1,16 @@
+export declare const DEFAULT_PRIORITY: {
+    L1: string;
+    L2: string;
+    L3: string;
+};
+export declare class MidwayPriorityManager {
+    private priorityList;
+    private defaultPriority;
+    getCurrentPriorityList(): Record<string, string>;
+    getDefaultPriority(): string;
+    isHighPriority(priority?: string): boolean;
+    isMediumPriority(priority?: string): boolean;
+    isLowPriority(priority?: string): boolean;
+    getPriority(priority: string): string;
+}
+//# sourceMappingURL=priorityManager.d.ts.map

package/dist/common/priorityManager.js

@@ -0,0 +1,46 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MidwayPriorityManager = exports.DEFAULT_PRIORITY = void 0;
+const decorator_1 = require("../decorator");
+const interface_1 = require("../interface");
+exports.DEFAULT_PRIORITY = {
+    L1: 'High',
+    L2: 'Medium',
+    L3: 'Low',
+};
+let MidwayPriorityManager = class MidwayPriorityManager {
+    constructor() {
+        this.priorityList = exports.DEFAULT_PRIORITY;
+        this.defaultPriority = exports.DEFAULT_PRIORITY.L2;
+    }
+    getCurrentPriorityList() {
+        return this.priorityList;
+    }
+    getDefaultPriority() {
+        return this.defaultPriority;
+    }
+    isHighPriority(priority = exports.DEFAULT_PRIORITY.L2) {
+        return priority === exports.DEFAULT_PRIORITY.L1;
+    }
+    isMediumPriority(priority = exports.DEFAULT_PRIORITY.L2) {
+        return priority === exports.DEFAULT_PRIORITY.L2;
+    }
+    isLowPriority(priority = exports.DEFAULT_PRIORITY.L2) {
+        return priority === exports.DEFAULT_PRIORITY.L3;
+    }
+    getPriority(priority) {
+        return priority || this.getDefaultPriority();
+    }
+};
+MidwayPriorityManager = __decorate([
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Scope)(interface_1.ScopeEnum.Singleton)
+], MidwayPriorityManager);
+exports.MidwayPriorityManager = MidwayPriorityManager;
+//# sourceMappingURL=priorityManager.js.map

package/dist/common/serviceFactory.d.ts

@@ -1,16 +1,13 @@
 import { IServiceFactory } from '../interface';
-export declare const DEFAULT_PRIORITY: {
-    L1: string;
-    L2: string;
-    L3: string;
-};
+import { MidwayPriorityManager } from './priorityManager';
 /**
  * 多客户端工厂实现
  */
 export declare abstract class ServiceFactory<T> implements IServiceFactory<T> {
     protected clients: Map<string, T>;
-    protected priority: any;
+    protected clientPriority: Record<string, string>;
     protected options: {};
+    protected priorityManager: MidwayPriorityManager;
     protected initClients(options?: any): Promise<void>;
     get<U = T>(id?: string): U;
     has(id: string): boolean;
@@ -22,9 +19,9 @@ export declare abstract class ServiceFactory<T> implements IServiceFactory<T> {
     getDefaultClientName(): string;
     getClients(): Map<string, T>;
     getClientKeys(): string[];
-    getClientPriority(clientName: string): any;
-    isHighPriority(clientName: string): boolean;
-    isMediumPriority(clientName: string): boolean;
-    isLowPriority(clientName: string): boolean;
+    getClientPriority(name: string): string;
+    isHighPriority(name: string): boolean;
+    isMediumPriority(name: string): boolean;
+    isLowPriority(name: string): boolean;
 }
 //# sourceMappingURL=serviceFactory.d.ts.map

package/dist/common/serviceFactory.js

@@ -1,12 +1,18 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServiceFactory = exports.DEFAULT_PRIORITY = void 0;
+exports.ServiceFactory = void 0;
 const extend_1 = require("../util/extend");
-exports.DEFAULT_PRIORITY = {
-    L1: 'High',
-    L2: 'Medium',
-    L3: 'Low',
-};
+const priorityManager_1 = require("./priorityManager");
+const decorator_1 = require("../decorator");
 /**
  * 多客户端工厂实现
  */
@@ -30,11 +36,7 @@ class ServiceFactory {
             }
         }
         // set priority
-        this.priority = options.priority || {
-            ...Array.from(this.clients.keys()).map(name => ({
-                [name]: exports.DEFAULT_PRIORITY.L2,
-            })),
-        };
+        this.clientPriority = options.priority || {};
     }
     get(id = 'default') {
         return this.clients.get(id);
@@ -68,18 +70,22 @@ class ServiceFactory {
     getClientKeys() {
         return Array.from(this.clients.keys());
     }
-    getClientPriority(clientName) {
-        return this.priority[clientName] || exports.DEFAULT_PRIORITY.L2;
+    getClientPriority(name) {
+        return this.priorityManager.getPriority(this.clientPriority[name]);
     }
-    isHighPriority(clientName) {
-        return this.getClientPriority(clientName) === exports.DEFAULT_PRIORITY.L1;
+    isHighPriority(name) {
+        return this.priorityManager.isHighPriority(this.clientPriority[name]);
     }
-    isMediumPriority(clientName) {
-        return this.getClientPriority(clientName) === exports.DEFAULT_PRIORITY.L2;
+    isMediumPriority(name) {
+        return this.priorityManager.isMediumPriority(this.clientPriority[name]);
     }
-    isLowPriority(clientName) {
-        return this.getClientPriority(clientName) === exports.DEFAULT_PRIORITY.L3;
+    isLowPriority(name) {
+        return this.priorityManager.isLowPriority(this.clientPriority[name]);
     }
 }
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", priorityManager_1.MidwayPriorityManager)
+], ServiceFactory.prototype, "priorityManager", void 0);
 exports.ServiceFactory = ServiceFactory;
 //# sourceMappingURL=serviceFactory.js.map

package/dist/index.d.ts

@@ -15,9 +15,11 @@ export { MidwayLifeCycleService } from './service/lifeCycleService';
 export { MidwayMiddlewareService } from './service/middlewareService';
 export { MidwayDecoratorService } from './service/decoratorService';
 export { MidwayMockService } from './service/mockService';
+export { MidwayHealthService } from './service/healthService';
 export { RouterInfo, DynamicRouterInfo, RouterPriority, RouterCollectorOptions, MidwayWebRouterService, } from './service/webRouterService';
 export { MidwayServerlessFunctionService, WebRouterCollector, } from './service/slsFunctionService';
 export { DataSourceManager } from './common/dataSourceManager';
+export { DEFAULT_PRIORITY, MidwayPriorityManager, } from './common/priorityManager';
 export * from './service/pipelineService';
 export * from './common/loggerFactory';
 export * from './common/serviceFactory';

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.FORMAT = exports.FileUtils = exports.PathFileUtil = exports.Types = exports.retryWith = exports.retryWithAsync = exports.extend = exports.Utils = exports.sleep = exports.isTypeScriptEnvironment = exports.wrapAsync = exports.wrapMiddleware = exports.pathMatching = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.loadModule = exports.safeRequire = exports.safelyGet = 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.FunctionalConfiguration = exports.createConfiguration = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
+exports.FORMAT = exports.FileUtils = exports.PathFileUtil = exports.Types = exports.retryWith = exports.retryWithAsync = exports.extend = exports.Utils = exports.sleep = exports.isTypeScriptEnvironment = exports.wrapAsync = exports.wrapMiddleware = exports.pathMatching = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.loadModule = exports.safeRequire = exports.safelyGet = exports.ASYNC_ROOT_CONTEXT = exports.MidwayPriorityManager = exports.DEFAULT_PRIORITY = exports.DataSourceManager = exports.WebRouterCollector = exports.MidwayServerlessFunctionService = exports.MidwayWebRouterService = exports.MidwayHealthService = exports.MidwayMockService = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.FunctionalConfiguration = exports.createConfiguration = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
 __exportStar(require("./interface"), exports);
 __exportStar(require("./context/container"), exports);
 var requestContainer_1 = require("./context/requestContainer");
@@ -46,6 +46,8 @@ 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 healthService_1 = require("./service/healthService");
+Object.defineProperty(exports, "MidwayHealthService", { enumerable: true, get: function () { return healthService_1.MidwayHealthService; } });
 var webRouterService_1 = require("./service/webRouterService");
 Object.defineProperty(exports, "MidwayWebRouterService", { enumerable: true, get: function () { return webRouterService_1.MidwayWebRouterService; } });
 var slsFunctionService_1 = require("./service/slsFunctionService");
@@ -53,6 +55,9 @@ Object.defineProperty(exports, "MidwayServerlessFunctionService", { enumerable:
 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; } });
+var priorityManager_1 = require("./common/priorityManager");
+Object.defineProperty(exports, "DEFAULT_PRIORITY", { enumerable: true, get: function () { return priorityManager_1.DEFAULT_PRIORITY; } });
+Object.defineProperty(exports, "MidwayPriorityManager", { enumerable: true, get: function () { return priorityManager_1.MidwayPriorityManager; } });
 __exportStar(require("./service/pipelineService"), exports);
 __exportStar(require("./common/loggerFactory"), exports);
 __exportStar(require("./common/serviceFactory"), exports);

package/dist/interface.d.ts

@@ -399,7 +399,6 @@ export interface MidwayCoreDefaultConfig {
         healthCheckTimeout?: number;
     };
 }
-export type ClientPriorityValue = 'High' | 'Medium' | 'Low';
 export type ServiceFactoryConfigOption<OPTIONS> = {
     default?: PowerPartial<OPTIONS>;
     client?: PowerPartial<OPTIONS>;
@@ -408,7 +407,7 @@ export type ServiceFactoryConfigOption<OPTIONS> = {
     };
     defaultClientName?: string;
     clientPriority?: {
-        [key: string]: ClientPriorityValue;
+        [key: string]: number;
     };
 };
 export type CreateDataSourceInstanceOptions = {
@@ -945,7 +944,7 @@ export interface IServiceFactory<Client> {
     getDefaultClientName(): string;
     getClients(): Map<string, Client>;
     getClientKeys(): string[];
-    getClientPriority(clientName: string): ClientPriorityValue;
+    getClientPriority(clientName: string): string;
     isHighPriority(clientName: string): boolean;
     isMediumPriority(clientName: string): boolean;
     isLowPriority(clientName: string): boolean;

package/dist/service/healthService.d.ts

@@ -1,13 +1,15 @@
 import { HealthResults, IMidwayContainer } from '../interface';
 import { MidwayConfigService } from './configService';
-import { MidwayLifeCycleService } from './lifeCycleService';
 export declare class MidwayHealthService {
     protected configService: MidwayConfigService;
-    protected lifeCycleService: MidwayLifeCycleService;
     protected applicationContext: IMidwayContainer;
     private healthCheckTimeout;
     private healthCheckMethods;
-    protected init(): Promise<void>;
+    init(lifeCycleInstanceList: Array<{
+        target: any;
+        namespace: string;
+        instance?: any;
+    }>): Promise<void>;
     getStatus(): Promise<HealthResults>;
     setCheckTimeout(timeout: number): void;
 }

package/dist/service/healthService.js

@@ -13,17 +13,16 @@ exports.MidwayHealthService = void 0;
 const decorator_1 = require("../decorator");
 const interface_1 = require("../interface");
 const configService_1 = require("./configService");
-const lifeCycleService_1 = require("./lifeCycleService");
 const util_1 = require("../util");
 let MidwayHealthService = class MidwayHealthService {
     constructor() {
         this.healthCheckTimeout = 1000;
         this.healthCheckMethods = [];
     }
-    async init() {
+    async init(lifeCycleInstanceList) {
         const healthCheckTimeout = this.configService.getConfiguration('core.healthCheckTimeout') || 1000;
         this.setCheckTimeout(healthCheckTimeout);
-        for (const lifecycleInstance of this.lifeCycleService.getLifecycleInstanceList()) {
+        for (const lifecycleInstance of lifeCycleInstanceList) {
             if (lifecycleInstance.instance &&
                 lifecycleInstance.instance['onHealthCheck']) {
                 this.healthCheckMethods.push({
@@ -84,20 +83,10 @@ __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", configService_1.MidwayConfigService)
 ], MidwayHealthService.prototype, "configService", void 0);
-__decorate([
-    (0, decorator_1.Inject)(),
-    __metadata("design:type", lifeCycleService_1.MidwayLifeCycleService)
-], MidwayHealthService.prototype, "lifeCycleService", void 0);
 __decorate([
     (0, decorator_1.ApplicationContext)(),
     __metadata("design:type", Object)
 ], MidwayHealthService.prototype, "applicationContext", void 0);
-__decorate([
-    (0, decorator_1.Init)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], MidwayHealthService.prototype, "init", null);
 MidwayHealthService = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(interface_1.ScopeEnum.Singleton)

package/dist/service/lifeCycleService.d.ts

@@ -2,11 +2,13 @@ import { IMidwayContainer } from '../interface';
 import { MidwayFrameworkService } from './frameworkService';
 import { MidwayConfigService } from './configService';
 import { MidwayMockService } from './mockService';
+import { MidwayHealthService } from './healthService';
 export declare class MidwayLifeCycleService {
     readonly applicationContext: IMidwayContainer;
     protected frameworkService: MidwayFrameworkService;
     protected configService: MidwayConfigService;
     protected mockService: MidwayMockService;
+    protected healthService: MidwayHealthService;
     private lifecycleInstanceList;
     constructor(applicationContext: IMidwayContainer);
     protected init(): Promise<void>;

package/dist/service/lifeCycleService.js

@@ -17,6 +17,7 @@ const frameworkService_1 = require("./frameworkService");
 const configService_1 = require("./configService");
 const util_1 = require("util");
 const mockService_1 = require("./mockService");
+const healthService_1 = require("./healthService");
 const debug = (0, util_1.debuglog)('midway:debug');
 let MidwayLifeCycleService = class MidwayLifeCycleService {
     constructor(applicationContext) {
@@ -41,6 +42,8 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
             }
             cycle.instance && this.lifecycleInstanceList.push(cycle);
         }
+        // init health check service
+        await this.healthService.init(this.lifecycleInstanceList);
         // bind object lifecycle
         await Promise.all([
             this.runObjectLifeCycle(this.lifecycleInstanceList, 'onBeforeObjectCreated'),
@@ -143,6 +146,10 @@ __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", mockService_1.MidwayMockService)
 ], MidwayLifeCycleService.prototype, "mockService", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", healthService_1.MidwayHealthService)
+], MidwayLifeCycleService.prototype, "healthService", void 0);
 __decorate([
     (0, decorator_1.Init)(),
     __metadata("design:type", Function),

package/dist/setup.js

@@ -136,6 +136,7 @@ async function prepareGlobalApplicationContextAsync(globalOptions) {
     applicationContext.bindClass(_1.MidwayWebRouterService);
     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) {
@@ -230,6 +231,7 @@ function prepareGlobalApplicationContext(globalOptions) {
     applicationContext.bindClass(_1.MidwayWebRouterService);
     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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.14.0",
+  "version": "3.14.4",
   "description": "midway core",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -42,5 +42,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "67e3a3596ffdb65a413064d30c68f1f7965af282"
+  "gitHead": "72aacdfd87ef730f100690557de48dcbd4d806a7"
 }