badmfck-api-server 2.8.6 → 2.8.8

package/dist/apiServer/APIService.js

@@ -80,6 +80,7 @@ async function Initializer(services) {
     for (let i of services) {
         await i.init();
         activeServices.push(i.getName());
+        MonitorService_1.S_STAT_REGISTRATE_SERVICE.invoke(i.getName());
     }
     for (let i of services) {
         i.applicationReady();
@@ -88,7 +89,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "2.8.6";
+    version = "2.8.8";
     options;
     monitor = null;
     monitorIndexFile;
@@ -107,6 +108,7 @@ class APIService extends BaseService_1.BaseService {
         if (this.options.monitor && this.options.monitor.length > 0) {
             exports.REQ_MONITOR_USERS.listener = async () => this.options.monitor ?? [];
             this.monitor = new MonitorService_1.MonitorService();
+            this.monitor.init();
             this.options.endpoints.push(new Monitor_1.Monitor());
         }
         this.options.endpoints.push(new ExternalServiceEndpoint_1.ExternalServiceEndpoint());
@@ -237,7 +239,7 @@ class APIService extends BaseService_1.BaseService {
                             files: req.files ?? null,
                             referer: req.get("Referer"),
                         };
-                        if (this.options.preproducer) {
+                        if (this.options.preproducer && ep !== "--sys-monitor") {
                             try {
                                 const preproducerResult = await this.options.preproducer(httpRequest);
                                 if (preproducerResult)

package/dist/apiServer/MonitorService.d.ts

@@ -14,10 +14,12 @@ export interface IEPStatReqFilter {
 export interface IEPStatResult {
 }
 export declare const S_STAT_REGISTRATE_REQUEST: Signal<TransferPacketVO<any>>;
+export declare const S_STAT_REGISTRATE_SERVICE: Signal<string>;
 export declare const REQ_EP_STAT: Req<IEPStatReqFilter, IEPStatResult>;
 export declare class MonitorService extends BaseService {
     endpoints: Map<number, Map<string, IEPStat>>;
     constructor();
+    init(): Promise<void>;
     getEPStat(req: IEPStatReqFilter): Promise<IEPStatResult>;
     onStatRegistrate(data: TransferPacketVO): void;
     pad(num: number): string;

package/dist/apiServer/MonitorService.js

@@ -23,18 +23,22 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MonitorService = exports.REQ_EP_STAT = exports.S_STAT_REGISTRATE_REQUEST = void 0;
+exports.MonitorService = exports.REQ_EP_STAT = exports.S_STAT_REGISTRATE_SERVICE = exports.S_STAT_REGISTRATE_REQUEST = void 0;
 const badmfck_signal_1 = __importStar(require("badmfck-signal"));
 const BaseService_1 = require("./BaseService");
 exports.S_STAT_REGISTRATE_REQUEST = new badmfck_signal_1.default();
+exports.S_STAT_REGISTRATE_SERVICE = new badmfck_signal_1.default();
 exports.REQ_EP_STAT = new badmfck_signal_1.Req(undefined, "REQ_EP_STAT");
 class MonitorService extends BaseService_1.BaseService {
     endpoints = new Map();
     constructor() {
         super("MonitorService");
-        exports.S_STAT_REGISTRATE_REQUEST.subscribe(this.onStatRegistrate);
+        exports.S_STAT_REGISTRATE_REQUEST.subscribe(req => this.onStatRegistrate(req));
         exports.REQ_EP_STAT.listener = async (req) => this.getEPStat(req);
     }
+    async init() {
+        super.init();
+    }
     async getEPStat(req) {
         const result = new Map();
         if (req.range === "hour") {
@@ -81,7 +85,7 @@ class MonitorService extends BaseService_1.BaseService {
             }
             endResult.push(stat);
         }
-        return { filter: req, result: endResult };
+        return { filter: req, result: endResult, overallcount: this.endpoints.size };
     }
     onStatRegistrate(data) {
         const minute = this.getMinutes(new Date());

package/dist/apiServer/monitor/Monitor.d.ts

@@ -15,6 +15,7 @@ export declare class Monitor extends BaseEndpoint {
     ignoreHttpLogging: boolean;
     users: Map<string, IStatObject>;
     constructor();
+    controllers(req: HTTPRequestVO): Promise<TransferPacketVO>;
     logs(req: HTTPRequestVO): Promise<TransferPacketVO>;
     netlog(req: HTTPRequestVO): Promise<TransferPacketVO>;
     metrics(req: HTTPRequestVO): Promise<TransferPacketVO>;

package/dist/apiServer/monitor/Monitor.js

@@ -22,9 +22,14 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
             { ignoreInterceptor: true, endpoint: "log", handler: this.logs },
             { ignoreInterceptor: true, endpoint: "netlog", handler: this.netlog },
             { ignoreInterceptor: true, endpoint: "metrics", handler: this.metrics },
-            { ignoreInterceptor: true, endpoint: "server", handler: this.serverStat }
+            { ignoreInterceptor: true, endpoint: "server", handler: this.serverStat },
+            { ignoreInterceptor: true, endpoint: "controllers", handler: this.controllers }
         ]);
     }
+    async controllers(req) {
+        this.checkAuthentication(req);
+        return {};
+    }
     async logs(req) {
         this.checkAuthentication(req);
         const services = await LogService_1.REQ_LOG_UNIQUE_SERVICES.request();
@@ -40,7 +45,8 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
     }
     async netlog(req) {
         this.checkAuthentication(req);
-        return {};
+        const log = await APIService_1.REQ_HTTP_LOG.request(req.data);
+        return { data: log };
     }
     async metrics(req) {
         this.checkAuthentication(req);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badmfck-api-server",
-  "version": "2.8.6",
+  "version": "2.8.8",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",