badmfck-api-server 2.8.7 → 2.8.9

package/dist/apiServer/APIService.js

@@ -89,7 +89,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "2.8.7";
+    version = "2.8.9";
     options;
     monitor = null;
     monitorIndexFile;
@@ -108,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());
@@ -238,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

@@ -5,20 +5,29 @@ export interface IEPStat {
     success: number;
     fail: number;
 }
+export interface ICustomEvent {
+    event: string;
+    data?: any;
+    project?: string;
+}
 export interface IEPStatReqFilter {
-    range: "minute" | "hour" | "day";
-    from: string;
-    to: string;
-    ep: string;
+    range?: "minute" | "hour" | "day";
+    from?: string;
+    to?: string;
+    ep?: string;
+    project?: string;
+    event?: string;
 }
 export interface IEPStatResult {
 }
 export declare const S_STAT_REGISTRATE_REQUEST: Signal<TransferPacketVO<any>>;
+export declare const S_STAT_REGISTRATE_CUSTOM_EVENT: Signal<ICustomEvent>;
 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>>;
+    projects: Map<string, 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,24 +23,34 @@ 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_SERVICE = exports.S_STAT_REGISTRATE_REQUEST = void 0;
+exports.MonitorService = exports.REQ_EP_STAT = exports.S_STAT_REGISTRATE_SERVICE = exports.S_STAT_REGISTRATE_CUSTOM_EVENT = 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_CUSTOM_EVENT = 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();
+    projects = 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") {
-            for (let [minute, minuteSlot] of this.endpoints) {
-                const date = this.getDate(minute);
+        const result = [];
+        for (let [project, projectSlot] of this.projects) {
+            if (req.project && req.project !== project)
+                continue;
+            let p = result.find(p => p.project === project);
+            if (!p) {
+                p = { project, dates: [] };
+                result.push(p);
+            }
+            for (let [minute, minuteSlot] of projectSlot) {
                 let range = minute + "";
                 if (req.range === "hour")
                     range = this.pad(this.getDate(minute).getHours());
@@ -54,42 +64,43 @@ class MonitorService extends BaseService_1.BaseService {
                     if (range > req.to)
                         continue;
                 }
-                let resultSlot = result.get(range);
-                if (!resultSlot) {
-                    resultSlot = new Map();
-                    result.set(range, resultSlot);
-                }
-                let epSlot = resultSlot.get(req.ep);
-                if (!epSlot) {
-                    epSlot = { success: 0, fail: 0 };
-                    resultSlot.set(req.ep, epSlot);
+                let dateSlot = p.dates.find(p => p.date === range);
+                if (!dateSlot) {
+                    dateSlot = {
+                        date: range,
+                        endpoints: []
+                    };
+                    p.dates.push(dateSlot);
                 }
-                for (let [ep, stat] of minuteSlot) {
-                    epSlot.success += stat.success;
-                    epSlot.fail += stat.fail;
+                for (let [epName, epStatSlot] of minuteSlot) {
+                    let epSlot = dateSlot.endpoints.find(p => p.ep === epName);
+                    if (!epSlot) {
+                        epSlot = {
+                            ep: epName,
+                            success: 0,
+                            fail: 0
+                        };
+                        dateSlot.endpoints.push(epSlot);
+                    }
+                    epSlot.fail += epStatSlot.fail;
+                    epSlot.success += epStatSlot.success;
                 }
             }
         }
-        const endResult = [];
-        for (let [date, obj] of result) {
-            const stat = {
-                date,
-                data: []
-            };
-            for (let [ep, s] of obj) {
-                const r = { ep, ...s };
-                stat.data.push(r);
-            }
-            endResult.push(stat);
-        }
-        return { filter: req, result: endResult, overallcount: this.endpoints.size };
+        return { filter: req, result: result };
     }
     onStatRegistrate(data) {
         const minute = this.getMinutes(new Date());
-        let minuteSlot = this.endpoints.get(minute);
+        const project = data.project ?? "unknown";
+        let projectSlot = this.projects.get(project);
+        if (!projectSlot) {
+            projectSlot = new Map();
+            this.projects.set(project, projectSlot);
+        }
+        let minuteSlot = projectSlot.get(minute);
         if (!minuteSlot) {
             minuteSlot = new Map();
-            this.endpoints.set(minute, minuteSlot);
+            projectSlot.set(minute, minuteSlot);
         }
         if (!data.endpoint)
             data.endpoint = "unknown";
@@ -104,10 +115,10 @@ class MonitorService extends BaseService_1.BaseService {
         else {
             epSlot.success++;
         }
-        if (this.endpoints.size > 3000) {
-            const firstItem = this.endpoints.keys().next().value;
+        if (projectSlot.size > 3000) {
+            const firstItem = projectSlot.keys().next().value;
             if (firstItem)
-                this.endpoints.delete(firstItem);
+                projectSlot.delete(firstItem);
         }
     }
     pad(num) {

package/dist/apiServer/structures/Interfaces.d.ts

@@ -16,6 +16,7 @@ export interface TransferPacketVO<T = any> {
     };
     file?: string;
     blockResponse?: boolean;
+    project?: string;
 }
 export interface HTTPRequestVO<T = any> {
     raw: any;

package/package.json

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