@midwayjs/info 3.19.2 → 4.0.0-alpha.1

package/dist/config.default.js

@@ -6,6 +6,5 @@ exports.info = {
     title: 'Midway Info',
     infoPath: '/_info',
     hiddenKey: interface_1.DefaultHiddenKey,
-    ignoreKey: [],
 };
 //# sourceMappingURL=config.default.js.map

package/dist/configuration.js

@@ -22,11 +22,12 @@ let InfoConfiguration = class InfoConfiguration {
         });
     }
 };
+exports.InfoConfiguration = InfoConfiguration;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayApplicationManager)
 ], InfoConfiguration.prototype, "applicationManager", void 0);
-InfoConfiguration = __decorate([
+exports.InfoConfiguration = InfoConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'info',
         importConfigs: [
@@ -36,5 +37,4 @@ InfoConfiguration = __decorate([
         ],
     })
 ], InfoConfiguration);
-exports.InfoConfiguration = InfoConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/infoService.d.ts

@@ -1,19 +1,15 @@
 import { MidwayInformationService, IMidwayContainer, MidwayConfigService, MidwayEnvironmentService } from '@midwayjs/core';
-import { InfoType, InfoValueType, TypeInfo } from './interface';
+import { InfoValueType, TypeInfo } from './interface';
 export declare class InfoService {
     midwayInformationService: MidwayInformationService;
     configService: MidwayConfigService;
     environment: MidwayEnvironmentService;
-    titleConfig: string;
+    titleConfig: any;
     defaultHiddenKey: string[];
-    ignoreKey: string[];
     secretMatchList: Array<any>;
     container: IMidwayContainer;
     init(): Promise<void>;
-    info(infoValueType?: InfoValueType): string | {
-        type: string;
-        info: {};
-    }[];
+    info(infoValueType?: InfoValueType): string | TypeInfo[];
     projectInfo(): TypeInfo;
     systemInfo(): TypeInfo;
     resourceOccupationInfo(): TypeInfo;
@@ -23,14 +19,14 @@ export declare class InfoService {
     networkInfo(): TypeInfo;
     dependenciesInfo(): TypeInfo;
     midwayService(): {
-        type: InfoType;
+        type: string;
         info: {};
     };
     midwayConfig(): {
-        type: InfoType;
+        type: string;
         info: {};
     };
-    protected filterSecretContent(key: string, value: any): any;
+    protected filterSecretContent(key: any, value: any): any;
     protected safeJson(value: any): string;
 }
 //# sourceMappingURL=infoService.d.ts.map

package/dist/infoService.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InfoService = void 0;
 const core_1 = require("@midwayjs/core");
 const core_2 = require("@midwayjs/core");
-const interface_1 = require("./interface");
 const utils_1 = require("./utils");
 const os_1 = require("os");
 const path_1 = require("path");
@@ -24,35 +23,25 @@ let InfoService = class InfoService {
         });
     }
     info(infoValueType) {
-        const allInfo = [];
-        allInfo.push(this.projectInfo());
-        allInfo.push(this.systemInfo());
-        allInfo.push(this.resourceOccupationInfo());
-        allInfo.push(this.softwareInfo());
-        allInfo.push(this.midwayConfig());
-        allInfo.push(this.midwayService());
-        allInfo.push(this.timeInfo());
-        allInfo.push(this.envInfo());
-        allInfo.push(this.dependenciesInfo());
-        allInfo.push(this.networkInfo());
-        // 过滤自定义隐藏的key
-        const newInfo = allInfo.map(({ type, info }) => {
-            const infoKeys = Object.keys(info);
-            const keys = infoKeys.filter(k => !this.ignoreKey.includes(k));
-            const infoByIgnore = {};
-            for (const key of keys) {
-                infoByIgnore[key] = info[key];
-            }
-            return { type, info: infoByIgnore };
-        });
+        const info = [];
+        info.push(this.projectInfo());
+        info.push(this.systemInfo());
+        info.push(this.resourceOccupationInfo());
+        info.push(this.softwareInfo());
+        info.push(this.midwayConfig());
+        info.push(this.midwayService());
+        info.push(this.timeInfo());
+        info.push(this.envInfo());
+        info.push(this.dependenciesInfo());
+        info.push(this.networkInfo());
         if (infoValueType === 'html') {
-            return (0, utils_1.renderToHtml)(newInfo, this.titleConfig);
+            return (0, utils_1.renderToHtml)(info, this.titleConfig);
         }
-        return newInfo;
+        return info;
     }
     projectInfo() {
         return {
-            type: interface_1.InfoType.PROJECT,
+            type: 'Project',
             info: {
                 Project: this.midwayInformationService.getProjectName(),
                 AppDir: this.midwayInformationService.getAppDir(),
@@ -65,7 +54,7 @@ let InfoService = class InfoService {
     systemInfo() {
         const _platform = process.platform;
         return {
-            type: interface_1.InfoType.SYSTEM,
+            type: 'System',
             info: {
                 Platform: _platform === 'win32' ? 'Windows' : _platform,
                 Node: process.versions.node,
@@ -83,7 +72,7 @@ let InfoService = class InfoService {
         const memory = process.memoryUsage();
         const cpu = (0, os_1.cpus)();
         return {
-            type: interface_1.InfoType.MEMORY_CPU,
+            type: 'Memory & CPU',
             info: {
                 'Memory Total Occupy': (0, utils_1.bitToMB)(memory.rss),
                 'Heap Total Occupy': (0, utils_1.bitToMB)(memory.heapTotal),
@@ -121,7 +110,7 @@ let InfoService = class InfoService {
             }
         }
         return {
-            type: interface_1.InfoType.SOFTWARE,
+            type: 'Software',
             info,
         };
     }
@@ -131,14 +120,14 @@ let InfoService = class InfoService {
             env[envName] = this.filterSecretContent(envName, process.env[envName]);
         });
         return {
-            type: interface_1.InfoType.ENVIRONMENT_VARIABLE,
+            type: 'Environment Variable',
             info: env,
         };
     }
     timeInfo() {
         const t = new Date().toString().split(' ');
         return {
-            type: interface_1.InfoType.TIME,
+            type: 'Time',
             info: {
                 Current: Date.now(),
                 Uptime: (0, os_1.uptime)(),
@@ -175,7 +164,7 @@ let InfoService = class InfoService {
                 .join(' / ');
         });
         return {
-            type: interface_1.InfoType.NETWORK,
+            type: 'Network',
             info,
         };
     }
@@ -188,22 +177,21 @@ let InfoService = class InfoService {
             info[modName] = `${modInfo.version || 'Not Found'}(${dependencies[modName]})`;
         });
         return {
-            type: interface_1.InfoType.DEPENDENCIES,
+            type: 'Dependencies',
             info,
         };
     }
     midwayService() {
-        var _a;
         const info = {};
-        if ((_a = this.container) === null || _a === void 0 ? void 0 : _a.registry) {
+        if (this.container?.registry) {
             for (const item of this.container.registry) {
                 const [key, value] = item;
-                const name = value ? (value === null || value === void 0 ? void 0 : value.name) || value : typeof value;
-                info[key] = `${(value === null || value === void 0 ? void 0 : value.namespace) ? `${value === null || value === void 0 ? void 0 : value.namespace}:` : ''}${name}${(value === null || value === void 0 ? void 0 : value.scope) ? ` [${value === null || value === void 0 ? void 0 : value.scope}]` : ''}`;
+                const name = value ? value?.name || value : typeof value;
+                info[key] = `${value?.namespace ? `${value?.namespace}:` : ''}${name}${value?.scope ? ` [${value?.scope}]` : ''}`;
             }
         }
         return {
-            type: interface_1.InfoType.MIDWAY_SERVICE,
+            type: 'Midway Service',
             info,
         };
     }
@@ -214,7 +202,7 @@ let InfoService = class InfoService {
             info[key] = this.safeJson(this.filterSecretContent(key, config[key]));
         });
         return {
-            type: interface_1.InfoType.MIDWAY_CONFIG,
+            type: 'Midway Config',
             info,
         };
     }
@@ -264,6 +252,7 @@ let InfoService = class InfoService {
         return '';
     }
 };
+exports.InfoService = InfoService;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_2.MidwayInformationService)
@@ -278,16 +267,12 @@ __decorate([
 ], InfoService.prototype, "environment", void 0);
 __decorate([
     (0, core_1.Config)('info.title'),
-    __metadata("design:type", String)
+    __metadata("design:type", Object)
 ], InfoService.prototype, "titleConfig", void 0);
 __decorate([
     (0, core_1.Config)('info.hiddenKey'),
     __metadata("design:type", Array)
 ], InfoService.prototype, "defaultHiddenKey", void 0);
-__decorate([
-    (0, core_1.Config)('info.ignoreKey'),
-    __metadata("design:type", Array)
-], InfoService.prototype, "ignoreKey", void 0);
 __decorate([
     (0, core_1.ApplicationContext)(),
     __metadata("design:type", Object)
@@ -298,9 +283,8 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], InfoService.prototype, "init", null);
-InfoService = __decorate([
+exports.InfoService = InfoService = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], InfoService);
-exports.InfoService = InfoService;
 //# sourceMappingURL=infoService.js.map

package/dist/interface.d.ts

@@ -10,19 +10,5 @@ export interface InfoConfigOptions {
     title: string;
     infoPath: string;
     hiddenKey: Array<string>;
-    ignoreKey: Array<string>;
-}
-export declare enum InfoType {
-    PROJECT = "Project",
-    SYSTEM = "System",
-    MEMORY_CPU = "Memory & CPU",
-    SOFTWARE = "Software",
-    ENVIRONMENT_VARIABLE = "Environment Variable",
-    TIME = "Time",
-    NETWORK = "Network",
-    RESOURCE = "Resource",
-    DEPENDENCIES = "Dependencies",
-    MIDWAY_SERVICE = "Midway Service",
-    MIDWAY_CONFIG = "Midway Config"
 }
 //# sourceMappingURL=interface.d.ts.map

package/dist/interface.js

@@ -1,19 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InfoType = exports.DefaultHiddenKey = void 0;
+exports.DefaultHiddenKey = void 0;
 exports.DefaultHiddenKey = ['keys', '*key', '*token', '*secret*', 'pass*'];
-var InfoType;
-(function (InfoType) {
-    InfoType["PROJECT"] = "Project";
-    InfoType["SYSTEM"] = "System";
-    InfoType["MEMORY_CPU"] = "Memory & CPU";
-    InfoType["SOFTWARE"] = "Software";
-    InfoType["ENVIRONMENT_VARIABLE"] = "Environment Variable";
-    InfoType["TIME"] = "Time";
-    InfoType["NETWORK"] = "Network";
-    InfoType["RESOURCE"] = "Resource";
-    InfoType["DEPENDENCIES"] = "Dependencies";
-    InfoType["MIDWAY_SERVICE"] = "Midway Service";
-    InfoType["MIDWAY_CONFIG"] = "Midway Config";
-})(InfoType = exports.InfoType || (exports.InfoType = {}));
 //# sourceMappingURL=interface.js.map

package/dist/middleware/info.middleware.d.ts

@@ -1,6 +1,6 @@
 import { InfoService } from '../infoService';
 export declare class InfoMiddleware {
-    protected infoPath: string;
+    protected infoPath: any;
     protected infoService: InfoService;
     resolve(app: any): ((req: any, res: any, next: any) => Promise<void>) | ((ctx: any, next: any) => Promise<any>);
     static getName(): string;

package/dist/middleware/info.middleware.js

@@ -14,7 +14,7 @@ const core_1 = require("@midwayjs/core");
 const infoService_1 = require("../infoService");
 let InfoMiddleware = class InfoMiddleware {
     resolve(app) {
-        if (app.getFrameworkType() === core_1.MidwayFrameworkType.WEB_EXPRESS) {
+        if ('express' === app.getNamespace()) {
             return async (req, res, next) => {
                 if (req.path === this.infoPath) {
                     // return html
@@ -40,16 +40,16 @@ let InfoMiddleware = class InfoMiddleware {
         return 'info';
     }
 };
+exports.InfoMiddleware = InfoMiddleware;
 __decorate([
     (0, core_1.Config)('info.infoPath'),
-    __metadata("design:type", String)
+    __metadata("design:type", Object)
 ], InfoMiddleware.prototype, "infoPath", void 0);
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", infoService_1.InfoService)
 ], InfoMiddleware.prototype, "infoService", void 0);
-InfoMiddleware = __decorate([
+exports.InfoMiddleware = InfoMiddleware = __decorate([
     (0, core_1.Middleware)()
 ], InfoMiddleware);
-exports.InfoMiddleware = InfoMiddleware;
 //# sourceMappingURL=info.middleware.js.map

package/dist/utils.d.ts

@@ -1,6 +1,6 @@
 import { TypeInfo } from './interface';
 export declare function safeRequire(mod: string, defaultValue?: any): any;
 export declare function bitToMB(bit: number): string;
-export declare function renderToHtml(infoList: TypeInfo[], title: string): string;
+export declare function renderToHtml(infoList: TypeInfo[], title: any): string;
 export declare function safeContent(value?: string): string;
 //# sourceMappingURL=utils.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/info",
   "description": "midway info",
-  "version": "3.19.2",
+  "version": "4.0.0-alpha.1",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -13,12 +13,10 @@
     "picomatch": "2.3.1"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.19.0",
-    "@midwayjs/express": "^3.19.2",
-    "@midwayjs/koa": "^3.19.2",
-    "@midwayjs/mock": "^3.19.2",
-    "@midwayjs/serverless-fc-starter": "^3.19.0",
-    "@midwayjs/serverless-scf-starter": "^3.14.0"
+    "@midwayjs/core": "^4.0.0-alpha.1",
+    "@midwayjs/express": "^4.0.0-alpha.1",
+    "@midwayjs/koa": "^4.0.0-alpha.1",
+    "@midwayjs/mock": "^4.0.0-alpha.1"
   },
   "keywords": [
     "midway"
@@ -27,8 +25,8 @@
   "license": "MIT",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit",
     "ci": "npm run test",
     "lint": "mwts check"
   },
@@ -39,5 +37,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "57fd034be94897fb819b0d9ef776de0b9923ab0f"
+  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
 }