badmfck-api-server 2.8.5 → 2.8.7

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.5";
+    version = "2.8.7";
     options;
     monitor = null;
     monitorIndexFile;
@@ -388,6 +389,7 @@ class APIService extends BaseService_1.BaseService {
             log.time = data.responseTime;
             log.referer = ref;
         }
+        MonitorService_1.S_STAT_REGISTRATE_REQUEST.invoke(data);
         if (res.destroyed || res.closed) {
             if (log)
                 log.error = "Connection already closed, can't send response for: " + data.endpoint;

package/dist/apiServer/MonitorService.d.ts

@@ -1,4 +1,28 @@
+import Signal, { Req } from "badmfck-signal";
 import { BaseService } from "./BaseService";
+import { TransferPacketVO } from "./structures/Interfaces";
+export interface IEPStat {
+    success: number;
+    fail: number;
+}
+export interface IEPStatReqFilter {
+    range: "minute" | "hour" | "day";
+    from: string;
+    to: string;
+    ep: string;
+}
+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();
+    getEPStat(req: IEPStatReqFilter): Promise<IEPStatResult>;
+    onStatRegistrate(data: TransferPacketVO): void;
+    pad(num: number): string;
+    getMinutes(date: Date): number;
+    getDate(minutes: number): Date;
+    getMinutesInMonth(date: Date): number;
 }

package/dist/apiServer/MonitorService.js

@@ -1,10 +1,138 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MonitorService = 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.REQ_EP_STAT.listener = async (req) => this.getEPStat(req);
+    }
+    async getEPStat(req) {
+        const result = new Map();
+        if (req.range === "hour") {
+            for (let [minute, minuteSlot] of this.endpoints) {
+                const date = this.getDate(minute);
+                let range = minute + "";
+                if (req.range === "hour")
+                    range = this.pad(this.getDate(minute).getHours());
+                else if (req.range === "day")
+                    range = this.pad(this.getDate(minute).getDate());
+                if (req.from) {
+                    if (range < req.from)
+                        continue;
+                }
+                if (req.to) {
+                    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);
+                }
+                for (let [ep, stat] of minuteSlot) {
+                    epSlot.success += stat.success;
+                    epSlot.fail += stat.fail;
+                }
+            }
+        }
+        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 };
+    }
+    onStatRegistrate(data) {
+        const minute = this.getMinutes(new Date());
+        let minuteSlot = this.endpoints.get(minute);
+        if (!minuteSlot) {
+            minuteSlot = new Map();
+            this.endpoints.set(minute, minuteSlot);
+        }
+        if (!data.endpoint)
+            data.endpoint = "unknown";
+        let epSlot = minuteSlot.get(data.endpoint);
+        if (!epSlot) {
+            epSlot = { success: 0, fail: 0 };
+            minuteSlot.set(data.endpoint, epSlot);
+        }
+        if (data.error) {
+            epSlot.fail++;
+        }
+        else {
+            epSlot.success++;
+        }
+        if (this.endpoints.size > 3000) {
+            const firstItem = this.endpoints.keys().next().value;
+            if (firstItem)
+                this.endpoints.delete(firstItem);
+        }
+    }
+    pad(num) {
+        return num.toString().padStart(2, '0');
+    }
+    getMinutes(date) {
+        const year = date.getFullYear();
+        const month = this.pad(date.getMonth() + 1);
+        const day = this.pad(date.getDate());
+        const hours = this.pad(date.getHours());
+        const minutes = this.pad(date.getMinutes());
+        return parseInt(`${year}${month}${day}${hours}${minutes}`);
+    }
+    getDate(minutes) {
+        const datetime = minutes.toString();
+        const year = parseInt(datetime.slice(0, 4));
+        const month = parseInt(datetime.slice(4, 6)) - 1;
+        const day = parseInt(datetime.slice(6, 8));
+        const hours = parseInt(datetime.slice(8, 10));
+        const min = parseInt(datetime.slice(10, 12));
+        return new Date(year, month, day, hours, min);
+    }
+    getMinutesInMonth(date) {
+        const daysInMonth = date.getDate();
+        return daysInMonth * 1440;
     }
 }
 exports.MonitorService = MonitorService;

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

@@ -11,6 +11,7 @@ const LogService_1 = require("../LogService");
 const crypto_1 = __importDefault(require("crypto"));
 const os_1 = __importDefault(require("os"));
 const DefaultErrors_1 = __importDefault(require("../structures/DefaultErrors"));
+const MonitorService_1 = require("../MonitorService");
 exports.S_MONITOR_REGISTRATE_ACTION = new badmfck_signal_1.Signal();
 class Monitor extends BaseEndpoint_1.BaseEndpoint {
     ignoreHttpLogging = true;
@@ -21,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();
@@ -39,11 +45,13 @@ 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);
-        return {};
+        const result = await MonitorService_1.REQ_EP_STAT.request(req.data);
+        return { data: result };
     }
     async serverStat(req) {
         this.checkAuthentication(req);

package/package.json

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