@midwayjs/info 4.0.0-alpha.1 → 4.0.0-beta.10

package/README.md

@@ -29,4 +29,4 @@ Your can curl `/_info` to show it.
 
 ## License
 
-[MIT]((http://github.com/midwayjs/midway/blob/master/LICENSE))
+[MIT](https://github.com/midwayjs/midway/blob/master/LICENSE)

package/dist/config.default.js

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

package/dist/configuration.js

@@ -14,6 +14,7 @@ const core_1 = require("@midwayjs/core");
 const info_middleware_1 = require("./middleware/info.middleware");
 const DefaultConfig = require("./config.default");
 let InfoConfiguration = class InfoConfiguration {
+    applicationManager;
     async onReady() {
         this.applicationManager
             .getApplications(['koa', 'faas', 'express', 'egg'])

package/dist/infoService.d.ts

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

package/dist/infoService.js

@@ -12,36 +12,55 @@ 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");
 const pm = require("picomatch");
 let InfoService = class InfoService {
+    midwayInformationService;
+    configService;
+    environment;
+    titleConfig;
+    defaultHiddenKey;
+    ignoreKey;
+    secretMatchList;
+    container;
     async init() {
         this.secretMatchList = Array.from(new Set(this.defaultHiddenKey)).map(pattern => {
             return pm(pattern);
         });
     }
     info(infoValueType) {
-        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());
+        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 };
+        });
         if (infoValueType === 'html') {
-            return (0, utils_1.renderToHtml)(info, this.titleConfig);
+            return (0, utils_1.renderToHtml)(newInfo, this.titleConfig);
         }
-        return info;
+        return newInfo;
     }
     projectInfo() {
         return {
-            type: 'Project',
+            type: interface_1.InfoType.PROJECT,
             info: {
                 Project: this.midwayInformationService.getProjectName(),
                 AppDir: this.midwayInformationService.getAppDir(),
@@ -54,7 +73,7 @@ let InfoService = class InfoService {
     systemInfo() {
         const _platform = process.platform;
         return {
-            type: 'System',
+            type: interface_1.InfoType.SYSTEM,
             info: {
                 Platform: _platform === 'win32' ? 'Windows' : _platform,
                 Node: process.versions.node,
@@ -72,7 +91,7 @@ let InfoService = class InfoService {
         const memory = process.memoryUsage();
         const cpu = (0, os_1.cpus)();
         return {
-            type: 'Memory & CPU',
+            type: interface_1.InfoType.MEMORY_CPU,
             info: {
                 'Memory Total Occupy': (0, utils_1.bitToMB)(memory.rss),
                 'Heap Total Occupy': (0, utils_1.bitToMB)(memory.heapTotal),
@@ -110,7 +129,7 @@ let InfoService = class InfoService {
             }
         }
         return {
-            type: 'Software',
+            type: interface_1.InfoType.SOFTWARE,
             info,
         };
     }
@@ -120,14 +139,14 @@ let InfoService = class InfoService {
             env[envName] = this.filterSecretContent(envName, process.env[envName]);
         });
         return {
-            type: 'Environment Variable',
+            type: interface_1.InfoType.ENVIRONMENT_VARIABLE,
             info: env,
         };
     }
     timeInfo() {
         const t = new Date().toString().split(' ');
         return {
-            type: 'Time',
+            type: interface_1.InfoType.TIME,
             info: {
                 Current: Date.now(),
                 Uptime: (0, os_1.uptime)(),
@@ -164,7 +183,7 @@ let InfoService = class InfoService {
                 .join(' / ');
         });
         return {
-            type: 'Network',
+            type: interface_1.InfoType.NETWORK,
             info,
         };
     }
@@ -177,7 +196,7 @@ let InfoService = class InfoService {
             info[modName] = `${modInfo.version || 'Not Found'}(${dependencies[modName]})`;
         });
         return {
-            type: 'Dependencies',
+            type: interface_1.InfoType.DEPENDENCIES,
             info,
         };
     }
@@ -191,7 +210,7 @@ let InfoService = class InfoService {
             }
         }
         return {
-            type: 'Midway Service',
+            type: interface_1.InfoType.MIDWAY_SERVICE,
             info,
         };
     }
@@ -202,7 +221,7 @@ let InfoService = class InfoService {
             info[key] = this.safeJson(this.filterSecretContent(key, config[key]));
         });
         return {
-            type: 'Midway Config',
+            type: interface_1.InfoType.MIDWAY_CONFIG,
             info,
         };
     }
@@ -267,12 +286,16 @@ __decorate([
 ], InfoService.prototype, "environment", void 0);
 __decorate([
     (0, core_1.Config)('info.title'),
-    __metadata("design:type", Object)
+    __metadata("design:type", String)
 ], 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)

package/dist/interface.d.ts

@@ -10,5 +10,19 @@ 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,5 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultHiddenKey = void 0;
+exports.InfoType = 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 = 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: any;
+    protected infoPath: string;
     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

@@ -13,6 +13,8 @@ exports.InfoMiddleware = void 0;
 const core_1 = require("@midwayjs/core");
 const infoService_1 = require("../infoService");
 let InfoMiddleware = class InfoMiddleware {
+    infoPath;
+    infoService;
     resolve(app) {
         if ('express' === app.getNamespace()) {
             return async (req, res, next) => {
@@ -43,7 +45,7 @@ let InfoMiddleware = class InfoMiddleware {
 exports.InfoMiddleware = InfoMiddleware;
 __decorate([
     (0, core_1.Config)('info.infoPath'),
-    __metadata("design:type", Object)
+    __metadata("design:type", String)
 ], InfoMiddleware.prototype, "infoPath", void 0);
 __decorate([
     (0, core_1.Inject)(),

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: any): string;
+export declare function renderToHtml(infoList: TypeInfo[], title: string): string;
 export declare function safeContent(value?: string): string;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeContent = exports.renderToHtml = exports.bitToMB = exports.safeRequire = void 0;
+exports.safeRequire = safeRequire;
+exports.bitToMB = bitToMB;
+exports.renderToHtml = renderToHtml;
+exports.safeContent = safeContent;
 const fs_1 = require("fs");
 function safeRequire(mod, defaultValue) {
     try {
@@ -13,11 +16,9 @@ function safeRequire(mod, defaultValue) {
         return defaultValue;
     }
 }
-exports.safeRequire = safeRequire;
 function bitToMB(bit) {
     return Number((bit || 0) / 1024 / 1024).toFixed(2) + ' MB';
 }
-exports.bitToMB = bitToMB;
 function renderToHtml(infoList, title) {
     let html = `<div style="padding: 24px; font-size: 36px;background: #9999cb;font-weight: bold;">${title}</div>`;
     html += infoList
@@ -37,7 +38,6 @@ function renderToHtml(infoList, title) {
   .infoValue {vertical-align: top;background:#d8d8d8;padding: 12px;word-break:break-all;}
   </style><div style="margin: 24px auto;max-width: 720px;min-width: 440px;">${html}</div>`;
 }
-exports.renderToHtml = renderToHtml;
 function safeContent(value = '') {
     if (value.length < 3) {
         return '*'.repeat(value.length);
@@ -55,5 +55,4 @@ function safeContent(value = '') {
         return value.slice(0, 3) + '*'.repeat(value.length - 6) + value.slice(-3);
     }
 }
-exports.safeContent = safeContent;
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/info",
   "description": "midway info",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-beta.10",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -13,10 +13,10 @@
     "picomatch": "2.3.1"
   },
   "devDependencies": {
-    "@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"
+    "@midwayjs/core": "^4.0.0-beta.10",
+    "@midwayjs/express": "^4.0.0-beta.10",
+    "@midwayjs/koa": "^4.0.0-beta.10",
+    "@midwayjs/mock": "^4.0.0-beta.10"
   },
   "keywords": [
     "midway"
@@ -31,11 +31,11 @@
     "lint": "mwts check"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=20"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
+  "gitHead": "1b1856629913703f67304155aaf611ec936a81ac"
 }